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/cpuidle/cpuidle.c | 4 ----
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 5 -----
net/xfrm/xfrm_device.c | 7 -------
3 files changed, 16 deletions(-)
--- a/drivers/cpuidle/cpuidle.c~linux-next-git-rejects
+++ a/drivers/cpuidle/cpuidle.c
@@ -187,11 +187,7 @@ int cpuidle_enter_s2idle(struct cpuidle_
* be frozen safely.
*/
index = find_deepest_state(drv, dev, U64_MAX, 0, true);
-<<<<<<< HEAD
- if (index > 0) {
-=======
if (index > 0 && !current_clr_polling_and_test())
->>>>>>> linux-next/akpm-base
enter_s2idle_proper(drv, dev, index);
local_irq_enable();
}
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1300,13 +1300,8 @@ static int sdma_v5_0_sw_fini(void *handl
int i;
for (i = 0; i < adev->sdma.num_instances; i++) {
-<<<<<<< HEAD
- if (adev->sdma.instance[i].fw != NULL)
- release_firmware(adev->sdma.instance[i].fw);
-=======
release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL;
->>>>>>> linux-next/akpm-base
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
}
--- a/net/xfrm/xfrm_device.c~linux-next-git-rejects
+++ a/net/xfrm/xfrm_device.c
@@ -135,13 +135,6 @@ struct sk_buff *validate_xmit_xfrm(struc
}
xo->flags |= XFRM_XMIT;
-<<<<<<< HEAD
-
- if (skb_is_gso(skb)) {
- struct net_device *dev = skb->dev;
-=======
->>>>>>> linux-next/akpm-base
-
if (skb_is_gso(skb) && unlikely(x->xso.dev != dev)) {
struct sk_buff *segs;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix.patch
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix.patch
linux-next-git-rejects.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-2.patch
kernel-forkc-export-kernel_thread-to-modules.patch
