From: Paul Moore <paul.moore@hp.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Dave Jones <davej@redhat.com>,
Matthew Garrett <mjg@redhat.com>
Subject: Re: linux-next: manual merge of the lblnet tree with Linus' tree
Date: Tue, 10 Mar 2009 11:00:36 -0400 [thread overview]
Message-ID: <200903101100.36903.paul.moore@hp.com> (raw)
In-Reply-To: <20090310171334.bd6d51fb.sfr@canb.auug.org.au>
On Tuesday 10 March 2009 02:13:34 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
> 753b7aea8e4611433c13ac157f944d8b4bf42482 ("[CPUFREQ] Add p4-clockmod
> sysfs-ui removal to feature-removal schedule") from Linus' tree and
> commit 4c7098cc3b1ccf2930bfb866e108e6cd10f4b2f3 ("selinux: Remove the
> "compat_net" compatibility code") from the lblnet tree.
>
> Just overlapping additions/removal. I fixed it up (see below) and can
> carry the fix for a while.
Thanks Stephen, I just updated the lblnet tree so there should be no conflict
here come tomorrow.
--
paul moore
linux @ hp
next prev parent reply other threads:[~2009-03-10 15:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 6:13 linux-next: manual merge of the lblnet tree with Linus' tree Stephen Rothwell
2009-03-10 15:00 ` Paul Moore [this message]
2009-03-11 0:17 ` Stephen Rothwell
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=200903101100.36903.paul.moore@hp.com \
--to=paul.moore@hp.com \
--cc=davej@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=mjg@redhat.com \
--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).