[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wgd4Ku0e4M8eBQuqKHAgBp81WWimFiw-hhBV1wZNdoR-A@mail.gmail.com>
Date: Wed, 28 Apr 2021 15:53:05 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Rob Herring <robh@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
devicetree <devicetree@...r.kernel.org>,
Frank Rowand <frowand.list@...il.com>
Subject: Re: [GIT PULL] Devicetree updates for v5.13
On Tue, Apr 27, 2021 at 2:49 PM Rob Herring <robh@...nel.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
Powered by blists - more mailing lists