From: Samuel Ortiz <sameo@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Hannemann <arnd@arndnet.de>,
Paul Mundt <lethal@linux-sh.org>
Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree
Date: Mon, 13 Sep 2010 15:59:15 +0200 [thread overview]
Message-ID: <20100913135915.GI2555@sortiz-mobl> (raw)
In-Reply-To: <20100913115404.cfbe7182.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, Sep 13, 2010 at 11:54:04AM +1000, Stephen Rothwell wrote:
> Hi Samuel,
>
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-shmobile/board-ap4evb.c between commit
> 410d878bd05315a19894b8b4685107f2cd0712a5 ("ARM: mach-shmobile: ap4evb:
> fix write protect for SDHI1") from Linus' tree and commit
> c3cfb4003377a3397b27de0efe910c9abd838ac3 ("ARM: mach-shmobile: ap4evb:
> Fix hotplug for SDHI1") from the mfd tree.
The conflict should be merged by now. Thanks for the warning.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
next prev parent reply other threads:[~2010-09-13 13:59 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 1:54 linux-next: manual merge of the mfd tree with Linus' tree Stephen Rothwell
2010-09-13 13:59 ` Samuel Ortiz [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-16 2:15 Stephen Rothwell
2023-03-05 22:49 Stephen Rothwell
2019-06-11 4:31 Stephen Rothwell
2019-05-09 2:44 Stephen Rothwell
2019-02-08 2:37 Stephen Rothwell
2019-02-08 8:33 ` Jarkko Nikula
2018-08-17 0:39 Stephen Rothwell
2018-08-21 8:08 ` Geert Uytterhoeven
2018-08-21 8:30 ` Stephen Rothwell
2018-08-28 13:34 ` Geert Uytterhoeven
2018-08-28 21:45 ` Stephen Rothwell
2018-03-08 1:33 Stephen Rothwell
2018-03-08 8:12 ` Lee Jones
2014-11-13 1:47 Stephen Rothwell
2012-11-28 3:20 Stephen Rothwell
2012-10-03 4:12 Stephen Rothwell
2012-09-18 3:19 Stephen Rothwell
2012-09-18 7:31 ` Dong Aisheng
2012-09-12 2:49 Stephen Rothwell
2012-07-25 1:18 Stephen Rothwell
2012-07-25 6:40 ` Laxman Dewangan
2012-05-23 3:01 Stephen Rothwell
2012-05-22 4:14 Stephen Rothwell
2012-05-22 4:10 Stephen Rothwell
2012-03-23 3:32 Stephen Rothwell
2012-03-23 9:41 ` Samuel Ortiz
2012-03-24 17:31 ` Grant Likely
2012-03-26 8:25 ` Samuel Ortiz
2012-03-28 22:47 ` Grant Likely
2012-01-12 1:06 Stephen Rothwell
2011-09-09 4:22 Stephen Rothwell
2011-03-21 1:26 Stephen Rothwell
2011-03-21 8:21 ` Linus Walleij
2011-03-22 11:16 ` Samuel Ortiz
2011-03-23 17:57 ` Linus Walleij
2011-03-22 11:08 ` Samuel Ortiz
2010-08-12 4:41 Stephen Rothwell
2010-08-12 9:51 ` Samuel Ortiz
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=20100913135915.GI2555@sortiz-mobl \
--to=sameo@linux.intel.com \
--cc=arnd@arndnet.de \
--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;
as well as URLs for NNTP newsgroup(s).