* [ptxdist] [PATCH] host-dtc: remove old patch for version 1.6.0
@ 2022-04-05 15:57 Bruno Thomsen
2022-04-08 13:36 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Bruno Thomsen @ 2022-04-05 15:57 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen, bth
After version bumping default host-dtc version from 1.6.0 to 1.6.1 there
was left an old patch for 1.6.0. Removing the patch so we don't collect
clutter.
Fixes: 89a84394677e ("host-dtc: version bump 1.6.0 to 1.6.1")
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
.../0001-fdtdump-Fix-gcc11-warning.patch | 30 -------------------
patches/dtc-v1.6.0/series | 4 ---
2 files changed, 34 deletions(-)
delete mode 100644 patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
delete mode 100644 patches/dtc-v1.6.0/series
diff --git a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch b/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
deleted file mode 100644
index 052419940a15..000000000000
--- a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Wed, 6 Jan 2021 14:52:26 +1100
-Subject: [PATCH] fdtdump: Fix gcc11 warning
-
-In one place, fdtdump abuses fdt_set_magic(), passing it just a small char
-array instead of the full fdt header it expects. That's relying on the
-fact that in fact fdt_set_magic() will only actually access the first 4
-bytes of the buffer.
-
-This trips a new warning in GCC 11 - and it's entirely possible it was
-always UB. So, don't do that.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- fdtdump.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fdtdump.c b/fdtdump.c
-index 9613befede71..d9fb374a59be 100644
---- a/fdtdump.c
-+++ b/fdtdump.c
-@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
- char *p = buf;
- char *endp = buf + len;
-
-- fdt_set_magic(smagic, FDT_MAGIC);
-+ fdt32_st(smagic, FDT_MAGIC);
-
- /* poor man's memmem */
- while ((endp - p) >= FDT_MAGIC_SIZE) {
diff --git a/patches/dtc-v1.6.0/series b/patches/dtc-v1.6.0/series
deleted file mode 100644
index a7e9d0319ba0..000000000000
--- a/patches/dtc-v1.6.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fdtdump-Fix-gcc11-warning.patch
-# cb5c26c7ab3ae2082ecff7af4de4e8c5 - git-ptx-patches magic
base-commit: 3114ee08bf379afd475d1379299b2edbb8e1acd4
--
2.35.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] host-dtc: remove old patch for version 1.6.0
2022-04-05 15:57 [ptxdist] [PATCH] host-dtc: remove old patch for version 1.6.0 Bruno Thomsen
@ 2022-04-08 13:36 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-04-08 13:36 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 824e3cb42a32570eec4217ebdad0ed9e6862dc77.
Michael
[sent from post-receive hook]
On Fri, 08 Apr 2022 15:36:05 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> After version bumping default host-dtc version from 1.6.0 to 1.6.1 there
> was left an old patch for 1.6.0. Removing the patch so we don't collect
> clutter.
>
> Fixes: 89a84394677e ("host-dtc: version bump 1.6.0 to 1.6.1")
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20220405155701.15497-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch b/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
> deleted file mode 100644
> index 052419940a15..000000000000
> --- a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From: David Gibson <david@gibson.dropbear.id.au>
> -Date: Wed, 6 Jan 2021 14:52:26 +1100
> -Subject: [PATCH] fdtdump: Fix gcc11 warning
> -
> -In one place, fdtdump abuses fdt_set_magic(), passing it just a small char
> -array instead of the full fdt header it expects. That's relying on the
> -fact that in fact fdt_set_magic() will only actually access the first 4
> -bytes of the buffer.
> -
> -This trips a new warning in GCC 11 - and it's entirely possible it was
> -always UB. So, don't do that.
> -
> -Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ----
> - fdtdump.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/fdtdump.c b/fdtdump.c
> -index 9613befede71..d9fb374a59be 100644
> ---- a/fdtdump.c
> -+++ b/fdtdump.c
> -@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
> - char *p = buf;
> - char *endp = buf + len;
> -
> -- fdt_set_magic(smagic, FDT_MAGIC);
> -+ fdt32_st(smagic, FDT_MAGIC);
> -
> - /* poor man's memmem */
> - while ((endp - p) >= FDT_MAGIC_SIZE) {
> diff --git a/patches/dtc-v1.6.0/series b/patches/dtc-v1.6.0/series
> deleted file mode 100644
> index a7e9d0319ba0..000000000000
> --- a/patches/dtc-v1.6.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-fdtdump-Fix-gcc11-warning.patch
> -# cb5c26c7ab3ae2082ecff7af4de4e8c5 - git-ptx-patches magic
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-08 13:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-05 15:57 [ptxdist] [PATCH] host-dtc: remove old patch for version 1.6.0 Bruno Thomsen
2022-04-08 13:36 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox