Messages in this thread | | | From | Linus Torvalds <> | Date | Wed, 28 Apr 2021 15:53:05 -0700 | Subject | Re: [GIT PULL] Devicetree updates for v5.13 |
| |
On Tue, Apr 27, 2021 at 2:49 PM Rob Herring <robh@kernel.org> wrote: > > There's one conflict with your tree in drivers/of/property.c kerneldoc > comments. Looking at it closer, I think the linux-next resolution is the > wrong one. Take what's in your tree instead. It makes more sense to > take the code author's comment than what's part of treewide fixes.
I picked the one I personally found more readable, whichever that was...
Linus
| |