[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>
---

 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c |    5 -----
 sound/soc/intel/skylake/skl.c                       |    3 ---
 2 files changed, 8 deletions(-)

diff -puN sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c~linux-next-git-rejects sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c~linux-next-git-rejects
+++ a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -355,10 +355,6 @@ static int kabylake_ssp0_hw_params(struc
 
 			ret = snd_soc_dai_set_sysclk(codec_dai,
 				RT5514_SCLK_S_MCLK, 24576000, SND_SOC_CLOCK_IN);
-<<<<<<< HEAD
-			if (ret < 0) {
-				dev_err(rtd->dev, "set sysclk err: %d\n", ret);
-=======
 			if (ret < 0) {
 				dev_err(rtd->dev, "set sysclk err: %d\n", ret);
 				return ret;
@@ -368,7 +364,6 @@ static int kabylake_ssp0_hw_params(struc
 			ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x30, 3, 8, 16);
 			if (ret < 0) {
 				dev_err(rtd->dev, "DEV0 TDM slot err:%d\n", ret);
->>>>>>> linux-next/akpm-base
 				return ret;
 			}
 		}
diff -puN sound/soc/intel/skylake/skl.c~linux-next-git-rejects sound/soc/intel/skylake/skl.c
--- a/sound/soc/intel/skylake/skl.c~linux-next-git-rejects
+++ a/sound/soc/intel/skylake/skl.c
@@ -996,8 +996,6 @@ static struct sst_acpi_mach sst_glk_devd
 		.fw_filename = "intel/dsp_fw_glk.bin",
 	},
 	{}
-<<<<<<< HEAD
-=======
 };
 
 static const struct sst_acpi_mach sst_cnl_devdata[] = {
@@ -1006,7 +1004,6 @@ static const struct sst_acpi_mach sst_cn
 		.drv_name = "cnl_rt274",
 		.fw_filename = "intel/dsp_fw_cnl.bin",
 	},
->>>>>>> linux-next/akpm-base
 };
 
 /* PCI IDs */
_

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

i-need-old-gcc.patch
mm-make-tlb_flush_pending-global-fix.patch
mm-fix-list-corruptions-on-shmem-shrinklist-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch
zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch
treewide-remove-gfp_temporary-allocation-flag-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix.patch
add-testcases-for-memset16-32-64-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[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