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/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 3 ---
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 3 ---
drivers/irqchip/irq-gic-v3-its.c | 6 ------
3 files changed, 12 deletions(-)
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -120,8 +120,6 @@
status = "disabled";
};
-<<<<<<< HEAD
-=======
thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay = <1000>;
@@ -177,7 +175,6 @@
};
};
->>>>>>> linux-next/akpm-base
ethmac: ethernet@ff3f0000 {
compatible = "amlogic,meson-axg-dwmac",
"snps,dwmac-3.70a",
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
@@ -461,14 +461,11 @@
power-domains = <&pwrc PWRC_SM1_ETH_ID>;
};
-<<<<<<< HEAD
-=======
&gpio_intc {
compatible = "amlogic,meson-sm1-gpio-intc",
"amlogic,meson-gpio-intc";
};
->>>>>>> linux-next/akpm-base
&pcie {
power-domains = <&pwrc PWRC_SM1_PCIE_ID>;
};
--- a/drivers/irqchip/irq-gic-v3-its.c~linux-next-git-rejects
+++ a/drivers/irqchip/irq-gic-v3-its.c
@@ -1250,15 +1250,9 @@ static void its_vlpi_set_doorbell(struct
struct its_device *its_dev = irq_data_get_irq_chip_data(d);
u32 event = its_get_event_id(d);
struct its_vlpi_map *map;
-<<<<<<< HEAD
map = dev_event_to_vlpi_map(its_dev, event);
-=======
-
- map = dev_event_to_vlpi_map(its_dev, event);
-
->>>>>>> linux-next/akpm-base
if (map->db_enabled == enable)
return;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
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
