public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Matt Mackall <mpm@selenic.com>
To: Pavel Machek <pavel@ucw.cz>
Cc: "Marcos D. Marado Torres" <marado@student.dei.uc.pt>,
	Greg KH <greg@kroah.com>,
	linux-kernel@vger.kernel.org, chrisw@osdl.org, torvalds@osdl.org,
	akpm@osdl.org
Subject: Re: Linux 2.6.11.2
Date: Wed, 9 Mar 2005 15:57:16 -0800	[thread overview]
Message-ID: <20050309235716.GZ3163@waste.org> (raw)
In-Reply-To: <20050309111102.GA30119@elf.ucw.cz>

On Wed, Mar 09, 2005 at 12:11:02PM +0100, Pavel Machek wrote:
> On St 09-03-05 09:52:46, Marcos D. Marado Torres wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> > 
> > On Wed, 9 Mar 2005, Greg KH wrote:
> > 
> > >which is a patch against the 2.6.11.1 release.  If consensus arrives
> > >that this patch should be against the 2.6.11 tree, it will be done that
> > >way in the future.
> > 
> > IMHO it sould be against 2.6.11 and not 2.6.11.1, like -rc's that are'nt 
> > againt
> > the last -rc but against 2.6.x.
> 
> You expect people to go through all 2.6.11.1, 2.6.11.2, ... . That
> means .11.2 should be relative to .11.1, because otherwise people will
> have to revert (ugly). And you want people to track -stable kernels as
> fast as possible.

There are three ways we can do this:

a) all 2.6.x.y are diffs against 2.6.x
b) interdiffs for .1, .2, etc. with 2.6.x+1 diffed against 2.6.x
c) interdiffs and 2.6.12 is a diff against 2.6.11.last

Imagine we want to go from 2.6.11.3 to 2.6.12

case a)
revert patch 2.6.11.3
get and apply 2.6.12

case b)
revert patch 2.6.11.3
revert patch 2.6.11.2
revert patch 2.6.11.1
get and apply 2.6.12

case c)
poke around on kernel.org and figure out that the last kernel in .11 is .11.5
get and apply 2.6.11.4
get and apply 2.6.11.5
get and apply 2.6.12

Note this gets increasingly more painful in cases b and c when there
are a large number of post-releases. And case c) is really stupid when
you want to go from 2.6.12 to 2.6.11.

Also note that -pre, -rc, -bk, -mm, -ac, and every other branch off a
release has worked the a) way.

-- 
Mathematics is the supreme nostalgia of our time.

  reply	other threads:[~2005-03-10  0:02 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-03-09  8:39 Linux 2.6.11.2 Greg KH
2005-03-09  8:39 ` Greg KH
2005-03-17 15:18   ` Gene Heskett
2005-03-09  9:52 ` Marcos D. Marado Torres
2005-03-09 10:04   ` Geert Uytterhoeven
2005-03-09 10:17     ` Marcos D. Marado Torres
2005-03-09 10:41       ` Geert Uytterhoeven
2005-03-09 11:23         ` Jesper Juhl
2005-03-09 21:26       ` Wakko Warner
2005-03-09 10:21     ` Dominik Karall
2005-03-09 10:28       ` Marcos D. Marado Torres
2005-03-09 10:51         ` Adrian Bunk
2005-03-09 15:35         ` Greg KH
2005-03-09 11:11   ` Pavel Machek
2005-03-09 23:57     ` Matt Mackall [this message]
2005-03-10  5:16       ` Willy Tarreau
2005-03-11 18:45       ` Bill Davidsen
2005-03-11 19:08         ` Matt Mackall
2005-03-11 19:19           ` Chris Wright
2005-03-11 22:01             ` Greg KH
2005-03-14 17:10               ` Bill Davidsen
2005-03-14 17:32                 ` Greg KH
2005-03-15 20:38           ` Bill Davidsen
2005-03-16  8:56             ` David Greaves
2005-03-09 12:38 ` Andy Whitcroft
2005-03-09 14:03 ` Marcelo Tosatti
2005-03-09 18:38   ` Greg KH
2005-03-09 20:32 ` Bill Davidsen
2005-03-09 21:06 ` Matt Mackall
2005-03-09 21:21   ` Randy.Dunlap
2005-03-09 23:11   ` Greg KH
2005-03-09 23:38     ` Matt Mackall
2005-03-10 12:54     ` Gene Heskett
2005-03-11 19:23       ` Bill Davidsen
2005-03-11 23:33         ` Gene Heskett
2005-03-11 14:53 ` Krzysztof Halasa
2005-03-11 17:38   ` Chris Wright
2005-03-11 19:28     ` Bill Davidsen
2005-03-11 21:07     ` Krzysztof Halasa
2005-03-11 21:11       ` Chris Wright
     [not found] <fa.dan38um.1m4gojq@ifi.uio.no>
     [not found] ` <fa.animhpl.r201hh@ifi.uio.no>
2005-03-10  1:46   ` Bodo Eggert
2005-03-10  3:08     ` Matt Mackall

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=20050309235716.GZ3163@waste.org \
    --to=mpm@selenic.com \
    --cc=akpm@osdl.org \
    --cc=chrisw@osdl.org \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marado@student.dei.uc.pt \
    --cc=pavel@ucw.cz \
    --cc=torvalds@osdl.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