From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Jiri Kosina <jkosina@suse.cz>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"André Goddard Rosa" <andre.goddard@gmail.com>,
"Yinghai Lu" <yinghai@kernel.org>
Subject: Re: linux-next: manual merge of the trivial tree with the pci tree
Date: Tue, 24 Nov 2009 13:51:50 -0800 [thread overview]
Message-ID: <20091124135150.0ccfd366@jbarnes-piketon> (raw)
In-Reply-To: <alpine.LSU.2.00.0911172318340.15039@wotan.suse.de>
On Tue, 17 Nov 2009 23:19:53 +0100 (CET)
Jiri Kosina <jkosina@suse.cz> wrote:
> On Tue, 17 Nov 2009, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the trivial tree got a conflict in
> > arch/x86/pci/amd_bus.c between commit
> > 99935a7a59eaca0292c1a5880e10bae03f4a5e3d ("x86/PCI: read root
> > resources from IOH on Intel") from the pci tree and commit
> > 17530b1c635dfd1f258afc6b07b986b425d66ebd ("tree-wide: fix assorted
> > typos all over the place") from the trivial tree.
> >
> > The comment fixed up by the trivial tree patch has moved to
> > arch/x86/pci/bus_numa.h and I haven't bothered to fix it there.
>
> Thanks for letting me know.
>
> I have dropped the hunk from my queue. Jesse, could you please merge
> this patch to your tree instead?
>
>
>
>
> From: André Goddard Rosa <andre.goddard@gmail.com>
> Subject: pci: fix comment typo
>
> Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
>
> diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
> index 572ee97..575f6fe 100644
> --- a/arch/x86/pci/amd_bus.c
> +++ b/arch/x86/pci/amd_bus.c
> @@ -19,7 +19,7 @@
> /*
> * sub bus (transparent) will use entres from 3 to store extra from
> root,
> - * so need to make sure have enought slot there, increase
> PCI_BUS_NUM_RESOURCES?
> + * so need to make sure have enough slot there, increase
> PCI_BUS_NUM_RESOURCES? */
> #define RES_NUM 16
Fixed this up. The comment is in bus_numa.h now.
--
Jesse Barnes, Intel Open Source Technology Center
prev parent reply other threads:[~2009-11-24 21:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-17 4:54 linux-next: manual merge of the trivial tree with the pci tree Stephen Rothwell
2009-11-17 22:19 ` Jiri Kosina
2009-11-24 21:51 ` Jesse Barnes [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=20091124135150.0ccfd366@jbarnes-piketon \
--to=jbarnes@virtuousgeek.org \
--cc=andre.goddard@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yinghai@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.