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/net/can/flexcan.c | 3 ---
drivers/nfc/st21nfca/se.c | 5 -----
2 files changed, 8 deletions(-)
--- a/drivers/net/can/flexcan.c~linux-next-git-rejects
+++ a/drivers/net/can/flexcan.c
@@ -1491,12 +1491,9 @@ static int flexcan_setup_stop_mode(struc
device_set_wakeup_capable(&pdev->dev, true);
-<<<<<<< HEAD
-=======
if (of_property_read_bool(np, "wakeup-source"))
device_set_wakeup_enable(&pdev->dev, true);
->>>>>>> linux-next/akpm-base
out_put_node:
of_node_put(gpr_np);
return ret;
--- a/drivers/nfc/st21nfca/se.c~linux-next-git-rejects
+++ a/drivers/nfc/st21nfca/se.c
@@ -315,12 +315,7 @@ int st21nfca_connectivity_event_received
skb->data[0] != NFC_EVT_TRANSACTION_AID_TAG)
return -EPROTO;
-<<<<<<< HEAD
- transaction = (struct nfc_evt_transaction *)devm_kzalloc(dev,
- skb->len - 2, GFP_KERNEL);
-=======
transaction = devm_kzalloc(dev, skb->len - 2, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
if (!transaction)
return -ENOMEM;
_
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.patch
mm-introduce-page_shift-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch
mm-memory_hotplug-remove-move_pfn_range-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix-2.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
