The patch titled
git-block-fixup
has been removed from the -mm tree. Its filename is
git-block-fixup.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: git-block-fixup
From: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/scsi.c | 6 ------
fs/namespace.c | 5 -----
include/linux/sysfs.h | 15 +++------------
include/scsi/scsi_tcq.h | 3 ---
mm/Makefile | 3 ---
5 files changed, 3 insertions(+), 29 deletions(-)
diff -puN drivers/scsi/scsi.c~git-block-fixup drivers/scsi/scsi.c
--- a/drivers/scsi/scsi.c~git-block-fixup
+++ a/drivers/scsi/scsi.c
@@ -1117,14 +1117,8 @@ static int __init init_scsi(void)
if (error)
goto cleanup_sysctl;
-<<<<<<< HEAD/drivers/scsi/scsi.c
- for_each_possible_cpu(i)
- INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
-
scsi_netlink_init();
-=======
->>>>>>> /drivers/scsi/scsi.c
printk(KERN_NOTICE "SCSI subsystem initialized\n");
return 0;
diff -puN include/scsi/scsi_tcq.h~git-block-fixup include/scsi/scsi_tcq.h
--- a/include/scsi/scsi_tcq.h~git-block-fixup
+++ a/include/scsi/scsi_tcq.h
@@ -133,7 +133,6 @@ static inline struct scsi_cmnd *scsi_fin
return sdev->current_cmnd;
}
-<<<<<<< HEAD/include/scsi/scsi_tcq.h
/**
* scsi_init_shared_tag_map - create a shared tag map
* @shost: the host to share the tag map among all devices
@@ -145,7 +144,5 @@ static inline int scsi_init_shared_tag_m
return shost->bqt ? 0 : -ENOMEM;
}
-=======
#endif /* CONFIG_BLOCK */
->>>>>>> /include/scsi/scsi_tcq.h
#endif /* _SCSI_SCSI_TCQ_H */
diff -puN fs/namespace.c~git-block-fixup fs/namespace.c
--- a/fs/namespace.c~git-block-fixup
+++ a/fs/namespace.c
@@ -28,11 +28,6 @@
#include <asm/unistd.h>
#include "pnode.h"
-<<<<<<< HEAD/fs/namespace.c
-extern int __init init_rootfs(void);
-
-=======
->>>>>>> /fs/namespace.c
/* spinlock for vfsmount related operations, inplace of dcache_lock */
__cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
diff -puN include/linux/sysfs.h~git-block-fixup include/linux/sysfs.h
--- a/include/linux/sysfs.h~git-block-fixup
+++ a/include/linux/sysfs.h
@@ -10,11 +10,8 @@
#ifndef _SYSFS_H_
#define _SYSFS_H_
-<<<<<<< HEAD/include/linux/sysfs.h
#include <linux/compiler.h>
-=======
#include <linux/init.h>
->>>>>>> /include/linux/sysfs.h
#include <asm/atomic.h>
struct kobject;
@@ -91,15 +88,9 @@ struct sysfs_dirent {
#ifdef CONFIG_SYSFS
-<<<<<<< HEAD/include/linux/sysfs.h
-extern int __must_check
-=======
-extern int __init
-sysfs_init(void);
-
-extern int
->>>>>>> /include/linux/sysfs.h
-sysfs_create_dir(struct kobject *);
+extern int __must_check __init sysfs_init(void);
+
+extern int sysfs_create_dir(struct kobject *);
extern void
sysfs_remove_dir(struct kobject *);
diff -puN mm/Makefile~git-block-fixup mm/Makefile
--- a/mm/Makefile~git-block-fixup
+++ a/mm/Makefile
@@ -26,7 +26,4 @@ obj-$(CONFIG_SLAB) += slab.o
obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
obj-$(CONFIG_FS_XIP) += filemap_xip.o
obj-$(CONFIG_MIGRATION) += migrate.o
-<<<<<<< HEAD/mm/Makefile
obj-$(CONFIG_SMP) += allocpercpu.o
-=======
->>>>>>> /mm/Makefile
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
list_del-debug-fix.patch
git-acpi.patch
acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
kauditd_thread-warning-fix.patch
git-dvb.patch
git-geode-fixup.patch
git-gfs2.patch
git-ia64.patch
git-input.patch
hdrcheck-permission-fix.patch
git-libata-all.patch
libata-return-sense-data-in-hdio_drive_cmd-ioctl-tidy.patch
mmc-driver-for-ti-flashmedia-card-reader-source.patch
git-mtd-fixup.patch
git-netdev-all.patch
forcedeth-power-management-support-tidy.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
revert-genirq-core-fix-handle_level_irq.patch
git-parisc-fixup.patch
git-parisc-powerpc-fix.patch
git-pcmcia-fixup.patch
git-serial.patch
git-serial-fixup.patch
serial-fix-uart_bug_txen-test.patch
pci-optionally-sort-device-lists-breadth-first-tweaks.patch
pci-optionally-sort-device-lists-breadth-first-force-on.patch
git-scsi-misc.patch
git-scsi-target-vs-git-block.patch
xpad-dance-pad-support-tidy.patch
git-watchdog.patch
git-watchdog-fixup.patch
revert-insert-ioapics-and-local-apic-into-resource-map.patch
x86_64-dump_trace-atomicity-fix.patch
spinlock-debug-all-cpu-backtrace.patch
spinlock-debug-all-cpu-backtrace-fix.patch
spinlock-debug-all-cpu-backtrace-fix-2.patch
spinlock-debug-all-cpu-backtrace-fix-3.patch
arch-i386-pci-mmconfigc-tlb-flush-fix-tweaks.patch
xfs-rename-uio_read.patch
invalidate_inode_pages2-ignore-page-refcounts.patch
get-rid-of-zone_table-fix.patch
slab-reduce-numa-text-size-tidy.patch
radix-tree-rcu-lockless-readside.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
swsusp-add-resume_offset-command-line-parameter-rev-2-fix.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
add-address_space_operationsbatch_write-fix.patch
maximum-latency-tracking-infrastructure-tidy.patch
kmemdup-introduce-vs-slab-clean-up-leak-tracking-ifdefs-a-little-bit.patch
add-config_headers_check-option-to-automatically-run-make-headers_check-nobble.patch
submit-checklist-mention-headers_check.patch
generic-bug-handling.patch
use-generic-bug-for-i386.patch
use-generic-bug-for-x86-64.patch
use-generic-bug-for-powerpc.patch
use-generic-bug-for-powerpc-fix-2.patch
use-generic-bug-for-powerpc-fix-infinite-loop-on-bug.patch
bug-test-1.patch
list-module-taint-flags-in-oops-panic-tidy.patch
ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
reiserfs-on-demand-bitmap-loading.patch
streamline-generic_file_-interfaces-and-filemap-gfs-fix.patch
add-vector-aio-support-fix.patch
csa-basic-accounting-over-taskstats-fix.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
generic-ioremap_page_range-x86_64-conversion-fix.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch
some-cleanup-in-the-pipe-code-tidy.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch
move-pidmap-to-pspaceh-fix.patch
kprobes-handle-symbol-resolution-when-modulesymbol-is-specified-tidy.patch
isdn-work-around-excessive-udelay.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-tidy.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-fix.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch
knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch
knfsd-move-tempsock-aging-to-a-timer-tidy.patch
knfsd-nfsd4-fslocations-data-structures-fix.patch
sched-remove-unnecessary-sched-group-allocations-fix.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
make-kmem_cache_destroy-return-void-ecryptfs.patch
ecryptfs-versioning-fixes-tidy.patch
namespaces-add-nsproxy.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
rename-the-provided-execve-functions-to-kernel_execve-headers-fix.patch
replace-cad_pid-by-a-struct-pid-fixes.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-rename-generic_sounding_globalspatch-fix.patch
hpt3xx-rework-rate-filtering-tidy.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-msi-only-build-msi-apicc-on-ia64-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
srcu-report-out-of-memory-errors-fixlet.patch
isdn-debug-build-fix.patch
isdn-more-pr_debug-fixes.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-fix.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
