From: Sam Ravnborg <sam@ravnborg.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Shaohua Li <shaohua.li@intel.com>,
Sebastian Siewior <bigeasy@linutronix.de>,
linux-next@vger.kernel.org, "Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: linux-next: pci/kbuild-current merge conflict
Date: Tue, 10 Jun 2008 21:06:17 +0200 [thread overview]
Message-ID: <20080610190617.GD15983@uranus.ravnborg.org> (raw)
In-Reply-To: <200806092253.54654.jbarnes@virtuousgeek.org>
On Mon, Jun 09, 2008 at 10:53:54PM -0700, Jesse Barnes wrote:
> On Monday, June 09, 2008 9:34 pm Stephen Rothwell wrote:
> > Hi Jesse,
> >
> > Today's linux-next merge of the pci tree got a trivial merge conflict in
> > include/asm-generic/vmlinux.lds.h between commit
> > f1cb2ba8ca4a8b4b76bbf0b795375af52442501b ("generic: add
> > OUTPUT_DATA_SECTION to vmlinux.lds.h") from the kbuild-current tree and
> > commit 638d515d37e4cfc9af9d8672f9668324b7b6600d ("Suspend/Resume bug in
> > PCI layer wrt quirks") from the pci tree.
> >
> > I did the obvious fixup.
> >
> > This can be fixed by you merging Linus' tree into the pci tree sometime
> > after he takes the kbuild patch. No real urgency, though.
> >
> > It is interesting that the pci patch is authored by Rafael, but has no
> > Signed-off-by from him.
>
> Ok, I'll try to fix that up tomorrow. I've been meaning to pull in Linus'
> latest bits for awhile anyway... Thanks for the heads up.
I have dropped the offending commit from kbuild.git for now.
So no need for you to do anything.
It was to benefit m68knommu only and I can apply it late in the
merge window.
Sam
prev parent reply other threads:[~2008-06-10 19:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080610143434.9cec3775.sfr@canb.auug.org.au>
2008-06-10 5:53 ` linux-next: pci/kbuild-current merge conflict Jesse Barnes
2008-06-10 19:06 ` Sam Ravnborg [this message]
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=20080610190617.GD15983@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=bigeasy@linutronix.de \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
--cc=shaohua.li@intel.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;
as well as URLs for NNTP newsgroup(s).