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]

Message-ID: <20170206083741.GA24733@kroah.com>
Date:   Mon, 6 Feb 2017 09:37:42 +0100
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,
        Sean Young <sean@...s.org>,
        Sudip Mukherjee <sudip.mukherjee@...ethink.co.uk>
Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb
 tree

On Mon, Feb 06, 2017 at 03:31:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/media/lirc/lirc_parallel.c
> 
> between commit:
> 
>   2933974cbb03 ("[media] staging: lirc_parallel: remove")
> 
> from the v4l-dvb tree and commit:
> 
>   1c5fa1c7dbff ("staging: media: lirc: use new parport device model")
> 
> from the staging tree.
> 
> Unfortunate ...

That's fine, thanks for letting me know, I didn't realize the file was
removed until after I had applied the patch :(

thanks,

greg k-h