Received-SPF: pass (google.com: domain of linux-kernel+bounces-88190-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <7158e09386f0345d2e87ea5433dabf38db027971.camel@redhat.com>
Subject: Re: [PATCH v3 00/10] Make PCI's devres API more consistent
From: Philipp Stanner <pstanner@redhat.com>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>, Maarten Lankhorst
 <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, 
 Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>,
 Daniel Vetter <daniel@ffwll.ch>, Bjorn Helgaas <bhelgaas@google.com>, Sam
 Ravnborg <sam@ravnborg.org>, dakr@redhat.com, 
 dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, 
 linux-pci@vger.kernel.org
Date: Fri, 01 Mar 2024 10:29:42 +0100
In-Reply-To: <20240229205715.GA362688@bhelgaas>
References: <20240229205715.GA362688@bhelgaas>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) 
Precedence: bulk
MIME-Version: 1.0

On Thu, 2024-02-29 at 14:57 -0600, Bjorn Helgaas wrote:
> On Thu, Feb 29, 2024 at 09:31:20AM +0100, Philipp Stanner wrote:
> > @Bjorn:
> > Hey Bjorn, are we good with this series? Any more wishes or
> > suggestions?
>=20
> Sorry, haven't had a chance to go through it yet.=C2=A0=20
>=20
> FWIW, I just tried to apply these on top of pci/devres, but it failed
> here:
>=20
> =C2=A0 Applying: PCI: Add new set of devres functions
> =C2=A0 Applying: PCI: Deprecate iomap-table functions
> =C2=A0 Applying: PCI: Warn users about complicated devres nature
> =C2=A0 Applying: PCI: Make devres region requests consistent
> =C2=A0 Applying: PCI: Move dev-enabled status bit to struct pci_dev
> =C2=A0 error: patch failed: drivers/pci/pci.h:811
> =C2=A0 error: drivers/pci/pci.h: patch does not apply
> =C2=A0 Patch failed at 0005 PCI: Move dev-enabled status bit to struct
> pci_dev
>=20
> Haven't investigated, so maybe it's some trivial easily fixed thing.

For me, based on Linus's master, this applies with the previous series.

It seems to me that this issue only exists on linux-next, the reason
being that git searches for struct pci_devres in line 811, but on
linux-next, because of previous additions, the struct moved to line
827, and poor git can't find it anymore.

I could fix that and provide a v4.


P.


>=20
> Bjorn
>=20