Re: [PATCH 15/41] Documentation: dt: mfd: fix spelling mistakes

[Lee Jones]

On Tue, 26 Apr 2016, Rob Herring wrote:

> On Tue, Apr 26, 2016 at 1:35 AM, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> > On Mon, 25 Apr 2016, Rob Herring wrote:
> >
> >> On Mon, Apr 25, 2016 at 11:58 AM, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> >> > On Mon, 25 Apr 2016, Rob Herring wrote:
> >> >
> >> >> On Mon, Apr 25, 2016 at 01:24:12AM +0100, Eric Engestrom wrote:
> >> >> > Signed-off-by: Eric Engestrom <eric@xxxxxxxxxxxx>
> >> >>
> >> >> Applied, thanks.
> >> >
> >> > I'd prefer to continue taking these if you don't mind Rob.  It'd limit
> >> > on the amount of immutable branch pull requests I have to send/handle.
> >>
> >> Why? Do you really expect to have a dependency here?
> >
> > Because the file is in ".*/mfd/.*", which normally goes through the MFD
> > tree.
> >
> > $ git log --committer="Rob Herring" --oneline -- Documentation/devicetree/bindings/mfd/ | wc -l
> > 6
> > $ git log --committer="Lee Jones" --oneline -- Documentation/devicetree/bindings/mfd/ | wc -l
> > 99
> 
> That is because most changes are coupled with drivers. For changes
> that are standalone without any dependency, they go thru my tree. If
> we're getting any merge conflicts beyond which Linus can/wants to fix,
> then there is a problem because bindings shouldn't be changing that
> much.

That's certainly the first I've heard about it.  It makes far less
sense for changes pertaining to a single directory to go in via 2
separate trees.  IMO that's asking for trouble.

> Eventually, I think we need to merge all the bindings thru a single
> tree. Otherwise, we'll never move toward moving bindings out of the
> kernel (unless we just sync from the kernel tree to a standalone
> repo).

Once (if they ever) move out from the kernel tree, then I agree with
you, they should be dealt with as completely separate entities and be
merged though different trees, but until then we need to make a
decision; either you take them all or I take them all.  I thought we
were doing the latter already. 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog