| Message ID | 20190725105413.2e79aedb@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the jc_docs tree | expand |
diff --cc Documentation/PCI/pci-error-recovery.rst index e5d450df06b4,7e30f43a9659..000000000000 --- a/Documentation/PCI/pci-error-recovery.rst
Hi all, Today's linux-next merge of the net-next tree got a conflict in: Documentation/PCI/pci-error-recovery.rst between commit: 4d2e26a38fbc ("docs: powerpc: convert docs to ReST and rename to *.rst") from the jc_docs tree and commit: 955315b0dc8c ("qlge: Move drivers/net/ethernet/qlogic/qlge/ to drivers/staging/qlge/") from the net-next 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.