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/iio/industrialio-buffer.c | 5 -----
drivers/misc/fastrpc.c | 7 -------
2 files changed, 12 deletions(-)
--- a/drivers/iio/industrialio-buffer.c~linux-next-git-rejects
+++ a/drivers/iio/industrialio-buffer.c
@@ -320,12 +320,7 @@ static int iio_scan_mask_set(struct iio_
const unsigned long *mask;
unsigned long *trialmask;
-<<<<<<< HEAD
- trialmask = kcalloc(BITS_TO_LONGS(indio_dev->masklength),
- sizeof(*trialmask), GFP_KERNEL);
-=======
trialmask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
if (trialmask == NULL)
return -ENOMEM;
if (!indio_dev->masklength) {
--- a/drivers/misc/fastrpc.c~linux-next-git-rejects
+++ a/drivers/misc/fastrpc.c
@@ -1315,10 +1315,7 @@ static int fastrpc_cb_probe(struct platf
struct device *dev = &pdev->dev;
int i, sessions = 0;
int rc;
-<<<<<<< HEAD
-=======
unsigned long flags;
->>>>>>> linux-next/akpm-base
cctx = dev_get_drvdata(dev->parent);
if (!cctx)
@@ -1347,11 +1344,7 @@ static int fastrpc_cb_probe(struct platf
}
}
cctx->sesscount++;
-<<<<<<< HEAD
- spin_unlock(&cctx->lock);
-=======
spin_unlock_irqrestore(&cctx->lock, flags);
->>>>>>> linux-next/akpm-base
rc = dma_set_mask(dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(dev, "32-bit DMA enable failed\n");
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
slab-fix-an-infinite-loop-in-leaks_show-fix.patch
userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch
mm-compaction-fix-an-undefined-behaviour-fix.patch
mm-enable-error-injection-at-add_to_page_cache-fix.patch
mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
mm-add-probe_user_read-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
lib-list_sort-simplify-and-remove-max_list_length_bits-fix.patch
lib-test_vmallocc-test_func-eliminate-local-ret.patch
fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch
cpumask-fix-double-string-traverse-in-cpumask_parse-fix.patch
convert-struct-pid-count-to-refcount_t-fix.patch
gcov-clang-support-checkpatch-fixes.patch
ipc-do-cyclic-id-allocation-for-the-ipc-object-fix.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
