Re: [GIT PULL for v3.12-rc1] media updates

[Linus Torvalds]

On Thu, Sep 5, 2013 at 7:24 AM, Mauro Carvalho Chehab
<m.chehab@xxxxxxxxxxx> wrote:
>
> Also, a trivial conflict at s5p_mfc_dec.c and s5p_mfc_enc.c will happen as
> a macro name got renamed from IS_MFCV6 to IS_MFCV6_PLUS.

I did an "ugly merge" when fixing that conflict up, because the stupid
code at the conflict site did this:

                if (!IS_MFCV6_PLUS(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {
                        mfc_err("Not supported format.\n");
                        return -EINVAL;
                }
                if (!IS_MFCV6_PLUS(dev)) {
                        if (fmt->fourcc == V4L2_PIX_FMT_VP8) {
                                mfc_err("Not supported format.\n");
                                return -EINVAL;
                        }
                }

and there was no way I was going to fix up the code and not remove the
idiotic duplication of the exact same test.

I have no idea why that code was duplicated with slightly different
syntax, but my OCD couldn't let it remain when I was editing those
lines.

              Linus
--
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/