From patchwork Mon Dec 12 23:03:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 32555 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2519952wrr; Mon, 12 Dec 2022 15:16:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf44UbeKKzxLqRWrdn6WBiWZN4DE16zX1D5UPU+uMJIsk0UJay/0wC4JN8ufz8Jm3IEkOraC X-Received: by 2002:a05:6402:320c:b0:46f:d71c:e732 with SMTP id g12-20020a056402320c00b0046fd71ce732mr8416309eda.31.1670886985584; Mon, 12 Dec 2022 15:16:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670886985; cv=none; d=google.com; s=arc-20160816; b=kLznHFZOyA0bvvk46f0IOTz91cVuQsAC8IyDFe5S0AtoGSfB4oW7O7xdXbK+O9Nezq 9ydWU4ku7Ifc7ypeO99zoMmWXaaFFYYDabrqlTOA7W8NptQQ39MwkWyKsU7ibt8y9cXw 64ijDx9lCsl5UE+PYoMaiHA1HUSGlZHWwlC0v8yAHCpO+GkbluUf8sEjBPhJ1GIpA0tm ibX8B5bN8E1CO8laBNgYdzjphEtHuyP6hh1RXeFm9xjnfbQS4W8kjy/wXf5yrX8BdU/a 3lQWdmuXjGm3IK/84Dv1N0uU6SBw0GiEvsBhhZcirSkD9NxQ7Uijkd3PJ9zoXeyriwj3 RrkA== 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=NCgE8+5Ez0w6THg439ugWeJQOoe4/Mn6dIFRYwNl0WE=; b=DdfTsoZIkyCHu8JzDEsKruJ/ixRo9E4z9LaViNMFi2iHL7wOzWmlml4tFRSQhYPfnk xWCuzUM7xBBKVNuq/wvBemk9u4UqqLcHYwRFieDQi81E+cefhQux+mske9AO2vmGFXrc 0SN/YzcqsVFK+iut2DV1iOaRTGl6HXoNJf89a8oQXvL3X57ZVabgDNWBC7F+t3c7DNrN BByznj2Mpcoqyw9TQLj0BK4whgNYlMwlyduP6QNPGKnv3ZENuuL/3DWM3C78atWfE+4i zlnQDuGOIT2tTQTF7wwnJA10oQajqM1ZtgXbruOmRmEpYyGVXjSqQS4AgVkSbab5jHCZ +6WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gXCer509; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f12-20020a056402354c00b0046c8d52c79asi9851372edd.357.2022.12.12.15.15.59; Mon, 12 Dec 2022 15:16:25 -0800 (PST) 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=gXCer509; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233931AbiLLXDi (ORCPT + 99 others); Mon, 12 Dec 2022 18:03:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232984AbiLLXDg (ORCPT ); Mon, 12 Dec 2022 18:03:36 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3C321789C; Mon, 12 Dec 2022 15:03:34 -0800 (PST) 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NWHH13hnMz4xP9; Tue, 13 Dec 2022 10:03:25 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1670886209; bh=NCgE8+5Ez0w6THg439ugWeJQOoe4/Mn6dIFRYwNl0WE=; h=Date:From:To:Cc:Subject:From; b=gXCer509fBGzsF+tdyPj3AMSXcl1razUftnx7drHGmHiM46zpq7poMp4hiKl5vRC2 uHayIEuOrTbI7d0d+EtJHPim5gJwM9xeTZkj6p8q3B7Uc8rbp67YYzmFJL9Qxui6AD FtmdPxjBktCKabD5Kvk2D30Ra5XJhurinW9Fa7jF3jWl/A9ETwmlOoioe0loSxgWFN h2Ue407D1HlToUUF94Io2RqnJJO0zQKMmH6kyIv46IMjapLl3MV5IRnjUXFCVTDnBz sniHIEZBnG4nEKMFvsj/daiU90CwRThBmtIYY2hQxi7CbXjauXlskMv+0BPxeVPH0s kzFUp3nLk/ZBA== Date: Tue, 13 Dec 2022 10:03:24 +1100 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley Cc: Anup Patel , Geert Uytterhoeven , Lad Prabhakar , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt Subject: linux-next: manual merge of the risc-v tree with Linus' tree Message-ID: <20221213100324.67fa5152@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS 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?1752051991776369593?= X-GMAIL-MSGID: =?utf-8?q?1752051991776369593?= Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/configs/defconfig between commit: 1776fca7fadb ("riscv: configs: defconfig: Enable Renesas RZ/Five SoC") from Linus' tree and commit: 497bcbe3ce04 ("RISC-V: Enable PMEM drivers") 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/configs/defconfig index f7f32448f160,fea1b17dbbd3..000000000000 --- a/arch/riscv/configs/defconfig