Received: by 2002:ab2:6816:0:b0:1f9:5764:f03e with SMTP id t22csp61757lqo; Wed, 15 May 2024 21:40:20 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWPh00dmtNvbW0DBpwfdHRzM1Wk8M32dV9lYQEj21CMiEbyDN8FbKcCi/XQhPlB/b1ZnJKh1uzN6rq62xw1Gb1my9zdNAMtZs3nQCerlw== X-Google-Smtp-Source: AGHT+IEWyS38Bi+Arx0K6leCy7HraloaeclH18LXHxKglWfE2OlL8o5zoYu2QpvYRlD131RjEKHa X-Received: by 2002:a05:6902:548:b0:de5:1553:4351 with SMTP id 3f1490d57ef6-dee4f31903fmr14966841276.15.1715834419992; Wed, 15 May 2024 21:40:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715834419; cv=pass; d=google.com; s=arc-20160816; b=dRfQETfLXQRNjf0QlnZyCzPYVKN2b3scNTr7Gm3So2+2bkG7bfL/MVtlhABn5DOhSX /PfnNabTaYD1Xsf3Ol/i9LPpTQ8x2oFSYqTOqDeoQbqCBqT9wXm8tSBst615o6+drMnq 7MGVY+FWdQ7zIIBbGuANfmjI6232n2BkVJmvIGBNIF2rcKNWb3GaTCMQZEyEbxqXZrOE 7+VvxDFhF7UWpC1O0dXMSRsifg0iFBoiFcNI6Zr7szfJZYR6DHxjbK3Th5pIEvT/wEqV k0ngeHJStIogcnat4+h93GIm8emACILfWJchr3VEMo/ypmpOr4doyiRjJXw2z5LXehsx 9/1Q== 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 :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=KwkWYAxPYWT4jyt7Nt2O/X7NlRLqDeRalY4XQ+cUo50=; fh=bUOPwQoTbnjKb8wf5VhfsaGd/oxnxGItLnb12LjoKdk=; b=pm/mjZ73R8cYVyhPkrmQ77PFetM2k7RfnyEmPWkmj+hkz8QDsCC9f9b35KBHuyFh9s g6Rm/+2C4F0GLW/HEHRiznrTU8Qns/clsO2DKhuq3tfKbzzE7+JbM4th890Rum2MqsSX Uwl0XZ4m9yPlRQ4WmPNPvzM7xCuy8cebmeLt+9aZXHgFyfol0yaN2pSlNX+cxyY2MxlQ 1zGYcRHkzQs7xw9nHetCUW7MP4x7mHfJTU/ySmqPInPRvxapOUK9QGFVoSol7IrQUGxP TbbKA6I2ISk8pZ3JmvnTDeV2Ngd+Z83+rmQOqbdFUI2XI2rejkhZRRVv2zumr1BAoqMG 9Csw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U7LS7LQI; 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-180628-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-180628-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id 6a1803df08f44-6a15f2b6446si158793296d6.391.2024.05.15.21.40.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 21:40:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-180628-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U7LS7LQI; 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-180628-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-180628-linux.lists.archive=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 A4CF21C22A70 for ; Thu, 16 May 2024 04:40:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E472D125DC; Thu, 16 May 2024 04:40:12 +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="U7LS7LQI" Received: from mail.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 E7820FBF3; Thu, 16 May 2024 04:40:07 +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=1715834412; cv=none; b=K5N+vxY83ZhzJj+3JCH7eKNaG7ern7w6z+ekhZyLRdw6eH5OXR7hKq0zcRRbkH+50yhUuRcRzJZd7CemWvRk6o1j9LPxHKcjOuF7bcd7fTSYiu0P4Y6q6tcuA/T48FVseR61hbErZGT5mi2S9aGhqc0PBD++ZjUIo3+TAbVrXi8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715834412; c=relaxed/simple; bh=L54fO4D0FCChnqQLA0pJ16mx/7DtJOfTrBflRIH5OcU=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EhRRQjXSFwuTI/T3ItDjD00NK0vvVjxL9cNP/7SR/tczO2KN3BPsyQVm0CISC/hkdeWeAHRWI5MIAt7kCymOgZ1MUaZgeEcw+/4AXk+eZ8k9Eij7n1o51mQ/Myv0qrVY1FHB9UHZJTyrXhPFmk+TqTEj3KttJx8+lLcnWRlFg0I= 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=U7LS7LQI; 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=1715834405; bh=KwkWYAxPYWT4jyt7Nt2O/X7NlRLqDeRalY4XQ+cUo50=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=U7LS7LQIAJQ9sJbAsmWLlNoGKR3vuGVLnrBUF0htv/rrWApI2d5bin9OP3X9B9228 TeEGGkoOcM/cYhV+H472ZrYEL94Vzf1vfwP24vb2VVcK5NKeI+G4jup+JQy1JUxJn/ ukV95Eon7vBaQAwkZwsyOSPd9BCqglagvAYwU31aO7ttFxMG3OIRtsLIyP7e6MyjeK T0h8Iv2P/QCHh0EfRwLQaeMaBVZqkfmJIqVY9ARAVuN+uxbqMde3HCecbiiGJVr35F cIU4Ep3qVmV+LmkcBxoXfC+jGE0yRzYzNr99Z8+6aJxe0+J+ZlW+1V02luaBGHDe7Y YHKFTUUsbvUTA== 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 4Vfy7S2Pncz4wby; Thu, 16 May 2024 14:40:04 +1000 (AEST) Date: Thu, 16 May 2024 14:40:01 +1000 From: Stephen Rothwell To: Yangyu Chen Cc: Palmer Dabbelt , Paul Walmsley , Conor Dooley , Emil Renner Berthing , Linux Kernel Mailing List , Linux Next Mailing List , Masahiro Yamada , Palmer Dabbelt Subject: Re: linux-next: manual merge of the risc-v tree with Linus' tree Message-ID: <20240516144001.091ab957@canb.auug.org.au> In-Reply-To: References: <20240516093641.15695f18@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/OrY0=XKI6gro7W/9yHoZroH"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/OrY0=XKI6gro7W/9yHoZroH Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Yangyu, On Thu, 16 May 2024 10:17:14 +0800 Yangyu Chen wrote: > > Oh, No. >=20 > Here should be CONFIG_SOC_CANAAN_K210 not CONFIG_ARCH_CANAAN_K210 . Yeah, sorry about that, I realised after I sent it. I will add a small fix patch to linux-next today and it will be correct tomorrow (if it is still needed). Just make sure Linus is told the correct thing. --=20 Cheers, Stephen Rothwell --Sig_/OrY0=XKI6gro7W/9yHoZroH Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZFjiEACgkQAVBC80lX 0Gye9Qf9HPluOLJTj3vATBddSi5tC1/fYifvXVs8shGZhxzNHVqz3N57Bz9B46u3 hN1BOWMC53SYEn4e7DZ/TYspVwur6dJmOZ6139N/t5ElQL7gIKHogC9RiYqdJFcf /95J+ulf16OeMbyfXM12ghG14D6g+i7c+NdAsWdn7KGgqfypGxzrX6JT4O8GgVvU PoukaXdezmrLMF26N//PMo2YQfduX+NZohjFKkAyz4j49BbndMlT/X5o+BfQ0NH1 hI6N6ZvXH/o5HHGsQA9vrACwSPQvY4XcnSq4Yo7bqQ5ONHJojifZ0to5INTpYSgn FhEmVcqgdIXk/6xhIm8BbnBeoiNLSg== =g8f3 -----END PGP SIGNATURE----- --Sig_/OrY0=XKI6gro7W/9yHoZroH--