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 <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
MAINTAINERS | 4 --
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 17 ----------
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 17 ----------
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 5 --
drivers/gpu/drm/drm_gem.c | 4 --
fs/io_uring.c | 16 ---------
6 files changed, 63 deletions(-)
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -17,11 +17,6 @@
ethernet1 = &switch0port1;
ethernet2 = &switch0port2;
ethernet3 = &switch0port3;
-<<<<<<< HEAD
- serial0 = &uart0;
- serial1 = &uart1;
-=======
->>>>>>> linux-next/akpm-base
};
chosen {
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
@@ -27,27 +27,10 @@
};
};
-<<<<<<< HEAD
-&switch0 {
- ports {
- switch0port1: port@1 {
- reg = <1>;
- label = "lan1";
- phy-handle = <&switch0phy0>;
- };
-
- switch0port3: port@3 {
- reg = <3>;
- label = "wan";
- phy-handle = <&switch0phy2>;
- };
- };
-=======
&switch0port1 {
label = "lan1";
};
&switch0port3 {
label = "wan";
->>>>>>> linux-next/akpm-base
};
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
@@ -28,29 +28,12 @@
};
};
-<<<<<<< HEAD
-&switch0 {
- ports {
- switch0port1: port@1 {
- reg = <1>;
- label = "lan1";
- phy-handle = <&switch0phy0>;
- };
-
- switch0port3: port@3 {
- reg = <3>;
- label = "wan";
- phy-handle = <&switch0phy2>;
- };
- };
-=======
&switch0port1 {
label = "lan1";
};
&switch0port3 {
label = "wan";
->>>>>>> linux-next/akpm-base
};
&sdhci0 {
--- a/drivers/gpu/drm/drm_gem.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/drm_gem.c
@@ -1078,11 +1078,7 @@ int drm_gem_mmap_obj(struct drm_gem_obje
vma->vm_private_data = obj;
-<<<<<<< HEAD
- if (obj->funcs && obj->funcs->mmap) {
-=======
if (obj->funcs->mmap) {
->>>>>>> linux-next/akpm-base
ret = obj->funcs->mmap(obj, vma);
if (ret) {
drm_gem_object_put(obj);
--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -1940,10 +1940,6 @@ static void __io_free_req(struct io_kioc
percpu_ref_put(&ctx->refs);
}
-<<<<<<< HEAD
-static void io_kill_linked_timeout(struct io_kiocb *req)
-{
-=======
static inline void io_remove_next_linked(struct io_kiocb *req)
{
struct io_kiocb *nxt = req->link;
@@ -1954,22 +1950,14 @@ static inline void io_remove_next_linked
static void io_kill_linked_timeout(struct io_kiocb *req)
{
->>>>>>> linux-next/akpm-base
struct io_ring_ctx *ctx = req->ctx;
struct io_kiocb *link;
bool cancelled = false;
unsigned long flags;
-<<<<<<< HEAD
-
- spin_lock_irqsave(&ctx->completion_lock, flags);
- link = list_first_entry_or_null(&req->link_list, struct io_kiocb,
- link_list);
-=======
spin_lock_irqsave(&ctx->completion_lock, flags);
link = req->link;
->>>>>>> linux-next/akpm-base
/*
* Can happen if a linked timeout fired and link had been like
* req -> link t-out -> link t-out [-> ...]
@@ -1978,12 +1966,8 @@ static void io_kill_linked_timeout(struc
struct io_timeout_data *io = link->async_data;
int ret;
-<<<<<<< HEAD
- list_del_init(&link->link_list);
-=======
io_remove_next_linked(req);
link->timeout.head = NULL;
->>>>>>> linux-next/akpm-base
ret = hrtimer_try_to_cancel(&io->timer);
if (ret != -1) {
io_cqring_fill_event(link, -ECANCELED);
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -2373,11 +2373,7 @@ F: drivers/i2c/busses/i2c-rk3x.c
F: sound/soc/rockchip/
N: rockchip
-<<<<<<< HEAD
-ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
-=======
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
->>>>>>> linux-next/akpm-base
M: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
L: linux-samsung-soc@xxxxxxxxxxxxxxx
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-memcontrol-correct-the-nr_anon_thps-counter-of-hierarchical-memcg-fix.patch
mm-memcontrol-correct-the-nr_anon_thps-counter-of-hierarchical-memcg-fix-fix.patch
mm-vmscan-fix-nr_isolated_file-corruption-on-64-bit-fix.patch
mm.patch
mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch
mm-page_alloc-do-not-rely-on-the-order-of-page_poison-and-init_on_alloc-free-parameters-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
