From patchwork Sun Jun 4 22:51:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 103047 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2349040vqr; Sun, 4 Jun 2023 15:58:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4U8IJb9jk1FT81bzq176ynw4vb2srodPpVQNzkESQk+UDao8Mp0ApI99sLn+X0T6zujRXh X-Received: by 2002:a05:622a:307:b0:3f4:f199:d98a with SMTP id q7-20020a05622a030700b003f4f199d98amr6898897qtw.24.1685919529561; Sun, 04 Jun 2023 15:58:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685919529; cv=none; d=google.com; s=arc-20160816; b=o2FA2QusppxDQ0H1Yqj0U3QR5A2rANmCJ6n0Kvl2QUkS1A8eqcIt8+gyQ1C1dp2Wey 6RkRKkf3fWKr9ycyhbxd61PfPZdz0z3yzFyD6RCI9zSG3pCmt8jkGx2nyJKA9B1vMijF DuP6JeVQgjHDJjlFPT4tt+McxaXXrHJhz3VzE/LpMbIUamUUGXMopJjNpc66q2r1obMq aOx9w/ZE3LDSZymCJPscyVVfAVFPgI8TVipIpN9qnA1IxrC+JRpdgZUDQoEDyRA3aFxM Xpjec7JchM14TWJEPYkz+Ak1d0f5RbSjQe6TMohj4/Te8jylzXwiIE1vM6ly3fH8HaBx wdhA== 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=gS30G2CeUzC8UwUsGBHIt3Oj/UgGabW+XQAq0uJjAfs=; b=lBcOGKU/CaftOsO4SqaSL6mmzANVMBvNrx8/yhGhY1GXjlxXq8KMJuz5hRHlIeqqXa mStI390o/ya3ooiBIcWDVfpmlXYyEieY3no/gYoyU5eTGV7Vq8mXjvJYDpyEHhRNfCdI 6YOWDzIRqnN0tYSAY7MiDHVQef2spEur0auib+tBwJBSLag16JRytS4FOxATWq38gDv/ e8sMzMlyIU9C9rXxcrrAk3PSoiJ9iUzW1fGZxaFbhjuTE/5E9/hdrIXXSTJRT/N3ajkl drE7JG3wsaQVqXSPZwOmBa4Jsr++8s93xZpSofnoSMJ0UKclrzJkRKyDMyhuQK7Tv4y2 ppBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=QhAGOvSz; 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 j13-20020a170903024d00b001b1a2c14a48si4696384plh.141.2023.06.04.15.58.35; Sun, 04 Jun 2023 15:58:49 -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=QhAGOvSz; 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 S232312AbjFDWvc (ORCPT + 99 others); Sun, 4 Jun 2023 18:51:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229670AbjFDWva (ORCPT ); Sun, 4 Jun 2023 18:51:30 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE415CD; Sun, 4 Jun 2023 15:51:28 -0700 (PDT) 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 4QZBmq0Xfhz4x1N; Mon, 5 Jun 2023 08:51:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1685919084; bh=gS30G2CeUzC8UwUsGBHIt3Oj/UgGabW+XQAq0uJjAfs=; h=Date:From:To:Cc:Subject:From; b=QhAGOvSzwrZjBRz9tSZ/7JzPvfMq8kBqgNg93brLLWHtyOygSso+KJMDh94ru6Twx e2Q1dse4CHw9bsT2c+fP7B2MqcvRiH4llUBtHIeqNhyfXG4xk+abqZi8G50g96c7+p ilTHYjat3/EASHv0u5PPEUidcNpPugFQCS8nlJQMEU4m8Npgs5Vebw3WDAtGMHeZkg FuKCClANzEWb8YZ5rV8XNfraKm5BWcnuqD3nLZzVTwdo3CIz6QKkEjgwsknT/Owa0g esg4cnOhoVdOkHZiHjBBlp8bNDa7Qw3nCIcNLDRDmOwgk6CVJ4IeScCWeA2BTHAzxU /CtMvb+lNQuWg== Date: Mon, 5 Jun 2023 08:51:22 +1000 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley Cc: Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt , Sunil V L Subject: linux-next: manual merge of the risc-v tree with Linus' tree Message-ID: <20230605085122.38f696e0@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, T_SCC_BODY_TEXT_LINE 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?1767814756643180493?= X-GMAIL-MSGID: =?utf-8?q?1767814756643180493?= Hi all, Today's linux-next merge of the risc-v tree got a conflict in: MAINTAINERS between commit: 80e62bc8487b ("MAINTAINERS: re-sort all entries and fields") from Linus' tree and commit: cc9e654a7e81 ("MAINTAINERS: Add entry for drivers/acpi/riscv") 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 MAINTAINERS index 607504217dc3,0d6ecb5a4107..000000000000 --- a/MAINTAINERS