From: Paul Moore <paul.moore@hp.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
Jean Delvare <khali@linux-fr.org>
Subject: Re: linux-next: manual merge of the lblnet tree
Date: Mon, 8 Dec 2008 14:38:04 -0500 [thread overview]
Message-ID: <200812081438.04489.paul.moore@hp.com> (raw)
In-Reply-To: <20081208184957.ae6f1726.sfr@canb.auug.org.au>
On Monday 08 December 2008 2:49:57 am Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the lblnet tree got a conflict in
> Documentation/feature-removal-schedule.txt between commit
> 839361440c4cf848dddc5705fa4ac7c25d00dddf ("hwmon: Deprecate the
> fscher and fscpos drivers") from the jdelvare-hwmon tree and commit
> d45075ffb96a78c0f7137cfcec9fe816a6d23cfb ("selinux: Deprecate and
> schedule the removal of the the compat_net functionality") from the
> lblnet tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry
> it as necessary.
Thanks. Other than pulling in the jdelvare-hwmon tree or moving the
entry somewhere else in the file (not solving anything, just
moving/delaying the problem) I'm not sure how to resolve the conflict.
If you don't mind carrying your fix-up patch until the merge window
opens that sounds like the best approach to me.
--
paul moore
linux @ hp
next prev parent reply other threads:[~2008-12-08 19:38 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 [this message]
2008-12-08 20:19 ` Jean Delvare
2008-12-09 0:23 ` Stephen Rothwell
-- 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=200812081438.04489.paul.moore@hp.com \
--to=paul.moore@hp.com \
--cc=hdegoede@redhat.com \
--cc=khali@linux-fr.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).