Message ID | 20201124122412.22386-1-sudeep.holla@arm.com |
---|---|
State | New |
Headers | show |
Series | [GIT,PULL] firmware: arm_scmi: Updates for v5.11 | expand |
On Tue, Nov 24, 2020 at 1:24 PM Sudeep Holla <sudeep.holla@arm.com> wrote: > > Hi ARM SoC Team, > > Please pull ! The tag is based on v5.10-rc2 to avoid conflicts with > the fixes that got merged in -rc2. Is there no way to avoid this? I would really prefer not to have to backmerge rc2 into my existing branch if it's just about the bugfix. I tried rebasing your branch onto -rc2 and only got a trivial conflict in one line, and even that could be avoided by merging in your bugfix branch instead of the whole -rc2. Arnd
On Thu, Nov 26, 2020 at 09:54:50PM +0100, Arnd Bergmann wrote: > On Tue, Nov 24, 2020 at 1:24 PM Sudeep Holla <sudeep.holla@arm.com> wrote: > > > > Hi ARM SoC Team, > > > > Please pull ! The tag is based on v5.10-rc2 to avoid conflicts with > > the fixes that got merged in -rc2. > > Is there no way to avoid this? I would really prefer not to have to backmerge > rc2 into my existing branch if it's just about the bugfix. > > I tried rebasing your branch onto -rc2 and only got a trivial conflict > in one line, and even that could be avoided by merging in your > bugfix branch instead of the whole -rc2. > Unfortunately the branch/tag I shared with Mark Brown to merge the voltage regulator part is also based on -rc2. I might have to drop those patches from this pull request if I need to rebase on -rc1. If that's OK, I can send fresh/new PR based on -rc1. Sorry for the trouble.
On Fri, Nov 27, 2020 at 11:00 AM Sudeep Holla <sudeep.holla@arm.com> wrote: > On Thu, Nov 26, 2020 at 09:54:50PM +0100, Arnd Bergmann wrote: > > On Tue, Nov 24, 2020 at 1:24 PM Sudeep Holla <sudeep.holla@arm.com> wrote: > > > > > > Hi ARM SoC Team, > > > > > > Please pull ! The tag is based on v5.10-rc2 to avoid conflicts with > > > the fixes that got merged in -rc2. > > > > Is there no way to avoid this? I would really prefer not to have to backmerge > > rc2 into my existing branch if it's just about the bugfix. > > > > I tried rebasing your branch onto -rc2 and only got a trivial conflict > > in one line, and even that could be avoided by merging in your > > bugfix branch instead of the whole -rc2. > > > > Unfortunately the branch/tag I shared with Mark Brown to merge the voltage > regulator part is also based on -rc2. I might have to drop those patches > from this pull request if I need to rebase on -rc1. If that's OK, I can > send fresh/new PR based on -rc1. Sorry for the trouble. I ended up doing the backmerge of v5.10-rc2 into arm/drivers and merged your tag on top of that. I'll have to remember filtering out the changes when I send my pull request to Linus, but otherwise this seems like the lesser evil. Arnd
On Fri, Nov 27, 2020 at 09:09:27PM +0100, Arnd Bergmann wrote: > On Fri, Nov 27, 2020 at 11:00 AM Sudeep Holla <sudeep.holla@arm.com> wrote: > > On Thu, Nov 26, 2020 at 09:54:50PM +0100, Arnd Bergmann wrote: > > > On Tue, Nov 24, 2020 at 1:24 PM Sudeep Holla <sudeep.holla@arm.com> wrote: > > > > > > > > Hi ARM SoC Team, > > > > > > > > Please pull ! The tag is based on v5.10-rc2 to avoid conflicts with > > > > the fixes that got merged in -rc2. > > > > > > Is there no way to avoid this? I would really prefer not to have to backmerge > > > rc2 into my existing branch if it's just about the bugfix. > > > > > > I tried rebasing your branch onto -rc2 and only got a trivial conflict > > > in one line, and even that could be avoided by merging in your > > > bugfix branch instead of the whole -rc2. > > > > > > > Unfortunately the branch/tag I shared with Mark Brown to merge the voltage > > regulator part is also based on -rc2. I might have to drop those patches > > from this pull request if I need to rebase on -rc1. If that's OK, I can > > send fresh/new PR based on -rc1. Sorry for the trouble. > > I ended up doing the backmerge of v5.10-rc2 into arm/drivers and merged > your tag on top of that. I'll have to remember filtering out the changes > when I send my pull request to Linus, but otherwise this seems like > the lesser evil. > Thanks and extremely sorry for the trouble. I always try to base on -rc1. Since I had seen Arm SoC pull requests on -rc2 sometimes due to other dependencies, I thought -rc2 wasn't too bad. I will try to stick with -rc1 or fixes tag in future to keep it simple.