From patchwork Mon Dec 4 22:05:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 173576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3066862vqy; Mon, 4 Dec 2023 14:06:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDg9iAg81ODkq/dRdLj0ppACyT7Xve/fj9OcLe6VA0Ne3dthLGRg5aPyWzP1ZJarOkW6ng X-Received: by 2002:a05:6a00:1146:b0:6ce:2731:c243 with SMTP id b6-20020a056a00114600b006ce2731c243mr266661pfm.50.1701727597638; Mon, 04 Dec 2023 14:06:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701727597; cv=none; d=google.com; s=arc-20160816; b=iZt8PuT3xF5wDt1yYyo2YyDgC4DMvwBJNTkbyLfZ3YoFd5SNeW/1cGu5NJaBN9sddO tlc5Z0ymFOCQ9Pi4xh+8bSUHzsOe1lqBrg0lmchNOYolw236H2L5o/XXAh66vmvrhJTB 5yXDAhGi5gCg7wTJWFzS+7ug+IEmzyiSLIs9dB6GhDJ/Plk4E3KP865092y7JLTeImmD AyKSz5AHEa4064U7sb7tq+o3vo/AOyIHhlA0ImvwkKrBbDex3Xw7x0w3WRZrcMHW5XGu HcZtfM2/Y4KeWXqI88pJQCGT+gfdsHNt15jPeknIIFlZ3yueAwmqUogQmH/Hwaq3shrC ObTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=u8QKEqgw1lWdKU3HMKBvExEXQRW3gD1GYo/TOI2dnVQ=; fh=JGgtiDq+XcSiXRGpUR1797YwDdzJu3AvXTD0HhM12KE=; b=TEgFAarFO7InEGWepXi1u+LfE97HhYuaBbzkx+LLVY7GzFMVRvMCPxgC7PVYQRUYwN Rc/0SPBUbxJHcqahkF6abk7gRKBcy/I2ZbFH02BYRVRJRUOuiVn8lMsroqJGDKyeutMI vayWgew2xZG9lnifCrkaxEOaDmx2zxIxIb717qyOKdzuANnC24WZvk9WeGyGwS/BZM5z XHVF1EtM/PQlzMX3meUThxO3hvIKPoMDBmuQP2XO5mC+WHdURMRX2/FNKfiaieaBV5Ec ieMHtre6ReNkVyS44RDAkds6ZWSXkcaEuFtb/85Bqd6iYrvkvhSQIRUtymH+n8ucOQ6o uEtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rYNVpU5g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id g21-20020a056a0023d500b006cbb2cd545esi8542225pfc.5.2023.12.04.14.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 14:06:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rYNVpU5g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2806380944C3; Mon, 4 Dec 2023 14:06:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234568AbjLDWF6 (ORCPT + 99 others); Mon, 4 Dec 2023 17:05:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234252AbjLDWFt (ORCPT ); Mon, 4 Dec 2023 17:05:49 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2933A130; Mon, 4 Dec 2023 14:05:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701727549; bh=u8QKEqgw1lWdKU3HMKBvExEXQRW3gD1GYo/TOI2dnVQ=; h=Date:From:To:Cc:Subject:From; b=rYNVpU5gDOwPj9MLTqFCXrSxqDVlrr9QhKy+BhH5e/DSmjhlxnItTHuaSoeyW+BHb VidrYmogBlsIB6T+n7kunyclCOJEzHs49cWfQ1QDCQcbMJGg4X3Ijf1vZ6PDC/DTmq KDyDQ2DQlu/ZlT9omhmV1r8XIyWIk8equsFbajr+/jkFDQeYWJrOPmAFXEoBJjj0Sn gVXWo/th/EmdNJgN02axPWySgLa+eAVgdFNdFzp+qXNclR3BNhvX4U/g5VRqxp1c+7 1WF94bCMmwIjmvmHqZqLhkfC+vWkR4b4NxsvcCN/fB5Njkjg1fPTHCBAaYtcGILNDu t0EVpllixZ08Q== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Skd5m74Vlz4x5M; Tue, 5 Dec 2023 09:05:48 +1100 (AEDT) Date: Tue, 5 Dec 2023 09:05:46 +1100 From: Stephen Rothwell To: Arnd Bergmann , Andrew Morton Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the asm-generic tree with the mm tree Message-ID: <20231205090546.7dffe3aa@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 04 Dec 2023 14:06:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784390717415131964 X-GMAIL-MSGID: 1784390717415131964 Hi all, Today's linux-next merge of the asm-generic tree got a conflict in: arch/mips/include/asm/traps.h between commit: 6b281b05cbcc ("mips: add missing declarations for trap handlers") from the mm tree and commit: 23f8c1823bd4 ("arch: add do_page_fault prototypes") from the asm-generic tree. I fixed it up (see below) 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. diff --cc arch/mips/include/asm/traps.h index 2c2b26f1e464,d4d9f8a8fdea..000000000000 --- a/arch/mips/include/asm/traps.h