From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Jens Axboe <jens.axboe@oracle.com>,
linux-next@vger.kernel.org, James Smart <James.Smart@Emulex.Com>,
FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Subject: Re: linux-next: block tree build failure
Date: Thu, 14 May 2009 23:24:06 -0400 [thread overview]
Message-ID: <1242357846.4060.2.camel@mulgrave> (raw)
In-Reply-To: <4A0CD7D3.3000302@kernel.org>
On Fri, 2009-05-15 at 11:47 +0900, Tejun Heo wrote:
> Hello, James.
>
> James Bottomley wrote:
> > No ... postmerge trees are held by maintainers for irreconcilable tree
> > conflicts. You run your standard tree, which can fire at any time in
> > the merge window and your postmerge one which pulls in the entangled
> > tree and adds your patches on top. This can only go after the
> > conflicting subsystem has also been pulled into linus head.
> >
> >> Out of curiousity, is there any reason not to use more standard git
> >> workflow?
> >
> > This is a standard workflow ...
>
> Ah... poor wording from me. I meant the one based on merging and
> monotonic commit accumulation without rebasing.
But that's not really possible here ... the only way to combine the two
incompatible trees now while maintaining bisectability is to hide a non
trivial patch in the merge point ... that's the worst practice of all.
James
next prev parent reply other threads:[~2009-05-15 3:24 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-13 4:04 linux-next: block tree build failure Stephen Rothwell
2009-05-13 9:21 ` Tejun Heo
2009-05-13 12:07 ` James Bottomley
2009-05-15 0:45 ` Tejun Heo
2009-05-15 2:35 ` James Bottomley
2009-05-15 2:47 ` Tejun Heo
2009-05-15 3:24 ` James Bottomley [this message]
2009-05-15 3:38 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2009-12-07 8:44 Stephen Rothwell
2009-12-07 8:49 ` Jens Axboe
2009-12-07 9:23 ` Stephen Rothwell
2009-12-07 9:28 ` Jens Axboe
2009-12-04 3:36 Stephen Rothwell
2009-12-04 7:43 ` Jens Axboe
2009-12-04 13:54 ` Jens Axboe
2009-12-04 22:49 ` Stephen Rothwell
2009-12-05 9:20 ` Jens Axboe
2009-10-27 3:34 Stephen Rothwell
2009-10-27 5:31 ` Jens Axboe
2009-10-27 5:50 ` Stephen Rothwell
2009-10-07 2:55 Stephen Rothwell
2009-10-07 2:55 ` Stephen Rothwell
[not found] ` <20091007135505.df1f058c.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-10-07 6:33 ` Jens Axboe
2009-10-07 6:33 ` Jens Axboe
2009-09-23 4:51 Stephen Rothwell
2009-09-23 4:51 ` Stephen Rothwell
2009-09-23 7:11 ` Lars Ellenberg
2009-09-23 7:32 ` Stephen Rothwell
[not found] ` <20090923071152.GA8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
2009-09-23 11:12 ` Lars Ellenberg
2009-09-23 11:12 ` Lars Ellenberg
[not found] ` <20090923111225.GC8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
2009-09-23 11:56 ` Stephen Rothwell
2009-09-23 11:56 ` Stephen Rothwell
2009-09-14 4:27 Stephen Rothwell
2009-09-14 6:25 ` Jens Axboe
2009-09-11 4:32 Stephen Rothwell
2009-09-11 5:30 ` Jens Axboe
2009-09-01 4:59 Stephen Rothwell
2009-09-01 5:30 ` Stephen Rothwell
2009-09-01 5:38 ` Jens Axboe
2009-09-01 8:13 ` Jens Axboe
2009-09-01 8:38 ` Stephen Rothwell
2009-07-07 3:49 Stephen Rothwell
2009-07-07 6:38 ` Jens Axboe
2009-07-07 6:45 ` Stephen Rothwell
2009-07-07 13:57 ` Christoph Hellwig
2009-07-07 14:31 ` Jens Axboe
2009-07-08 3:17 ` Stephen Rothwell
2009-07-08 6:55 ` Jens Axboe
2009-07-07 13:55 ` Christoph Hellwig
2009-07-08 0:41 ` Stephen Rothwell
2009-06-26 2:53 Stephen Rothwell
2009-06-26 4:34 ` NeilBrown
2009-06-26 4:39 ` Jens Axboe
2009-06-26 5:49 ` Neil Brown
2009-06-26 9:00 ` Jens Axboe
2009-05-25 4:35 Stephen Rothwell
2009-05-25 5:38 ` Martin K. Petersen
2009-05-25 5:54 ` Stephen Rothwell
2009-04-09 3:37 Stephen Rothwell
2009-04-14 2:35 ` Stephen Rothwell
2009-04-14 6:21 ` Jens Axboe
2009-04-14 6:26 ` Stephen Rothwell
2009-04-14 6:32 ` Jens Axboe
2008-11-26 10:29 Stephen Rothwell
2008-11-26 10:42 ` Ingo Molnar
2008-11-26 10:47 ` Jens Axboe
2008-11-26 11:16 ` Ingo Molnar
2008-11-26 11:20 ` Jens Axboe
2008-11-26 11:28 ` Ingo Molnar
2008-11-26 11:23 ` Mathieu Desnoyers
2008-11-26 11:25 ` Ingo Molnar
[not found] <20081110145442.d60e57b7.sfr@canb.auug.org.au>
2008-11-10 4:13 ` malahal
2008-11-10 4:46 ` malahal
2008-11-10 12:12 ` Jens Axboe
2008-09-18 3:04 Stephen Rothwell
2008-09-18 4:31 ` Jens Axboe
2008-09-15 5:18 Stephen Rothwell
2008-09-15 5:38 ` Alex Dubov
2008-09-15 13:18 ` Jens Axboe
2008-09-03 6:15 Stephen Rothwell
2008-09-03 6:34 ` Jens Axboe
2008-09-03 7:04 ` Andrew Morton
2008-09-03 7:07 ` Jens Axboe
2008-09-03 8:50 ` Stephen Rothwell
2008-09-03 16:05 ` Andrew Morton
2008-09-03 16:27 ` Tejun Heo
2008-09-03 16:32 ` Andrew Morton
2008-09-03 17:29 ` Tejun Heo
2008-09-04 4:06 ` Andrew Morton
2008-08-29 5:07 Stephen Rothwell
2008-08-29 9:00 ` Jens Axboe
[not found] <20080627165326.9222c841.sfr@canb.auug.org.au>
2008-06-27 7:00 ` Jens Axboe
2008-06-27 7:14 ` 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=1242357846.4060.2.camel@mulgrave \
--to=james.bottomley@hansenpartnership.com \
--cc=James.Smart@Emulex.Com \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=jens.axboe@oracle.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
/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.