From patchwork Mon Feb 26 23:03:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 206971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2379995dyb; Mon, 26 Feb 2024 15:04:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW5y31fybOU5RsF32GJ9rLsz3Zs/59xwFneIh2aEEva3m2mtjErP3Gea1mAnjc2dlVihvuaa+KbrZT8vj+7mNNIj1mYKw== X-Google-Smtp-Source: AGHT+IESA+i5vTVCy2SI88f5biUwdfaYrVcLbohTna+nD0kVMqFTQpqShsWncSH1/h8NrdVuF7Kp X-Received: by 2002:a05:6a21:3401:b0:1a0:694c:c467 with SMTP id yn1-20020a056a21340100b001a0694cc467mr705370pzb.14.1708988651829; Mon, 26 Feb 2024 15:04:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708988651; cv=pass; d=google.com; s=arc-20160816; b=tvodteSl76FaKm21TfygkzgWMiqaO7uH4ODmTNVwC5362m02By1rvMKm315M2XuRv7 ede9aYeG+Jutje1jhtELgDROo/SdNkhN+njJHnfOEMr1gZSP70JtjAzcCsTuZFuCgtAk vcYjaYkAZsrY5f+wWNgkRlEoMynKX4xXQJKvUltERmfJpi/7fLoUYTB6lifAYa2kFEVD /o4MUlvP0RAc1HlbMZX82nOXdKmG+0vjly0nnAd76JSrcQJ0/SR/7APkHG0k+Drl7jae JQ0QMys7yVwsJhywMTjTUUzF5/4zsm+jWnEK3RMblV5/TaTsCvhyz+pwu/iFb6gna7Rg HlaQ== ARC-Message-Signature: i=2; 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=RA5pyVGVpeMHztHsPvWh2/DejPVZ4y1rM0WtuJXcLXs=; fh=SGUb7wxF06ddvdxUb7jqhthB20AlWc88bNnzslunGN0=; b=OqJapkLqY5NqqY1KynZoRtQcn/qJLe5HtqrDtv1/plU9WpAh8VAh1AOB8juibObpNV QPZXZeH1hwga9no7zdqJ3TfQ6guWXDhcR3MZ4DJzoirMkgwZVT4AM3S/CCfTkNVrUHBF 7ktKQaQVYSl8rrskiaxaCjOwXLMzTUd37GhyT/6P99MsrHeBNDxTdxGmC4Xm8a1fQTB+ LEFzL42K6grqhYx/BCVn+zzAFbSZ9wiNnjDUq3MUQ72Xlta11C2zkRPJxeJb13F3RcX4 f4LcCo4J2VrC7AcYsHtQkooqwLbaJChb7gv44fMvYGL0lyDWAs6Z7siL/GOib5phvRxf CllA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TQV3JW4O; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-82430-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82430-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id dr4-20020a056a020fc400b005d645323583si4370332pgb.755.2024.02.26.15.04.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 15:04:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82430-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TQV3JW4O; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-82430-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82430-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 9588EB22DE2 for ; Mon, 26 Feb 2024 23:04:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 29274135A5B; Mon, 26 Feb 2024 23:03:50 +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="TQV3JW4O" 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 39F621E878; Mon, 26 Feb 2024 23:03:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708988627; cv=none; b=m70k9nC7Tfoy+7WoVVh7yYLeFR8u1trcCwGvtBo/Qsz+7uQCJjsrK2+3C54jPjUXLRCMfuB0xTnHYBJFfpzKUkSwqVfzTyW+SvG01USfVWQ+4vnmFNzJl7R2WDPjz11DrCSE+xvqNBOBc4NIEHX3j1N3zmOgnBA19MVOhBhkoyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708988627; c=relaxed/simple; bh=JCo1qii8yFiXcyz7GwvVbZU8mdZnZAbkXKJprXLQXAo=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=lP2MhryP2E2s2iXYQe1rj5HRKPZZbmy1KvCNDshB4X3eQYr+Z6QyhH+Mf+05tHDGQxqpEwC8yOPicsKMIlsBrj5Mj4KgFWWHCfv0qu1BI3jwhqukOfGxEyWbfTRW4fxM1FEwwOeKmMG8RKiy2ZPuwadDApHSeNmFbfrv/8qUiNc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=TQV3JW4O; arc=none smtp.client-ip=150.107.74.76 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=1708988620; bh=RA5pyVGVpeMHztHsPvWh2/DejPVZ4y1rM0WtuJXcLXs=; h=Date:From:To:Cc:Subject:From; b=TQV3JW4Ot6ikgvdNI/skoCi9CKJJlXjYHopvV1I3lqoz1bhSdy2D9zR2dMYUwq2m9 b/d/zwhDJPVypVzwcLmR/Lo0tf3AFW+UuX91IMkiQGqcInFElAr2ppCF2M+uEQTqxG o5OKCgme12aTnKJzu34VAdZlZ6T1nzr8EXxiCmT0vKuQQ3LMsthQ7e6IVArvZFXPHf LFFoF2XxQObtLudSxOf1ZPJQgBae6k2KF8xgbchYDbEEqdw/qWInwmggc5FZXBmQV0 mDuXtqNpsrjhh+MGpD7g+y35/cxBGHCTI+lqpCeqfZnrlxbpLOWLlR9N9fhzqlyqtb XhY6xg2FyUFOg== 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 4TkGPl6FZcz4wc1; Tue, 27 Feb 2024 10:03:39 +1100 (AEDT) Date: Tue, 27 Feb 2024 10:03:37 +1100 From: Stephen Rothwell To: Huacai Chen , Catalin Marinas , Will Deacon Cc: Huacai Chen , Jamie Cunliffe , Jinyang He , Linux Kernel Mailing List , Linux Next Mailing List , Tiezhu Yang , Youling Tang Subject: linux-next: manual merge of the loongarch tree with the arm64 tree Message-ID: <20240227100337.4e9b64c1@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: 1792004484523681005 X-GMAIL-MSGID: 1792004484523681005 Hi all, Today's linux-next merge of the loongarch tree got a conflict in: arch/loongarch/Makefile between commit: f82811e22b48 ("rust: Refactor the build target to allow the use of builtin targets") from the arm64 tree and commit: 58aeb61a338e ("LoongArch: Add ORC stack unwinder support") from the loongarch 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/loongarch/Makefile index fa4fb09909ae,e3bc02fb7fdc..000000000000 --- a/arch/loongarch/Makefile