Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 20 Aug 2021 15:13:57 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Bjorn Helgaas <bhelgaas@google.com>
Cc:     Dan Williams <dan.j.williams@intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Krzysztof =?UTF-8?B?V2lsY3p5xYRza2k=?= <kw@linux.com>,
        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 driver-core tree with the
 pci-current tree
Message-ID: <20210820151357.793f0b31@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/VJ8bW44c/+v6Uw6lBiiCgHp";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/VJ8bW44c/+v6Uw6lBiiCgHp
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/pci/pci-sysfs.c

between commit:

  045a9277b561 ("PCI/sysfs: Use correct variable for the legacy_mem sysfs o=
bject")

from the pci-current tree and commits:

  93bb8e352a91 ("sysfs: Invoke iomem_get_mapping() from the sysfs open call=
back")
  f06aff924f97 ("sysfs: Rename struct bin_attribute member to f_mapping")

from the driver-core 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/pci/pci-sysfs.c
index 7bbf2673c7f2,f65382915f01..000000000000
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@@ -978,7 -978,7 +978,7 @@@ void pci_create_legacy_files(struct pci
  	b->legacy_mem->size =3D 1024*1024;
  	b->legacy_mem->attr.mode =3D 0600;
  	b->legacy_mem->mmap =3D pci_mmap_legacy_mem;
- 	b->legacy_mem->mapping =3D iomem_get_mapping();
 -	b->legacy_io->f_mapping =3D iomem_get_mapping;
++	b->legacy_mem->f_mapping =3D iomem_get_mapping;
  	pci_adjust_legacy_attr(b, pci_mmap_mem);
  	error =3D device_create_bin_file(&b->dev, b->legacy_mem);
  	if (error)

--Sig_/VJ8bW44c/+v6Uw6lBiiCgHp
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEfOhUACgkQAVBC80lX
0GyO5Af/UHl0cfe5EahYTXVXZYteh8JEB59/RIpM/YApGllq9qEc3L7mDUkXthw6
YXXdJIVAhjkZMDKGOtNA7wiaPZzyk3iDZg49R9PQVw32Ux6KViubQInMA1mejrVb
8QlpbiST46IaYvx4l1muIPdLz+jzOadJzv8SR+HOPOPqj6c+B/Vk63JLygKNy/hy
OI7KO6Oaz7nDJVnw5LHZSLxn99CUEynOIhKcnRDemCalEJkXQdB0vgQFZ+8/wFjq
vlYz6vXUjtngD8bNQddR3VhTbY1LPTjw1tljuPX11yfqECoK0EiLBXh5QCEJxV45
uwDNpa5rM2QbBL1WrE8uLoPnFw76YA==
=NEys
-----END PGP SIGNATURE-----

--Sig_/VJ8bW44c/+v6Uw6lBiiCgHp--