From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Colin Cross <ccross@android•com>,
Olof Johansson <olof@lixom•net>,
Thierry Reding <treding@nvidia•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Nagarjuna Kristam <nkristam@nvidia•com>,
Heikki Krogerus <heikki.krogerus@linux•intel.com>
Subject: linux-next: manual merge of the usb tree with the tegra tree
Date: Mon, 16 Mar 2020 13:44:45 +1100 [thread overview]
Message-ID: <20200316134445.343e7c97@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 800 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-16 2:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 2:44 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-16 2:47 linux-next: manual merge of the usb tree with the tegra tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200316134445.343e7c97@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ccross@android$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=heikki.krogerus@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nkristam@nvidia$(echo .)com \
--cc=olof@lixom$(echo .)net \
--cc=treding@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox