Received-SPF: pass (google.com: domain of linux-kernel+bounces-162491-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Date: Mon, 29 Apr 2024 17:51:13 +0300 (EEST)
To: Andrew Lunn <andrew@lunn.ch>
cc: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>, 
    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, 
    Rob Herring <robh@kernel.org>, 
    =?ISO-8859-2?Q?Krzysztof_Wilczy=F1ski?= <kw@linux.com>, 
    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, 
    Gregory Clement <gregory.clement@bootlin.com>, 
    Russell King <linux@armlinux.org.uk>, linux-arm-kernel@lists.infradead.org, 
    LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 01/10] ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of
 the way
In-Reply-To: <1d3606e7-0cb5-4180-92ff-5b9cec7a64ad@lunn.ch>
Message-ID: <eceb5fb8-dbc6-3f2c-4a50-629518198b89@linux.intel.com>
References: <20240429104633.11060-1-ilpo.jarvinen@linux.intel.com> <20240429104633.11060-2-ilpo.jarvinen@linux.intel.com> <1d3606e7-0cb5-4180-92ff-5b9cec7a64ad@lunn.ch>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323328-486568427-1714402273=:1286"

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323328-486568427-1714402273=:1286
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE

On Mon, 29 Apr 2024, Andrew Lunn wrote:

> On Mon, Apr 29, 2024 at 01:46:24PM +0300, Ilpo J=E4rvinen wrote:
> > orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic
> > because PCI core is going to introduce defines with the same names.
> >=20
> > Add ORION5X prefix to those defines to avoid name conflicts.
> >=20
> > Note: as this is part of series that replaces the code in question
> > anyway, only bare minimum renaming is done and other similarly named
> > macros are not touched.
> >=20
> > Signed-off-by: Ilpo J=E4rvinen <ilpo.jarvinen@linux.intel.com>
>=20
> Hi Ilpo
>=20
> What branch do these apply to? I wanted to test them, but i get hunks
> rejected:
>=20
> git am < 20240429104633.11060-1-ilpo.jarvinen@linux.intel.com.mbx
> Applying: ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way
> Applying: ARM: orion5x: Use generic PCI Conf Type 1 helper
> error: patch failed: arch/arm/mach-orion5x/pci.c:276
> error: arch/arm/mach-orion5x/pci.c: patch does not apply
> Patch failed at 0002 ARM: orion5x: Use generic PCI Conf Type 1 helper
>=20
> I tried linux-next, v6.9-rc6, pci:next

Hi,

On top of pci:main (so v6.9-rc1).

"ARM: orion5x: Use generic PCI Conf Type 1 helper" should be only 4th=20
patch but your command seems to apply it as 2nd patch (is the mbx file=20
having them out-of-order?).

--=20
 i.

--8323328-486568427-1714402273=:1286--