linux-kernel - Re: linux-next: manual merge of the driver-core tree with the pci-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210820130633.GB183257@rocinante>
Date:   Fri, 20 Aug 2021 15:06:33 +0200
From:   Krzysztof Wilczyński <kw@...ux.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>, Bjorn Helgaas <bhelgaas@...gle.com>,
        Dan Williams <dan.j.williams@...el.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 pci-current tree

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