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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 D0D61C433B4 for ; Thu, 15 Apr 2021 17:58:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7B3A61139 for ; Thu, 15 Apr 2021 17:58:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233395AbhDOR7O (ORCPT ); Thu, 15 Apr 2021 13:59:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:60792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232759AbhDOR7O (ORCPT ); Thu, 15 Apr 2021 13:59:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F7AB61139; Thu, 15 Apr 2021 17:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1618509530; bh=VsoieBRV0qS6Nfi5rxkcfATckHk9VoIUclLsXxBWFrA=; h=Date:From:To:Subject:From; b=GLyVY0llK190wDFczWso4+3/wtR6p8I6Os4VdQqsYIDgl9abxGM7dtwC3kREjxFWZ tU32QLgLjdYnuVf5iaz4QYOk2OutFJBf9IgxNakuGzGSorJnHDlc/kRz4RQYWbDuFX KOyH1AFkJKXbrdgki0hj/5N8TX59H3teSz8ib1Lc= Date: Thu, 15 Apr 2021 10:58:50 -0700 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: <20210415175850.RKI7bpgQu%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 --- arch/arm64/include/asm/word-at-a-time.h | 3 --- 1 file changed, 3 deletions(-) --- a/arch/arm64/include/asm/word-at-a-time.h~linux-next-git-rejects +++ a/arch/arm64/include/asm/word-at-a-time.h @@ -54,11 +54,8 @@ static inline unsigned long find_zero(un static inline unsigned long load_unaligned_zeropad(const void *addr) { unsigned long ret, tmp; -<<<<<<< HEAD -======= __uaccess_enable_tco_async(); ->>>>>>> linux-next/akpm-base /* Load word from unaligned pointer addr */ asm( _ Patches currently in -mm which might be from akpm@linux-foundation.org are scripts-a-new-script-for-checking-duplicate-struct-declaration-fix.patch mm.patch mm-memcontrol-switch-to-rstat-fix.patch mm-vmalloc-remove-unmap_kernel_range-fix-fix.patch mm-page_alloc-add-an-array-based-interface-to-the-bulk-page-allocator-fix.patch mm-vmscan-add-shrinker_info_protected-helper-fix.patch mm-drop-redundant-arch_enable__migration-fix.patch mm-drop-redundant-arch_enable__migration-fix-fix.patch mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch