From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Date: Thu, 26 Feb 2009 11:27:35 -0800 Message-ID: <200902261927.n1QJRZTO014163@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:56257 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752278AbZBZT2I (ORCPT ); Thu, 26 Feb 2009 14:28:08 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n1QJRauK022253 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 26 Feb 2009 11:27:37 -0800 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org The patch titled linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: linux-next-git-rejects From: Andrew Morton Signed-off-by: Andrew Morton --- fs/proc/inode.c | 6 ------ net/core/net_namespace.c | 16 ---------------- 2 files changed, 22 deletions(-) diff -puN fs/proc/inode.c~linux-next-git-rejects fs/proc/inode.c --- a/fs/proc/inode.c~linux-next-git-rejects +++ a/fs/proc/inode.c @@ -479,12 +479,6 @@ struct inode *proc_get_inode(struct supe } } unlock_new_inode(inode); -<<<<<<< HEAD:fs/proc/inode.c - } else { - module_put(de->owner); - de_put(de); -======= ->>>>>>> FETCH_HEAD:fs/proc/inode.c } return inode; } diff -puN net/core/net_namespace.c~linux-next-git-rejects net/core/net_namespace.c --- a/net/core/net_namespace.c~linux-next-git-rejects +++ a/net/core/net_namespace.c @@ -74,22 +74,6 @@ out_undo: goto out; } -<<<<<<< HEAD:net/core/net_namespace.c -static struct net_generic *net_alloc_generic(void) -{ - struct net_generic *ng; - size_t generic_size = sizeof(struct net_generic) + - INITIAL_NET_GEN_PTRS * sizeof(void *); - - ng = kzalloc(generic_size, GFP_KERNEL); - if (ng) - ng->len = INITIAL_NET_GEN_PTRS; - - return ng; -} - -======= ->>>>>>> FETCH_HEAD:net/core/net_namespace.c #ifdef CONFIG_NET_NS static struct kmem_cache *net_cachep; static struct workqueue_struct *netns_wq; _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch i-need-old-gcc.patch i2c-too-much-compiler-noise.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch thinkpad-acpi-split-delayed-leds-stuff-clean-up-code.patch oprofile-dont-set-counter-width-from-cpuid-on-core2-checkpatch-fixes.patch kernel-auditscc-fix-warning.patch early-platform-driver-v3.patch clocksource-pass-clocksource-to-read-callback.patch input-bcm5974-declare-alignment-usage.patch input-keyboard-introduce-lm8323-driver-checkpatch-fixes.patch leds-add-bd2802gu-led-driver.patch mmc-add-extended-csd-register-to-debugfs-checkpatch-fixes.patch mtd-rbtx4939-add-mtd-support.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets-v2-checkpatch-fixes.patch pci-enable-pcie-aer-only-after-checking-firmware-support-fix.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch vfs-simple_set_mnt-should-return-void.patch __tty_open-use-the-correct-type-for-saved_flags.patch scsi-dpt_i2o-is-bust-on-ia64.patch input-add-a-dmi-table-for-the-i8042reset-option-make-msi-wind-u-100-work.patch psmouse-synaptics-ensure-we-reset-the-device-on-resume-fix.patch nommu-fix-a-number-of-issues-with-the-per-mm-vma-patch.patch page_fault-retry-with-nopage_retry.patch page_fault-retry-with-nopage_retry-fix.patch page_fault-retry-with-nopage_retry-fix-fix.patch mm-add-proc-controls-for-pdflush-threads-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-99.patch proc-pid-maps-dont-show-pgoff-of-pure-anon-vmas-checkpatch-fixes.patch mm-introduce-for_each_populated_zone-macro-cleanup.patch mm-shrink_all_memory-use-scnr_reclaimed-checkpatch-fixes.patch mm-add-comment-why-mark_page_accessed-would-be-better-than-pte_mkyoung-in-follow_page-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch do_pipe-drop-its-last-user-in-arch-alpha-checkpatch-fixes.patch alpha-convert-u64-to-unsigned-long-long-fix.patch alpha-convert-u64-to-unsigned-long-long-fix-2.patch m68k-count-can-reach-51-not-50-checkpatch-fixes.patch epoll-keyed-wakeups-v2-teach-epoll-about-hints-coming-with-the-wakeup-key-checkpatch-fixes.patch rtc-convert-leap_year-into-an-inline.patch rtc-add-platform-driver-for-efi-fix.patch drivers-video-uvesafbc-dont-use-gfp_any.patch cirrusfb-convert-printks-to-dev_foo-fix.patch cirrusfb-convert-printks-to-dev_foo-fix-fix2.patch fbdev-uninline-lock_fb_info.patch fbdev-update-s1d13xxxfb-to-differ-between-revisions-and-production-ids-checkpatch-fixes.patch fbdev-update-s1d13xxxfb-to-differ-between-revisions-and-production-ids-simplification.patch ext3-use-unsigned-instead-of-int-for-type-of-blocksize-in-fs-ext3-nameic-fix.patch ext3-use-unsigned-instead-of-int-for-type-of-blocksize-in-fs-ext3-nameic-fix-checkpatch-fixes.patch memcg-fix-oom-killer-under-memcg-fix2.patch memcg-fix-oom-killer-under-memcg-fix.patch memcg-show-memcg-information-during-oom-fix2.patch memcg-show-memcg-information-during-oom-fix.patch memcg-show-memcg-information-during-oom-fix-fix-checkpatch-fixes.patch forget_original_parent-do-not-abuse-child-ptrace_entry-fix.patch pids-document-task_pgrp-task_session-is-not-safe-without-tasklist-rcu-fix.patch nbd-add-locking-to-nbd_ioctl-checkpatch-fixes.patch nbd-add-locking-to-nbd_ioctl-fix.patch namespaces-mqueue-namespace-adapt-sysctl-update-fix.patch edac-new-ppc4xx-driver-module-update-checkpatch-fixes.patch edac-new-ppc4xx-driver-module-update-checkpatch-fixes-checkpatch-fixes.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix-fix-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix-fix-checkpatch-fixes-cleanup.patch arch-x86-kernel-acpi-cstatec-avoid-using-work_on_cpu.patch arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-using-work_on_cpu.patch arch-x86-kernel-cpu-mcheck-mce_amd_64c-avoid-using-work_on_cpu.patch work_on_cpu-rewrite-it-to-create-a-kernel-thread-on-demand.patch nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch vfs-simple_set_mnt-should-return-void-fix-nilfs.patch nilfs2-segment-buffer-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 drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch