From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
Tomasz Figa <t.figa@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Thu, 17 Jul 2014 12:06:31 +1000 [thread overview]
Message-ID: <20140717120631.4bc75d13@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got conflicts in
arch/arm/mach-s5pv210/dev-audio.c,
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h,
arch/arm/mach-s5pv210/mach-aquila.c, arch/arm/mach-s5pv210/mach-goni.c,
arch/arm/mach-s5pv210/mach-smdkv210.c,
arch/arm/mach-s5pv210/setup-fb-24bpp.c,
arch/arm/mach-s5pv210/setup-fimc.c, arch/arm/mach-s5pv210/setup-i2c0.c,
arch/arm/mach-s5pv210/setup-i2c1.c, arch/arm/mach-s5pv210/setup-i2c2.c,
arch/arm/mach-s5pv210/setup-ide.c,
arch/arm/mach-s5pv210/setup-keypad.c,
arch/arm/mach-s5pv210/setup-sdhci-gpio.c,
arch/arm/mach-s5pv210/setup-spi.c and
arch/arm/plat-samsung/s5p-irq-eint.c between commit 2fd48f94426d ("ARM:
mach-s5p: get rid of all <mach/gpio.h> headers") from the arm-soc tree
and commits 36278bb98dc7 ("ARM: S5PV210: Remove support for board
files") and 2722091e711f ("ARM: SAMSUNG: Remove remaining legacy code")
from the samsung tree.
I fixed it up (I just removed the files removed by the latter commits)
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 --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
Tomasz Figa <t.figa@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Thu, 17 Jul 2014 12:06:31 +1000 [thread overview]
Message-ID: <20140717120631.4bc75d13@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got conflicts in
arch/arm/mach-s5pv210/dev-audio.c,
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h,
arch/arm/mach-s5pv210/mach-aquila.c, arch/arm/mach-s5pv210/mach-goni.c,
arch/arm/mach-s5pv210/mach-smdkv210.c,
arch/arm/mach-s5pv210/setup-fb-24bpp.c,
arch/arm/mach-s5pv210/setup-fimc.c, arch/arm/mach-s5pv210/setup-i2c0.c,
arch/arm/mach-s5pv210/setup-i2c1.c, arch/arm/mach-s5pv210/setup-i2c2.c,
arch/arm/mach-s5pv210/setup-ide.c,
arch/arm/mach-s5pv210/setup-keypad.c,
arch/arm/mach-s5pv210/setup-sdhci-gpio.c,
arch/arm/mach-s5pv210/setup-spi.c and
arch/arm/plat-samsung/s5p-irq-eint.c between commit 2fd48f94426d ("ARM:
mach-s5p: get rid of all <mach/gpio.h> headers") from the arm-soc tree
and commits 36278bb98dc7 ("ARM: S5PV210: Remove support for board
files") and 2722091e711f ("ARM: SAMSUNG: Remove remaining legacy code")
from the samsung tree.
I fixed it up (I just removed the files removed by the latter commits)
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 --]
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Thu, 17 Jul 2014 12:06:31 +1000 [thread overview]
Message-ID: <20140717120631.4bc75d13@canb.auug.org.au> (raw)
Hi Kukjin,
Today's linux-next merge of the samsung tree got conflicts in
arch/arm/mach-s5pv210/dev-audio.c,
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h,
arch/arm/mach-s5pv210/mach-aquila.c, arch/arm/mach-s5pv210/mach-goni.c,
arch/arm/mach-s5pv210/mach-smdkv210.c,
arch/arm/mach-s5pv210/setup-fb-24bpp.c,
arch/arm/mach-s5pv210/setup-fimc.c, arch/arm/mach-s5pv210/setup-i2c0.c,
arch/arm/mach-s5pv210/setup-i2c1.c, arch/arm/mach-s5pv210/setup-i2c2.c,
arch/arm/mach-s5pv210/setup-ide.c,
arch/arm/mach-s5pv210/setup-keypad.c,
arch/arm/mach-s5pv210/setup-sdhci-gpio.c,
arch/arm/mach-s5pv210/setup-spi.c and
arch/arm/plat-samsung/s5p-irq-eint.c between commit 2fd48f94426d ("ARM:
mach-s5p: get rid of all <mach/gpio.h> headers") from the arm-soc tree
and commits 36278bb98dc7 ("ARM: S5PV210: Remove support for board
files") and 2722091e711f ("ARM: SAMSUNG: Remove remaining legacy code")
from the samsung tree.
I fixed it up (I just removed the files removed by the latter commits)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140717/c2201735/attachment.sig>
next reply other threads:[~2014-07-17 2:06 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 2:06 Stephen Rothwell [this message]
2014-07-17 2:06 ` linux-next: manual merge of the samsung tree with the arm-soc tree Stephen Rothwell
2014-07-17 2:06 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-07-21 1:13 Stephen Rothwell
2014-07-21 1:13 ` Stephen Rothwell
2014-07-21 1:13 ` Stephen Rothwell
2014-07-17 2:01 Stephen Rothwell
2014-07-17 2:01 ` Stephen Rothwell
2014-07-17 2:01 ` Stephen Rothwell
2014-07-17 1:54 Stephen Rothwell
2014-07-17 1:54 ` Stephen Rothwell
2014-07-17 1:54 ` Stephen Rothwell
2014-05-26 0:17 Stephen Rothwell
2014-05-26 0:17 ` Stephen Rothwell
2014-05-26 0:17 ` Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-03-23 23:30 Stephen Rothwell
2014-03-23 23:30 ` Stephen Rothwell
2014-03-23 23:30 ` Stephen Rothwell
2013-04-05 5:02 Stephen Rothwell
2013-04-05 5:02 ` Stephen Rothwell
2013-04-05 5:02 ` Stephen Rothwell
2013-04-05 6:49 ` Kukjin Kim
2013-04-05 6:49 ` Kukjin Kim
2013-02-13 7:39 Stephen Rothwell
2013-02-13 7:39 ` Stephen Rothwell
2013-02-13 7:39 ` Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-02-09 14:20 ` Grant Likely
2013-02-09 14:20 ` Grant Likely
2013-01-18 3:28 Stephen Rothwell
2013-01-18 3:28 ` Stephen Rothwell
2013-01-18 3:28 ` Stephen Rothwell
2013-01-18 3:24 Stephen Rothwell
2013-01-18 3:24 ` Stephen Rothwell
2013-01-18 3:24 ` Stephen Rothwell
2013-01-18 3:21 Stephen Rothwell
2013-01-18 3:21 ` Stephen Rothwell
2013-01-18 3:21 ` Stephen Rothwell
2013-01-11 4:32 Stephen Rothwell
2013-01-11 4:32 ` Stephen Rothwell
2013-01-11 4:32 ` Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 4:06 ` Kukjin Kim
2013-01-17 4:06 ` Kukjin Kim
2013-01-17 4:10 ` Kukjin Kim
2013-01-17 4:10 ` Kukjin Kim
2013-01-17 5:02 ` Kukjin Kim
2013-01-17 5:02 ` Kukjin Kim
2013-01-17 5:13 ` Kukjin Kim
2013-01-17 5:13 ` Kukjin Kim
2013-01-17 5:59 ` Stephen Rothwell
2013-01-17 5:59 ` Stephen Rothwell
2013-01-11 4:18 Stephen Rothwell
2012-11-26 11:19 Stephen Rothwell
2012-11-26 11:19 ` Stephen Rothwell
2012-11-26 11:19 ` Stephen Rothwell
2012-11-26 11:15 Stephen Rothwell
2012-11-26 11:15 ` Stephen Rothwell
2012-11-26 11:15 ` Stephen Rothwell
2012-09-24 10:52 Stephen Rothwell
2012-09-24 10:52 ` Stephen Rothwell
2012-09-24 10:52 ` 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=20140717120631.4bc75d13@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=kgene.kim@samsung.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=t.figa@samsung.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.