From: Alexandre TORGUE <alexandre.torgue@foss.st.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>,
Kevin Hilman <khilman@baylibre.com>, SoC Team <soc@kernel.org>,
arm-soc <arm@kernel.org>,
"linux-stm32@st-md-mailman.stormreply.com"
<linux-stm32@st-md-mailman.stormreply.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL] STM32 DT fixes for v5.19 #2
Date: Mon, 4 Jul 2022 09:52:45 +0200 [thread overview]
Message-ID: <a1b80bbf-11a6-d5f7-ce40-04a644039eaa@foss.st.com> (raw)
In-Reply-To: <CAK8P3a2OC=G-gw_Nny-ATj5dHtVcLrGHTK9qvs+QPUw52RWxhw@mail.gmail.com>
On 7/1/22 15:25, Arnd Bergmann wrote:
> On Fri, Jul 1, 2022 at 2:05 PM Alexandre TORGUE
> <alexandre.torgue@foss.st.com> wrote:
>>
>> Hi ARM SoC maintainers,
>>
>> Please consider this second round of STM32 DT fixes for v5.19 cycle. It
>> mainly concerns fixes for SCMI version of ST boards introduced in v5.19-rc1.
>>
>> The following changes since commit ea3414e1249ea35bc02debe28d4cbfeb6261657c:
>>
>> ARM: dts: stm32: move SCMI related nodes in a dedicated file for
>> stm32mp15 (2022-06-07 17:22:21 +0200)
>>
>> are available in the Git repository at:
>
> Hi Alex,
>
> I get a merge conflict because I had picked up the "ARM: dts: stm32: move SCMI
> related nodes in a dedicated file for stm32mp15" commit from the mailing
> list, so it now has a different commit ID from the one you are based on.
>
> As far as I can tell, the patches are identical, but since the files
> are modified
> further in your tree, this confuses the git merge algorithm and leads to a
> somewhat ugly git history with two identical commits if I fix it up.
>
> Can you rebase this pull request on top of v5.19-rc4 and resend?
> (note: don't rebase the non-fixes pull requests unless you have to).
Hi Arnd,
No pb, I'm going to send a v2. If it is not an issue for you, I would
prefer to rebase also the stm32-next to avoid conflicts during the merge
on your side.
Alex
>
> Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-07-04 7:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 12:05 [GIT PULL] STM32 DT fixes for v5.19 #2 Alexandre TORGUE
2022-07-01 13:25 ` Arnd Bergmann
2022-07-04 7:52 ` Alexandre TORGUE [this message]
2022-07-04 12:30 ` Arnd Bergmann
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=a1b80bbf-11a6-d5f7-ce40-04a644039eaa@foss.st.com \
--to=alexandre.torgue@foss.st.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=olof@lixom.net \
--cc=soc@kernel.org \
/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).