From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Felipe Balbi <balbi@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jayshri Pawar <jpawar@cadence•com>,
Pawel Laszczak <pawell@cadence•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>
Subject: linux-next: manual merge of the usb-gadget tree with Linus' tree
Date: Fri, 10 Jan 2020 15:32:07 +1100 [thread overview]
Message-ID: <20200110153207.70c888cd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 693 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-01-10 4:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 4:32 Stephen Rothwell [this message]
2020-01-14 8:41 ` linux-next: manual merge of the usb-gadget tree with Linus' tree Geert Uytterhoeven
2020-01-14 9:17 ` Pawel Laszczak
2020-01-15 3:40 ` Stephen Rothwell
2020-01-15 6:56 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2017-06-13 6:11 Stephen Rothwell
2014-09-08 7:13 Stephen Rothwell
2014-09-08 13:28 ` Felipe Balbi
2014-09-08 7:06 Stephen Rothwell
2014-07-17 6:52 Stephen Rothwell
2014-07-17 15:05 ` Felipe Balbi
2013-08-01 5:32 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=20200110153207.70c888cd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@kernel$(echo .)org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jpawar@cadence$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pawell@cadence$(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