* linux-next: manual merge of the staging tree with the devicetree tree
@ 2018-07-27 7:53 Stephen Rothwell
2018-07-27 8:36 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2018-07-27 7:53 UTC (permalink / raw)
To: Greg KH, Rob Herring
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rob Herring,
Brian Masney, Jonathan Cameron
[-- Attachment #1: Type: text/plain, Size: 1682 bytes --]
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/devicetree/bindings/iio/pressure/bmp085.txt
between commit:
791d3ef2e111 ("dt-bindings: remove 'interrupt-parent' from bindings")
from the devicetree tree and commit:
d2b863baf1c7 ("iio: pressure: bmp280: remove unused options from device tree documentation")
from the staging 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/devicetree/bindings/iio/pressure/bmp085.txt
index 5498b0688b6f,abcab02504fb..000000000000
--- a/Documentation/devicetree/bindings/iio/pressure/bmp085.txt
+++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.txt
@@@ -8,10 -8,7 +8,6 @@@ Required properties
"bosch,bme280"
Optional properties:
- - chip-id: configurable chip id for non-default chip revisions
- - temp-measurement-period: temperature measurement period (milliseconds)
- - default-oversampling: default oversampling value to be used at startup,
- value range is 0-3 with rising sensitivity.
-- interrupt-parent: should be the phandle for the interrupt controller
- interrupts: interrupt mapping for IRQ
- reset-gpios: a GPIO line handling reset of the sensor: as the line is
active low, it should be marked GPIO_ACTIVE_LOW (see gpio/gpio.txt)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the devicetree tree
2018-07-27 7:53 linux-next: manual merge of the staging tree with the devicetree tree Stephen Rothwell
@ 2018-07-27 8:36 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2018-07-27 8:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rob Herring, Linux-Next Mailing List, Linux Kernel Mailing List,
Rob Herring, Brian Masney, Jonathan Cameron
On Fri, Jul 27, 2018 at 05:53:13PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> Documentation/devicetree/bindings/iio/pressure/bmp085.txt
>
> between commit:
>
> 791d3ef2e111 ("dt-bindings: remove 'interrupt-parent' from bindings")
>
> from the devicetree tree and commit:
>
> d2b863baf1c7 ("iio: pressure: bmp280: remove unused options from device tree documentation")
>
> from the staging 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/devicetree/bindings/iio/pressure/bmp085.txt
> index 5498b0688b6f,abcab02504fb..000000000000
> --- a/Documentation/devicetree/bindings/iio/pressure/bmp085.txt
> +++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.txt
> @@@ -8,10 -8,7 +8,6 @@@ Required properties
> "bosch,bme280"
>
> Optional properties:
> - - chip-id: configurable chip id for non-default chip revisions
> - - temp-measurement-period: temperature measurement period (milliseconds)
> - - default-oversampling: default oversampling value to be used at startup,
> - value range is 0-3 with rising sensitivity.
> -- interrupt-parent: should be the phandle for the interrupt controller
> - interrupts: interrupt mapping for IRQ
> - reset-gpios: a GPIO line handling reset of the sensor: as the line is
> active low, it should be marked GPIO_ACTIVE_LOW (see gpio/gpio.txt)
Looks correct to me, thanks!
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the devicetree tree
2020-10-06 7:49 Stephen Rothwell
@ 2020-10-06 8:18 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2020-10-06 8:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rob Herring, Jonathan Cameron, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Oct 06, 2020 at 06:49:44PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
>
> between commit:
>
> 41fb845621ea ("dt-bindings: Another round of adding missing 'additionalProperties'")
>
> from the devicetree tree and commit:
>
> 3b17dd220432 ("dt-bindings: iio: adc: exynos-adc: require second interrupt with touch screen")
>
> from the staging 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/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
> index 16d76482b4ff,37d6591ff78c..000000000000
> --- a/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
> +++ b/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
> @@@ -107,8 -109,15 +109,17 @@@ allOf
> items:
> - const: adc
>
> + - if:
> + required:
> + - has-touchscreen
> + then:
> + properties:
> + interrupts:
> + minItems: 2
> + maxItems: 2
> +
> +additionalProperties: false
> +
> examples:
> - |
> adc: adc@12d10000 {
Looks good to me, thanks!
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the staging tree with the devicetree tree
@ 2020-10-06 7:49 Stephen Rothwell
2020-10-06 8:18 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2020-10-06 7:49 UTC (permalink / raw)
To: Greg KH, Rob Herring
Cc: Jonathan Cameron, Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1449 bytes --]
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
between commit:
41fb845621ea ("dt-bindings: Another round of adding missing 'additionalProperties'")
from the devicetree tree and commit:
3b17dd220432 ("dt-bindings: iio: adc: exynos-adc: require second interrupt with touch screen")
from the staging 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/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
index 16d76482b4ff,37d6591ff78c..000000000000
--- a/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
@@@ -107,8 -109,15 +109,17 @@@ allOf
items:
- const: adc
+ - if:
+ required:
+ - has-touchscreen
+ then:
+ properties:
+ interrupts:
+ minItems: 2
+ maxItems: 2
+
+additionalProperties: false
+
examples:
- |
adc: adc@12d10000 {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the devicetree tree
2017-01-20 8:30 ` Greg KH
@ 2017-01-20 17:24 ` Jonathan Cameron
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2017-01-20 17:24 UTC (permalink / raw)
To: Greg KH, Rob Herring
Cc: Stephen Rothwell, linux-next, linux-kernel, Marek Vasut,
Matt Ranostay, Jonathan Cameron
On 20 January 2017 08:30:22 GMT+00:00, Greg KH <greg@kroah.com> wrote:
>On Thu, Jan 19, 2017 at 09:17:01PM -0600, Rob Herring wrote:
>> On Thu, Jan 19, 2017 at 8:55 PM, Stephen Rothwell
><sfr@canb.auug.org.au> wrote:
>> > Hi Greg,
>> >
>> > Today's linux-next merge of the staging tree got a conflict in:
>> >
>> > Documentation/devicetree/bindings/vendor-prefixes.txt
>> >
>> > between commit:
>> >
>> > 566088d1d2a0 ("devicetree: Add Fujitsu Ltd. vendor prefix")
>> >
>> > from the devicetree tree and commit:
>> >
>> > 9b27c270d403 ("devicetree: add Garmin vendor prefix")
>> >
>> > from the staging 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/devicetree/bindings/vendor-prefixes.txt
>> > index 14fd1c24e1f0,b34463b12382..000000000000
>> > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
>> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
>> > @@@ -107,7 -108,7 +108,8 @@@ firefly Firefl
>> > focaltech FocalTech Systems Co.,Ltd
>> > friendlyarm Guangzhou FriendlyARM Computer Tech Co., Ltd
>> > fsl Freescale Semiconductor
>> > +fujitsu Fujitsu Ltd.
>> > + grmn Garmin Limited
>>
>> Ugg. This didn't get sorted correctly when changed from garmin to
>grmn...
>
>Ick, sorry I missed that, I'll go queue up a patch to fix it in the
>staging tree.
>
>greg k-h
Me too. Thanks for sorting!
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the devicetree tree
2017-01-20 3:17 ` Rob Herring
@ 2017-01-20 8:30 ` Greg KH
2017-01-20 17:24 ` Jonathan Cameron
0 siblings, 1 reply; 8+ messages in thread
From: Greg KH @ 2017-01-20 8:30 UTC (permalink / raw)
To: Rob Herring
Cc: Stephen Rothwell, linux-next, linux-kernel, Marek Vasut,
Matt Ranostay, Jonathan Cameron
On Thu, Jan 19, 2017 at 09:17:01PM -0600, Rob Herring wrote:
> On Thu, Jan 19, 2017 at 8:55 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in:
> >
> > Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
> >
> > 566088d1d2a0 ("devicetree: Add Fujitsu Ltd. vendor prefix")
> >
> > from the devicetree tree and commit:
> >
> > 9b27c270d403 ("devicetree: add Garmin vendor prefix")
> >
> > from the staging 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/devicetree/bindings/vendor-prefixes.txt
> > index 14fd1c24e1f0,b34463b12382..000000000000
> > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> > @@@ -107,7 -108,7 +108,8 @@@ firefly Firefl
> > focaltech FocalTech Systems Co.,Ltd
> > friendlyarm Guangzhou FriendlyARM Computer Tech Co., Ltd
> > fsl Freescale Semiconductor
> > +fujitsu Fujitsu Ltd.
> > + grmn Garmin Limited
>
> Ugg. This didn't get sorted correctly when changed from garmin to grmn...
Ick, sorry I missed that, I'll go queue up a patch to fix it in the
staging tree.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the devicetree tree
2017-01-20 2:55 Stephen Rothwell
@ 2017-01-20 3:17 ` Rob Herring
2017-01-20 8:30 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Rob Herring @ 2017-01-20 3:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Marek Vasut, Matt Ranostay,
Jonathan Cameron
On Thu, Jan 19, 2017 at 8:55 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 566088d1d2a0 ("devicetree: Add Fujitsu Ltd. vendor prefix")
>
> from the devicetree tree and commit:
>
> 9b27c270d403 ("devicetree: add Garmin vendor prefix")
>
> from the staging 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/devicetree/bindings/vendor-prefixes.txt
> index 14fd1c24e1f0,b34463b12382..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -107,7 -108,7 +108,8 @@@ firefly Firefl
> focaltech FocalTech Systems Co.,Ltd
> friendlyarm Guangzhou FriendlyARM Computer Tech Co., Ltd
> fsl Freescale Semiconductor
> +fujitsu Fujitsu Ltd.
> + grmn Garmin Limited
Ugg. This didn't get sorted correctly when changed from garmin to grmn...
> ge General Electric Company
> geekbuying GeekBuying
> gef GE Fanuc Intelligent Platforms Embedded Systems, Inc.
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the staging tree with the devicetree tree
@ 2017-01-20 2:55 Stephen Rothwell
2017-01-20 3:17 ` Rob Herring
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2017-01-20 2:55 UTC (permalink / raw)
To: Greg KH, Rob Herring
Cc: linux-next, linux-kernel, Marek Vasut, Matt Ranostay, Jonathan Cameron
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
566088d1d2a0 ("devicetree: Add Fujitsu Ltd. vendor prefix")
from the devicetree tree and commit:
9b27c270d403 ("devicetree: add Garmin vendor prefix")
from the staging 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/devicetree/bindings/vendor-prefixes.txt
index 14fd1c24e1f0,b34463b12382..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -107,7 -108,7 +108,8 @@@ firefly Firefl
focaltech FocalTech Systems Co.,Ltd
friendlyarm Guangzhou FriendlyARM Computer Tech Co., Ltd
fsl Freescale Semiconductor
+fujitsu Fujitsu Ltd.
+ grmn Garmin Limited
ge General Electric Company
geekbuying GeekBuying
gef GE Fanuc Intelligent Platforms Embedded Systems, Inc.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-10-06 8:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-27 7:53 linux-next: manual merge of the staging tree with the devicetree tree Stephen Rothwell
2018-07-27 8:36 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2020-10-06 7:49 Stephen Rothwell
2020-10-06 8:18 ` Greg KH
2017-01-20 2:55 Stephen Rothwell
2017-01-20 3:17 ` Rob Herring
2017-01-20 8:30 ` Greg KH
2017-01-20 17:24 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.