| Message ID | 20230809134051.1167e40d@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2561098vqr;
Tue, 8 Aug 2023 21:38:32 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IE6Rv4zXoZhftRADmxhw+wdTZNodaPVT8BE7gxWp4/f/GVGJJ/1MqDnNmfT6YGe1lJN3Vzh
X-Received: by 2002:ac2:5f4e:0:b0:4fb:81f2:4228 with SMTP id
14-20020ac25f4e000000b004fb81f24228mr821182lfz.31.1691555911924;
Tue, 08 Aug 2023 21:38:31 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1691555911; cv=none;
d=google.com; s=arc-20160816;
b=NCfTu3WxcyJb6aK07mx5C+mjyn9p75RRcyvbuVTUfDHy7Mm3GyWLles8TAHGLOPiXF
Lc19F8GARsm0BEv35zEW2mnjdPp6lKyfGobeyrX2ylRWiJycE4EPxRq+/0m4OBQb4mEL
pj9TTRtwlKFpr+c2E1yUwVcAG/ykuGUAjnULPTJ8q38OZJRbwj3Vw3t/AJISFlvdgkIB
qeAnViV/pyDzH2n9a3PC5ep3jDFLRwpK/G3Jyjy1ICkl6ISN/Mcm9YVidGzgvwbyw3fi
2jt1RsZQaZ1CPDZA9HH3SRtIITw9SAPLnpPTadFGlrLrRCquTCD+oj4hn+8WcyUCJ+Rt
6wFg==
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=eYzYCpPfk9mGCdjkiffMCkKG4XvwoVeUP6ZVEPKf4pU=;
fh=FGtmJNowKmgOzwiM+sGXcJnnog+jVJ0zhq7pFs7a9t8=;
b=WHTHB8pAFJm3t+5SlaoFJ26rR0JszAWgAUi1xqxvbZGTorHVGmhAV/4jMdrzKGhdjc
2V6v1CGiDX/tDNmgaZ9DgsSJo4ldUB5LnxDJli/vQQDIGuoZZjWLD9ltsrkktLDOd8kU
MRrPLoMu5VuyVwu/i9rx2X3nTiDirm92ysmrry5oF8uwqogmmBZtnIG/Eiy8cXCTZcmG
IfgnScL684d8g0PwB13IuyDuKav8hy+ailUVWcdA5EcwUDvGHL3sCQPiYlDmzPI7FNYP
/0LQFKNBdfvFrrNVtMfQV4VTVjalScINoLQAJH6Lpc3MFgg3cAJXRognchAJs1MgPN0j
JKzg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=oJyc+gp6;
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
l23-20020a056402125700b0052247666986si8670296edw.434.2023.08.08.21.38.08;
Tue, 08 Aug 2023 21:38:31 -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=oJyc+gp6;
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 S229810AbjHIDk5 (ORCPT <rfc822;aaronkmseo@gmail.com> + 99 others);
Tue, 8 Aug 2023 23:40:57 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54448 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229512AbjHIDk4 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 8 Aug 2023 23:40:56 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18F97C9;
Tue, 8 Aug 2023 20:40:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1691552453;
bh=eYzYCpPfk9mGCdjkiffMCkKG4XvwoVeUP6ZVEPKf4pU=;
h=Date:From:To:Cc:Subject:From;
b=oJyc+gp61EwOaT9IK+bZVCQEQ6FpEaTKOav5LJIpwHeI9db80+whzUSJrwlzvIQFv
p5/UjrZLzo8NsCU0iDH8lKKDmeOZGAWNpTZBTUwNiFMISTFNKQwfhS7I2VOXjXS9D/
wnCbxCin/AcF6GAwF6C4F2nwQ8ciNzwaYj+VlcAkzaaiI9w/Q+uO4ULTE161YoY2uM
UaubInqub69xFoOQxEGVAh5oHju63X07mFvZLywVMfPPT1sGACFxNdpaUPCrNrffLO
3sSkazErw9EQ5PasuidJg/CcwUHzfzb3ZAWJVSE/AZyFuf3WjeM/wORRQy7q0xOiFw
EMbdxx//pMZMw==
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 4RLG6s1SYBz4wy5;
Wed, 9 Aug 2023 13:40:53 +1000 (AEST)
Date: Wed, 9 Aug 2023 13:40:51 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the tty tree with the net-next tree
Message-ID: <20230809134051.1167e40d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YnfJMTaw1Wq4YKH1vQazNkL";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS,
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: INBOX
X-GMAIL-THRID: 1773724931666299983
X-GMAIL-MSGID: 1773724931666299983
|
| Series |
linux-next: manual merge of the tty tree with the net-next tree
|
|
Commit Message
Stephen Rothwell
Aug. 9, 2023, 3:40 a.m. UTC
Hi all,
Today's linux-next merge of the tty tree got conflicts in:
arch/powerpc/platforms/8xx/mpc885ads_setup.c
arch/powerpc/platforms/8xx/tqm8xx_setup.c
between commit:
33deffc9f19f ("net: fs_enet: Don't include fs_enet_pd.h when not needed")
from the net-next tree and commit:
a833b201d908 ("serial: cpm_uart: Don't include fs_uart_pd.h when not needed")
from the tty 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.
Comments
On Wed, Aug 09, 2023 at 01:40:51PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tty tree got conflicts in: > > arch/powerpc/platforms/8xx/mpc885ads_setup.c > arch/powerpc/platforms/8xx/tqm8xx_setup.c > > between commit: > > 33deffc9f19f ("net: fs_enet: Don't include fs_enet_pd.h when not needed") > > from the net-next tree and commit: > > a833b201d908 ("serial: cpm_uart: Don't include fs_uart_pd.h when not needed") > > from the tty 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. Fix looks good to me, thanks! greg k-h
diff --cc arch/powerpc/platforms/8xx/mpc885ads_setup.c index c7c4f082b838,6ecc7fa2a816..000000000000 --- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c diff --cc arch/powerpc/platforms/8xx/tqm8xx_setup.c index 6e56be852b2c,a451f5003abd..000000000000 --- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c