Re: [PATCH] [media] Order the Makefile alphabetically

[Sakari Ailus]

Hi Mauro and Maxime,

On Fri, Apr 21, 2017 at 12:11:05PM -0300, Mauro Carvalho Chehab wrote:
> Em Fri, 21 Apr 2017 16:41:25 +0200
> Maxime Ripard  escreveu:
> 
> > On Wed, Apr 19, 2017 at 08:15:45AM -0300, Mauro Carvalho Chehab wrote:
> > > Em Thu,  6 Apr 2017 16:40:51 +0200
> > > Maxime Ripard  escreveu:
> > >   
> > > > The Makefiles were a free for all without a clear order defined. Sort 
> > > > all the
> > > > options based on the Kconfig symbol.
> > > > 
> > > > Signed-off-by: Maxime Ripard 
> > > > 
> > > > ---
> > > > 
> > > > Hi Mauro,
> > > > 
> > > > Here is my makefile ordering patch again, this time with all the 
> > > > Makefiles
> > > > in drivers/media that needed ordering.
> > > > 
> > > > Since we're already pretty late in the release period, I guess there 
> > > > won't
> > > > be any major conflicts between now and the merge window.
> > > >   
> > > 
> > > The thing with patches like that is that they almost never apply fine.
> > > By the time I review such patches, it was already broken. Also,
> > > once applied, it breaks for everybody that have pending work to merge.
> > > 
> > > This patch is broken (see attached).
> > > 
> > > So, I prefer not applying stuff like that.  
> > 
> > I had the feeling that now would have been a good time to merge it,
> > since all the PR should be merged I guess. But ok.
> 
> No, there are drivers that were late-submitted, and whose commit
> (if driver gets accepted) will be after -rc1. If this patch gets 
> applied, those drivers will have merge conflicts. There are also
> the cases where people have drivers under development. If they pull
> from my tree after a change like that, the developer will get
> conflicts.

Resolving a single conflict in a Makefile is certainly not unfeasible.
Generally it'd be good to prioritise cleanups.

When would it be a good time to get such changes in? Right in the beginning
of the next merge window in media tree?

-- 
Kind regards,

Sakari Ailus
e-mail: sakari.ai...@iki.fi XMPP: sai...@retiisi.org.uk

Re: [PATCH] [media] Order the Makefile alphabetically

[Mauro Carvalho Chehab]

Em Fri, 21 Apr 2017 16:41:25 +0200
Maxime Ripard  escreveu:

> On Wed, Apr 19, 2017 at 08:15:45AM -0300, Mauro Carvalho Chehab wrote:
> > Em Thu,  6 Apr 2017 16:40:51 +0200
> > Maxime Ripard  escreveu:
> >   
> > > The Makefiles were a free for all without a clear order defined. Sort all 
> > > the
> > > options based on the Kconfig symbol.
> > > 
> > > Signed-off-by: Maxime Ripard 
> > > 
> > > ---
> > > 
> > > Hi Mauro,
> > > 
> > > Here is my makefile ordering patch again, this time with all the Makefiles
> > > in drivers/media that needed ordering.
> > > 
> > > Since we're already pretty late in the release period, I guess there won't
> > > be any major conflicts between now and the merge window.
> > >   
> > 
> > The thing with patches like that is that they almost never apply fine.
> > By the time I review such patches, it was already broken. Also,
> > once applied, it breaks for everybody that have pending work to merge.
> > 
> > This patch is broken (see attached).
> > 
> > So, I prefer not applying stuff like that.  
> 
> I had the feeling that now would have been a good time to merge it,
> since all the PR should be merged I guess. But ok.

No, there are drivers that were late-submitted, and whose commit
(if driver gets accepted) will be after -rc1. If this patch gets 
applied, those drivers will have merge conflicts. There are also
the cases where people have drivers under development. If they pull
from my tree after a change like that, the developer will get
conflicts.


Thanks,
Mauro

Re: [PATCH] [media] Order the Makefile alphabetically

[Maxime Ripard]

On Wed, Apr 19, 2017 at 08:15:45AM -0300, Mauro Carvalho Chehab wrote:
> Em Thu,  6 Apr 2017 16:40:51 +0200
> Maxime Ripard  escreveu:
> 
> > The Makefiles were a free for all without a clear order defined. Sort all 
> > the
> > options based on the Kconfig symbol.
> > 
> > Signed-off-by: Maxime Ripard 
> > 
> > ---
> > 
> > Hi Mauro,
> > 
> > Here is my makefile ordering patch again, this time with all the Makefiles
> > in drivers/media that needed ordering.
> > 
> > Since we're already pretty late in the release period, I guess there won't
> > be any major conflicts between now and the merge window.
> > 
> 
> The thing with patches like that is that they almost never apply fine.
> By the time I review such patches, it was already broken. Also,
> once applied, it breaks for everybody that have pending work to merge.
> 
> This patch is broken (see attached).
> 
> So, I prefer not applying stuff like that.

I had the feeling that now would have been a good time to merge it,
since all the PR should be merged I guess. But ok.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com


signature.asc
Description: PGP signature

Re: [PATCH] [media] Order the Makefile alphabetically

[Mauro Carvalho Chehab]

Em Thu,  6 Apr 2017 16:40:51 +0200
Maxime Ripard  escreveu:

> The Makefiles were a free for all without a clear order defined. Sort all the
> options based on the Kconfig symbol.
> 
> Signed-off-by: Maxime Ripard 
> 
> ---
> 
> Hi Mauro,
> 
> Here is my makefile ordering patch again, this time with all the Makefiles
> in drivers/media that needed ordering.
> 
> Since we're already pretty late in the release period, I guess there won't
> be any major conflicts between now and the merge window.
> 

The thing with patches like that is that they almost never apply fine.
By the time I review such patches, it was already broken. Also,
once applied, it breaks for everybody that have pending work to merge.

This patch is broken (see attached).

So, I prefer not applying stuff like that.

Regards,
Mauro


testing if patches/lmml_40670_media_order_the_makefile_alphabetically.patch 
applies
patch -p1 -i patches/lmml_40670_media_order_the_makefile_alphabetically.patch 
--dry-run -t -N
checking file drivers/media/common/Makefile
checking file drivers/media/dvb-frontends/Makefile
checking file drivers/media/i2c/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file drivers/media/pci/Makefile
checking file drivers/media/platform/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file drivers/media/radio/Makefile
checking file drivers/media/rc/Makefile
checking file drivers/media/tuners/Makefile
checking file drivers/media/usb/Makefile
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED
checking file drivers/media/v4l2-core/Makefile
 drivers/media/common/Makefile|2 
 drivers/media/dvb-frontends/Makefile |  220 +--
 drivers/media/i2c/Makefile   |  162 -
 drivers/media/pci/Makefile   |   34 ++---
 drivers/media/platform/Makefile  |   92 +-
 drivers/media/radio/Makefile |   62 -
 drivers/media/rc/Makefile|   74 +--
 drivers/media/tuners/Makefile|   73 +--
 drivers/media/usb/Makefile   |   34 ++---
 drivers/media/v4l2-core/Makefile |   36 ++---
 10 files changed, 381 insertions(+), 408 deletions(-)

Thanks,
Mauro

Re: [PATCH] [media] Order the Makefile alphabetically

[Laurent Pinchart]

Hi Maxime,

Thank you for the patch.

On Thursday 06 Apr 2017 16:40:51 Maxime Ripard wrote:
> The Makefiles were a free for all without a clear order defined. Sort all
> the options based on the Kconfig symbol.
> 
> Signed-off-by: Maxime Ripard 

I like the approach.

Acked-by: Laurent Pinchart 

(I haven't reviewed the changes in detail though, I trust that you have 
double-checked through automated means that no Kconfig symbol was lost.)

> ---
> 
> Hi Mauro,
> 
> Here is my makefile ordering patch again, this time with all the Makefiles
> in drivers/media that needed ordering.
> 
> Since we're already pretty late in the release period, I guess there won't
> be any major conflicts between now and the merge window.
> 
> Maxime
> ---
>  drivers/media/common/Makefile|   2 +-
>  drivers/media/dvb-frontends/Makefile | 220 +++
>  drivers/media/i2c/Makefile   | 162 +-
>  drivers/media/pci/Makefile   |  34 +++---
>  drivers/media/platform/Makefile  |  92 +--
>  drivers/media/radio/Makefile |  62 +-
>  drivers/media/rc/Makefile|  74 ++--
>  drivers/media/tuners/Makefile|  73 ++--
>  drivers/media/usb/Makefile   |  34 +++---
>  drivers/media/v4l2-core/Makefile |  36 +++---
>  10 files changed, 381 insertions(+), 408 deletions(-)

-- 
Regards,

Laurent Pinchart