linux-next: Tree for March 30
Subsystems (4)
Hi all,
Changes since 20100329:
This tree has a smattering of patches to cope with the slabh tree's change to remove the include of slab.h from percpu.h. Hopefully these patches, which are safe to apply now, will be taken up by subsystem maintainers.
Dropped tree: tmio-mmc (long unresolved conflicts and unable to fetch)
My fixes tree contains:
a patch for a pktcdvd build error from Arnd Bergmann a revert of the commit that broke virtual consoles on PowerPC
The pci tree lost its conflict.
The net tree lost its build failure and gained a conflict against the wireless-current tree.
The slabh tree gained a conflict against the percpu tree and lost most of its build failures (due to interactions with other trees) for which I applied patches.
----------------------------------------------------------------------------
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 160 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 · 230 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 Applying: ar9170: fix for driver-core ABI change Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/for-linus 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 gcl-current/merge Merging arm/devel Applying: arm: update gfp/slab.h includes Merging davinci/davinci-next Applying: davinci: update gfp/slab.h includes Merging i.MX/for-next Merging msm/for-next Merging omap/for-next Merging pxa/for-next Merging samsung/next-samsung 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/master Merging genesis/master Merging sparc/master Merging xtensa/master Merging ceph/for-next CONFLICT (content): Merge conflict in fs/ceph/auth_x.c CONFLICT (content): Merge conflict in fs/ceph/mds_client.c 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 logfs/master Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Applying: ocfs2: update gfp/slab.h includes 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 CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (content): Merge conflict in fs/nfs/inode.c CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c CONFLICT (content): Merge conflict in fs/nfsd/vfs.c CONFLICT (content): Merge conflict in fs/ufs/inode.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c CONFLICT (content): Merge conflict in security/tomoyo/realpath.c Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT Applying: libata: update gfp/slab.h includes Merging infiniband/for-next Merging acpi/test Applying: acpi: update gfp/slab.h includes Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging ibft/master Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c Merging wireless/master Applying: wireless: update gfp/slab.h includes Merging mtd/master Applying: mtd: update gfp/slab.h includes Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/char/hvc_console.c CONFLICT (content): Merge conflict in drivers/char/hvc_console.h CONFLICT (content): Merge conflict in drivers/char/virtio_console.c Merging mmc/next Merging input/next Applying: Input: ad714x: use of kzalloc/kfree requires the include of slab.h Applying: input: pcf8574_keypad: use of kzalloc/kfree requires the include of slab.h Applying: input: update gfp/slab.h includes Merging lsm/for-next Merging block/for-next Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master Applying: pcmcia: update gfp/slab.h includes Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Applying: kgdb: update for sysrq handling change Applying: kgdb: use of kmalloc/kfree requires the include of slab.h Applying: kdb: update gfp/slab.h includes Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Applying: mfd: update gfp/slab.h includes 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 quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c CONFLICT (content): Merge conflict in include/linux/fsnotify.h CONFLICT (content): Merge conflict in kernel/audit_tree.c CONFLICT (content): Merge conflict in kernel/sysctl.c Applying: fsnotify: update gfp/slab.h includes Merging irda/for-next CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Merging hwlat/for-linus CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/misc/Makefile Applying: kgdb: update for sysrq handling change Merging drbd/for-jens Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild CONFLICT (content): Merge conflict in lib/Kconfig Applying: vbus: use of kzalloc/kfree requires the include of slab.h Applying: vbus: update gfp/slab.h includes Merging i7core_edac/linux_next Merging devicetree/next-devicetree Merging spi/next-spi Merging limits/writable_limits CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Merging omap_dss2/for-next Merging tip/auto-latest Merging edac-amd/for-next Merging oprofile/for-next Merging percpu/for-next Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging sysctl/master Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Applying: usb: update gfp/slab.h includes Merging quilt/staging Applying: staging: update gfp/slab.h includes Merging slabh/slabh CONFLICT (content): Merge conflict in drivers/char/sysrq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c CONFLICT (content): Merge conflict in drivers/hid/hid-wacom.c CONFLICT (content): Merge conflict in drivers/media/video/soc_camera.c CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.c CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_main.c CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_spi.c CONFLICT (content): Merge conflict in drivers/pcmcia/pcmcia_resource.c CONFLICT (content): Merge conflict in drivers/s390/char/vmcp.c CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c CONFLICT (content): Merge conflict in fs/9p/vfs_super.c CONFLICT (content): Merge conflict in include/linux/percpu.h CONFLICT (content): Merge conflict in kernel/audit_watch.c CONFLICT (content): Merge conflict in net/mac80211/scan.c CONFLICT (delete/modify): sound/soc/codecs/ad1938.c deleted in HEAD and modified in slabh/slabh. Version slabh/slabh of sound/soc/codecs/ad1938.c left in tree. $ git rm -f sound/soc/codecs/ad1938.c Applying: hwlat: using kzalloc/kfree requires the include of slab.h Merging scsi-post-merge/master
PATCH 1/1 gspca: fix build for INPUT=m or INPUT=n
From: Randy Dunlap <[email protected]>
Handle case of GSPCA=m, INPUT=m when building gspca core; also handle case of INPUT=n by using stubs.
drivers/media/video/gspca/gspca.c:662: error: implicit declaration of function 'gspca_input_destroy_urb' drivers/media/video/gspca/gspca.c:668: error: implicit declaration of function 'gspca_input_create_urb' drivers/media/video/gspca/gspca.c:2284: error: implicit declaration of function 'gspca_input_connect'
--- drivers/media/video/gspca/gspca.c | 23 ++++++++++++++++++----- drivers/media/video/gspca/gspca.h | 6 +++--- 2 files changed, 21 insertions(+), 8 deletions(-)
drivers/media/video/gspca/gspca.c +18 -5
@@ -40,7 +40,7 @@#include "gspca.h" -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )#include <linux/input.h> #include <linux/usb/input.h> #endif
@@ -115,7 +115,7 @@ static const struct vm_operations_struct/* * Input and interrupt endpoint handling functions */ -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )static void int_irq (struct urb *urb) {struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
@@ -279,6 +279,19 @@ static void gspca_input_destroy_urb(stru usb_free_urb(urb); } } +#else +static inline void gspca_input_destroy_urb (struct gspca_dev *gspca_dev) +{ +} + +static inline void gspca_input_create_urb (struct gspca_dev *gspca_dev) +{ +} + +static inline int gspca_input_connect (struct gspca_dev *dev) +{ +return 0 ; +}#endif /* get the current input frame buffer */
@@ -2310,7 +2323,7 @@ int gspca_dev_probe(struct usb_interfacereturn 0 ; out: -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )if (gspca_dev->input_dev)input_unregister_device (gspca_dev->input_dev);#endif
@@ -2329,7 +2342,7 @@ EXPORT_SYMBOL(gspca_dev_probe);void gspca_disconnect (struct usb_interface *intf) {struct gspca_dev *gspca_dev =usb_get_intfdata (intf); -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )struct input_dev *input_dev;#endif
@@ -2343,7 +2356,7 @@ void gspca_disconnect(struct usb_interfawake_up_interruptible (&gspca_dev->wq); } -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )gspca_input_destroy_urb (gspca_dev); input_dev = gspca_dev->input_dev;if (input_dev) {
drivers/media/video/gspca/gspca.h +3 -3
@@ -130,7 +130,7 @@ struct sd_desc {cam_reg_op get_register;#endif cam_ident_op get_chip_ident; -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )cam_int_pkt_op int_pkt_scan;/* other_input makes the gspca core create gspca_dev->input even when int_pkt_scan is NULL, for cams with non interrupt driven buttons */
@@ -158,7 +158,7 @@ struct gspca_dev {struct module *module;/* subdriver handling the device */ struct usb_device *dev;struct file *capt_file;/* file doing video capture */ -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )struct input_dev *input_dev;char phys[64 ];/* physical device path */ #endif
@@ -171,7 +171,7 @@ struct gspca_dev {#define USB_BUF_SZ 64__u8 *usb_buf;/* buffer for USB exchanges */ struct urb *urb[MAX_NURBS ]; -#ifdef CONFIG_INPUT +#if defined(CONFIG_INPUT ) || defined(CONFIG_INPUT_MODULE )struct urb *int_urb;#endif
PATCH 1/1 module.h: add stub for is_module_percpu_address
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix build for CONFIG_MODULES not enabled by providing a stub for is_module_percpu_address().
kernel/lockdep.c:605: error: implicit declaration of function 'is_module_percpu_address'
--- include/linux/module.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/module.h +5 -0
@@ -567,6 +567,11 @@ static inline bool is_module_address(unsreturn false; } +static inline bool is_module_percpu_address (unsigned long addr) +{ +return false; +} +static inline bool is_module_text_address (unsigned long addr) {return false;
Re: [PATCH -next] module.h: add stub for is_module_percpu_address
Quoted 8 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix build for
CONFIG_MODULESnot enabled by providing a stub foris_module_percpu_address().
kernel/lockdep.c:605: error: implicit declaration of function 'is_module_percpu_address'Signed-off-by Randy Dunlap <[email protected]>
Thanks. Applied to percpu tree.
Signature · 1 line
tejun
Re: [PATCH -next] module.h: add stub for is_module_percpu_address
In reply to Randy DunlapQuoted 8 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix build for
CONFIG_MODULESnot enabled by providing a stub foris_module_percpu_address().
kernel/lockdep.c:605: error: implicit declaration of function 'is_module_percpu_address'Signed-off-by Randy Dunlap <[email protected]>
Thanks!
Rusty.
PATCH 1/1 sound: fix patch_realtek printk format
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix printk format warnings in patch_realtek.c:
ound/pci/hda/patch_realtek.c:5120: warning: format '%s' expects type 'char *', but argument 2 has type 'int' sound/pci/hda/patch_realtek.c:5120: warning: too few arguments for format
--- sound/pci/hda/patch_realtek.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +2 -1
@@ -5117,7 +5117,8 @@ static void fillup_priv_adc_nids(struct }if (!spec->num_adc_nids) {printk (KERN_WARNING "hda_codec: %s: no valid ADC found;" -" using fallback 0x%x\n" , fallback_adc); +" using fallback 0x%x\n" , + codec->chip_name, fallback_adc); spec->private_adc_nids[0 ] = fallback_adc; spec->adc_nids = spec->private_adc_nids;if (fallback_adc != fallback_cap) {
Re: [PATCH -next] sound: fix patch_realtek printk format
At Tue, 30 Mar 2010 10:46:21 -0700,
Quoted 11 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix printk format warnings in
patch_realtek.c:
ound/pci/hda/patch_realtek.c:5120: warning: format '%s' expects type 'char *', but argument 2 has type 'int'sound/pci/hda/patch_realtek.c:5120: warning: too few arguments for formatSigned-off-by Randy Dunlap <[email protected]>Cc Jaroslav Kysela <[email protected]>Cc Takashi Iwai <[email protected]>
Thanks, this was already fixed for tomorrow's merge.
Takashi
Quoted 17 lines
--- sound/pci/hda/patch_realtek.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)sound/pci/hda/patch_realtek.c +2
-1@@ -5117,7 +5117,8 @@ static void fillup_priv_adc_nids(struct }if (!spec->num_adc_nids) {printk (KERN_WARNING "hda_codec: %s: no valid ADC found;" -" using fallback 0x%x\n" , fallback_adc); +" using fallback 0x%x\n" , + codec->chip_name, fallback_adc); spec->private_adc_nids[0 ] = fallback_adc; spec->adc_nids = spec->private_adc_nids;if (fallback_adc != fallback_cap) {