| Message ID | 20230524091407.71b4a42e@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2478367vqo;
Tue, 23 May 2023 16:23:25 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ49kgHtzJxP412ptJJwhCKfJl9ctuYyt5otjjKGO7hv2ONvUL0trLH03EPnT6/vaoACm6Oz
X-Received: by 2002:a05:6a20:3c92:b0:10b:8bc7:e112 with SMTP id
b18-20020a056a203c9200b0010b8bc7e112mr8535641pzj.10.1684884205310;
Tue, 23 May 2023 16:23:25 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1684884205; cv=none;
d=google.com; s=arc-20160816;
b=kTQpaFF5jR10C9e/HQAWQflsK+on1jafryJpCCx/GOJWXuGkWl6bVqXVjeJUUNhZvh
zYeNjbdO5wXQveEvJMb8hGygbfU/kkQjBCY1CnItQinYip1+yx6Y3N8KKsFd02kmo3un
/aJeATe6/3zrr9YBaNWsipbsSS654l4SyAZSia/GxK/uEj04S/M/+nnZY+/7WrLAgyED
mlRl8VQf/xWF7WxLSRKNyTqrJWzE72v/mmQ295rlou7+oPWrsA0f/JlE/qFORW1IlA/v
3H61LT9tlyMmaMKmCvqCZwaJVCfEiP2OGZ2RIdsHHx1ZDaDlTGmIvZHA75DJBf+PCTr1
Oa8g==
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=jfY1ZQA1iHV4JSZMNcgRNB7+bNhuN21X6QA4Zw31PQw=;
b=Ctf92D0OlL16qNdFkQZk6p8vxNyDMIjd3n7dqpPJiTQMK0CX/RaKi9l3EiW2/G5dAl
qIiloqZSS7hedBsuZ7KieWC9xsHHvpQg0frqlAO6Dzr6H1SUeWwLP4BYUs0ZHNp1CCFH
HvvOFRIuT097j01Hh6PiAktiSpTlztJQujoEnPx5yDExjgot00Gxl9nSoxw9T20niv00
Cp4qiARywmivZrVzVi1qd8jqgmKyDixBT1yr8YgdRLadcQ8ZNfRScmXjkZXHpNWBG0o3
oep+Mi9FlKOLDvIcR0HjpkvQ4ByDp5GtB2RvJ9sHrtxzCtN8+Y0WjsEl5kWxjiPUD3Sq
hPRg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gwgoLNZh;
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
n28-20020a63721c000000b0053b99f632c9si4174062pgc.842.2023.05.23.16.23.10;
Tue, 23 May 2023 16:23:25 -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=gwgoLNZh;
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 S234858AbjEWXOW (ORCPT <rfc822;ahmedalshaiji.dev@gmail.com>
+ 99 others); Tue, 23 May 2023 19:14:22 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41572 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229457AbjEWXOV (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 23 May 2023 19:14:21 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DD80DA;
Tue, 23 May 2023 16:14:19 -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 4QQqrh0lxzz4x2j;
Wed, 24 May 2023 09:14:11 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1684883653;
bh=jfY1ZQA1iHV4JSZMNcgRNB7+bNhuN21X6QA4Zw31PQw=;
h=Date:From:To:Cc:Subject:From;
b=gwgoLNZhoHNvZsWkpt2RvXXZCsg/By75pyFy0sZawssTL0fgmv8OEUrg4DO9xvoX9
Fe3B2MDgdADKPQffTLGwTmAEIvE+kd0hpDYihB3/pYxF/kdosEnzwvtUOt/94cMqY6
1hxhjTtY5IMvMA+G5kcCXykB1in0JpHz8+Dou5Yy2Osj3CfQGAn6hAXJv1MOxSrHNK
E6gDNI0RU48bHy4wb4v54atb8g/hkwgjW7XNW9kLi9+zfevoCu4L8NZPf8cd9BL0V9
bTTNIqbpz5vS7imFxTgeLXCv3Xb6dNYt705SuMt14L5qHi8nJIM45ximo9SWIUxm2A
kUVTttvbaJrRg==
Date: Wed, 24 May 2023 09:14:07 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michal Simek <michal.simek@amd.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: linux-next: manual merge of the mtd-fixes tree with Linus' tree
Message-ID: <20230524091407.71b4a42e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/3=scmLKFEkHmx.=+sNQ_Uvh";
protocol="application/pgp-signature"; micalg=pgp-sha256
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,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1766729140541211358?=
X-GMAIL-MSGID: =?utf-8?q?1766729140541211358?=
|
| Series |
linux-next: manual merge of the mtd-fixes tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
May 23, 2023, 11:14 p.m. UTC
Hi all,
Today's linux-next merge of the mtd-fixes tree got a conflict in:
MAINTAINERS
between commit:
80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")
from Linus' tree and commit:
faa5e6cbb559 ("MAINTAINERS: Add myself as reviewer instead of Naga")
from the mtd-fixes 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 b484d589e51c,3678799f537c..000000000000 --- a/MAINTAINERS