Re: [GIT PULL for v3.1-rc7] media fixes

[Mauro Carvalho Chehab]

Em 06-07-2011 11:55, Mauro Carvalho Chehab escreveu:
> Hi Linus,
> 
> Please pull from:
>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
> 
> For a series of bug fixes:
> 	- mx1-camera were using an uninitialized variable;
> 	- pwc issues at USB disconnect;
> 	- several mceusb and lirc fixes;
> 	- some OOPSes fixes at uvc driver;
> 	- some videobuf2 fixes;
> 	- some omap1 camera fixes;
> 	- m5mols/s5p-fimc fixes (this is a driver added at 3.0 merge window);
> 
> Thanks!
> Mauro
> 

Linus,

In time:
 
There will be a small conflict when applying over 3.0-rc6:

$ git diff
diff --cc MAINTAINERS
index ae563fa,63be58b..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6733,6 -6723,7 +6733,10 @@@ F:     fs/fat
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@xxxxxxxxxx>
  M:    Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
++<<<<<<< HEAD
++=======
+ M:        Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
++>>>>>>> 98c32bcded0e249fd48726930ae9f393e0e318b4
  L:    linux-media@xxxxxxxxxxxxxxx
  S:    Maintained
  F:    drivers/media/video/videobuf2-*

The right conflict resolution is to add Kyugmin's name as one of the VB2
maintainers.

Thanks,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/