linux-next: Tree for July 31

Hi all,

Changes since next-20080730:

New tree: agp

Temporarily dropped trees: acpi (it is being moved to a new tree and is just accumulating conflicts against Linus' tree).
v4l-dvb (got lots of conflicts against the version that was
merged to Linus).

The driver-core.current tree lost its conflict against Linus' tree.

The driver-core tree gained a patch for a boot problem.

The x86 tree gained a conflict against Linus' tree.

The m68k tree gained a trivial conflict against Linus' tree.

I have also applied the following patch for a known problem:

hfcmulti is not supported on big endian

The sparc(32) defconfig build still fails - this is probably a toolchain problem. I have fixed this by reverting the these commits from Linus' tree:

	UFS: add const to parser token table (f9247273cb69ba101877e946d2d83044409cc8c5)
	fix fs/nfs/nfsroot.c compilation (fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43)

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below).

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. After the final fixups, it is also built with powerpc allnoconfig, 44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 105 trees (counting Linus' and 14 trees of patches pending for Linus' tree), 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/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.

Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Applying move iommu_num_pages helper to x86
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging quilt/driver-core
Applying driver-core: kobject verification fixup
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/genapic_64.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
Merging ocfs2/linux-next
Merging quilt/m68k
CONFLICT (content): Merge conflict in init/main.c
Merging powerpc/next
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging sparc/master
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging arm/devel
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
Merging bkl-removal/bkl-removal
Merging trivial/next
CONFLICT (content): Merge conflict in Documentation/edac.txt
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging m68knommu/for-next
Merging uclinux/for-next
Merging md/for-next
Merging cris/for-next
Merging kmemcheck/auto-kmemcheck-next
Merging generic-ipi/auto-generic-ipi-next
Merging mips/mips-for-linux-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (add/add): Merge conflict in drivers/gpu/Makefile
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i830/Makefile
CONFLICT (content): Merge conflict in include/Kbuild
CONFLICT (add/add): Merge conflict in include/drm/Kbuild
Merging voltage/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Applying hfcmulti is not supported on big endian
Created commit 2982340: Revert "fix fs/nfs/nfsroot.c compilation"
Created commit 283af7d: Revert "UFS: add const to parser token table"

xp_uv.c:(.text+0x4186b): undefined reference to gru_copy_gpa' xpc_uv.c:(.text+0x44616): undefined reference to gru_create_message_queue' xpc_uv.c:(.text+0x44e16): undefined reference to gru_free_message' xpc_uv.c:(.text+0x44e22): undefined reference to gru_get_next_message' xpc_uv.c:(.text+0x44e67): undefined reference to gru_send_message_gpa' xpc_uv.c:(.text+0x45a79): undefined reference to gru_free_message' xpc_uv.c:(.text+0x45a85): undefined reference to `gru_get_next_message' make[1]: *** [.tmp_vmlinux1] Error 1

config attached.

and please add a GRU maintainer entry somewhere.

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

This is not actually a GRU problem. XP is missing a dependency. Dean will post a patch later today.

Done. Also added maintainer for XP...

--- jack

Add a reverse dependency of CONFIG_SGI_XP upon CONFIG_SGI_GRU to Kconfig.

---

 drivers/misc/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Index: linux/drivers/misc/Kconfig
===================================================================
@@ -429,6 +429,7 @@ config SGI_XP
 	depends on IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || (X86_64 && SMP)
 	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
 	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+	select SGI_GRU if IA64_GENERIC || IA64_SGI_UV || (X86_64 && SMP)
 	---help---
 	  An SGI machine can be divided into multiple Single System
 	  Images which act independently of each other and have

Yes, this helps, but there is another problem. When CONFIG_NET=n, these build errors happen:

drivers/built-in.o: In function `xpnet_connection_activity':
xpnet.c:(.text+0x114442): undefined reference to netif_carrier_on' xpnet.c:(.text+0x114458): undefined reference to dev_alloc_skb' xpnet.c:(.text+0x1144b0): undefined reference to skb_put' xpnet.c:(.text+0x11451b): undefined reference to eth_type_trans' xpnet.c:(.text+0x11455f): undefined reference to netif_rx_ni' xpnet.c:(.text+0x11457f): undefined reference to netif_carrier_off' drivers/built-in.o: In function `xpnet_send_completed':
xpnet.c:(.text+0x114614): undefined reference to dev_kfree_skb_any' drivers/built-in.o: In function xpnet_dev_hard_start_xmit':
xpnet.c:(.text+0x1147c4): undefined reference to kfree_skb' xpnet.c:(.text+0x114871): undefined reference to kfree_skb' drivers/built-in.o: In function `xpnet_init':
xpnet.c:(.init.text+0xa818): undefined reference to ether_setup' xpnet.c:(.init.text+0xa829): undefined reference to alloc_netdev_mq' xpnet.c:(.init.text+0xa841): undefined reference to netif_carrier_off' xpnet.c:(.init.text+0xa930): undefined reference to register_netdev' xpnet.c:(.init.text+0xa946): undefined reference to free_netdev' drivers/built-in.o: In function xpnet_exit':
xpnet.c:(.exit.text+0xcbd): undefined reference to unregister_netdev' xpnet.c:(.exit.text+0xcc9): undefined reference to free_netdev' make[1]: *** [.tmp_vmlinux1] Error 1

Add a dependency of CONFIG_SGI_XP upon CONFIG_NET to Kconfig.

---

 drivers/misc/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Index: linux/drivers/misc/Kconfig
===================================================================
@@ -426,6 +426,7 @@ config ENCLOSURE_SERVICES
 
 config SGI_XP
 	tristate "Support communication between SGI SSIs"
+	depends on NET
 	depends on IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || (X86_64 && SMP)
 	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
 	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2

security/integrity/ima:

linux-next-20080731/security/integrity/ima/ima_policy.c:81: error: implicit declaration of function 'security_audit_rule_match' linux-next-20080731/security/integrity/ima/ima_policy.c:206: error: implicit declaration of function 'security_audit_rule_init' make[4]: *** [security/integrity/ima/ima_policy.o] Error 1

config attached.

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/