From patchwork Mon Jan 1 22:08:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 184183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4165875dyb; Mon, 1 Jan 2024 14:08:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/dKR4CBjqK3exqvtYP4arYbKXeMcJ1BwCbcg77ulQnZzsSMfoWALN6Tw0VUkqYpOyROxe X-Received: by 2002:a05:6870:5686:b0:203:ff5d:b5f9 with SMTP id p6-20020a056870568600b00203ff5db5f9mr15642294oao.40.1704146923484; Mon, 01 Jan 2024 14:08:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704146923; cv=none; d=google.com; s=arc-20160816; b=Ph4rhzz63KHtn8QUgZr0ZRpx118gPMQjIUcbkgyiNhQlS8uoTcig2uv4cpXxlTUoPD tZBIocWq0OZulVuw3GbYhOUUwUuYdcEyUKnrdHMOJNzn3e5z+211w0shsuwEMezlzHMa u5GY3yYWqB0+4clqekJiJ0p92Dh+hhgT38OW9rsZYHnkHeS39zAMBAjodRqyU7BCbA6I kAVqwF0pjyH+OnXb0NOZ/Wa6Do2P6ubG1EAUHX8c22PfZJajYvdNzJYjNydACY2/GxhH iviClVpfGb6SRRsgkapYxksALR3HSkDaeML2hYflJLXyCugccMbOQb412LWjD3pUmBL3 3sUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=JRJV7ElX1rFWpuMu0jxb+JP+5jXn4iWDgasR8SjPBR8=; fh=Ux51kCoA+9GYR50ektzq1qgOR3xGppFwZbjM6OCUCO4=; b=VB1MTvv5JkLmlx9Tfb/9LGnPkrEVgj4iwsr8DvDawIH3/OyZbnrFlCP9JHHTMxioPB nO2xP1+7EDsd5izA7y93StOavspT160E0Rrje+WIaZd1smPXO5Jp3hkEGc3nwP552Pkn eExDT+w/SED+EfHvcNbkV7ELPE0/49Otb1vtVaIemrzAXKRypRpPz09D5R+3KPuKq9+i /E4NpNbpfACIsqee4EcMkK72D/LWRQS/KOoW7EYFFFGHaLKSMi8UYerxOHeXxmlxAIxU HhxyjRMblJY18vjBPM5K4Uux6HY3MC4AePuHLFNmO2gjV4qNnIUzCTMoAO5irZn7/qaI IJkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="g/4OIVud"; spf=pass (google.com: domain of linux-kernel+bounces-13950-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13950-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id w23-20020a05620a0e9700b007811c39c8cbsi24518476qkm.713.2024.01.01.14.08.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 14:08:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13950-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="g/4OIVud"; spf=pass (google.com: domain of linux-kernel+bounces-13950-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13950-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A93F61C20F37 for ; Mon, 1 Jan 2024 22:08:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25F53EAF0; Mon, 1 Jan 2024 22:08:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="g/4OIVud" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B942DE542; Mon, 1 Jan 2024 22:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704146895; bh=JRJV7ElX1rFWpuMu0jxb+JP+5jXn4iWDgasR8SjPBR8=; h=Date:From:To:Cc:Subject:From; b=g/4OIVudulbA6rz+YktAcBt+UiCTpml1fEgJrjwfoKDRmozz+PetIukmkd46rC0qm JwRN9iZe5a0jKC1vlTI0G3IfOs2T9oef0HCPahpZzrqIAWCzpp5pvfBx94opjva4dz 4jNeNKQrOuXwWanJZGXPZOKODuh7lttMH2oRrjbgkNnIjKEDG3RdGJaIa9VRb96UV1 W7yqZ8ZKXjpu/6YPlvXpYaAOARL/y1BvtB8GbZ/cRqWSlBNXmDT02Byy/ksKHEvfEg Q8UP2Igab7AhVyezPmQarvJY77mxbdhG1obJQuNvityo5w7fxPvYOk7BwbNBP2WYMx qx2dPGG/J1Lwg== 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 4T3qqf21Xhz4wny; Tue, 2 Jan 2024 09:08:13 +1100 (AEDT) Date: Tue, 2 Jan 2024 09:08:12 +1100 From: Stephen Rothwell To: Thomas Bogendoerfer , Andrew Morton Cc: Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the mips tree with the mm-nonmm-stable tree Message-ID: <20240102090812.4243eb88@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786927564458425365 X-GMAIL-MSGID: 1786927564458425365 Hi all, Today's linux-next merge of the mips tree got a conflict in: arch/mips/kernel/traps.c between commit: ec47b986e53e ("mips: fix tlb_init() prototype") from the mm-nonmm-stable tree and commit: 8e1803900ef1 ("MIPS: Remove unused shadow GPR support from vector irq setup") from the mips 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/kernel/traps.c index c58c0c3c5b40,c1b2b18b0505..000000000000 --- a/arch/mips/kernel/traps.c