From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Bolle <pebolle@tiscali.nl>, Magnus Damm <damm@opensource.se>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Wolfram Sang <wsa@sang-engineering.com>
Subject: Re: linux-next: manual merge of the usb tree with the tip tree
Date: Mon, 17 Mar 2014 11:30:52 -0700 [thread overview]
Message-ID: <20140317183052.GD10565@kroah.com> (raw)
In-Reply-To: <20140317183126.7c8ba1901c81fbb9ace00f20@canb.auug.org.au>
On Mon, Mar 17, 2014 at 06:31:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-shmobile/Kconfig between commit aeb8fb7910fc ("ARM:
> shmobile: Remove CMT, TMU and STI Kconfig entries") from the tip tree and
> commit f6723b569a67 ("usb: host: remove selects of USB_ARCH_HAS_?HCI")
> from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2014-03-17 18:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-17 7:31 linux-next: manual merge of the usb tree with the tip tree Stephen Rothwell
2014-03-17 18:30 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-03-09 2:35 Stephen Rothwell
2016-03-09 4:17 ` Greg KH
2014-03-17 7:34 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2009-08-19 7:59 Stephen Rothwell
2009-08-19 23:38 ` Greg KH
2009-08-20 2:37 ` Jason Wessel
2009-08-20 2:48 ` Greg KH
2009-08-20 5:57 ` Peter Zijlstra
2009-08-20 19:31 ` Jason Wessel
2009-08-20 10:35 ` Ingo Molnar
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=20140317183052.GD10565@kroah.com \
--to=greg@kroah.com \
--cc=damm@opensource.se \
--cc=daniel.lezcano@linaro.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=pebolle@tiscali.nl \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=wsa@sang-engineering.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).