Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell <s...@canb.auug.org.au> escreveu:
> Hi Laurent,
>
> On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart
> <laurent.pinch...@ideasonboard.com> wrote:
> >
> > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
> > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
> > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
> > > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
> > > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
> > > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
> >
> > The above 6 lines introduce duplicate defines, you can remove them.
>
> OK, thanks, done for tomorrow. Though hopefully all this will be
> resolved soon.
I think that the best is for me to merge from the DRM branch that Linus
picked, and solve the conflict there.
This way, it should be a way easier for Linus to pick it, and not
manually solve those conflicts with are not trivial.
Laurent/Philipp,
Please double-check if everything went fine on my conflict solving.
I'm pushing it at branch "fixes" at the media development tree:
git://linuxtv.org/media_tree.git fixes
In any case, I double-checked that it is compiling and it is producing the
media DocBook.
PS.: I intend to send this latter today for being merged upstream.
Thanks,
Mauro
pgpxV4TNneIMI.pgp
Description: Assinatura digital OpenPGP
