From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Jesse Barnes <jbarnes@virtuousgeek•org>,
linux-next@vger•kernel.org, Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: Re: linux-next: manual merge of the pci tree
Date: Tue, 1 Jul 2008 07:58:44 +0200 [thread overview]
Message-ID: <20080701055844.GB14658@elte.hu> (raw)
In-Reply-To: <20080701135347.6afb4a84.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in between
> commit d752aed810d8c038a9a65819f0ba7c7da7425178 ("x86: rename
> setup_32.c to setup.c") from the x86 tree and commit
> e3f2baebf4209b5927e23fa65d5977d31db936b3 ("PCI/x86: early dump pci
> conf space v2") from the pci tree.
>
> The former merges setup_64.c into setup.c while the latter adds some
> code to setup_arch in setup_64.c. I applied the patch below to
> setup.c. Probably worth checking that I did it right.
Jesse,
> +++ b/arch/x86/kernel/setup.c
> @@ -596,6 +596,13 @@ void __init setup_arch(char **cmdline_p)
>
> parse_early_param();
>
> +#ifdef CONFIG_X86_64
> +#ifdef CONFIG_PCI
> + if (pci_early_dump_regs)
> + early_dump_pci_devices();
> +#endif
> +#endif
hm, the commit looks a bit weird: why the ifdefs? There's nothing 64-bit
about being able to dump early resources, and the CONFIG_PCI could be
hidden as well.
Ingo
next prev parent reply other threads:[~2008-07-01 5:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 3:53 linux-next: manual merge of the pci tree Stephen Rothwell
2008-07-01 5:58 ` Ingo Molnar [this message]
2008-07-01 6:29 ` Stephen Rothwell
2008-07-02 1:56 ` Jesse Barnes
2008-07-02 2:09 ` Yinghai Lu
2008-07-02 3:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-02-19 22:40 Stephen Rothwell
2009-01-06 0:54 Stephen Rothwell
2008-12-11 0:53 Stephen Rothwell
2008-10-20 4:00 Stephen Rothwell
2008-10-20 18:36 ` Jesse Barnes
2008-10-16 3:24 Stephen Rothwell
2008-10-16 12:32 ` Jesse Barnes
2008-07-08 1:13 Stephen Rothwell
2008-07-03 2:10 Stephen Rothwell
2008-07-03 2:15 ` Stephen Rothwell
2008-07-03 3:28 ` Greg KH
2008-07-03 19:23 ` Jesse Barnes
2008-07-04 0:09 ` Stephen Rothwell
2008-07-04 0:13 ` Jesse Barnes
2008-07-04 0:14 ` Stephen Rothwell
2008-06-25 3:01 Stephen Rothwell
2008-06-25 19:28 ` Jesse Barnes
2008-06-25 2:57 Stephen Rothwell
2008-06-25 19:27 ` Jesse Barnes
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=20080701055844.GB14658@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=hpa@zytor$(echo .)com \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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