From: Chris Metcalf <cmetcalf@tilera.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: Re: linux-next: manual merge of the tile tree with Linus' tree
Date: Tue, 13 Mar 2012 20:56:21 -0400 [thread overview]
Message-ID: <4F5FECB5.3090806@tilera.com> (raw)
In-Reply-To: <20120314111057.499d4901f51264c2012fd2b1@canb.auug.org.au>
On 3/13/2012 8:10 PM, Stephen Rothwell wrote:
> Hi Chris,
>
> Today's linux-next merge of the tile tree got a conflict in arch/Kconfig
> between commit 43570fd2f47b ("mm,slub,x86: decouple size of struct page
> from CONFIG_CMPXCHG_LOCAL") (and a couple after) from Linus' tree and
> commit ca3a3d347e23 ("ipc: provide generic compat versions of IPC
> syscalls") from the tile tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks! I'll sync up that tree over the next couple of days as I start
pushing out some more changes to get ready for 3.4 merge window.
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
next prev parent reply other threads:[~2012-03-14 0:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-14 0:10 linux-next: manual merge of the tile tree with Linus' tree Stephen Rothwell
2012-03-14 0:56 ` Chris Metcalf [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-04-10 0:38 Stephen Rothwell
2012-04-10 0:34 Stephen Rothwell
2012-04-02 0:46 Stephen Rothwell
2012-04-02 0:37 Stephen Rothwell
2011-03-17 23: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=4F5FECB5.3090806@tilera.com \
--to=cmetcalf@tilera.com \
--cc=heiko.carstens@de.ibm.com \
--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