linux-kernel - linux-next: manual merge of the usb-gadget tree with Linus' 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-next>] [day] [month] [year] [list]

Date:   Fri, 10 Jan 2020 15:32:07 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Felipe Balbi <balbi@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jayshri Pawar <jpawar@...ence.com>,
        Pawel Laszczak <pawell@...ence.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: linux-next: manual merge of the usb-gadget tree with Linus' tree

Hi all,

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

  drivers/usb/cdns3/gadget.c

between commit:

  f616c3bda47e ("usb: cdns3: Fix dequeue implementation.")

from Linus' tree and commit:

  4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")

from the usb-gadget tree.

I have no idea how to handle this, so I just dropped the usb-gadget tree
for today - it clearly needs to be rebased on Linus' tree anyway (it
has a few shared patches that are different commits and there are
further changes to this file in Linus' tree as well.  rebasing onto
(or merging with) v5.5-rc6 may be useful.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped