From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: manual merge of the tip tree with the block tree
Date: Mon, 21 Jun 2010 17:40:30 -0700 [thread overview]
Message-ID: <20100622004030.GN2354@linux.vnet.ibm.com> (raw)
In-Reply-To: <20100622100423.205ae0a4.sfr@canb.auug.org.au>
On Tue, Jun 22, 2010 at 10:04:23AM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> On Tue, 22 Jun 2010 09:40:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 21 Jun 2010 10:13:00 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> > >
> > > I took a look, and all of the changes from "fs: remove all rcu head
> > > initializations, except on_stack initializations" are reflected in -next.
> >
> > Thanks for checking.
>
> Is there some way that this commit can be merged via the block tree? Or
> does later work in your tree depend on it? There is considerable and
> ongoing work in the block tree on the same areas as your commit changes.
> Even today, this conflict is going to be much worse.
I have no problem with this patch being applied via the block tree, as
long as it doesn't take too many minor releases for it to hit mainline. ;-)
How would everyone like to proceed?
Thanx, Paul
next prev parent reply other threads:[~2010-06-22 0:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-21 6:16 linux-next: manual merge of the tip tree with the block tree Stephen Rothwell
2010-06-21 17:13 ` Paul E. McKenney
2010-06-21 23:40 ` Stephen Rothwell
2010-06-22 0:04 ` Stephen Rothwell
2010-06-22 0:40 ` Paul E. McKenney [this message]
2010-06-22 6:26 ` Jens Axboe
2010-06-22 17:14 ` Paul E. McKenney
[not found] <20100622143121.186fe9c4.sfr@canb.auug.org.au>
2010-06-22 21:06 ` Paul E. McKenney
2014-05-09 4:46 Stephen Rothwell
2017-07-03 3:56 Stephen Rothwell
2017-07-03 4:03 ` Stephen Rothwell
2017-11-01 6:10 Stephen Rothwell
2017-11-01 14:25 ` Jens Axboe
2017-11-01 14:37 ` Kees Cook
2019-02-13 2:41 Stephen Rothwell
2020-11-09 3:14 Stephen Rothwell
2020-11-09 13:45 ` Thomas Gleixner
2020-11-09 14:06 ` Jens Axboe
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=20100622004030.GN2354@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.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.