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,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
"Samuel Ortiz" <sameo@linux.intel.com>,
"Linus Walleij" <linus.walleij@linaro.org>
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Tue, 1 May 2012 15:34:41 +1000 [thread overview]
Message-ID: <20120501153441.5e101139fb096ef262ff1d2b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 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,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
"Samuel Ortiz" <sameo@linux.intel.com>,
"Linus Walleij" <linus.walleij@linaro.org>
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Tue, 1 May 2012 15:34:41 +1000 [thread overview]
Message-ID: <20120501153441.5e101139fb096ef262ff1d2b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 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 arm-soc tree with the mfd tree
Date: Tue, 1 May 2012 15:34:41 +1000 [thread overview]
Message-ID: <20120501153441.5e101139fb096ef262ff1d2b@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120501/7717e97c/attachment.sig>
next reply other threads:[~2012-05-01 5:34 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-01 5:34 Stephen Rothwell [this message]
2012-05-01 5:34 ` linux-next: manual merge of the arm-soc tree with the mfd tree Stephen Rothwell
2012-05-01 5:34 ` Stephen Rothwell
2012-05-01 22:56 ` Linus Walleij
2012-05-01 22:56 ` Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2013-06-28 6:01 Stephen Rothwell
2013-06-28 6:01 ` Stephen Rothwell
2013-06-28 6:01 ` Stephen Rothwell
2013-06-21 5:54 Stephen Rothwell
2013-06-21 5:54 ` Stephen Rothwell
2013-06-21 5:54 ` Stephen Rothwell
2013-06-21 5:59 ` Gupta, Pekon
2013-06-21 5:59 ` Gupta, Pekon
2013-06-21 5:59 ` Gupta, Pekon
2013-02-11 6:06 Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 19:08 ` Olof Johansson
2013-02-11 19:08 ` Olof Johansson
2013-02-12 14:46 ` Roger Quadros
2013-02-12 14:46 ` Roger Quadros
2013-02-12 14:46 ` Roger Quadros
2013-02-12 14:53 ` Samuel Ortiz
2013-02-12 14:53 ` Samuel Ortiz
2013-02-04 6:04 Stephen Rothwell
2013-02-04 6:04 ` Stephen Rothwell
2013-02-04 6:04 ` Stephen Rothwell
2012-04-17 3:34 Stephen Rothwell
2012-04-17 3:34 ` Stephen Rothwell
2012-04-17 3:34 ` 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=20120501153441.5e101139fb096ef262ff1d2b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--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=sameo@linux.intel.com \
--cc=u.kleine-koenig@pengutronix.de \
/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.