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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 4 Mar 2016 08:58:41 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Mauro Carvalho Chehab <mchehab@....samsung.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Janani Ravichandran <janani.rvchndrn@...il.com>,
	Antti Palosaari <crope@....fi>
Subject: 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