From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Linus Walleij" <linus.walleij@linaro.org>,
"\"Sjur Brændeland\"" <sjur.brandeland@stericsson.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"MyungJoo Ham" <myungjoo.ham@samsung.com>
Subject: Re: linux-next: manual merge of the modem-shm tree with the driver-core tree
Date: Mon, 23 Apr 2012 07:24:39 -0700 [thread overview]
Message-ID: <20120423142439.GC32269@kroah.com> (raw)
In-Reply-To: <20120423154420.09f149266ae36bb8e08b4207@canb.auug.org.au>
On Mon, Apr 23, 2012 at 03:44:20PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the modem-shm tree got a conflict in
> drivers/Kconfig between commit de55d8716ac5 ("Extcon (external
> connector): import Android's switch class and modify") from the
> driver-core tree and commit 021fd6178bcd ("modem_shm: Makefile and
> Kconfig for M7400 Shared Memory Drivers") from the modem-shm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good, thanks for doing this.
greg k-h
prev parent reply other threads:[~2012-04-23 14:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 5:44 linux-next: manual merge of the modem-shm tree with the driver-core tree Stephen Rothwell
2012-04-23 14:24 ` 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=20120423142439.GC32269@kroah.com \
--to=greg@kroah.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=sfr@canb.auug.org.au \
--cc=sjur.brandeland@stericsson.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.