Bjorn Helgaas <[email protected]> wrote:
>
> On Thursday 23 March 2006 13:41, Andi Kleen wrote:
> > On Thursday 23 March 2006 21:37, Bjorn Helgaas wrote:
> > > dmi_scan.c is arch-independent and is used by i386, x86_64, and ia64.
> > > Currently all three arches compile it from arch/i386, which means that
> > > ia64 and x86_64 depend on things in arch/i386 that they wouldn't
> > > otherwise care about.
> > >
> > > This is simply "mv arch/i386/kernel/dmi_scan.c drivers/firmware/"
> > > (removing trailing whitespace) and the associated Makefile changes.
> > > All three architectures already set CONFIG_DMI in their top-level
> > > Kconfig files.
> > >
> > > Built and booted on ia64 and i386.
> >
> > This conflicts with at least three patches in my upcomming x86-64 patchkit.
akpm:/usr/src/25> grep -l arch/i386/kernel/dmi_scan.c patches/*.patch
patches/dmi-only-ioremap-stuff-we-actually-need.patch
patches/efi-fixes.patch
patches/efi-keep-physical-table-addresses-in-efi-structure.patch
patches/ia64-use-i386-dmi_scanc.patch
patches/x86_64-mm-dmi-early.patch
patches/x86_64-mm-dmi-year.patch
> > Since it doesn't fix anything I would request that such cleanup patches be
> > delayed.
>
> Sure, that's fine with me. Do you want to let me know when your
> patches are in? Or maybe it would be easier for you to incorporate
> my patch into your patchkit. I just don't know how to tell when
> the cleanup window is open.
>
I'm reluctant to attempt to merge the efi patches until ia64, acpi and
x86_64 have merged. Only ia64 has merged at this time. acpi might need to
be bypassed, dunno.
I'd expect things to be settled down in a couple of weeks. Patches which
move files around are hard.
On Thursday 23 March 2006 16:51, Andrew Morton wrote:
> I'd expect things to be settled down in a couple of weeks. Patches which
> move files around are hard.
OK, I'll watch for those merges and try again afterwards.