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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20160201131017.5a843363@canb.auug.org.au>
Date:	Mon, 1 Feb 2016 13:10:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rob Herring <robherring2@...il.com>,
	Andy Gross <agross@...eaurora.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Subject: linux-next: manual merge of the dt-rh tree with the qcom tree

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???-*