Re: [GIT PULL] STM32 DT changes for v4.21 #1

On Wed, Jan 30, 2019 at 5:45 PM Alexandre Torgue
[off-list ref] wrote:

On 1/30/19 5:29 PM, Arnd Bergmann wrote:

quoted

On Tue, Jan 8, 2019 at 9:42 AM Alexandre Torgue [off-list ref] wrote:

quoted

On 1/8/19 8:29 AM, Alexandre Torgue wrote:

quoted

On 12/3/18 12:18 PM, Alexandre Torgue wrote:

quoted

Hi Arnd, Olof and Kevin,

Please consider this first round of STM32 DT updates for v4.21.

Thanks.
Alex

This PR has not been merged in 5.0-rc1. Is there an issue (except than
v4.21 doesn't exist :)) ?
If not, is it possible to get it in next 5.0 rc ?

Sorry for the last post. I completely missed Olof answer:

"I think you might have missed pushing the tag to the remote?
-Olof
"

My tag is now pushed. Is there a chance to get it in next RC ?

I noticed this we were still missing this one, but it's clearly too
late now for 5.0 now, so I've pulled it into arm/dt for 5.1 now.

Sure it's too late :) and no pb. I planned to resend it for 5.1 so
thanks to have already taken it. One question, I have a (small) PR to
send for 5.1 this week. what is the best for you: base it on top of
arm/dt ? or rebase the one for 5.0 on 5.1 and make my PR on top of it ?

You should never rebase a branch that was already merged somewhere,
and I also wouldn't base one of your branches on top of mine.

What I'd recommend instead is to base your new work on top of
the branch I just pulled. If you also need stuff from 5.0-rc1, then
start with that and merge stm32-dt-for-v4.21-1 into that, followed
by your new work on top (note: don't merge 5.0-rc1 into
stm32-dt-for-v4.21-1 though, that would lead to a confusing
git history).

      Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel