Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/include/debug/netx.S
between commit:
d2912cb15bdd ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
500")
from Linus' tree and commit:
ceb02dcf676f ("ARM: delete netx machine")
from the arm
* Stephen Rothwell [181028 23:14]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in:
>
> include/linux/platform_data/gpio-omap.h
>
> between commit:
>
> b764a5863fd8 ("gpio: omap: Remove custom PM calls and use cpu_pm instead")
>
> from Linus' tree and commit:
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
include/linux/platform_data/gpio-omap.h
between commit:
b764a5863fd8 ("gpio: omap: Remove custom PM calls and use cpu_pm instead")
from Linus' tree and commit:
26683316c92a ("ARM: OMAP1: ams-delta-fiq: Use
")
from
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
drivers/soc/qcom/Kconfig
between commit:
a978a5b8d83f ("net/kconfig: Make QCOM_QMI_HELPERS available when
COMPILE_TEST")
from Linus' tree and commit:
ccfb464cd106 ("soc: qcom: Allow COMPILE_TEST of qcom SoC Kconfig
Russell King - ARM Linux writes:
> On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote:
>> I fixed it up (I deleted the file) and can carry the fix as
>> necessary. This is now fixed as far as linux-next is concerned, but any
>> non trivial conflicts should be mentioned to your upstr
On Tue, Sep 06, 2016 at 12:17:48PM +0200, Arnd Bergmann wrote:
> On Monday, September 5, 2016 7:26:03 PM CEST Russell King - ARM Linux wrote:
> > On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote:
> > > I fixed it up (I deleted the file) and can carry the fix as
> > > necessary. This
On Monday, September 5, 2016 7:26:03 PM CEST Russell King - ARM Linux wrote:
> On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote:
> > I fixed it up (I deleted the file) and can carry the fix as
> > necessary. This is now fixed as far as linux-next is concerned, but any
> > non trivia
On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote:
> I fixed it up (I deleted the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submi
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/mach-realview/core.c
between commit:
2fb04fdf3019 ("net: smc91x: fix SMC accesses")
from Linus' tree and commit:
7484c727b636 ("ARM: realview: delete the RealView board files")
from the arm-soc tree.
I fi
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
MAINTAINERS
between commit:
4a121096db9c ("MAINTAINERS: Update mailing list for Renesas SoC Development")
from Linus' tree and commit:
804b0d7011ee ("MAINTAINERS: Remove link to oss.renesas.com which is closed")
fr
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
drivers/cpufreq/exynos-cpufreq.c
between commit:
62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not
match")
from Linus' tree and commits:
ac4c90c82e4d ("cpufreq: exynos: remove exynos5250
Hi,
On 06/01/2015 02:25 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/zynq-7000.dtsi between commit 9eeb5161397a ("ARM:
> zynq: DT: Use the zynq binding with macb") from Linus' tree and commit
> 4481b18b7cf0 ("ARM: zyn
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/zynq-7000.dtsi between commit 9eeb5161397a ("ARM:
zynq: DT: Use the zynq binding with macb") from Linus' tree and commit
4481b18b7cf0 ("ARM: zynq: DT: Use the zynq binding with macb") from the
arm-soc tree.
I
On Wed, Jan 29, 2014 at 9:33 PM, Kevin Hilman wrote:
> On Wed, Jan 29, 2014 at 4:19 PM, Stephen Rothwell
> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> drivers/clk/Makefile between commit fd3fdaf09f26 ("clk: sort Makefile")
>> from Linus' tree and com
On Wed, Jan 29, 2014 at 4:19 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/clk/Makefile between commit fd3fdaf09f26 ("clk: sort Makefile")
> from Linus' tree and commit 7ee2c5117483 ("clk: bcm281xx: add initial
> clock framework
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/clk/Makefile between commit fd3fdaf09f26 ("clk: sort Makefile")
from Linus' tree and commit 7ee2c5117483 ("clk: bcm281xx: add initial
clock framework support") from the arm-soc tree.
I fixed it up (see below) and can c
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/bcm11351.dtsi between commit 67a57be85e68 ("ARM:
bcm11351: Enable pinctrl for Broadcom Capri SoCs") from Linus' tree and
commit 0bd898b872ac ("ARM: dts: Declare clocks as fixed on bcm11351") and
several follow
Hi Stephen,
On Tue, 27 Aug 2013 10:17:21 -0600 Stephen Warren wrote:
>
> On 08/27/2013 02:29 AM, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/boot/dts/tegra20-trimslice.dts between commit
> > 30ca2226bea6 ("ARM: tegra: always enable
On 08/27/2013 02:29 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/tegra20-trimslice.dts between commit
> 30ca2226bea6 ("ARM: tegra: always enable USB VBUS regulators") from
> Linus' tree and commit 23f95ef2d951 ("ARM:
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/tegra20-trimslice.dts between commit 30ca2226bea6
("ARM: tegra: always enable USB VBUS regulators") from Linus' tree and
commit 23f95ef2d951 ("ARM: tegra: use TEGRA_GPIO() in a couple more
places") from the ar
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/tegra20-seaboard.dts between commit 30ca2226bea6 ("ARM:
tegra: always enable USB VBUS regulators") from Linus' tree and commit
23f95ef2d951 ("ARM: tegra: use TEGRA_GPIO() in a couple more places")
from the arm
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/Kconfig between commit 4a1b573346ee ("ARM: 7758/1:
introduce config HAS_BANDGAP") from Linus' tree and commit 59d92875a6d9
("ARM: OMAP: build mach-omap code only if needed") from the arm-soc tree.
I fixed i
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/snowball.dts between commit d52701d39e37 ("mfd: ab8500:
Kill "reg" property from binding") from Linus' tree and commit
924e82dacab9 ("ARM: ux500: allow Snowball access to the AB8500 GPIO
pins") from the arm-so
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/x86/include/asm/Kbuild between commit 10b63956fce7 ("UAPI: Plumb the
UAPI Kbuilds into the user header installation and checking") from Linus'
tree and commit e7a570ff7dff ("asm-generic: Add default clkdev.h") from
the arm
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/watchdog/orion_wdt.c between commit 0dd6e4847ed8 ("watchdog:
orion_wdt: Convert driver to watchdog core") from Linus' tree and commit
1e7bad0f5b91 ("ARM: Orion: DTify the watchdog timer") from the arm-soc
tree.
Just co
25 matches
Mail list logo
