Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933221AbbDODdw (ORCPT ); Tue, 14 Apr 2015 23:33:52 -0400 Received: from ozlabs.org ([103.22.144.67]:60876 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933054AbbDODdQ (ORCPT ); Tue, 14 Apr 2015 23:33:16 -0400 Date: Wed, 15 Apr 2015 13:33:09 +1000 From: Stephen Rothwell To: Dave Airlie , Mauro Carvalho Chehab Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philipp Zabel , Laurent Pinchart , Hans Verkuil , Laurent Pinchart , Hyun Kwon Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree Message-ID: <20150415133309.24f0a36a@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/ORaam17kOxWX4CR4HgOp78f"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 13326 Lines: 311 --Sig_/ORaam17kOxWX4CR4HgOp78f Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Dave, Today's linux-next merge of the drm tree got a conflict in Documentation/DocBook/media/v4l/subdev-formats.xml between commit 7b0fd4568bee ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on 24 and 32 bit busses") and e8b2d7a565ae ("[media] v4l: Sort YUV formats of v4l2_mbus_pixelcode") from the v4l-dvb tree and commits 08c38458be7e ("Add BGR888_1X24 and GBR888_1X24 media bus formats"), 0fc63eb104d7 ("Add YUV8_1X24 media bus format") and 203508ef52e3 ("Add RGB666_1X24_CPADHI media bus format") from the drm tree. I fixed it up (almost certainly incorrectly - see below) and can carry the fix as necessary. Please sort out who "owns" this file and try to coordinate updates to it. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc Documentation/DocBook/media/v4l/subdev-formats.xml index bc8d3fb9e4a9,18b71aff48c9..000000000000 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@@ -440,36 -482,96 +482,126 @@@ see .b1 b0 + + MEDIA_BUS_FMT_RBG888_1X24 + 0x100e + + &dash-ent-8; + r7 + r6 + r5 + r4 + r3 + r2 + r1 + r0 + b7 + b6 + b5 + b4 + b3 + b2 + b1 + b0 + g7 + g6 + g5 + g4 + g3 + g2 + g1 + g0 + + + MEDIA_BUS_FMT_RGB666_1X24_CPADHI + 0x1015 + + &dash-ent-8; + 0 + 0 + r5 + r4 + r3 + r2 + r1 + r0 + 0 + 0 + g5 + g4 + g3 + g2 + g1 + g0 + 0 + 0 + b5 + b4 + b3 + b2 + b1 + b0 + + + MEDIA_BUS_FMT_BGR888_1X24 + 0x1013 + + &dash-ent-8; + b7 + b6 + b5 + b4 + b3 + b2 + b1 + b0 + g7 + g6 + g5 + g4 + g3 + g2 + g1 + g0 + r7 + r6 + r5 + r4 + r3 + r2 + r1 + r0 + + + MEDIA_BUS_FMT_GBR888_1X24 + 0x1014 + + &dash-ent-8; + g7 + g6 + g5 + g4 + g3 + g2 + g1 + g0 + b7 + b6 + b5 + b4 + b3 + b2 + b1 + b0 + r7 + r6 + r5 + r4 + r3 + r2 + r1 + r0 + MEDIA_BUS_FMT_RGB888_1X24 0x100a @@@ -2719,33 -3047,92 +3106,92 @@@ u1 u0 + + MEDIA_BUS_FMT_YDYUYDYV8_1X16 + 0x2014 + + &dash-ent-16; + y7 + y6 + y5 + y4 + y3 + y2 + y1 + y0 ++ d ++ d ++ d ++ d ++ d ++ d ++ d ++ d ++ + + MEDIA_BUS_FMT_YUV8_1X24 + 0x2024 + + - + - + - + - + - + - + - + - + y7 + y6 + y5 + y4 + y3 + y2 + y1 + y0 + u7 + u6 + u5 + u4 + u3 + u2 + u1 + u0 + v7 + v6 + v5 + v4 + v3 + v2 + v1 + v0 + + + MEDIA_BUS_FMT_YUV10_1X30 + 0x2016 + - - - - - y9 - y8 ++ &dash-ent-16; + y7 + y6 + y5 + y4 + y3 + y2 + y1 + y0 - u9 - u8 - u7 - u6 - u5 - u4 - u3 - u2 - u1 - u0 - v9 - v8 - v7 - v6 - v5 - v4 - v3 - v2 - v1 - v0 + d + d + d + d + d + d + d + d - - MEDIA_BUS_FMT_AYUV8_1X32 - 0x2017 + - a7 - a6 - a5 - a4 - a3 - a2 - a1 - a0 + + + &dash-ent-16; y7 y6 y5 --Sig_/ORaam17kOxWX4CR4HgOp78f Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVLdv6AAoJEMDTa8Ir7ZwVNxsP/0AbG6Nq+WbfP5So7spK9UjJ CqAZbeHIP4HC8PzSd+sdq4mNXCciGY+Yo3vWCDNOmS/bU8OdIBUdIJQqR3oYnvDI LaQ1aFqDpTc15iXG5QlqX5wkBk+u6RN277tsSO0Pbyee4BQXOAYbw8yNRCENrNTA bYjeMVB/63jlsvYdss5hHfRELZKKUbqAkUrlJwbVGQHRknCyhOdlZ2R77diKowVQ sbhjhJQwVWLyRcM+ywjxjPpZkyN2I7j4r8dXISxwfbKwx4BDV2FxBoZUPsE4Nl3K pldKejuU61Um4XR2SbxK2LetYCJBxrC6L8OsE5avQTsH38oSnSCiPWcfIc4yN0ri QxlzHP+WIImRi0z+GVfUyGL71fVVbm2NKbAV4OVeHhVtD6lV+61pP0FenZvNbdXV tjKo3v2TfSQ1/6RGTr3so+G7XV0XgtmpX1aUvreFAEa47swVlMjp/C3RAQUvmo6P aGj8BcPUI2uErSXDvgnhAkC7gUCclMJWw3uZ/SdCYQg7j0l2JmHO3K5DO7JWgjmn otELCe3mp3pdtQRJPCcLVsTo+eshvkRUprntAkutSqTAraCO5E6e9/yAXJdprhil MxAo2KSwvK1hVN1TpcX0as8wPfVNYtDj535gqR8Azx6zOQM6zoCNTNDjF7skeHAJ ldW0YbAv5weKh+Nfx4rB =+joM -----END PGP SIGNATURE----- --Sig_/ORaam17kOxWX4CR4HgOp78f-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/