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

Hi all, Today's linux-next merge of the input tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.yaml between commit: cb1cc137a2c1 ("dt-bindings: Add vendor prefix for Shenzhen Zkmagic Technology Co., Ltd.") from the arm-soc tree and commit: 8f445ffa851e ("dt-bin

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

Hi all, On Wed, 1 May 2019 13:40:54 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the input tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 2c98d9e47533 ("dt-bindings: vendor-prefixes: add AZW") > > from the arm-so

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

Hi Dmitry, Today's linux-next merge of the input tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: 2c98d9e47533 ("dt-bindings: vendor-prefixes: add AZW") from the arm-soc tree and commit: 7b5bb55d0dad ("Input: add support for Azoteq IQS550/572