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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 20 Feb 2017 09:40:56 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Bjorn Helgaas <bhelgaas@...gle.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: linux-next: manual merge of the pci tree. Hi Bjorn, Today's linux-next merge of the pci tree got conflicts in: drivers/pci/dwc/pcie-designware-host.c I have no idea why? I see this file has been split out from another that was itself moved from another directory, but that all happened in the pci tree. I fixed it up (I just used the pci tree version) 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. OK, I checked again ... it may be conflicting with commit a782b5f986c3 ("PCI: designware: Check for iATU unroll only on platforms that use ATU") from Linus' tree (merged into v4.10-rc5), so my resolution above may be incorrect. -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists