diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-15 08:06:56 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-15 08:06:56 +0100 |
| commit | 2d026f3438e68d05e3dcfc79fd5d29690614a6cb (patch) | |
| tree | 3074cb31ee4a8e25f71dd369c13b60828548e4c9 | |
| parent | 5c165c88898fa679284912e6623aa962e4fa687d (diff) | |
| parent | 86e3b7659f412755f5ac538d82567095b0863ffd (diff) | |
| download | kernel-2d026f3438e68d05e3dcfc79fd5d29690614a6cb.tar.gz kernel-2d026f3438e68d05e3dcfc79fd5d29690614a6cb.tar.xz kernel-2d026f3438e68d05e3dcfc79fd5d29690614a6cb.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc5.git1.2.vanilla.knurd.1.fc29kernel-4.16.0-0.rc5.git1.2.vanilla.knurd.1.fc28kernel-4.16.0-0.rc5.git1.2.vanilla.knurd.1.fc27kernel-4.16.0-0.rc5.git1.2.vanilla.knurd.1.fc26
| -rw-r--r-- | 0001-Temporarily-work-around-gcc-aliasing-warning-error.patch | 27 | ||||
| -rw-r--r-- | kernel.spec | 7 |
2 files changed, 33 insertions, 1 deletions
diff --git a/0001-Temporarily-work-around-gcc-aliasing-warning-error.patch b/0001-Temporarily-work-around-gcc-aliasing-warning-error.patch new file mode 100644 index 000000000..24302d2ec --- /dev/null +++ b/0001-Temporarily-work-around-gcc-aliasing-warning-error.patch @@ -0,0 +1,27 @@ +From 991b5e95d4fe7778c8f5e7d7f478d01134d51ca7 Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Wed, 14 Mar 2018 14:20:02 -0700 +Subject: [PATCH] Temporarily work around gcc aliasing warning/error + +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + tools/lib/str_error_r.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/lib/str_error_r.c b/tools/lib/str_error_r.c +index d6d65537b0d9..c0ede4f6adae 100644 +--- a/tools/lib/str_error_r.c ++++ b/tools/lib/str_error_r.c +@@ -21,7 +21,8 @@ + char *str_error_r(int errnum, char *buf, size_t buflen) + { + int err = strerror_r(errnum, buf, buflen); ++ void *temp = buf; + if (err) +- snprintf(buf, buflen, "INTERNAL ERROR: strerror_r(%d, %p, %zd)=%d", errnum, buf, buflen, err); ++ snprintf(buf, buflen, "INTERNAL ERROR: strerror_r(%d, %p, %zd)=%d", errnum, temp, buflen, err); + return buf; + } +-- +2.16.2 + diff --git a/kernel.spec b/kernel.spec index 791e9b087..3de470f52 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -523,6 +523,8 @@ Source5000: patch-4.%{base_sublevel}-git%{gitrev}.xz # ongoing complaint, full discussion delayed until ksummit/plumbers Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch +# gcc -Werror=aliasing workaround +Patch003: 0001-Temporarily-work-around-gcc-aliasing-warning-error.patch %if !%{nopatches} @@ -1894,6 +1896,9 @@ fi # # %changelog +* Wed Mar 14 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc5.git1.2 +- Fix boot hang on aarch64 + * Tue Mar 13 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc5.git1.1 - Linux v4.16-rc5-4-gfc6eabbbf8ef |