linux-next: manual merge of the pci tree with Linus' tree
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
MAINTAINERS
between commit:
2b6d546ba83e ("MAINTAINERS: update my email address")
from Linus' tree and commit:
010515bd2d47 ("MAINTAINERS: Add Manivannan Sadhasivam as PCI/pwrctl maintainer")
from the pci 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.
Signature · 17 lines
Cheers, Stephen Rothwell diff --cc MAINTAINERS index 2fcbda2fdca1,c61750164ba9..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -19955,7 -19886,8 +19971,8 @@@ F: drivers/pci/p2pdma. F: include/linux/pci-p2pdma.h PCI POWER CONTROL -M: Bartosz Golaszewski <[email protected]> +M: Bartosz Golaszewski <[email protected]> + M: Manivannan Sadhasivam <[email protected]> L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
Quoted 33 lines · Stephen Rothwell
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
MAINTAINERSbetween commit:
2b6d546ba83e("MAINTAINERS: update my email address")from Linus' tree and commit:
010515bd2d47("MAINTAINERS: Add Manivannan Sadhasivam as PCI/pwrctl maintainer")from the pci 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 RothwellMAINTAINERS +0
-0
MAINTAINERS
Quoted 9 lines
MAINTAINERS +1
-0@@@ -19955,7 -19886,8 +19971,8 @@@ F: drivers/pci/p2pdma. F: include/linux/pci-p2pdma.h PCI POWER CONTROL -M: Bartosz Golaszewski <[email protected]> +M: Bartosz Golaszewski <[email protected]> + M: Manivannan Sadhasivam <[email protected]> L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
Looks good, thanks!
Bart