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>
---
arch/mips/kernel/syscalls/syscall_n32.tbl | 3 ---
arch/mips/kernel/syscalls/syscall_n64.tbl | 3 ---
arch/mips/kernel/syscalls/syscall_o32.tbl | 3 ---
drivers/gpu/drm/amd/amdgpu/Makefile | 5 -----
drivers/gpu/drm/i915/display/intel_display.c | 7 -------
lib/test_user_copy.c | 8 --------
6 files changed, 29 deletions(-)
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl~linux-next-git-rejects
+++ a/arch/mips/kernel/syscalls/syscall_n32.tbl
@@ -374,7 +374,4 @@
433 n32 fspick sys_fspick
434 n32 pidfd_open sys_pidfd_open
435 n32 clone3 __sys_clone3
-<<<<<<< HEAD
-=======
436 n32 watch_devices sys_watch_devices
->>>>>>> linux-next/akpm-base
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl~linux-next-git-rejects
+++ a/arch/mips/kernel/syscalls/syscall_n64.tbl
@@ -350,7 +350,4 @@
433 n64 fspick sys_fspick
434 n64 pidfd_open sys_pidfd_open
435 n64 clone3 __sys_clone3
-<<<<<<< HEAD
-=======
436 n64 watch_devices sys_watch_devices
->>>>>>> linux-next/akpm-base
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl~linux-next-git-rejects
+++ a/arch/mips/kernel/syscalls/syscall_o32.tbl
@@ -423,7 +423,4 @@
433 o32 fspick sys_fspick
434 o32 pidfd_open sys_pidfd_open
435 o32 clone3 __sys_clone3
-<<<<<<< HEAD
-=======
436 o32 watch_devices sys_watch_devices
->>>>>>> linux-next/akpm-base
--- a/drivers/gpu/drm/amd/amdgpu/Makefile~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -53,14 +53,9 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o
amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \
amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \
amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
-<<<<<<< HEAD
- amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
- amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o
-=======
amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \
amdgpu_umc.o smu_v11_0_i2c.o
->>>>>>> linux-next/akpm-base
amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o
--- a/drivers/gpu/drm/i915/display/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/display/intel_display.c
@@ -7524,17 +7524,10 @@ intel_link_compute_m_n(u16 bits_per_pixe
bool constant_n, bool fec_enable)
{
u32 data_clock = bits_per_pixel * pixel_clock;
-<<<<<<< HEAD
if (fec_enable)
data_clock = intel_dp_mode_to_fec_clock(data_clock);
-=======
-
- if (fec_enable)
- data_clock = intel_dp_mode_to_fec_clock(data_clock);
-
->>>>>>> linux-next/akpm-base
m_n->tu = 64;
compute_m_n(data_clock,
link_clock * nlanes * 8,
--- a/lib/test_user_copy.c~linux-next-git-rejects
+++ a/lib/test_user_copy.c
@@ -93,19 +93,11 @@ static int test_copy_struct_from_user(ch
size_t ksize, usize;
umem_src = kmalloc(size, GFP_KERNEL);
-<<<<<<< HEAD
- if ((ret |= test(umem_src == NULL, "kmalloc failed")))
- goto out_free;
-
- expected = kmalloc(size, GFP_KERNEL);
- if ((ret |= test(expected == NULL, "kmalloc failed")))
-=======
if (ret |= test(umem_src == NULL, "kmalloc failed"))
goto out_free;
expected = kmalloc(size, GFP_KERNEL);
if (ret |= test(expected == NULL, "kmalloc failed"))
->>>>>>> linux-next/akpm-base
goto out_free;
/* Fill umem with a fixed byte pattern. */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch
mm-page_alloc-fix-a-crash-in-free_pages_prepare-fix.patch
mm-vmpressure-fix-a-signedness-bug-in-vmpressure_register_event-fix.patch
mm-vmpressure-fix-a-signedness-bug-in-vmpressure_register_event-fix-fix.patch
mm-slb-guarantee-natural-alignment-for-kmallocpower-of-two-fix.patch
ocfs2-protect-extent-tree-in-the-ocfs2_prepare_inode_for_write-checkpatch-fixes.patch
mm.patch
mm-slub-fix-a-deadlock-in-show_slab_objects-fix.patch
mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
hugetlb-remove-duplicated-code-checkpatch-fixes.patch
linux-next-rejects.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
