linux-next: Tree for October 9
Subsystems (3)
Hi all,
Changes since 20091008:
New trees: staging.current
reiserfs-bkl
My fixes tree contains a build fix for powerpc/kvm.
Linus' tree gained a build failure for which I reverted a commit.
The parisc tree gained a conflict against Linus' tree.
The mfd tree still has a build failure so I used the version from next-20091005.
The drm tree lost its conflicts.
The suspend tree lost its build failure.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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 (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 142 trees (counting Linus' and 22 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 · 174 lines
Cheers, Stephen Rothwell [email protected] $ git checkout master $ git reset --hard stable Merging origin/master Merging fixes/fixes 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/tty.current Merging quilt/usb.current Merging quilt/staging.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus Merging crypto-current/master Merging ide-curent/master Merging dwmw2/master Merging arm/devel Merging davinci/for-next Merging pxa/for-next Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next CONFLICT (content): Merge conflict in drivers/rtc/Kconfig Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/Kconfig CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree. CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree. CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree. $ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c Merging parisc/next CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S CONFLICT (content): Merge conflict in arch/parisc/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c Merging powerpc/next Merging 4xx/next Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next Merging ext3/for_next Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging quota/for_next Merging kbuild/master Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master Merging wireless/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Merging mmc/next Merging tmio-mmc/linux-next Merging input/next Merging lsm/for-next Merging block/for-next Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next $ git reset --hard HEAD^ Merging refs/next/20091005/mfd Merging hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master Merging agp/agp-next Merging uwb/for-upstream Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging omap/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next Merging irda/for-next Merging hwlat/for-linus Merging drbd/for-jens CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c CONFLICT (add/add): Merge conflict in include/linux/drbd.h Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in lib/Kconfig Merging tip/auto-latest CONFLICT (content): Merge conflict in drivers/mtd/maps/gpio-addr-flash.c Merging oprofile/for-next Merging percpu/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master [master 9b2aec4] Revert "ahci: filter FPDMA non-zero offset enable for Aspire 3810T"
PATCH 1/1 thinkpad_acpi: fix build, HOTKEY_POLL is optional
From: Randy Dunlap <[email protected]>
Fix optional part of driver to be built optionally:
drivers/platform/x86/thinkpad_acpi.c:6251: error: implicit declaration of function 'tpacpi_hotkey_driver_mask_set'
--- drivers/platform/x86/thinkpad_acpi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/platform/x86/thinkpad_acpi.c +2 -0
@@ -6245,12 +6245,14 @@ static int __init brightness_init(struct ibm_backlight_device->props.brightness = b &TP_EC_BACKLIGHT_LVLMSK ;backlight_update_status (ibm_backlight_device); +#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL vdbg_printk (TPACPI_DBG_INIT |TPACPI_DBG_BRGHT ,"brightness: registering brightness hotkeys " "as change notification\n" );tpacpi_hotkey_driver_mask_set (hotkey_driver_mask |TP_ACPI_HKEY_BRGHTUP_MASK |TP_ACPI_HKEY_BRGHTDWN_MASK );; +#endif return 0 ; }
Re: [PATCH -next] thinkpad_acpi: fix build, HOTKEY_POLL is optional
Quoted 3 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix optional part of driver to be built optionally:
NAK!
This happens because of (linux-next) commit 7f6443f7238a0aa9014b11a0a31ab76825d75cdf "thinkpad-acpi: Fix build on !CONFIG_THINKPAD_ACPI_HOTKEY_POLL" by Ingo.
That commit is wrong, it must NOT be applied as explained in the thread starting at http://lkml.org/lkml/2009/9/27/30.
Ingo, can you please check if you don't have that commit still in one of your trees that are fed into linux-next? It broke the driver now that the "backlight/thinkpad-acpi: issue backlight class events" patch landed in -next, just like I said it would happen...
Signature · 4 lines
"One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh
Re: [PATCH -next] thinkpad_acpi: fix build, HOTKEY_POLL is optional
Quoted 7 lines · Henrique de Moraes Holschuh
Quoted 3 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix optional part of driver to be built optionally:
NAK!
Quoted 7 lines
This happens because of (linux-next) commit
7f6443f7238a0aa9014b11a0a31ab76825d75cdf"thinkpad-acpi: Fix build on !CONFIG_THINKPAD_ACPI_HOTKEY_POLL" by Ingo.That commit is wrong, it must NOT be applied as explained in the thread starting at http://lkml.org/lkml/2009/9/27/30.
Yep, that was wrong - it should be gone now.
Ingo
Re: [PATCH -next] thinkpad_acpi: fix build, HOTKEY_POLL is optional
Quoted 13 lines · Ingo Molnar
Quoted 12 lines · Henrique de Moraes Holschuh
Quoted 3 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix optional part of driver to be built optionally:
NAK!
This happens because of (linux-next) commit
7f6443f7238a0aa9014b11a0a31ab76825d75cdf"thinkpad-acpi: Fix build on !CONFIG_THINKPAD_ACPI_HOTKEY_POLL" by Ingo.
Quoted 4 lines
Quoted 2 lines
That commit is wrong, it must NOT be applied as explained in the thread starting at http://lkml.org/lkml/2009/9/27/30.
Yep, that was wrong - it should be gone now.
Thank you.
Signature · 4 lines
"One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh
PATCH 1/1 libertas: depends on CFG80211
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
libertas uses CFG80211 functions so it should depend on that symbol.
drivers/built-in.o: In function `lbs_cfg_free':
(.text+0x9ca93): undefined reference to wiphy_unregister' drivers/built-in.o: In function lbs_cfg_free':
(.text+0x9ca9a): undefined reference to wiphy_free' drivers/built-in.o: In function lbs_cfg_register':
(.text+0x9cb45): undefined reference to wiphy_register' drivers/built-in.o: In function lbs_cfg_alloc':
(.text+0x9cc64): undefined reference to `wiphy_new'
--- drivers/net/wireless/libertas/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/libertas/Kconfig +1 -1
@@ -1,6 +1,6 @@ config LIBERTAS tristate "Marvell 8xxx Libertas WLAN driver support" - depends on WLAN_80211 + depends on WLAN_80211 && CFG80211 select WIRELESS_EXT select WEXT_SPY select LIB80211
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20091009161730.6ae5fe59.randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org
Re: [PATCH -next] libertas: depends on CFG80211
Quoted 1 line
libertas uses CFG80211 functions so it should depend on that
symbol.
Ack.
Sigh, I should concentrate more on getting clean patches on the first iteration.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH -next] libertas: depends on CFG80211
In reply to Randy DunlapOh, and I sent in the same patch:
http://marc.info/?l=linux-wireless&m=125507252131925&w=4
I don't care which one get's applied.
Signature · 1 line
http://www.holgerschurig.de