| Message ID | 20190521105151.51ffa942@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-misc tree with Linus' tree | expand |
Hi Sean, On Tue, 21 May 2019 10:51:51 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > from Linus' tree and commits: > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > from the drm-misc tree. > > I fixed it up (I deleted the file and added the patch 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 > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 21 May 2019 10:48:36 +1000 > Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml > index 83ca4816a78b..749e3c3843d0 100644 > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml > @@ -287,6 +287,8 @@ patternProperties: > description: Everest Semiconductor Co. Ltd. > "^everspin,.*": > description: Everspin Technologies, Inc. > + "^evervision,.*": > + description: Evervision Electronics Co. Ltd. > "^exar,.*": > description: Exar Corporation > "^excito,.*": > @@ -851,6 +853,8 @@ patternProperties: > description: Shenzhen Techstar Electronics Co., Ltd. > "^terasic,.*": > description: Terasic Inc. > + "^tfc,.*": > + description: Three Five Corp > "^thine,.*": > description: THine Electronics, Inc. > "^ti,.*": > @@ -925,6 +929,8 @@ patternProperties: > description: Voipac Technologies s.r.o. > "^vot,.*": > description: Vision Optical Technology Co., Ltd. > + "^vxt,.*" > + description: VXT Ltd > "^wd,.*": > description: Western Digital Corp. > "^wetek,.*": > -- > 2.20.1 In doing a back merge of Linus' tree into the drm-misc tree, you seem to have missed the above merge fixup and so lost some of the changes from the above commits.
Hi Stephen, On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > from Linus' tree and commits: > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > from the drm-misc tree. > > I fixed it up (I deleted the file and added the patch 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 > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 21 May 2019 10:48:36 +1000 > Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml > index 83ca4816a78b..749e3c3843d0 100644 > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml > @@ -287,6 +287,8 @@ patternProperties: > description: Everest Semiconductor Co. Ltd. > "^everspin,.*": > description: Everspin Technologies, Inc. > + "^evervision,.*": > + description: Evervision Electronics Co. Ltd. > "^exar,.*": > description: Exar Corporation > "^excito,.*": > @@ -851,6 +853,8 @@ patternProperties: > description: Shenzhen Techstar Electronics Co., Ltd. > "^terasic,.*": > description: Terasic Inc. > + "^tfc,.*": > + description: Three Five Corp > "^thine,.*": > description: THine Electronics, Inc. > "^ti,.*": > @@ -925,6 +929,8 @@ patternProperties: > description: Voipac Technologies s.r.o. > "^vot,.*": > description: Vision Optical Technology Co., Ltd. > + "^vxt,.*" > + description: VXT Ltd I'm not sure whether or not you can change it, but this breaks the users of that file. What you want is: - "^vxt,.*" + "^vxt,.*:" Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Maxime, On Thu, 23 May 2019 10:10:22 +0200 Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > Hi Stephen, > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > Documentation/devicetree/bindings/vendor-prefixes.txt > > > > between commit: > > > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > > > from Linus' tree and commits: > > > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > > > from the drm-misc tree. > > > > I fixed it up (I deleted the file and added the patch 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 > > > > From: Stephen Rothwell <sfr@canb.auug.org.au> > > Date: Tue, 21 May 2019 10:48:36 +1000 > > Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion > > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > > --- > > Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml > > index 83ca4816a78b..749e3c3843d0 100644 > > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml > > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml > > @@ -287,6 +287,8 @@ patternProperties: > > description: Everest Semiconductor Co. Ltd. > > "^everspin,.*": > > description: Everspin Technologies, Inc. > > + "^evervision,.*": > > + description: Evervision Electronics Co. Ltd. > > "^exar,.*": > > description: Exar Corporation > > "^excito,.*": > > @@ -851,6 +853,8 @@ patternProperties: > > description: Shenzhen Techstar Electronics Co., Ltd. > > "^terasic,.*": > > description: Terasic Inc. > > + "^tfc,.*": > > + description: Three Five Corp > > "^thine,.*": > > description: THine Electronics, Inc. > > "^ti,.*": > > @@ -925,6 +929,8 @@ patternProperties: > > description: Voipac Technologies s.r.o. > > "^vot,.*": > > description: Vision Optical Technology Co., Ltd. > > + "^vxt,.*" > > + description: VXT Ltd > > I'm not sure whether or not you can change it, but this breaks the > users of that file. > > What you want is: > > - "^vxt,.*" > + "^vxt,.*:" I have fixed my version (but I put the ':' after the '"' like the others). Thanks for letting me know.
On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > from Linus' tree and commits: > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > from the drm-misc tree. > > I fixed it up (I deleted the file and added the patch 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. I just took your patch and pushed a temp branch there: https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90 Rob, Stephen, are you ok with the change? If so, I'll push it. Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Maxime, On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > Documentation/devicetree/bindings/vendor-prefixes.txt > > > > between commit: > > > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > > > from Linus' tree and commits: > > > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > > > from the drm-misc tree. > > I just took your patch and pushed a temp branch there: > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90 > > Rob, Stephen, are you ok with the change? If so, I'll push it. All that needs to be done is for my patch (slightly corrected) needs to be applied to the drm-misc tree. That tree already has the back merge of Linus' tree and the txt file has been removed (my patch should have been applied as part of the merge resolution but doing it later is fine).
On Thu, May 23, 2019 at 3:04 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi Maxime, > > On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > > > Documentation/devicetree/bindings/vendor-prefixes.txt > > > > > > between commit: > > > > > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > > > > > from Linus' tree and commits: > > > > > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > > > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > > > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > > > > > from the drm-misc tree. > > > > I just took your patch and pushed a temp branch there: > > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90 > > > > Rob, Stephen, are you ok with the change? If so, I'll push it. > > All that needs to be done is for my patch (slightly corrected) needs to > be applied to the drm-misc tree. That tree already has the back merge > of Linus' tree and the txt file has been removed (my patch should have > been applied as part of the merge resolution but doing it later is fine). That commit is on top of drm-misc, and somehow the .txt version has been resurrect in drm-misc-next (so needs to be re-deleted too). -Daniel
Hi Daniel, On Thu, 23 May 2019 15:11:15 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > That commit is on top of drm-misc, and somehow the .txt version has > been resurrect in drm-misc-next (so needs to be re-deleted too). My mistake, the conflict went away (due to the back merge) so my scripts assumed the file no longer needed deleting. I didn't actually check to see if it was still there.
On Thu, May 23, 2019 at 6:54 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > Documentation/devicetree/bindings/vendor-prefixes.txt > > > > between commit: > > > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > > > from Linus' tree and commits: > > > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > > > from the drm-misc tree. > > > > I fixed it up (I deleted the file and added the patch 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. > > I just took your patch and pushed a temp branch there: > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90 > > Rob, Stephen, are you ok with the change? If so, I'll push it. The 'tfc' line is missing a ':' on the end. Does the file pass dt_binding_check like that? Rob
On Thu, May 23, 2019 at 11:10:39AM -0500, Rob Herring wrote: > On Thu, May 23, 2019 at 6:54 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > > > Documentation/devicetree/bindings/vendor-prefixes.txt > > > > > > between commit: > > > > > > 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") > > > > > > from Linus' tree and commits: > > > > > > b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") > > > b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") > > > fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") > > > > > > from the drm-misc tree. > > > > > > I fixed it up (I deleted the file and added the patch 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. > > > > I just took your patch and pushed a temp branch there: > > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90 > > > > Rob, Stephen, are you ok with the change? If so, I'll push it. > > The 'tfc' line is missing a ':' on the end. That's on me, sorry. > Does the file pass dt_binding_check like that? No, it didn't but I overlooked it somehow. I've pushed that patch with the extra semi-column. Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 83ca4816a78b..749e3c3843d0 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -287,6 +287,8 @@ patternProperties: description: Everest Semiconductor Co. Ltd. "^everspin,.*": description: Everspin Technologies, Inc. + "^evervision,.*": + description: Evervision Electronics Co. Ltd. "^exar,.*": description: Exar Corporation "^excito,.*": @@ -851,6 +853,8 @@ patternProperties: description: Shenzhen Techstar Electronics Co., Ltd. "^terasic,.*": description: Terasic Inc. + "^tfc,.*": + description: Three Five Corp "^thine,.*": description: THine Electronics, Inc. "^ti,.*": @@ -925,6 +929,8 @@ patternProperties: description: Voipac Technologies s.r.o. "^vot,.*": description: Vision Optical Technology Co., Ltd. + "^vxt,.*" + description: VXT Ltd "^wd,.*": description: Western Digital Corp. "^wetek,.*":
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") from Linus' tree and commits: b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") from the drm-misc tree. I fixed it up (I deleted the file and added the patch 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.