From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D253C388F2 for ; Tue, 3 Nov 2020 18:16:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCA4420786 for ; Tue, 3 Nov 2020 18:16:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604427398; bh=VcWKTgBJZHFXW8Q2Rw9ZGLxIdM6qjeBPsTRKaR+zKRM=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=RkyCZREQ/gIR7Q2QAbM4rhHkCcvVoUePRduOwjFVNSoWK52WnX9YCDPLbJPZ1nxx/ eQAjPVPCoOnkrIM4UJ5rsmfNb0G59AZ+FOGvxMu3+g6hWzm6PpObbUF5Hzzu+yJ0Ry HO3Ge2PKTZ601y/DgiadNFBXZEAV9EAXewI6/YXk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728939AbgKCSQi (ORCPT ); Tue, 3 Nov 2020 13:16:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:39094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbgKCSQi (ORCPT ); Tue, 3 Nov 2020 13:16:38 -0500 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9721720786; Tue, 3 Nov 2020 18:16:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604427397; bh=VcWKTgBJZHFXW8Q2Rw9ZGLxIdM6qjeBPsTRKaR+zKRM=; h=Date:From:To:Subject:From; b=WC/AzujtYUO6FZyZeBjrQshmnuJASV2PprAdy/G4X9Q/La10/SevazptdpwVa8syn Vz4F8do3X1Icm/cDL/m6YJqau4+jgsCaeUWXD75ZBMQDjcv+eeLf25RjWFp88e0+IX sX8Y8cKp/AFaJppo3WPhBn37QbzaqMDSNQkxbjNo= Date: Tue, 03 Nov 2020 10:16:37 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Message-ID: <20201103181637.eMbEnXj1x%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org 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 Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- 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 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc@vger.kernel.org _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm.patch mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-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