From: Jesse Barnes <jbarnes@virtuousgeek•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Shaohua Li <shaohua.li@intel•com>,
Sebastian Siewior <bigeasy@linutronix•de>,
linux-next@vger•kernel.org, "Rafael J. Wysocki" <rjw@sisk•pl>,
Sam Ravnborg <sam@ravnborg•org>
Subject: Re: linux-next: pci/kbuild-current merge conflict
Date: Mon, 9 Jun 2008 22:53:54 -0700 [thread overview]
Message-ID: <200806092253.54654.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20080610143434.9cec3775.sfr@canb.auug.org.au>
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
next parent reply other threads:[~2008-06-10 5:54 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 ` Jesse Barnes [this message]
2008-06-10 19:06 ` linux-next: pci/kbuild-current merge conflict Sam Ravnborg
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=200806092253.54654.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek$(echo .)org \
--cc=bigeasy@linutronix$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
--cc=sam@ravnborg$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shaohua.li@intel$(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