On Fri, May 22, 2020 at 8:03 AM Stephen Rothwell wrote:
> I fixed it up (see below) 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 submitted for merging.
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
between commit:
82ab9b6705bd ("dt-bindings: arm: Add Akebi96 board support")
from the arm-soc tree and commit:
9f60a65bc5e6 ("dt-bindings: Clean-up sc
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm64/boot/dts/amlogic/Makefile
between commit:
593d311d9f17 ("ARM64: dts: meson-gxm: Add Vega S96 board")
from the arm-soc tree and commit:
4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS nativel
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm64/boot/dts/allwinner/Makefile
between commit:
d7341305863b ("arm64: allwinner: h5: add NanoPi NEO Plus2 DT support")
from the arm-soc tree and commit:
4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_AL
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm/mach-bcm/board_bcm21664.c
between commit:
406c8f6c9954 ("ARM: bcm21664: Remove reset code")
from the arm-soc tree and commit:
850bea2335e4 ("arm: Remove unnecessary of_platform_populate with default
mat
On Wed, 12 Mar 2014 15:36:58 -0700, Olof Johansson wrote:
> On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown wrote:
> > Hi Grant,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in
> > include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM:
> > Introduce CPU_M
On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM:
> Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and
> commit f
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM:
Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and
commit f618c4703a14672d27 ("drivers: of: add support for custom reserve
Stephen,
On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings:
> Remove all references to device_type "ethernet-phy"") and b31b32
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts between commit
6b6430e82331 ("ARM: orion5x: Fix typo in device_type property of phy
node") from the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings:
Remove all r
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts between commit
261e7735d0ed ("ARM: kirkwood: NETGEAR ReadyNAS Duo v2 .dts cleanup") from
the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings: Remove all
references
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings:
Remove all references to device_type "ethernet-phy"") and b31b32119abe
("ARM: dove: sort DT nodes by address") from the devicetree tree and
commit 351
12 matches
Mail list logo
