linux-next: manual merge of the pci tree.
From: Stephen Rothwell
Date: Sun Feb 19 2017 - 17:42:07 EST
Today's linux-next merge of the pci tree got conflicts in:
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
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