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>
---
arch/arm/mach-imx/cpu.c | 8 --------
drivers/reset/core.c | 11 -----------
include/linux/platform_data/ti-sysc.h | 3 ---
3 files changed, 22 deletions(-)
--- a/arch/arm/mach-imx/cpu.c~linux-next-git-rejects
+++ a/arch/arm/mach-imx/cpu.c
@@ -184,13 +184,6 @@ struct device * __init imx_soc_device_in
}
if (!IS_ERR_OR_NULL(ocotp)) {
-<<<<<<< HEAD
- regmap_read(ocotp, OCOTP_UID_H, &val);
- soc_uid = val;
- regmap_read(ocotp, OCOTP_UID_L, &val);
- soc_uid <<= 32;
- soc_uid |= val;
-=======
if (__mxc_cpu_type == MXC_CPU_IMX7ULP) {
regmap_read(ocotp, OCOTP_ULP_UID_4, &val);
soc_uid = val & 0xffff;
@@ -210,7 +203,6 @@ struct device * __init imx_soc_device_in
soc_uid <<= 32;
soc_uid |= val;
}
->>>>>>> linux-next/akpm-base
}
soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d",
--- a/drivers/reset/core.c~linux-next-git-rejects
+++ a/drivers/reset/core.c
@@ -788,14 +788,7 @@ struct reset_control *__devm_reset_contr
return ERR_PTR(-ENOMEM);
rstc = __reset_control_get(dev, id, index, shared, optional, acquired);
-<<<<<<< HEAD
- if (!IS_ERR_OR_NULL(rstc)) {
- *ptr = rstc;
- devres_add(dev, ptr);
- } else {
-=======
if (IS_ERR_OR_NULL(rstc)) {
->>>>>>> linux-next/akpm-base
devres_free(ptr);
return rstc;
}
@@ -937,11 +930,7 @@ devm_reset_control_array_get(struct devi
rstc = of_reset_control_array_get(dev->of_node, shared, optional, true);
if (IS_ERR_OR_NULL(rstc)) {
-<<<<<<< HEAD
- devres_free(devres);
-=======
devres_free(ptr);
->>>>>>> linux-next/akpm-base
return rstc;
}
--- a/include/linux/platform_data/ti-sysc.h~linux-next-git-rejects
+++ a/include/linux/platform_data/ti-sysc.h
@@ -49,10 +49,7 @@ struct sysc_regbits {
s8 emufree_shift;
};
-<<<<<<< HEAD
-=======
#define SYSC_QUIRK_CLKDM_NOAUTO BIT(21)
->>>>>>> linux-next/akpm-base
#define SYSC_QUIRK_FORCE_MSTANDBY BIT(20)
#define SYSC_MODULE_QUIRK_AESS BIT(19)
#define SYSC_MODULE_QUIRK_SGX BIT(18)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-gup-fix-memory-leak-in-__gup_benchmark_ioctl-fix.patch
mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-rejects.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
