From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: + linux-next-git-rejects.patch added to -mm tree Date: Fri, 26 Jun 2020 20:32:51 -0700 Message-ID: <20200627033251.eKkTMJYAY%akpm@linux-foundation.org> References: <20200625202807.b630829d6fa55388148bee7d@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:44580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbgF0Dcx (ORCPT ); Fri, 26 Jun 2020 23:32:53 -0400 In-Reply-To: <20200625202807.b630829d6fa55388148bee7d@linux-foundation.org> Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org 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 Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- 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