From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@ti.com>, Yegor Yefremov <yegorslists@googlemail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Philippe Reynes <tremyfr@gmail.com>
Subject: linux-next: manual merge of the usb-gadget tree with Linus' tree
Date: Mon, 8 Sep 2014 17:06:59 +1000 [thread overview]
Message-ID: <20140908170659.1ec79726@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/gadget/Makefile, drivers/usb/gadget/legacy/Makefile and
drivers/usb/gadget/function/Makefile between commit 5d19703822da ("usb:
gadget: remove $(PWD) in ccflags-y") from Linus' tree and commit
fa31409a82ee ("usb: gadget: use $(srctree) instead of $(PWD) for
includes") from the usb-gadget tree.
I fixed it up (I used the version from the usb-gadget tree) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-08 7:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 7:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-10 4:32 linux-next: manual merge of the usb-gadget tree with Linus' tree Stephen Rothwell
2020-01-14 8:41 ` Geert Uytterhoeven
2020-01-14 9:17 ` Pawel Laszczak
2020-01-15 3:40 ` Stephen Rothwell
2020-01-15 6:56 ` Felipe Balbi
2017-06-13 6:11 Stephen Rothwell
2014-09-08 7:13 Stephen Rothwell
2014-09-08 13:28 ` Felipe Balbi
2014-09-08 13:28 ` Felipe Balbi
2014-07-17 6:52 Stephen Rothwell
2014-07-17 15:05 ` Felipe Balbi
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=20140908170659.1ec79726@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tremyfr@gmail.com \
--cc=yegorslists@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.