From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jean Delvare <khali@linux-fr•org>
Cc: Paul Moore <paul.moore@hp•com>,
linux-next@vger•kernel.org, Hans de Goede <hdegoede@redhat•com>
Subject: Re: linux-next: manual merge of the lblnet tree
Date: Tue, 9 Dec 2008 11:23:01 +1100 [thread overview]
Message-ID: <20081209112301.cd9d5396.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081208211941.6d2c2261@hyperion.delvare>
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
Hi Jean,
On Mon, 8 Dec 2008 21:19:41 +0100 Jean Delvare <khali@linux-fr•org> wrote:
>
> All in all I don't think it really matters.
> Documentation/feature-removal-schedule.txt will always have conflicts
> by design, but it's only a text file and if it isn't totally up-to-date
> in linux-next, I doubt anybody cares. So I would vote for permanently
> ignoring conflicts to this file.
I still have to do something with the conflicts and fixing them (like
this one) is trivial and "git rerere" remembers them, so carrying them is
also trivial. And, as you imply, it really doesn't matter if I get one
wrong. :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-12-09 0:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-08 7:49 linux-next: manual merge of the lblnet tree Stephen Rothwell
2008-12-08 19:38 ` Paul Moore
2008-12-08 20:19 ` Jean Delvare
2008-12-09 0:23 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-08 8:07 Stephen Rothwell
2008-12-08 10:46 ` David Howells
2008-12-08 16:09 ` Casey Schaufler
2008-12-08 19:41 ` Paul Moore
2008-12-08 21:16 ` James Morris
2008-12-08 22:58 ` Paul Moore
2008-12-09 4:15 ` Casey Schaufler
2008-12-10 17:05 ` Casey Schaufler
2008-12-10 17:34 ` Paul Moore
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=20081209112301.cd9d5396.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hdegoede@redhat$(echo .)com \
--cc=khali@linux-fr$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.moore@hp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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