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

Message-ID: <20200316134445.343e7c97@canb.auug.org.au>
Date:   Mon, 16 Mar 2020 13:44:45 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Colin Cross <ccross@...roid.com>,
        Olof Johansson <olof@...om.net>,
        Thierry Reding <treding@...dia.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Nagarjuna Kristam <nkristam@...dia.com>,
        Heikki Krogerus <heikki.krogerus@...ux.intel.com>
Subject: linux-next: manual merge of the usb tree with the tegra tree

Hi all,

Today's linux-next merge of the usb tree got conflicts in:

  drivers/usb/gadget/udc/tegra-xudc.c

between commit:

  041960cf6937 ("usb: gadget: tegra-xudc: Remove usb-role-switch support")

from the tegra tree and commit:

  bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")

from the usb tree.

I fixed it up (I basically used the tegra tree version) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped