From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded-merged] =?US-ASCII?Q?memcg-fix-null-pointer-dereference-in-=5F=5Fmem=5Fcgroup=5F?= =?US-ASCII?Q?usage=5Funregister=5Fevent-fix.patch?= removed from -mm tree Date: Sat, 21 Mar 2020 18:15:19 -0700 Message-ID: <20200322011519.7AzvLRMOj%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: Received: from mail.kernel.org ([198.145.29.99]:39880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727533AbgCVBPU (ORCPT ); Sat, 21 Mar 2020 21:15:20 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, brookxu@tencent.com, hannes@cmpxchg.org, kirill.shutemov@linux.intel.com, mhocko@suse.com, mm-commits@vger.kernel.org, vdavydov.dev@gmail.com The patch titled Subject: memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event-fix has been removed from the -mm tree. Its filename was memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event-fix.patch This patch was dropped because it was folded into memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event.patch ------------------------------------------------------ From: Andrew Morton Subject: memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event-fix fix comment, per Kirill Cc: Chunguang Xu Cc: Johannes Weiner Cc: Kirill A. Shutemov Cc: Michal Hocko Cc: Vladimir Davydov Signed-off-by: Andrew Morton --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memcontrol.c~memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event-fix +++ a/mm/memcontrol.c @@ -4068,7 +4068,7 @@ static void __mem_cgroup_usage_unregiste new = thresholds->spare; - /* If items related to eventfd have been cleared, nothing to do */ + /* If no items related to eventfd have been cleared, nothing to do */ if (!entries) goto unlock; _ Patches currently in -mm which might be from akpm@linux-foundation.org are memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event.patch mm-hotplug-fix-hot-remove-failure-in-sparsememvmemmap-case-fix.patch drivers-infiniband-sw-siw-siw_qp_rxc-suppress-uninitialized-var-warning.patch drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch mm.patch mm-gup-track-foll_pin-pages-fix-2-fix.patch mm-swap-make-page_evictable-inline-fix.patch memcg-optimize-memorynuma_stat-like-memorystat-fix.patch selftest-add-mremap_dontunmap-selftest-fix.patch selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch mm-hugetlbc-fix-printk-format-warning-for-32-bit-phys_addr_t-fix.patch mm-migratec-migrate-pg_readahead-flag-fix.patch hv_balloon-dont-check-for-memhp_auto_online-manually-fix.patch proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch linux-next-rejects.patch linux-next-fix.patch linux-next-git-rejects.patch mm-add-vm_insert_pages-fix.patch net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch seq_read-info-message-about-buggy-next-functions-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch