linux-next: manual merge of the devicetree tree with Linus' tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/x86/index.rst between commit: ea4e3bef4c94 ("Documentation/x86: Add documentation for /proc/cpuinfo feature flags") from Linus' tree and commit: 441848282c59 ("dt: Remove booting-without-of.rst")

linux-next: manual merge of the devicetree tree with Linus' tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/usb/generic-ehci.yaml between commit: 3aa3c66aedef ("dt-bindings: usb: Bring back phy-names") from Linus' tree and commit: 02ceb12c20f5 ("dt-bindings: usb: generic-ehci: Add

Re: linux-next: manual merge of the devicetree tree with Linus' tree

On Tue, Jul 23, 2019 at 9:02 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt > > between commit: > > 355fb0e54e85 ("dt-bindings: input: sun4i-lradc-keys: Add A64

linux-next: manual merge of the devicetree tree with Linus' tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt between commit: 355fb0e54e85 ("dt-bindings: input: sun4i-lradc-keys: Add A64 compatible") from Linus' tree and commit: 3f587b3b77b9 ("dt-bindings:

Re: linux-next: manual merge of the devicetree tree with Linus' tree

Hi all, On Mon, 24 Jun 2019 15:51:24 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the devicetree tree got conflicts in: > > scripts/dtc/Makefile.dtc > scripts/dtc/libfdt/Makefile.libfdt > > between commit: > > ec8f24b7faaf ("treewide: Add SPDX license

linux-next: manual merge of the devicetree tree with Linus' tree

Hi all, Today's linux-next merge of the devicetree tree got conflicts in: scripts/dtc/Makefile.dtc scripts/dtc/libfdt/Makefile.libfdt between commit: ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig") from Linus' tree and commit: 12869ecd5eef ("scripts/dtc:

linux-next: manual merge of the devicetree tree with Linus' tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt between commit: 8217724eb7c5 ("doc: bindings: fix bad reference to ARM CPU bindings") from Linus' tree and commit: 36c79bc7ef79

linux-next: manual merge of the devicetree tree with Linus' tree

Hi Rob, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt between commit: ea6c3077678f ("dt-bindings: net: Remove duplicate NSP Ethernet MAC binding document") from Linus' tree and commit: 4da722ca19f3

linux-next: manual merge of the devicetree tree with Linus' tree

Hi Rob, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt between commit: ea6c3077678f ("dt-bindings: net: Remove duplicate NSP Ethernet MAC binding document") from Linus' tree and commit: 4da722ca19f3

linux-next: manual merge of the devicetree tree with Linus' tree

Hi Rob, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt between commit: 6eb8844bf4be ("Documentation/bindings: crypto: remove the dma-mask property") from Linus' tree and commit: 4da722ca19f3

linux-next: manual merge of the devicetree tree with Linus' tree

Hi Rob, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt between commit: 6eb8844bf4be ("Documentation/bindings: crypto: remove the dma-mask property") from Linus' tree and commit: 4da722ca19f3