All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
	Christoph Lameter <cl@linux-foundation.org>,
	Ingo Molnar <mingo@elte.hu>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Kosina <jkosina@suse.cz>
Subject: Re: linux-next: manual merge of the percpu tree with Linus' tree
Date: Fri, 30 Oct 2009 11:02:25 +0100	[thread overview]
Message-ID: <4AEAB9B1.4000304@kernel.org> (raw)
In-Reply-To: <20091030192050.06a0f706.sfr@canb.auug.org.au>

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
> between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
> pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
> 0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
> warnings") from the percpu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

I'll pull master into for-next in a few days so that we can do sparse
cleanup pass over the whole tree on the latest tree.

Thanks.

-- 
tejun

  reply	other threads:[~2009-10-30 10:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-30  8:20 linux-next: manual merge of the percpu tree with Linus' tree Stephen Rothwell
2009-10-30 10:02 ` Tejun Heo [this message]
2009-10-31  4:23   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2009-09-07  8:22 Stephen Rothwell
2009-09-07  8:36 ` Tejun Heo
2009-09-07 10:24   ` Stephen Rothwell
2009-07-01  7:25 Stephen Rothwell
2009-07-01  7:19 Stephen Rothwell
2009-06-29  5:33 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=4AEAB9B1.4000304@kernel.org \
    --to=tj@kernel.org \
    --cc=cl@linux-foundation.org \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=rusty@rustcorp.com.au \
    --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 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.