From patchwork Tue Jul 4 23:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 115908 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1537619vqx; Tue, 4 Jul 2023 17:33:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlE8FxLBCb05jzhx99x07JB9umcPbC0L2VpIh/3Q67z7STcRtAOjOsYQeBPo9gGHSQLnp8Nc X-Received: by 2002:a05:6808:10ce:b0:3a3:9073:856f with SMTP id s14-20020a05680810ce00b003a39073856fmr16452215ois.3.1688517237330; Tue, 04 Jul 2023 17:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688517237; cv=none; d=google.com; s=arc-20160816; b=uztUoYBM8Qoz8jJh7OjGH2iLbeqvNQzCQBK3MyIQGR+XALjrkvmw7fG5x0Jen4lNfv saj8fesEBkXg6oJa930PfnElXQh024Dra65174Q69sMjPPh8NCCG4X7xc4X7RJB272n+ z6YRd/A+nT4nZsFLp9drsZr1WTomu3mqF4YkapPn+T6jCaSbzt+XXcyGU7WQM4EECYRz 5q884nN7xKOHapRlBCy6oUvQDV/3QGWfu/4ZsFh4B7EpEQILBthlT+RECQVR8FCGefFn LgeOqfeLZhfmhBLtfLFAHzFFjhiewJZ6hrYY8VSyR5BB4xa9pRP7+5GflnND6PRcAtY9 cmqw== 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=m9X7PjJoGtGOIM1Fq88qaw0yVr5cSNkExDGHaJjEn84=; fh=xMhPqK4Erdc1PDFnbI36k3QWCHzDUn+HKEtt4MGhcnQ=; b=JcGT4hOFKjYRbzvgP+MUsiuyDXDUNiUGUg8MBMVQeinEVjLep14refFP92ZNa+qhqW cOWpRRj3u4YFycJ5BAQ+1Mb60+9ID6JZT47XjWlMn1PIa2ged+t08G7y9kxgcct3AXxT OBNlnEZNjsy5kkzHjRo+WgELrsseSFnQMI3pep7YM7L65Qh8/vkGL7CKtL/CCGWS6goP UypUF88UHAl7kcc7I94NoTGMIWNVLU7EsbaONLrG/nIbsmapj3XfuduCCMZq1psJSmz7 c0RZzKT+MW+x4eZLKwGsXNNqOZ7zyYXW+2Aq97tZUDB9qXujVjmAb+QDJQkNnfVECDTF l0PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=g1CYmj0d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u185-20020a6385c2000000b005343e03b044si22615675pgd.697.2023.07.04.17.33.43; Tue, 04 Jul 2023 17:33:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=g1CYmj0d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231312AbjGDXrL (ORCPT + 99 others); Tue, 4 Jul 2023 19:47:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229671AbjGDXrJ (ORCPT ); Tue, 4 Jul 2023 19:47:09 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B701A184; Tue, 4 Jul 2023 16:47:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1688514421; bh=m9X7PjJoGtGOIM1Fq88qaw0yVr5cSNkExDGHaJjEn84=; h=Date:From:To:Cc:Subject:From; b=g1CYmj0dkPxly36wnstPHcPrlh95/7CsERovwNagESjSzb2wqoktD/v2k1/6efYbC hJer7puBtJjBX3yOs/sCsHWQdArhvtK8h0ECAW0gxonKQpWjm0dsr3hNETbIC4cXR7 kSc+y3InxB0Zl0tGc4wpz8wkL7c7QON+w8kt75zylD2wKUNznXmuhVXT98/wsrrOW4 Flh5v1ATEQu2zxR/XOFBJ0x944HrXTdJetG7OnAoGsYw2b5WZp+0l/c8lb5brxm8Vk XMpJxkit9/M/pe8VqVfF1DmZRh2KirauHmti8JRaN5hFkvUpF02v+/WvaBpSsUn3cq l/WuNHC9GW3Jg== 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 ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Qwfb81bK8z4wxp; Wed, 5 Jul 2023 09:47:00 +1000 (AEST) Date: Wed, 5 Jul 2023 09:46:21 +1000 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley Cc: Donglin Peng , Jisheng Zhang , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt , "Steven Rostedt (Google)" Subject: linux-next: manual merge of the risc-v tree with Linus' tree Message-ID: <20230705094406.0240c3b9@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770538650674673137?= X-GMAIL-MSGID: =?utf-8?q?1770538650674673137?= Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/Kconfig between commit: b97aec082b51 ("riscv: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL") from Linus' tree and commit: ab7fa6b05ebb ("riscv: move options to keep entries sorted") from the risc-v 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/riscv/Kconfig index 6c12512d8278,c8c22cf11602..000000000000 --- a/arch/riscv/Kconfig