The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/vsprintf.c | 23 ------------
tools/testing/selftests/kvm/vmx_tsc_adjust_test.c | 4 --
2 files changed, 27 deletions(-)
diff -puN lib/vsprintf.c~linux-next-git-rejects lib/vsprintf.c
--- a/lib/vsprintf.c~linux-next-git-rejects
+++ a/lib/vsprintf.c
@@ -1654,25 +1654,7 @@ char *device_node_string(char *buf, char
return widen_string(buf, buf - buf_start, end, spec);
}
-<<<<<<< HEAD
-static noinline_for_stack
-char *pointer_string(char *buf, char *end, const void *ptr,
- struct printf_spec spec)
-{
- spec.base = 16;
- spec.flags |= SMALL;
- if (spec.field_width == -1) {
- spec.field_width = 2 * sizeof(ptr);
- spec.flags |= ZEROPAD;
- }
-
- return number(buf, end, (unsigned long int)ptr, spec);
-}
-
-static DEFINE_STATIC_KEY_TRUE(not_filled_random_ptr_key);
-=======
static bool have_filled_random_ptr_key __read_mostly;
->>>>>>> linux-next/akpm-base
static siphash_key_t ptr_key __read_mostly;
static void enable_ptr_key_workfn(struct work_struct *work)
@@ -1716,13 +1698,8 @@ static char *ptr_to_id(char *buf, char *
const char *str = sizeof(ptr) == 8 ? "(____ptrval____)" : "(ptrval)";
unsigned long hashval;
-<<<<<<< HEAD
- if (static_branch_unlikely(¬_filled_random_ptr_key)) {
- spec.field_width = default_width;
-=======
if (unlikely(!have_filled_random_ptr_key)) {
spec.field_width = 2 * sizeof(ptr);
->>>>>>> linux-next/akpm-base
/* string length must be less than default_width */
return string(buf, end, str, spec);
}
diff -puN tools/testing/selftests/kvm/vmx_tsc_adjust_test.c~linux-next-git-rejects tools/testing/selftests/kvm/vmx_tsc_adjust_test.c
--- a/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c~linux-next-git-rejects
+++ a/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c
@@ -192,11 +192,7 @@ int main(int argc, char *argv[])
if (!(entry->ecx & CPUID_VMX)) {
fprintf(stderr, "nested VMX not enabled, skipping test\n");
-<<<<<<< HEAD
- exit(KSFT_SKIP);
-=======
return KSFT_SKIP;
->>>>>>> linux-next/akpm-base
}
vm = vm_create_default_vmx(VCPU_ID, (void *) l1_guest_code);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
zram-introduce-zram-memory-tracking-fix.patch
zram-introduce-zram-memory-tracking-update-fix.patch
zram-introduce-zram-memory-tracking-update-fix-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch
mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch
mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
mm-memcontrolc-add-mem_cgroup_from_task-as-a-local-helper.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
ida-remove-simple_ida_lock-fix.patch
kcov-prefault-the-kcov_area-fix.patch
kcov-prefault-the-kcov_area-fix-fix.patch
kcov-prefault-the-kcov_area-fix-fix-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.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
