Hi all,
Changes since next-20080411:
No need for libata-fix-1 (a typo fixup)

New conflicts in XFS (caused by some XFS patches being merged upstream and

	also existing in the xfs tree - trivial).

Added a small Kconfig patch for powerpc to make allmodconfig build (I expect

	to be added to the powerpc next tree shortly).
----------------------------------------------------------------------------
I have created today's linux-next tree at

git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git

(tar balls at

http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).
You can see which trees have been included by looking in the Next/Trees

file in the source.  There are also quilt-import.log and merge.log files

in the Next directory.  Between each merge, the tree was built with

a ppc64_defconfig for powerpc and an allmodconfig for x86_64.
There were a few merge conflicts (fairly trivial) and couple of build

failures (notified).  Below is a summary of the state of the merge.
We are up to 55 trees, more are welcome (even if they are currently

empty).  Thanks to those who have contributed, and to those who haven't,

please do.
Status of my local build tests will be at

http://kisskb.ellerman.id.au/linux-next.  If maintainers want to give

advice about cross compilers/configs that work, we are always open to add

more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests

at http://l4x.org/k/ and the guys at http://test.kernel.org/.
--=20

Cheers,

Stephen Rothwell                    sfr@canb.auug.org.au
Merging origin/master

Merging x86-fixes/for-linus

Merging sched-fixes/for-linus

Merging powerpc-merge/merge

Merging scsi-rc-fixes/master

Merging quilt/driver-core

Merging quilt/pci

Merging quilt/usb

Merging x86/for-akpm

Merging sched/for-akpm

Merging quilt/device-mapper

Merging hid/mm

Merging quilt/i2c

Merging quilt/kernel-doc

Merging avr32/avr32-arch

Merging v4l-dvb/stable

Merging s390/features

Merging sh/master

Merging jf...
[ message continues ]

In mainline, x86-32-subarch es7000 builds cleanly.

.config attached.  (CONFIG_ACPI=n)
In linux-next, the same .config (with minimal -next changes) fails:
arch/x86/mach-es7000/built-in.o: In function `es7000_rename_gsi':

next-20080411/arch/x86/mach-es7000/es7000plat.c:64: undefined reference to `es7000_plat'

arch/x86/mach-es7000/built-in.o: In function `setup_unisys':

next-20080411/arch/x86/mach-es7000/es7000plat.c:89: undefined reference to `es7000_plat'

next-20080411/arch/x86/mach-es7000/es7000plat.c:91: undefined reference to `es7000_plat'

arch/x86/mach-es7000/built-in.o: In function `parse_unisys_oem':

next-20080411/arch/x86/mach-es7000/es7000plat.c:156: undefined reference to `es7000_plat'

next-20080411/arch/x86/mach-es7000/es7000plat.c:154: undefined reference to `es7000_plat'

arch/x86/mach-es7000/built-in.o:next-20080411/arch/x86/mach-es7000/es7000plat.c:156: more undefined references to `es7000_plat' follow

make[1]: *** [.tmp_vmlinux1] Error 1
---

~Randy

From: Natalie Protasevich <protasnb@gmail.com>
This is the patch to fix build problem with es7000.

Conflict while building without ACPI being set. Made es7000_plat to be

defined in both ACPI and non-ACPI cases.
Signed-off-by: Natalie Protasevich <protasnb@gmail.com>

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

---

mpparse.c |    4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff -Naur linux-next/arch/x86/kernel/mpparse.c

linux-next-mod/arch/x86/kernel/mpparse.c

--- linux-next/arch/x86/kernel/mpparse.c        2008-05-02

14:26:02.000000000 -0700

+++ linux-next-mod/arch/x86/kernel/mpparse.c    2008-05-02

14:34:00.000000000 -0700

@@ -790,6 +790,8 @@

        __find_smp_config(1);

 }
+int es7000_plat;

+

 /* --------------------------------------------------------------------------

                             ACPI-based MP Configuration

    --------------------------------------------------------------------------

*/

@@ -909,8 +911,6 @@

        MP_intsrc_info(&intsrc);

 }
-int es7000_plat;

-

 void __init mp_config_acpi_legacy_irqs(void)

 {

        struct mpc_config_intsrc intsrc;
Thanks,

--Natalie