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;
Date:   Tue, 13 Dec 2022 17:48:53 +0100
From:   Thierry Reding <treding@nvidia.com>
To:     Bjorn Helgaas <helgaas@kernel.org>
Cc:     Vidya Sagar <vidyas@nvidia.com>, Jon Hunter <jonathanh@nvidia.com>,
        Serge Semin <Sergey.Semin@baikalelectronics.ru>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with the arm-soc tree
Message-ID: <Y5is9cp6WdWixwgU@orome>
References: <20221205095738.607b9551@canb.auug.org.au>
 <20221213162103.GA106222@bhelgaas>
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="0mpWKdjTJOccsDp1"
Content-Disposition: inline
In-Reply-To: <20221213162103.GA106222@bhelgaas>
User-Agent: Mutt/2.2.9 (2022-11-12)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4qvzWkgvVy8QH34Gd0d9/TqTp/nFDydutSLEzZhkysSrQ/Oy8RLME8OaZTwJ?=
 =?us-ascii?Q?liqfkg2stP83a/f3spTAdOmapymm7DrOUCMtNeAsYrfAuGaKDUrwER+r5sCH?=
 =?us-ascii?Q?k4eoBhre25NROXgJTYRHuaNMmyGDbUQjI7x6zBm00uqBbtmEL89PpsQSSvXr?=
 =?us-ascii?Q?v5kgv5+zIGHgdp/ZRpvqZPBziVSp1Sr92pZlRmLTdenoS+ZUH+GjlzftrO1d?=
 =?us-ascii?Q?G5h1VpCkMVdlyB/QHFsoh8GiqAHr3AXNRmNm/QgTSdzEekQKCHi8dPKy++Sc?=
 =?us-ascii?Q?pL7jc+/tjJ+tPHtywtQHi1b0tfVlF7m4vRwTkOhggega5YRKeUdJS3lw1yZP?=
 =?us-ascii?Q?2t4tnue5vVgZaOi/eB0GlQnDMiUeudR7IWmPM+mFzYoPbumPXPtMQOor1D4k?=
 =?us-ascii?Q?ai/ncQW2ATb6eYeRZFkuq9RZSpQndto6K7RzwXIXyFT6d/icpPrJ99zlehv2?=
 =?us-ascii?Q?kkVyWT9XCJpfN42GtqrEg5ijeMjWYVK0aR7jlme1uPLVrBsVoYmiFfyiwzUL?=
 =?us-ascii?Q?nWMj+OZWtt/AW9DC6937Eo86zjpqaYuKz0Gbq2LlwfKRaUzCnKQ2lwR8KD2y?=
 =?us-ascii?Q?X0vPsvagrC1wVzMJw19cCycoqyATVVMrL3jvL2wv9jSxYXvp1mekOIlLXhXu?=
 =?us-ascii?Q?QMhFBL2gmATHXMvwOW2lxvj/KujvOqW90Lo5+DkzRo1cRHJ14cSgjQRziWzw?=
 =?us-ascii?Q?qxkycO62grTyI6xFgXVk47oBZNqy8i+JeZ0DW3TFVW81ZFGmE5ZwyxbwBvXU?=
 =?us-ascii?Q?lbWgyaopmPnVqbqZWoewo0m/2poaInYtQfO3vc0wsdrM3W9Q4CHznvBiO4QQ?=
 =?us-ascii?Q?oG0p+clRhALNye4N7NdSX6wxbUcj6UtvLZdXM/tG1xMAFOQZmHp5o6T8hLqu?=
 =?us-ascii?Q?yj0ii8cYzIAfeu1jl3wh1NU+6Pll89sGpDFsz/XktBxEGvDRu+YywvlEnC+E?=
 =?us-ascii?Q?6yABrvr1QfKn4d3GgxtHZDhXHNczC7tEqiRG3DJ0RZW17RimI6Px5+wIeJQy?=
 =?us-ascii?Q?X3e8BkzwPOImjeLAJFgW4MLUpUPs55Xx96t03nicei1/SNcdCi3Qe3Ippy1L?=
 =?us-ascii?Q?DAOrugNc0yL3+/qcVaTcVbAls1gLLsAb2Oiz7+OqOflntRDsLInSwxlXXXKu?=
 =?us-ascii?Q?+aI9UWESZSeejLCzo4mhuPm8gaMyt2sgRAF/sXYpaoScn5F7jRmzNwrNm8Yd?=
 =?us-ascii?Q?Y1HlXexJWnvG3/FLoFCNSsCxI7elPMQoCFbu2BZl4Z3pb1iVfiFF9p6QDhJj?=
 =?us-ascii?Q?953nEtH1VTBdCSpxgwzDCq6PuWZlu6LQQut78EnxkWa1Q0x5E42ng0etwH5o?=
 =?us-ascii?Q?MKK/WU+Dj/jb1hjoDn/IYXsMSQCIZ4eqCTL4tsRUL6JAIZV0XTBoXJb/xdAM?=
 =?us-ascii?Q?BG2qgRkaLcOiU5PSxdJbcPTRPFnsl9TcydnsdOAbcBRZvt0jp/c7J5tjt4k7?=
 =?us-ascii?Q?UBQkM6Ta/q1ui66txv8w41Gf0z0JY528r9pg9jrSU9pNgQbVIt1lIcdOdUya?=
 =?us-ascii?Q?qDDJmQPjylRAa1iDIqAuenLTO8ZGK/1UhIpvOnG06gw4afVk1lxgi+TDhgkm?=
 =?us-ascii?Q?Z8hKnY5ETSf9H894rpSzMxEjeCjLgDMx/8j0Vt3xd/Bz7MiqyKtUak3qxfLz?=
 =?us-ascii?Q?7puOZH/meNpTHoOLnRcESGCYtDXDa1Ts0fv7koWY3rTr?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e6662035-409b-4911-fa24-08dadd29ef36
X-MS-Exchange-CrossTenant-AuthSource: DM8PR12MB5413.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2022 16:49:00.4834
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jkTdrdubrnQhCERMkmn/8srKLE3M7QE9N0wWcFSZ21Xj2sctDHvsaBk/GE7Upk9GID/v1PzHCIkGOf+BZ2xhCA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5956
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no 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

--0mpWKdjTJOccsDp1
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >=20
> > Today's linux-next merge of the pci tree got a conflict in:
> >=20
> >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> >=20
> > between commit:
> >=20
> >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> >=20
> > from the arm-soc tree and commit:
> >=20
> >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common proper=
ties")
> >=20
> > from the pci tree.
> >=20
> > I didn't know how to fix this up, so I just used the latter (and so lost
> > the addition of "ecam").
>=20
> Did I miss a suggested resolution for this?

We had a brief discussion about this in another thread. So basically
Stephen's resolution is fine here and the plan is to instead add the
ECAM bits that the Tegra patch does in a separate patch on top of
Serge's patch. I should get around to sending that patch tomorrow.

Thierry

--0mpWKdjTJOccsDp1
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmOYrPUACgkQ3SOs138+
s6EEghAAuPQiw1O7wFpguaspQhHPqYkzdaIZJibB9FRy6025yT9XrzzUDvv4VqVB
nDCBxFam8tK3m1fWoB/x63w2Rnvpr/5Bq5VD8CeTtfwH49wDBgPByciiFxteE+p2
aCBADgUiPd/rBuIAVFrXETKlYA42/2lVjZxsGCScxCot4dxG8nD93xpws3Y+Yovs
7YuLcv1SjPabiZ3ohMyyNcX7wDNam76cpWPxW3lvI17ilWOwBlflbgsGOqWAvyLz
4AtMjv/5k9UANb3euAt9q/R4enVAYb+rV+TtO9oG3+xJPNA4U689kmK1LfRP6dX2
rAUtp3Dfc+xO/wQTSulW8Y3TZp0oOSVTn2G71UuQ7l+qelN67OQ7dbsulqvAgB9n
DjKCN8pfet6MYiprjbKBTlE3GwEJfDXs+/k0nBWap7jW7NW/FCYToqojMRB37Ty3
FSpzqeNV1khyunGN1l1VXN5fxK49VgmX+pEIlm3wA9TC//0sSXDrZ+bxCsb/9w2X
StA/LlTnKAcoWCzXXZrrj2CfyzEAmcREydROcbE02MXbibPKc0LMY3R2w00BDH0b
SHRopyR2CFwFSySY6fsoZN6Y0gcNpDea6hAdvDRHCG/PjxNBYG0oLeLw+0jE1buL
SA6BZgfP3tIEHMZne43pj1hR8mNT+wqg3vyXYBask3+jocII/6M=
=qjbn
-----END PGP SIGNATURE-----

--0mpWKdjTJOccsDp1--