Em Tue, 2 Oct 2018 08:35:47 +0200
Ludovic Desroches <[email protected]> escreveu:

> On Mon, Oct 01, 2018 at 01:51:01PM -0300, Mauro Carvalho Chehab wrote:
> > Em Sun, 30 Sep 2018 02:40:35 -0700
> > Joe Perches <[email protected]> escreveu:
> >   
> > > On Sun, 2018-09-30 at 06:30 -0300, Mauro Carvalho Chehab wrote:  
> > > > Em Sun, 30 Sep 2018 09:54:48 +0300
> > > > Laurent Pinchart <[email protected]> escreveu:
> > > >     
> > > > > include/media/atmel-isi got removed three years ago without the
> > > > > MAINTAINERS file being updated. Remove the stale entry.
> > > > > 
> > > > > Fixes: 40a78f36fc92 ("[media] v4l: atmel-isi: Remove support for 
> > > > > platform data")
> > > > > Reported-by: Joe Perches <[email protected]>
> > > > > Signed-off-by: Laurent Pinchart <[email protected]>
> > > > > ---
> > > > >  MAINTAINERS | 1 -
> > > > >  1 file changed, 1 deletion(-)
> > > > > 
> > > > > 
> > > > > diff --git a/MAINTAINERS b/MAINTAINERS    
> > > []  
> > > > > @@ -2497,7 +2497,6 @@ M:      Ludovic Desroches 
> > > > > <[email protected]>
> > > > >  L:   [email protected]
> > > > >  S:   Supported
> > > > >  F:   drivers/media/platform/atmel/atmel-isi.c
> > > > > -F:   include/media/atmel-isi.h    
> > > > 
> > > > I guess the right fix would be to replace it by:
> > > > 
> > > > F: drivers/media/platform/atmel/atmel-isi.h    
> > > 
> > > Or replace both F entries with:
> > > 
> > > F:        drivers/media/platform/atmel/atmel-isi.*
> > > 
> > > Or combine the 2 MICROCHIP sections into one
> > > 
> > > MICROCHIP ISC DRIVER
> > > M:        Eugen Hristev <[email protected]>
> > > L:        [email protected]
> > > S:        Supported
> > > F:        drivers/media/platform/atmel/atmel-isc.c
> > > F:        drivers/media/platform/atmel/atmel-isc-regs.h
> > > F:        devicetree/bindings/media/atmel-isc.txt
> > > 
> > > MICROCHIP ISI DRIVER
> > > M:        Eugen Hristev <[email protected]>
> > > L:        [email protected]
> > > S:        Supported
> > > F:        drivers/media/platform/atmel/atmel-isi.c
> > > F:        include/media/atmel-isi.h
> > > 
> > > and maybe use something like:
> > > 
> > > MICROCHIP MEDIA DRIVERS
> > > M:        Eugen Hristev <[email protected]>
> > > L:        
> > > [email protected]
> > > S:        Supported
> > > F:        drivers/media/platform/atmel/
> > > F:        devicetree/bindings/media/atmel-isc.txt  
> > 
> > Yeah, combining both of them seems a good alternative to me.
> > 
> > Eugen/Ludovic/Josh,
> > 
> > Comments?  
> 
> I have no strong opinion about it. The devices are different but usually
> there is one person per topic so combining them makes sense.

Hmm... At media tree, currently, MAINTAINERS entry is different:

MICROCHIP / ATMEL ISC DRIVER
M:      Songjun Wu <[email protected]>
L:      [email protected]
S:      Supported
F:      drivers/media/platform/atmel/atmel-isc.c
F:      drivers/media/platform/atmel/atmel-isc-regs.h
F:      devicetree/bindings/media/atmel-isc.txt

ATMEL ISI DRIVER
M:      Ludovic Desroches <[email protected]>
L:      [email protected]
S:      Supported
F:      drivers/media/platform/atmel/atmel-isi.c
F:      include/media/atmel-isi.h

Maybe some patch upstream did some recent changes on it via another
tree.

So, in order to avoid conflicts upstream, for now I would just correct
the location for the ISI file.

After the merge window, we may revisit and join both entries, 
if the maintainers are the same.

Regards,
Mauro

-

MAINTAINERS: fix location for atmel-isi.h file

The location of this file got changed by changeset 40a78f36fc92
("[media] v4l: atmel-isi: Remove support for platform data"), but
MAINTAINERS was not updated accordingly.

Fixes: 40a78f36fc92 ("[media] v4l: atmel-isi: Remove support for platform data")
Reported-by: Joe Perches <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index 9989925f658d..385ebe9ca0a2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2496,8 +2496,7 @@ ATMEL ISI DRIVER
 M:     Ludovic Desroches <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/media/platform/atmel/atmel-isi.c
-F:     include/media/atmel-isi.h
+F:     drivers/media/platform/atmel/atmel-isi.*
 
 ATMEL LCDFB DRIVER
 M:     Nicolas Ferre <[email protected]>

Reply via email to