The patch titled git-watchdog: prevent kconfig explosion has been added to the -mm tree. Its filename is git-watchdog-prevent-kconfig-explosion.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: git-watchdog: prevent kconfig explosion From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> drivers/watchdog/Kconfig:305: unknown option "CS5535" drivers/watchdog/Kconfig:306: unknown option "processors" drivers/watchdog/Kconfig:307: unknown option "it" drivers/watchdog/Kconfig:308: unknown option "a" drivers/watchdog/Kconfig:310: unknown option "You" drivers/watchdog/Kconfig:311: unknown option "it" That seems rather severe treatment for just an extra leading space? Cc: Wim Van Sebroeck <wim@xxxxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/watchdog/Kconfig~git-watchdog-prevent-kconfig-explosion drivers/watchdog/Kconfig --- a/drivers/watchdog/Kconfig~git-watchdog-prevent-kconfig-explosion +++ a/drivers/watchdog/Kconfig @@ -301,7 +301,7 @@ config GEODE_WDT tristate "AMD Geode CS5535/CS5536 Watchdog" depends on MGEODE_LX help - This driver enables a watchdog capability built into the + This driver enables a watchdog capability built into the CS5535/CS5536 companion chips for the AMD Geode GX and LX processors. This watchdog watches your kernel to make sure it doesn't freeze, and if it does, it reboots your computer after _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch rename-declare_pci_device_table-to-define_pci_device_table.patch git-x86.patch arch-x86-kernel-ptracec-fix-defined-but-unused-warnings.patch git-acpi-fixup.patch acpi-enable-c3-power-state-on-dell-inspiron-8200.patch git-alsa.patch git-alsa-fix-git-conflicts.patch git-arm-master.patch git-powerpc-fix-git-rejects.patch revert-gregkh-driver-video-add-the-go7007-driver.patch fix-gregkh-driver-net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch driver-core-debug-for-bad-dev_attr_show-return-value.patch git-drm.patch git-dvb.patch oz99x-i2c-button-and-led-support-driver.patch git-hwmon.patch git-hrt.patch drivers-input-touchscreen-ads7846c-fix-uninitialized-var-warning.patch maple-add-driver-for-sega-dreamcast-controller-update-checkpatch-fixes.patch git-kvm.patch git-md-accel.patch git-md-accel-fix-git-rejects.patch git-net.patch update-smc91x-driver-with-arm-versatile-board-info.patch git-nfsd.patch git-ocfs2.patch git-selinux.patch git-sh.patch scsi-aic94xx-cleanups.patch scsi-chc-fix-shadowed-variable-warnings-checkpatch-fixes.patch git-block-git-rejects.patch git-unionfs.patch git-v9fs.patch git-watchdog.patch git-semaphore-git-rejects.patch remove-sparse-warning-for-mmzoneh-checkpatch-fixes.patch fix-invalidate_inode_pages2_range-to-not-clear-ret-checkpatch-fixes.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch capabilities-implement-per-process-securebits-warning-fix.patch lsm-introduce-inode_getsecid-and-ipc_getsecid-hooks-checkpatch-fixes.patch lsm-audit-introduce-generic-audit-lsm-hooks-checkpatch-fixes.patch selinux-use-new-audit-hooks-remove-redundant-exports-checkpatch-fixes.patch audit-final-renamings-and-cleanup-checkpatch-fixes.patch make-dev-kmem-a-config-option-fix.patch misc-phantom-add-compat-ioctl-checkpatch-fixes.patch kernel-add-clamp-and-clamp_t-macros-checkpatch-fixes.patch kernel-add-clamp-and-clamp_t-macros-fix.patch r-o-bind-mounts-elevate-write-count-for-callers-of-vfs_mkdir-fix.patch r-o-bind-mounts-elevate-write-count-for-xattr_permission-callers-fix.patch r-o-bind-mounts-get-write-access-for-vfs_rename-callers-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix-2.patch r-o-bind-mounts-get-callers-of-vfs_mknod-create-fix.patch fs-inodec-use-hlist_for_each_entry-checkpatch-fixes.patch add-rcu_assign_index-if-ever-needed-fix.patch uart_get_baud_rate-stop-mangling-termios-fix.patch oprofile-change-cpu_buffer-from-array-to-per_cpu-variable-checkpatch-fixes.patch vt-notifier-extension-for-accessibility-checkpatch-fixes.patch kprobes-prevent-probing-of-preempt_schedule-fix.patch kprobes-prevent-probing-of-preempt_schedule-checkpatch-fixes.patch rtc-isl1208-new-style-conversion-and-minor-bug-fixes-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes-fix.patch rtc-x1205-new-style-conversion-checkpatch-fixes.patch fb-add-support-for-foreign-endianness-force-it-on.patch fbcon-replace-mono_col-macro-with-static-inline-fix.patch fat_valid_media-remove-pointless-test.patch cgroup-api-files-update-cpusets-to-use-cgroup-structured-file-api-fix.patch workqueues-shrink-cpu_populated_map-when-cpu-dies-fix.patch ext4-is-broken.patch ipc-use-ipc_buildid-directly-from-ipc_addid-cleanup.patch ipmi-run-to-completion-fixes-checkpatch-fixes.patch ipmi-style-fixes-in-the-system-interface-code-checkpatch-fixes.patch elf-fix-shadowed-variables-in-fs-binfmt_elfc.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix-2.patch epcac-static-functions-and-integer-as-null-pointer-fixes-checkpatch-fixes.patch keys-add-keyctl-function-to-get-a-security-label-fix.patch procfs-task-exe-symlink-fix.patch edd-add-default-mode-config_edd_off=n-override-with-edd=onoff-fix.patch mm-bdi-export-bdi-attributes-in-sysfs-ia64-fix.patch basic-braille-screen-reader-support-ppc-fix.patch reiser4.patch jens-broke-reiser4patch-added-to-mm-tree.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch profile-likely-unlikely-macros.patch profile-likely-unlikely-macros-fix.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch w1-build-fix.patch git-watchdog-prevent-kconfig-explosion.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html