linux-next: manual merge of the dt-rh tree with the qcom tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the dt-rh tree with the qcom tree
Date	2016-02-01 03:20 +0100
Message-ID	<qXcfT-45K-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Rob,

Today's linux-next merge of the dt-rh tree got a conflict in:

  MAINTAINERS

between commit:

  43ed2986476d ("MAINTAINERS: add qcom i2c and spi drivers to list")

from the qcom tree and commit:

  e68d7c143a62 ("MAINTAINERS: Add missing platform maintainers for dts files")

from the dt-rh tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 5318f7972fb9,973336739ae5..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1431,9 -1434,8 +1440,10 @@@ S:	Maintaine
  F:	arch/arm/boot/dts/qcom-*.dts
  F:	arch/arm/boot/dts/qcom-*.dtsi
  F:	arch/arm/mach-qcom/
+ F:	arch/arm64/boot/dts/qcom/*
 +F:	drivers/i2c/busses/i2c-qup.c
  F:	drivers/soc/qcom/
 +F:	drivers/spi/spi-qup.c
  F:	drivers/tty/serial/msm_serial.h
  F:	drivers/tty/serial/msm_serial.c
  F:	drivers/*/pm8???-*

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the dt-rh tree with the qcom tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-01 03:20 +0100

csiph-web