From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Felipe Balbi <balbi@kernel•org>, Greg KH <greg@kroah•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jason Yan <yanaijie@huawei•com>,
kbuild test robot <lkp@intel•com>
Subject: linux-next: manual merge of the usb-gadget tree with the usb tree
Date: Thu, 21 May 2020 17:21:30 +1000 [thread overview]
Message-ID: <20200521172130.52aaa1d6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 812 bytes --]
Hi all,
Today's linux-next merge of the usb-gadget tree got a conflict in:
drivers/usb/cdns3/gadget.c
between commit:
e9010320f2d9 ("usb: cdns3: gadget: make a bunch of functions static")
from the usb tree and commit:
e2e77a94078b ("usb: cdns3: mark local functions static")
from the usb-gadget tree.
I fixed it up (the difference was the indentation of contiuation lines -
I juts used the latter) 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-05-21 7:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 7:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-16 3:23 linux-next: manual merge of the usb-gadget tree with the usb tree Stephen Rothwell
2020-03-16 7:25 ` Greg KH
2020-03-16 8:18 ` Greg KH
2018-05-17 4:03 Stephen Rothwell
2018-05-17 7:07 ` Greg KH
2017-10-18 14:49 Mark Brown
[not found] ` <20171018144912.qlc7vlnhdqmr5tdd-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>
2017-10-18 15:40 ` Kees Cook
2017-10-18 16:04 ` Mark Brown
2017-10-18 14:42 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-19 7:37 ` Felipe Balbi
2017-04-07 4:45 Stephen Rothwell
2017-04-07 4:41 Stephen Rothwell
2014-11-06 3:58 Stephen Rothwell
2014-11-06 4:59 ` Felipe Balbi
2014-04-28 5:20 Stephen Rothwell
2014-04-28 16:11 ` Felipe Balbi
2013-08-02 6:38 Stephen Rothwell
2013-08-02 7:23 ` Felipe Balbi
2013-04-04 4:18 Stephen Rothwell
2013-04-04 6:27 ` Thierry Reding
2013-04-04 7:08 ` Felipe Balbi
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=20200521172130.52aaa1d6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lkp@intel$(echo .)com \
--cc=yanaijie@huawei$(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