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
https://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
https://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/pinctrl/qcom/pinctrl-sc7280.c | 3 ---
1 file changed, 3 deletions(-)
--- a/drivers/pinctrl/qcom/pinctrl-sc7280.c~linux-next-git-rejects
+++ a/drivers/pinctrl/qcom/pinctrl-sc7280.c
@@ -1447,8 +1447,6 @@ static const struct msm_pingroup sc7280_
[180] = SDC_QDSD_PINGROUP(sdc2_clk, 0xb4000, 14, 6),
[181] = SDC_QDSD_PINGROUP(sdc2_cmd, 0xb4000, 11, 3),
[182] = SDC_QDSD_PINGROUP(sdc2_data, 0xb4000, 9, 0),
-<<<<<<< HEAD
-=======
};
static const struct msm_gpio_wakeirq_map sc7280_pdc_map[] = {
@@ -1471,7 +1469,6 @@ static const struct msm_gpio_wakeirq_map
{ 150, 87 }, { 151, 88 }, { 153, 89 }, { 155, 164 }, { 156, 129 },
{ 157, 161 }, { 158, 120 }, { 161, 136 }, { 163, 142 }, { 172, 166 },
{ 174, 167 },
->>>>>>> linux-next/akpm-base
};
static const struct msm_pinctrl_soc_data sc7280_pinctrl = {
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
kasan-remove-redundant-config-option-fix.patch
mm-gup-check-page-posion-status-for-coredump-fix.patch
mm.patch
mm-memcontrol-switch-to-rstat-fix.patch
mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
