linux-next: Tree for March 25
Subsystems (6)
Hi all,
Changes since 20100324:
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 input tree lost its build failure.
The kgdb tree has its build failure back for which I have applied a merge fixup patch.
The wireless 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 158 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 · 190 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 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 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 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 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/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 CONFLICT (content): Merge conflict in drivers/ata/ahci.c Merging infiniband/for-next Merging acpi/test 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 Merging wireless/master Merging mtd/master CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c 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 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 Applying: kgdb: update for sysrq handling change 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 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 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 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 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 Merging quilt/staging Merging scsi-post-merge/master
PATCH 1/3 drm: fix build error when SYSRQ is disabled
From: Randy Dunlap <[email protected]>
Fix build error when CONFIG_MAGIC_SYSRQ is not enabled:
drivers/gpu/drm/drm_fb_helper.c:915: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function) drivers/gpu/drm/drm_fb_helper.c:929: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function)
--- drivers/gpu/drm/drm_fb_helper.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_fb_helper.c +2 -0
@@ -283,6 +283,8 @@ static struct sysrq_key_op sysrq_drm_fb_ .help_msg = "force-fb(V)", .action_msg = "Restore framebuffer console", }; +#else +static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { };#endif static void drm_fb_helper_on (struct fb_info *info)
PATCH 2/3 usb: fix serial build when SYSRQ is disabled
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix build error when CONFIG_MAGIC_SYSRQ is not enabled:
drivers/usb/serial/generic.c:566: error: implicit declaration of function 'handle_sysrq'
--- drivers/usb/serial/generic.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/serial/generic.c +9 -0
@@ -12,6 +12,7 @@#include <linux/kernel.h> #include <linux/errno.h> #include <linux/slab.h> +#include <linux/sysrq.h> #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/module.h>
@@ -558,6 +559,7 @@ void usb_serial_generic_unthrottle(struc } } +#ifdef CONFIG_MAGIC_SYSRQ int usb_serial_handle_sysrq_char (struct tty_struct *tty,struct usb_serial_port *port,unsigned int ch) {
@@ -571,6 +573,13 @@ int usb_serial_handle_sysrq_char(struct }return 0 ; } +#else +int usb_serial_handle_sysrq_char (struct tty_struct *tty, +struct usb_serial_port *port,unsigned int ch) +{ +return 0 ; +} +#endif EXPORT_SYMBOL_GPL (usb_serial_handle_sysrq_char);int usb_serial_handle_break (struct usb_serial_port *port)
PATCH 3/3 xen: fix build when SYSRQ is disabled
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix build error when CONFIG_MAGIC_SYSRQ is not enabled:
drivers/xen/manage.c:223: error: implicit declaration of function 'handle_sysrq'
--- drivers/xen/manage.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/xen/manage.c +9 -5
@@ -194,6 +194,7 @@ static void shutdown_handler(struct xenbkfree (str); } +#ifdef CONFIG_MAGIC_SYSRQ static void sysrq_handler (struct xenbus_watch *watch,const char **vec,unsigned int len) {
@@ -223,15 +224,16 @@ static void sysrq_handler(struct xenbus_ handle_sysrq(sysrq_key, NULL); } -static struct xenbus_watch shutdown_watch = { - .node ="control/shutdown" , - .callback = shutdown_handler -}; -static struct xenbus_watch sysrq_watch = { .node ="control/sysrq" , .callback = sysrq_handler }; +#endif + +static struct xenbus_watch shutdown_watch = { + .node ="control/shutdown" , + .callback = shutdown_handler +};static int setup_shutdown_watcher (void ) {
@@ -243,11 +245,13 @@ static int setup_shutdown_watcher(void)return err; } +#ifdef CONFIG_MAGIC_SYSRQ err =register_xenbus_watch (&sysrq_watch);if (err) {printk (KERN_ERR "Failed to set sysrq watcher\n" );return err; } +#endif return 0 ; }
Re: [PATCH 3/3 -next] xen: fix build when SYSRQ is disabled
Quoted 6 lines · Randy Dunlap
From: Randy Dunlap<[email protected]>
Fix build error when
CONFIG_MAGIC_SYSRQis not enabled:
drivers/xen/manage.c:223: error: implicit declaration of function 'handle_sysrq'
Yep, looks fine.
J
Quoted 54 lines
Signed-off-by Randy Dunlap<[email protected]>Cc Jeremy Fitzhardinge<[email protected]>Cc Chris Wright<[email protected]>--- drivers/xen/manage.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)drivers/xen/manage.c +9
-5@@ -194,6 +194,7 @@ static void shutdown_handler(struct xenbkfree (str); } +#ifdef CONFIG_MAGIC_SYSRQ static void sysrq_handler (struct xenbus_watch *watch,const char **vec,unsigned int len) {@@ -223,15 +224,16 @@ static void sysrq_handler(struct xenbus_ handle_sysrq(sysrq_key, NULL); } -static struct xenbus_watch shutdown_watch = { - .node ="control/shutdown" , - .callback = shutdown_handler -}; -static struct xenbus_watch sysrq_watch = { .node ="control/sysrq" , .callback = sysrq_handler }; +#endif + +static struct xenbus_watch shutdown_watch = { + .node ="control/shutdown" , + .callback = shutdown_handler +};static int setup_shutdown_watcher (void ) {@@ -243,11 +245,13 @@ static int setup_shutdown_watcher(void)return err; } +#ifdef CONFIG_MAGIC_SYSRQ err =register_xenbus_watch (&sysrq_watch);if (err) {printk (KERN_ERR "Failed to set sysrq watcher\n" );return err; } +#endif return 0 ; }