* linux-next: manual merge of the modem-shm tree with the driver-core tree
@ 2012-04-23 5:44 Stephen Rothwell
2012-04-23 14:24 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-04-23 5:44 UTC (permalink / raw)
To: Linus Walleij, "Sjur Brændeland"
Cc: linux-next, linux-kernel, MyungJoo Ham, Greg KH
[-- Attachment #1: Type: text/plain, Size: 806 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/Kconfig
index 0233ad9,918e943..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,6 -136,6 +140,8 @@@ source "drivers/virt/Kconfig
source "drivers/devfreq/Kconfig"
+source "drivers/extcon/Kconfig"
+
+ source "drivers/modem_shm/Kconfig"
+
endmenu
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the modem-shm tree with the driver-core tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2012-04-23 14:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, "Sjur Brændeland", linux-next,
linux-kernel, MyungJoo Ham
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-23 14:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).