From: Larry McVoy <lm@bitmover.com>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Ben Collins <bcollins@debian.org>,
Christoph Hellwig <hch@infradead.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: Linux v2.5.52
Date: Mon, 16 Dec 2002 12:39:32 -0800 [thread overview]
Message-ID: <20021216123932.B6887@work.bitmover.com> (raw)
In-Reply-To: <Pine.LNX.4.44.0212160920380.2799-100000@home.transmeta.com>; from torvalds@transmeta.com on Mon, Dec 16, 2002 at 09:26:58AM -0800
> Alternatively, never EVER make a patch against the "current kernel
> version". Only make a patch against the _last_ kernel that you merged
> with, and if I cannot apply it I will tell you so. Making a patch just
> between your tree and mine will _always_ end up losing fixes.
I think this is a good approach. If people sent Linus patches with some
indication of the baseline of the patch, such as BASELINE=v2.5.49 in the
header of the patch, I'd be willing to go make bk import -temail do
the right thing, which would probably be to try and patch it in in the
working tree, but if that didn't work, it would do
bk clone -l -r$BASELINE tree tree.$BASELINE
cd tree.$BASLINE
bk import -temail ....
cd ../tree
bk pull ../tree.$BASELINE && rm -rf ../tree.$BASELINE
and you'd get BK to merge most of the work.
--
---
Larry McVoy lm at bitmover.com http://www.bitmover.com/lm
next prev parent reply other threads:[~2002-12-16 20:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-12-16 3:34 Linux v2.5.52 Linus Torvalds
2002-12-16 10:26 ` Christoph Hellwig
2002-12-16 12:05 ` James H. Cloos Jr.
2002-12-16 15:16 ` Ben Collins
2002-12-16 16:36 ` Christoph Hellwig
2002-12-16 16:40 ` Ben Collins
2002-12-16 17:26 ` Linus Torvalds
2002-12-16 17:36 ` Ben Collins
2002-12-16 20:39 ` Larry McVoy [this message]
2002-12-16 20:54 ` Linus Torvalds
2002-12-16 13:53 ` Gerd Knorr
-- strict thread matches above, loose matches on Subject: below --
2002-12-16 9:45 ALESSANDRO.SUARDI
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=20021216123932.B6887@work.bitmover.com \
--to=lm@bitmover.com \
--cc=bcollins@debian.org \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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