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
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/afs/mntpt.c | 4 ----
include/linux/compiler-gcc.h | 18 ------------------
security/apparmor/policy.c | 4 ----
3 files changed, 26 deletions(-)
--- a/fs/afs/mntpt.c~linux-next-git-rejects
+++ a/fs/afs/mntpt.c
@@ -122,12 +122,8 @@ static int afs_mntpt_set_params(struct f
if (PageError(page)) {
ret = afs_bad(AFS_FS_I(d_inode(mntpt)), afs_file_error_mntpt);
-<<<<<<< HEAD
- goto error;
-=======
put_page(page);
return ret;
->>>>>>> linux-next/akpm-base
}
buf = kmap(page);
--- a/include/linux/compiler-gcc.h~linux-next-git-rejects
+++ a/include/linux/compiler-gcc.h
@@ -76,15 +76,10 @@
#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
-<<<<<<< HEAD
-#define __compiletime_warning(message) __attribute__((__warning__(message)))
-#define __compiletime_error(message) __attribute__((__error__(message)))
-=======
#ifndef CONFIG_CC_OPTIMIZE_FOR_DEBUGGING
#define __compiletime_warning(message) __attribute__((__warning__(message)))
#define __compiletime_error(message) __attribute__((__error__(message)))
#endif
->>>>>>> linux-next/akpm-base
#if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__)
#define __latent_entropy __attribute__((latent_entropy))
@@ -120,11 +115,7 @@
#endif
/*
-<<<<<<< HEAD
- * GCC 'asm goto' miscompiles certain code sequences:
-=======
* GCC < 4.8.2 'asm goto' miscompiles certain code sequences:
->>>>>>> linux-next/akpm-base
*
* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
*
@@ -158,16 +149,7 @@
#define KASAN_ABI_VERSION 3
#endif
-<<<<<<< HEAD
-/*
- * Because __no_sanitize_address conflicts with inlining:
- * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
- * we do one or the other.
- */
-#ifdef CONFIG_KASAN
-=======
#if (GCC_VERSION >= 40902) && defined(CONFIG_KASAN)
->>>>>>> linux-next/akpm-base
#define __no_sanitize_address_or_inline \
__no_sanitize_address __maybe_unused notrace
#else
--- a/security/apparmor/policy.c~linux-next-git-rejects
+++ a/security/apparmor/policy.c
@@ -231,11 +231,7 @@ void aa_free_profile(struct aa_profile *
for (i = 0; i < profile->xattr_count; i++)
kzfree(profile->xattrs[i]);
kzfree(profile->xattrs);
-<<<<<<< HEAD
- for (i = 0; i < profile->secmark_count; i++)
-=======
for (i=0; i < profile->secmark_count; i++)
->>>>>>> linux-next/akpm-base
kzfree(profile->secmark[i].label);
kzfree(profile->secmark);
kzfree(profile->dirname);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-page_owner-clamp-read-count-to-page_size-fix.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
