Skip to contentSkip to conversation

linux-next: Tree for February 2

PATCH In review Stephen Rothwell 4 participants 5 messages Feb 2, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi all,

Changes since 20090126:

New tree:
crypto-current

Dropped trees (temporarily):
kernel-doc (import failed)
ide (import failed)
cpu_alloc (build problem)
audit (difficult conflicts)

The m68knommu tree lost its conflict.

The pxa tree inherited a conflict from the i2c tree.

The driver-core tree gained 3 conflicts against the parisc tree. It also lost its build fix revert (but see below for the acpi tree).

The tip-core tree gained a conflict against Linus' tree.

The acpi tree gained a build failure due to an interaction with the driver-core tree for which I reverted a commit.

The ext4 tree gained a conflict against Linus' tree.

The net tree gained a conflict against Linus' tree. It also lost its 2 build fix reverts.

The rr tree gained a conflict against the cpufreq tree.

The firmware tree gained a conflict against the sound tree.

The kmemcheck tree gained a conflict against the slab tree.

The proc tree lost its build fix.

The kmemleak tree gained a conflict against the slab tree. It also lost a conflict.

The sparc-current tree needed a build fix patch because of an interaction with the sparseirq tree.

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

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 (if any), it is also built with powerpc allnoconfig, ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 132 trees (counting Linus' and 18 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.

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

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
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-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
CONFLICT (content): Merge conflict in arch/arm/configs/magician_defconfig
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/char/agp/parisc-agp.c
CONFLICT (content): Merge conflict in drivers/parisc/gsc.c
CONFLICT (content): Merge conflict in drivers/parisc/sba_iommu.c
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/e820.h
CONFLICT (content): Merge conflict in arch/x86/kernel/setup_percpu.c
CONFLICT (content): Merge conflict in include/linux/nubus.h
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging cpus4096/auto-cpus4096-next
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 pci/linux-next
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging v4l-dvb/master
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Created commit 6a535d9: Revert "platform/x86: Add oqo-wmi driver for model 2 OQO backlight and rfkill control"
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/Kconfig
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
CONFLICT (content): Merge conflict in mm/Makefile
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/dma_remapping.h
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging squashfs/master
Merging omap/for-next
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master
Applying sparc: fixup for sparseirq changes
#1 lore raw

Re: linux-next: Tree for February 2 (iwlwifi)

Quoted 3 lines · On Mon, 2 Feb 2009 20:16:37 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20090126:

a. optional drivers such as iwlwifi should not default to 'y':

config IWLWIFI

	bool "Intel Wireless Wifi"
	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
	default y

b. Are there cases where IWLCORE is not needed? I.e., why is it even a kconfig option?

c. The attached config causes beaucoup build errors with:
CONFIG_IWLWIFI=y
# CONFIG_IWLCORE is not set
# CONFIG_IWLAGN is not set
CONFIG_IWL3945=y
# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set CONFIG_IWL3945_LEDS=y

like:
drivers/built-in.o: In function `iwl3945_mac_stop':
iwl3945-base.c:(.text+0x16b7ae): undefined reference to iwl_scan_cancel_timeout' drivers/built-in.o: In function iwl3945_send_power_mode':
iwl3945-base.c:(.text+0x16b8e0): undefined reference to `iwl_send_cmd_pdu'
drivers/built-in.o: In function `iwl3945_activate_qos':
iwl3945-base.c:(.text+0x16b995): undefined reference to `iwl_send_cmd_pdu'
drivers/built-in.o: In function `iwl3945_send_rxon_assoc':
iwl3945-base.c:(.text+0x16ba38): undefined reference to `iwl_send_cmd_sync'
drivers/built-in.o: In function `iwl3945_mac_get_tx_stats':
iwl3945-base.c:(.text+0x16be5a): undefined reference to `iwl_queue_space'
drivers/built-in.o: In function `iwl3945_add_station':
(.text+0x16c0c1): undefined reference to `iwl_send_add_sta'
drivers/built-in.o: In function `iwl3945_commit_rxon':
iwl3945-base.c:(.text+0x16c50d): undefined reference to iwl_send_cmd_pdu' iwl3945-base.c:(.text+0x16c55c): undefined reference to iwl_send_cmd_pdu' iwl3945-base.c:(.text+0x16c5d0): undefined reference to `iwl_bcast_addr'
drivers/built-in.o: In function `iwl3945_mac_reset_tsf':
iwl3945-base.c:(.text+0x16c727): undefined reference to iwl_reset_qos' iwl3945-base.c:(.text+0x16c7b7): undefined reference to iwl_scan_cancel_timeout' drivers/built-in.o: In function `iwl3945_mac_set_key':
iwl3945-base.c:(.text+0x16c817): undefined reference to iwl_bcast_addr' iwl3945-base.c:(.text+0x16c84e): undefined reference to iwl_scan_cancel_timeout' iwl3945-base.c:(.text+0x16c93f): undefined reference to iwl_send_add_sta' iwl3945-base.c:(.text+0x16c9e2): undefined reference to iwl_send_add_sta'
drivers/built-in.o: In function `iwl3945_mac_remove_interface':
iwl3945-base.c:(.text+0x16ca43): undefined reference to iwl_scan_cancel_timeout' drivers/built-in.o: In function iwl3945_send_beacon_cmd':
iwl3945-base.c:(.text+0x16cba7): undefined reference to `iwl_send_cmd_pdu'
drivers/built-in.o: In function `iwl3945_post_associate':
iwl3945-base.c:(.text+0x16cc4c): undefined reference to iwl_scan_cancel_timeout' iwl3945-base.c:(.text+0x16cc89): undefined reference to iwl_send_cmd_pdu'
drivers/built-in.o: In function `iwl3945_mac_beacon_update':
iwl3945-base.c:(.text+0x16ce2d): undefined reference to `iwl_reset_qos'
drivers/built-in.o: In function `iwl3945_connection_init_rx_config':
iwl3945-base.c:(.text+0x16cf01): undefined reference to iwl_get_channel_info' drivers/built-in.o: In function iwl3945_set_rxon_channel':
iwl3945-base.c:(.text+0x16cf6a): undefined reference to iwl_get_channel_info' drivers/built-in.o: In function iwl3945_mac_tx':
iwl3945-base.c:(.text+0x16d668): undefined reference to iwl_txq_update_write_ptr' iwl3945-base.c:(.text+0x16d681): undefined reference to iwl_queue_space' iwl3945-base.c:(.text+0x16d6b7): undefined reference to iwl_txq_update_write_ptr' drivers/built-in.o: In function iwl3945_rx_queue_restock':
iwl3945-base.c:(.text+0x16d773): undefined reference to iwl_rx_queue_space' iwl3945-base.c:(.text+0x16d7f0): undefined reference to iwl_rx_queue_update_write_ptr' drivers/built-in.o: In function `iwl3945_rx_reply_error':
iwl3945-base.c:(.text+0x16d94f): undefined reference to `get_cmd_string'
drivers/built-in.o: In function `iwl3945_bg_alive_start':
iwl3945-base.c:(.text+0x16dc36): undefined reference to iwl_send_bt_config' drivers/built-in.o: In function iwl3945_mac_add_interface':
iwl3945-base.c:(.text+0x16dec7): undefined reference to iwl_get_channel_info' iwl3945-base.c:(.text+0x16df47): undefined reference to iwl_scan_cancel_timeout' drivers/built-in.o: In function `iwl3945_rx_card_state_notif':
iwl3945-base.c:(.text+0x16e27c): undefined reference to `iwl_scan_cancel'
drivers/built-in.o: In function `iwl3945_mac_config':
iwl3945-base.c:(.text+0x16e3de): undefined reference to iwl_get_channel_info' iwl3945-base.c:(.text+0x16e45a): undefined reference to iwl_scan_cancel' iwl3945-base.c:(.text+0x16e497): undefined reference to iwl_send_card_state' drivers/built-in.o: In function store_filter_flags':
iwl3945-base.c:(.text+0x16e672): undefined reference to iwl_scan_cancel_timeout' drivers/built-in.o: In function store_flags':
iwl3945-base.c:(.text+0x16e6f7): undefined reference to iwl_scan_cancel_timeout' drivers/built-in.o: In function iwl3945_mac_config_interface':
iwl3945-base.c:(.text+0x16e8eb): undefined reference to iwl_scan_cancel_timeout' iwl3945-base.c:(.text+0x16e9b6): undefined reference to iwl_send_cmd_pdu' iwl3945-base.c:(.text+0x16ea47): undefined reference to iwl_bcast_addr' iwl3945-base.c:(.text+0x16ea91): undefined reference to iwl_scan_cancel_timeout' drivers/built-in.o: In function `iwl3945_irq_tasklet':
iwl3945-base.c:(.text+0x16ecc4): undefined reference to iwl_rx_queue_update_write_ptr' iwl3945-base.c:(.text+0x16ecd1): undefined reference to iwl_txq_update_write_ptr' iwl3945-base.c:(.text+0x16ecde): undefined reference to iwl_txq_update_write_ptr' iwl3945-base.c:(.text+0x16eceb): undefined reference to iwl_txq_update_write_ptr' iwl3945-base.c:(.text+0x16ecf8): undefined reference to iwl_txq_update_write_ptr' iwl3945-base.c:(.text+0x16ed05): undefined reference to iwl_txq_update_write_ptr' drivers/built-in.o:iwl3945-base.c:(.text+0x16ed12): more undefined references to iwl_txq_update_write_ptr' follow drivers/built-in.o: In function iwl3945_irq_tasklet':
iwl3945-base.c:(.text+0x16ed4d): undefined reference to iwl_rx_queue_space' drivers/built-in.o: In function show_statistics':
iwl3945-base.c:(.text+0x16f2f3): undefined reference to iwl_send_statistics_request' drivers/built-in.o: In function iwl3945_bg_request_scan':
iwl3945-base.c:(.text+0x16f94f): undefined reference to iwl_fill_probe_req' iwl3945-base.c:(.text+0x16f9b8): undefined reference to iwl_get_active_dwell_time' iwl3945-base.c:(.text+0x16f9c7): undefined reference to iwl_get_passive_dwell_time' iwl3945-base.c:(.text+0x16fa2d): undefined reference to iwl_get_channel_info' iwl3945-base.c:(.text+0x16faf5): undefined reference to `iwl_send_cmd_sync'
drivers/built-in.o: In function `iwl3945_pci_probe':
iwl3945-base.c:(.text+0x16fc09): undefined reference to iwl_alloc_all' iwl3945-base.c:(.text+0x16fd9b): undefined reference to iwl_eeprom_init' iwl3945-base.c:(.text+0x16fee0): undefined reference to iwl_reset_qos' iwl3945-base.c:(.text+0x16ff49): undefined reference to iwl_init_channel_map' iwl3945-base.c:(.text+0x16ff95): undefined reference to iwlcore_init_geos' iwl3945-base.c:(.text+0x170044): undefined reference to iwl_free_channel_map' iwl3945-base.c:(.text+0x170265): undefined reference to iwl_bg_rf_kill' iwl3945-base.c:(.text+0x1703c9): undefined reference to iwl_bg_scan_completed' iwl3945-base.c:(.text+0x170449): undefined reference to iwl_bg_abort_scan' iwl3945-base.c:(.text+0x170485): undefined reference to iwl_bg_scan_check' iwl3945-base.c:(.text+0x1705b1): undefined reference to `iwlcore_free_geos'
drivers/built-in.o: In function `iwl3945_hw_txq_ctx_free':
(.text+0x1717c4): undefined reference to `iwl_tx_queue_free'
drivers/built-in.o: In function `iwl3945_sync_sta':
(.text+0x1718da): undefined reference to `iwl_send_add_sta'
drivers/built-in.o: In function `iwl3945_send_tx_power':
(.text+0x171de5): undefined reference to `iwl_get_channel_info'
drivers/built-in.o: In function `iwl3945_send_tx_power':
(.text+0x171e8b): undefined reference to `iwl_send_cmd_pdu'
drivers/built-in.o: In function `iwl3945_hw_nic_init':
(.text+0x171f2d): undefined reference to `iwl_rx_queue_alloc'
drivers/built-in.o: In function `iwl3945_hw_nic_init':
(.text+0x171f65): undefined reference to `iwl_rx_queue_reset'
drivers/built-in.o: In function `iwl3945_hw_nic_init':
(.text+0x172149): undefined reference to `iwl_tx_queue_init'
drivers/built-in.o: In function `iwl3945_rx_reply_tx':
iwl-3945.c:(.text+0x1724d2): undefined reference to `iwl_queue_space'
drivers/built-in.o: In function `iwl3945_init_hw_rate_table':
(.text+0x172612): undefined reference to `iwl_send_cmd_pdu'
drivers/built-in.o: In function `iwl3945_init_hw_rate_table':
(.text+0x17262d): undefined reference to `iwl_send_cmd_pdu'
drivers/built-in.o: In function `iwl_send_led_cmd':
iwl-3945-led.c:(.text+0x173508): undefined reference to `iwl_send_cmd'
drivers/built-in.o: In function `iwl3945_pci_remove':
iwl3945-base.c:(.devexit.text+0x14c3): undefined reference to iwl_rx_queue_free' iwl3945-base.c:(.devexit.text+0x153a): undefined reference to iwl_free_channel_map' iwl3945-base.c:(.devexit.text+0x1541): undefined reference to iwlcore_free_geos' drivers/built-in.o:(.data+0x15944): undefined reference to iwlcore_eeprom_verify_signature' drivers/built-in.o:(.data+0x15954): undefined reference to `iwlcore_eeprom_query_addr'
make[1]: *** [.tmp_vmlinux1] Error 1

---
~Randy

#2 lore raw

Re: linux-next: Tree for February 2 (iwlwifi)

Quoted 7 lines · Randy Dunlap
Quoted 3 lines · On Mon, 2 Feb 2009 20:16:37 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20090126:

Quoted 6 lines

a. optional drivers such as iwlwifi should not default to 'y':

config IWLWIFI
bool "Intel Wireless Wifi"
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL default y

will fix.

Quoted 3 lines

b. Are there cases where IWLCORE is not needed? I.e., why is it even a kconfig option?

indeed ... now that 3945 depends on IWLCORE also we could replace IWLWIFI with it because IWLWIFI is not used in code ... we will have to see if this is possible.

Quoted 9 lines

c. The attached config causes beaucoup build errors with:
CONFIG_IWLWIFI=y
# CONFIG_IWLCORE is not set
# CONFIG_IWLAGN is not set
CONFIG_IWL3945=y
# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set CONFIG_IWL3945_LEDS=y

3945 is being ported to iwlwifi and we neglected to change Kconfig to reflect this. We will fix it.

Thank you very much for this report.

Reinette

#3 lore raw

PATCH 1/1 jfs: needs crc32_le

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

JFS needs crc32_le(), so select its library config symbol:

fs/built-in.o: In function `jfs_statfs':
super.c:(.text+0x7c8c0): undefined reference to crc32_le' super.c:(.text+0x7c8d5): undefined reference to crc32_le'

---
 fs/jfs/Kconfig |    1 +
 1 file changed, 1 insertion(+)
fs/jfs/Kconfig +1 -0
@@ -1,6 +1,7 @@
 config JFS_FS
 	tristate "JFS filesystem support"
 	select NLS
+	select CRC32
 	help
 	  This is a port of IBM's Journaled Filesystem .  More information is
 	  available in the file <file:Documentation/filesystems/jfs.txt>.
#4 lore raw

Re: [PATCH] jfs: needs crc32_le

Quoted 3 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

JFS needs crc32_le(), so select its library config symbol:

Thanks Randy. I'll push this one right away.

Shaggy

Quoted 21 lines

fs/built-in.o: In function `jfs_statfs':
super.c:(.text+0x7c8c0): undefined reference to crc32_le' super.c:(.text+0x7c8d5): undefined reference to crc32_le'

---
 fs/jfs/Kconfig |    1 +
 1 file changed, 1 insertion(+)
fs/jfs/Kconfig +1 -0
@@ -1,6 +1,7 @@
 config JFS_FS
 	tristate "JFS filesystem support"
 	select NLS
+	select CRC32
 	help
 	  This is a port of IBM's Journaled Filesystem .  More information is
 	  available in the file <file:Documentation/filesystems/jfs.txt>.
Signature · 2 lines
David Kleikamp
IBM Linux Technology Center