Hi all,
Today's linux-next merge of the imx-mxs tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
7b0d021fbe41 ("arm64: defconfig: enable PCIE_ALTERA")
from the arm-soc tree and commit:
a9aa2a812255 ("arm64: defconfig: Enable CONFIG_SPI_IMX")
from the imx-mxs tree.
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
7b0d021fbe41 ("arm64: defconfig: enable PCIE_ALTERA")
from the arm-soc tree and commit:
2b4fd225df89 ("arm64: defconfig: Enable CONFIG_SPI_IMX")
from the imx-mxs tree.
On Tue, Mar 27, 2018 at 9:55 AM, Shawn Guo wrote:
> On Tue, Mar 27, 2018 at 09:10:26AM +1100, Stephen Rothwell wrote:
>> Hi Shawn,
>>
>> Today's linux-next merge of the imx-mxs tree got a conflict in:
>>
>> arch/arm/configs/mxs_defconfig
>>
>> between commit:
>>
>> e3e583e7a293 ("ARM: mxs_defc
On Tue, Mar 27, 2018 at 09:10:26AM +1100, Stephen Rothwell wrote:
> Hi Shawn,
>
> Today's linux-next merge of the imx-mxs tree got a conflict in:
>
> arch/arm/configs/mxs_defconfig
>
> between commit:
>
> e3e583e7a293 ("ARM: mxs_defconfig: Re-sync defconfig")
>
> from the arm-soc tree and
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in:
arch/arm/configs/mxs_defconfig
between commit:
e3e583e7a293 ("ARM: mxs_defconfig: Re-sync defconfig")
from the arm-soc tree and commit:
8bc2c29b550c ("ARM: mxs_defconfig: Re-sync defconfig")
from the imx-mxs tree
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in:
arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
arch/arm/boot/dts/imx53-tx53-x13x.dts
arch/arm/boot/dts/imx6dl-tx6u-811x.dts
arch/arm/boot/dts/imx6q-icore-rqs.dts
arch/arm/boot/dts/imx6q-tx6q-1110.dts
arch/arm/boot/dt
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/Kconfig between commit 8064887e02fd ("ARM: vf610:
enable Cortex-M4 configuration on Vybrid SoC") from the arm-soc tree
and commit ef6c578329c7 ("ARM: imx: imx7d requires anatop") from the
imx-mxs tree.
I fi
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/Kconfig between commit 8064887e02fd ("ARM: vf610:
enable Cortex-M4 configuration on Vybrid SoC") from the arm-soc tree
and commit aff62955b27b ("ARM: imx: add msl support for imx7d") from
the imx-mxs tree.
Hi Arnd,
On Tue, 13 Jan 2015 14:18:32 +0100 Arnd Bergmann wrote:
>
> There is an extraneous '\' character behind imx6sx-sdb.dtb now, which caused
> build errors for me. We should soon be able to merge the other branches into
> arm-soc to avoid the entire set of merge conflicts, until then please
On Tuesday 13 January 2015 11:16:36 Stephen Rothwell wrote:
> - imx6q-tx6q-1110.dtb \
> - imx6sl-evk.dtb \
> + imx6q-tx6q-1110.dtb
> +dtb-$(CONFIG_SOC_IMX6SL) += \
> + imx6sl-evk.dtb
> +dtb-$(CONFIG_SOC_IMX6SX) += \
> + imx6sx-sabreauto.dtb \
> imx6sx-sdb.dtb
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/Makefile between commit 6f1650f15bc4 ("ARM: dts: Only
build dtb if associated Arch and/or SoC is enabled") from the arm-soc
tree and commit 99fc5ba0bfb6 ("ARM: dts: imx6sx: add i.mx6sx sabreauto
board suppor
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/Kconfig between commit e49d9b375628 ("ARM: Remove
ARCH_HAS_CPUFREQ config option") from the arm-soc tree and commit
7de46855b1e7 ("ARM: imx5: move SOC_IMX5 and SOC_IMX51 into 'Device tree
only'") from the im
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/Kconfig between commits ddb902cc3459 ("ARM: centralize
common multi-platform kconfig options") and 37dff0825611 ("ARM: imx6:
introduce CONFIG_SOC_IMX6 for i.MX6 common stuff") from the arm-soc tree
and commi
On Thu, Feb 20, 2014 at 11:42:42AM +1100, Stephen Rothwell wrote:
> Hi Shawn,
>
> Today's linux-next merge of the imx-mxs tree got conflicts in
> arch/arm/mach-imx/Makefile and arch/arm/mach-imx/common.h between commit
> 28a9f3b078c5 ("ARM: imx6: build pm-imx6q.c independently of CONFIG_PM")
> fro
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got conflicts in
arch/arm/mach-imx/Makefile and arch/arm/mach-imx/common.h between commit
28a9f3b078c5 ("ARM: imx6: build pm-imx6q.c independently of CONFIG_PM")
from the arm-soc tree and commits 8dd751932545 ("ARM: imx: add suspend in
ocram s
On Wed, Jan 29, 2014 at 01:25:13PM +1100, Stephen Rothwell wrote:
> Hi Shawn,
>
> On Wed, 29 Jan 2014 09:18:06 +0800 Shawn Guo wrote:
> >
> > I will rebase my branch on v3.14-rc1 once it's out.
>
> Um, does that mean that all that stuff is *not* destined for v3.14? ...
Yes, Stephen. That's the
Hi Shawn,
On Wed, 29 Jan 2014 09:18:06 +0800 Shawn Guo wrote:
>
> I will rebase my branch on v3.14-rc1 once it's out.
Um, does that mean that all that stuff is *not* destined for v3.14? ...
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpngr0ewErs2.pgp
Description: PG
On Wed, Jan 29, 2014 at 01:13:10AM +, Russell King - ARM Linux wrote:
> On Wed, Jan 29, 2014 at 11:35:14AM +1100, Stephen Rothwell wrote:
> > Hi Shawn,
> >
> > Today's linux-next merge of the imx-mxs tree got a conflict in
> > arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
On Wed, Jan 29, 2014 at 11:35:14AM +1100, Stephen Rothwell wrote:
> Hi Shawn,
>
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
> initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx:
> initial So
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx:
initial SolidRun Cubox-i support") from the arm tree and various commits
from the imx-mx
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got conflicts in
arch/arm/boot/dts/Makefile, arch/arm/boot/dts/imx6dl-hummingboard.dts,
arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi and
arch/arm/boot/dts/imx6qdl-microsom.dtsi between commits 728d5599f5d8
("ARM: imx: initial SolidRun Hummin
On Sun, Jan 5, 2014 at 3:49 PM, Stephen Rothwell wrote:
> Hi Shawn,
>
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/boot/dts/imx6q-sabrelite.dts between commit 8f568b496dd9 ("ARM:
> imx: Explicitly pass the active level of the PHY reset") from the arm-soc
> tree and c
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/imx6q-sabrelite.dts between commit 8f568b496dd9 ("ARM:
imx: Explicitly pass the active level of the PHY reset") from the arm-soc
tree and commit e5a5af250568 ("ARM: dts: imx: sabrelite: add Dual
Lite/Solo su
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/imx51-apf51.dts between commit 8f568b496dd9 ("ARM: imx:
Explicitly pass the active level of the PHY reset") from the arm-soc tree
and commit 756c8d5762c2 ("ARM: dts: i.MX51 boards: Switch to use standard
GPI
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi between commit
8f568b496dd9 ("ARM: imx: Explicitly pass the active level of the PHY
reset") from the arm-soc tree and commit 208d5b9c2c71 ("ARM: dts: i.MX27
boards: Switch to us
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/mach-imx6q.c
caused by commits 6aec339 (PM / OPP: rename header to linux/pm_opp.h) and
0794410 (imx: add PCI fixup for PEX860X on Gateworks board).
I fixed it up (see below). Please verify that the resolutio
Hi Thierry,
On Wed, Oct 9, 2013 at 11:14 AM, Thierry Reding
wrote:
> Today's linux-next merge of the imx-mxs tree got conflicts in
>
> arch/arm/mach-imx/clk-imx51-imx53.c
> arch/arm/mach-imx/mach-imx6q.c
>
> caused by commits 0efe995 (ARM: mach-imx: clk-imx51-imx53: Retrieve base
Today's linux-next merge of the imx-mxs tree got conflicts in
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-imx/mach-imx6q.c
caused by commits 0efe995 (ARM: mach-imx: clk-imx51-imx53: Retrieve base
address and irq from dt), d2b36f6 (ARM: imx: replace imx6q_restart()
with mxc_r
On Tue, Oct 08, 2013 at 03:44:12PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the imx-mxs tree got conflicts in
>
> arch/arm/mach-imx/mach-imx6q.c
>
> caused by commits 4d9d18a (ARM: imx: remove custom .init_time hook),
> e709f38 (ARM: imx6: report soc info via soc device) a
Today's linux-next merge of the imx-mxs tree got conflicts in
arch/arm/mach-imx/mach-imx6q.c
caused by commits 4d9d18a (ARM: imx: remove custom .init_time hook),
e709f38 (ARM: imx6: report soc info via soc device) and 3087d32 (ARM:
imx6q: use common soc revision helpers).
I fixed it up (
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/Kconfig.debug between commit 5e33abe38413 ("ARM: debug: move
PL01X debug include into arch/arm/include/debug/") from the arm tree and
commit d1814df976f2 ("ARM: imx: add low-level debug for vybrid") from the
imx-mxs
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/Kconfig.debug between commit 828989ad87af ("ARM: keystone: Add
minimal TI Keystone platform support") from the arm-soc tree and commit
34e8a16b944e ("ARM: imx: enable low-level debug support for imx6sl") from
the imx
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-mxs/mach-mxs.c between commit 6aaab172c99b ("ARM: mxs:
remove the .map_io declaration") from the arm-soc tree and commit
fe7149dfa886 ("ARM: mxs: Remove init_irq declaration in machine
description") from the imx
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/clk-imx6q.c between commit e8094b2c1712 ("ARM i.MX6:
Fix ldb_di clock selection") from the arm-soc tree and commit
8034cf45ac38 ("ARM i.MX6q: Add audio/video PLL post dividers for i.MX6q
rev 1.1") from the i
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
drivers/pinctrl/Makefile between commit 62194200e5e3 ("pinctrl: remove
pxa pinctrl driver") from the pinctrl tree and commit b8979245b6ff
("pinctrl: add pinctrl driver for imx6dl") from the imx-mxs tree.
I fixed it up (see b
On 4 April 2013 10:48, Stephen Rothwell wrote:
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/mach-imx/cpufreq.c between commits b43a7ffbf33b ("cpufreq:
> Notify all policy->cpus in cpufreq_notify_transition()") and eb2f50ff93f0
> ("cpufreq: drivers: Remove unnecessary
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/cpufreq.c between commits b43a7ffbf33b ("cpufreq:
Notify all policy->cpus in cpufreq_notify_transition()") and eb2f50ff93f0
("cpufreq: drivers: Remove unnecessary assignments of policy-> members")
from the p
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
drivers/clocksource/Makefile between commit 275786b71d42 ("ARM: sirf: use
clocksource_of infrastructure") from the arm-soc tree and commit
c74512bf83f3 ("ARM: mxs: move timer driver into drivers/clocksource")
from the imx-mxs
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/Kconfig.debug between commit 266c347924f5 ("ARM: nomadik: move
debugmacro to debug includes") from the arm-soc tree and commit
11c6f861cf3a ("ARM: mxs: rename debug-macro.S for multiplatform build")
from the imx-mxs
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/mach-imx6q.c between commit da4a686a2cfb ("ARM:
smp_twd: convert to use CLKSRC_OF init") from the arm-soc tree and commit
371287432334 ("ARM: imx: enable anatop suspend/resume") from the imx-mxs
tree.
I fix
40 matches
Mail list logo
