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, 08 Mar 2012 11:09:52 -0800 Message-ID: <20120308190957.A293BA03DB@akpm.mtv.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-ee0-f74.google.com ([74.125.83.74]:43338 "EHLO mail-ee0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756814Ab2CHTKD (ORCPT ); Thu, 8 Mar 2012 14:10:03 -0500 Received: by eekc41 with SMTP id c41so29982eek.1 for ; Thu, 08 Mar 2012 11:10:00 -0800 (PST) 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 Subject: 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/ ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- arch/arm/mach-vexpress/Kconfig | 3 --- drivers/net/ethernet/broadcom/tg3.c | 3 --- 2 files changed, 6 deletions(-) diff -puN arch/arm/mach-vexpress/Kconfig~linux-next-git-rejects arch/arm/mach-vexpress/Kconfig --- a/arch/arm/mach-vexpress/Kconfig~linux-next-git-rejects +++ a/arch/arm/mach-vexpress/Kconfig @@ -24,15 +24,12 @@ config ARCH_VEXPRESS_DT bool "Device Tree support for Versatile Express platforms" select ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA select ARM_GIC -<<<<<<< HEAD select ARM_ERRATA_720789 select ARM_ERRATA_751472 select PL310_ERRATA_753970 -======= select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR select CPU_V7 ->>>>>>> linux-next/akpm-end select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select USE_OF diff -puN drivers/net/ethernet/broadcom/tg3.c~linux-next-git-rejects drivers/net/ethernet/broadcom/tg3.c --- a/drivers/net/ethernet/broadcom/tg3.c~linux-next-git-rejects +++ a/drivers/net/ethernet/broadcom/tg3.c @@ -6972,12 +6972,9 @@ static netdev_tx_t tg3_start_xmit(struct skb_tx_timestamp(skb); netdev_tx_sent_queue(txq, skb->len); -<<<<<<< HEAD -======= /* Sync BD data before updating mailbox */ wmb(); ->>>>>>> linux-next/akpm-end /* Packets are ready, update Tx producer idx local and on card. */ tw32_tx_mbox(tnapi->prodmbox, entry); _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-block-nvmec-stop-breaking-my-i386-build.patch drivers-mfd-twl-corec-wtf-isnt-this-fixed-yet.patch drivers-mfd-twl-corec-unbork.patch drivers-staging-zsmalloc-zsmalloc-mainc-unbork.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs.patch drivers-platform-x86-sony-laptopc-fix-scancodes.patch net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer.patch x86-pci-increase-the-number-of-iommus-supported-to-be-max_io_apics.patch x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs.patch percpu-remove-percpu_xxx-functions-fix.patch drivers-media-video-uvc-uvc_driverc-use-linux-atomich.patch thermal-thermal_sys-fix-build-warning.patch thermal-add-support-for-thermal-sensor-present-on-spear13xx-machines.patch net-netfilter-nfnetlink_acctc-use-linux-atomich.patch brlocks-lglocks-cleanups.patch fs-symlink-restrictions-on-sticky-directories.patch fs-hardlink-creation-restrictions-fix.patch slab-introduce-kmalloc_array.patch mm.patch make-swapin-readahead-skip-over-holes-fix.patch vmscan-kswapd-carefully-call-compaction-fix.patch mm-compaction-make-compact_control-order-signed-fix.patch hugetlb-try-to-search-again-if-it-is-really-needed-fix.patch thp-optimize-away-unnecessary-page-table-locking-fix-checkpatch-fixes.patch mm-vmscan-forcibly-scan-highmem-if-there-are-too-many-buffer_heads-pinning-highmem-fix-fix.patch procfs-mark-thread-stack-correctly-in-proc-pid-maps.patch mm-fix-move-migrate_pages-race-on-task-struct-checkpatch-fixes.patch bootmem-sparsemem-remove-limit-constraint-in-alloc_bootmem_section-fix.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes.patch memcg-simplify-move_account-check-fix.patch memcg-use-new-logic-for-page-stat-accounting-fix.patch memcg-fix-performance-of-mem_cgroup_begin_update_page_stat-fix.patch mm-memcontrolc-s-stealed-stolen.patch prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix.patch prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix.patch kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix.patch smp-start-up-non-boot-cpus-asynchronously-fix.patch backlight-add-driver-for-bachmanns-ot200-fix.patch leds-lp5521-support-led-pattern-data-checkpatch-fixes.patch drivers-leds-leds-lp5523c-constify-some-data.patch drivers-leds-add-driver-for-pca9663-i2c-chip-fix.patch leds-lm3530-replace-i2c_client-with-led_classdev-fix.patch drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place-fix.patch crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix.patch rtc-rtc-driver-for-da9052-53-pmic-v1-fix.patch kmod-avoid-deadlock-by-recursive-kmod-call-fix.patch procfs-add-num_to_str-to-speed-up-proc-stat-fix.patch procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes.patch seq_file-add-seq_set_overflow-seq_overflow-fix.patch smp-add-func-to-ipi-cpus-based-on-parameter-func-fix.patch smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix.patch smp-add-func-to-ipi-cpus-based-on-parameter-func-v9.patch smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix.patch pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix.patch pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes.patch fs-proc-namespacesc-prevent-crash-when-ns_entries-is-empty.patch selftests-makefile-make-run_tests-depend-on-all.patch move-hugepage-test-examples-to-tools-testing-selftests-vm-fix.patch move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix.patch syscalls-x86-add-__nr_kcmp-syscall-v8.patch syscalls-x86-add-__nr_kcmp-syscall-v8-fix.patch syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch