Re: [GIT PULL] Devicetree updates for v5.12

On Mon, Feb 22, 2021 at 10:52:09AM -0800, Linus Torvalds wrote: > On Mon, Feb 22, 2021 at 9:35 AM Rob Herring wrote: > > > > Please pull DT updates for v5.12. > > Ugh. > > This causes "git status" to be unhappy, because there's a new > generated file (scripts/dtc/fdtoverlay) without a gitignore

Re: [GIT PULL] Devicetree updates for v5.12

On Mon, Feb 22, 2021 at 9:35 AM Rob Herring wrote: > > Please pull DT updates for v5.12. Ugh. This causes "git status" to be unhappy, because there's a new generated file (scripts/dtc/fdtoverlay) without a gitignore entry. This was added by commit 79edff12060f ("scripts/dtc: Update to upstream

Re: [GIT PULL] Devicetree updates for v5.12

The pull request you sent on Mon, 22 Feb 2021 11:35:41 -0600: > git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git > tags/devicetree-for-5.12 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/a99163e9e708d5d773b7de6da952fcddc341f977 Thank you! --

[GIT PULL] Devicetree updates for v5.12

Linus, Please pull DT updates for v5.12. I dropped the conflicting changes with the powerpc tree that Michael noted. There's a conflict with the kbuild tree in scripts/Makefile.lib. The resolution is use 'always-' instead of 'extra-' everywhere. There's another conflict with your tree in