From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Geoff Levand <geoff@infradead.org>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH] package/flannel: Bump to version 0.25.1
Date: Mon, 6 May 2024 22:27:06 +0200 [thread overview]
Message-ID: <20240506222706.157b4045@windsurf> (raw)
In-Reply-To: <f6398ca5-a3b5-48a2-ade8-d31b363ca937@infradead.org>
On Wed, 1 May 2024 11:53:05 +0900
Geoff Levand <geoff@infradead.org> wrote:
> Signed-off-by: Geoff Levand <geoff@infradead.org>
>
> diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash
> index 2e0198debe..97700d37ec 100644
> --- a/package/flannel/flannel.hash
> +++ b/package/flannel/flannel.hash
> @@ -1,3 +1,3 @@
> # Locally computed:
> -sha256 98dde4eda016fec9aa6394cb4b283bdd972deda6ef9e1f2c3669dd2719ea1fe9 flannel-0.24.4.tar.gz
> +sha256 c0de130efa2b14bc0f057a17df07bfd61154b30ce4a5eca24594c5b533ce661d flannel-0.25.1.tar.gz
> sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
> diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk
> index 5cdfa0e09e..aa24644764 100644
> --- a/package/flannel/flannel.mk
> +++ b/package/flannel/flannel.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -FLANNEL_VERSION = 0.24.4
> +FLANNEL_VERSION = 0.25.1
This was not applying on master, because you created this commit on top
of your previous 0.24.2 -> 0.24.4 bump, which still had not been
applied to master. So when something like this happen, we ideally
expect you to mark your previous patch as Changes Requested, and then
submit a brand new patch that does the 0.24.2 -> 0.25.1 in one go.
I fixed up the conflicts when applying, and pushed to master. Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2024-05-06 20:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-01 2:53 [Buildroot] [PATCH] package/flannel: Bump to version 0.25.1 Geoff Levand
2024-05-06 20:27 ` Thomas Petazzoni via buildroot [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=20240506222706.157b4045@windsurf \
--to=buildroot@buildroot.org \
--cc=geoff@infradead.org \
--cc=thomas.petazzoni@bootlin.com \
/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