Skip to contentSkip to conversation

linux-next: Tree for April 1

PATCH In review Stephen Rothwell 4 participants 6 messages Apr 1, 2008 – Apr 2, 2008 Sonics silicon backplane driver (ssb)

lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

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 one build failure (reverted and notified). Below is a summary of the stat of the merge.

We are up to 50 trees, more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.

In particular, I have very few of the architecture trees ....

Status of my local build tests is 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/.

Signature · 78 lines
Cheers,
Stephen Rothwell                    [email protected]

Merging origin/master
Merging quilt/driver-core
	I have removed driver-core-remove-no-longer-used-struct-class_device.patch
	as it needs to be merged late.
Merging quilt/pci
Merging quilt/usb
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 jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in Documentation/ide/ide.txt
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in drivers/ide/ide.c
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
CONFLICT (content): Merge conflict in drivers/infiniband/hw/amso1100/c2_provider.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/iwch_provider.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c
Merging acpi/test
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
CONFLICT (add/add): Merge conflict in include/asm-s390/sysinfo.h
Merging dlm/next
Merging scsi-rc-fixes/master
CONFLICT (content): Merge conflict in drivers/scsi/hosts.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c
Merging scsi/master
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc-merge/merge
Merging powerpc/powerpc-next
Merging hrt/mm
Merging lblnet/master
Merging ext4/next
CONFLICT (content): Merge conflict in fs/jbd2/journal.c
CONFLICT (content): Merge conflict in fs/jbd2/revoke.c
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in MAINTAINERS
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging vfs/vfs-2.6.25
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_ialloc.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_sb.h
Merging semaphore/semaphore
Merging quilt/ldp
	I have removed net-add-alacritech-slicoss-driver.patch as
	it causes build failures.
Created commit 0dc7166: Revert "novfs: Add the Novell filesystem client kernel module"
Created commit ab51693: Revert "[SCSI] WD33C93: let platform stub override no_sync/fast/dma_mode"
Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP
Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP
#1 lore raw
Quoted 4 lines · Stephen Rothwell

We are up to 50 trees, more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.

Could you please include the crypto tree at

git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6

Thanks,

Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
author
#2 lore raw

Hi Herbert,

Quoted 4 lines · On Tue, 01 Apr 2008 22:43:10 +0800 Herbert Xu <[email protected]>…

Could you please include the crypto tree at

git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6

Added, thanks.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#3 lore raw

Re: linux-next: Tree for April 1 (ssb build error)

In reply to Stephen Rothwell
Quoted 6 lines · On Tue, 1 Apr 2008 17:52:30 +1100 Stephen Rothwell wrote:

Hi all,

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/).

ssb build fails when SSB_PCIHOST is not set, as in:

CONFIG_SSB_POSSIBLE=y
CONFIG_SSB=y
CONFIG_SSB_SPROM=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
# CONFIG_SSB_PCIHOST is not set
CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_DEBUG=y

Error is:

drivers/built-in.o: In function `ssb_attr_sprom_store':
(.text+0x1c4b79): undefined reference to ssb_devices_freeze' drivers/built-in.o: In function ssb_attr_sprom_store':
(.text+0x1c4bb3): undefined reference to `ssb_devices_thaw' make[1]: *** [.tmp_vmlinux1] Error 1

---
~Randy

#4 lore raw

PATCH 1/1 ssb: Fix build for non-PCIhost

This fixes a build error when PCMCIA-host support is built, but PCI-host support is disabled.
Hell, who on earth would use such a weird configuration. :D

drivers/built-in.o: In function `ssb_attr_sprom_store':
(.text+0x1c4b79): undefined reference to ssb_devices_freeze' drivers/built-in.o: In function ssb_attr_sprom_store':
(.text+0x1c4bb3): undefined reference to `ssb_devices_thaw' make[1]: *** [.tmp_vmlinux1] Error 1

Signed-off-by Michael Buesch <[email protected]>

---

John, please apply this to 2.6.26

drivers/ssb/main.c +2 -2
Index: wireless-testing/drivers/ssb/main.c
===================================================================
@@ -202,7 +202,7 @@ out:
 	return err;
 }
 
-#ifdef CONFIG_SSB_PCIHOST
+#ifdef CONFIG_SSB_SPROM
 int ssb_devices_freeze(struct ssb_bus *bus)
 {
 	struct ssb_device *dev;

@@ -288,7 +288,7 @@ int ssb_devices_thaw(struct ssb_bus *bus
 
 	return 0;
 }
-#endif /* CONFIG_SSB_PCIHOST */
+#endif /* CONFIG_SSB_SPROM */
 
 static void ssb_device_shutdown(struct device *dev)
 {
Signature · 1 line
Greetings Michael.
Acked-by on v1 1/1
#5 lore raw

Re: [PATCH] ssb: Fix build for non-PCIhost

Quoted 11 lines · On Wed, 2 Apr 2008 17:03:26 +0200 Michael Buesch wrote:

This fixes a build error when PCMCIA-host support is built, but PCI-host support is disabled.
Hell, who on earth would use such a weird configuration. :D

drivers/built-in.o: In function `ssb_attr_sprom_store':
(.text+0x1c4b79): undefined reference to ssb_devices_freeze' drivers/built-in.o: In function ssb_attr_sprom_store':
(.text+0x1c4bb3): undefined reference to `ssb_devices_thaw' make[1]: *** [.tmp_vmlinux1] Error 1

Signed-off-by Michael Buesch <[email protected]>
Acked-by Randy Dunlap <[email protected]>
Quoted 30 lines

---

John, please apply this to 2.6.26

Index: wireless-testing/drivers/ssb/main.c
===================================================================

drivers/ssb/main.c +2 -2
@@ -202,7 +202,7 @@ out:
 	return err;
 }
 
-#ifdef CONFIG_SSB_PCIHOST
+#ifdef CONFIG_SSB_SPROM
 int ssb_devices_freeze(struct ssb_bus *bus)
 {
 	struct ssb_device *dev;

@@ -288,7 +288,7 @@ int ssb_devices_thaw(struct ssb_bus *bus
 
 	return 0;
 }
-#endif /* CONFIG_SSB_PCIHOST */
+#endif /* CONFIG_SSB_SPROM */
 
 static void ssb_device_shutdown(struct device *dev)
 {
Signature · 1 line
--

---
~Randy