linux-next: Tree for November 12
Subsystems (12)
Hi all,
Changes since 20101111:
The voltage tree lost its build failure.
The fsnotify tree lost its build failure.
The tty tree gained a build failure for which I reverted a commit.
----------------------------------------------------------------------------
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 179 trees (counting Linus' and 26 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 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 · 200 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/rc-fixes Merging driver-core.current/driver-core-linus Merging tty.current/tty-linus Merging usb.current/usb-linus Merging staging.current/staging-linus 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 sh-current/sh-fixes-for-linus Merging rmobile-current/rmobile-fixes-for-linus Merging fbdev-current/fbdev-fixes-for-linus Merging gcl-current/merge Merging arm/devel Merging davinci/davinci-next Merging i.MX/for-next Merging msm/for-next Merging omap/for-next Merging pxa/for-next Merging samsung/next-samsung Merging s5p/for-next Merging tegra/for-next Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next Merging galak/next Merging s390/features Merging sh/sh-latest Merging rmobile/rmobile-latest Merging sparc/master Merging tile/master Merging xtensa/master CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Merging ceph/for-next 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 hfsplus/for-next Merging jfs/next Merging logfs/master CONFLICT (content): Merge conflict in fs/logfs/logfs.h Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging omfs/for-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Merging vfs/for-next Merging pci/linux-next Merging hid/for-next CONFLICT (content): Merge conflict in drivers/hid/hid-input.c Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging hwmon-staging/hwmon-next Merging quilt/kernel-doc Merging v4l-dvb/master Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging idle-test/idle-test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging swiotlb/master Merging ibft/master Merging scsi/master Merging async_tx/next Merging net/master Merging wireless/master Merging bluetooth/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging sound-asoc/for-next Merging cpufreq/next Merging quilt/rr Merging input/next Merging lsm/for-next Merging block/for-next CONFLICT (content): Merge conflict in fs/ocfs2/file.c 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 mmc/mmc-next Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging fbdev/master Merging viafb/viafb-next Merging omap_dss2/for-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master Merging agp/agp-next 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 CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree. CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree. CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c $ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h Merging audit/for-next Merging suspend/linux-next Merging fsnotify/for-next Merging irda/for-next Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild Merging i7core_edac/linux_next Merging i7300_edac/linux_next Merging devicetree/next-devicetree Merging spi/next-spi Merging tip/auto-latest Merging rcu/rcu/next Merging oprofile/for-next Merging xen/upstream/xen Merging swiotlb-xen/master Merging xen-pvhvm/linux-next Merging edac-amd/for-next Merging percpu/for-next Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging drivers-x86/linux-next Merging hwpoison/hwpoison Merging sysctl/master Merging driver-core/driver-core-next Merging tty/tty-next Merging usb/usb-next Merging staging/staging-next CONFLICT (content): Merge conflict in drivers/staging/bcm/Bcmchar.c CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intel_sst_app_interface.c Merging slabh/slabh Merging bkl-trivial/trivial Merging bkl-llseek/llseek Merging bkl-vfs/vfs Merging bkl-config/config Merging irqflags/master Merging cleancache/linux-next CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in mm/Kconfig Merging scsi-post-merge/merge-base:master [master d0e885e] Revert "ifx6x60: SPI protocol driver for Infineon 6x60 modem"
PATCH 1/1 edac: use BIT_64() to eliminate warnings
From: Randy Dunlap <[email protected]>
Building for X86_32 produces shift count warnings, so use BIT_64() to eliminate the warnings.
drivers/edac/mce_amd.c:778: warning: left shift count >= width of type drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
--- drivers/edac/mce_amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/mce_amd.c +2 -2
@@ -776,8 +776,8 @@ int amd_decode_mce(struct notifier_blockif (c->x86 ==0x15 )pr_cont ("|%s|%s" , - ((m->status &BIT (44 )) ?"Deferred" :"-" ), - ((m->status &BIT (43 )) ?"Poison" :"-" )); + ((m->status &BIT_64 (44 )) ?"Deferred" :"-" ), + ((m->status &BIT_64 (43 )) ?"Poison" :"-" ));/* do the two bits[14:13] together */ ecc = (m->status >>45 ) &0x3 ;
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture Simplifying enterprise desktop deployment and management using Dell EqualLogic storage and VMware View: A highly scalable, end-to-end client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
Borislav Petkov
AppliedRe: [PATCH -next] edac: use BIT_64() to eliminate warnings
Quoted 5 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Building for
X86_32produces shift count warnings, so useBIT_64()to eliminate the warnings.
Quoted 7 lines
drivers/edac/mce_amd.c:778: warning: left shift count >= width of typedrivers/edac/mce_amd.c:778: warning: left shift count >= width of typeSigned-off-by Randy Dunlap <[email protected]>Cc Doug Thompson <[email protected]>Cc Borislav Petkov <[email protected]>
Thanks, applied.
BTW, Doug, we still carry the bluesmoke-devel ML as edac mailing list in MAINTAINERS althouth there's a new linux-edac@vger... which got proposed recently. I think we should use that new one and deprecate the sourceforge list since the new one is not moderated for subsribers and thus more open.
Thoughts?
Signature · 8 lines
Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
PATCH 1/1 iwlwifi: fix modular legacy build errors
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
With CONFIG_IWLWIFI=m, CONFIG_IWLAGN=m, and CONFIG_IWL3945=m, a kernel build has errors as below. Changing a few lines in the Makefile is one possible fix for these build errors.
ERROR: "iwl_legacy_mac_config" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_isr_legacy" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_tx_cmd_protection" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_mac_bss_info_changed" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_mac_reset_tsf" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
--- drivers/net/wireless/iwlwifi/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/wireless/iwlwifi/Makefile +2 -4
@@ -2,8 +2,6 @@ obj-$(CONFIG_IWLWIFI) += iwlcore.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o iwlcore-objs += iwl-rx.o iwl-tx.o iwl-sta.o iwlcore-objs += iwl-scan.o iwl-led.o -iwlcore-$(CONFIG_IWL3945) += iwl-legacy.o -iwlcore-$(CONFIG_IWL4965) += iwl-legacy.o iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
@@ -17,7 +15,7 @@ iwlagn-objs += iwl-agn-lib.o iwl-agn-rx iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o -iwlagn-$(CONFIG_IWL4965) += iwl-4965.o +iwlagn-$(CONFIG_IWL4965) += iwl-4965.o iwl-legacy.o iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o iwl-agn-ict.o iwlagn-$(CONFIG_IWL5000) += iwl-5000.o iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
@@ -25,7 +23,7 @@ iwlagn-$(CONFIG_IWL5000) += iwl-1000.o # 3945 obj-$(CONFIG_IWL3945) += iwl3945.o -iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o +iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o iwl-legacy.o iwl3945-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-3945-debugfs.o ccflags-y += -D__CHECK_ENDIAN__
--
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
PATCH 1/1 pci-sysfs: fix printk warnings
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Cast pci_resource_start() and pci_resource_len() to u64 for printk.
drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 9 has type 'resource_size_t' drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 10 has type 'resource_size_t'
--- drivers/pci/pci-sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/pci-sysfs.c +2 -1
@@ -754,7 +754,8 @@ pci_mmap_resource(struct kobject *kobj,"at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n" , current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff,pci_name (pdev), i, - pci_resource_start(pdev, i), pci_resource_len(pdev, i)); + (u64 )pci_resource_start (pdev, i), + (u64)pci_resource_len(pdev, i));return -EINVAL ; }
PATCH 1/1 staging: fix iio/gyro typos, build errors
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Typo causes build errors. Did anyone even build this driver?
--- drivers/staging/iio/gyro/adis16251.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Also has section mismatch warnings:
WARNING: drivers/staging/built-in.o(.data+0xe9b8): Section mismatch in reference from the variable spi_adis16255_drv to the function .devinit.text:spi_adis16255_probe() The variable spi_adis16255_drv references
the function __devinit spi_adis16255_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
WARNING: drivers/staging/built-in.o(.data+0xe9c0): Section mismatch in reference from the variable spi_adis16255_drv to the function .devexit.text:spi_adis16255_remove() The variable spi_adis16255_drv references
the function __devexit spi_adis16255_remove()
If the reference is valid then annotate the
variable with __exit* (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
drivers/staging/iio/gyro/adis16251.h +8 -8
@@ -56,14 +56,14 @@#define ADIS16251_DIAG_STAT_POWER_HIGH (1<<1)#define ADIS16251_DIAG_STAT_POWER_LOW (1<<0) -#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16261_DIAG_STAT_ALARM2 | \ - ADIS16261_DIAG_STAT_ALARM1 | \ - ADIS16261_DIAG_STAT_SELF_TEST | \ - ADIS16261_DIAG_STAT_OVERFLOW | \ - ADIS16261_DIAG_STAT_SPI_FAIL | \ - ADIS16261_DIAG_STAT_FLASH_UPT | \ - ADIS16261_DIAG_STAT_POWER_HIGH | \ - ADIS16261_DIAG_STAT_POWER_LOW) +#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16251_DIAG_STAT_ALARM2 | \ + ADIS16251_DIAG_STAT_ALARM1 | \ + ADIS16251_DIAG_STAT_SELF_TEST | \ + ADIS16251_DIAG_STAT_OVERFLOW | \ + ADIS16251_DIAG_STAT_SPI_FAIL | \ + ADIS16251_DIAG_STAT_FLASH_UPT | \ + ADIS16251_DIAG_STAT_POWER_HIGH | \ + ADIS16251_DIAG_STAT_POWER_LOW)/* GLOB_CMD */ #define ADIS16251_GLOB_CMD_SW_RESET (1<<7)
PATCH 1/1 xen: fix header export to userspace
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
scripts/headers_install.pl prevents "__user" from being exported to userspace headers, so just use compiler.h to make sure that __user is defined and avoid the error.
unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)
--- include/xen/privcmd.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
include/xen/privcmd.h +1 -4
@@ -34,13 +34,10 @@#define __LINUX_PUBLIC_PRIVCMD_H__#include <linux/types.h> +#include <linux/compiler.h> typedef unsigned long xen_pfn_t ; -#ifndef __user -#define __user -#endif -struct privcmd_hypercall {__u64 op;__u64 arg[5 ];
Re: [PATCH -next] xen: fix header export to userspace
Quoted 7 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
scripts/headers_install.plprevents "__user" from being exported to userspace headers, so just usecompiler.hto make sure that__useris defined and avoid the error.unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)
I suggest the following slightly more informative message
Quoted 6 lines
scripts/headers_install.plstrips "__user" when exporting headers to userspace and can introduce a syntax error (detected by unifdef) if "__user" appears in an unexpected place. Simplify by usingcompiler.hto make sure that__useris defined and avoid the error.unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)
In any case,
Tony.
Signature · 4 lines
f.anthony.n.finch <[email protected]> http://dotat.at/ HUMBER THAMES DOVER WIGHT PORTLAND: NORTH BACKING WEST OR NORTHWEST, 5 TO 7, DECREASING 4 OR 5, OCCASIONALLY 6 LATER IN HUMBER AND THAMES. MODERATE OR ROUGH. RAIN THEN FAIR. GOOD.
Re: [PATCH -next] xen: fix header export to userspace
In reply to Randy DunlapQuoted 7 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
scripts/headers_install.plprevents "__user" from being exported to userspace headers, so just usecompiler.hto make sure that__useris defined and avoid the error.unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)
Ah, OK, thanks. I was wondering what the proper fix for this was. I'll stick this in my tree.
Thanks,
J
Quoted 27 lines
Signed-off-by Randy Dunlap <[email protected]>Cc Jeremy Fitzhardinge <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc [email protected] (moderated for non-subscribers)Cc Tony Finch <[email protected]>--- include/xen/privcmd.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)include/xen/privcmd.h +1
-4@@ -34,13 +34,10 @@#define __LINUX_PUBLIC_PRIVCMD_H__#include <linux/types.h> +#include <linux/compiler.h> typedef unsigned long xen_pfn_t ; -#ifndef __user -#define __user -#endif -struct privcmd_hypercall {__u64 op;__u64 arg[5 ];
PATCH 1/1 x86/mrst: force support code to be built
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix mrst.c build: make sure that its called functions are built.
arch/x86/built-in.o: In function `mrst_reboot':
mrst.c:(.text+0x2250b): undefined reference to intel_scu_ipc_simple_command' arch/x86/built-in.o: In function mrst_power_off':
mrst.c:(.text+0x2252e): undefined reference to `intel_scu_ipc_simple_command'
--- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/x86/Kconfig +1 -0
@@ -387,6 +387,7 @@ config X86_MRST select APB_TIMER select I2C select SPI + select X86_PLATFORM_DEVICES ---help--- Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin Internet Device(MID) platform. Moorestown consists of two chips:
Re: [PATCH -next] x86/mrst: force support code to be built
Quoted 17 lines · On Sat, 13 Nov 2010 08:44:37 -0800 Randy Dunlap <[email protected]> wrote:
From: Randy Dunlap <[email protected]>
Fix
mrst.cbuild: make sure that its called functions are built.
arch/x86/built-in.o: In function `mrst_reboot':
mrst.c:(.text+0x2250b): undefined reference tointel_scu_ipc_simple_command' arch/x86/built-in.o: In functionmrst_power_off':
mrst.c:(.text+0x2252e): undefined reference to `intel_scu_ipc_simple_command'Signed-off-by Randy Dunlap <[email protected]>--- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/x86/Kconfig config X86_MRST · line 390
Quoted 4 lines
arch/x86/Kconfig +1
-0@@ -387,6 +387,7 @@ config X86_MRST select APB_TIMER select I2C select SPI + select X86_PLATFORM_DEVICES
We need the SCU so in fact we really want to select that. I'll send a patch to Ingo.