Thanks, applied as 824e3cb42a32570eec4217ebdad0ed9e6862dc77. Michael
[sent from post-receive hook] On Fri, 08 Apr 2022 15:36:05 +0200, Bruno Thomsen <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 <[email protected]> > -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 <[email protected]> > ---- > - 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
