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>
---
drivers/bus/ti-sysc.c | 5 -----
1 file changed, 5 deletions(-)
--- a/drivers/bus/ti-sysc.c~linux-next-git-rejects
+++ a/drivers/bus/ti-sysc.c
@@ -766,16 +766,11 @@ static int sysc_ioremap(struct sysc *dda
ddata->offsets[SYSC_SYSCONFIG],
ddata->offsets[SYSC_SYSSTATUS]);
-<<<<<<< HEAD
- if ((size + sizeof(u32)) > ddata->module_size)
- return -EINVAL;
-=======
if (size < SZ_1K)
size = SZ_1K;
if ((size + sizeof(u32)) > ddata->module_size)
size = ddata->module_size;
->>>>>>> linux-next/akpm-base
}
ddata->module_va = devm_ioremap(ddata->dev,
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
scripts-spellingtxt-drop-sepc-from-the-misspelling-list-fix.patch
ocfs2-add-locking-filter-debugfs-file-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
include-linux-pfn_th-remove-pfn_t_to_virt.patch
mm-swap-use-rbtree-for-swap_extent-fix.patch
mm-section-numbers-use-the-type-unsigned-long-fix.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-map_files-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix-fix.patch
byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes.patch
selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch
resource-fix-locking-in-find_next_iomem_res-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
proc-sysctl-add-shared-variables-for-range-check-fix-2-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
