[obsolete] linux-next-git-rejects.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/gpu/drm/amd/powerplay/renoir_ppt.c |    3 ---
 1 file changed, 3 deletions(-)

--- a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c
@@ -799,10 +799,7 @@ static const struct pptable_funcs renoir
 	.check_fw_version = smu_v12_0_check_fw_version,
 	.powergate_sdma = smu_v12_0_powergate_sdma,
 	.powergate_vcn = smu_v12_0_powergate_vcn,
-<<<<<<< HEAD
-=======
 	.powergate_jpeg = smu_v12_0_powergate_jpeg,
->>>>>>> linux-next/akpm-base
 	.send_smc_msg_with_param = smu_v12_0_send_msg_with_param,
 	.read_smc_arg = smu_v12_0_read_arg,
 	.set_gfx_cgpg = smu_v12_0_set_gfx_cgpg,
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

mm-add-apply_to_existing_pages-helper-fix.patch
mm-add-apply_to_existing_pages-helper-fix-fix.patch
kasan-use-apply_to_existing_pages-for-releasing-vmalloc-shadow-fix.patch
mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux