Messages in this thread | | | Date | Thu, 28 May 2015 11:36:26 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pci-current tree with Linus' tree |
| |
Hi Bjorn,
Today's linux-next merge of the pci-current tree got a conflict in MAINTAINERS between commit b77017555ce5 ("MAINTAINERS: update Jingoo Han's email address") from Linus' tree and commit 110baab1d128 ("MAINTAINERS: Add Pratyush Anand as SPEAr13xx and DesignWare PCIe maintainer") from the pci-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS index 474bcb6c0bac,72674ba8cca5..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7575,7 -7546,8 +7575,8 @@@ S: Maintaine F: drivers/pci/host/pci-exynos.c PCI DRIVER FOR SYNOPSIS DESIGNWARE -M: Jingoo Han <jg1.han@samsung.com> +M: Jingoo Han <jingoohan1@gmail.com> + M: Pratyush Anand <pratyush.anand@gmail.com> L: linux-pci@vger.kernel.org S: Maintained F: drivers/pci/host/*designware* [unhandled content-type:application/pgp-signature] | |