linux-kernel - Re: linux-next: manual merge of the staging tree with the usb 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: <20170504234215.GB13025@kroah.com>
Date:   Thu, 4 May 2017 16:42:15 -0700
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Guenter Roeck <groeck@...omium.org>,
        Gilad Ben-Yossef <gilad@...yossef.com>,
        Michael Zoran <mzoran@...wfest.net>
Subject: Re: linux-next: manual merge of the staging tree with the usb tree

On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/Makefile
> 
> between commit:
> 
>   f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
> 
> from the usb tree and commit:
> 
>   051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
>   abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I'm the maintainer of both :)

Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.

greg k-h