public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: David Woodhouse <dwmw2@infradead.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jaxboe@fusionio.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] block/IO bits for 2.6.36-rc1
Date: Mon, 16 Aug 2010 21:48:30 +0100	[thread overview]
Message-ID: <1281991710.30341.9.camel@localhost> (raw)
In-Reply-To: <AANLkTincMAv0OLYHSqHNwrhfKBC-yQHhgWdqKYHoJNOf@mail.gmail.com>

On Sat, 2010-08-07 at 14:15 -0700, Linus Torvalds wrote:
> 
>  It might well make sense to base linux-next itself on the
> latest tagged release rather than on some random daily thing (and if
> the things that get merged _into_ linux-next then are based on a
> random daily thing and bring linux-next forward, then that's a problem
> with the trees getting merged - they shouldn't be doing that either).

Hm? I do that whenever you pull from me -- I'll pull the merge commit
into my own tree. So the mtd-2.6.git tree you pulled last night, for
example, was based on some "random daily thing" half-way between 2.6.35
and 2.6.26-rc1, which happened to be entitled 'Merge git://...mtd-2.6'.

I try to avoid having to *merge* such a thing, but it certainly does end
up in linux-next as the *base* for maintainers' tree. It's difficult to
see how that could be avoided.

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation


  parent reply	other threads:[~2010-08-16 20:49 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-06 10:38 [GIT PULL] block/IO bits for 2.6.36-rc1 Jens Axboe
2010-08-06 10:42 ` Jens Axboe
2010-08-06 15:44 ` Linus Torvalds
2010-08-06 15:51   ` Linus Torvalds
2010-08-07  7:34     ` Jens Axboe
2010-08-07 21:15       ` Linus Torvalds
2010-08-08 11:00         ` Jens Axboe
2010-08-16 20:48         ` David Woodhouse [this message]
2010-08-07  7:31   ` Jens Axboe
2010-08-07 21:00     ` Linus Torvalds
2010-08-08 10:54       ` 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=1281991710.30341.9.camel@localhost \
    --to=dwmw2@infradead.org \
    --cc=jaxboe@fusionio.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox