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: Wed, 13 Jun 2012 12:04:53 -0700 Message-ID: <20120613190454.D704CA0341@akpm.mtv.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-fa0-f74.google.com ([209.85.161.74]:47075 "EHLO mail-fa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754392Ab2FMTE5 (ORCPT ); Wed, 13 Jun 2012 15:04:57 -0400 Received: by fat25 with SMTP id 25so51441fat.1 for ; Wed, 13 Jun 2012 12:04:56 -0700 (PDT) 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/x86/kernel/cpu/perf_event.h | 3 --- 1 file changed, 3 deletions(-) diff -puN arch/x86/kernel/cpu/perf_event.h~linux-next-git-rejects arch/x86/kernel/cpu/perf_event.h --- a/arch/x86/kernel/cpu/perf_event.h~linux-next-git-rejects +++ a/arch/x86/kernel/cpu/perf_event.h @@ -378,10 +378,7 @@ struct x86_pmu { void (*drain_pebs)(struct pt_regs *regs); struct event_constraint *pebs_constraints; void (*pebs_aliases)(struct perf_event *event); -<<<<<<< HEAD -======= int max_pebs_events; ->>>>>>> linux-next/akpm-base /* * Intel LBR _ Patches currently in -mm which might be from akpm@linux-foundation.org are 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-staging-zsmalloc-zsmalloc-mainc-unbork.patch mm-fix-slab-page-_count-corruption-when-using-slub-fix.patch tmpfs-implement-numa-node-interleaving-fix.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch fs-symlink-restrictions-on-sticky-directories.patch fs-hardlink-creation-restrictions.patch mm.patch mm-make-vb_alloc-more-foolproof-fix.patch mm-compaction-handle-incorrect-migrate_unmovable-type-pageblocks-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume.patch kmsg-dev-kmsg-properly-return-possible-copy_from_user-failure.patch btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-fix.patch btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-checkpatch-fixes.patch string-introduce-memweight-fix.patch kmod-avoid-deadlock-from-recursive-kmod-call.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