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=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 9362DC64E7B for ; Mon, 30 Nov 2020 11:59:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E50E2073C for ; Mon, 30 Nov 2020 11:59:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726810AbgK3L6u (ORCPT ); Mon, 30 Nov 2020 06:58:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:34252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726385AbgK3L6u (ORCPT ); Mon, 30 Nov 2020 06:58:50 -0500 Received: from gaia (unknown [95.146.230.165]) (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 F0AF72073C; Mon, 30 Nov 2020 11:58:07 +0000 (UTC) Date: Mon, 30 Nov 2020 11:58:05 +0000 From: Catalin Marinas To: Stephen Rothwell Cc: Andrew Morton , Will Deacon , Andrey Konovalov , Linux Kernel Mailing List , Linux Next Mailing List , Peter Collingbourne , Vincenzo Frascino Subject: Re: linux-next: manual merge of the akpm tree with the arm64 tree Message-ID: <20201130115804.GC3902@gaia> References: <20201130182840.02a96a67@canb.auug.org.au> <20201130184835.18b5f4de@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201130184835.18b5f4de@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Nov 30, 2020 at 06:48:35PM +1100, Stephen Rothwell wrote: > On Mon, 30 Nov 2020 18:28:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm tree got a conflict in: > > > > arch/arm64/kernel/mte.c > > > > between commit: > > > > e710c29e0177 ("arm64: mte: make the per-task SCTLR_EL1 field usable elsewhere") > > > > from the arm64 tree and commit: > > > > 44a7127eb3a4 ("arm64: mte: add in-kernel MTE helpers") > > > > from the akpm tree. > > > > I fixed it up (the former just removed some of the context for what the > > latter added) and can carry the fix as necessary. This is now fixed as > > far as linux-next is concerned, but any non trivial conflicts should be > > mentioned to your upstream maintainer when your tree is submitted for > > merging. You may also want to consider cooperating with the maintainer > > of the conflicting tree to minimise any particularly complex conflicts. > > A couple of the following patches in the akpm tree also conflicted with > the arm64 tree. Thanks Stephen. While the conflicts are not too bad, the variable renaming (e.g. gcr_incl -> gcr_excl) makes them look pretty messy. I'll drop commit e710c29e0177 and the subsequent one from the arm64 tree and either merge them via akpm or defer to 5.12. -- Catalin