Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1349847 > unrolled thread

linux-next: manual merge of the staging tree with the v4l-dvb tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-04 06:30 +0100
    Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Greg KH <greg@kroah.com> - 2016-03-04 18:00 +0100

#1349847 — linux-next: manual merge of the staging tree with the v4l-dvb tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/media/dvb-frontends/mn88473.c

between commit:

  7908fad99a6c ("[media] mn88473: finalize driver")

from the v4l-dvb tree and commit:

  3a35be2a1443 ("staging: media: Remove unneeded parentheses")

from the staging tree.

I fixed it up (I just used the v4l-dvb tree version) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]

#1350453 — Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

On Fri, Mar 04, 2016 at 04:24:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/media/dvb-frontends/mn88473.c
> 
> between commit:
> 
>   7908fad99a6c ("[media] mn88473: finalize driver")
> 
> from the v4l-dvb tree and commit:
> 
>   3a35be2a1443 ("staging: media: Remove unneeded parentheses")
> 
> from the staging tree.
> 
> I fixed it up (I just used the v4l-dvb tree version) and can carry the
> fix as necessary (no action is required).

Thanks for this, that sounds fine.

greg k-h

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web