From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Rob Herring <robherring2@gmail•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Rob Herring <robh@kernel•org>,
Brian Masney <masneyb@onstation•org>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>
Subject: Re: linux-next: manual merge of the staging tree with the devicetree tree
Date: Fri, 27 Jul 2018 10:36:36 +0200 [thread overview]
Message-ID: <20180727083636.GB17942@kroah.com> (raw)
In-Reply-To: <20180727175300.0a1fb512@canb.auug.org.au>
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
next prev parent reply other threads:[~2018-07-27 8:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
-- 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180727083636.GB17942@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masneyb@onstation$(echo .)org \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox