The patch titled drivers/scsi/sym53c8xx_2/sym_glue.c: rename skip_spaces() to sym_skip_spaces() has been removed from the -mm tree. Its filename was drivers-scsi-sym53c8xx_2-sym_gluec-rename-skip_spaces-to-sym_skip_spaces.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/scsi/sym53c8xx_2/sym_glue.c: rename skip_spaces() to sym_skip_spaces() From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> To avoid a collision with the newly-added kernel-wide skip_spaces(). Signed-off-by: André Goddard Rosa <andre.goddard@xxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/sym53c8xx_2/sym_glue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/scsi/sym53c8xx_2/sym_glue.c~drivers-scsi-sym53c8xx_2-sym_gluec-rename-skip_spaces-to-sym_skip_spaces drivers/scsi/sym53c8xx_2/sym_glue.c --- a/drivers/scsi/sym53c8xx_2/sym_glue.c~drivers-scsi-sym53c8xx_2-sym_gluec-rename-skip_spaces-to-sym_skip_spaces +++ a/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -984,7 +984,7 @@ static void sym_exec_user_command (struc } } -static int skip_spaces(char *ptr, int len) +static int sym_skip_spaces(char *ptr, int len) { int cnt, c; @@ -1012,7 +1012,7 @@ static int is_keyword(char *ptr, int len } #define SKIP_SPACES(ptr, len) \ - if ((arg_len = skip_spaces(ptr, len)) < 1) \ + if ((arg_len = sym_skip_spaces(ptr, len)) < 1) \ return -EINVAL; \ ptr += arg_len; len -= arg_len; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch revert-input-wistron_btns-switch-to-using-sparse-keymap-library.patch drivers-gpu-drm-i915-i915_dmac-fix-unused-var.patch arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-cross-cpu-interrupts-by-using-smp_call_function_any.patch acpi-remove-nid_inval.patch drivers-acpi-acpi_padc-squish-warning.patch cmpc_acpi-add-support-for-classmate-pc-acpi-devices.patch cmpc_acpi-add-support-for-classmate-pc-acpi-devices-checkpatch-fixes.patch drivers-gpu-drm-radeon-radeon_combiosc-fix-warning.patch drivers-media-video-pmsc-needs-versionh.patch timer-stats-fix-del_timer_sync-and-try_to_del_timer_sync.patch drivers-leds-leds-ss4200c-fix-return-statement.patch net-sctp-socketc-fix-warning.patch proc_fops-convert-drivers-isdn-to-seq_file-fix2.patch 3x59x-fix-pci-resource-management.patch bluetooth-fix-for-acer-bluetooth-optical-rechargeable-mouse.patch fs-ext4-superc-fix-printk-warning.patch atmel_serial-add-poll_get_char-and-poll_put_char-uart_ops.patch scsi-aacraid-fix-memory-leak-checkpatch-fixes.patch aoe-switch-to-the-new-bio_flush_dcache_pages-interface.patch fs-improve-remountro-vs-buffercache-coherency.patch drivers-net-wireless-iwlwifi-iwl-txc-fix-gcc-345-warning.patch percpu-avoid-calling-__pcpu_ptr_to_addrnull.patch readahead-add-blk_run_backing_dev.patch oom-kill-fix-numa-consraint-check-with-nodemask-v42.patch ksm-memory-hotremove-migration-only-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch spi-controller-driver-for-designware-spi-core.patch spidev-use-declare_bitmap-instead-of-declaring-the-array.patch gpiolib-add-names-file-in-gpio-chip-sysfs.patch mb862xxfb-add-acceleration-support-for-coral-p-coral-pa-imageblt-copyarea-fillrect-fix.patch mb862xxfb-add-acceleration-support-for-coral-p-coral-pa-imageblt-copyarea-fillrect-fix2.patch mb862xxfb-add-acceleration-support-for-coral-p-coral-pa-imageblt-copyarea-fillrect-fix2-fix-3.patch ext2-avoid-warn-messages-when-failing-to-write-to-the-superblock-checkpatch-fixes.patch memcg-coalesce-charging-via-percpu-storage-fix.patch memcg-code-cleanrm-unused-variable-in-mem_cgroup_resize_limit-cleanup.patch ipc-remove-unreachable-code-in-semc-fix.patch char-cyclades-fix-compiler-warning.patch fs-cache-avoid-maybe-used-uninitialised-warning-on-variable.patch aio-dont-zero-out-the-pages-array-inside-struct-dio-fix.patch direct-io-cleanup-blockdev_direct_io-locking-checkpatch-fixes.patch drivers-media-video-cx23885-needs-kfifo-conversion.patch drivers-media-video-cx23885-needs-kfifo-updates.patch revert-tty-sdio_uart-use-kfifo-instead-of-the-messy-circ-stuff.patch kfifo-move-struct-kfifo-in-place-fix.patch zlib-optimize-inffast-when-copying-direct-from-output-checkpatch-fixes.patch lib-add-support-for-lzo-compressed-kernels-checkpatch-fixes.patch lib-add-support-for-lzo-compressed-kernels-checkpatch-fixes-cleanup.patch net-netfilter-ipvs-ip_vs_wrrc-use-lib-gcdc-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch fs-reiser4-contextc-current_is_pdflush-got-removed.patch reiser4-fix.patch slab-leaks3-default-y.patch put_bh-debug.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