All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sudeep Holla <sudeep.holla@arm.com>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Olof Johansson <olof@lixom.net>, ARM SoC Team <arm@kernel.org>,
	SoC Team <soc@kernel.org>, Sudeep Holla <sudeep.holla@arm.com>,
	ALKML <linux-arm-kernel@lists.infradead.org>,
	Cristian Marussi <cristian.marussi@arm.com>
Subject: Re: [GIT PULL] firmware: arm_scmi: Updates for v5.17
Date: Tue, 8 Feb 2022 11:34:57 +0000	[thread overview]
Message-ID: <20220208113457.waf4fdujnbtvneka@bogus> (raw)
In-Reply-To: <CAK8P3a1Xq0O83PF1U-CcQTzAdaLuuxoLN=p+nC-ZjEbzAjPwSA@mail.gmail.com>

On Tue, Feb 08, 2022 at 12:14:25PM +0100, Arnd Bergmann wrote:
> On Tue, Feb 8, 2022 at 11:33 AM Sudeep Holla <sudeep.holla@arm.com> wrote:
> > On Tue, Feb 08, 2022 at 11:00:43AM +0100, Arnd Bergmann wrote:
> > > As the contents are still fine, I could offer to either merge the branch again
> > > for v5.18, or I can drop it and wait for a new pull request from you, please
> > > let me know your preference.
> > >
> >
> > Is it OK if I merge this tag with v5.17-rc1 as base and load it with any
> > new v5.18 material on the top ? I just want to avoid rebasing as the same time
> > some of the new material depend on these changes. Let me know if that
> > is fine. I am open to any other suggestions too.
> 
> Yes, I think that is ok, as long as you start a branch from v5.17-rc1 and merge
> the old contents into the new branch, rather than back-merging the -rc1 tag
> into your existing branch. This way, the git history still makes sense
> across the merges.

Thanks for confirming my understanding.

-- 
Regards,
Sudeep

WARNING: multiple messages have this Message-ID (diff)
From: Sudeep Holla <sudeep.holla@arm.com>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Olof Johansson <olof@lixom.net>, ARM SoC Team <arm@kernel.org>,
	SoC Team <soc@kernel.org>, Sudeep Holla <sudeep.holla@arm.com>,
	ALKML <linux-arm-kernel@lists.infradead.org>,
	Cristian Marussi <cristian.marussi@arm.com>
Subject: Re: [GIT PULL] firmware: arm_scmi: Updates for v5.17
Date: Tue, 8 Feb 2022 11:34:57 +0000	[thread overview]
Message-ID: <20220208113457.waf4fdujnbtvneka@bogus> (raw)
In-Reply-To: <CAK8P3a1Xq0O83PF1U-CcQTzAdaLuuxoLN=p+nC-ZjEbzAjPwSA@mail.gmail.com>

On Tue, Feb 08, 2022 at 12:14:25PM +0100, Arnd Bergmann wrote:
> On Tue, Feb 8, 2022 at 11:33 AM Sudeep Holla <sudeep.holla@arm.com> wrote:
> > On Tue, Feb 08, 2022 at 11:00:43AM +0100, Arnd Bergmann wrote:
> > > As the contents are still fine, I could offer to either merge the branch again
> > > for v5.18, or I can drop it and wait for a new pull request from you, please
> > > let me know your preference.
> > >
> >
> > Is it OK if I merge this tag with v5.17-rc1 as base and load it with any
> > new v5.18 material on the top ? I just want to avoid rebasing as the same time
> > some of the new material depend on these changes. Let me know if that
> > is fine. I am open to any other suggestions too.
> 
> Yes, I think that is ok, as long as you start a branch from v5.17-rc1 and merge
> the old contents into the new branch, rather than back-merging the -rc1 tag
> into your existing branch. This way, the git history still makes sense
> across the merges.

Thanks for confirming my understanding.

-- 
Regards,
Sudeep

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

  reply	other threads:[~2022-02-08 11:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-22 14:13 [GIT PULL] firmware: arm_scmi: Updates for v5.17 Sudeep Holla
2021-12-22 14:13 ` Sudeep Holla
2022-01-07 11:37 ` Sudeep Holla
2022-01-07 11:37   ` Sudeep Holla
2022-01-08 20:24   ` Olof Johansson
2022-01-08 20:24     ` Olof Johansson
2022-02-08 10:00     ` Arnd Bergmann
2022-02-08 10:00       ` Arnd Bergmann
2022-02-08 10:33       ` Sudeep Holla
2022-02-08 10:33         ` Sudeep Holla
2022-02-08 11:14         ` Arnd Bergmann
2022-02-08 11:14           ` Arnd Bergmann
2022-02-08 11:34           ` Sudeep Holla [this message]
2022-02-08 11:34             ` Sudeep Holla
2022-01-08 22:00 ` patchwork-bot+linux-soc

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=20220208113457.waf4fdujnbtvneka@bogus \
    --to=sudeep.holla@arm.com \
    --cc=arm@kernel.org \
    --cc=arnd@kernel.org \
    --cc=cristian.marussi@arm.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.