From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Haojian Zhuang <hzhuang1@marvell.com>
Cc: Yong Zhang <yong.zhang0@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the akpm tree with the arm-soc tree
Date: Wed, 29 Feb 2012 18:11:03 +1100 [thread overview]
Message-ID: <20120229181103.e05c55bafd959f739d6a336b@canb.auug.org.au> (raw)
In-Reply-To: <25B60CDC2F704E4E9D88FFD52780CB4C060A87D777@SC-VEXCH1.marvell.com>
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
Hi,
On Tue, 28 Feb 2012 22:54:06 -0800 Haojian Zhuang <hzhuang1@marvell.com> wrote:
>
> Since there's the conflict on code. Does it mean that I need to re-submit
> those patches in arm-soc that should be based on commit "drivers/rtc:
> remove IRQF_DISABLED" from the akpm tree?
No, that conflict can be resolved by Linus during the next merge window
(unless someone else wants to do something about it).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-02-29 7:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 6:21 linux-next: manual merge of the akpm tree with the arm-soc tree Stephen Rothwell
2012-02-29 6:32 ` Yong Zhang
2012-02-29 6:54 ` Haojian Zhuang
2012-02-29 7:11 ` Stephen Rothwell [this message]
2012-05-14 9:24 Stephen Rothwell
2012-05-14 21:57 ` Turquette, Mike
2012-05-17 7:18 Stephen Rothwell
2013-03-12 3:47 Stephen Rothwell
2013-03-12 6:25 ` Andrew Lunn
2013-03-12 11:12 ` Jason Cooper
2013-03-12 11:37 ` Olof Johansson
2013-03-12 11:53 ` Jason Cooper
2013-03-12 12:48 ` Arnd Bergmann
2013-03-12 13:32 ` Jason Cooper
2013-03-12 20:20 ` Andrew Morton
2013-06-21 7:33 Stephen Rothwell
2013-06-21 7:36 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=20120229181103.e05c55bafd959f739d6a336b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=hzhuang1@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=yong.zhang0@gmail.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 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).