From: Sudeep Holla <sudeep.holla@arm.com>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Kevin Hilman <khilman@kernel.org>,
SoC Team <soc@kernel.org>, ARM SoC Team <arm@kernel.org>,
Sudeep Holla <sudeep.holla@arm.com>,
Olof Johansson <olof@lixom.net>,
ALKML <linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL] firmware: arm_scmi: Updates for v5.11
Date: Sat, 28 Nov 2020 08:34:36 +0000 [thread overview]
Message-ID: <20201128083436.c5cgygkas34mtnkd@bogus> (raw)
In-Reply-To: <CAK8P3a07J7dUxd4v9ks0uV6RB5gbzC84f1rBRpuXVrtbXSE9mQ@mail.gmail.com>
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.
--
Regards,
Sudeep
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2020-11-28 8:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 12:24 [GIT PULL] firmware: arm_scmi: Updates for v5.11 Sudeep Holla
2020-11-26 20:54 ` Arnd Bergmann
2020-11-27 10:00 ` Sudeep Holla
2020-11-27 20:09 ` Arnd Bergmann
2020-11-28 8:34 ` Sudeep Holla [this message]
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=20201128083436.c5cgygkas34mtnkd@bogus \
--to=sudeep.holla@arm.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--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