From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Mundt <lethal@linux-sh.org>
Subject: Re: linux-next: manual merge of the usb tree with the sh tree
Date: Mon, 6 Dec 2010 20:43:10 -0800 [thread overview]
Message-ID: <20101207044310.GA29457@kroah.com> (raw)
In-Reply-To: <20101206124723.72a8cd7f.sfr@canb.auug.org.au>
On Mon, Dec 06, 2010 at 12:47:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/sh/Kconfig between commit f020c92de48246510623162fb22d60d91810cc56
> ("sh: Enable optional gpiolib for all CPUs with pinmux tables") from the
> sh tree and commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 ("sh: Convert
> to USB_ARCH_HAS_OHCI/EHCI selects") from the usb tree.
>
> Just context changes. I fixed ti up (see below) and can carry the fix as
> necessary.
Looks good, thanks for carrying this.
greg k-h
prev parent reply other threads:[~2010-12-07 4:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-06 1:47 linux-next: manual merge of the usb tree with the sh tree Stephen Rothwell
2010-12-07 4:43 ` Greg KH [this message]
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=20101207044310.GA29457@kroah.com \
--to=greg@kroah.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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