The patch titled NTFS: rename incorrect check of NTFS_DEBUG with just DEBUG has been added to the -mm tree. Its filename is ntfs-rename-incorrect-check-of-ntfs_debug-with-just-debug.patch *** 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 ------------------------------------------------------ Subject: NTFS: rename incorrect check of NTFS_DEBUG with just DEBUG From: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Replace the incorrect debugging check of "#ifdef NTFS_DEBUG" with just "#ifdef DEBUG". Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Acked-by: Anton Altaparmakov <aia21@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/ntfs/attrib.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ntfs/attrib.c~ntfs-rename-incorrect-check-of-ntfs_debug-with-just-debug fs/ntfs/attrib.c --- a/fs/ntfs/attrib.c~ntfs-rename-incorrect-check-of-ntfs_debug-with-just-debug +++ a/fs/ntfs/attrib.c @@ -1921,7 +1921,7 @@ s64 ntfs_attr_extend_allocation(ntfs_ino u32 attr_len = 0; /* Silence stupid gcc warning. */ bool mp_rebuilt; -#ifdef NTFS_DEBUG +#ifdef DEBUG read_lock_irqsave(&ni->size_lock, flags); allocated_size = ni->allocated_size; read_unlock_irqrestore(&ni->size_lock, flags); _ Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are git-acpi.patch git-alsa.patch ppc-use-syslog-macro-for-the-printk-log-level.patch fix-apparent-typo-config_serial_cpm_smc.patch remove-the-unused-kernel-config-option-video_videobuf.patch change-incorrect-config_input_atixl-to-config_mouse_atixl.patch kbuild-remove-references-to-deprecated-prepare-all-target.patch git-mips.patch remove-unused-kernel-config-option-dlci_count.patch remove-useless-find_first_bit-macro-from-cardbusc.patch remove-some-unused-scsi-related-kernel-config-variables.patch scsi-fix-obvious-typo-spin_lock_irqrestore-in-gdthc.patch fix-misspelled-usbnet_mii-kernel-config-option.patch fix-apparent-typo-config_usb_cdcether.patch rename-ipw2100-debugging-macros-to-not-look-like-config.patch replace-incorrect-macro-name-wireless_ext-with.patch remove-unused-kernel-config-option-x86_xadd.patch uml-fix-apparent-config_64_bit-typo.patch transform-kmem_cache_allocmemset0-kmem_cache_zalloc.patch get-rid-of-double-zeroing-of-allocated-pages.patch remove-unnecessary-memset0-calls-after-kzalloc-calls.patch discuss-a-couple-common-errors-in-kernel-doc-usage.patch numerous-fixes-to-kernel-doc-info-in-source-files.patch remove-a-couple-final-references-to-obsolete-verify_area.patch remove-the-last-reference-to-rwlock_is_locked-macro.patch extend-the-set-of-__attribute__-shortcut-macros.patch remove-final-reference-to-superfluous-smp_commence.patch replace-regular-code-with-appropriate-calls-to-container_of.patch remove-dead-kernel-config-option-aedsp16_mpu401.patch remove-references-to-obsolete-kernel-config-option-debug_rwsems.patch remove-unused-kernel-config-option-zisofs_fs.patch remove-unused-kernel-config-option-lcd_device.patch remove-unused-kernel-config-option-paride_parport.patch fix-apparent-typo-config_lockdep_debug.patch add-is_power_of_2-checking-to-log2h.patch ntfs-rename-incorrect-check-of-ntfs_debug-with-just-debug.patch isdn-fix-typo-config_hisax_quadro-config_hisax_sct_quadro.patch isdn-rename-some-debugging-macros-to-not-resemble-config.patch isdn-rename-debug-option-config_serial_nopause_io.patch isdn-remove-defunct-test-emulator.patch isdn-rename-special-macro-config_hisax_hfc4s8s_pcimem.patch correct-apparent-typo-config_aty_ct-in-aty-video.patch oss-replace-kmallocmemset-combos-with-kzalloc.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