The patch titled mtd-fix-timeout-in-m25p80-driver-fix has been added to the -mm tree. Its filename is mtd-fix-timeout-in-m25p80-driver-fix.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://userweb.kernel.org/~akpm/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: mtd-fix-timeout-in-m25p80-driver-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> fix merge snafu Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Martin Michlmayr <tbm@xxxxxxxxxx> Cc: Peter Horton <zero@xxxxxxxxxxxxxxxxx> Cc: Steven A. Falco <sfalco@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mtd/devices/m25p80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/mtd/devices/m25p80.c~mtd-fix-timeout-in-m25p80-driver-fix drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c~mtd-fix-timeout-in-m25p80-driver-fix +++ a/drivers/mtd/devices/m25p80.c @@ -54,7 +54,7 @@ #define SR_SRWD 0x80 /* SR write protect */ /* Define max times to check status register before we give up. */ -#define MAX_READY_WAIT_COUNT (10 * HZ) /* eg. M25P128 specs 6s max sector erase */ +#define MAX_READY_WAIT_JIFFIES (10 * HZ) /* eg. M25P128 specs 6s max sector erase */ #define CMD_SIZE 4 #ifdef CONFIG_M25PXX_USE_FAST_READ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-close-page_mkwrite-races-try-3.patch vmscan-avoid-multiplication-overflow-in-shrink_zone.patch i2c-too-much-compiler-noise.patch linux-next.patch next-remove-localversion.patch dmar-stupid-hack.patch i-need-old-gcc.patch arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-cross-cpu-interrupts.patch arch-x86-kernel-apic-io_apicc-conditionally-compile-eoi_ioapic_irq.patch drivers-gpu-drm-i915-intel_fbc-remove-sysrq-g-handler.patch dvb-core-fix-potential-mutex_unlock-without-mutex_lock-in-dvb_dvr_read-fix.patch input-keyboard-introduce-lm8323-driver.patch drivers-input-xpadc-improve-xbox-360-wireless-support-and-add-sysfs-interface-checkpatch-fixes.patch input-documentation-input-xpadtxt-update-for-new-driver-functionality-checkpatch-fixes.patch mtd-flex-onenand-support.patch mtd-fix-timeout-in-m25p80-driver-fix.patch misdn-l1oip-reduce-stack-memory-footprint.patch drivers-net-82596c-suppress-warnings.patch forcedeth-add-clock-gating-feature-checkpatch-fixes.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets-v2.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch libfs-make-simple_read_from_buffer-conventional.patch eliminate-thousands-of-warnings-with-gcc-32-build-cleanup.patch scsi-dpt_i2o-is-bust-on-ia64.patch leds-of_register_platform_driver-doesnt-exist-on-sparc64.patch squashfs-fix-breakage-when-pagesize-blocksize-checkpatch-fixes.patch mm-consolidate-init_mm-definition-fix.patch readahead-record-mmap-read-around-states-in-file_ra_state-checkpatch-fixes.patch mm-clean-up-get_user_pages_fast-documentation-checkpatch-fixes.patch ksm-add-get_pte-helper-function-fetching-pte-for-va-fix.patch ksm-add-ksm-kernel-shared-memory-driver-checkpatch-fixes.patch ksm-add-ksm-kernel-shared-memory-driver-borked-on-non-x86.patch page-allocator-do-not-sanity-check-order-in-the-fast-path-fix.patch page-allocator-calculate-the-preferred-zone-for-allocation-only-once-fix.patch page-allocator-remove-a-branch-by-assuming-__gfp_high-==-alloc_high.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch m68k-count-can-reach-51-not-50.patch rb_tree-reorganize-code-in-rb_erase-for-additional-changes-checkpatch-fixes.patch flat-fix-data-sections-alignment.patch drivers-char-memc-memory_open-cleanup-lookup-minor-device-number-from-devlist-checkpatch-fixes.patch edac-add-cpc925-memory-controller-driver-cleanup.patch edac-add-edac_device_alloc_index-cleanup.patch gru-support-for-asynchronous-gru-instructions-fix.patch mutex-add-atomic_dec_and_mutex_lock-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.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 notify_change-callers-must-hold-i_mutex.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