OK, so unfortunately it seems very challenging to reconcile the merge
conflict pointed up by Serge between net-next and pci-devres regarding
"ethernet: stmicro": A patch that applies to the net-next tree does not
apply anymore to pci-devres (and vice versa).
So I actually think that it would be best if we just drop the portation
of "ethernet: stmicro" for now and port it as the last user in v6.13.
Then we can also remove pcim_iounmap_regions() completely.
That should then be trivial.
Changes in v5:
- Patch "ethernet: cavium": Re-add accidentally removed
pcim_iounmap_region(). (Me)
- Add Jens's Reviewed-by to patch "block: mtip32xx". (Jens)
Changes in v4:
- Drop the "ethernet: stmicro: [...] patch since it doesn't apply to
net-next, and making it apply to that prevents it from being
applyable to PCI ._. (Serge, me)
- Instead, deprecate pcim_iounmap_regions() and keep "ethernet:
stimicro" as the last user for now.
- ethernet: cavium: Use PTR_ERR_OR_ZERO(). (Andy)
- vdpa: solidrun (Bugfix) Correct wrong printf string (was "psnet" instead of
"snet"). (Christophe)
- vdpa: solidrun (Bugfix): Add missing blank line. (Andy)
- vdpa: solidrun (Portation): Use PTR_ERR_OR_ZERO(). (Andy)
- Apply Reviewed-by's from Andy and Xu Yilun.
Changes in v3:
- fpga/dfl-pci.c: remove now surplus wrapper around
pcim_iomap_region(). (Andy)
- block: mtip32xx: remove now surplus label. (Andy)
- vdpa: solidrun: Bugfix: Include forgotten place where stack UB
occurs. (Andy, Christophe)
- Some minor wording improvements in commit messages. (Me)
Changes in v2:
- Add a fix for the UB stack usage bug in vdap/solidrun. Separate
patch, put stable kernel on CC. (Christophe, Andy).
- Drop unnecessary pcim_release_region() in mtip32xx (Andy)
- Consequently, drop patch "PCI: Make pcim_release_region() a public
function", since there's no user anymore. (obsoletes the squash
requested by Damien).
- vdap/solidrun:
• make 'i' an 'unsigned short' (Andy, me)
• Use 'continue' to simplify loop (Andy)
• Remove leftover blank line
- Apply given Reviewed- / acked-bys (Andy, Damien, Bartosz)
Important things first:
This series is based on [1] and [2] which Bjorn Helgaas has currently
queued for v6.12 in the PCI tree.
This series shall remove pcim_iounmap_regions() in order to make way to
remove its brother, pcim_iomap_regions().
@Bjorn: Feel free to squash the PCI commits.
Regards,
P.
[1] https://lore.kernel.org/all/20240729093625.17561-4-pstanner@xxxxxxxxxx/
[2] https://lore.kernel.org/all/20240807083018.8734-2-pstanner@xxxxxxxxxx/
Philipp Stanner (7):
PCI: Deprecate pcim_iounmap_regions()
fpga/dfl-pci.c: Replace deprecated PCI functions
block: mtip32xx: Replace deprecated PCI functions
gpio: Replace deprecated PCI functions
ethernet: cavium: Replace deprecated PCI functions
vdpa: solidrun: Fix UB bug with devres
vdap: solidrun: Replace deprecated PCI functions
drivers/block/mtip32xx/mtip32xx.c | 18 +++---
drivers/fpga/dfl-pci.c | 16 ++---
drivers/gpio/gpio-merrifield.c | 14 ++---
.../net/ethernet/cavium/common/cavium_ptp.c | 7 +--
drivers/pci/devres.c | 8 ++-
drivers/vdpa/solidrun/snet_main.c | 59 ++++++++-----------
include/linux/pci.h | 1 +
7 files changed, 53 insertions(+), 70 deletions(-)
--
2.46.0
