* Re: linux-next: pci/kbuild-current merge conflict
[not found] <20080610143434.9cec3775.sfr@canb.auug.org.au>
@ 2008-06-10 5:53 ` Jesse Barnes
2008-06-10 19:06 ` Sam Ravnborg
0 siblings, 1 reply; 2+ messages in thread
From: Jesse Barnes @ 2008-06-10 5:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Shaohua Li, Sebastian Siewior, linux-next, Rafael J. Wysocki,
Sam Ravnborg
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.
Jesse
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: pci/kbuild-current merge conflict
2008-06-10 5:53 ` linux-next: pci/kbuild-current merge conflict Jesse Barnes
@ 2008-06-10 19:06 ` Sam Ravnborg
0 siblings, 0 replies; 2+ messages in thread
From: Sam Ravnborg @ 2008-06-10 19:06 UTC (permalink / raw)
To: Jesse Barnes
Cc: Stephen Rothwell, Shaohua Li, Sebastian Siewior, linux-next,
Rafael J. Wysocki
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-10 19:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[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 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).