linux-kernel - Re: linux-next: manual merge of the usb tree with the usb.current 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: <YAfjkLGh9Q+sBPGA@kroah.com>
Date:   Wed, 20 Jan 2021 09:02:24 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Al Cooper <alcooperx@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Patrik Jakobsson <patrik.r.jakobsson@...il.com>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
 tree

On Wed, Jan 20, 2021 at 01:06:03PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/gadget/udc/bdc/Kconfig
> 
> between commit:
> 
>   ef02684c4e67 ("usb: bdc: Make bdc pci driver depend on BROKEN")
> 
> from the usb.current tree and commit:
> 
>   7766cafea0ec ("usb: bdc: Remove the BDC PCI driver")
> 
> from the usb tree.
> 
> I fixed it up (the latter removed the text updated by the former) 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.

Thanks, I knew this would happen and will resolve it when the
usb.current patch is merged in Linus's tree.

greg k-h