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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55AE6C433F5 for ; Tue, 8 Mar 2022 17:53:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348791AbiCHRyc (ORCPT ); Tue, 8 Mar 2022 12:54:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349305AbiCHRyc (ORCPT ); Tue, 8 Mar 2022 12:54:32 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFE964130B for ; Tue, 8 Mar 2022 09:53:33 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 83EBAB81BDA for ; Tue, 8 Mar 2022 17:53:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D26CC340F6; Tue, 8 Mar 2022 17:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1646762011; bh=I9/E/1eozJK2dWoDwsNLFgoGLZuj8ROjHi9GwXo91aE=; h=Date:To:From:Subject:From; b=CUXAknPGxeu9cRhKdbw9NI6YgoXE5OjlPvAywhfnG/csBdhPJlkcXZc6VWDh3IH2Q 6zThKIn7VKybvvWmQ3FoX+S1N6ulbn/WsHFV9urvmyn5RIcumq8ZPq2/ZA4lF5+M5H mqMtCmXrBHs/cFe3Ru0Vksw9CyABVoOvLjZd/ErM= Date: Tue, 08 Mar 2022 09:53:30 -0800 To: mm-commits@vger.kernel.org, akpm@linux-foundation.org, akpm@linux-foundation.org From: Andrew Morton Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Message-Id: <20220308175331.2D26CC340F6@smtp.kernel.org> 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 --- drivers/block/virtio_blk.c | 10 ---------- drivers/virtio/Kconfig | 4 ---- 2 files changed, 14 deletions(-) --- a/drivers/block/virtio_blk.c~linux-next-git-rejects +++ a/drivers/block/virtio_blk.c @@ -69,16 +69,6 @@ struct virtio_blk { /* Process context for config space updates */ struct work_struct config_work; -<<<<<<< HEAD - /* - * Tracks references from block_device_operations open/release and - * virtio_driver probe/remove so this object can be freed once no - * longer in use. - */ - refcount_t refs; - -======= ->>>>>>> linux-next/akpm-base /* Ida index - used to track minor number allocations. */ int index; --- a/drivers/virtio/Kconfig~linux-next-git-rejects +++ a/drivers/virtio/Kconfig @@ -105,11 +105,7 @@ config VIRTIO_BALLOON config VIRTIO_MEM tristate "Virtio mem driver" -<<<<<<< HEAD - depends on X86_64 -======= depends on X86_64 || ARM64 ->>>>>>> linux-next/akpm-base depends on VIRTIO depends on MEMORY_HOTPLUG depends on MEMORY_HOTREMOVE _ Patches currently in -mm which might be from akpm@linux-foundation.org are memcg-sync-flush-only-if-periodic-flush-is-delayed-fix.patch remove-bdi_congested-and-wb_congested-and-related-functions-fix.patch mm.patch documentation-vm-page_ownerrst-update-the-documentation-fix.patch mm-list_lru-replace-linear-array-with-xarray-fix.patch mm-hwpoison-inject-support-injecting-hwpoison-to-free-page-fix.patch mm-export-pageheadhuge-fix.patch userfaultfd-provide-unmasked-address-on-page-fault-v3-fix.patch mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch mm-handle-uninitialized-numa-nodes-gracefully-fix.patch mm-memory_hotplug-remove-obsolete-comment-of-__add_pages-fix.patch proc-alloc-path_max-bytes-for-proc-pid-fd-symlinks-fix.patch taskstats-remove-unneeded-dead-assignment-fix.patch linux-next-rejects.patch arch-x86-kernel-resourcec-needs-spinlockh.patch mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch kasan-improve-vmalloc-tests-fix-3-fix.patch mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix.patch mutex-subsystem-synchro-test-module-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch