linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the drm tree with the v4l-dvb tree
@ 2018-07-27  4:36 Stephen Rothwell
  2018-07-27  7:57 ` Philipp Zabel
  2018-07-27 10:32 ` Mauro Carvalho Chehab
  0 siblings, 2 replies; 13+ messages in thread
From: Stephen Rothwell @ 2018-07-27  4:36 UTC (permalink / raw)
  To: Dave Airlie, DRI, Mauro Carvalho Chehab
  Cc: Steve Longerbeam, Linux-Next Mailing List, Linux Kernel Mailing List


[-- Attachment #1.1: Type: text/plain, Size: 795 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/ipu-v3/ipu-cpmem.c

between commit:

  343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced scanning")

from the v4l-dvb tree and commit:

  4e3c5d7e05be ("gpu: ipu-v3: Allow negative offsets for interlaced scanning")

from the drm tree.

I fixed it up (I just used the drm tree version) and can carry the fix
as necessary. This is now fixed as far as linux-next is concerned, but
any non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
  2018-07-27  4:36 linux-next: manual merge of the drm tree with the v4l-dvb tree Stephen Rothwell
@ 2018-07-27  7:57 ` Philipp Zabel
  2018-07-27 10:32 ` Mauro Carvalho Chehab
  1 sibling, 0 replies; 13+ messages in thread
From: Philipp Zabel @ 2018-07-27  7:57 UTC (permalink / raw)
  To: Stephen Rothwell, Dave Airlie, DRI, Mauro Carvalho Chehab
  Cc: Steve Longerbeam, Linux-Next Mailing List, Linux Kernel Mailing List

On Fri, 2018-07-27 at 14:36 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the drm tree got a conflict in:
> 
>   drivers/gpu/ipu-v3/ipu-cpmem.c
> 
> between commit:
> 
>   343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced scanning")
> 
> from the v4l-dvb tree and commit:
> 
>   4e3c5d7e05be ("gpu: ipu-v3: Allow negative offsets for interlaced scanning")
> 
> from the drm tree.
>
> I fixed it up (I just used the drm tree version)

This is correct.

>  and can carry the fix
> as necessary. This is now fixed as far as linux-next is concerned, but
> any non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Steve had pointed out a valid issue with 343b23a7c6b6, I didn't expect
this patch to get picked up. I should have mentioned on linux-media that
I had submitted the fixed version for inclusion in drm-next.

regards
Philipp
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
  2018-07-27  4:36 linux-next: manual merge of the drm tree with the v4l-dvb tree Stephen Rothwell
  2018-07-27  7:57 ` Philipp Zabel
@ 2018-07-27 10:32 ` Mauro Carvalho Chehab
  1 sibling, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2018-07-27 10:32 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Steve Longerbeam, Dave Airlie, Linux Kernel Mailing List, DRI,
	Linux-Next Mailing List, Mauro Carvalho Chehab

Em Fri, 27 Jul 2018 14:36:40 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi all,
> 
> Today's linux-next merge of the drm tree got a conflict in:
> 
>   drivers/gpu/ipu-v3/ipu-cpmem.c
> 
> between commit:
> 
>   343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced scanning")
> 
> from the v4l-dvb tree and commit:
> 
>   4e3c5d7e05be ("gpu: ipu-v3: Allow negative offsets for interlaced scanning")
> 
> from the drm tree.
> 
> I fixed it up (I just used the drm tree version) and can carry the fix
> as necessary. This is now fixed as far as linux-next is concerned, but
> any non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

My mistake. Not sure why media ML was c/c on this patch. As the author
is an usual media contributor and we have an IPU3 driver that has being
taking some discussions those days, I ended by merging it without
noticing that it was for the gpu driver.

I'll remove it from my tree in order to avoid conflicts.

Thanks,
Mauro
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the drm tree with the v4l-dvb tree
@ 2022-03-01  1:20 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2022-03-01  1:20 UTC (permalink / raw)
  To: Dave Airlie, DRI, Mauro Carvalho Chehab
  Cc: Chun-Kuang Hu, Hans Verkuil, Linux Kernel Mailing List,
	Linux Next Mailing List, Yong Wu, jason-jh.lin

[-- Attachment #1: Type: text/plain, Size: 7325 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

between commit:

  6d0990e6e844 ("media: dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW")

from the v4l-dvb tree and commit:

  4ed545e7d100 ("dt-bindings: display: mediatek: disp: split each block to individual yaml")

from the drm tree.

I fixed it up (I deleted the file and added the following merge fix patch)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Mar 2022 12:17:12 +1100
Subject: [PATCH] fix up for "media: dt-binding: mediatek: Get rid of
 mediatek,larb for multimedia HW"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 .../bindings/display/mediatek/mediatek,ovl-2l.yaml     | 10 ----------
 .../bindings/display/mediatek/mediatek,ovl.yaml        | 10 ----------
 .../bindings/display/mediatek/mediatek,rdma.yaml       | 10 ----------
 .../bindings/display/mediatek/mediatek,wdma.yaml       | 10 ----------
 4 files changed, 40 deletions(-)

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
index 611a2dbdefa4..e3cef99d0f98 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
@@ -46,15 +46,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,gce-client-reg:
     description: The register of client driver can be configured by gce with
       4 arguments defined in this property, such as phandle of gce, subsys id,
@@ -83,6 +74,5 @@ examples:
         power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
         clocks = <&mmsys CLK_MM_DISP_OVL0_2L>;
         iommus = <&iommu M4U_PORT_DISP_2L_OVL0_LARB0>;
-        mediatek,larb = <&larb0>;
         mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x9000 0x1000>;
     };
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
index e71f79bc2dee..93d5c68a2dbd 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
@@ -61,15 +61,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,gce-client-reg:
     description: The register of client driver can be configured by gce with
       4 arguments defined in this property, such as phandle of gce, subsys id,
@@ -98,6 +89,5 @@ examples:
         power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
         clocks = <&mmsys CLK_MM_DISP_OVL0>;
         iommus = <&iommu M4U_PORT_DISP_OVL0>;
-        mediatek,larb = <&larb0>;
         mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xc000 0x1000>;
     };
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
index 8ef821641672..b56e22fbcd52 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
@@ -63,15 +63,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,rdma-fifo-size:
     description:
       rdma fifo size may be different even in same SOC, add this property to the
@@ -111,7 +102,6 @@ examples:
         power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
         clocks = <&mmsys CLK_MM_DISP_RDMA0>;
         iommus = <&iommu M4U_PORT_DISP_RDMA0>;
-        mediatek,larb = <&larb0>;
         mediatek,rdma-fifosize = <8192>;
         mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xe000 0x1000>;
     };
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
index aaf5649b6413..f9f00a518edf 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
@@ -44,15 +44,6 @@ properties:
       This property should point to the respective IOMMU block with master port as argument,
       see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.
 
-  mediatek,larb:
-    description:
-      This property should contain a phandle pointing to the local arbiter devices defined in
-      Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml.
-      It must sort according to the local arbiter index, like larb0, larb1, larb2...
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    minItems: 1
-    maxItems: 32
-
   mediatek,gce-client-reg:
     description: The register of client driver can be configured by gce with
       4 arguments defined in this property, such as phandle of gce, subsys id,
@@ -81,6 +72,5 @@ examples:
         power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
         clocks = <&mmsys CLK_MM_DISP_WDMA0>;
         iommus = <&iommu M4U_PORT_DISP_WDMA0>;
-        mediatek,larb = <&larb0>;
         mediatek,gce-client-reg = <&gce SUBSYS_1401XXXX 0x1000 0x1000>;
     };
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the drm tree with the v4l-dvb tree
@ 2017-04-11  0:27 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2017-04-11  0:27 UTC (permalink / raw)
  To: Dave Airlie, Mauro Carvalho Chehab
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Hans Verkuil,
	Shawn Guo, Daniel Vetter

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/exynos/exynos_hdmi.c

between commit:

  278c811c5d05 ("[media] exynos_hdmi: add CEC notifier support")

from the v4l-dvb tree and commit:

  64b0e1d6c6a1 ("drm: exynos: use vblank hooks in struct drm_crtc_funcs")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/exynos/exynos_hdmi.c
index bc4c8d0a66f4,52438404c8c9..000000000000
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@@ -43,9 -43,6 +43,8 @@@
  
  #include <drm/exynos_drm.h>
  
 +#include <media/cec-notifier.h>
 +
- #include "exynos_drm_drv.h"
  #include "exynos_drm_crtc.h"
  
  #define HOTPLUG_DEBOUNCE_MS		1100

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the drm tree with the v4l-dvb tree
@ 2016-07-19  1:21 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2016-07-19  1:21 UTC (permalink / raw)
  To: Dave Airlie, Mauro Carvalho Chehab
  Cc: linux-next, linux-kernel, Jani Nikula, Daniel Vetter

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  Documentation/index.rst

between commits:

  d26a5d4350fd ("[media] doc-rst: Convert media API to rst")
  651af5e464ec ("[media] add DVB documentation to Sphinx")

from the v4l-dvb tree and commit:

  cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/index.rst
index 31273cc2e0bc,dacc77b43c29..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -13,11 -13,7 +13,12 @@@ Contents
  .. toctree::
     :maxdepth: 2
  
+    gpu/index
 +   kernel-documentation
 +   media/media_uapi
 +   media/media_drivers
 +   media/dvb-drivers/index
 +   media/v4l-drivers/index
  
  Indices and tables
  ==================

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the drm tree with the v4l-dvb tree
@ 2016-07-13  2:25 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2016-07-13  2:25 UTC (permalink / raw)
  To: Dave Airlie, Mauro Carvalho Chehab
  Cc: linux-next, linux-kernel, Hans Verkuil, Peter Ujfalusi

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/media/platform/omap/omap_voutdef.h

between commit:

  77430f0396af ("[media] omap_vout: use control framework")

from the v4l-dvb tree and commit:

  781a162244a2 ("[media] omap_vout: Switch to use the video/omapfb_dss.h header file")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/media/platform/omap/omap_voutdef.h
index 49de1475e473,94b5d65afb19..000000000000
--- a/drivers/media/platform/omap/omap_voutdef.h
+++ b/drivers/media/platform/omap/omap_voutdef.h
@@@ -11,8 -11,7 +11,8 @@@
  #ifndef OMAP_VOUTDEF_H
  #define OMAP_VOUTDEF_H
  
 +#include <media/v4l2-ctrls.h>
- #include <video/omapdss.h>
+ #include <video/omapfb_dss.h>
  #include <video/omapvrfb.h>
  
  #define YUYV_BPP        2

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
  2015-04-17  3:07   ` Dave Airlie
@ 2015-04-17 17:12     ` Philipp Zabel
  0 siblings, 0 replies; 13+ messages in thread
From: Philipp Zabel @ 2015-04-17 17:12 UTC (permalink / raw)
  To: Dave Airlie
  Cc: Stephen Rothwell, Mauro Carvalho Chehab, linux-next,
	linux-kernel, Laurent Pinchart, Hans Verkuil, Hyun Kwon

Am Freitag, den 17.04.2015, 04:07 +0100 schrieb Dave Airlie:
> > Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell:
> > > 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.
> > 
> > Together with the corresponding fixup for include/uapi/linux/media-bus-format.h,
> > how about this:
> 
> This should never have gone into my tree if there wasn't someone in the 
> v4l tree who knew it was coming,
>
> In future please merge the media-bus-formats through both tree, providing
> a stable git tree to both maintainers to pull from, though this may not
> avoid all bad cases, it hopefully will avoid this sort of mess.

I'll try this next time.

> I'm not really sure how best to clean this one up, I think I'd want
> patches to my tree that just use the correect values, then it would just 
> be a normal conflict on merging, instead of renumbering userspace visible
> values,

So far the media tree has added formats 0x100e 0x100f and 0x2024, so I
will send a patch for drm-next that moves these three out of the way,
leaving them unused for the merge.
The merge conflict resolution will still have to take care of the
ordering in media-bus-format.h and the conflicts in subdev-formats.xml
are still non-trivial, but at leasts the constant values won't move
around anymore.

regards
Philipp

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
  2015-04-15  9:09 ` Philipp Zabel
@ 2015-04-17  3:07   ` Dave Airlie
  2015-04-17 17:12     ` Philipp Zabel
  0 siblings, 1 reply; 13+ messages in thread
From: Dave Airlie @ 2015-04-17  3:07 UTC (permalink / raw)
  To: Philipp Zabel
  Cc: Stephen Rothwell, Mauro Carvalho Chehab, linux-next,
	linux-kernel, Laurent Pinchart, Hans Verkuil, Hyun Kwon

> Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell:
> > 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.
> 
> Together with the corresponding fixup for include/uapi/linux/media-bus-format.h,
> how about this:

This should never have gone into my tree if there wasn't someone in the 
v4l tree who knew it was coming,

In future please merge the media-bus-formats through both tree, providing
a stable git tree to both maintainers to pull from, though this may not
avoid all bad cases, it hopefully will avoid this sort of mess.

I'm not really sure how best to clean this one up, I think I'd want
patches to my tree that just use the correect values, then it would just 
be a normal conflict on merging, instead of renumbering userspace visible
values,

Dave.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
  2015-04-15  3:33 Stephen Rothwell
@ 2015-04-15  9:09 ` Philipp Zabel
  2015-04-17  3:07   ` Dave Airlie
  0 siblings, 1 reply; 13+ messages in thread
From: Philipp Zabel @ 2015-04-15  9:09 UTC (permalink / raw)
  To: Stephen Rothwell, Dave Airlie, Mauro Carvalho Chehab
  Cc: linux-next, linux-kernel, Laurent Pinchart, Hans Verkuil, Hyun Kwon

Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell:
> 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.

Together with the corresponding fixup for include/uapi/linux/media-bus-format.h,
how about this:

-----8<-----
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 0881d55..1af86c1 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -484,7 +484,7 @@ see <xref linkend="colorspaces" />.</entry>
 	    </row>
 	    <row id="MEDIA-BUS-FMT-RBG888-1X24">
 	      <entry>MEDIA_BUS_FMT_RBG888_1X24</entry>
-	      <entry>0x100e</entry>
+	      <entry>0x1016</entry>
 	      <entry></entry>
 	      &dash-ent-8;
 	      <entry>r<subscript>7</subscript></entry>
@@ -743,7 +743,7 @@ see <xref linkend="colorspaces" />.</entry>
 	    </row>
 	    <row id="MEDIA-BUS-FMT-RGB888-1X32-PADHI">
 	      <entry>MEDIA_BUS_FMT_RGB888_1X32_PADHI</entry>
-	      <entry>0x100f</entry>
+	      <entry>0x1017</entry>
 	      <entry></entry>
 	      <entry>0</entry>
 	      <entry>0</entry>
@@ -3463,7 +3463,7 @@ see <xref linkend="colorspaces" />.</entry>
 	    </row>
 	    <row id="MEDIA-BUS-FMT-VUY8-1X24">
 	      <entry>MEDIA_BUS_FMT_VUY8_1X24</entry>
-	      <entry>0x201a</entry>
+	      <entry>0x2025</entry>
 	      <entry></entry>
 	      &dash-ent-8;
 	      <entry>v<subscript>7</subscript></entry>
-- 
2.1.4
----->8-----

regards
Philipp

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
  2015-04-15  3:49 Stephen Rothwell
@ 2015-04-15  9:00 ` Philipp Zabel
  0 siblings, 0 replies; 13+ messages in thread
From: Philipp Zabel @ 2015-04-15  9:00 UTC (permalink / raw)
  To: Stephen Rothwell, Mauro Carvalho Chehab, Dave Airlie
  Cc: linux-next, linux-kernel, Boris Brezillion, Laurent Pinchart,
	Hans Verkuil, Hyun Kwon

Am Mittwoch, den 15.04.2015, 13:49 +1000 schrieb Stephen Rothwell:
> Hi Dave,
> 
> Today's linux-next merge of the drm tree got a conflict in
> include/uapi/linux/media-bus-format.h between commits 7b0fd4568bee
> ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on 24 and 32 bit
> busses"), e8b2d7a565ae ("[media] v4l: Sort YUV formats of
> v4l2_mbus_pixelcode") and 2dca0551e4e2 ("[media] v4l: Add VUY8 24 bits
> bus format") from the v4l-dvb tree and commits 4b3a81a917a5 ("Add
> RGB444_1X12 and RGB565_1X16 media bus formats"), b295c22978b8 ("Add
> LVDS RGB media bus formats"), 08c38458be7e ("Add BGR888_1X24 and
> GBR888_1X24 media bus formats") and 203508ef52e3 ("Add
> RGB666_1X24_CPADHI media bus format") from the drm tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
> 
> (what a mess :-()

I remember Sakari warned about this when I posted my part of these
conflicting changes to linux-media.
How about this fixup to get rid of the duplicated values:

-----8<-----
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 7f6a9f5..54344c2 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -33,7 +33,7 @@
 
 #define MEDIA_BUS_FMT_FIXED			0x0001
 
-/* RGB - next is	0x1016 */
+/* RGB - next is	0x1018 */
 #define MEDIA_BUS_FMT_RGB444_1X12		0x100e
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE	0x1001
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE	0x1002
@@ -45,7 +45,7 @@
 #define MEDIA_BUS_FMT_RGB565_2X8_BE		0x1007
 #define MEDIA_BUS_FMT_RGB565_2X8_LE		0x1008
 #define MEDIA_BUS_FMT_RGB666_1X18		0x1009
-#define MEDIA_BUS_FMT_RBG888_1X24		0x100e
+#define MEDIA_BUS_FMT_RBG888_1X24		0x1016
 #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI	0x1015
 #define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG		0x1010
 #define MEDIA_BUS_FMT_BGR888_1X24		0x1013
@@ -56,9 +56,9 @@
 #define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG		0x1011
 #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA	0x1012
 #define MEDIA_BUS_FMT_ARGB8888_1X32		0x100d
-#define MEDIA_BUS_FMT_RGB888_1X32_PADHI		0x100f
+#define MEDIA_BUS_FMT_RGB888_1X32_PADHI		0x1017
 
-/* YUV (including grey) - next is	0x2025 */
+/* YUV (including grey) - next is	0x2026 */
 #define MEDIA_BUS_FMT_Y8_1X8			0x2001
 #define MEDIA_BUS_FMT_UV8_1X8			0x2015
 #define MEDIA_BUS_FMT_UYVY8_1_5X8		0x2002
@@ -89,7 +89,7 @@
 #define MEDIA_BUS_FMT_YUYV10_1X20		0x200d
 #define MEDIA_BUS_FMT_YVYU10_1X20		0x200e
 #define MEDIA_BUS_FMT_YUV8_1X24			0x2024
-#define MEDIA_BUS_FMT_VUY8_1X24			0x2024
+#define MEDIA_BUS_FMT_VUY8_1X24			0x2025
 #define MEDIA_BUS_FMT_UYVY12_1X24		0x2020
 #define MEDIA_BUS_FMT_VYUY12_1X24		0x2021
 #define MEDIA_BUS_FMT_YUYV12_1X24		0x2022
-- 
2.1.4
----->8-----

regards
Philipp

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the drm tree with the v4l-dvb tree
@ 2015-04-15  3:49 Stephen Rothwell
  2015-04-15  9:00 ` Philipp Zabel
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2015-04-15  3:49 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Boris Brezillion, Philipp Zabel,
	Laurent Pinchart, Hans Verkuil, Hyun Kwon

[-- Attachment #1: Type: text/plain, Size: 2534 bytes --]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
include/uapi/linux/media-bus-format.h between commits 7b0fd4568bee
("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on 24 and 32 bit
busses"), e8b2d7a565ae ("[media] v4l: Sort YUV formats of
v4l2_mbus_pixelcode") and 2dca0551e4e2 ("[media] v4l: Add VUY8 24 bits
bus format") from the v4l-dvb tree and commits 4b3a81a917a5 ("Add
RGB444_1X12 and RGB565_1X16 media bus formats"), b295c22978b8 ("Add
LVDS RGB media bus formats"), 08c38458be7e ("Add BGR888_1X24 and
GBR888_1X24 media bus formats") and 203508ef52e3 ("Add
RGB666_1X24_CPADHI media bus format") from the drm tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

(what a mess :-()
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/uapi/linux/media-bus-format.h
index d391893064a0,83ea46f4be51..000000000000
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@@ -43,12 -45,16 +45,18 @@@
  #define MEDIA_BUS_FMT_RGB565_2X8_BE		0x1007
  #define MEDIA_BUS_FMT_RGB565_2X8_LE		0x1008
  #define MEDIA_BUS_FMT_RGB666_1X18		0x1009
 +#define MEDIA_BUS_FMT_RBG888_1X24		0x100e
+ #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI	0x1015
+ #define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG		0x1010
+ #define MEDIA_BUS_FMT_BGR888_1X24		0x1013
+ #define MEDIA_BUS_FMT_GBR888_1X24		0x1014
  #define MEDIA_BUS_FMT_RGB888_1X24		0x100a
  #define MEDIA_BUS_FMT_RGB888_2X12_BE		0x100b
  #define MEDIA_BUS_FMT_RGB888_2X12_LE		0x100c
+ #define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG		0x1011
+ #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA	0x1012
  #define MEDIA_BUS_FMT_ARGB8888_1X32		0x100d
 +#define MEDIA_BUS_FMT_RGB888_1X32_PADHI		0x100f
  
  /* YUV (including grey) - next is	0x2025 */
  #define MEDIA_BUS_FMT_Y8_1X8			0x2001
@@@ -80,7 -82,13 +88,8 @@@
  #define MEDIA_BUS_FMT_VYUY10_1X20		0x201b
  #define MEDIA_BUS_FMT_YUYV10_1X20		0x200d
  #define MEDIA_BUS_FMT_YVYU10_1X20		0x200e
+ #define MEDIA_BUS_FMT_YUV8_1X24			0x2024
 -#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
 +#define MEDIA_BUS_FMT_VUY8_1X24			0x2024
  #define MEDIA_BUS_FMT_UYVY12_1X24		0x2020
  #define MEDIA_BUS_FMT_VYUY12_1X24		0x2021
  #define MEDIA_BUS_FMT_YUYV12_1X24		0x2022

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the drm tree with the v4l-dvb tree
@ 2015-04-15  3:33 Stephen Rothwell
  2015-04-15  9:09 ` Philipp Zabel
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2015-04-15  3:33 UTC (permalink / raw)
  To: Dave Airlie, Mauro Carvalho Chehab
  Cc: linux-next, linux-kernel, Philipp Zabel, Laurent Pinchart, Hans Verkuil

[-- Attachment #1: Type: text/plain, Size: 12245 bytes --]

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.

-- 
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 <xref linkend="colorspaces" />.</en
  	      <entry>b<subscript>1</subscript></entry>
  	      <entry>b<subscript>0</subscript></entry>
  	    </row>
 +	    <row id="MEDIA-BUS-FMT-RBG888-1X24">
 +	      <entry>MEDIA_BUS_FMT_RBG888_1X24</entry>
 +	      <entry>0x100e</entry>
 +	      <entry></entry>
 +	      &dash-ent-8;
 +	      <entry>r<subscript>7</subscript></entry>
 +	      <entry>r<subscript>6</subscript></entry>
 +	      <entry>r<subscript>5</subscript></entry>
 +	      <entry>r<subscript>4</subscript></entry>
 +	      <entry>r<subscript>3</subscript></entry>
 +	      <entry>r<subscript>2</subscript></entry>
 +	      <entry>r<subscript>1</subscript></entry>
 +	      <entry>r<subscript>0</subscript></entry>
 +	      <entry>b<subscript>7</subscript></entry>
 +	      <entry>b<subscript>6</subscript></entry>
 +	      <entry>b<subscript>5</subscript></entry>
 +	      <entry>b<subscript>4</subscript></entry>
 +	      <entry>b<subscript>3</subscript></entry>
 +	      <entry>b<subscript>2</subscript></entry>
 +	      <entry>b<subscript>1</subscript></entry>
 +	      <entry>b<subscript>0</subscript></entry>
 +	      <entry>g<subscript>7</subscript></entry>
 +	      <entry>g<subscript>6</subscript></entry>
 +	      <entry>g<subscript>5</subscript></entry>
 +	      <entry>g<subscript>4</subscript></entry>
 +	      <entry>g<subscript>3</subscript></entry>
 +	      <entry>g<subscript>2</subscript></entry>
 +	      <entry>g<subscript>1</subscript></entry>
 +	      <entry>g<subscript>0</subscript></entry>
 +	    </row>
+ 	    <row id="MEDIA-BUS-FMT-RGB666-1X24_CPADHI">
+ 	      <entry>MEDIA_BUS_FMT_RGB666_1X24_CPADHI</entry>
+ 	      <entry>0x1015</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-BGR888-1X24">
+ 	      <entry>MEDIA_BUS_FMT_BGR888_1X24</entry>
+ 	      <entry>0x1013</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>b<subscript>7</subscript></entry>
+ 	      <entry>b<subscript>6</subscript></entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	      <entry>g<subscript>7</subscript></entry>
+ 	      <entry>g<subscript>6</subscript></entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>r<subscript>7</subscript></entry>
+ 	      <entry>r<subscript>6</subscript></entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-GBR888-1X24">
+ 	      <entry>MEDIA_BUS_FMT_GBR888_1X24</entry>
+ 	      <entry>0x1014</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>g<subscript>7</subscript></entry>
+ 	      <entry>g<subscript>6</subscript></entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>b<subscript>7</subscript></entry>
+ 	      <entry>b<subscript>6</subscript></entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	      <entry>r<subscript>7</subscript></entry>
+ 	      <entry>r<subscript>6</subscript></entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	    </row>
  	    <row id="MEDIA-BUS-FMT-RGB888-1X24">
  	      <entry>MEDIA_BUS_FMT_RGB888_1X24</entry>
  	      <entry>0x100a</entry>
@@@ -2719,33 -3047,92 +3106,92 @@@
  	      <entry>u<subscript>1</subscript></entry>
  	      <entry>u<subscript>0</subscript></entry>
  	    </row>
 +	    <row id="MEDIA-BUS-FMT-YDYUYDYV8-1X16">
 +	      <entry>MEDIA_BUS_FMT_YDYUYDYV8_1X16</entry>
 +	      <entry>0x2014</entry>
 +	      <entry></entry>
 +	      &dash-ent-16;
 +	      <entry>y<subscript>7</subscript></entry>
 +	      <entry>y<subscript>6</subscript></entry>
 +	      <entry>y<subscript>5</subscript></entry>
 +	      <entry>y<subscript>4</subscript></entry>
 +	      <entry>y<subscript>3</subscript></entry>
 +	      <entry>y<subscript>2</subscript></entry>
 +	      <entry>y<subscript>1</subscript></entry>
 +	      <entry>y<subscript>0</subscript></entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	    </row>
+ 	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
+ 	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
+ 	      <entry>0x2024</entry>
+ 	      <entry></entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>y<subscript>7</subscript></entry>
+ 	      <entry>y<subscript>6</subscript></entry>
+ 	      <entry>y<subscript>5</subscript></entry>
+ 	      <entry>y<subscript>4</subscript></entry>
+ 	      <entry>y<subscript>3</subscript></entry>
+ 	      <entry>y<subscript>2</subscript></entry>
+ 	      <entry>y<subscript>1</subscript></entry>
+ 	      <entry>y<subscript>0</subscript></entry>
+ 	      <entry>u<subscript>7</subscript></entry>
+ 	      <entry>u<subscript>6</subscript></entry>
+ 	      <entry>u<subscript>5</subscript></entry>
+ 	      <entry>u<subscript>4</subscript></entry>
+ 	      <entry>u<subscript>3</subscript></entry>
+ 	      <entry>u<subscript>2</subscript></entry>
+ 	      <entry>u<subscript>1</subscript></entry>
+ 	      <entry>u<subscript>0</subscript></entry>
+ 	      <entry>v<subscript>7</subscript></entry>
+ 	      <entry>v<subscript>6</subscript></entry>
+ 	      <entry>v<subscript>5</subscript></entry>
+ 	      <entry>v<subscript>4</subscript></entry>
+ 	      <entry>v<subscript>3</subscript></entry>
+ 	      <entry>v<subscript>2</subscript></entry>
+ 	      <entry>v<subscript>1</subscript></entry>
+ 	      <entry>v<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-YUV10-1X30">
+ 	      <entry>MEDIA_BUS_FMT_YUV10_1X30</entry>
+ 	      <entry>0x2016</entry>
+ 	      <entry></entry>
 -	      <entry>-</entry>
 -	      <entry>-</entry>
 -	      <entry>y<subscript>9</subscript></entry>
 -	      <entry>y<subscript>8</subscript></entry>
++	      &dash-ent-16;
+ 	      <entry>y<subscript>7</subscript></entry>
+ 	      <entry>y<subscript>6</subscript></entry>
+ 	      <entry>y<subscript>5</subscript></entry>
+ 	      <entry>y<subscript>4</subscript></entry>
+ 	      <entry>y<subscript>3</subscript></entry>
+ 	      <entry>y<subscript>2</subscript></entry>
+ 	      <entry>y<subscript>1</subscript></entry>
+ 	      <entry>y<subscript>0</subscript></entry>
 -	      <entry>u<subscript>9</subscript></entry>
 -	      <entry>u<subscript>8</subscript></entry>
 -	      <entry>u<subscript>7</subscript></entry>
 -	      <entry>u<subscript>6</subscript></entry>
 -	      <entry>u<subscript>5</subscript></entry>
 -	      <entry>u<subscript>4</subscript></entry>
 -	      <entry>u<subscript>3</subscript></entry>
 -	      <entry>u<subscript>2</subscript></entry>
 -	      <entry>u<subscript>1</subscript></entry>
 -	      <entry>u<subscript>0</subscript></entry>
 -	      <entry>v<subscript>9</subscript></entry>
 -	      <entry>v<subscript>8</subscript></entry>
 -	      <entry>v<subscript>7</subscript></entry>
 -	      <entry>v<subscript>6</subscript></entry>
 -	      <entry>v<subscript>5</subscript></entry>
 -	      <entry>v<subscript>4</subscript></entry>
 -	      <entry>v<subscript>3</subscript></entry>
 -	      <entry>v<subscript>2</subscript></entry>
 -	      <entry>v<subscript>1</subscript></entry>
 -	      <entry>v<subscript>0</subscript></entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
  	    </row>
 -	    <row id="MEDIA-BUS-FMT-AYUV8-1X32">
 -	      <entry>MEDIA_BUS_FMT_AYUV8_1X32</entry>
 -	      <entry>0x2017</entry>
 +	    <row>
  	      <entry></entry>
 -	      <entry>a<subscript>7</subscript></entry>
 -	      <entry>a<subscript>6</subscript></entry>
 -	      <entry>a<subscript>5</subscript></entry>
 -	      <entry>a<subscript>4</subscript></entry>
 -	      <entry>a<subscript>3</subscript></entry>
 -	      <entry>a<subscript>2</subscript></entry>
 -	      <entry>a<subscript>1</subscript></entry>
 -	      <entry>a<subscript>0</subscript></entry>
 +	      <entry></entry>
 +	      <entry></entry>
 +	      &dash-ent-16;
  	      <entry>y<subscript>7</subscript></entry>
  	      <entry>y<subscript>6</subscript></entry>
  	      <entry>y<subscript>5</subscript></entry>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-03-01  1:20 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-27  4:36 linux-next: manual merge of the drm tree with the v4l-dvb tree Stephen Rothwell
2018-07-27  7:57 ` Philipp Zabel
2018-07-27 10:32 ` Mauro Carvalho Chehab
  -- strict thread matches above, loose matches on Subject: below --
2022-03-01  1:20 Stephen Rothwell
2017-04-11  0:27 Stephen Rothwell
2016-07-19  1:21 Stephen Rothwell
2016-07-13  2:25 Stephen Rothwell
2015-04-15  3:49 Stephen Rothwell
2015-04-15  9:00 ` Philipp Zabel
2015-04-15  3:33 Stephen Rothwell
2015-04-15  9:09 ` Philipp Zabel
2015-04-17  3:07   ` Dave Airlie
2015-04-17 17:12     ` Philipp Zabel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).