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

2017-04-24 Thread 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

2017-04-21 Thread 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

2017-04-21 Thread 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

2017-04-19 Thread 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

2017-04-06 Thread 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

[PATCH] [media] Order the Makefile alphabetically

2017-04-06 Thread Maxime Ripard 
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.

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(-)

diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index 2d1b0a025084..e71c70afc87d 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,4 +1,4 @@
 obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/
+obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o
 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
-obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o
diff --git a/drivers/media/dvb-frontends/Makefile 
b/drivers/media/dvb-frontends/Makefile
index 3fccaf34ef52..9e09a596c2b2 100644
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -16,113 +16,113 @@ drxd-objs := drxd_firm.o drxd_hard.o
 cxd2820r-objs := cxd2820r_core.o cxd2820r_c.o cxd2820r_t.o cxd2820r_t2.o
 drxk-objs := drxk_hard.o
 
-obj-$(CONFIG_DVB_PLL) += dvb-pll.o
-obj-$(CONFIG_DVB_STV0299) += stv0299.o
-obj-$(CONFIG_DVB_STB0899) += stb0899.o
-obj-$(CONFIG_DVB_STB6100) += stb6100.o
-obj-$(CONFIG_DVB_SP8870) += sp8870.o
-obj-$(CONFIG_DVB_CX22700) += cx22700.o
-obj-$(CONFIG_DVB_S5H1432) += s5h1432.o
-obj-$(CONFIG_DVB_CX24110) += cx24110.o
-obj-$(CONFIG_DVB_TDA8083) += tda8083.o
-obj-$(CONFIG_DVB_L64781) += l64781.o
-obj-$(CONFIG_DVB_DIB3000MB) += dib3000mb.o
-obj-$(CONFIG_DVB_DIB3000MC) += dib3000mc.o dibx000_common.o
-obj-$(CONFIG_DVB_DIB7000M) += dib7000m.o dibx000_common.o
-obj-$(CONFIG_DVB_DIB7000P) += dib7000p.o dibx000_common.o
-obj-$(CONFIG_DVB_DIB8000) += dib8000.o dibx000_common.o
-obj-$(CONFIG_DVB_DIB9000) += dib9000.o dibx000_common.o
-obj-$(CONFIG_DVB_MT312) += mt312.o
-obj-$(CONFIG_DVB_VES1820) += ves1820.o
-obj-$(CONFIG_DVB_VES1X93) += ves1x93.o
-obj-$(CONFIG_DVB_TDA1004X) += tda1004x.o
-obj-$(CONFIG_DVB_SP887X) += sp887x.o
-obj-$(CONFIG_DVB_NXT6000) += nxt6000.o
-obj-$(CONFIG_DVB_MT352) += mt352.o
-obj-$(CONFIG_DVB_ZL10036) += zl10036.o
-obj-$(CONFIG_DVB_ZL10039) += zl10039.o
-obj-$(CONFIG_DVB_ZL10353) += zl10353.o
-obj-$(CONFIG_DVB_CX22702) += cx22702.o
-obj-$(CONFIG_DVB_DRXD) += drxd.o
-obj-$(CONFIG_DVB_TDA10021) += tda10021.o
-obj-$(CONFIG_DVB_TDA10023) += tda10023.o
-obj-$(CONFIG_DVB_STV0297) += stv0297.o
-obj-$(CONFIG_DVB_NXT200X) += nxt200x.o
-obj-$(CONFIG_DVB_OR51211) += or51211.o
-obj-$(CONFIG_DVB_OR51132) += or51132.o
-obj-$(CONFIG_DVB_BCM3510) += bcm3510.o
-obj-$(CONFIG_DVB_S5H1420) += s5h1420.o
-obj-$(CONFIG_DVB_LGDT330X) += lgdt330x.o
-obj-$(CONFIG_DVB_LGDT3305) += lgdt3305.o
-obj-$(CONFIG_DVB_LGDT3306A) += lgdt3306a.o
-obj-$(CONFIG_DVB_LG2160) += lg2160.o
-obj-$(CONFIG_DVB_CX24123) += cx24123.o
-obj-$(CONFIG_DVB_LNBH25) += lnbh25.o
-obj-$(CONFIG_DVB_LNBP21) += lnbp21.o
-obj-$(CONFIG_DVB_LNBP22) += lnbp22.o
-obj-$(CONFIG_DVB_ISL6405) += isl6405.o
-obj-$(CONFIG_DVB_ISL6421) += isl6421.o
-obj-$(CONFIG_DVB_TDA10086) += tda10086.o
-obj-$(CONFIG_DVB_TDA826X) += tda826x.o
-obj-$(CONFIG_DVB_TDA8261) += tda8261.o
-obj-$(CONFIG_DVB_TUNER_DIB0070) += dib0070.o
-obj-$(CONFIG_DVB_TUNER_DIB0090) += dib0090.o
-obj-$(CONFIG_DVB_TUA6100) += tua6100.o
-obj-$(CONFIG_DVB_S5H1409) += s5h1409.o
-obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o
-obj-$(CONFIG_DVB_AU8522) += au8522_common.o
-obj-$(CONFIG_DVB_AU8522_DTV) += au8522_dig.o
-obj-$(CONFIG_DVB_AU8522_V4L) += au8522_decoder.o
-obj-$(CONFIG_DVB_TDA10048) += tda10048.o
-obj-$(CONFIG_DVB_TUNER_CX24113) += cx24113.o
-obj-$(CONFIG_DVB_S5H1411) += s5h1411.o
-obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o
-obj-$(CONFIG_DVB_TDA665x) += tda665x.o
-obj-$(CONFIG_DVB_LGS8GXX) += lgs8gxx.o
-obj-$(CONFIG_DVB_ATBM8830) += atbm8830.o
-obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o
-obj-$(CONFIG_DVB_AF9013) += af9013.o
-obj-$(CONFIG_DVB_CX24116) += cx24116.o
-obj-$(CONFIG_DVB_CX24117) += cx24117.o
-obj-$(CONFIG_DVB_CX24120) += cx24120.o
-obj-$(CONFIG_DVB_SI21XX) += si21xx.o
-obj-$(CONFIG_DVB_SI2168) += si2168.o
-obj-$(CONFIG_DVB_STV0288) += stv0288.o
-obj-$(CONFIG_DVB_STB6000) += stb6000.o
-obj-$(CONFIG_DVB_S921) += s921.o