Re: linux-next: manual merge of the arm-soc tree with the tree

2014-05-27 Thread Tony Lindgren
* Stephen Rothwell [140526 17:46]: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-omap2/omap-mpuss-lowpower.c between commit 4e4bb5c72f6b > ("ARM: l2c: omap2: avoid reading directly from the L2 registers in > platform code") from the arm tree and comm

linux-next: manual merge of the arm-soc tree with the tree

2014-05-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/omap-mpuss-lowpower.c between commit 4e4bb5c72f6b ("ARM: l2c: omap2: avoid reading directly from the L2 registers in platform code") from the arm tree and commit edfaf05c2fcb ("ARM: OMAP2+: raw read and writ

linux-next: manual merge of the arm-soc tree with the tree

2014-04-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got conflicts in arch/arm/boot/dts/qcom-msm8960.dtsi, arch/arm/boot/dts/qcom-msm8974.dtsi, arch/arm/mach-omap2/pdata-quirks.c, arch/arm/mach-zynq/Kconfig, drivers/watchdog/Kconfig and sound/soc/kirkwood/Kconfig between various merge commits from

linux-next: manual merge of the arm-soc tree with the tree

2013-10-29 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig between commit 85649711a895 ("ARM: gemini: delete ") from the gpio tree and commit f3372c01816e ("ARM: gemini: convert to GENERIC_CLOCKEVENTS") from the arm-soc tree. I fixed it up (see below) and can carry th

linux-next: manual merge of the arm-soc tree with the tree

2013-06-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in include/linux/mfd/davinci_voicecodec.h between commit 997174705458 ("mfd: davinci_voicecodec: Fix build breakage") from the mfd tree and commit 3ad7a42d5a9c ("ARM: davinci: move private EDMA API to arm/common") from the arm-soc

linux-next: manual merge of the arm-soc tree with the tree

2012-11-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-spear13xx/spear13xx.c between commit b47394911c26 ("ARM: SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and commit 3e270ba6e915 ("ARM: SPEAr13xx: Remove fields not required for ssp control

Re: linux-next: manual merge of the arm-soc tree with the tree

2012-09-25 Thread Tony Prisk
On Tue, 2012-09-25 at 16:37 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > Documentation/devicetree/bindings/usb/platform-uhci.txt between commit > 100d45970327 ("ARM: vt8500: Add support for UHCI companion controller") > from the usb

linux-next: manual merge of the arm-soc tree with the tree

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in Documentation/devicetree/bindings/usb/platform-uhci.txt between commit 100d45970327 ("ARM: vt8500: Add support for UHCI companion controller") from the usb tree and commit 95e9fd10f06c ("arm: vt8500: doc: Add device tree bindin

linux-next: manual merge of the arm-soc tree with the tree

2012-09-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-imx/clk-imx51-imx53.c between commit 75453a08e365 ("ARM: i.MX5: Add nand oftree support") from the mtd tree and commit a745f039b901 ("ARM i.MX53: register CAN clocks") from the arm-soc tree. I fixed it up (see be