The patch titled
git-net-fixup
has been added to the -mm tree. Its filename is
git-net-fixup.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: git-net-fixup
From: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/core/dev.c | 14 --------------
net/ipv4/fib_semantics.c | 24 ------------------------
net/ipv6/tcp_ipv6.c | 5 -----
net/xfrm/xfrm_policy.c | 26 --------------------------
4 files changed, 69 deletions(-)
diff -puN net/core/dev.c~git-net-fixup net/core/dev.c
--- a/net/core/dev.c~git-net-fixup
+++ a/net/core/dev.c
@@ -638,25 +638,11 @@ struct net_device * dev_get_by_flags(uns
*/
int dev_valid_name(const char *name)
{
-<<<<<<< HEAD/net/core/dev.c
- if (*name == '\0')
- return 0;
- if (!strcmp(name, ".") || !strcmp(name, ".."))
- return 0;
-
- while (*name) {
- if (*name == '/' || isspace(*name))
- return 0;
- name++;
- }
- return 1;
-=======
return !(*name == '\0'
|| strlen(name) >= IFNAMSIZ
|| !strcmp(name, ".")
|| !strcmp(name, "..")
|| strchr(name, '/'));
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/core/dev.c
}
/**
diff -puN net/ipv4/fib_semantics.c~git-net-fixup net/ipv4/fib_semantics.c
--- a/net/ipv4/fib_semantics.c~git-net-fixup
+++ a/net/ipv4/fib_semantics.c
@@ -160,11 +160,7 @@ void free_fib_info(struct fib_info *fi)
void fib_release_info(struct fib_info *fi)
{
-<<<<<<< HEAD/net/ipv4/fib_semantics.c
- write_lock_bh(&fib_info_lock);
-=======
spin_lock(&fib_info_lock);
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/ipv4/fib_semantics.c
if (fi && --fi->fib_treeref == 0) {
hlist_del(&fi->fib_hash);
if (fi->fib_prefsrc)
@@ -177,11 +173,7 @@ void fib_release_info(struct fib_info *f
fi->fib_dead = 1;
fib_info_put(fi);
}
-<<<<<<< HEAD/net/ipv4/fib_semantics.c
- write_unlock_bh(&fib_info_lock);
-=======
spin_unlock(&fib_info_lock);
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/ipv4/fib_semantics.c
}
static __inline__ int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)
@@ -611,11 +603,7 @@ static void fib_hash_move(struct hlist_h
unsigned int old_size = fib_hash_size;
unsigned int i, bytes;
-<<<<<<< HEAD/net/ipv4/fib_semantics.c
- write_lock_bh(&fib_info_lock);
-=======
spin_lock(&fib_info_lock);
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/ipv4/fib_semantics.c
old_info_hash = fib_info_hash;
old_laddrhash = fib_info_laddrhash;
fib_hash_size = new_size;
@@ -656,11 +644,7 @@ static void fib_hash_move(struct hlist_h
}
fib_info_laddrhash = new_laddrhash;
-<<<<<<< HEAD/net/ipv4/fib_semantics.c
- write_unlock_bh(&fib_info_lock);
-=======
spin_unlock(&fib_info_lock);
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/ipv4/fib_semantics.c
bytes = old_size * sizeof(struct hlist_head *);
fib_hash_free(old_info_hash, bytes);
@@ -827,11 +811,7 @@ link_it:
fi->fib_treeref++;
atomic_inc(&fi->fib_clntref);
-<<<<<<< HEAD/net/ipv4/fib_semantics.c
- write_lock_bh(&fib_info_lock);
-=======
spin_lock(&fib_info_lock);
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/ipv4/fib_semantics.c
hlist_add_head(&fi->fib_hash,
&fib_info_hash[fib_info_hashfn(fi)]);
if (fi->fib_prefsrc) {
@@ -850,11 +830,7 @@ link_it:
head = &fib_info_devhash[hash];
hlist_add_head(&nh->nh_hash, head);
} endfor_nexthops(fi)
-<<<<<<< HEAD/net/ipv4/fib_semantics.c
- write_unlock_bh(&fib_info_lock);
-=======
spin_unlock(&fib_info_lock);
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/ipv4/fib_semantics.c
return fi;
err_inval:
diff -puN net/ipv6/tcp_ipv6.c~git-net-fixup net/ipv6/tcp_ipv6.c
--- a/net/ipv6/tcp_ipv6.c~git-net-fixup
+++ a/net/ipv6/tcp_ipv6.c
@@ -953,13 +953,8 @@ static struct sock * tcp_v6_syn_recv_soc
* comment in that function for the gory details. -acme
*/
-<<<<<<< HEAD/net/ipv6/tcp_ipv6.c
- newsk->sk_gso_type = SKB_GSO_TCPV6;
- __ip6_dst_store(newsk, dst, NULL);
-=======
sk->sk_gso_type = SKB_GSO_TCPV6;
__ip6_dst_store(newsk, dst, NULL, NULL);
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/ipv6/tcp_ipv6.c
newtcp6sk = (struct tcp6_sock *)newsk;
inet_sk(newsk)->pinet6 = &newtcp6sk->inet6;
diff -puN net/xfrm/xfrm_policy.c~git-net-fixup net/xfrm/xfrm_policy.c
--- a/net/xfrm/xfrm_policy.c~git-net-fixup
+++ a/net/xfrm/xfrm_policy.c
@@ -1655,35 +1655,9 @@ EXPORT_SYMBOL(__xfrm_route_forward);
static struct dst_entry *xfrm_dst_check(struct dst_entry *dst, u32 cookie)
{
-<<<<<<< HEAD/net/xfrm/xfrm_policy.c
- /* Code (such as __xfrm4_bundle_create()) sets dst->obsolete
- * to "-1" to force all XFRM destinations to get validated by
- * dst_ops->check on every use. We do this because when a
- * normal route referenced by an XFRM dst is obsoleted we do
- * not go looking around for all parent referencing XFRM dsts
- * so that we can invalidate them. It is just too much work.
- * Instead we make the checks here on every use. For example:
- *
- * XFRM dst A --> IPv4 dst X
- *
- * X is the "xdst->route" of A (X is also the "dst->path" of A
- * in this example). If X is marked obsolete, "A" will not
- * notice. That's what we are validating here via the
- * stale_bundle() check.
- *
- * When a policy's bundle is pruned, we dst_free() the XFRM
- * dst which causes it's ->obsolete field to be set to a
- * positive non-zero integer. If an XFRM dst has been pruned
- * like this, we want to force a new route lookup.
- */
- if (dst->obsolete < 0 && !stale_bundle(dst))
- return dst;
-
-=======
if (!stale_bundle(dst))
return dst;
->>>>>>> dee142e3b9cbbfe701d5811a9cdb03207b0b6765/net/xfrm/xfrm_policy.c
return NULL;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
zvc-scale-thresholds-depending-on-the-size-of-the-system.patch
x86-increase-max_mp_busses-on-default-arch.patch
git-acpi.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
git-alsa.patch
kauditd_thread-warning-fix.patch
revert-gregkh-driver-class_device_rename-remove.patch
revert-gregkh-driver-network-class_device-to-device.patch
revert-gregkh-driver-tty-device.patch
revert-gregkh-driver-mem-devices.patch
drivers-base-check-errors.patch
scsi-device_reprobe-can-fail.patch
git-drm.patch
git-dvb.patch
git-dvb-fixup.patch
git-gfs2.patch
git-ia64.patch
git-ieee1394-fixup.patch
git-input.patch
git-intelfb-fixup.patch
git-kbuild.patch
git-libata-all.patch
asus-mv-device-ids.patch
1-of-2-jmicron-driver-fix.patch
via-pata-controller-xfer-fixes-fix.patch
git-netdev-all.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-net.patch
git-net-fixup.patch
git-nfs-fixup.patch
git-pcmcia-fixup.patch
git-powerpc.patch
tickle-nmi-watchdog-on-serial-output-fix.patch
serial-fix-uart_bug_txen-test.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
revert-scsi-improve-inquiry-printing.patch
fix-panic-when-reinserting-adaptec-pcmcia-scsi-card.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
git-sas.patch
git-block-vs-git-sas.patch
usb-hub-driver-improve-use-of-ifdef-fix.patch
gregkh-usb-usb-storage-add-rio-karma-eject-support-fix.patch
pm-usb-hcds-use-pm_event_prethaw-fix.patch
rtl8150_disconnect-needs-tasklet_kill.patch
git-supertrak-fixup.patch
git-watchdog.patch
kthread-airoc.patch
x86_64-mm-spin-irqs-enabled-fix.patch
mm-x86_64-mm-generic-getcpu-syscall-tweaks.patch
revert-x86_64-mm-i386-remove-lock-section.patch
revert-x86_64-mm-detect-cfi.patch
git-cryptodev-fixup.patch
git-cryptodev-fixup-2.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
convert-i386-numa-kva-space-to-bootmem-tidy.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-fix.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix.patch
out-of-memory-notifier-tidy.patch
mm-swap-write-failure-fixup-fix.patch
slab-optimize-kmalloc_node-the-same-way-as-kmalloc-fix.patch
slab-fix-lockdep-warnings-fix-2.patch
have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch
zone_reclaim-dynamic-slab-reclaim-tidy.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
selinux-2-3-change-isec-semaphore-to-a-mutex-vs-git-net.patch
binfmt_elf-consistently-use-loff_t.patch
convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls-tidy.patch
i386-adds-smp_call_function_single-fix.patch
swsusp-write-timer.patch
swsusp-write-speedup.patch
swsusp-read-timer.patch
swsusp-read-speedup.patch
swsusp-read-speedup-fix.patch
swsusp-read-speedup-cleanup.patch
swsusp-read-speedup-cleanup-2.patch
swsusp-read-speedup-fix-fix-2.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private-gfs-fix.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
blockdevc-check-errors.patch
let-warn_on-warn_on_once-return-the-condition-fix.patch
let-warn_on-warn_on_once-return-the-condition-fix-2.patch
omap-add-watchdog-driver-support-tweaks.patch
move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch
single-bit-flip-detector-tidy.patch
fix-unserialized-task-files-changing-fix.patch
tty-make-termios_sem-a-mutex-fix.patch
solaris-emulation-incorrect-tty-locking-fix.patch
solaris-emulation-incorrect-tty-locking-fix-2.patch
remove-sound-oss-copying.patch
maximum-latency-tracking-infrastructure-tidy.patch
fs-nameic-replace-multiple-current-fs-by-shortcut-variable-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
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-have-ext2-reject-file-handles-with-bad-inode-numbers-early-tidy.patch
knfsd-make-ext3-reject-filehandles-referring-to-invalid-inode-numbers-tidy.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
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
namespaces-add-nsproxy.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
ipc-namespace-core.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
asus-mv-ide-device-ids.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
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
input_register_device-debug.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
