LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the driver-core tree with the pci-current tree
@ 2021-08-20  5:13 Stephen Rothwell
  2021-08-20 13:06 ` Krzysztof Wilczyński
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-08-20  5:13 UTC (permalink / raw)
  To: Greg KH, Bjorn Helgaas
  Cc: Dan Williams, Greg Kroah-Hartman, Krzysztof Wilczyński,
	Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1463 bytes --]

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 object")

from the pci-current tree and commits:

  93bb8e352a91 ("sysfs: Invoke iomem_get_mapping() from the sysfs open callback")
  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.

-- 
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 = 1024*1024;
  	b->legacy_mem->attr.mode = 0600;
  	b->legacy_mem->mmap = pci_mmap_legacy_mem;
- 	b->legacy_mem->mapping = iomem_get_mapping();
 -	b->legacy_io->f_mapping = iomem_get_mapping;
++	b->legacy_mem->f_mapping = iomem_get_mapping;
  	pci_adjust_legacy_attr(b, pci_mmap_mem);
  	error = device_create_bin_file(&b->dev, b->legacy_mem);
  	if (error)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the driver-core tree with the pci-current tree
  2021-08-20  5:13 linux-next: manual merge of the driver-core tree with the pci-current tree Stephen Rothwell
@ 2021-08-20 13:06 ` Krzysztof Wilczyński
  0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Wilczyński @ 2021-08-20 13:06 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, Bjorn Helgaas, Dan Williams, Greg Kroah-Hartman,
	Linux Kernel Mailing List, Linux Next Mailing List

Hi Stephen,

> 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 object")
> 
> from the pci-current tree and commits:
> 
>   93bb8e352a91 ("sysfs: Invoke iomem_get_mapping() from the sysfs open callback")
>   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.

Thank you for fixing this!

We did crossed the streams there a little bit, so to speak.  Sincere
apologies.

	Krzysztof

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-20 13:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-20  5:13 linux-next: manual merge of the driver-core tree with the pci-current tree Stephen Rothwell
2021-08-20 13:06 ` Krzysztof Wilczyński

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).