Re: [GIT PULL] Devicetree updates for 5.3

2019-07-11 Thread pr-tracker-bot
The pull request you sent on Wed, 10 Jul 2019 14:50:01 -0600: > git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git > tags/devicetree-for-5.3 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/d06e4156430e7c5eb4f04dabcaa0d9e2fba335e3 Thank you! -- Deet-doot-do

[GIT PULL] Devicetree updates for 5.3

2019-07-10 Thread Rob Herring
Hi Linus, Please pull. There's 2 conflicts. The first is with your tree and SPDX tags in scripts/dtc/. The correct resolution is to take the version from my tree as that has the correct licenses from upstream dtc. The 2nd conflict is with the netdev tree. It's fine to just delete ethernet.txt. The