From: Thierry Reding <thierry.reding@gmail.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>,
Benjamin Gaignard <benjamin.gaignard@st.com>,
Fabrice Gasnier <fabrice.gasnier@st.com>
Subject: Re: linux-next: manual merge of the pwm tree with the devicetree tree
Date: Fri, 15 Nov 2019 10:41:41 +0100 [thread overview]
Message-ID: <20191115094141.GA825257@ulmo> (raw)
In-Reply-To: <20191115154456.244c27e4@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]
On Fri, Nov 15, 2019 at 03:44:56PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pwm tree got a conflict in:
>
> Documentation/devicetree/bindings/pwm/pwm-stm32.txt
>
> between commit:
>
> 56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to json-schema")
>
> from the devicetree tree and commit:
>
> 4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state")
>
> from the pwm tree.
>
> I fixed it up (I just deleted the file - more fixup is probably required)
> 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.
It should be trivial to rewrite the sleep state patch on top of the
json-schema conversion and then take that version into the devicetree
tree.
Fabrice, can you resend that patch based on the devicetree tree?
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-11-15 9:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 4:44 linux-next: manual merge of the pwm tree with the devicetree tree Stephen Rothwell
2019-11-15 9:41 ` Thierry Reding [this message]
2019-11-15 9:56 ` Benjamin GAIGNARD
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=20191115094141.GA825257@ulmo \
--to=thierry.reding@gmail.com \
--cc=benjamin.gaignard@st.com \
--cc=fabrice.gasnier@st.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robherring2@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).