From af31301c41e080291f795670121dcebf74b6a24a Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 21 Dec 2024 16:50:23 +1100 Subject: [PATCH 1/4] Make patches relative to where tarballs are extracted Ever since an old patch version, it has (for reasonable security reasons) not supported patched with ../ in the filename. Many of our patches have been relying on this behaviour being OK, because we start off with an ancient patch version that didn't perform such checks. As soon as we need this behaviour after we build a newer patch though, we will have problems. So, let's change the policy. Patches are relative to where tarballs are extracted, rather than the "working directory" - e.g. have patches for `coreutils-9.4/src/cp.c` instead of `src/cp.c`. Keeping this consistent has a few implications; - patches are applied from the build/ directory in bash era now, with `-p0` - when patches are manually applied in the bash era, use `-p` as required, usually `-p1` - in kaem era where patches are always manually applied, `-p1` is used --- DEVEL.md | 3 +- .../autoconf-2.53/patches/autoconf_252.patch | 4 +- .../patches/aclocal_glob.patch | 4 +- .../patches/aclocal_glob.patch | 4 +- .../patches/aclocal_glob.patch | 4 +- steps/automake-1.15.1/patches/bootstrap.patch | 4 +- .../patches/shellcheck-bypass.patch | 4 +- steps/bash-2.05b/pass1.kaem | 10 +- steps/bash-2.05b/patches/dev-tty.patch | 4 +- steps/bash-2.05b/patches/extern.patch | 4 +- steps/bash-2.05b/patches/locale.patch | 4 +- steps/bash-2.05b/patches/mes-libc.patch | 4 +- .../bash-2.05b/patches/missing-defines.patch | 4 +- steps/bash-2.05b/patches/size.patch | 4 +- steps/bash-2.05b/patches/tinycc.patch | 4 +- ...d-missing-config-directory-reference.patch | 4 +- steps/binutils-2.30/patches/new-gettext.patch | 4 +- ...i386-init-dependencies-are-satisfied.patch | 4 +- steps/binutils-2.41/patches/new-gettext.patch | 4 +- .../patches/no-maint-functions-texi.patch | 4 +- .../patches/no-maint-opcodes.patch | 4 +- .../bison-2.3/patches/autover-mismatch.patch | 4 +- steps/bison-2.3/patches/fopen-safer.patch | 4 +- steps/bison-2.3/patches/gnulib-fix.patch | 4 +- steps/bison-2.3/patches/our-bison.patch | 4 +- steps/bison-3.4.1/patches/fseterr.patch | 4 +- .../patches/missing-includes.patch | 12 +- .../bison-3.4.2/patches/gnulib-makefile.patch | 4 +- steps/bison-3.4.2/patches/our-bison.patch | 4 +- steps/bison-3.4.2/patches/po-files.patch | 4 +- steps/byacc-20240109/pass1.kaem | 2 +- steps/byacc-20240109/patches/meslibc.patch | 12 +- steps/bzip2-1.0.8/pass1.kaem | 4 +- steps/bzip2-1.0.8/patches/coreutils.patch | 4 +- steps/bzip2-1.0.8/patches/mes-libc.patch | 8 +- steps/coreutils-5.0/pass1.kaem | 18 +- steps/coreutils-5.0/patches/expr-strcmp.patch | 4 +- steps/coreutils-5.0/patches/ls-strcmp.patch | 4 +- steps/coreutils-5.0/patches/mbstate.patch | 8 +- steps/coreutils-5.0/patches/modechange.patch | 4 +- steps/coreutils-5.0/patches/sort-locale.patch | 8 +- steps/coreutils-5.0/patches/tac-uint64.patch | 4 +- .../patches/touch-dereference.patch | 4 +- .../coreutils-5.0/patches/touch-getdate.patch | 4 +- steps/coreutils-5.0/patches/uniq-fopen.patch | 4 +- .../patches/force_to_use_nanosleep.patch | 4 +- .../patches/remove_gettext.patch | 8 +- steps/curl-8.5.0/patches/help.patch | 8 +- .../patches/timeless-mk-ca-bundle.patch | 4 +- .../patches/remove-ctassert.patch | 28 +- steps/dist-3.5-236/patches/env.patch | 4 +- steps/e2fsprogs-1.45.7/patches/gawk-fix.patch | 8 +- .../patches/remove-intl.patch | 8 +- .../patches/force-getcwd-fallback.patch | 4 +- steps/flex-2.5.11/patches/scan_l.patch | 4 +- steps/flex-2.5.11/patches/yyin.patch | 8 +- steps/gcc-10.4.0/patches/fix-autoreconf.patch | 8 +- steps/gcc-10.4.0/patches/includes.patch | 4 +- steps/gcc-10.4.0/patches/libgcc-xfmode.patch | 24 +- steps/gcc-10.4.0/patches/new-gettext.patch | 4 +- ...-isolate-erroneous-paths-dereference.patch | 4 +- steps/gcc-13.1.0/patches/new-gettext.patch | 4 +- .../0001-libitm-fixes-for-musl-support.patch | 8 +- ...-fixincludes-update-for-musl-support.patch | 4 +- .../patches/0003-unwind-fix-for-musl.patch | 4 +- ...004-libstdc-gthr-workaround-for-musl.patch | 8 +- .../patches/0005-musl-libc-config.patch | 20 +- .../0006-add-musl-support-to-gcc.patch | 8 +- .../patches/0007-x86-musl-support.patch | 8 +- ...ux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch | 4 +- .../gcc-4.7.4/patches/gcc-10-fself-test.patch | 4 +- .../gcc-10-libgcc-builtin-macros.patch | 4 +- .../patches/gcc-10-mlong-double.patch | 42 +- .../patches/remove_gperf_dependency.patch | 8 +- steps/gzip-1.2.4/pass1.kaem | 4 +- .../patches/makecrc-write-to-file.patch | 4 +- steps/gzip-1.2.4/patches/removecrc.patch | 4 +- steps/help2man-1.36.4/patches/date.patch | 4 +- steps/helpers.sh | 3 +- steps/kbd-1.15/patches/fcntl.patch | 4 +- steps/kbd-1.15/patches/resizecons.patch | 8 +- .../patches/bad-gcc-arg.patch | 4 +- .../patches/archive-objs-order.patch | 12 +- steps/libtool-2.2.4/patches/hostname.patch | 4 +- steps/libtool-2.4.7/patches/hostname.patch | 4 +- .../patches/4.14.341-openela.patch | 1448 ++++++++--------- ...117714014cebe7b5d008fdec8eaec620cba1.patch | 4 +- .../patches/deblob.patch | 84 +- .../patches/disable-broken-check.patch | 4 +- .../patches/drm_edid.patch | 4 +- .../patches/i2c-hid-dmi-quirks.patch | 4 +- .../patches/i915_sw_fence.patch | 4 +- .../patches/initramfs_list.patch | 4 +- .../patches/linking.patch | 4 +- .../patches/regen.patch | 4 +- .../patches/remove-alternative-asm.patch | 8 +- .../patches/remove-kconfig.patch | 4 +- .../patches/wno-array-bounds.patch | 4 +- .../patches/4.14.341-openela.patch | 76 +- .../patches/winsize.patch | 4 +- .../patches/avoid_set_thread_area.patch | 8 +- .../musl-1.1.24/patches/avoid_sys_clone.patch | 4 +- steps/musl-1.1.24/patches/fenv.patch | 4 +- .../patches/madvise_preserve_errno.patch | 4 +- steps/musl-1.1.24/patches/makefile.patch | 4 +- .../musl-1.1.24/patches/set_thread_area.patch | 4 +- steps/musl-1.1.24/patches/sigsetjmp.patch | 4 +- steps/musl-1.1.24/patches/va_list.patch | 4 +- .../patches/avoid_set_thread_area.patch | 12 +- .../musl-1.2.4/patches/avoid_sys_clone.patch | 4 +- .../perl-5.10.1/patches/undefined_hack.patch | 8 +- .../perl-5.32.1/patches/reproducibility.patch | 8 +- .../patches/reproducibility2.patch | 8 +- .../python-2.0.1/files/disable-unicode.patch | 4 +- steps/python-2.0.1/pass1.sh | 2 +- steps/python-2.0.1/patches/destdir.patch | 8 +- steps/python-2.0.1/patches/posixmodule.patch | 4 +- steps/python-2.0.1/patches/pyc.patch | 8 +- steps/python-2.0.1/patches/undefs.patch | 4 +- .../python-2.3.7/files/disable-unicode.patch | 8 +- steps/python-2.3.7/pass1.sh | 2 +- steps/python-2.3.7/patches/posixmodule.patch | 4 +- steps/python-2.3.7/patches/pyc.patch | 8 +- steps/python-2.5.6/files/graminit-regen.patch | 4 +- steps/python-2.5.6/pass1.sh | 4 +- steps/python-2.5.6/patches/keyword.patch | 4 +- .../python-2.5.6/patches/pgen-timestamp.patch | 4 +- steps/python-2.5.6/patches/posixmodule.patch | 4 +- steps/python-2.5.6/patches/pyc.patch | 8 +- steps/python-2.5.6/patches/sorted.patch | 4 +- .../python-2.5.6/patches/sre_constants.patch | 4 +- steps/python-3.1.5/files/graminit-regen.patch | 4 +- steps/python-3.1.5/files/py2.patch | 8 +- steps/python-3.1.5/pass1.sh | 6 +- steps/python-3.1.5/pass2.sh | 4 +- .../python-3.1.5/patches/install-perms.patch | 4 +- steps/python-3.1.5/patches/openssl.patch | 4 +- steps/python-3.1.5/patches/posixmodule.patch | 4 +- steps/python-3.11.1/patches/empty-date.patch | 4 +- steps/python-3.11.1/patches/multiarch.patch | 4 +- .../python-3.3.7/patches/install-perms.patch | 4 +- steps/python-3.3.7/patches/symbol.patch | 4 +- .../python-3.4.10/patches/install-perms.patch | 4 +- steps/python-3.4.10/patches/symbol.patch | 4 +- steps/python-3.8.16/patches/empty-date.patch | 4 +- steps/python-3.8.16/patches/maxgroups.patch | 4 +- steps/python-3.8.16/patches/refractor.patch | 4 +- .../patches/dont-skip-weak-symbols-ar.patch | 4 +- .../patches/ignore-static-inside-array.patch | 4 +- steps/tcc-0.9.27/patches/static-link.patch | 4 +- .../patches/broken-programs.patch | 12 +- .../patches/disable-tests.patch | 4 +- .../patches/headers-bsd.patch | 8 +- .../patches/headers-gpl2.patch | 8 +- steps/util-linux-2.19.1/patches/headers.patch | 40 +- .../patches/pkg-config.patch | 12 +- 156 files changed, 1265 insertions(+), 1263 deletions(-) diff --git a/DEVEL.md b/DEVEL.md index db3d89a4..efaddceb 100644 --- a/DEVEL.md +++ b/DEVEL.md @@ -66,7 +66,8 @@ libraries that are compiled and installed. ## Conventions - **Patches:** - - all patches are `-p0` + - all patches are relative to the directory where the tarball is extracted + - thus, no patch lines for `a/file.c`, but `coreutils-9.4/file.c` - all patches begin with a patch header - **parts.rst:** - all packages are explained in `parts.rst` diff --git a/steps/autoconf-2.53/patches/autoconf_252.patch b/steps/autoconf-2.53/patches/autoconf_252.patch index a4d0b0f5..d2e706b6 100644 --- a/steps/autoconf-2.53/patches/autoconf_252.patch +++ b/steps/autoconf-2.53/patches/autoconf_252.patch @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Disable features unsupported by Autoconf 2.52 ---- configure.ac Wed Mar 17 19:53:06 2021 -+++ configure.ac.new Wed Mar 17 19:52:53 2021 +--- autoconf-2.53/configure.ac Wed Mar 17 19:53:06 2021 ++++ autoconf-2.53/configure.ac.new Wed Mar 17 19:52:53 2021 @@ -19,8 +19,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. diff --git a/steps/automake-1.10.3/patches/aclocal_glob.patch b/steps/automake-1.10.3/patches/aclocal_glob.patch index 1e0bd5fa..fd383724 100644 --- a/steps/automake-1.10.3/patches/aclocal_glob.patch +++ b/steps/automake-1.10.3/patches/aclocal_glob.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Fixes aclocal-1.10 to work with our Perl ---- aclocal.in 2021-03-25 19:18:10.489134059 +0000 -+++ aclocal.in 2021-03-25 19:18:20.159389339 +0000 +--- automake-1.10.3/aclocal.in 2021-03-25 19:18:10.489134059 +0000 ++++ automake-1.10.3/aclocal.in 2021-03-25 19:18:20.159389339 +0000 @@ -45,6 +45,7 @@ use Automake::FileUtils; use File::Basename; diff --git a/steps/automake-1.11.2/patches/aclocal_glob.patch b/steps/automake-1.11.2/patches/aclocal_glob.patch index 4403be0d..86b3ec66 100644 --- a/steps/automake-1.11.2/patches/aclocal_glob.patch +++ b/steps/automake-1.11.2/patches/aclocal_glob.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Fixes aclocal-1.10 to work with our Perl ---- aclocal.in 2021-03-25 19:18:10.489134059 +0000 -+++ aclocal.in 2021-03-25 19:18:20.159389339 +0000 +--- automake-1.11.2/aclocal.in 2021-03-25 19:18:10.489134059 +0000 ++++ automake-1.11.2/aclocal.in 2021-03-25 19:18:20.159389339 +0000 @@ -44,6 +44,7 @@ use Automake::FileUtils; use File::Basename; diff --git a/steps/automake-1.15.1/patches/aclocal_glob.patch b/steps/automake-1.15.1/patches/aclocal_glob.patch index 1fd0d955..16e68399 100644 --- a/steps/automake-1.15.1/patches/aclocal_glob.patch +++ b/steps/automake-1.15.1/patches/aclocal_glob.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Fixes aclocal to work with our Perl ---- bin/aclocal.in 2021-03-31 18:19:50.665806225 +0100 -+++ bin/aclocal.in 2021-03-31 18:20:02.836132739 +0100 +--- automake-1.15.1/bin/aclocal.in 2021-03-31 18:19:50.665806225 +0100 ++++ automake-1.15.1/bin/aclocal.in 2021-03-31 18:20:02.836132739 +0100 @@ -42,6 +42,7 @@ use Automake::XFile; use Automake::FileUtils; diff --git a/steps/automake-1.15.1/patches/bootstrap.patch b/steps/automake-1.15.1/patches/bootstrap.patch index 57070766..522452f7 100644 --- a/steps/automake-1.15.1/patches/bootstrap.patch +++ b/steps/automake-1.15.1/patches/bootstrap.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Fixes dependency of bootstrapping script ---- gen-testsuite-part 2017-06-16 21:46:16.000000000 +0100 -+++ gen-testsuite-part 2021-04-01 00:02:46.801098617 +0100 +--- automake-1.15.1/gen-testsuite-part 2017-06-16 21:46:16.000000000 +0100 ++++ automake-1.15.1/gen-testsuite-part 2021-04-01 00:02:46.801098617 +0100 @@ -64,8 +64,6 @@ $func->($fh); close $fh diff --git a/steps/automake-1.15.1/patches/shellcheck-bypass.patch b/steps/automake-1.15.1/patches/shellcheck-bypass.patch index 01c45095..15d54f9d 100644 --- a/steps/automake-1.15.1/patches/shellcheck-bypass.patch +++ b/steps/automake-1.15.1/patches/shellcheck-bypass.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Fixes configure script to work with older bash ---- configure.ac.bak 2023-03-08 14:34:57.009268432 +1100 -+++ configure.ac 2023-03-08 14:35:27.947964581 +1100 +--- automake-1.15.1/configure.ac.bak 2023-03-08 14:34:57.009268432 +1100 ++++ automake-1.15.1/configure.ac 2023-03-08 14:35:27.947964581 +1100 @@ -272,14 +272,6 @@ [], [am_score=1; break]) diff --git a/steps/bash-2.05b/pass1.kaem b/steps/bash-2.05b/pass1.kaem index 9145f8aa..cbe3ebdf 100755 --- a/steps/bash-2.05b/pass1.kaem +++ b/steps/bash-2.05b/pass1.kaem @@ -32,11 +32,11 @@ touch include/pipesize.h rm y.tab.c y.tab.h # Patch -patch -Np0 -i ../../patches/mes-libc.patch -patch -Np0 -i ../../patches/tinycc.patch -patch -Np0 -i ../../patches/missing-defines.patch -patch -Np0 -i ../../patches/locale.patch -patch -Np0 -i ../../patches/dev-tty.patch +patch -Np1 -i ../../patches/mes-libc.patch +patch -Np1 -i ../../patches/tinycc.patch +patch -Np1 -i ../../patches/missing-defines.patch +patch -Np1 -i ../../patches/locale.patch +patch -Np1 -i ../../patches/dev-tty.patch # Compile make mkbuiltins diff --git a/steps/bash-2.05b/patches/dev-tty.patch b/steps/bash-2.05b/patches/dev-tty.patch index 8c381a85..db768cd8 100644 --- a/steps/bash-2.05b/patches/dev-tty.patch +++ b/steps/bash-2.05b/patches/dev-tty.patch @@ -7,8 +7,8 @@ some reason, bash has a fixation on /dev/tty, even though we are not interactive. Removing this check entirely fixes this issue. diff --color -ru shell.c ---- shell.c 2002-07-02 01:27:11.000000000 +1000 -+++ shell.c 2021-01-16 11:23:36.407287955 +1100 +--- bash-2.05b/shell.c 2002-07-02 01:27:11.000000000 +1000 ++++ bash-2.05b/shell.c 2021-01-16 11:23:36.407287955 +1100 @@ -342,8 +342,6 @@ # endif #endif diff --git a/steps/bash-2.05b/patches/extern.patch b/steps/bash-2.05b/patches/extern.patch index 837f7fc4..05171701 100644 --- a/steps/bash-2.05b/patches/extern.patch +++ b/steps/bash-2.05b/patches/extern.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later tinycc's extern support is bad. i.e. these externs don't propagate through. ---- builtins/common.c 2021-01-15 21:32:56.938683418 +1100 -+++ builtins/common.c 2021-01-15 21:34:09.102153806 +1100 +--- bash-2.05b/builtins/common.c 2021-01-15 21:32:56.938683418 +1100 ++++ bash-2.05b/builtins/common.c 2021-01-15 21:34:09.102153806 +1100 @@ -46,6 +46,9 @@ #include "../flags.h" #include "../jobs.h" diff --git a/steps/bash-2.05b/patches/locale.patch b/steps/bash-2.05b/patches/locale.patch index 458335c8..5c7742bf 100644 --- a/steps/bash-2.05b/patches/locale.patch +++ b/steps/bash-2.05b/patches/locale.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later mes libc + setting locale = not worky. ---- locale.c 2021-01-15 09:38:55.729307629 +1100 -+++ locale.c 2021-01-15 11:19:01.929391346 +1100 +--- bash-2.05b/locale.c 2021-01-15 09:38:55.729307629 +1100 ++++ bash-2.05b/locale.c 2021-01-15 11:19:01.929391346 +1100 @@ -190,7 +190,7 @@ set_lang (var, value) char *var, *value; diff --git a/steps/bash-2.05b/patches/mes-libc.patch b/steps/bash-2.05b/patches/mes-libc.patch index 5f651591..2ace2d00 100644 --- a/steps/bash-2.05b/patches/mes-libc.patch +++ b/steps/bash-2.05b/patches/mes-libc.patch @@ -6,8 +6,8 @@ mes libc does not have locale support... diff --git lib/sh/snprintf.c lib/sh/snprintf.c index 7669576..747aeba 100644 ---- lib/sh/snprintf.c -+++ lib/sh/snprintf.c +--- bash-2.05b/lib/sh/snprintf.c ++++ bash-2.05b/lib/sh/snprintf.c @@ -376,7 +376,7 @@ static void xfree __P((void *)); if ((p)->flags & PF_STAR_P) \ (p)->precision = GETARG (int) diff --git a/steps/bash-2.05b/patches/missing-defines.patch b/steps/bash-2.05b/patches/missing-defines.patch index 35fa4381..a03a95ac 100644 --- a/steps/bash-2.05b/patches/missing-defines.patch +++ b/steps/bash-2.05b/patches/missing-defines.patch @@ -6,8 +6,8 @@ We don't actually want any of these things, which should really be hidden behind the ifdefs given here to disable them when they are not being used (as we do). ---- execute_cmd.c 2021-01-15 09:38:55.730307635 +1100 -+++ execute_cmd.c 2021-01-15 09:43:41.046896754 +1100 +--- bash-2.05b/execute_cmd.c 2021-01-15 09:38:55.730307635 +1100 ++++ bash-2.05b/execute_cmd.c 2021-01-15 09:43:41.046896754 +1100 @@ -286,12 +286,18 @@ { if (currently_executing_command->type == cm_simple) diff --git a/steps/bash-2.05b/patches/size.patch b/steps/bash-2.05b/patches/size.patch index 87a1b57a..9e3ac6e4 100644 --- a/steps/bash-2.05b/patches/size.patch +++ b/steps/bash-2.05b/patches/size.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later We don't yet have the size command. ---- Makefile.in 2023-03-11 15:41:13.297307977 +1100 -+++ Makefile.in 2023-03-11 15:43:51.677298993 +1100 +--- bash-2.05b/Makefile.in 2023-03-11 15:41:13.297307977 +1100 ++++ bash-2.05b/Makefile.in 2023-03-11 15:43:51.677298993 +1100 @@ -471,7 +471,6 @@ $(RM) $@ $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) diff --git a/steps/bash-2.05b/patches/tinycc.patch b/steps/bash-2.05b/patches/tinycc.patch index 3f441ee6..fe5ac61a 100644 --- a/steps/bash-2.05b/patches/tinycc.patch +++ b/steps/bash-2.05b/patches/tinycc.patch @@ -7,8 +7,8 @@ to reflect this. diff --git lib/sh/oslib.c lib/sh/oslib.c index 90d7be9..37fdf2a 100644 ---- lib/sh/oslib.c -+++ lib/sh/oslib.c +--- bash-2.05b/lib/sh/oslib.c ++++ bash-2.05b/lib/sh/oslib.c @@ -192,8 +192,7 @@ bzero (s, n) # include int diff --git a/steps/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch b/steps/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch index dd5b0daa..dad442f7 100644 --- a/steps/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch +++ b/steps/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch @@ -6,8 +6,8 @@ Add missing AC_CONFIG_MACRO_DIR. Required by autoreconf to create aclocal.m4 correctly. ---- /libiberty/configure.ac 2022-01-22 14:14:09.000000000 +0200 -+++ libiberty/configure.ac 2022-09-04 00:01:02.941738129 +0300 +--- binutils-2.30//libiberty/configure.ac 2022-01-22 14:14:09.000000000 +0200 ++++ binutils-2.30/libiberty/configure.ac 2022-09-04 00:01:02.941738129 +0300 @@ -2,6 +2,7 @@ AC_INIT diff --git a/steps/binutils-2.30/patches/new-gettext.patch b/steps/binutils-2.30/patches/new-gettext.patch index 8c0a0264..6ffea00d 100644 --- a/steps/binutils-2.30/patches/new-gettext.patch +++ b/steps/binutils-2.30/patches/new-gettext.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later In new gettext external is required for AM_GNU_GETTEXT. ---- intl/configure.ac 2023-02-07 18:57:56.350832016 +1100 -+++ intl/configure.ac 2023-02-07 18:58:07.310054484 +1100 +--- binutils-2.30/intl/configure.ac 2023-02-07 18:57:56.350832016 +1100 ++++ binutils-2.30/intl/configure.ac 2023-02-07 18:58:07.310054484 +1100 @@ -4,7 +4,7 @@ AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR(../config) diff --git a/steps/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch b/steps/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch index 205fa104..0653ff6f 100644 --- a/steps/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch +++ b/steps/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Ensure i386-init.h dependencies are satisfied. ---- opcodes/Makefile.am 2022-01-22 14:14:09.000000000 +0200 -+++ opcodes/Makefile.am 2022-09-13 21:09:04.353324699 +0300 +--- binutils-2.30/opcodes/Makefile.am 2022-01-22 14:14:09.000000000 +0200 ++++ binutils-2.30/opcodes/Makefile.am 2022-09-13 21:09:04.353324699 +0300 @@ -575,7 +575,7 @@ i386-gen.o: i386-gen.c i386-opc.h $(srcd $(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h @echo $@ diff --git a/steps/binutils-2.41/patches/new-gettext.patch b/steps/binutils-2.41/patches/new-gettext.patch index 8c0a0264..a898bca7 100644 --- a/steps/binutils-2.41/patches/new-gettext.patch +++ b/steps/binutils-2.41/patches/new-gettext.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later In new gettext external is required for AM_GNU_GETTEXT. ---- intl/configure.ac 2023-02-07 18:57:56.350832016 +1100 -+++ intl/configure.ac 2023-02-07 18:58:07.310054484 +1100 +--- binutils-2.41/intl/configure.ac 2023-02-07 18:57:56.350832016 +1100 ++++ binutils-2.41/intl/configure.ac 2023-02-07 18:58:07.310054484 +1100 @@ -4,7 +4,7 @@ AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR(../config) diff --git a/steps/binutils-2.41/patches/no-maint-functions-texi.patch b/steps/binutils-2.41/patches/no-maint-functions-texi.patch index c376784b..13e2c6d4 100644 --- a/steps/binutils-2.41/patches/no-maint-functions-texi.patch +++ b/steps/binutils-2.41/patches/no-maint-functions-texi.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Ensure functions.texi dependencies are satisfied. ---- libiberty/Makefile.in 2023-12-08 15:18:57.985791235 +1100 -+++ libiberty/Makefile.in 2023-12-08 15:19:15.391252344 +1100 +--- binutils-2.41/libiberty/Makefile.in 2023-12-08 15:18:57.985791235 +1100 ++++ binutils-2.41/libiberty/Makefile.in 2023-12-08 15:19:15.391252344 +1100 @@ -368,12 +368,12 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC) $(MAKEINFO) --no-split --html -I$(srcdir) -o $@ $< diff --git a/steps/binutils-2.41/patches/no-maint-opcodes.patch b/steps/binutils-2.41/patches/no-maint-opcodes.patch index 612c228d..fd852250 100644 --- a/steps/binutils-2.41/patches/no-maint-opcodes.patch +++ b/steps/binutils-2.41/patches/no-maint-opcodes.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Ensure i386-tbl.h dependencies are satisfied. ---- opcodes/Makefile.am 2023-12-08 17:13:05.669136957 +1100 -+++ opcodes/Makefile.am 2023-12-08 17:13:18.410480026 +1100 +--- binutils-2.41/opcodes/Makefile.am 2023-12-08 17:13:05.669136957 +1100 ++++ binutils-2.41/opcodes/Makefile.am 2023-12-08 17:13:18.410480026 +1100 @@ -540,7 +540,7 @@ # i386-gen will generate all headers in one go. Use a pattern rule to properly # express this, with the inner dash ('-') arbitrarily chosen to be the stem. diff --git a/steps/bison-2.3/patches/autover-mismatch.patch b/steps/bison-2.3/patches/autover-mismatch.patch index 57dbce6d..bb7d8070 100644 --- a/steps/bison-2.3/patches/autover-mismatch.patch +++ b/steps/bison-2.3/patches/autover-mismatch.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later This macro does not exist in newer versions of autoconf and is unrequired. There is no version of autoconf supporting this project + gnulib + this macro. ---- m4/po_gl.m4 2021-04-11 18:39:53.353069610 +1000 -+++ m4/po_gl.m4 2021-04-11 18:40:20.422242498 +1000 +--- bison-2.3/m4/po_gl.m4 2021-04-11 18:39:53.353069610 +1000 ++++ bison-2.3/m4/po_gl.m4 2021-04-11 18:40:20.422242498 +1000 @@ -24,7 +24,6 @@ [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl diff --git a/steps/bison-2.3/patches/fopen-safer.patch b/steps/bison-2.3/patches/fopen-safer.patch index 8583e403..4d1a9cdd 100644 --- a/steps/bison-2.3/patches/fopen-safer.patch +++ b/steps/bison-2.3/patches/fopen-safer.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later fopen-safer.c for whatever reason does not exist when added by gnulib. ---- lib/Makefile.am 2021-04-11 19:01:01.265993928 +1000 -+++ lib/Makefile.am 2021-04-11 19:01:40.413232722 +1000 +--- bison-2.3/lib/Makefile.am 2021-04-11 19:01:01.265993928 +1000 ++++ bison-2.3/lib/Makefile.am 2021-04-11 19:01:40.413232722 +1000 @@ -31,7 +31,8 @@ lib_SOURCES = \ get-errno.h get-errno.c \ diff --git a/steps/bison-2.3/patches/gnulib-fix.patch b/steps/bison-2.3/patches/gnulib-fix.patch index b336fe09..80bf0b7d 100644 --- a/steps/bison-2.3/patches/gnulib-fix.patch +++ b/steps/bison-2.3/patches/gnulib-fix.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later This should be declared for gnulib, but for some reason is not, most likely use of a different version (but CVS history no longer exists). ---- lib/Makefile.am 2021-04-11 13:49:09.414805465 +1000 -+++ lib/Makefile.am 2021-04-11 13:49:26.418916036 +1000 +--- bison-2.3/lib/Makefile.am 2021-04-11 13:49:09.414805465 +1000 ++++ bison-2.3/lib/Makefile.am 2021-04-11 13:49:26.418916036 +1000 @@ -19,6 +19,7 @@ BUILT_SOURCES = diff --git a/steps/bison-2.3/patches/our-bison.patch b/steps/bison-2.3/patches/our-bison.patch index b3bdc09a..e3fcb4dc 100644 --- a/steps/bison-2.3/patches/our-bison.patch +++ b/steps/bison-2.3/patches/our-bison.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later This doesn't actually make sense, you can't use the built bison to bootstrap itself. Make it use our bison instead. ---- src/Makefile.am 2021-04-10 21:37:11.570390316 +1000 -+++ src/Makefile.am 2021-04-10 21:38:01.805804332 +1000 +--- bison-2.3/src/Makefile.am 2021-04-10 21:37:11.570390316 +1000 ++++ bison-2.3/src/Makefile.am 2021-04-10 21:38:01.805804332 +1000 @@ -23,10 +23,6 @@ LDADD = ../lib/libbison.a $(LIBINTL) diff --git a/steps/bison-3.4.1/patches/fseterr.patch b/steps/bison-3.4.1/patches/fseterr.patch index eafe0cad..4018fd54 100644 --- a/steps/bison-3.4.1/patches/fseterr.patch +++ b/steps/bison-3.4.1/patches/fseterr.patch @@ -10,8 +10,8 @@ Date: Thu Mar 26 18:02:01 2020 +0100 diff --git lib/fseterr.c lib/fseterr.c index 8cd68e8..0ec7e2c 100644 ---- lib/fseterr.c -+++ lib/fseterr.c +--- bison-3.4.1/lib/fseterr.c ++++ bison-3.4.1/lib/fseterr.c @@ -53,7 +53,7 @@ fseterr (FILE *fp) #elif defined EPLAN9 /* Plan9 */ if (fp->state != 0 /* CLOSED */) diff --git a/steps/bison-3.4.1/patches/missing-includes.patch b/steps/bison-3.4.1/patches/missing-includes.patch index 96f5f1d4..9876a17e 100644 --- a/steps/bison-3.4.1/patches/missing-includes.patch +++ b/steps/bison-3.4.1/patches/missing-includes.patch @@ -10,8 +10,8 @@ Date: Thu Mar 26 18:02:01 2020 +0100 diff --git src/scan-code.l src/scan-code.l index 73a3b2d..f348b20 100644 ---- src/scan-code.l -+++ src/scan-code.l +--- bison-3.4.1/src/scan-code.l ++++ bison-3.4.1/src/scan-code.l @@ -21,6 +21,7 @@ %option prefix="code_" outfile="lex.yy.c" @@ -30,8 +30,8 @@ index 73a3b2d..f348b20 100644 #include diff --git src/scan-gram.l src/scan-gram.l index 66a8caa..efa391a 100644 ---- src/scan-gram.l -+++ src/scan-gram.l +--- bison-3.4.1/src/scan-gram.l ++++ bison-3.4.1/src/scan-gram.l @@ -21,6 +21,7 @@ %option prefix="gram_" outfile="lex.yy.c" @@ -50,8 +50,8 @@ index 66a8caa..efa391a 100644 #include diff --git src/scan-skel.l src/scan-skel.l index 487e9f5..19f4832 100644 ---- src/scan-skel.l -+++ src/scan-skel.l +--- bison-3.4.1/src/scan-skel.l ++++ bison-3.4.1/src/scan-skel.l @@ -21,6 +21,7 @@ %option prefix="skel_" outfile="lex.yy.c" diff --git a/steps/bison-3.4.2/patches/gnulib-makefile.patch b/steps/bison-3.4.2/patches/gnulib-makefile.patch index e9db5aa1..bc1483dc 100644 --- a/steps/bison-3.4.2/patches/gnulib-makefile.patch +++ b/steps/bison-3.4.2/patches/gnulib-makefile.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Again, same as bison 2.3. I cannot figure out what gnulib/bison are doing that makes this required... ---- Makefile.am 2021-04-15 12:18:34.371818904 +1000 -+++ Makefile.am 2021-04-15 12:18:39.055851647 +1000 +--- bison-3.4.2/Makefile.am 2021-04-15 12:18:34.371818904 +1000 ++++ bison-3.4.2/Makefile.am 2021-04-15 12:18:39.055851647 +1000 @@ -63,6 +63,7 @@ check_SCRIPTS = dist_TESTS = diff --git a/steps/bison-3.4.2/patches/our-bison.patch b/steps/bison-3.4.2/patches/our-bison.patch index ecb42fb0..5803ef11 100644 --- a/steps/bison-3.4.2/patches/our-bison.patch +++ b/steps/bison-3.4.2/patches/our-bison.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Why do they insist on using themselves to bootstrap themselves? It doesn't exist... ---- Makefile.am 2021-04-15 21:29:36.596205032 +1000 -+++ Makefile.am 2021-04-15 21:30:00.367365897 +1000 +--- bison-3.4.2/Makefile.am 2021-04-15 21:29:36.596205032 +1000 ++++ bison-3.4.2/Makefile.am 2021-04-15 21:30:00.367365897 +1000 @@ -39,7 +39,7 @@ ## Running the bison from this tarball. To generate our own parser, ## but also to run the tests. Of course, you ought to keep a sane diff --git a/steps/bison-3.4.2/patches/po-files.patch b/steps/bison-3.4.2/patches/po-files.patch index 0e9f708a..d46ea8c1 100644 --- a/steps/bison-3.4.2/patches/po-files.patch +++ b/steps/bison-3.4.2/patches/po-files.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later We don't have network access at this stage to "Fetch PO files". ---- ../gnulib-672663a/gnulib-tool 2021-04-15 21:07:04.538055553 +1000 -+++ ../gnulib-672663a/gnulib-tool 2021-04-15 21:07:16.424135984 +1000 +--- gnulib-672663a/gnulib-tool 2021-04-15 21:07:04.538055553 +1000 ++++ gnulib-672663a/gnulib-tool 2021-04-15 21:07:16.424135984 +1000 @@ -5564,16 +5564,6 @@ fi func_append added_files "$pobase/POTFILES.in$nl" diff --git a/steps/byacc-20240109/pass1.kaem b/steps/byacc-20240109/pass1.kaem index 1cfd9bc7..19f092f7 100644 --- a/steps/byacc-20240109/pass1.kaem +++ b/steps/byacc-20240109/pass1.kaem @@ -24,7 +24,7 @@ cd ${pkg} # Prepare and patch cp ../../files/Makefile . -patch -Np0 -i ../../patches/meslibc.patch +patch -Np1 -i ../../patches/meslibc.patch # Build yacc make CC=tcc AR=tcc\ -ar CFLAGS=-DMAXPATHLEN=100\ -DEILSEQ=84\ -DMB_LEN_MAX=100 LDFLAGS=-lgetopt\ -static RANLIB=true diff --git a/steps/byacc-20240109/patches/meslibc.patch b/steps/byacc-20240109/patches/meslibc.patch index e080836b..477076bf 100644 --- a/steps/byacc-20240109/patches/meslibc.patch +++ b/steps/byacc-20240109/patches/meslibc.patch @@ -9,8 +9,8 @@ License note: Berkeley Yacc is in the public domain, but it's linked with meslibc, which is GPL-3.0-or-later, so we apply that license here too. diff -ru ../byacc-20240109.bak/main.c ./main.c ---- ../byacc-20240109.bak/main.c 2024-04-14 16:06:09.646465507 +0200 -+++ ./main.c 2024-04-14 20:41:56.227083399 +0200 +--- byacc-20240109/main.c 2024-04-14 16:06:09.646465507 +0200 ++++ byacc-20240109/main.c 2024-04-14 20:41:56.227083399 +0200 @@ -788,7 +788,7 @@ (void)umask(save_umask); } @@ -21,8 +21,8 @@ diff -ru ../byacc-20240109.bak/main.c ./main.c if (result == 0) diff -ru ../byacc-20240109.bak/output.c ./output.c ---- ../byacc-20240109.bak/output.c 2024-04-14 16:06:09.646465507 +0200 -+++ ./output.c 2024-04-14 16:06:24.636465897 +0200 +--- byacc-20240109/output.c 2024-04-14 16:06:09.646465507 +0200 ++++ byacc-20240109/output.c 2024-04-14 16:06:24.636465897 +0200 @@ -1289,7 +1289,7 @@ { if (union_file != 0) @@ -51,8 +51,8 @@ diff -ru ../byacc-20240109.bak/output.c ./output.c return; diff -ru ../byacc-20240109.bak/reader.c ./reader.c ---- ../byacc-20240109.bak/reader.c 2024-04-14 16:06:09.646465507 +0200 -+++ ./reader.c 2024-04-14 20:40:58.387082748 +0200 +--- byacc-20240109/reader.c 2024-04-14 16:06:09.646465507 +0200 ++++ byacc-20240109/reader.c 2024-04-14 20:40:58.387082748 +0200 @@ -70,7 +70,7 @@ char *line_data; /* saved input-line */ size_t line_used; /* position within saved input-line */ diff --git a/steps/bzip2-1.0.8/pass1.kaem b/steps/bzip2-1.0.8/pass1.kaem index 4595a7a8..8464689a 100755 --- a/steps/bzip2-1.0.8/pass1.kaem +++ b/steps/bzip2-1.0.8/pass1.kaem @@ -22,8 +22,8 @@ rm -r ../src cd ${pkg} # Patch -patch -Np0 -i ../../patches/mes-libc.patch -patch -Np0 -i ../../patches/coreutils.patch +patch -Np1 -i ../../patches/mes-libc.patch +patch -Np1 -i ../../patches/coreutils.patch # Build make CC=tcc AR="tcc -ar" LDFLAGS="-static" bzip2 diff --git a/steps/bzip2-1.0.8/patches/coreutils.patch b/steps/bzip2-1.0.8/patches/coreutils.patch index 25dee3e7..0b46bede 100644 --- a/steps/bzip2-1.0.8/patches/coreutils.patch +++ b/steps/bzip2-1.0.8/patches/coreutils.patch @@ -8,8 +8,8 @@ point of the bootstrap. ranlib can be unconditionally disabled as we do not have it either. diff -r -N -U3 Makefile Makefile ---- Makefile 2019-07-13 18:50:05.000000000 +0100 -+++ Makefile 2021-01-14 15:45:17.558516299 +0000 +--- bzip2-1.0.8/Makefile 2019-07-13 18:50:05.000000000 +0100 ++++ bzip2-1.0.8/Makefile 2021-01-14 15:45:17.558516299 +0000 @@ -21,7 +21,7 @@ LDFLAGS= diff --git a/steps/bzip2-1.0.8/patches/mes-libc.patch b/steps/bzip2-1.0.8/patches/mes-libc.patch index 59e17e31..988de25a 100644 --- a/steps/bzip2-1.0.8/patches/mes-libc.patch +++ b/steps/bzip2-1.0.8/patches/mes-libc.patch @@ -9,8 +9,8 @@ It also does not have fch{own,mod}, which we don't care about in the bootstrap anyway, so we can null-op those calls. diff -r -N -U3 bzip2.c bzip2.c ---- bzip2.c 2019-07-13 18:50:05.000000000 +0100 -+++ bzip2.c 2021-01-14 14:11:40.160213521 +0000 +--- bzip2-1.0.8/bzip2.c 2019-07-13 18:50:05.000000000 +0100 ++++ bzip2-1.0.8/bzip2.c 2021-01-14 14:11:40.160213521 +0000 @@ -1051,12 +1051,9 @@ { # if BZ_UNIX @@ -26,8 +26,8 @@ diff -r -N -U3 bzip2.c bzip2.c # endif } diff -r -N -U3 utime.h utime.h ---- utime.h 1970-01-01 01:00:00.000000000 +0100 -+++ utime.h 2021-01-14 18:11:11.253825037 +0000 +--- bzip2-1.0.8/utime.h 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.8/utime.h 2021-01-14 18:11:11.253825037 +0000 @@ -0,0 +1,2 @@ +#define fchown(filedes, owner, group) 0 +#define fchmod(filedes, mode) 0 diff --git a/steps/coreutils-5.0/pass1.kaem b/steps/coreutils-5.0/pass1.kaem index 80ec88d0..558577af 100755 --- a/steps/coreutils-5.0/pass1.kaem +++ b/steps/coreutils-5.0/pass1.kaem @@ -35,15 +35,15 @@ rm src/false.c rm src/dircolors.h -patch -Np0 -i ../../patches/modechange.patch -patch -Np0 -i ../../patches/mbstate.patch -patch -Np0 -i ../../patches/ls-strcmp.patch -patch -Np0 -i ../../patches/touch-getdate.patch -patch -Np0 -i ../../patches/touch-dereference.patch -patch -Np0 -i ../../patches/tac-uint64.patch -patch -Np0 -i ../../patches/expr-strcmp.patch -patch -Np0 -i ../../patches/sort-locale.patch -patch -Np0 -i ../../patches/uniq-fopen.patch +patch -Np1 -i ../../patches/modechange.patch +patch -Np1 -i ../../patches/mbstate.patch +patch -Np1 -i ../../patches/ls-strcmp.patch +patch -Np1 -i ../../patches/touch-getdate.patch +patch -Np1 -i ../../patches/touch-dereference.patch +patch -Np1 -i ../../patches/tac-uint64.patch +patch -Np1 -i ../../patches/expr-strcmp.patch +patch -Np1 -i ../../patches/sort-locale.patch +patch -Np1 -i ../../patches/uniq-fopen.patch # Build and install make -f Makefile PREFIX=${PREFIX} diff --git a/steps/coreutils-5.0/patches/expr-strcmp.patch b/steps/coreutils-5.0/patches/expr-strcmp.patch index d269d29f..0dca51cb 100644 --- a/steps/coreutils-5.0/patches/expr-strcmp.patch +++ b/steps/coreutils-5.0/patches/expr-strcmp.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later strcoll() does not exist in mes libc, change it to strcmp. ---- src/expr.c -+++ src/expr.c +--- coreutils-5.0/src/expr.c ++++ coreutils-5.0/src/expr.c @@ -332,7 +332,7 @@ nextarg (char *str) return 0; else diff --git a/steps/coreutils-5.0/patches/ls-strcmp.patch b/steps/coreutils-5.0/patches/ls-strcmp.patch index ee67c1ed..863e4a14 100644 --- a/steps/coreutils-5.0/patches/ls-strcmp.patch +++ b/steps/coreutils-5.0/patches/ls-strcmp.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later strcoll() does not exist in mes libc, change it to strcmp. ---- src/ls.c -+++ src/ls.c +--- coreutils-5.0/src/ls.c ++++ coreutils-5.0/src/ls.c @@ -2597,7 +2597,7 @@ xstrcoll (char const *a, char const *b) { int diff; diff --git a/steps/coreutils-5.0/patches/mbstate.patch b/steps/coreutils-5.0/patches/mbstate.patch index 69509e78..f73b08dc 100644 --- a/steps/coreutils-5.0/patches/mbstate.patch +++ b/steps/coreutils-5.0/patches/mbstate.patch @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later mbstate_t is a struct that is required. However, it is not defined by mes libc. This implementation was taken from glibc 2.32. ---- lib/quotearg.c 2002-11-23 07:08:10.000000000 +0000 -+++ lib/quotearg.c 2021-01-17 19:41:59.461095532 +0000 +--- coreutils-5.0/lib/quotearg.c 2002-11-23 07:08:10.000000000 +0000 ++++ coreutils-5.0/lib/quotearg.c 2021-01-17 19:41:59.461095532 +0000 @@ -21,6 +21,7 @@ # include #endif @@ -16,8 +16,8 @@ This implementation was taken from glibc 2.32. #include "quotearg.h" #include "xalloc.h" ---- lib/mbstate_t.h 1970-01-01 01:00:00.000000000 +0100 -+++ lib/mbstate_t.h 2021-01-17 19:42:21.341658668 +0000 +--- coreutils-5.0/lib/mbstate_t.h 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-5.0/lib/mbstate_t.h 2021-01-17 19:42:21.341658668 +0000 @@ -0,0 +1,23 @@ +#ifndef ____mbstate_t_defined +#define ____mbstate_t_defined 1 diff --git a/steps/coreutils-5.0/patches/modechange.patch b/steps/coreutils-5.0/patches/modechange.patch index 92bd039a..a4e36a76 100644 --- a/steps/coreutils-5.0/patches/modechange.patch +++ b/steps/coreutils-5.0/patches/modechange.patch @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later modechange.h uses functions defined in sys/stat.h, so we need to move it to after sys/stat.h include. ---- lib/modechange.c 2001-12-09 22:54:19.000000000 +0000 -+++ lib/modechange.c 2021-01-17 18:34:22.016427148 +0000 +--- coreutils-5.0/lib/modechange.c 2001-12-09 22:54:19.000000000 +0000 ++++ coreutils-5.0/lib/modechange.c 2021-01-17 18:34:22.016427148 +0000 @@ -28,8 +28,8 @@ # include #endif diff --git a/steps/coreutils-5.0/patches/sort-locale.patch b/steps/coreutils-5.0/patches/sort-locale.patch index 30230f9e..54ecdef5 100644 --- a/steps/coreutils-5.0/patches/sort-locale.patch +++ b/steps/coreutils-5.0/patches/sort-locale.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later strcoll() does not exist in mes libc, change it to strcmp. hard_LC_COLLATE is used but not declared when HAVE_SETLOCALE is unset. ---- lib/memcoll.c -+++ lib/memcoll.c +--- coreutils-5.0/lib/memcoll.c ++++ coreutils-5.0/lib/memcoll.c @@ -47,7 +47,7 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len) s1[s1len++] = '\0'; s2[s2len++] = '\0'; @@ -17,8 +17,8 @@ hard_LC_COLLATE is used but not declared when HAVE_SETLOCALE is unset. /* strcoll found no difference, but perhaps it was fooled by NUL characters in the data. Work around this problem by advancing ---- src/sort.c -+++ src/sort.c +--- coreutils-5.0/src/sort.c ++++ coreutils-5.0/src/sort.c @@ -91,13 +91,13 @@ double strtod (); #define NEGATION_SIGN '-' #define NUMERIC_ZERO '0' diff --git a/steps/coreutils-5.0/patches/tac-uint64.patch b/steps/coreutils-5.0/patches/tac-uint64.patch index 9973e511..9dca91e9 100644 --- a/steps/coreutils-5.0/patches/tac-uint64.patch +++ b/steps/coreutils-5.0/patches/tac-uint64.patch @@ -3,8 +3,8 @@ SPDX-FileCopyrightText: 2022 Andrius Štikonas SPDX-License-Identifier: GPL-2.0-or-later uint64_t is not supported in tcc 0.9.27 ---- lib/tempname.c 2002-12-01 10:40:32.000000000 +0000 -+++ lib/tempname.c 2022-06-22 20:57:37.449423973 +0100 +--- coreutils-5.0/lib/tempname.c 2002-12-01 10:40:32.000000000 +0000 ++++ coreutils-5.0/lib/tempname.c 2022-06-22 20:57:37.449423973 +0100 @@ -231,8 +231,8 @@ { int len; diff --git a/steps/coreutils-5.0/patches/touch-dereference.patch b/steps/coreutils-5.0/patches/touch-dereference.patch index 701a81a4..6fbd56c6 100644 --- a/steps/coreutils-5.0/patches/touch-dereference.patch +++ b/steps/coreutils-5.0/patches/touch-dereference.patch @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later touch: add -h to change symlink timestamps, where supported diff -r -U3 coreutils-5.0.orig/src/touch.c coreutils-5.0/src/touch.c ---- src/touch.c 2002-12-20 20:09:22.000000000 +0000 -+++ src/touch.c 2022-05-16 20:31:37.801988595 +0100 +--- coreutils-5.0/src/touch.c 2002-12-20 20:09:22.000000000 +0000 ++++ coreutils-5.0/src/touch.c 2022-05-16 20:31:37.801988595 +0100 @@ -77,6 +77,9 @@ /* (-r) If nonzero, use times from a reference file. */ static int use_ref; diff --git a/steps/coreutils-5.0/patches/touch-getdate.patch b/steps/coreutils-5.0/patches/touch-getdate.patch index a540493a..9692ba6c 100644 --- a/steps/coreutils-5.0/patches/touch-getdate.patch +++ b/steps/coreutils-5.0/patches/touch-getdate.patch @@ -6,8 +6,8 @@ getdate.c is pre-compiled from getdate.y At this point we don't have bison yet and in any case getdate.y does not compile when generated with modern bison. ---- src/touch.c.orig 2021-03-13 18:16:05.344355958 +0000 -+++ src/touch.c 2021-03-13 18:16:26.204891355 +0000 +--- coreutils-5.0/src/touch.c.orig 2021-03-13 18:16:05.344355958 +0000 ++++ coreutils-5.0/src/touch.c 2021-03-13 18:16:26.204891355 +0000 @@ -306,7 +306,7 @@ case 'd': diff --git a/steps/coreutils-5.0/patches/uniq-fopen.patch b/steps/coreutils-5.0/patches/uniq-fopen.patch index 8a393f46..c598e8b1 100644 --- a/steps/coreutils-5.0/patches/uniq-fopen.patch +++ b/steps/coreutils-5.0/patches/uniq-fopen.patch @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later uniq: don't assume fopen cannot return stdin or stdout. Backport of https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=786ebb2ceca72f69aa2de701671fb41f53cb1489 ---- src/uniq.c -+++ src/uniq.c +--- coreutils-5.0/src/uniq.c ++++ coreutils-5.0/src/uniq.c @@ -30,6 +30,7 @@ #include "error.h" #include "hard-locale.h" diff --git a/steps/coreutils-9.4/patches/force_to_use_nanosleep.patch b/steps/coreutils-9.4/patches/force_to_use_nanosleep.patch index 7668af5d..c65ae1f8 100644 --- a/steps/coreutils-9.4/patches/force_to_use_nanosleep.patch +++ b/steps/coreutils-9.4/patches/force_to_use_nanosleep.patch @@ -7,8 +7,8 @@ We always assume that kernel doesn't have correct implementation and instead use function from gnulib with fix. That fixes reproducibility problem across different kernels. ---- ../gnulib-bb5bb43/m4/nanosleep.m4 -+++ ../gnulib-bb5bb43/m4/nanosleep.m4 +--- gnulib-bb5bb43/m4/nanosleep.m4 ++++ gnulib-bb5bb43/m4/nanosleep.m4 @@ -85,23 +85,9 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], ts_sleep.tv_nsec = 1; #if HAVE_DECL_ALARM diff --git a/steps/coreutils-9.4/patches/remove_gettext.patch b/steps/coreutils-9.4/patches/remove_gettext.patch index bd5e7709..9e48636e 100644 --- a/steps/coreutils-9.4/patches/remove_gettext.patch +++ b/steps/coreutils-9.4/patches/remove_gettext.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Remove dependency on gettext, because we don't have it at this stage of the build. ---- ./configure.ac -+++ ./configure.ac +--- coreutils-9.4/configure.ac ++++ coreutils-9.4/configure.ac @@ -624,8 +624,8 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in @@ -18,8 +18,8 @@ of the build. # For a test of uniq: it uses the $LOCALE_FR envvar. gt_LOCALE_FR ---- ./Makefile.am -+++ ./Makefile.am +--- coreutils-9.4/Makefile.am ++++ coreutils-9.4/Makefile.am @@ -17,7 +17,7 @@ ALL_RECURSIVE_TARGETS = diff --git a/steps/curl-8.5.0/patches/help.patch b/steps/curl-8.5.0/patches/help.patch index c1d703a2..87119258 100644 --- a/steps/curl-8.5.0/patches/help.patch +++ b/steps/curl-8.5.0/patches/help.patch @@ -6,8 +6,8 @@ Regenerating help is not trivial. Help is unnecessary. Disable help. diff -ru src/Makefile.inc src/Makefile.inc ---- src/Makefile.inc -+++ src/Makefile.inc +--- curl-8.5.0/src/Makefile.inc ++++ curl-8.5.0/src/Makefile.inc @@ -76,12 +76,10 @@ tool_formparse.c \ tool_getparam.c \ @@ -30,8 +30,8 @@ diff -ru src/Makefile.inc src/Makefile.inc tool_hugehelp.h \ tool_ipfs.h \ diff -ru src/tool_operate.c src/tool_operate.c ---- src/tool_operate.c -+++ src/tool_operate.c +--- curl-8.5.0/src/tool_operate.c ++++ curl-8.5.0/src/tool_operate.c @@ -78,7 +78,6 @@ #include "tool_writeout.h" #include "tool_xattr.h" diff --git a/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch b/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch index eb911dff..0dd1c11a 100644 --- a/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch +++ b/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch @@ -6,8 +6,8 @@ Disables checking current date in mk-ca-bundle script, so it produces reproducible bundles. diff -ru scripts/mk-ca-bundle.pl scripts/mk-ca-bundle.pl ---- scripts/mk-ca-bundle.pl -+++ scripts/mk-ca-bundle.pl +--- curl-8.5.0/scripts/mk-ca-bundle.pl ++++ curl-8.5.0/scripts/mk-ca-bundle.pl @@ -499,19 +499,7 @@ if($main_block) { push @precert, $_ if not /^#$/; diff --git a/steps/dhcpcd-10.0.1/patches/remove-ctassert.patch b/steps/dhcpcd-10.0.1/patches/remove-ctassert.patch index 7949c0b4..93a9be3c 100644 --- a/steps/dhcpcd-10.0.1/patches/remove-ctassert.patch +++ b/steps/dhcpcd-10.0.1/patches/remove-ctassert.patch @@ -5,8 +5,8 @@ __CTASSERT macro does not work properly on our older GCC. diff -ru src/arp.c src/arp.c ---- src/arp.c -+++ src/arp.c +--- dhcpcd-10.0.1/src/arp.c ++++ dhcpcd-10.0.1/src/arp.c @@ -63,9 +63,6 @@ /* ARP debugging can be quite noisy. Enable this for more noise! */ //#define ARP_DEBUG @@ -18,8 +18,8 @@ diff -ru src/arp.c src/arp.c arp_request(const struct arp_state *astate, const struct in_addr *sip) diff -ru src/auth.c src/auth.c ---- src/auth.c -+++ src/auth.c +--- dhcpcd-10.0.1/src/auth.c ++++ dhcpcd-10.0.1/src/auth.c @@ -343,9 +343,6 @@ /* RFC3318, section 5.2 - zero giaddr and hops */ @@ -31,8 +31,8 @@ diff -ru src/auth.c src/auth.c memset(mm + offsetof(struct bootp, giaddr), 0, 4); } diff -ru src/dhcp6.c src/dhcp6.c ---- src/dhcp6.c -+++ src/dhcp6.c +--- dhcpcd-10.0.1/src/dhcp6.c ++++ dhcpcd-10.0.1/src/dhcp6.c @@ -84,33 +84,28 @@ uint8_t xid[3]; /* followed by options */ @@ -76,8 +76,8 @@ diff -ru src/dhcp6.c src/dhcp6.c struct dhcp6_op { uint16_t type; diff -ru src/dhcp.c src/dhcp.c ---- src/dhcp.c -+++ src/dhcp.c +--- dhcpcd-10.0.1/src/dhcp.c ++++ dhcpcd-10.0.1/src/dhcp.c @@ -98,11 +98,6 @@ #define IP_RECVPKTINFO IP_PKTINFO #endif @@ -91,8 +91,8 @@ diff -ru src/dhcp.c src/dhcp.c uint8_t value; const char *name; diff -ru src/if-bsd.c src/if-bsd.c ---- src/if-bsd.c -+++ src/if-bsd.c +--- dhcpcd-10.0.1/src/if-bsd.c ++++ dhcpcd-10.0.1/src/if-bsd.c @@ -1600,7 +1600,6 @@ #endif } @@ -102,8 +102,8 @@ diff -ru src/if-bsd.c src/if-bsd.c if_handlelink(struct dhcpcd_ctx *ctx) { diff -ru src/ipv6nd.c src/ipv6nd.c ---- src/ipv6nd.c -+++ src/ipv6nd.c +--- dhcpcd-10.0.1/src/ipv6nd.c ++++ dhcpcd-10.0.1/src/ipv6nd.c @@ -80,7 +80,6 @@ uint32_t nd_opt_rdnss_lifetime; /* followed by list of IP prefixes */ @@ -121,8 +121,8 @@ diff -ru src/ipv6nd.c src/ipv6nd.c /* Impossible options, so we can easily add extras */ diff -ru src/privsep-root.c src/privsep-root.c ---- src/privsep-root.c -+++ src/privsep-root.c +--- dhcpcd-10.0.1/src/privsep-root.c ++++ dhcpcd-10.0.1/src/privsep-root.c @@ -56,8 +56,6 @@ #include "sa.h" #include "script.h" diff --git a/steps/dist-3.5-236/patches/env.patch b/steps/dist-3.5-236/patches/env.patch index 1adf8dd5..7eeae8a1 100644 --- a/steps/dist-3.5-236/patches/env.patch +++ b/steps/dist-3.5-236/patches/env.patch @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 fosslinux SPDX-License-Identifier: Artistic-1.0 ---- bin/perload 2021-04-21 19:01:35.803767498 +1000 -+++ bin/perload 2021-04-21 19:01:47.959850217 +1000 +--- dist-3.5-236/bin/perload 2021-04-21 19:01:35.803767498 +1000 ++++ dist-3.5-236/bin/perload 2021-04-21 19:01:47.959850217 +1000 @@ -450,8 +450,6 @@ :# This perl program uses dynamic loading [generated by perload] :# diff --git a/steps/e2fsprogs-1.45.7/patches/gawk-fix.patch b/steps/e2fsprogs-1.45.7/patches/gawk-fix.patch index c5a30bf3..1352b8a8 100644 --- a/steps/e2fsprogs-1.45.7/patches/gawk-fix.patch +++ b/steps/e2fsprogs-1.45.7/patches/gawk-fix.patch @@ -6,8 +6,8 @@ Our version of gawk does not seem to like printing, at least in the way that this attempts to use it. Instead, make it print to console and use working bash redirects. ---- lib/et/compile_et.sh.in 2022-05-18 19:26:17.182054784 +1000 -+++ lib/et/compile_et.sh.in 2022-05-18 19:30:16.489294776 +1000 +--- e2fsprogs-1.45.7/lib/et/compile_et.sh.in 2022-05-18 19:26:17.182054784 +1000 ++++ e2fsprogs-1.45.7/lib/et/compile_et.sh.in 2022-05-18 19:30:16.489294776 +1000 @@ -44,14 +44,14 @@ exit 1; fi @@ -25,8 +25,8 @@ bash redirects. if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then rm -f ${BASE}.c.$$ else ---- lib/ss/mk_cmds.sh.in 2022-05-18 19:33:16.024962919 +1000 -+++ lib/ss/mk_cmds.sh.in 2022-05-18 19:33:39.650576476 +1000 +--- e2fsprogs-1.45.7/lib/ss/mk_cmds.sh.in 2022-05-18 19:33:16.024962919 +1000 ++++ e2fsprogs-1.45.7/lib/ss/mk_cmds.sh.in 2022-05-18 19:33:39.650576476 +1000 @@ -43,7 +43,7 @@ fi diff --git a/steps/e2fsprogs-1.45.7/patches/remove-intl.patch b/steps/e2fsprogs-1.45.7/patches/remove-intl.patch index 3768d17c..e3e699e3 100644 --- a/steps/e2fsprogs-1.45.7/patches/remove-intl.patch +++ b/steps/e2fsprogs-1.45.7/patches/remove-intl.patch @@ -4,8 +4,8 @@ Disable gettext, which we do not have at this time, along with pkg-config. ---- configure.ac 2022-05-18 15:12:53.633061872 +1000 -+++ configure.ac 2022-05-18 19:09:13.351790066 +1000 +--- e2fsprogs-1.45.7/configure.ac 2022-05-18 15:12:53.633061872 +1000 ++++ e2fsprogs-1.45.7/configure.ac 2022-05-18 19:09:13.351790066 +1000 @@ -860,20 +860,7 @@ dnl MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library @@ -60,8 +60,8 @@ Disable gettext, which we do not have at this time, along with pkg-config. AC_MSG_CHECKING([for systemd system unit dir]) systemd_system_unit_dir="${with_systemd_unit_dir}" AS_IF([test -n "${systemd_system_unit_dir}"], ---- Makefile.in 2022-05-18 19:41:37.596959349 +1000 -+++ Makefile.in 2022-05-18 19:41:41.109050161 +1000 +--- e2fsprogs-1.45.7/Makefile.in 2022-05-18 19:41:37.596959349 +1000 ++++ e2fsprogs-1.45.7/Makefile.in 2022-05-18 19:41:41.109050161 +1000 @@ -20,7 +20,7 @@ @ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs diff --git a/steps/findutils-4.2.33/patches/force-getcwd-fallback.patch b/steps/findutils-4.2.33/patches/force-getcwd-fallback.patch index 018b28f1..8aab3b83 100644 --- a/steps/findutils-4.2.33/patches/force-getcwd-fallback.patch +++ b/steps/findutils-4.2.33/patches/force-getcwd-fallback.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Use the fallback implementations of getcwd to get the same /usr/bin/find checksum when building across FUSE and non-FUSE filesystems. ---- gnulib/m4/getcwd-path-max.m4 2022-01-08 13:16:54.412709192 +0200 -+++ gnulib/m4/getcwd-path-max.m4 2022-01-16 11:38:02.658606802 +0200 +--- findutils-4.2.33/gnulib/m4/getcwd-path-max.m4 2022-01-08 13:16:54.412709192 +0200 ++++ findutils-4.2.33/gnulib/m4/getcwd-path-max.m4 2022-01-16 11:38:02.658606802 +0200 @@ -81,7 +81,7 @@ char *cwd = getcwd (buf, PATH_MAX); size_t initial_cwd_len; diff --git a/steps/flex-2.5.11/patches/scan_l.patch b/steps/flex-2.5.11/patches/scan_l.patch index 7d41a421..5e26c085 100644 --- a/steps/flex-2.5.11/patches/scan_l.patch +++ b/steps/flex-2.5.11/patches/scan_l.patch @@ -8,8 +8,8 @@ Comments are unsupported by our flex. diff --git scan.l scan.l index 18d0de8..c251a5e 100644 ---- scan.l -+++ scan.l +--- flex-2.5.11/scan.l ++++ flex-2.5.11/scan.l @@ -335,8 +335,8 @@ LEXOPT [aceknopr] diff --git a/steps/flex-2.5.11/patches/yyin.patch b/steps/flex-2.5.11/patches/yyin.patch index feb9e2df..984b8af4 100644 --- a/steps/flex-2.5.11/patches/yyin.patch +++ b/steps/flex-2.5.11/patches/yyin.patch @@ -9,8 +9,8 @@ acidentally re-declare it. diff --git flexdef.h flexdef.h index 3eb710a..94ef024 100644 ---- flexdef.h -+++ flexdef.h +--- flex-2.5.11/flexdef.h ++++ flex-2.5.11/flexdef.h @@ -421,7 +421,7 @@ extern int yymore_really_used, reject_really_used; */ @@ -31,8 +31,8 @@ index 3eb710a..94ef024 100644 extern char *action_array; extern int action_size; extern int defs1_offset, prolog_offset, action_offset, action_index; ---- scan.l -+++ scan.l +--- flex-2.5.11/scan.l ++++ flex-2.5.11/scan.l @@ -32,6 +32,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ diff --git a/steps/gcc-10.4.0/patches/fix-autoreconf.patch b/steps/gcc-10.4.0/patches/fix-autoreconf.patch index 9ccbd50f..ed08990a 100644 --- a/steps/gcc-10.4.0/patches/fix-autoreconf.patch +++ b/steps/gcc-10.4.0/patches/fix-autoreconf.patch @@ -15,8 +15,8 @@ the applicable combination of 'aclocal', 'autoconf', 'autoheader'. See also 'AC_CONFIG_MACRO_DIRS'/'AC_CONFIG_MACRO_DIR' usage elsewhere. ---- gcc/configure.ac 2023-01-22 16:22:57.833166450 +1100 -+++ gcc/configure.ac 2023-01-22 16:23:08.971274603 +1100 +--- gcc-10.4.0/gcc/configure.ac 2023-01-22 16:22:57.833166450 +1100 ++++ gcc-10.4.0/gcc/configure.ac 2023-01-22 16:23:08.971274603 +1100 @@ -25,6 +25,7 @@ AC_INIT @@ -25,8 +25,8 @@ See also 'AC_CONFIG_MACRO_DIRS'/'AC_CONFIG_MACRO_DIR' usage elsewhere. AC_CONFIG_HEADER(auto-host.h:config.in) gcc_version=`cat $srcdir/BASE-VER` ---- libobjc/configure.ac 2023-01-22 16:23:42.648601085 +1100 -+++ libobjc/configure.ac 2023-01-22 16:23:28.937468262 +1100 +--- gcc-10.4.0/libobjc/configure.ac 2023-01-22 16:23:42.648601085 +1100 ++++ gcc-10.4.0/libobjc/configure.ac 2023-01-22 16:23:28.937468262 +1100 @@ -20,6 +20,7 @@ AC_INIT(package-unused, version-unused,, libobjc) diff --git a/steps/gcc-10.4.0/patches/includes.patch b/steps/gcc-10.4.0/patches/includes.patch index 3750def3..2fdb53c1 100644 --- a/steps/gcc-10.4.0/patches/includes.patch +++ b/steps/gcc-10.4.0/patches/includes.patch @@ -12,8 +12,8 @@ https://stackoverflow.com/questions/22160093/inconsistent-operand-constraints-in Pre-5.0 GCC does not support PIC inline ASM that touches ebx (as presumably the cpuid call does); so we must disable PIC. ---- libgcc/Makefile.in 2023-01-25 16:03:45.928059755 +1100 -+++ libgcc/Makefile.in 2023-01-25 16:04:06.711464255 +1100 +--- gcc-10.4.0/libgcc/Makefile.in 2023-01-25 16:03:45.928059755 +1100 ++++ gcc-10.4.0/libgcc/Makefile.in 2023-01-25 16:04:06.711464255 +1100 @@ -282,7 +282,7 @@ # subdirectory rather than in the source directory. # -I$(@D) and -I$(srcdir)/$(@D) cause the subdirectory of the file diff --git a/steps/gcc-10.4.0/patches/libgcc-xfmode.patch b/steps/gcc-10.4.0/patches/libgcc-xfmode.patch index 569090ef..58f62000 100644 --- a/steps/gcc-10.4.0/patches/libgcc-xfmode.patch +++ b/steps/gcc-10.4.0/patches/libgcc-xfmode.patch @@ -18,8 +18,8 @@ __LIBGCC_HAS_XF_MODE__ is not defined. diff --git libgcc/config/libbid/_dd_to_xf.c libgcc/config/libbid/_dd_to_xf.c index 5a2abbbb1f4..e4b12e8ac4f 100644 ---- libgcc/config/libbid/_dd_to_xf.c -+++ libgcc/config/libbid/_dd_to_xf.c +--- gcc-10.4.0/libgcc/config/libbid/_dd_to_xf.c ++++ gcc-10.4.0/libgcc/config/libbid/_dd_to_xf.c @@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "bid_functions.h" #include "bid_gcc_intrinsics.h" @@ -35,8 +35,8 @@ index 5a2abbbb1f4..e4b12e8ac4f 100644 +#endif diff --git libgcc/config/libbid/_sd_to_xf.c libgcc/config/libbid/_sd_to_xf.c index 9af09913684..288ccb25075 100644 ---- libgcc/config/libbid/_sd_to_xf.c -+++ libgcc/config/libbid/_sd_to_xf.c +--- gcc-10.4.0/libgcc/config/libbid/_sd_to_xf.c ++++ gcc-10.4.0/libgcc/config/libbid/_sd_to_xf.c @@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "bid_functions.h" #include "bid_gcc_intrinsics.h" @@ -52,8 +52,8 @@ index 9af09913684..288ccb25075 100644 +#endif diff --git libgcc/config/libbid/_td_to_xf.c libgcc/config/libbid/_td_to_xf.c index b0c76a71497..e990282162d 100644 ---- libgcc/config/libbid/_td_to_xf.c -+++ libgcc/config/libbid/_td_to_xf.c +--- gcc-10.4.0/libgcc/config/libbid/_td_to_xf.c ++++ gcc-10.4.0/libgcc/config/libbid/_td_to_xf.c @@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "bid_functions.h" #include "bid_gcc_intrinsics.h" @@ -69,8 +69,8 @@ index b0c76a71497..e990282162d 100644 +#endif diff --git libgcc/config/libbid/_xf_to_dd.c libgcc/config/libbid/_xf_to_dd.c index 9feb0f2c3d6..e3246a1c2e1 100644 ---- libgcc/config/libbid/_xf_to_dd.c -+++ libgcc/config/libbid/_xf_to_dd.c +--- gcc-10.4.0/libgcc/config/libbid/_xf_to_dd.c ++++ gcc-10.4.0/libgcc/config/libbid/_xf_to_dd.c @@ -25,9 +25,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "bid_functions.h" #include "bid_gcc_intrinsics.h" @@ -85,8 +85,8 @@ index 9feb0f2c3d6..e3246a1c2e1 100644 +#endif diff --git libgcc/config/libbid/_xf_to_sd.c libgcc/config/libbid/_xf_to_sd.c index 7d46548af6c..9147e979182 100644 ---- libgcc/config/libbid/_xf_to_sd.c -+++ libgcc/config/libbid/_xf_to_sd.c +--- gcc-10.4.0/libgcc/config/libbid/_xf_to_sd.c ++++ gcc-10.4.0/libgcc/config/libbid/_xf_to_sd.c @@ -25,9 +25,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "bid_functions.h" #include "bid_gcc_intrinsics.h" @@ -101,8 +101,8 @@ index 7d46548af6c..9147e979182 100644 +#endif diff --git libgcc/config/libbid/_xf_to_td.c libgcc/config/libbid/_xf_to_td.c index 07987fdcc3a..c8d102b0b7f 100644 ---- libgcc/config/libbid/_xf_to_td.c -+++ libgcc/config/libbid/_xf_to_td.c +--- gcc-10.4.0/libgcc/config/libbid/_xf_to_td.c ++++ gcc-10.4.0/libgcc/config/libbid/_xf_to_td.c @@ -25,9 +25,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "bid_functions.h" #include "bid_gcc_intrinsics.h" diff --git a/steps/gcc-10.4.0/patches/new-gettext.patch b/steps/gcc-10.4.0/patches/new-gettext.patch index 9212c166..7c4e1651 100644 --- a/steps/gcc-10.4.0/patches/new-gettext.patch +++ b/steps/gcc-10.4.0/patches/new-gettext.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later In new gettext external is required for AM_GNU_GETTEXT. ---- intl/configure.ac 2023-02-07 18:43:58.989786230 +1100 -+++ intl/configure.ac 2023-02-07 18:43:02.182632631 +1100 +--- gcc-10.4.0/intl/configure.ac 2023-02-07 18:43:58.989786230 +1100 ++++ gcc-10.4.0/intl/configure.ac 2023-02-07 18:43:02.182632631 +1100 @@ -4,7 +4,7 @@ AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR(../config) diff --git a/steps/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch b/steps/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch index 329dff2a..576a58c9 100644 --- a/steps/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch +++ b/steps/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later GCC 4.7 doesn't have fisolate-erroneous-paths-dereference. Hence this line does nothing. ---- libgcc/generic-morestack.c 2023-01-25 16:52:35.382471998 +1100 -+++ libgcc/generic-morestack.c 2023-01-25 16:52:40.773585043 +1100 +--- gcc-10.4.0/libgcc/generic-morestack.c 2023-01-25 16:52:35.382471998 +1100 ++++ gcc-10.4.0/libgcc/generic-morestack.c 2023-01-25 16:52:40.773585043 +1100 @@ -23,8 +23,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ diff --git a/steps/gcc-13.1.0/patches/new-gettext.patch b/steps/gcc-13.1.0/patches/new-gettext.patch index 9212c166..8362ca90 100644 --- a/steps/gcc-13.1.0/patches/new-gettext.patch +++ b/steps/gcc-13.1.0/patches/new-gettext.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later In new gettext external is required for AM_GNU_GETTEXT. ---- intl/configure.ac 2023-02-07 18:43:58.989786230 +1100 -+++ intl/configure.ac 2023-02-07 18:43:02.182632631 +1100 +--- gcc-13.1.0/intl/configure.ac 2023-02-07 18:43:58.989786230 +1100 ++++ gcc-13.1.0/intl/configure.ac 2023-02-07 18:43:02.182632631 +1100 @@ -4,7 +4,7 @@ AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR(../config) diff --git a/steps/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch b/steps/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch index 1486f99e..0342dca2 100644 --- a/steps/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch +++ b/steps/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch @@ -14,8 +14,8 @@ libitm fixes for musl support From-SVN: r222325 ---- libitm/config/arm/hwcap.cc -+++ libitm/config/arm/hwcap.cc +--- gcc-4.7.4/libitm/config/arm/hwcap.cc ++++ gcc-4.7.4/libitm/config/arm/hwcap.cc @@ -40,7 +40,7 @@ int GTM_hwcap HIDDEN = 0 #ifdef __linux__ @@ -25,8 +25,8 @@ From-SVN: r222325 #include static void __attribute__((constructor)) ---- libitm/config/linux/x86/tls.h -+++ libitm/config/linux/x86/tls.h +--- gcc-4.7.4/libitm/config/linux/x86/tls.h ++++ gcc-4.7.4/libitm/config/linux/x86/tls.h @@ -25,16 +25,19 @@ #ifndef LIBITM_X86_TLS_H #define LIBITM_X86_TLS_H 1 diff --git a/steps/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch b/steps/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch index 0c6daed8..701ec456 100644 --- a/steps/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch +++ b/steps/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch @@ -13,8 +13,8 @@ fixincludes update for musl support From-SVN: r222327 ---- fixincludes/mkfixinc.sh -+++ fixincludes/mkfixinc.sh +--- gcc-4.7.4/fixincludes/mkfixinc.sh ++++ gcc-4.7.4/fixincludes/mkfixinc.sh @@ -20,7 +20,8 @@ case $machine in powerpc-*-eabi* | \ powerpc-*-rtems* | \ diff --git a/steps/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch b/steps/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch index f90ba909..d6001383 100644 --- a/steps/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch +++ b/steps/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch @@ -18,8 +18,8 @@ Co-Authored-By: Szabolcs Nagy From-SVN: r222328 ---- libgcc/unwind-dw2-fde-dip.c -+++ libgcc/unwind-dw2-fde-dip.c +--- gcc-4.7.4/libgcc/unwind-dw2-fde-dip.c ++++ gcc-4.7.4/libgcc/unwind-dw2-fde-dip.c @@ -53,6 +53,12 @@ # define USE_PT_GNU_EH_FRAME #endif diff --git a/steps/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch b/steps/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch index 4f0b06ba..fe895e7b 100644 --- a/steps/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch +++ b/steps/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch @@ -15,8 +15,8 @@ libstdc++ gthr workaround for musl From-SVN: r222329 ---- libstdc++-v3/config/os/generic/os_defines.h -+++ libstdc++-v3/config/os/generic/os_defines.h +--- gcc-4.7.4/libstdc++-v3/config/os/generic/os_defines.h ++++ gcc-4.7.4/libstdc++-v3/config/os/generic/os_defines.h @@ -33,4 +33,9 @@ // System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others. @@ -27,8 +27,8 @@ From-SVN: r222329 +#define _GLIBCXX_GTHREAD_USE_WEAK 0 + #endif ---- libstdc++-v3/configure.host -+++ libstdc++-v3/configure.host +--- gcc-4.7.4/libstdc++-v3/configure.host ++++ gcc-4.7.4/libstdc++-v3/configure.host @@ -242,6 +242,9 @@ case "${host_os}" in freebsd*) os_include_dir="os/bsd/freebsd" diff --git a/steps/gcc-4.7.4/patches/0005-musl-libc-config.patch b/steps/gcc-4.7.4/patches/0005-musl-libc-config.patch index 970a813a..b96dd7cc 100644 --- a/steps/gcc-4.7.4/patches/0005-musl-libc-config.patch +++ b/steps/gcc-4.7.4/patches/0005-musl-libc-config.patch @@ -28,8 +28,8 @@ Co-Authored-By: Szabolcs Nagy From-SVN: r222904 ---- gcc/config.gcc -+++ gcc/config.gcc +--- gcc-4.7.4/gcc/config.gcc ++++ gcc-4.7.4/gcc/config.gcc @@ -522,7 +522,7 @@ case ${target} in esac @@ -49,8 +49,8 @@ From-SVN: r222904 *) tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" ;; ---- gcc/config/linux.h -+++ gcc/config/linux.h +--- gcc-4.7.4/gcc/config/linux.h ++++ gcc-4.7.4/gcc/config/linux.h @@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) @@ -204,8 +204,8 @@ From-SVN: r222904 + { 0, 0, 0, 0, 0, 0 } \ + } +#endif ---- gcc/config/linux.opt -+++ gcc/config/linux.opt +--- gcc-4.7.4/gcc/config/linux.opt ++++ gcc-4.7.4/gcc/config/linux.opt @@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_libc,LIBC_GLIBC) Negative(muclibc) Use GNU C library @@ -217,8 +217,8 @@ From-SVN: r222904 +mmusl +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic) +Use musl C library ---- gcc/configure.ac -+++ gcc/configure.ac +--- gcc-4.7.4/gcc/configure.ac ++++ gcc-4.7.4/gcc/configure.ac @@ -4669,6 +4669,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library, gcc_cv_libc_provides_ssp, [gcc_cv_libc_provides_ssp=no @@ -247,8 +247,8 @@ From-SVN: r222904 esac GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) if test x$gcc_cv_target_dl_iterate_phdr = xyes; then ---- gcc/doc/invoke.texi -+++ gcc/doc/invoke.texi +--- gcc-4.7.4/gcc/doc/invoke.texi ++++ gcc-4.7.4/gcc/doc/invoke.texi @@ -595,7 +595,7 @@ Objective-C and Objective-C++ Dialects}. -mcpu=@var{cpu}} diff --git a/steps/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch b/steps/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch index aeb1be71..3f5a6330 100644 --- a/steps/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch +++ b/steps/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch @@ -19,8 +19,8 @@ Add musl support to GCC From-SVN: r222905 ---- gcc/config/glibc-stdint.h -+++ gcc/config/glibc-stdint.h +--- gcc-4.7.4/gcc/config/glibc-stdint.h ++++ gcc-4.7.4/gcc/config/glibc-stdint.h @@ -22,6 +22,12 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ @@ -51,8 +51,8 @@ From-SVN: r222905 #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") ---- gcc/config/linux.h -+++ gcc/config/linux.h +--- gcc-4.7.4/gcc/config/linux.h ++++ gcc-4.7.4/gcc/config/linux.h @@ -33,11 +33,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) diff --git a/steps/gcc-4.7.4/patches/0007-x86-musl-support.patch b/steps/gcc-4.7.4/patches/0007-x86-musl-support.patch index 4fcc87e2..57733a7d 100644 --- a/steps/gcc-4.7.4/patches/0007-x86-musl-support.patch +++ b/steps/gcc-4.7.4/patches/0007-x86-musl-support.patch @@ -15,8 +15,8 @@ x86 musl support From-SVN: r223218 ---- gcc/config/i386/linux.h -+++ gcc/config/i386/linux.h +--- gcc-4.7.4/gcc/config/i386/linux.h ++++ gcc-4.7.4/gcc/config/i386/linux.h @@ -22,3 +22,6 @@ along with GCC; see the file COPYING3. If not see #define GNU_USER_LINK_EMULATION "elf_i386" @@ -24,8 +24,8 @@ From-SVN: r223218 + +#undef MUSL_DYNAMIC_LINKER +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" ---- gcc/config/i386/linux64.h -+++ gcc/config/i386/linux64.h +--- gcc-4.7.4/gcc/config/i386/linux64.h ++++ gcc-4.7.4/gcc/config/i386/linux64.h @@ -31,3 +31,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" diff --git a/steps/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch b/steps/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch index 1f4920b0..e39d6f7b 100644 --- a/steps/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch +++ b/steps/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch @@ -9,8 +9,8 @@ config/linux.h (INCLUDE_DEFAULTS): Add INCLUDE_DEFAULTS_MUSL_LOCAL. From-SVN: r229392 ---- gcc/config/linux.h -+++ gcc/config/linux.h +--- gcc-4.7.4/gcc/config/linux.h ++++ gcc-4.7.4/gcc/config/linux.h @@ -184,6 +184,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define INCLUDE_DEFAULTS \ { \ diff --git a/steps/gcc-4.7.4/patches/gcc-10-fself-test.patch b/steps/gcc-4.7.4/patches/gcc-10-fself-test.patch index 7f804ed9..f5615b2e 100644 --- a/steps/gcc-4.7.4/patches/gcc-10-fself-test.patch +++ b/steps/gcc-4.7.4/patches/gcc-10-fself-test.patch @@ -6,8 +6,8 @@ In GCC 10, fself-test is run on every GCC used in the build process to ensure correctness. However this is not yet introduced in GCC 4.7, so we no-op it. ---- gcc/common.opt 2023-01-23 21:22:23.630919284 +1100 -+++ gcc/common.opt 2023-01-23 21:23:33.030143958 +1100 +--- gcc-4.7.4/gcc/common.opt 2023-01-23 21:22:23.630919284 +1100 ++++ gcc-4.7.4/gcc/common.opt 2023-01-23 21:23:33.030143958 +1100 @@ -1701,6 +1701,10 @@ Common Report Var(flag_selective_scheduling2) Optimization Run selective scheduling after reload diff --git a/steps/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch b/steps/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch index 71936afd..013fa8d4 100644 --- a/steps/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch +++ b/steps/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch @@ -10,8 +10,8 @@ These macros do not exist in GCC 4.7, so we add them in. (We could -D them in GCC 10, but this is a simpler unobtrusive solution, and is arguably more correct). ---- gcc/c-family/c-cppbuiltin.c 2023-01-25 16:56:44.122222376 +1100 -+++ gcc/c-family/c-cppbuiltin.c 2023-01-25 17:01:52.500855016 +1100 +--- gcc-4.7.4/gcc/c-family/c-cppbuiltin.c 2023-01-25 16:56:44.122222376 +1100 ++++ gcc-4.7.4/gcc/c-family/c-cppbuiltin.c 2023-01-25 17:01:52.500855016 +1100 @@ -850,6 +850,30 @@ builtin_define_with_int_value ("__LIBGCC_TRAMPOLINE_SIZE__", TRAMPOLINE_SIZE); diff --git a/steps/gcc-4.7.4/patches/gcc-10-mlong-double.patch b/steps/gcc-4.7.4/patches/gcc-10-mlong-double.patch index e1f9ac7b..6b47ff8c 100644 --- a/steps/gcc-4.7.4/patches/gcc-10-mlong-double.patch +++ b/steps/gcc-4.7.4/patches/gcc-10-mlong-double.patch @@ -15,8 +15,8 @@ makes more sense to simply add in support to GCC 4.7. diff --git gcc/config/i386/i386-c.c gcc/config/i386/i386-c.c index d00e0ba54b939..edd64ff7ae388 100644 ---- gcc/config/i386/i386-c.c -+++ gcc/config/i386/i386-c.c +--- gcc-4.7.4/gcc/config/i386/i386-c.c ++++ gcc-4.7.4/gcc/config/i386/i386-c.c @@ -418,6 +418,9 @@ builtin_define_std ("i386"); } @@ -29,8 +29,8 @@ index d00e0ba54b939..edd64ff7ae388 100644 ix86_tune, diff --git gcc/config/i386/i386.c gcc/config/i386/i386.c index a6fc45b047a94..da931ee153745 100644 ---- gcc/config/i386/i386.c -+++ gcc/config/i386/i386.c +--- gcc-4.7.4/gcc/config/i386/i386.c ++++ gcc-4.7.4/gcc/config/i386/i386.c @@ -2786,6 +2786,7 @@ ix86_target_string (HOST_WIDE_INT isa, int flags, const char *arch, static struct ix86_target_opts flag_opts[] = { @@ -53,8 +53,8 @@ index a6fc45b047a94..da931ee153745 100644 if (main_args_p) diff --git gcc/config/i386/i386.h gcc/config/i386/i386.h index 11f79e3f670af..3a41a43e308bf 100644 ---- gcc/config/i386/i386.h -+++ gcc/config/i386/i386.h +--- gcc-4.7.4/gcc/config/i386/i386.h ++++ gcc-4.7.4/gcc/config/i386/i386.h @@ -671,9 +671,17 @@ enum target_cpu_default #define LONG_LONG_TYPE_SIZE 64 #define FLOAT_TYPE_SIZE 32 @@ -77,8 +77,8 @@ index 11f79e3f670af..3a41a43e308bf 100644 #define MAX_BITS_PER_WORD 64 diff --git gcc/config/i386/i386.opt gcc/config/i386/i386.opt index e4f78f3ce50f3..6a389947d904e 100644 ---- gcc/config/i386/i386.opt -+++ gcc/config/i386/i386.opt +--- gcc-4.7.4/gcc/config/i386/i386.opt ++++ gcc-4.7.4/gcc/config/i386/i386.opt @@ -86,6 +86,14 @@ m96bit-long-double Target RejectNegative Report InverseMask(128BIT_LONG_DOUBLE) Save sizeof(long double) is 12 @@ -98,7 +98,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-1.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..cf933796f8aea --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-64-1.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-1.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mlong-double-64" } */ @@ -114,7 +114,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-2.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..ddf4fe656d099 --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-64-2.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-2.c @@ -0,0 +1,10 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -mbionic" } */ @@ -130,7 +130,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-3.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..e748fab2edd3c --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-64-3.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-3.c @@ -0,0 +1,10 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -mandroid" } */ @@ -146,7 +146,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-4.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..d9c25aaec080c --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-64-4.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-4.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mlong-double-80 -mlong-double-64" } */ @@ -162,7 +162,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-1.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..d3b75a0be21de --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-80-1.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-1.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mlong-double-80" } */ @@ -178,7 +178,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-2.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..954dfd15d4271 --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-80-2.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-2.c @@ -0,0 +1,10 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -mlong-double-80 -mbionic" } */ @@ -194,7 +194,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-3.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..e0e8365e32c4a --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-80-3.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-3.c @@ -0,0 +1,10 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -mlong-double-80 -mandroid" } */ @@ -210,7 +210,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-4.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..cac2d55bc166c --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-80-4.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-4.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mlong-double-64 -mlong-double-80" } */ @@ -226,7 +226,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-5.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..4aa606fd1ba05 --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-80-5.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-5.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mlong-double-64" } */ @@ -242,7 +242,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-6.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..a395a265942c1 --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-80-6.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-6.c @@ -0,0 +1,11 @@ +/* { dg-do run } */ +/* { dg-options "-O0 -mlong-double-64 -mfpmath=387" } */ @@ -259,7 +259,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-7.c gcc/testsuite/gcc.ta new file mode 100644 index 0000000000000..9b30fe8856786 --- /dev/null -+++ gcc/testsuite/gcc.target/i386/long-double-80-7.c ++++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-7.c @@ -0,0 +1,13 @@ +/* { dg-do run } */ +/* { dg-options "-O0 -mlong-double-64 -mfpmath=sse" } */ @@ -276,8 +276,8 @@ index 0000000000000..9b30fe8856786 +} diff --git libgcc/config/i386/t-linux libgcc/config/i386/t-linux index 29b4c22398346..4f47f7bfa59cf 100644 ---- libgcc/config/i386/t-linux -+++ libgcc/config/i386/t-linux +--- gcc-4.7.4/libgcc/config/i386/t-linux ++++ gcc-4.7.4/libgcc/config/i386/t-linux @@ -2,3 +2,5 @@ # Need to support TImode for x86. Override the settings from # t-slibgcc-elf-ver and t-linux diff --git a/steps/gcc-4.7.4/patches/remove_gperf_dependency.patch b/steps/gcc-4.7.4/patches/remove_gperf_dependency.patch index 76503a5f..d8d71b0c 100644 --- a/steps/gcc-4.7.4/patches/remove_gperf_dependency.patch +++ b/steps/gcc-4.7.4/patches/remove_gperf_dependency.patch @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-3.0-or-later Remove dependency on gperf. ---- gcc/cp/except.c 2021-07-07 18:24:36.561530121 +0100 -+++ gcc/cp/except.c 2021-07-07 18:27:18.035681929 +0100 +--- gcc-4.7.4/gcc/cp/except.c 2021-07-07 18:24:36.561530121 +0100 ++++ gcc-4.7.4/gcc/cp/except.c 2021-07-07 18:27:18.035681929 +0100 @@ -987,8 +987,6 @@ exception, unless it calls a program-supplied function that throws an exception. */ @@ -23,8 +23,8 @@ Remove dependency on gperf. } /* Returns nonzero if an exception of type FROM will be caught by a ---- gcc/cp/Make-lang.in 2021-07-07 18:24:36.571530380 +0100 -+++ gcc/cp/Make-lang.in 2021-07-07 18:26:47.154887799 +0100 +--- gcc-4.7.4/gcc/cp/Make-lang.in 2021-07-07 18:24:36.571530380 +0100 ++++ gcc-4.7.4/gcc/cp/Make-lang.in 2021-07-07 18:26:47.154887799 +0100 @@ -313,7 +313,7 @@ cp/rtti.o: cp/rtti.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) convert.h \ $(TARGET_H) $(C_PRAGMA_H) gt-cp-rtti.h intl.h diff --git a/steps/gzip-1.2.4/pass1.kaem b/steps/gzip-1.2.4/pass1.kaem index 03292cf2..40617815 100755 --- a/steps/gzip-1.2.4/pass1.kaem +++ b/steps/gzip-1.2.4/pass1.kaem @@ -27,11 +27,11 @@ catm gzip.c.new ../../files/stat_override.c gzip.c cp gzip.c.new gzip.c # Remove generated crc table from util.c -patch -Np0 -i ../../patches/removecrc.patch +patch -Np1 -i ../../patches/removecrc.patch # Since IO redirection is not available yet, patch makecrc.c so that it writes # C code to file crc.c that can be appended to util.c -patch -Np0 -i ../../patches/makecrc-write-to-file.patch +patch -Np1 -i ../../patches/makecrc-write-to-file.patch tcc -static -o makecrc sample/makecrc.c ./makecrc diff --git a/steps/gzip-1.2.4/patches/makecrc-write-to-file.patch b/steps/gzip-1.2.4/patches/makecrc-write-to-file.patch index 8568e94e..24dcf2fd 100644 --- a/steps/gzip-1.2.4/patches/makecrc-write-to-file.patch +++ b/steps/gzip-1.2.4/patches/makecrc-write-to-file.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Modify makecrc so that it outputs C code to a file that can be appended to util.c ---- sample/makecrc.c -+++ sample/makecrc.c +--- gzip-1.2.4/sample/makecrc.c ++++ gzip-1.2.4/sample/makecrc.c @@ -47,7 +47,9 @@ main() e |= 1L << (31 - p[i]); diff --git a/steps/gzip-1.2.4/patches/removecrc.patch b/steps/gzip-1.2.4/patches/removecrc.patch index 9e80d27f..c8676ca7 100644 --- a/steps/gzip-1.2.4/patches/removecrc.patch +++ b/steps/gzip-1.2.4/patches/removecrc.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Remove generated CRC table ---- util.c -+++ util.c +--- gzip-1.2.4/util.c ++++ gzip-1.2.4/util.c @@ -406,57 +406,3 @@ voidp xmalloc (size) /* ======================================================================== * Table of CRC-32's of all single-byte values (made by makecrc.c) diff --git a/steps/help2man-1.36.4/patches/date.patch b/steps/help2man-1.36.4/patches/date.patch index e792d4ec..3bedb1e7 100644 --- a/steps/help2man-1.36.4/patches/date.patch +++ b/steps/help2man-1.36.4/patches/date.patch @@ -8,8 +8,8 @@ manpage. This makes manpages not reproducible. diff --color -ru help2man.PL help2man.PL ---- help2man.PL 2022-04-02 10:20:20.100234930 +1100 -+++ help2man.PL 2022-04-02 10:20:21.866247540 +1100 +--- help2man-1.36.4/help2man.PL 2022-04-02 10:20:20.100234930 +1100 ++++ help2man-1.36.4/help2man.PL 2022-04-02 10:20:21.866247540 +1100 @@ -303,7 +303,7 @@ $_, $ARGV[0] } $help_option, $version_option; diff --git a/steps/helpers.sh b/steps/helpers.sh index 02a5cc63..ea2cc057 100755 --- a/steps/helpers.sh +++ b/steps/helpers.sh @@ -369,13 +369,14 @@ default_src_unpack() { # Default function to prepare source code. # It applies all patches from patch_dir (at the moment only -p0 patches are supported). +# Patches are applied from the parent directory. # Then it copies our custom makefile and any other custom files from files directory. default_src_prepare() { if test -d "${patch_dir}"; then if ls "${patch_dir}"/*.patch >/dev/null 2>&1; then for p in "${patch_dir}"/*.patch; do echo "Applying patch: ${p}" - patch -Np0 < "${p}" + patch -d.. -Np0 < "${p}" done fi fi diff --git a/steps/kbd-1.15/patches/fcntl.patch b/steps/kbd-1.15/patches/fcntl.patch index 8784c62f..702ecc6c 100644 --- a/steps/kbd-1.15/patches/fcntl.patch +++ b/steps/kbd-1.15/patches/fcntl.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Add missing fcntl header. ---- src/kbdrate.c 2021-07-22 22:35:53.671970814 +1000 -+++ src/kbdrate.c 2021-07-22 22:36:10.038096797 +1000 +--- kbd-1.15/src/kbdrate.c 2021-07-22 22:35:53.671970814 +1000 ++++ kbd-1.15/src/kbdrate.c 2021-07-22 22:36:10.038096797 +1000 @@ -94,6 +94,7 @@ }; diff --git a/steps/kbd-1.15/patches/resizecons.patch b/steps/kbd-1.15/patches/resizecons.patch index 488e9e01..14fd371a 100644 --- a/steps/kbd-1.15/patches/resizecons.patch +++ b/steps/kbd-1.15/patches/resizecons.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Don't build resizecons (will not build in chroot). ---- src/Makefile.am 2022-02-26 14:11:22.577168053 +1100 -+++ src/Makefile.am 2022-02-26 14:11:34.641835790 +1100 +--- kbd-1.15/src/Makefile.am 2022-02-26 14:11:22.577168053 +1100 ++++ kbd-1.15/src/Makefile.am 2022-02-26 14:11:34.641835790 +1100 @@ -10,10 +10,6 @@ PROGS += getkeycodes setkeycodes endif @@ -17,8 +17,8 @@ Don't build resizecons (will not build in chroot). if OPTIONAL_PROGS PROGS += \ screendump setlogcons setvesablank spawn_console spawn_login \ ---- configure.ac 2022-02-26 14:10:50.047367229 +1100 -+++ configure.ac 2022-02-26 14:11:15.310765839 +1100 +--- kbd-1.15/configure.ac 2022-02-26 14:10:50.047367229 +1100 ++++ kbd-1.15/configure.ac 2022-02-26 14:11:15.310765839 +1100 @@ -53,12 +53,6 @@ esac AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes") diff --git a/steps/kexec-tools-2.0.22/patches/bad-gcc-arg.patch b/steps/kexec-tools-2.0.22/patches/bad-gcc-arg.patch index a0cab66d..44ec76bc 100644 --- a/steps/kexec-tools-2.0.22/patches/bad-gcc-arg.patch +++ b/steps/kexec-tools-2.0.22/patches/bad-gcc-arg.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only GCC 4 does not recognise -fno-stack-protector. ---- purgatory/Makefile 2021-06-03 17:03:41.534638295 +1000 -+++ purgatory/Makefile 2021-06-03 17:03:50.489716136 +1000 +--- kexec-tools-2.0.22/purgatory/Makefile 2021-06-03 17:03:41.534638295 +1000 ++++ kexec-tools-2.0.22/purgatory/Makefile 2021-06-03 17:03:50.489716136 +1000 @@ -49,7 +49,7 @@ $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ -Os -fno-builtin -ffreestanding \ diff --git a/steps/libtool-2.2.4/patches/archive-objs-order.patch b/steps/libtool-2.2.4/patches/archive-objs-order.patch index 4694944f..9dbe8ca2 100644 --- a/steps/libtool-2.2.4/patches/archive-objs-order.patch +++ b/steps/libtool-2.2.4/patches/archive-objs-order.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Backported from upstream commit 74c8993c178a1386ea5e2363a01d919738402f30 ---- libltdl/config/ltmain.m4sh 2008-05-04 22:09:52.000000000 +0300 -+++ libltdl/config/ltmain.m4sh 2022-05-14 14:24:15.506913405 +0300 +--- libtool-2.2.4/libltdl/config/ltmain.m4sh 2008-05-04 22:09:52.000000000 +0300 ++++ libtool-2.2.4/libltdl/config/ltmain.m4sh 2022-05-14 14:24:15.506913405 +0300 @@ -2226,7 +2226,7 @@ darwin_file= darwin_files= @@ -25,8 +25,8 @@ Backported from upstream commit 74c8993c178a1386ea5e2363a01d919738402f30 done func_extract_archives_result="$my_oldobjs" ---- libltdl/config/ltmain.sh 2008-05-04 22:23:13.000000000 +0300 -+++ libltdl/config/ltmain.sh 2022-05-14 14:25:15.314266819 +0300 +--- libtool-2.2.4/libltdl/config/ltmain.sh 2008-05-04 22:23:13.000000000 +0300 ++++ libtool-2.2.4/libltdl/config/ltmain.sh 2022-05-14 14:25:15.314266819 +0300 @@ -2668,7 +2668,7 @@ darwin_file= darwin_files= @@ -45,8 +45,8 @@ Backported from upstream commit 74c8993c178a1386ea5e2363a01d919738402f30 done func_extract_archives_result="$my_oldobjs" ---- libltdl/m4/libtool.m4 2008-05-04 19:34:02.000000000 +0300 -+++ libltdl/m4/libtool.m4 2022-05-14 14:24:15.507913411 +0300 +--- libtool-2.2.4/libltdl/m4/libtool.m4 2008-05-04 19:34:02.000000000 +0300 ++++ libtool-2.2.4/libltdl/m4/libtool.m4 2022-05-14 14:24:15.507913411 +0300 @@ -5864,20 +5864,20 @@ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ diff --git a/steps/libtool-2.2.4/patches/hostname.patch b/steps/libtool-2.2.4/patches/hostname.patch index a90c5a21..d5268239 100644 --- a/steps/libtool-2.2.4/patches/hostname.patch +++ b/steps/libtool-2.2.4/patches/hostname.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later Remove hostname from libtool script. ---- libltdl/m4/libtool.m4 2022-02-26 10:27:30.649198752 +1100 -+++ libltdl/m4/libtool.m4 2022-02-26 10:28:39.458342624 +1100 +--- libtool-2.2.4/libltdl/m4/libtool.m4 2022-02-26 10:27:30.649198752 +1100 ++++ libtool-2.2.4/libltdl/m4/libtool.m4 2022-02-26 10:28:39.458342624 +1100 @@ -684,7 +684,6 @@ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. diff --git a/steps/libtool-2.4.7/patches/hostname.patch b/steps/libtool-2.4.7/patches/hostname.patch index 24858e9e..24771abd 100644 --- a/steps/libtool-2.4.7/patches/hostname.patch +++ b/steps/libtool-2.4.7/patches/hostname.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only Remove hostname from libtool script. ---- m4/libtool.m4 2022-03-17 04:43:39.000000000 +0200 -+++ m4/libtool.m4 2022-09-03 20:04:29.687049292 +0300 +--- libtool-2.4.7/m4/libtool.m4 2022-03-17 04:43:39.000000000 +0200 ++++ libtool-2.4.7/m4/libtool.m4 2022-09-03 20:04:29.687049292 +0300 @@ -730,7 +730,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL diff --git a/steps/linux-4.14.341-openela/patches/4.14.341-openela.patch b/steps/linux-4.14.341-openela/patches/4.14.341-openela.patch index 80efa8ab..9c557b06 100644 --- a/steps/linux-4.14.341-openela/patches/4.14.341-openela.patch +++ b/steps/linux-4.14.341-openela/patches/4.14.341-openela.patch @@ -7,8 +7,8 @@ Patch kernel up to 4.14.341-openela diff --git Documentation/ABI/testing/sysfs-class-net-queues Documentation/ABI/testing/sysfs-class-net-queues index 0c0df91b1516..2734cd9ee43c 100644 ---- Documentation/ABI/testing/sysfs-class-net-queues -+++ Documentation/ABI/testing/sysfs-class-net-queues +--- linux-4.14.336/Documentation/ABI/testing/sysfs-class-net-queues ++++ linux-4.14.336/Documentation/ABI/testing/sysfs-class-net-queues @@ -1,4 +1,4 @@ -What: /sys/class//queues/rx-/rps_cpus +What: /sys/class/net//queues/rx-/rps_cpus @@ -98,8 +98,8 @@ index 0c0df91b1516..2734cd9ee43c 100644 Contact: netdev@vger.kernel.org diff --git Documentation/ABI/testing/sysfs-class-net-statistics Documentation/ABI/testing/sysfs-class-net-statistics index 397118de7b5e..53e508c6936a 100644 ---- Documentation/ABI/testing/sysfs-class-net-statistics -+++ Documentation/ABI/testing/sysfs-class-net-statistics +--- linux-4.14.336/Documentation/ABI/testing/sysfs-class-net-statistics ++++ linux-4.14.336/Documentation/ABI/testing/sysfs-class-net-statistics @@ -1,4 +1,4 @@ -What: /sys/class//statistics/collisions +What: /sys/class/net//statistics/collisions @@ -313,8 +313,8 @@ index 397118de7b5e..53e508c6936a 100644 Contact: netdev@vger.kernel.org diff --git Documentation/sound/soc/dapm.rst Documentation/sound/soc/dapm.rst index 8e44107933ab..c3154ce6e1b2 100644 ---- Documentation/sound/soc/dapm.rst -+++ Documentation/sound/soc/dapm.rst +--- linux-4.14.336/Documentation/sound/soc/dapm.rst ++++ linux-4.14.336/Documentation/sound/soc/dapm.rst @@ -234,7 +234,7 @@ corresponding soft power control. In this case it is necessary to create a virtual widget - a widget with no control bits e.g. :: @@ -326,8 +326,8 @@ index 8e44107933ab..c3154ce6e1b2 100644 diff --git Makefile Makefile index 3e5a7d98a1e3..0a53d6d980f7 100644 ---- Makefile -+++ Makefile +--- linux-4.14.336/Makefile ++++ linux-4.14.336/Makefile @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 @@ -341,8 +341,8 @@ index 3e5a7d98a1e3..0a53d6d980f7 100644 # *DOCUMENTATION* diff --git arch/arc/kernel/signal.c arch/arc/kernel/signal.c index 68901f6f18ba..c36e642eb1a0 100644 ---- arch/arc/kernel/signal.c -+++ arch/arc/kernel/signal.c +--- linux-4.14.336/arch/arc/kernel/signal.c ++++ linux-4.14.336/arch/arc/kernel/signal.c @@ -64,7 +64,7 @@ struct rt_sigframe { unsigned int sigret_magic; }; @@ -369,8 +369,8 @@ index 68901f6f18ba..c36e642eb1a0 100644 #ifndef CONFIG_ISA_ARCOMPACT diff --git arch/arm/boot/dts/imx1-ads.dts arch/arm/boot/dts/imx1-ads.dts index 5ea28ee07cf4..c2ee0a6b74ac 100644 ---- arch/arm/boot/dts/imx1-ads.dts -+++ arch/arm/boot/dts/imx1-ads.dts +--- linux-4.14.336/arch/arm/boot/dts/imx1-ads.dts ++++ linux-4.14.336/arch/arm/boot/dts/imx1-ads.dts @@ -81,7 +81,7 @@ pinctrl-0 = <&pinctrl_weim>; status = "okay"; @@ -382,8 +382,8 @@ index 5ea28ee07cf4..c2ee0a6b74ac 100644 bank-width = <4>; diff --git arch/arm/boot/dts/imx1-apf9328.dts arch/arm/boot/dts/imx1-apf9328.dts index e8b4b52c2418..001984de53ff 100644 ---- arch/arm/boot/dts/imx1-apf9328.dts -+++ arch/arm/boot/dts/imx1-apf9328.dts +--- linux-4.14.336/arch/arm/boot/dts/imx1-apf9328.dts ++++ linux-4.14.336/arch/arm/boot/dts/imx1-apf9328.dts @@ -50,7 +50,7 @@ pinctrl-0 = <&pinctrl_weim>; status = "okay"; @@ -395,8 +395,8 @@ index e8b4b52c2418..001984de53ff 100644 bank-width = <2>; diff --git arch/arm/boot/dts/imx1.dtsi arch/arm/boot/dts/imx1.dtsi index 38d712be5685..65e27c86468a 100644 ---- arch/arm/boot/dts/imx1.dtsi -+++ arch/arm/boot/dts/imx1.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx1.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx1.dtsi @@ -269,9 +269,12 @@ status = "disabled"; }; @@ -413,8 +413,8 @@ index 38d712be5685..65e27c86468a 100644 }; diff --git arch/arm/boot/dts/imx23-sansa.dts arch/arm/boot/dts/imx23-sansa.dts index 221fd55e967e..3e532f4c86a4 100644 ---- arch/arm/boot/dts/imx23-sansa.dts -+++ arch/arm/boot/dts/imx23-sansa.dts +--- linux-4.14.336/arch/arm/boot/dts/imx23-sansa.dts ++++ linux-4.14.336/arch/arm/boot/dts/imx23-sansa.dts @@ -174,10 +174,8 @@ #address-cells = <1>; #size-cells = <0>; @@ -443,8 +443,8 @@ index 221fd55e967e..3e532f4c86a4 100644 touch: touch@20 { diff --git arch/arm/boot/dts/imx23.dtsi arch/arm/boot/dts/imx23.dtsi index 10d57f9cbb42..7a1613258e6c 100644 ---- arch/arm/boot/dts/imx23.dtsi -+++ arch/arm/boot/dts/imx23.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx23.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx23.dtsi @@ -413,7 +413,7 @@ status = "disabled"; }; @@ -456,8 +456,8 @@ index 10d57f9cbb42..7a1613258e6c 100644 interrupts = <7 5 9 26 diff --git arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi index d6f27641c0ef..8676a28f8b7a 100644 ---- arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi -+++ arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi @@ -34,7 +34,7 @@ pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; @@ -469,8 +469,8 @@ index d6f27641c0ef..8676a28f8b7a 100644 }; diff --git arch/arm/boot/dts/imx27-apf27dev.dts arch/arm/boot/dts/imx27-apf27dev.dts index 5f84b598e0d0..167f21434fbf 100644 ---- arch/arm/boot/dts/imx27-apf27dev.dts -+++ arch/arm/boot/dts/imx27-apf27dev.dts +--- linux-4.14.336/arch/arm/boot/dts/imx27-apf27dev.dts ++++ linux-4.14.336/arch/arm/boot/dts/imx27-apf27dev.dts @@ -53,7 +53,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_leds>; @@ -482,8 +482,8 @@ index 5f84b598e0d0..167f21434fbf 100644 linux,default-trigger = "heartbeat"; diff --git arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi index 2cf896c505f9..546b0544f8c9 100644 ---- arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi -+++ arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi @@ -45,7 +45,7 @@ pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; @@ -504,8 +504,8 @@ index 2cf896c505f9..546b0544f8c9 100644 compatible = "cfi-flash"; diff --git arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi index c973c5d91875..1cd3251d21e1 100644 ---- arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi -+++ arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi @@ -326,7 +326,7 @@ &weim { status = "okay"; @@ -517,8 +517,8 @@ index c973c5d91875..1cd3251d21e1 100644 bank-width = <2>; diff --git arch/arm/boot/dts/imx27.dtsi arch/arm/boot/dts/imx27.dtsi index 15d85f1f85fd..507159b5d1d4 100644 ---- arch/arm/boot/dts/imx27.dtsi -+++ arch/arm/boot/dts/imx27.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx27.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx27.dtsi @@ -600,6 +600,9 @@ iram: iram@ffff4c00 { compatible = "mmio-sram"; @@ -531,8 +531,8 @@ index 15d85f1f85fd..507159b5d1d4 100644 }; diff --git arch/arm/boot/dts/imx28.dtsi arch/arm/boot/dts/imx28.dtsi index 2f4ebe0318d3..e489c480f4c0 100644 ---- arch/arm/boot/dts/imx28.dtsi -+++ arch/arm/boot/dts/imx28.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx28.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx28.dtsi @@ -985,7 +985,7 @@ status = "disabled"; }; @@ -544,8 +544,8 @@ index 2f4ebe0318d3..e489c480f4c0 100644 interrupts = <78 79 66 0 diff --git arch/arm/boot/dts/imx7s.dtsi arch/arm/boot/dts/imx7s.dtsi index 836550f2297a..1d158707b5de 100644 ---- arch/arm/boot/dts/imx7s.dtsi -+++ arch/arm/boot/dts/imx7s.dtsi +--- linux-4.14.336/arch/arm/boot/dts/imx7s.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/imx7s.dtsi @@ -674,7 +674,7 @@ }; @@ -566,8 +566,8 @@ index 836550f2297a..1d158707b5de 100644 interrupts = ; diff --git arch/arm/boot/dts/rk3036.dtsi arch/arm/boot/dts/rk3036.dtsi index 03cf0c84ac0a..b1ede7a1e8de 100644 ---- arch/arm/boot/dts/rk3036.dtsi -+++ arch/arm/boot/dts/rk3036.dtsi +--- linux-4.14.336/arch/arm/boot/dts/rk3036.dtsi ++++ linux-4.14.336/arch/arm/boot/dts/rk3036.dtsi @@ -353,12 +353,20 @@ pinctrl-0 = <&hdmi_ctl>; status = "disabled"; @@ -594,8 +594,8 @@ index 03cf0c84ac0a..b1ede7a1e8de 100644 }; diff --git arch/mips/alchemy/devboards/db1200.c arch/mips/alchemy/devboards/db1200.c index ae81e05fcb2c..fe827f98ebf1 100644 ---- arch/mips/alchemy/devboards/db1200.c -+++ arch/mips/alchemy/devboards/db1200.c +--- linux-4.14.336/arch/mips/alchemy/devboards/db1200.c ++++ linux-4.14.336/arch/mips/alchemy/devboards/db1200.c @@ -858,7 +858,7 @@ int __init db1200_dev_setup(void) i2c_register_board_info(0, db1200_i2c_devs, ARRAY_SIZE(db1200_i2c_devs)); @@ -607,8 +607,8 @@ index ae81e05fcb2c..fe827f98ebf1 100644 * S6.7 AC97/I2S selector (OFF=AC97 ON=I2S) diff --git arch/mips/alchemy/devboards/db1550.c arch/mips/alchemy/devboards/db1550.c index 7d3dfaa10231..aaee46fe582f 100644 ---- arch/mips/alchemy/devboards/db1550.c -+++ arch/mips/alchemy/devboards/db1550.c +--- linux-4.14.336/arch/mips/alchemy/devboards/db1550.c ++++ linux-4.14.336/arch/mips/alchemy/devboards/db1550.c @@ -581,7 +581,7 @@ int __init db1550_dev_setup(void) i2c_register_board_info(0, db1550_i2c_devs, ARRAY_SIZE(db1550_i2c_devs)); @@ -620,8 +620,8 @@ index 7d3dfaa10231..aaee46fe582f 100644 if (!IS_ERR(c)) { diff --git arch/mips/include/asm/checksum.h arch/mips/include/asm/checksum.h index 77cad232a1c6..d7f673a6ef6d 100644 ---- arch/mips/include/asm/checksum.h -+++ arch/mips/include/asm/checksum.h +--- linux-4.14.336/arch/mips/include/asm/checksum.h ++++ linux-4.14.336/arch/mips/include/asm/checksum.h @@ -276,7 +276,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, " .set pop" : "=&r" (sum), "=&r" (tmp) @@ -634,8 +634,8 @@ index 77cad232a1c6..d7f673a6ef6d 100644 } diff --git arch/mips/kernel/elf.c arch/mips/kernel/elf.c index 731325a61a78..d7d0a4872389 100644 ---- arch/mips/kernel/elf.c -+++ arch/mips/kernel/elf.c +--- linux-4.14.336/arch/mips/kernel/elf.c ++++ linux-4.14.336/arch/mips/kernel/elf.c @@ -15,6 +15,7 @@ #include @@ -658,8 +658,8 @@ index 731325a61a78..d7d0a4872389 100644 case 0: diff --git arch/parisc/kernel/firmware.c arch/parisc/kernel/firmware.c index 906b7c882587..82f264621845 100644 ---- arch/parisc/kernel/firmware.c -+++ arch/parisc/kernel/firmware.c +--- linux-4.14.336/arch/parisc/kernel/firmware.c ++++ linux-4.14.336/arch/parisc/kernel/firmware.c @@ -127,10 +127,10 @@ static unsigned long f_extend(unsigned long address) #ifdef CONFIG_64BIT if(unlikely(parisc_narrow_firmware)) { @@ -675,8 +675,8 @@ index 906b7c882587..82f264621845 100644 return address; diff --git arch/powerpc/Kconfig arch/powerpc/Kconfig index 3fcfa8534156..ff7a86090eac 100644 ---- arch/powerpc/Kconfig -+++ arch/powerpc/Kconfig +--- linux-4.14.336/arch/powerpc/Kconfig ++++ linux-4.14.336/arch/powerpc/Kconfig @@ -281,12 +281,10 @@ config ARCH_MAY_HAVE_PC_FDC config PPC_UDBG_16550 @@ -781,8 +781,8 @@ index 3fcfa8534156..ff7a86090eac 100644 depends on PPC32 diff --git arch/powerpc/Kconfig.debug arch/powerpc/Kconfig.debug index 6c60cc03a53c..a185e7c3fc9c 100644 ---- arch/powerpc/Kconfig.debug -+++ arch/powerpc/Kconfig.debug +--- linux-4.14.336/arch/powerpc/Kconfig.debug ++++ linux-4.14.336/arch/powerpc/Kconfig.debug @@ -5,7 +5,6 @@ source "lib/Kconfig.debug" config PPC_DISABLE_WERROR @@ -822,8 +822,8 @@ index 6c60cc03a53c..a185e7c3fc9c 100644 bool "Include xmon kernel debugger" diff --git arch/powerpc/include/asm/mmu.h arch/powerpc/include/asm/mmu.h index 6364f5c2cc3e..2cc99f5dd703 100644 ---- arch/powerpc/include/asm/mmu.h -+++ arch/powerpc/include/asm/mmu.h +--- linux-4.14.336/arch/powerpc/include/asm/mmu.h ++++ linux-4.14.336/arch/powerpc/include/asm/mmu.h @@ -332,5 +332,9 @@ static inline void mmu_early_init_devtree(void) { } # include #endif @@ -836,8 +836,8 @@ index 6364f5c2cc3e..2cc99f5dd703 100644 #endif /* _ASM_POWERPC_MMU_H_ */ diff --git arch/powerpc/include/asm/mmzone.h arch/powerpc/include/asm/mmzone.h index 91c69ff53a8a..50c2198c2c76 100644 ---- arch/powerpc/include/asm/mmzone.h -+++ arch/powerpc/include/asm/mmzone.h +--- linux-4.14.336/arch/powerpc/include/asm/mmzone.h ++++ linux-4.14.336/arch/powerpc/include/asm/mmzone.h @@ -42,9 +42,6 @@ u64 memory_hotplug_max(void); #else #define memory_hotplug_max() memblock_end_of_DRAM() @@ -850,8 +850,8 @@ index 91c69ff53a8a..50c2198c2c76 100644 #endif /* _ASM_MMZONE_H_ */ diff --git arch/powerpc/kernel/traps.c arch/powerpc/kernel/traps.c index a507a6874d42..f70799febec4 100644 ---- arch/powerpc/kernel/traps.c -+++ arch/powerpc/kernel/traps.c +--- linux-4.14.336/arch/powerpc/kernel/traps.c ++++ linux-4.14.336/arch/powerpc/kernel/traps.c @@ -1070,10 +1070,12 @@ static int emulate_instruction(struct pt_regs *regs) return -EINVAL; } @@ -867,8 +867,8 @@ index a507a6874d42..f70799febec4 100644 static int emulate_math(struct pt_regs *regs) diff --git arch/powerpc/lib/Makefile arch/powerpc/lib/Makefile index 00c34be4c604..41491eb517cc 100644 ---- arch/powerpc/lib/Makefile -+++ arch/powerpc/lib/Makefile +--- linux-4.14.336/arch/powerpc/lib/Makefile ++++ linux-4.14.336/arch/powerpc/lib/Makefile @@ -21,8 +21,8 @@ obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o # 64-bit linker creates .sfpr on demand for final link (vmlinux), # so it is only needed for modules, and only for older linkers which @@ -882,8 +882,8 @@ index 00c34be4c604..41491eb517cc 100644 obj64-y += copypage_64.o copyuser_64.o mem_64.o hweight_64.o \ diff --git arch/powerpc/lib/sstep.c arch/powerpc/lib/sstep.c index e9bfd9751246..331f3d0cbeb2 100644 ---- arch/powerpc/lib/sstep.c -+++ arch/powerpc/lib/sstep.c +--- linux-4.14.336/arch/powerpc/lib/sstep.c ++++ linux-4.14.336/arch/powerpc/lib/sstep.c @@ -471,6 +471,8 @@ static int do_fp_load(struct instruction_op *op, unsigned long ea, } u; @@ -924,8 +924,8 @@ index e9bfd9751246..331f3d0cbeb2 100644 /* align to multiple of size */ diff --git arch/powerpc/mm/init-common.c arch/powerpc/mm/init-common.c index eb8c6c8c4851..c8515de5292e 100644 ---- arch/powerpc/mm/init-common.c -+++ arch/powerpc/mm/init-common.c +--- linux-4.14.336/arch/powerpc/mm/init-common.c ++++ linux-4.14.336/arch/powerpc/mm/init-common.c @@ -65,7 +65,7 @@ void pgtable_cache_add(unsigned shift, void (*ctor)(void *)) * as to leave enough 0 bits in the address to contain it. */ unsigned long minalign = max(MAX_PGTABLE_INDEX_SIZE + 1, @@ -947,8 +947,8 @@ index eb8c6c8c4851..c8515de5292e 100644 diff --git arch/powerpc/perf/imc-pmu.c arch/powerpc/perf/imc-pmu.c index a0b4c22d963a..0b785c6bdbbf 100644 ---- arch/powerpc/perf/imc-pmu.c -+++ arch/powerpc/perf/imc-pmu.c +--- linux-4.14.336/arch/powerpc/perf/imc-pmu.c ++++ linux-4.14.336/arch/powerpc/perf/imc-pmu.c @@ -246,6 +246,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) attr_group->attrs = attrs; do { @@ -978,8 +978,8 @@ index a0b4c22d963a..0b785c6bdbbf 100644 continue; diff --git arch/powerpc/platforms/40x/Kconfig arch/powerpc/platforms/40x/Kconfig index 60254a321a91..2a9d66254ffc 100644 ---- arch/powerpc/platforms/40x/Kconfig -+++ arch/powerpc/platforms/40x/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/40x/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/40x/Kconfig @@ -2,7 +2,6 @@ config ACADIA bool "Acadia" @@ -1054,8 +1054,8 @@ index 60254a321a91..2a9d66254ffc 100644 This option enables support for the AppliedMicro APM8018X evaluation diff --git arch/powerpc/platforms/44x/Kconfig arch/powerpc/platforms/44x/Kconfig index a6011422b861..559577065af2 100644 ---- arch/powerpc/platforms/44x/Kconfig -+++ arch/powerpc/platforms/44x/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/44x/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/44x/Kconfig @@ -2,7 +2,6 @@ config PPC_47x bool "Support for 47x variant" @@ -1235,8 +1235,8 @@ index a6011422b861..559577065af2 100644 diff --git arch/powerpc/platforms/82xx/Kconfig arch/powerpc/platforms/82xx/Kconfig index 6e04099361b9..1947a88bc69f 100644 ---- arch/powerpc/platforms/82xx/Kconfig -+++ arch/powerpc/platforms/82xx/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/82xx/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/82xx/Kconfig @@ -51,7 +51,6 @@ endif config PQ2ADS @@ -1247,8 +1247,8 @@ index 6e04099361b9..1947a88bc69f 100644 bool diff --git arch/powerpc/platforms/Kconfig arch/powerpc/platforms/Kconfig index e06ccba35133..7cf557c1e1b0 100644 ---- arch/powerpc/platforms/Kconfig -+++ arch/powerpc/platforms/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/Kconfig @@ -23,7 +23,6 @@ source "arch/powerpc/platforms/amigaone/Kconfig" config KVM_GUEST @@ -1380,8 +1380,8 @@ index e06ccba35133..7cf557c1e1b0 100644 Supports for the ULI1575 PCIe south bridge that exists on some diff --git arch/powerpc/platforms/Kconfig.cputype arch/powerpc/platforms/Kconfig.cputype index 3ce376b42330..267cc8f41cf1 100644 ---- arch/powerpc/platforms/Kconfig.cputype -+++ arch/powerpc/platforms/Kconfig.cputype +--- linux-4.14.336/arch/powerpc/platforms/Kconfig.cputype ++++ linux-4.14.336/arch/powerpc/platforms/Kconfig.cputype @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 config PPC64 @@ -1416,8 +1416,8 @@ index 3ce376b42330..267cc8f41cf1 100644 diff --git arch/powerpc/platforms/cell/Kconfig arch/powerpc/platforms/cell/Kconfig index 741a8fa8a3e6..3ad42075f1f4 100644 ---- arch/powerpc/platforms/cell/Kconfig -+++ arch/powerpc/platforms/cell/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/cell/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/cell/Kconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 config PPC_CELL @@ -1444,8 +1444,8 @@ index 741a8fa8a3e6..3ad42075f1f4 100644 config CBE_RAS diff --git arch/powerpc/platforms/maple/Kconfig arch/powerpc/platforms/maple/Kconfig index 376d0be36b66..2601fac50354 100644 ---- arch/powerpc/platforms/maple/Kconfig -+++ arch/powerpc/platforms/maple/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/maple/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/maple/Kconfig @@ -13,7 +13,6 @@ config PPC_MAPLE select PPC_RTAS select MMIO_NVRAM @@ -1456,8 +1456,8 @@ index 376d0be36b66..2601fac50354 100644 For more information, refer to diff --git arch/powerpc/platforms/pasemi/Kconfig arch/powerpc/platforms/pasemi/Kconfig index d458a791d35b..98e3bc22bebc 100644 ---- arch/powerpc/platforms/pasemi/Kconfig -+++ arch/powerpc/platforms/pasemi/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/pasemi/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/pasemi/Kconfig @@ -2,7 +2,6 @@ config PPC_PASEMI depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN @@ -1468,8 +1468,8 @@ index d458a791d35b..98e3bc22bebc 100644 select PPC_UDBG_16550 diff --git arch/powerpc/platforms/powernv/Kconfig arch/powerpc/platforms/powernv/Kconfig index f8dc98d3dc01..05ee7b65d40f 100644 ---- arch/powerpc/platforms/powernv/Kconfig -+++ arch/powerpc/platforms/powernv/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/powernv/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/powernv/Kconfig @@ -35,7 +35,6 @@ config OPAL_PRD config PPC_MEMTRACE bool "Enable removal of RAM from kernel mappings for tracing" @@ -1480,8 +1480,8 @@ index f8dc98d3dc01..05ee7b65d40f 100644 from the kernel mappings to be used for hardware tracing. diff --git arch/powerpc/platforms/powernv/opal-irqchip.c arch/powerpc/platforms/powernv/opal-irqchip.c index ecdcba9d1220..bd37ff2d7bd2 100644 ---- arch/powerpc/platforms/powernv/opal-irqchip.c -+++ arch/powerpc/platforms/powernv/opal-irqchip.c +--- linux-4.14.336/arch/powerpc/platforms/powernv/opal-irqchip.c ++++ linux-4.14.336/arch/powerpc/platforms/powernv/opal-irqchip.c @@ -253,6 +253,8 @@ int __init opal_event_init(void) else name = kasprintf(GFP_KERNEL, "opal"); @@ -1493,8 +1493,8 @@ index ecdcba9d1220..bd37ff2d7bd2 100644 name, NULL); diff --git arch/powerpc/platforms/ps3/Kconfig arch/powerpc/platforms/ps3/Kconfig index 6f7525555b19..24864b8aaf5d 100644 ---- arch/powerpc/platforms/ps3/Kconfig -+++ arch/powerpc/platforms/ps3/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/ps3/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/ps3/Kconfig @@ -49,7 +49,6 @@ config PS3_HTAB_SIZE config PS3_DYNAMIC_DMA depends on PPC_PS3 @@ -1513,8 +1513,8 @@ index 6f7525555b19..24864b8aaf5d 100644 diff --git arch/powerpc/platforms/pseries/Kconfig arch/powerpc/platforms/pseries/Kconfig index 0c698fd6d491..39032d9b316c 100644 ---- arch/powerpc/platforms/pseries/Kconfig -+++ arch/powerpc/platforms/pseries/Kconfig +--- linux-4.14.336/arch/powerpc/platforms/pseries/Kconfig ++++ linux-4.14.336/arch/powerpc/platforms/pseries/Kconfig @@ -28,7 +28,6 @@ config PPC_PSERIES config PPC_SPLPAR depends on PPC_PSERIES @@ -1533,8 +1533,8 @@ index 0c698fd6d491..39032d9b316c 100644 With this option a system running in an LPAR can be given more diff --git arch/powerpc/platforms/pseries/hotplug-memory.c arch/powerpc/platforms/pseries/hotplug-memory.c index 1a3cffdaa1e8..318772785547 100644 ---- arch/powerpc/platforms/pseries/hotplug-memory.c -+++ arch/powerpc/platforms/pseries/hotplug-memory.c +--- linux-4.14.336/arch/powerpc/platforms/pseries/hotplug-memory.c ++++ linux-4.14.336/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -573,7 +573,7 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop) int lmb_found; int i, rc; @@ -1580,8 +1580,8 @@ index 1a3cffdaa1e8..318772785547 100644 rc = 0; diff --git arch/powerpc/sysdev/Kconfig arch/powerpc/sysdev/Kconfig index bcef2ac56479..e0dbec780fe9 100644 ---- arch/powerpc/sysdev/Kconfig -+++ arch/powerpc/sysdev/Kconfig +--- linux-4.14.336/arch/powerpc/sysdev/Kconfig ++++ linux-4.14.336/arch/powerpc/sysdev/Kconfig @@ -6,19 +6,16 @@ config PPC4xx_PCI_EXPRESS bool @@ -1616,8 +1616,8 @@ index bcef2ac56479..e0dbec780fe9 100644 bool diff --git arch/powerpc/sysdev/xive/Kconfig arch/powerpc/sysdev/xive/Kconfig index 70ee976e1de0..785c292d104b 100644 ---- arch/powerpc/sysdev/xive/Kconfig -+++ arch/powerpc/sysdev/xive/Kconfig +--- linux-4.14.336/arch/powerpc/sysdev/xive/Kconfig ++++ linux-4.14.336/arch/powerpc/sysdev/xive/Kconfig @@ -1,17 +1,14 @@ # SPDX-License-Identifier: GPL-2.0 config PPC_XIVE @@ -1638,8 +1638,8 @@ index 70ee976e1de0..785c292d104b 100644 select PPC_XIVE diff --git arch/s390/kernel/ptrace.c arch/s390/kernel/ptrace.c index 7c635e4328b8..60050ba8fa1d 100644 ---- arch/s390/kernel/ptrace.c -+++ arch/s390/kernel/ptrace.c +--- linux-4.14.336/arch/s390/kernel/ptrace.c ++++ linux-4.14.336/arch/s390/kernel/ptrace.c @@ -411,6 +411,7 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data) /* * floating point control reg. is in the thread structure @@ -1669,8 +1669,8 @@ index 7c635e4328b8..60050ba8fa1d 100644 else diff --git arch/s390/kvm/kvm-s390.c arch/s390/kvm/kvm-s390.c index 05bd51752845..ee822b451eb2 100644 ---- arch/s390/kvm/kvm-s390.c -+++ arch/s390/kvm/kvm-s390.c +--- linux-4.14.336/arch/s390/kvm/kvm-s390.c ++++ linux-4.14.336/arch/s390/kvm/kvm-s390.c @@ -2788,8 +2788,6 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) @@ -1682,8 +1682,8 @@ index 05bd51752845..ee822b451eb2 100644 convert_fp_to_vx((__vector128 *) vcpu->run->s.regs.vrs, diff --git arch/s390/pci/pci.c arch/s390/pci/pci.c index 960c4a362d8c..cf6a0af76c8f 100644 ---- arch/s390/pci/pci.c -+++ arch/s390/pci/pci.c +--- linux-4.14.336/arch/s390/pci/pci.c ++++ linux-4.14.336/arch/s390/pci/pci.c @@ -272,7 +272,7 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, /* combine single writes by using store-block insn */ void __iowrite64_copy(void __iomem *to, const void *from, size_t count) @@ -1695,8 +1695,8 @@ index 960c4a362d8c..cf6a0af76c8f 100644 /* Create a virtual mapping cookie for a PCI BAR */ diff --git arch/um/drivers/net_kern.c arch/um/drivers/net_kern.c index 1669240c7a25..f107c9598127 100644 ---- arch/um/drivers/net_kern.c -+++ arch/um/drivers/net_kern.c +--- linux-4.14.336/arch/um/drivers/net_kern.c ++++ linux-4.14.336/arch/um/drivers/net_kern.c @@ -207,7 +207,7 @@ static int uml_net_close(struct net_device *dev) return 0; } @@ -1708,8 +1708,8 @@ index 1669240c7a25..f107c9598127 100644 unsigned long flags; diff --git arch/um/include/shared/kern_util.h arch/um/include/shared/kern_util.h index 35ab97e4bb9b..f2da8347d5f5 100644 ---- arch/um/include/shared/kern_util.h -+++ arch/um/include/shared/kern_util.h +--- linux-4.14.336/arch/um/include/shared/kern_util.h ++++ linux-4.14.336/arch/um/include/shared/kern_util.h @@ -49,7 +49,7 @@ extern void do_uml_exitcalls(void); * Are we disallowed to sleep? Used to choose between GFP_KERNEL and * GFP_ATOMIC. @@ -1721,8 +1721,8 @@ index 35ab97e4bb9b..f2da8347d5f5 100644 extern int cpu(void); diff --git arch/um/kernel/process.c arch/um/kernel/process.c index 691b83b10649..c9d09d04d19d 100644 ---- arch/um/kernel/process.c -+++ arch/um/kernel/process.c +--- linux-4.14.336/arch/um/kernel/process.c ++++ linux-4.14.336/arch/um/kernel/process.c @@ -210,7 +210,7 @@ void arch_cpu_idle(void) local_irq_enable(); } @@ -1734,8 +1734,8 @@ index 691b83b10649..c9d09d04d19d 100644 } diff --git arch/um/os-Linux/helper.c arch/um/os-Linux/helper.c index 3f02d4232812..53d450e4a53a 100644 ---- arch/um/os-Linux/helper.c -+++ arch/um/os-Linux/helper.c +--- linux-4.14.336/arch/um/os-Linux/helper.c ++++ linux-4.14.336/arch/um/os-Linux/helper.c @@ -45,7 +45,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv) unsigned long stack, sp; int pid, fds[2], ret, n; @@ -1765,8 +1765,8 @@ index 3f02d4232812..53d450e4a53a 100644 diff --git arch/um/os-Linux/util.c arch/um/os-Linux/util.c index 8cc8b2617a67..0436cc9537e0 100644 ---- arch/um/os-Linux/util.c -+++ arch/um/os-Linux/util.c +--- linux-4.14.336/arch/um/os-Linux/util.c ++++ linux-4.14.336/arch/um/os-Linux/util.c @@ -166,23 +166,38 @@ __uml_setup("quiet", quiet_cmd_param, "quiet\n" " Turns off information messages during boot.\n\n"); @@ -1810,8 +1810,8 @@ index 8cc8b2617a67..0436cc9537e0 100644 } diff --git arch/x86/kernel/cpu/amd.c arch/x86/kernel/cpu/amd.c index 96305270c435..9ffb0cc5aa01 100644 ---- arch/x86/kernel/cpu/amd.c -+++ arch/x86/kernel/cpu/amd.c +--- linux-4.14.336/arch/x86/kernel/cpu/amd.c ++++ linux-4.14.336/arch/x86/kernel/cpu/amd.c @@ -198,15 +198,6 @@ static void init_amd_k6(struct cpuinfo_x86 *c) return; } @@ -1848,8 +1848,8 @@ index 96305270c435..9ffb0cc5aa01 100644 static void init_amd(struct cpuinfo_x86 *c) diff --git arch/x86/lib/misc.c arch/x86/lib/misc.c index a018ec4fba53..c97be9a1430a 100644 ---- arch/x86/lib/misc.c -+++ arch/x86/lib/misc.c +--- linux-4.14.336/arch/x86/lib/misc.c ++++ linux-4.14.336/arch/x86/lib/misc.c @@ -6,7 +6,7 @@ */ int num_digits(int val) @@ -1861,8 +1861,8 @@ index a018ec4fba53..c97be9a1430a 100644 if (val < 0) { diff --git arch/x86/mm/ident_map.c arch/x86/mm/ident_map.c index 407fa1df470e..50c537a4554b 100644 ---- arch/x86/mm/ident_map.c -+++ arch/x86/mm/ident_map.c +--- linux-4.14.336/arch/x86/mm/ident_map.c ++++ linux-4.14.336/arch/x86/mm/ident_map.c @@ -26,18 +26,31 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, for (; addr < end; addr = next) { pud_t *pud = pud_page + pud_index(addr); @@ -1902,8 +1902,8 @@ index 407fa1df470e..50c537a4554b 100644 continue; diff --git block/bio.c block/bio.c index 1eaf31976702..28e288243266 100644 ---- block/bio.c -+++ block/bio.c +--- linux-4.14.336/block/bio.c ++++ linux-4.14.336/block/bio.c @@ -1723,7 +1723,7 @@ void bio_set_pages_dirty(struct bio *bio) bio_for_each_segment_all(bvec, bio, i) { struct page *page = bvec->bv_page; @@ -1924,8 +1924,8 @@ index 1eaf31976702..28e288243266 100644 } else { diff --git crypto/af_alg.c crypto/af_alg.c index da000a256e91..24de37ac9d27 100644 ---- crypto/af_alg.c -+++ crypto/af_alg.c +--- linux-4.14.336/crypto/af_alg.c ++++ linux-4.14.336/crypto/af_alg.c @@ -1060,9 +1060,13 @@ EXPORT_SYMBOL_GPL(af_alg_sendpage); void af_alg_free_resources(struct af_alg_async_req *areq) { @@ -1963,8 +1963,8 @@ index da000a256e91..24de37ac9d27 100644 areq->last_rsgl = NULL; diff --git crypto/algapi.c crypto/algapi.c index 603d2d637209..8557aff7fb35 100644 ---- crypto/algapi.c -+++ crypto/algapi.c +--- linux-4.14.336/crypto/algapi.c ++++ linux-4.14.336/crypto/algapi.c @@ -222,6 +222,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg) } @@ -1975,8 +1975,8 @@ index 603d2d637209..8557aff7fb35 100644 } diff --git crypto/scompress.c crypto/scompress.c index 2075e2c4e7df..9baaf49f16bb 100644 ---- crypto/scompress.c -+++ crypto/scompress.c +--- linux-4.14.336/crypto/scompress.c ++++ linux-4.14.336/crypto/scompress.c @@ -29,9 +29,17 @@ #include #include "internal.h" @@ -2180,8 +2180,8 @@ index 2075e2c4e7df..9baaf49f16bb 100644 diff --git drivers/acpi/acpi_extlog.c drivers/acpi/acpi_extlog.c index e05309bc41cc..e148b0a28ec9 100644 ---- drivers/acpi/acpi_extlog.c -+++ drivers/acpi/acpi_extlog.c +--- linux-4.14.336/drivers/acpi/acpi_extlog.c ++++ linux-4.14.336/drivers/acpi/acpi_extlog.c @@ -317,9 +317,10 @@ static void __exit extlog_exit(void) { edac_set_report_status(old_edac_report_status); @@ -2197,8 +2197,8 @@ index e05309bc41cc..e148b0a28ec9 100644 release_mem_region(elog_base, elog_size); diff --git drivers/acpi/acpi_video.c drivers/acpi/acpi_video.c index cc228e5ad2b3..d426ece23a70 100644 ---- drivers/acpi/acpi_video.c -+++ drivers/acpi/acpi_video.c +--- linux-4.14.336/drivers/acpi/acpi_video.c ++++ linux-4.14.336/drivers/acpi/acpi_video.c @@ -581,6 +581,15 @@ static const struct dmi_system_id video_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3350"), }, @@ -2236,8 +2236,8 @@ index cc228e5ad2b3..d426ece23a70 100644 memset(&props, 0, sizeof(struct backlight_properties)); diff --git drivers/android/binder_alloc.c drivers/android/binder_alloc.c index f7f0b71c9f68..08f31fa30648 100644 ---- drivers/android/binder_alloc.c -+++ drivers/android/binder_alloc.c +--- linux-4.14.336/drivers/android/binder_alloc.c ++++ linux-4.14.336/drivers/android/binder_alloc.c @@ -284,7 +284,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, } if (mm) { @@ -2309,8 +2309,8 @@ index f7f0b71c9f68..08f31fa30648 100644 alloc->pid, size, alloc->free_async_space); diff --git drivers/ata/ahci.c drivers/ata/ahci.c index 5b810a290b93..c2e5ef709acb 100644 ---- drivers/ata/ahci.c -+++ drivers/ata/ahci.c +--- linux-4.14.336/drivers/ata/ahci.c ++++ linux-4.14.336/drivers/ata/ahci.c @@ -605,6 +605,11 @@ MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)"); static void ahci_pci_save_initial_config(struct pci_dev *pdev, struct ahci_host_priv *hpriv) @@ -2325,8 +2325,8 @@ index 5b810a290b93..c2e5ef709acb 100644 hpriv->force_port_map = 1; diff --git drivers/atm/idt77252.c drivers/atm/idt77252.c index e7a6b4903f9c..c777973f0ff3 100644 ---- drivers/atm/idt77252.c -+++ drivers/atm/idt77252.c +--- linux-4.14.336/drivers/atm/idt77252.c ++++ linux-4.14.336/drivers/atm/idt77252.c @@ -2933,6 +2933,8 @@ open_card_ubr0(struct idt77252_dev *card) vc->scq = alloc_scq(card, vc->class); if (!vc->scq) { @@ -2338,8 +2338,8 @@ index e7a6b4903f9c..c777973f0ff3 100644 diff --git drivers/base/core.c drivers/base/core.c index e834087448a4..4f1ac622df06 100644 ---- drivers/base/core.c -+++ drivers/base/core.c +--- linux-4.14.336/drivers/base/core.c ++++ linux-4.14.336/drivers/base/core.c @@ -3075,6 +3075,50 @@ define_dev_printk_level(_dev_info, KERN_INFO); #endif @@ -2393,8 +2393,8 @@ index e834087448a4..4f1ac622df06 100644 return fwnode && !IS_ERR(fwnode->secondary); diff --git drivers/base/power/domain.c drivers/base/power/domain.c index 0f38df5856e1..a469fb4badf2 100644 ---- drivers/base/power/domain.c -+++ drivers/base/power/domain.c +--- linux-4.14.336/drivers/base/power/domain.c ++++ linux-4.14.336/drivers/base/power/domain.c @@ -749,7 +749,7 @@ static int __init genpd_power_off_unused(void) return 0; @@ -2406,8 +2406,8 @@ index 0f38df5856e1..a469fb4badf2 100644 diff --git drivers/block/virtio_blk.c drivers/block/virtio_blk.c index 7e8f58c2f65b..2d3484a83fd7 100644 ---- drivers/block/virtio_blk.c -+++ drivers/block/virtio_blk.c +--- linux-4.14.336/drivers/block/virtio_blk.c ++++ linux-4.14.336/drivers/block/virtio_blk.c @@ -930,14 +930,15 @@ static int virtblk_freeze(struct virtio_device *vdev) { struct virtio_blk *vblk = vdev->priv; @@ -2437,8 +2437,8 @@ index 7e8f58c2f65b..2d3484a83fd7 100644 #endif diff --git drivers/char/hw_random/core.c drivers/char/hw_random/core.c index 303fd55f9be0..a12561fdd2f0 100644 ---- drivers/char/hw_random/core.c -+++ drivers/char/hw_random/core.c +--- linux-4.14.336/drivers/char/hw_random/core.c ++++ linux-4.14.336/drivers/char/hw_random/core.c @@ -24,10 +24,13 @@ #include #include @@ -2530,8 +2530,8 @@ index 303fd55f9be0..a12561fdd2f0 100644 out_unlock_reading: diff --git drivers/clk/hisilicon/clk-hi3620.c drivers/clk/hisilicon/clk-hi3620.c index fa0fba653898..7f49c7067028 100644 ---- drivers/clk/hisilicon/clk-hi3620.c -+++ drivers/clk/hisilicon/clk-hi3620.c +--- linux-4.14.336/drivers/clk/hisilicon/clk-hi3620.c ++++ linux-4.14.336/drivers/clk/hisilicon/clk-hi3620.c @@ -481,8 +481,10 @@ static void __init hi3620_mmc_clk_init(struct device_node *node) return; @@ -2546,8 +2546,8 @@ index fa0fba653898..7f49c7067028 100644 struct hisi_mmc_clock *mmc_clk = &hi3620_mmc_clks[i]; diff --git drivers/clk/mmp/clk-of-pxa168.c drivers/clk/mmp/clk-of-pxa168.c index f110c02e83cb..9674c6c06dca 100644 ---- drivers/clk/mmp/clk-of-pxa168.c -+++ drivers/clk/mmp/clk-of-pxa168.c +--- linux-4.14.336/drivers/clk/mmp/clk-of-pxa168.c ++++ linux-4.14.336/drivers/clk/mmp/clk-of-pxa168.c @@ -258,18 +258,21 @@ static void __init pxa168_clk_init(struct device_node *np) pxa_unit->mpmu_base = of_iomap(np, 0); if (!pxa_unit->mpmu_base) { @@ -2572,8 +2572,8 @@ index f110c02e83cb..9674c6c06dca 100644 diff --git drivers/clk/rockchip/clk-rk3128.c drivers/clk/rockchip/clk-rk3128.c index 5970a50671b9..83c7eb18321f 100644 ---- drivers/clk/rockchip/clk-rk3128.c -+++ drivers/clk/rockchip/clk-rk3128.c +--- linux-4.14.336/drivers/clk/rockchip/clk-rk3128.c ++++ linux-4.14.336/drivers/clk/rockchip/clk-rk3128.c @@ -497,7 +497,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { GATE(HCLK_I2S_2CH, "hclk_i2s_2ch", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), GATE(0, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 13, GFLAGS), @@ -2585,8 +2585,8 @@ index 5970a50671b9..83c7eb18321f 100644 GATE(HCLK_TSP, "hclk_tsp", "hclk_peri", 0, RK2928_CLKGATE_CON(10), 12, GFLAGS), diff --git drivers/crypto/ccp/ccp-ops.c drivers/crypto/ccp/ccp-ops.c index 453d27d2a4ff..56c571370486 100644 ---- drivers/crypto/ccp/ccp-ops.c -+++ drivers/crypto/ccp/ccp-ops.c +--- linux-4.14.336/drivers/crypto/ccp/ccp-ops.c ++++ linux-4.14.336/drivers/crypto/ccp/ccp-ops.c @@ -183,8 +183,11 @@ static int ccp_init_dm_workarea(struct ccp_dm_workarea *wa, wa->dma.address = dma_map_single(wa->dev, wa->address, len, @@ -2602,8 +2602,8 @@ index 453d27d2a4ff..56c571370486 100644 } diff --git drivers/crypto/sahara.c drivers/crypto/sahara.c index 085c229eab1d..fdc9db6c0d5e 100644 ---- drivers/crypto/sahara.c -+++ drivers/crypto/sahara.c +--- linux-4.14.336/drivers/crypto/sahara.c ++++ linux-4.14.336/drivers/crypto/sahara.c @@ -46,7 +46,6 @@ #define FLAGS_MODE_MASK 0x000f #define FLAGS_ENCRYPT BIT(0) @@ -2899,8 +2899,8 @@ index 085c229eab1d..fdc9db6c0d5e 100644 } diff --git drivers/crypto/virtio/virtio_crypto_common.h drivers/crypto/virtio/virtio_crypto_common.h index e976539a05d9..d8be210a07ec 100644 ---- drivers/crypto/virtio/virtio_crypto_common.h -+++ drivers/crypto/virtio/virtio_crypto_common.h +--- linux-4.14.336/drivers/crypto/virtio/virtio_crypto_common.h ++++ linux-4.14.336/drivers/crypto/virtio/virtio_crypto_common.h @@ -22,6 +22,7 @@ #include #include @@ -2919,8 +2919,8 @@ index e976539a05d9..d8be210a07ec 100644 struct virtio_crypto { diff --git drivers/crypto/virtio/virtio_crypto_core.c drivers/crypto/virtio/virtio_crypto_core.c index ff1410a32c2b..e21dd216989f 100644 ---- drivers/crypto/virtio/virtio_crypto_core.c -+++ drivers/crypto/virtio/virtio_crypto_core.c +--- linux-4.14.336/drivers/crypto/virtio/virtio_crypto_core.c ++++ linux-4.14.336/drivers/crypto/virtio/virtio_crypto_core.c @@ -34,27 +34,28 @@ virtcrypto_clear_request(struct virtio_crypto_request *vc_req) } } @@ -2986,8 +2986,8 @@ index ff1410a32c2b..e21dd216989f 100644 virtcrypto_clear_crypto_engines(vcrypto); diff --git drivers/dma/sh/shdma.h drivers/dma/sh/shdma.h index 2c0a969adc9f..35987a35a848 100644 ---- drivers/dma/sh/shdma.h -+++ drivers/dma/sh/shdma.h +--- linux-4.14.336/drivers/dma/sh/shdma.h ++++ linux-4.14.336/drivers/dma/sh/shdma.h @@ -29,7 +29,7 @@ struct sh_dmae_chan { const struct sh_dmae_slave_config *config; /* Slave DMA configuration */ int xmit_shift; /* log_2(bytes_per_xfer) */ @@ -2999,8 +2999,8 @@ index 2c0a969adc9f..35987a35a848 100644 }; diff --git drivers/edac/thunderx_edac.c drivers/edac/thunderx_edac.c index dfefa39e9351..bc9ecc6c0573 100644 ---- drivers/edac/thunderx_edac.c -+++ drivers/edac/thunderx_edac.c +--- linux-4.14.336/drivers/edac/thunderx_edac.c ++++ linux-4.14.336/drivers/edac/thunderx_edac.c @@ -1154,7 +1154,7 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(int irq, void *irq_id) decode_register(other, OCX_OTHER_SIZE, ocx_com_errors, ctx->reg_com_int); @@ -3045,8 +3045,8 @@ index dfefa39e9351..bc9ecc6c0573 100644 edac_device_handle_ue(l2c->edac_dev, 0, 0, msg); diff --git drivers/firewire/core-card.c drivers/firewire/core-card.c index 11c634125c7d..0e6f96c0e395 100644 ---- drivers/firewire/core-card.c -+++ drivers/firewire/core-card.c +--- linux-4.14.336/drivers/firewire/core-card.c ++++ linux-4.14.336/drivers/firewire/core-card.c @@ -442,7 +442,23 @@ static void bm_work(struct work_struct *work) */ card->bm_generation = generation; @@ -3074,8 +3074,8 @@ index 11c634125c7d..0e6f96c0e395 100644 * config rom. In either case, pick another root. diff --git drivers/firewire/core-device.c drivers/firewire/core-device.c index a293b39fd4ce..25c5de074525 100644 ---- drivers/firewire/core-device.c -+++ drivers/firewire/core-device.c +--- linux-4.14.336/drivers/firewire/core-device.c ++++ linux-4.14.336/drivers/firewire/core-device.c @@ -113,10 +113,9 @@ static int textual_leaf_to_string(const u32 *block, char *buf, size_t size) * @buf: where to put the string * @size: size of @buf, in bytes @@ -3092,8 +3092,8 @@ index a293b39fd4ce..25c5de074525 100644 */ diff --git drivers/firmware/efi/capsule-loader.c drivers/firmware/efi/capsule-loader.c index 539825a17959..fa36bbdb9ca7 100644 ---- drivers/firmware/efi/capsule-loader.c -+++ drivers/firmware/efi/capsule-loader.c +--- linux-4.14.336/drivers/firmware/efi/capsule-loader.c ++++ linux-4.14.336/drivers/firmware/efi/capsule-loader.c @@ -287,7 +287,7 @@ static int efi_capsule_open(struct inode *inode, struct file *file) return -ENOMEM; } @@ -3105,8 +3105,8 @@ index 539825a17959..fa36bbdb9ca7 100644 kfree(cap_info); diff --git drivers/firmware/ti_sci.c drivers/firmware/ti_sci.c index dd677fc4578a..7ac5a8bd05c4 100644 ---- drivers/firmware/ti_sci.c -+++ drivers/firmware/ti_sci.c +--- linux-4.14.336/drivers/firmware/ti_sci.c ++++ linux-4.14.336/drivers/firmware/ti_sci.c @@ -184,7 +184,7 @@ static int ti_sci_debugfs_create(struct platform_device *pdev, { struct device *dev = &pdev->dev; @@ -3133,8 +3133,8 @@ index dd677fc4578a..7ac5a8bd05c4 100644 diff --git drivers/gpio/gpio-74x164.c drivers/gpio/gpio-74x164.c index 15a1f4b348c4..4043fe0c8247 100644 ---- drivers/gpio/gpio-74x164.c -+++ drivers/gpio/gpio-74x164.c +--- linux-4.14.336/drivers/gpio/gpio-74x164.c ++++ linux-4.14.336/drivers/gpio/gpio-74x164.c @@ -133,8 +133,6 @@ static int gen_74x164_probe(struct spi_device *spi) if (IS_ERR(chip->gpiod_oe)) return PTR_ERR(chip->gpiod_oe); @@ -3155,8 +3155,8 @@ index 15a1f4b348c4..4043fe0c8247 100644 return 0; diff --git drivers/gpio/gpiolib-acpi.c drivers/gpio/gpiolib-acpi.c index 713dc43024c9..a2d00b1ff117 100644 ---- drivers/gpio/gpiolib-acpi.c -+++ drivers/gpio/gpiolib-acpi.c +--- linux-4.14.336/drivers/gpio/gpiolib-acpi.c ++++ linux-4.14.336/drivers/gpio/gpiolib-acpi.c @@ -1476,6 +1476,20 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] = { .ignore_wake = "INT33FF:01@0", }, @@ -3180,8 +3180,8 @@ index 713dc43024c9..a2d00b1ff117 100644 diff --git drivers/gpu/drm/amd/amdgpu/amdgpu_device.c drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 076b22c44122..d7192b2a980c 100644 ---- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +--- linux-4.14.336/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ linux-4.14.336/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -701,6 +701,7 @@ static bool amdgpu_vpost_needed(struct amdgpu_device *adev) return true; @@ -3192,8 +3192,8 @@ index 076b22c44122..d7192b2a980c 100644 } diff --git drivers/gpu/drm/amd/amdgpu/kv_dpm.c drivers/gpu/drm/amd/amdgpu/kv_dpm.c index d99fb88341f4..a4c9a326e9f5 100644 ---- drivers/gpu/drm/amd/amdgpu/kv_dpm.c -+++ drivers/gpu/drm/amd/amdgpu/kv_dpm.c +--- linux-4.14.336/drivers/gpu/drm/amd/amdgpu/kv_dpm.c ++++ linux-4.14.336/drivers/gpu/drm/amd/amdgpu/kv_dpm.c @@ -2718,10 +2718,8 @@ static int kv_parse_power_table(struct amdgpu_device *adev) non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; @@ -3208,8 +3208,8 @@ index d99fb88341f4..a4c9a326e9f5 100644 idx = (u8 *)&power_state->v2.clockInfoIndex[0]; diff --git drivers/gpu/drm/amd/amdgpu/si_dpm.c drivers/gpu/drm/amd/amdgpu/si_dpm.c index 288ac692f536..5f80f44f5f67 100644 ---- drivers/gpu/drm/amd/amdgpu/si_dpm.c -+++ drivers/gpu/drm/amd/amdgpu/si_dpm.c +--- linux-4.14.336/drivers/gpu/drm/amd/amdgpu/si_dpm.c ++++ linux-4.14.336/drivers/gpu/drm/amd/amdgpu/si_dpm.c @@ -7336,10 +7336,9 @@ static int si_dpm_init(struct amdgpu_device *adev) adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries = @@ -3225,8 +3225,8 @@ index 288ac692f536..5f80f44f5f67 100644 adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0].v = 0; diff --git drivers/gpu/drm/bridge/nxp-ptn3460.c drivers/gpu/drm/bridge/nxp-ptn3460.c index d64a3283822a..4ea809891f64 100644 ---- drivers/gpu/drm/bridge/nxp-ptn3460.c -+++ drivers/gpu/drm/bridge/nxp-ptn3460.c +--- linux-4.14.336/drivers/gpu/drm/bridge/nxp-ptn3460.c ++++ linux-4.14.336/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -64,13 +64,13 @@ static int ptn3460_read_bytes(struct ptn3460_bridge *ptn_bridge, char addr, int ret; @@ -3254,8 +3254,8 @@ index d64a3283822a..4ea809891f64 100644 } diff --git drivers/gpu/drm/drm_crtc.c drivers/gpu/drm/drm_crtc.c index 5af25ce5bf7c..7e37b439ecae 100644 ---- drivers/gpu/drm/drm_crtc.c -+++ drivers/gpu/drm/drm_crtc.c +--- linux-4.14.336/drivers/gpu/drm/drm_crtc.c ++++ linux-4.14.336/drivers/gpu/drm/drm_crtc.c @@ -556,8 +556,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, struct drm_mode_set set; uint32_t __user *set_connectors_ptr; @@ -3294,8 +3294,8 @@ index 5af25ce5bf7c..7e37b439ecae 100644 } diff --git drivers/gpu/drm/drm_drv.c drivers/gpu/drm/drm_drv.c index 340440febf9a..384a060aa8a1 100644 ---- drivers/gpu/drm/drm_drv.c -+++ drivers/gpu/drm/drm_drv.c +--- linux-4.14.336/drivers/gpu/drm/drm_drv.c ++++ linux-4.14.336/drivers/gpu/drm/drm_drv.c @@ -812,8 +812,11 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto err_minors; } @@ -3322,8 +3322,8 @@ index 340440febf9a..384a060aa8a1 100644 drm_minor_unregister(dev, DRM_MINOR_PRIMARY); diff --git drivers/gpu/drm/drm_file.c drivers/gpu/drm/drm_file.c index 3cf07f5063ff..8705060c72b4 100644 ---- drivers/gpu/drm/drm_file.c -+++ drivers/gpu/drm/drm_file.c +--- linux-4.14.336/drivers/gpu/drm/drm_file.c ++++ linux-4.14.336/drivers/gpu/drm/drm_file.c @@ -138,7 +138,7 @@ int drm_open(struct inode *inode, struct file *filp) { struct drm_device *dev; @@ -3335,8 +3335,8 @@ index 3cf07f5063ff..8705060c72b4 100644 minor = drm_minor_acquire(iminor(inode)); diff --git drivers/gpu/drm/drm_framebuffer.c drivers/gpu/drm/drm_framebuffer.c index af40189cdb60..d6476223a941 100644 ---- drivers/gpu/drm/drm_framebuffer.c -+++ drivers/gpu/drm/drm_framebuffer.c +--- linux-4.14.336/drivers/gpu/drm/drm_framebuffer.c ++++ linux-4.14.336/drivers/gpu/drm/drm_framebuffer.c @@ -521,7 +521,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, struct drm_framebuffer *fb; unsigned flags; @@ -3348,8 +3348,8 @@ index af40189cdb60..d6476223a941 100644 return -EINVAL; diff --git drivers/gpu/drm/drm_mipi_dsi.c drivers/gpu/drm/drm_mipi_dsi.c index 6995bee5ad0f..488e8e35c722 100644 ---- drivers/gpu/drm/drm_mipi_dsi.c -+++ drivers/gpu/drm/drm_mipi_dsi.c +--- linux-4.14.336/drivers/gpu/drm/drm_mipi_dsi.c ++++ linux-4.14.336/drivers/gpu/drm/drm_mipi_dsi.c @@ -305,7 +305,8 @@ static int mipi_dsi_remove_device_fn(struct device *dev, void *priv) { struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev); @@ -3397,8 +3397,8 @@ index 6995bee5ad0f..488e8e35c722 100644 EXPORT_SYMBOL(mipi_dsi_detach); diff --git drivers/gpu/drm/drm_plane.c drivers/gpu/drm/drm_plane.c index 71186bf90760..5354dedaa608 100644 ---- drivers/gpu/drm/drm_plane.c -+++ drivers/gpu/drm/drm_plane.c +--- linux-4.14.336/drivers/gpu/drm/drm_plane.c ++++ linux-4.14.336/drivers/gpu/drm/drm_plane.c @@ -1072,6 +1072,7 @@ retry: out: if (fb) @@ -3409,8 +3409,8 @@ index 71186bf90760..5354dedaa608 100644 crtc->primary->old_fb = NULL; diff --git drivers/gpu/drm/exynos/exynos_drm_drv.c drivers/gpu/drm/exynos/exynos_drm_drv.c index 82b72425a42f..707b4fdd94a7 100644 ---- drivers/gpu/drm/exynos/exynos_drm_drv.c -+++ drivers/gpu/drm/exynos/exynos_drm_drv.c +--- linux-4.14.336/drivers/gpu/drm/exynos/exynos_drm_drv.c ++++ linux-4.14.336/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -407,6 +407,7 @@ err_mode_config_cleanup: drm_release_iommu_mapping(drm); err_free_private: @@ -3448,8 +3448,8 @@ index 82b72425a42f..707b4fdd94a7 100644 .pm = &exynos_drm_pm_ops, diff --git drivers/gpu/drm/exynos/exynos_hdmi.c drivers/gpu/drm/exynos/exynos_hdmi.c index 0109ff40b1db..3d79a7af8c86 100644 ---- drivers/gpu/drm/exynos/exynos_hdmi.c -+++ drivers/gpu/drm/exynos/exynos_hdmi.c +--- linux-4.14.336/drivers/gpu/drm/exynos/exynos_hdmi.c ++++ linux-4.14.336/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1722,6 +1722,8 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) return ret; @@ -3461,8 +3461,8 @@ index 0109ff40b1db..3d79a7af8c86 100644 ret = hdmi_create_connector(encoder); diff --git drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c index 47fa2aba1983..de0dac7b5d85 100644 ---- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c -+++ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +--- linux-4.14.336/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c ++++ linux-4.14.336/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c @@ -284,6 +284,7 @@ static void mdp4_crtc_atomic_disable(struct drm_crtc *crtc, { struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc); @@ -3488,8 +3488,8 @@ index 47fa2aba1983..de0dac7b5d85 100644 diff --git drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c index 4b571cc6bc70..6597def18627 100644 ---- drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c -+++ drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c +--- linux-4.14.336/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c ++++ linux-4.14.336/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c @@ -154,11 +154,17 @@ shadow_fw_init(struct nvkm_bios *bios, const char *name) return (void *)fw; } @@ -3511,8 +3511,8 @@ index 4b571cc6bc70..6597def18627 100644 }; diff --git drivers/gpu/drm/radeon/r100.c drivers/gpu/drm/radeon/r100.c index a4929372090d..56e13bdd4bd0 100644 ---- drivers/gpu/drm/radeon/r100.c -+++ drivers/gpu/drm/radeon/r100.c +--- linux-4.14.336/drivers/gpu/drm/radeon/r100.c ++++ linux-4.14.336/drivers/gpu/drm/radeon/r100.c @@ -2307,7 +2307,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) switch (prim_walk) { case 1: @@ -3533,8 +3533,8 @@ index a4929372090d..56e13bdd4bd0 100644 "bound\n", prim_walk, i); diff --git drivers/gpu/drm/radeon/r600_cs.c drivers/gpu/drm/radeon/r600_cs.c index 97fd58e97043..f478d88aea8f 100644 ---- drivers/gpu/drm/radeon/r600_cs.c -+++ drivers/gpu/drm/radeon/r600_cs.c +--- linux-4.14.336/drivers/gpu/drm/radeon/r600_cs.c ++++ linux-4.14.336/drivers/gpu/drm/radeon/r600_cs.c @@ -1278,7 +1278,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) return -EINVAL; } @@ -3555,8 +3555,8 @@ index 97fd58e97043..f478d88aea8f 100644 track->db_dirty = true; diff --git drivers/gpu/drm/radeon/radeon_display.c drivers/gpu/drm/radeon/radeon_display.c index 173439a8c881..620f301737a4 100644 ---- drivers/gpu/drm/radeon/radeon_display.c -+++ drivers/gpu/drm/radeon/radeon_display.c +--- linux-4.14.336/drivers/gpu/drm/radeon/radeon_display.c ++++ linux-4.14.336/drivers/gpu/drm/radeon/radeon_display.c @@ -678,11 +678,16 @@ static void radeon_crtc_init(struct drm_device *dev, int index) if (radeon_crtc == NULL) return; @@ -3577,8 +3577,8 @@ index 173439a8c881..620f301737a4 100644 if (rdev->family >= CHIP_BONAIRE) { diff --git drivers/gpu/drm/radeon/radeon_vm.c drivers/gpu/drm/radeon/radeon_vm.c index e5c0e635e371..6f2133ff7c2c 100644 ---- drivers/gpu/drm/radeon/radeon_vm.c -+++ drivers/gpu/drm/radeon/radeon_vm.c +--- linux-4.14.336/drivers/gpu/drm/radeon/radeon_vm.c ++++ linux-4.14.336/drivers/gpu/drm/radeon/radeon_vm.c @@ -1205,13 +1205,17 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm) r = radeon_bo_create(rdev, pd_size, align, true, RADEON_GEM_DOMAIN_VRAM, 0, NULL, @@ -3601,8 +3601,8 @@ index e5c0e635e371..6f2133ff7c2c 100644 diff --git drivers/gpu/drm/radeon/si.c drivers/gpu/drm/radeon/si.c index 1144cafea9ac..6dc20e790556 100644 ---- drivers/gpu/drm/radeon/si.c -+++ drivers/gpu/drm/radeon/si.c +--- linux-4.14.336/drivers/gpu/drm/radeon/si.c ++++ linux-4.14.336/drivers/gpu/drm/radeon/si.c @@ -3612,6 +3612,10 @@ static int si_cp_start(struct radeon_device *rdev) for (i = RADEON_RING_TYPE_GFX_INDEX; i <= CAYMAN_RING_TYPE_CP2_INDEX; ++i) { ring = &rdev->ring[i]; @@ -3616,8 +3616,8 @@ index 1144cafea9ac..6dc20e790556 100644 radeon_ring_write(ring, PACKET3_COMPUTE(PACKET3_CLEAR_STATE, 0)); diff --git drivers/gpu/drm/radeon/sumo_dpm.c drivers/gpu/drm/radeon/sumo_dpm.c index fd4804829e46..258cca4ae59b 100644 ---- drivers/gpu/drm/radeon/sumo_dpm.c -+++ drivers/gpu/drm/radeon/sumo_dpm.c +--- linux-4.14.336/drivers/gpu/drm/radeon/sumo_dpm.c ++++ linux-4.14.336/drivers/gpu/drm/radeon/sumo_dpm.c @@ -1493,8 +1493,10 @@ static int sumo_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) @@ -3632,8 +3632,8 @@ index fd4804829e46..258cca4ae59b 100644 kfree(rdev->pm.dpm.ps); diff --git drivers/gpu/drm/radeon/trinity_dpm.c drivers/gpu/drm/radeon/trinity_dpm.c index 2ef7c4e5e495..8fcb7466bf8c 100644 ---- drivers/gpu/drm/radeon/trinity_dpm.c -+++ drivers/gpu/drm/radeon/trinity_dpm.c +--- linux-4.14.336/drivers/gpu/drm/radeon/trinity_dpm.c ++++ linux-4.14.336/drivers/gpu/drm/radeon/trinity_dpm.c @@ -1768,8 +1768,10 @@ static int trinity_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) @@ -3648,8 +3648,8 @@ index 2ef7c4e5e495..8fcb7466bf8c 100644 kfree(rdev->pm.dpm.ps); diff --git drivers/hid/hid-apple.c drivers/hid/hid-apple.c index 80ecbf14d3c8..8ba8f76c92c0 100644 ---- drivers/hid/hid-apple.c -+++ drivers/hid/hid-apple.c +--- linux-4.14.336/drivers/hid/hid-apple.c ++++ linux-4.14.336/drivers/hid/hid-apple.c @@ -54,6 +54,12 @@ MODULE_PARM_DESC(swap_opt_cmd, "Swap the Option (\"Alt\") and Command (\"Flag\") "(For people who want to keep Windows PC keyboard muscle memory. " "[0] = as-is, Mac layout. 1 = swapped, Windows layout.)"); @@ -3769,8 +3769,8 @@ index 80ecbf14d3c8..8ba8f76c92c0 100644 }; diff --git drivers/hid/hid-core.c drivers/hid/hid-core.c index fe3824a6af5c..9bfae325a410 100644 ---- drivers/hid/hid-core.c -+++ drivers/hid/hid-core.c +--- linux-4.14.336/drivers/hid/hid-core.c ++++ linux-4.14.336/drivers/hid/hid-core.c @@ -2063,6 +2063,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, @@ -3781,8 +3781,8 @@ index fe3824a6af5c..9bfae325a410 100644 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) }, diff --git drivers/hid/hid-ids.h drivers/hid/hid-ids.h index 26db838be5a2..1b89c9185c14 100644 ---- drivers/hid/hid-ids.h -+++ drivers/hid/hid-ids.h +--- linux-4.14.336/drivers/hid/hid-ids.h ++++ linux-4.14.336/drivers/hid/hid-ids.h @@ -172,6 +172,7 @@ #define USB_DEVICE_ID_APPLE_IRCONTROL3 0x8241 #define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242 @@ -3793,8 +3793,8 @@ index 26db838be5a2..1b89c9185c14 100644 #define USB_DEVICE_ID_ASUS_T91MT 0x0185 diff --git drivers/hid/wacom_sys.c drivers/hid/wacom_sys.c index 3ca50505c78c..b4c25afb3a36 100644 ---- drivers/hid/wacom_sys.c -+++ drivers/hid/wacom_sys.c +--- linux-4.14.336/drivers/hid/wacom_sys.c ++++ linux-4.14.336/drivers/hid/wacom_sys.c @@ -1920,7 +1920,7 @@ static int wacom_allocate_inputs(struct wacom *wacom) return 0; } @@ -3902,8 +3902,8 @@ index 3ca50505c78c..b4c25afb3a36 100644 wacom_query_tablet_data(wacom); diff --git drivers/hid/wacom_wac.c drivers/hid/wacom_wac.c index 19a798eb395c..eb39c88b5eac 100644 ---- drivers/hid/wacom_wac.c -+++ drivers/hid/wacom_wac.c +--- linux-4.14.336/drivers/hid/wacom_wac.c ++++ linux-4.14.336/drivers/hid/wacom_wac.c @@ -2317,7 +2317,14 @@ static void wacom_wac_pen_report(struct hid_device *hdev, wacom_wac->hid_data.tipswitch); input_report_key(input, wacom_wac->tool[0], prox); @@ -3975,8 +3975,8 @@ index 19a798eb395c..eb39c88b5eac 100644 diff --git drivers/hwmon/aspeed-pwm-tacho.c drivers/hwmon/aspeed-pwm-tacho.c index e4337e9dda44..922c5930373b 100644 ---- drivers/hwmon/aspeed-pwm-tacho.c -+++ drivers/hwmon/aspeed-pwm-tacho.c +--- linux-4.14.336/drivers/hwmon/aspeed-pwm-tacho.c ++++ linux-4.14.336/drivers/hwmon/aspeed-pwm-tacho.c @@ -195,6 +195,8 @@ struct aspeed_pwm_tacho_data { u8 fan_tach_ch_source[16]; struct aspeed_cooling_device *cdev[8]; @@ -4014,8 +4014,8 @@ index e4337e9dda44..922c5930373b 100644 if (IS_ERR(priv->regmap)) diff --git drivers/hwmon/coretemp.c drivers/hwmon/coretemp.c index 770bf76a5348..532cc7286cf0 100644 ---- drivers/hwmon/coretemp.c -+++ drivers/hwmon/coretemp.c +--- linux-4.14.336/drivers/hwmon/coretemp.c ++++ linux-4.14.336/drivers/hwmon/coretemp.c @@ -53,7 +53,7 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius"); #define PKG_SYSFS_ATTR_NO 1 /* Sysfs attribute for package temp */ @@ -4027,8 +4027,8 @@ index 770bf76a5348..532cc7286cf0 100644 #define TOTAL_ATTRS (MAX_CORE_ATTRS + 1) diff --git drivers/hwtracing/coresight/coresight-etm4x.h drivers/hwtracing/coresight/coresight-etm4x.h index b3b5ea7b7fb3..d48c40d8fc28 100644 ---- drivers/hwtracing/coresight/coresight-etm4x.h -+++ drivers/hwtracing/coresight/coresight-etm4x.h +--- linux-4.14.336/drivers/hwtracing/coresight/coresight-etm4x.h ++++ linux-4.14.336/drivers/hwtracing/coresight/coresight-etm4x.h @@ -373,7 +373,7 @@ struct etmv4_drvdata { u8 ctxid_size; u8 vmid_size; @@ -4040,8 +4040,8 @@ index b3b5ea7b7fb3..d48c40d8fc28 100644 u8 q_support; diff --git drivers/i2c/busses/i2c-s3c2410.c drivers/i2c/busses/i2c-s3c2410.c index 911f8628128e..299d8f388d62 100644 ---- drivers/i2c/busses/i2c-s3c2410.c -+++ drivers/i2c/busses/i2c-s3c2410.c +--- linux-4.14.336/drivers/i2c/busses/i2c-s3c2410.c ++++ linux-4.14.336/drivers/i2c/busses/i2c-s3c2410.c @@ -235,8 +235,17 @@ static bool is_ack(struct s3c24xx_i2c *i2c) int tries; @@ -4116,8 +4116,8 @@ index 911f8628128e..299d8f388d62 100644 /* diff --git drivers/infiniband/hw/hfi1/pio.c drivers/infiniband/hw/hfi1/pio.c index 07bf282fd8aa..162f4cb4851a 100644 ---- drivers/infiniband/hw/hfi1/pio.c -+++ drivers/infiniband/hw/hfi1/pio.c +--- linux-4.14.336/drivers/infiniband/hw/hfi1/pio.c ++++ linux-4.14.336/drivers/infiniband/hw/hfi1/pio.c @@ -2133,7 +2133,7 @@ int init_credit_return(struct hfi1_devdata *dd) "Unable to allocate credit return DMA range for NUMA %d\n", i); @@ -4140,8 +4140,8 @@ index 07bf282fd8aa..162f4cb4851a 100644 void free_credit_return(struct hfi1_devdata *dd) diff --git drivers/infiniband/hw/mthca/mthca_cmd.c drivers/infiniband/hw/mthca/mthca_cmd.c index 419a2a20c047..7df5155cdb48 100644 ---- drivers/infiniband/hw/mthca/mthca_cmd.c -+++ drivers/infiniband/hw/mthca/mthca_cmd.c +--- linux-4.14.336/drivers/infiniband/hw/mthca/mthca_cmd.c ++++ linux-4.14.336/drivers/infiniband/hw/mthca/mthca_cmd.c @@ -641,7 +641,7 @@ void mthca_free_mailbox(struct mthca_dev *dev, struct mthca_mailbox *mailbox) int mthca_SYS_EN(struct mthca_dev *dev) @@ -4162,8 +4162,8 @@ index 419a2a20c047..7df5155cdb48 100644 err = mthca_cmd_imm(dev, mailbox->dma, &imm, 0, 0, CMD_MGID_HASH, diff --git drivers/infiniband/hw/mthca/mthca_main.c drivers/infiniband/hw/mthca/mthca_main.c index ccf50dafce9c..66a85f757a2f 100644 ---- drivers/infiniband/hw/mthca/mthca_main.c -+++ drivers/infiniband/hw/mthca/mthca_main.c +--- linux-4.14.336/drivers/infiniband/hw/mthca/mthca_main.c ++++ linux-4.14.336/drivers/infiniband/hw/mthca/mthca_main.c @@ -382,7 +382,7 @@ static int mthca_init_icm(struct mthca_dev *mdev, struct mthca_init_hca_param *init_hca, u64 icm_size) @@ -4175,8 +4175,8 @@ index ccf50dafce9c..66a85f757a2f 100644 err = mthca_SET_ICM_SIZE(mdev, icm_size, &aux_pages); diff --git drivers/infiniband/ulp/ipoib/ipoib_multicast.c drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 9b3f47ae2016..25d7d9219591 100644 ---- drivers/infiniband/ulp/ipoib/ipoib_multicast.c -+++ drivers/infiniband/ulp/ipoib/ipoib_multicast.c +--- linux-4.14.336/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ++++ linux-4.14.336/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -543,21 +543,18 @@ static int ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast) /* SM supports sendonly-fullmember, otherwise fallback to full-member */ rec.join_state = SENDONLY_FULLMEMBER_JOIN; @@ -4203,8 +4203,8 @@ index 9b3f47ae2016..25d7d9219591 100644 } diff --git drivers/infiniband/ulp/srpt/ib_srpt.c drivers/infiniband/ulp/srpt/ib_srpt.c index 1446e1cc69ae..08343e6116d2 100644 ---- drivers/infiniband/ulp/srpt/ib_srpt.c -+++ drivers/infiniband/ulp/srpt/ib_srpt.c +--- linux-4.14.336/drivers/infiniband/ulp/srpt/ib_srpt.c ++++ linux-4.14.336/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -80,12 +80,16 @@ module_param(srpt_srq_size, int, 0444); MODULE_PARM_DESC(srpt_srq_size, "Shared receive queue (SRQ) size."); @@ -4248,8 +4248,8 @@ index 1446e1cc69ae..08343e6116d2 100644 qp_init->srq = sdev->srq; diff --git drivers/input/joystick/xpad.c drivers/input/joystick/xpad.c index 1dbe30335458..3fedc3688e8f 100644 ---- drivers/input/joystick/xpad.c -+++ drivers/input/joystick/xpad.c +--- linux-4.14.336/drivers/input/joystick/xpad.c ++++ linux-4.14.336/drivers/input/joystick/xpad.c @@ -282,6 +282,7 @@ static const struct xpad_device { { 0x146b, 0x0604, "Bigben Interactive DAIJA Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1532, 0x0a00, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, @@ -4260,8 +4260,8 @@ index 1dbe30335458..3fedc3688e8f 100644 { 0x15e4, 0x3f10, "Batarang Xbox 360 controller", 0, XTYPE_XBOX360 }, diff --git drivers/input/keyboard/atkbd.c drivers/input/keyboard/atkbd.c index 7e75835e220f..585bf7392539 100644 ---- drivers/input/keyboard/atkbd.c -+++ drivers/input/keyboard/atkbd.c +--- linux-4.14.336/drivers/input/keyboard/atkbd.c ++++ linux-4.14.336/drivers/input/keyboard/atkbd.c @@ -717,6 +717,44 @@ static void atkbd_deactivate(struct atkbd *atkbd) ps2dev->serio->phys); } @@ -4334,8 +4334,8 @@ index 7e75835e220f..585bf7392539 100644 if (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS)) diff --git drivers/irqchip/irq-brcmstb-l2.c drivers/irqchip/irq-brcmstb-l2.c index b009b916a292..da8a426e9def 100644 ---- drivers/irqchip/irq-brcmstb-l2.c -+++ drivers/irqchip/irq-brcmstb-l2.c +--- linux-4.14.336/drivers/irqchip/irq-brcmstb-l2.c ++++ linux-4.14.336/drivers/irqchip/irq-brcmstb-l2.c @@ -76,6 +76,9 @@ static void brcmstb_l2_intc_irq_handle(struct irq_desc *desc) generic_handle_irq(irq_find_mapping(b->domain, irq)); } while (status); @@ -4348,8 +4348,8 @@ index b009b916a292..da8a426e9def 100644 diff --git drivers/leds/trigger/ledtrig-panic.c drivers/leds/trigger/ledtrig-panic.c index d735526b9db4..2fc04418a87e 100644 ---- drivers/leds/trigger/ledtrig-panic.c -+++ drivers/leds/trigger/ledtrig-panic.c +--- linux-4.14.336/drivers/leds/trigger/ledtrig-panic.c ++++ linux-4.14.336/drivers/leds/trigger/ledtrig-panic.c @@ -67,10 +67,13 @@ static long led_panic_blink(int state) static int __init ledtrig_panic_init(void) @@ -4367,8 +4367,8 @@ index d735526b9db4..2fc04418a87e 100644 } diff --git drivers/md/dm-crypt.c drivers/md/dm-crypt.c index 7cc4281d5a79..966fb898f4b8 100644 ---- drivers/md/dm-crypt.c -+++ drivers/md/dm-crypt.c +--- linux-4.14.336/drivers/md/dm-crypt.c ++++ linux-4.14.336/drivers/md/dm-crypt.c @@ -1742,6 +1742,12 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) io->ctx.bio_out = clone; io->ctx.iter_out = clone->bi_iter; @@ -4384,8 +4384,8 @@ index 7cc4281d5a79..966fb898f4b8 100644 crypt_inc_pending(io); diff --git drivers/md/md.c drivers/md/md.c index 3c2364d0d88f..07da8d7569b5 100644 ---- drivers/md/md.c -+++ drivers/md/md.c +--- linux-4.14.336/drivers/md/md.c ++++ linux-4.14.336/drivers/md/md.c @@ -1018,6 +1018,7 @@ struct super_type { struct md_rdev *refdev, int minor_version); @@ -4511,8 +4511,8 @@ index 3c2364d0d88f..07da8d7569b5 100644 /* This was a hot-add request, but events doesn't diff --git drivers/md/raid5.c drivers/md/raid5.c index d2ac3d189410..6fca2df66550 100644 ---- drivers/md/raid5.c -+++ drivers/md/raid5.c +--- linux-4.14.336/drivers/md/raid5.c ++++ linux-4.14.336/drivers/md/raid5.c @@ -44,7 +44,6 @@ */ @@ -4542,8 +4542,8 @@ index d2ac3d189410..6fca2df66550 100644 diff --git drivers/media/dvb-core/dvbdev.c drivers/media/dvb-core/dvbdev.c index 1b3a54520d68..0506179a7c86 100644 ---- drivers/media/dvb-core/dvbdev.c -+++ drivers/media/dvb-core/dvbdev.c +--- linux-4.14.336/drivers/media/dvb-core/dvbdev.c ++++ linux-4.14.336/drivers/media/dvb-core/dvbdev.c @@ -90,6 +90,8 @@ static int dvb_device_open(struct inode *inode, struct file *file) err = file->f_op->open(inode, file); up_read(&minor_rwsem); @@ -4555,8 +4555,8 @@ index 1b3a54520d68..0506179a7c86 100644 fail: diff --git drivers/media/pci/ddbridge/ddbridge-main.c drivers/media/pci/ddbridge/ddbridge-main.c index ccac7fe31336..13aab32f8048 100644 ---- drivers/media/pci/ddbridge/ddbridge-main.c -+++ drivers/media/pci/ddbridge/ddbridge-main.c +--- linux-4.14.336/drivers/media/pci/ddbridge/ddbridge-main.c ++++ linux-4.14.336/drivers/media/pci/ddbridge/ddbridge-main.c @@ -265,7 +265,7 @@ fail: ddb_unmap(dev); pci_set_drvdata(pdev, NULL); @@ -4568,8 +4568,8 @@ index ccac7fe31336..13aab32f8048 100644 /****************************************************************************/ diff --git drivers/media/usb/cx231xx/cx231xx-core.c drivers/media/usb/cx231xx/cx231xx-core.c index f372ad3917a8..61fd934c0205 100644 ---- drivers/media/usb/cx231xx/cx231xx-core.c -+++ drivers/media/usb/cx231xx/cx231xx-core.c +--- linux-4.14.336/drivers/media/usb/cx231xx/cx231xx-core.c ++++ linux-4.14.336/drivers/media/usb/cx231xx/cx231xx-core.c @@ -1038,6 +1038,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, if (!dev->video_mode.isoc_ctl.urb) { dev_err(dev->dev, @@ -4588,8 +4588,8 @@ index f372ad3917a8..61fd934c0205 100644 diff --git drivers/media/usb/pvrusb2/pvrusb2-context.c drivers/media/usb/pvrusb2/pvrusb2-context.c index d9e8481e9e28..9236463ba269 100644 ---- drivers/media/usb/pvrusb2/pvrusb2-context.c -+++ drivers/media/usb/pvrusb2/pvrusb2-context.c +--- linux-4.14.336/drivers/media/usb/pvrusb2/pvrusb2-context.c ++++ linux-4.14.336/drivers/media/usb/pvrusb2/pvrusb2-context.c @@ -277,7 +277,8 @@ void pvr2_context_disconnect(struct pvr2_context *mp) { pvr2_hdw_disconnect(mp->hdw); @@ -4602,8 +4602,8 @@ index d9e8481e9e28..9236463ba269 100644 diff --git drivers/media/usb/stk1160/stk1160-video.c drivers/media/usb/stk1160/stk1160-video.c index ce8ebbe395a6..8a6cdbc36a08 100644 ---- drivers/media/usb/stk1160/stk1160-video.c -+++ drivers/media/usb/stk1160/stk1160-video.c +--- linux-4.14.336/drivers/media/usb/stk1160/stk1160-video.c ++++ linux-4.14.336/drivers/media/usb/stk1160/stk1160-video.c @@ -117,8 +117,7 @@ void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len) /* @@ -4625,8 +4625,8 @@ index ce8ebbe395a6..8a6cdbc36a08 100644 diff --git drivers/mfd/Kconfig drivers/mfd/Kconfig index fc5e4fef89d2..7e90ed8fdb1c 100644 ---- drivers/mfd/Kconfig -+++ drivers/mfd/Kconfig +--- linux-4.14.336/drivers/mfd/Kconfig ++++ linux-4.14.336/drivers/mfd/Kconfig @@ -1199,6 +1199,7 @@ config MFD_DAVINCI_VOICECODEC config MFD_TI_AM335X_TSCADC @@ -4637,8 +4637,8 @@ index fc5e4fef89d2..7e90ed8fdb1c 100644 select REGMAP_MMIO diff --git drivers/mmc/core/mmc.c drivers/mmc/core/mmc.c index 32bf0b47e339..69f0cc3a28bc 100644 ---- drivers/mmc/core/mmc.c -+++ drivers/mmc/core/mmc.c +--- linux-4.14.336/drivers/mmc/core/mmc.c ++++ linux-4.14.336/drivers/mmc/core/mmc.c @@ -990,10 +990,12 @@ static int mmc_select_bus_width(struct mmc_card *card) static unsigned ext_csd_bits[] = { EXT_CSD_BUS_WIDTH_8, @@ -4654,8 +4654,8 @@ index 32bf0b47e339..69f0cc3a28bc 100644 unsigned idx, bus_width = 0; diff --git drivers/mtd/mtd_blkdevs.c drivers/mtd/mtd_blkdevs.c index 9ec8f033ac5f..5a76e7c549ef 100644 ---- drivers/mtd/mtd_blkdevs.c -+++ drivers/mtd/mtd_blkdevs.c +--- linux-4.14.336/drivers/mtd/mtd_blkdevs.c ++++ linux-4.14.336/drivers/mtd/mtd_blkdevs.c @@ -513,7 +513,7 @@ static void blktrans_notify_add(struct mtd_info *mtd) { struct mtd_blktrans_ops *tr; @@ -4676,8 +4676,8 @@ index 9ec8f033ac5f..5a76e7c549ef 100644 mutex_unlock(&mtd_table_mutex); diff --git drivers/mtd/nand/fsl_ifc_nand.c drivers/mtd/nand/fsl_ifc_nand.c index 0d4928161439..be7d9eb7359c 100644 ---- drivers/mtd/nand/fsl_ifc_nand.c -+++ drivers/mtd/nand/fsl_ifc_nand.c +--- linux-4.14.336/drivers/mtd/nand/fsl_ifc_nand.c ++++ linux-4.14.336/drivers/mtd/nand/fsl_ifc_nand.c @@ -33,7 +33,7 @@ #define ERR_BYTE 0xFF /* Value returned for read @@ -4689,8 +4689,8 @@ index 0d4928161439..be7d9eb7359c 100644 struct fsl_ifc_ctrl; diff --git drivers/net/bonding/bond_alb.c drivers/net/bonding/bond_alb.c index 4926c3e06e4e..6cd4e024b41d 100644 ---- drivers/net/bonding/bond_alb.c -+++ drivers/net/bonding/bond_alb.c +--- linux-4.14.336/drivers/net/bonding/bond_alb.c ++++ linux-4.14.336/drivers/net/bonding/bond_alb.c @@ -988,7 +988,8 @@ static int alb_upper_dev_walk(struct net_device *upper, void *_data) if (netif_is_macvlan(upper) && !strict_match) { tags = bond_verify_device_path(bond->dev, upper, 0); @@ -4703,8 +4703,8 @@ index 4926c3e06e4e..6cd4e024b41d 100644 kfree(tags); diff --git drivers/net/ethernet/aquantia/atlantic/aq_nic.c drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 7a900f76c9ac..396c335909af 100644 ---- drivers/net/ethernet/aquantia/atlantic/aq_nic.c -+++ drivers/net/ethernet/aquantia/atlantic/aq_nic.c +--- linux-4.14.336/drivers/net/ethernet/aquantia/atlantic/aq_nic.c ++++ linux-4.14.336/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -884,7 +884,6 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self, default: err = -1; @@ -4715,8 +4715,8 @@ index 7a900f76c9ac..396c335909af 100644 err = -1; diff --git drivers/net/ethernet/broadcom/bnxt/bnxt.c drivers/net/ethernet/broadcom/bnxt/bnxt.c index ee438674d6cc..180a7ef588cf 100644 ---- drivers/net/ethernet/broadcom/bnxt/bnxt.c -+++ drivers/net/ethernet/broadcom/bnxt/bnxt.c +--- linux-4.14.336/drivers/net/ethernet/broadcom/bnxt/bnxt.c ++++ linux-4.14.336/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -7092,6 +7092,8 @@ static void bnxt_sp_task(struct work_struct *work) bnxt_cfg_ntp_filters(bp); if (test_and_clear_bit(BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT, &bp->sp_event)) @@ -4737,8 +4737,8 @@ index ee438674d6cc..180a7ef588cf 100644 #else diff --git drivers/net/ethernet/broadcom/tg3.c drivers/net/ethernet/broadcom/tg3.c index dc27c81ad512..44556eea780b 100644 ---- drivers/net/ethernet/broadcom/tg3.c -+++ drivers/net/ethernet/broadcom/tg3.c +--- linux-4.14.336/drivers/net/ethernet/broadcom/tg3.c ++++ linux-4.14.336/drivers/net/ethernet/broadcom/tg3.c @@ -6434,6 +6434,14 @@ static void tg3_dump_state(struct tg3 *tp) int i; u32 *regs; @@ -4766,8 +4766,8 @@ index dc27c81ad512..44556eea780b 100644 rtnl_unlock(); diff --git drivers/net/ethernet/cisco/enic/enic_ethtool.c drivers/net/ethernet/cisco/enic/enic_ethtool.c index fd3980cc1e34..3280fbad5d5a 100644 ---- drivers/net/ethernet/cisco/enic/enic_ethtool.c -+++ drivers/net/ethernet/cisco/enic/enic_ethtool.c +--- linux-4.14.336/drivers/net/ethernet/cisco/enic/enic_ethtool.c ++++ linux-4.14.336/drivers/net/ethernet/cisco/enic/enic_ethtool.c @@ -378,7 +378,6 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd) break; default: @@ -4778,8 +4778,8 @@ index fd3980cc1e34..3280fbad5d5a 100644 fsp->h_u.tcp_ip4_spec.ip4src = flow_get_u32_src(&n->keys); diff --git drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/freescale/fec_main.c index 1085f1d721b0..4b169890d301 100644 ---- drivers/net/ethernet/freescale/fec_main.c -+++ drivers/net/ethernet/freescale/fec_main.c +--- linux-4.14.336/drivers/net/ethernet/freescale/fec_main.c ++++ linux-4.14.336/drivers/net/ethernet/freescale/fec_main.c @@ -1746,6 +1746,7 @@ static void fec_enet_adjust_link(struct net_device *ndev) /* if any of the above changed restart the FEC */ @@ -4798,8 +4798,8 @@ index 1085f1d721b0..4b169890d301 100644 fec_stop(ndev); diff --git drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/ethernet/intel/i40e/i40e_main.c index a783ebb14db9..ec5da7cbf416 100644 ---- drivers/net/ethernet/intel/i40e/i40e_main.c -+++ drivers/net/ethernet/intel/i40e/i40e_main.c +--- linux-4.14.336/drivers/net/ethernet/intel/i40e/i40e_main.c ++++ linux-4.14.336/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -4708,7 +4708,7 @@ static int i40e_pf_wait_queues_disabled(struct i40e_pf *pf) { int v, ret = 0; @@ -4811,8 +4811,8 @@ index a783ebb14db9..ec5da7cbf416 100644 if (ret) diff --git drivers/net/ethernet/intel/ixgbe/ixgbe_common.c drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 6b5662674c75..71583f8756c2 100644 ---- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c -+++ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +--- linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c ++++ linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c @@ -55,7 +55,7 @@ static s32 ixgbe_write_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset, u16 words, u16 *data); static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw, @@ -4914,8 +4914,8 @@ index 6b5662674c75..71583f8756c2 100644 /** diff --git drivers/net/ethernet/intel/ixgbe/ixgbe_main.c drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index ac9835e61602..ca9bdaed31c5 100644 ---- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c -+++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +--- linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c ++++ linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -2660,7 +2660,6 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) { struct ixgbe_hw *hw = &adapter->hw; @@ -4978,8 +4978,8 @@ index ac9835e61602..ca9bdaed31c5 100644 static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter) diff --git drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index 654a402f0e9e..09a7c0f4aa2a 100644 ---- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c -+++ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +--- linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c ++++ linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -429,8 +429,7 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw) return status; @@ -5025,8 +5025,8 @@ index 654a402f0e9e..09a7c0f4aa2a 100644 /** ixgbe_set_copper_phy_power - Control power for copper phy diff --git drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h index 94df1d99be95..7002f0a534c7 100644 ---- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h -+++ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +--- linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h ++++ linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h @@ -178,7 +178,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw); s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw, u16 *list_offset, @@ -5038,8 +5038,8 @@ index 94df1d99be95..7002f0a534c7 100644 s32 ixgbe_read_i2c_byte_generic_unlocked(struct ixgbe_hw *hw, u8 byte_offset, diff --git drivers/net/ethernet/intel/ixgbe/ixgbe_type.h drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index ffa0ee5cd0f5..93d18050284d 100644 ---- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h -+++ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +--- linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h ++++ linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h @@ -1227,7 +1227,7 @@ struct ixgbe_thermal_sensor_data { #define IXGBE_PSRTYPE_RQPL_SHIFT 29 @@ -5093,8 +5093,8 @@ index ffa0ee5cd0f5..93d18050284d 100644 #define IXGBE_ERR_RESET_FAILED -15 diff --git drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c index 6ea0d6a5fb90..b5e4e78f86ee 100644 ---- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c -+++ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +--- linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c ++++ linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c @@ -375,7 +375,6 @@ static s32 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw) if (ixgbe_read_eerd_generic(hw, pointer, &length)) { hw_dbg(hw, "EEPROM read failed\n"); @@ -5105,8 +5105,8 @@ index 6ea0d6a5fb90..b5e4e78f86ee 100644 /* Skip pointer section if length is invalid. */ diff --git drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c index 10fa0e095ec3..f99596cf3d7e 100644 ---- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c -+++ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +--- linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c ++++ linux-4.14.336/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c @@ -620,8 +620,10 @@ static s32 ixgbe_setup_fw_link(struct ixgbe_hw *hw) rc = ixgbe_fw_phy_activity(hw, FW_PHY_ACT_SETUP_LINK, &setup); if (rc) @@ -5243,8 +5243,8 @@ index 10fa0e095ec3..f99596cf3d7e 100644 /** diff --git drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c index c567cff499d1..b8c7997ea52b 100644 ---- drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c -+++ drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c +--- linux-4.14.336/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c ++++ linux-4.14.336/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c @@ -229,11 +229,13 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft, ft->g = kcalloc(MLX5E_ARFS_NUM_GROUPS, @@ -5317,8 +5317,8 @@ index c567cff499d1..b8c7997ea52b 100644 diff --git drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c index cd678323bacb..375c1c4ffc0c 100644 ---- drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c -+++ drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c +--- linux-4.14.336/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c ++++ linux-4.14.336/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c @@ -571,11 +571,13 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface) const u32 barcfg_msix_general = NFP_PCIE_BAR_PCIE2CPP_MapType( @@ -5337,8 +5337,8 @@ index cd678323bacb..375c1c4ffc0c 100644 const u32 barcfg_explicit[4] = { diff --git drivers/net/ethernet/qlogic/qla3xxx.c drivers/net/ethernet/qlogic/qla3xxx.c index 6c8a591db713..bc3d268916b8 100644 ---- drivers/net/ethernet/qlogic/qla3xxx.c -+++ drivers/net/ethernet/qlogic/qla3xxx.c +--- linux-4.14.336/drivers/net/ethernet/qlogic/qla3xxx.c ++++ linux-4.14.336/drivers/net/ethernet/qlogic/qla3xxx.c @@ -316,12 +316,11 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev, * buffer */ @@ -5745,8 +5745,8 @@ index 6c8a591db713..bc3d268916b8 100644 pr_err("%s no usable DMA configuration\n", pci_name(pdev)); diff --git drivers/net/ethernet/renesas/ravb_main.c drivers/net/ethernet/renesas/ravb_main.c index b97d450214df..2190ed6b0081 100644 ---- drivers/net/ethernet/renesas/ravb_main.c -+++ drivers/net/ethernet/renesas/ravb_main.c +--- linux-4.14.336/drivers/net/ethernet/renesas/ravb_main.c ++++ linux-4.14.336/drivers/net/ethernet/renesas/ravb_main.c @@ -1545,7 +1545,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) struct ravb_tstamp_skb *ts_skb; struct ravb_tx_desc *desc; @@ -5758,8 +5758,8 @@ index b97d450214df..2190ed6b0081 100644 u32 len; diff --git drivers/net/fjes/fjes_hw.c drivers/net/fjes/fjes_hw.c index 9c652c04375b..c3fa8db69b9e 100644 ---- drivers/net/fjes/fjes_hw.c -+++ drivers/net/fjes/fjes_hw.c +--- linux-4.14.336/drivers/net/fjes/fjes_hw.c ++++ linux-4.14.336/drivers/net/fjes/fjes_hw.c @@ -235,21 +235,25 @@ static int fjes_hw_setup(struct fjes_hw *hw) mem_size = FJES_DEV_REQ_BUF_SIZE(hw->max_epid); @@ -5833,8 +5833,8 @@ index 9c652c04375b..c3fa8db69b9e 100644 static void fjes_hw_cleanup(struct fjes_hw *hw) diff --git drivers/net/gtp.c drivers/net/gtp.c index d7bf8212ff04..a222736c3117 100644 ---- drivers/net/gtp.c -+++ drivers/net/gtp.c +--- linux-4.14.336/drivers/net/gtp.c ++++ linux-4.14.336/drivers/net/gtp.c @@ -1380,26 +1380,26 @@ static int __init gtp_init(void) get_random_bytes(>p_h_initval, sizeof(gtp_h_initval)); @@ -5871,8 +5871,8 @@ index d7bf8212ff04..a222736c3117 100644 return err; diff --git drivers/net/ppp/ppp_async.c drivers/net/ppp/ppp_async.c index 297a986e6653..4d981d9e0e38 100644 ---- drivers/net/ppp/ppp_async.c -+++ drivers/net/ppp/ppp_async.c +--- linux-4.14.336/drivers/net/ppp/ppp_async.c ++++ linux-4.14.336/drivers/net/ppp/ppp_async.c @@ -474,6 +474,10 @@ ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg) case PPPIOCSMRU: if (get_user(val, p)) @@ -5886,8 +5886,8 @@ index 297a986e6653..4d981d9e0e38 100644 ap->mru = val; diff --git drivers/net/usb/ax88172a.c drivers/net/usb/ax88172a.c index 909755ef71ac..5881620e4436 100644 ---- drivers/net/usb/ax88172a.c -+++ drivers/net/usb/ax88172a.c +--- linux-4.14.336/drivers/net/usb/ax88172a.c ++++ linux-4.14.336/drivers/net/usb/ax88172a.c @@ -198,7 +198,9 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf) u8 buf[ETH_ALEN]; struct ax88172a_private *priv; @@ -5901,8 +5901,8 @@ index 909755ef71ac..5881620e4436 100644 if (!priv) diff --git drivers/net/usb/dm9601.c drivers/net/usb/dm9601.c index 5aad26600b03..9b7db5fd9e08 100644 ---- drivers/net/usb/dm9601.c -+++ drivers/net/usb/dm9601.c +--- linux-4.14.336/drivers/net/usb/dm9601.c ++++ linux-4.14.336/drivers/net/usb/dm9601.c @@ -231,7 +231,7 @@ static int dm9601_mdio_read(struct net_device *netdev, int phy_id, int loc) err = dm_read_shared_word(dev, 1, loc, &res); if (err < 0) { @@ -5914,8 +5914,8 @@ index 5aad26600b03..9b7db5fd9e08 100644 netdev_dbg(dev->net, diff --git drivers/net/usb/lan78xx.c drivers/net/usb/lan78xx.c index d6a71c051ec1..171accb5ebbf 100644 ---- drivers/net/usb/lan78xx.c -+++ drivers/net/usb/lan78xx.c +--- linux-4.14.336/drivers/net/usb/lan78xx.c ++++ linux-4.14.336/drivers/net/usb/lan78xx.c @@ -2450,7 +2450,8 @@ static int lan78xx_reset(struct lan78xx_net *dev) if (dev->chipid == ID_REV_CHIP_ID_7801_) buf &= ~MAC_CR_GMII_EN_; @@ -5928,8 +5928,8 @@ index d6a71c051ec1..171accb5ebbf 100644 /* Implies there is no external eeprom. Set mac speed */ diff --git drivers/net/virtio_net.c drivers/net/virtio_net.c index 067ebdd0d589..8e1a3c523b09 100644 ---- drivers/net/virtio_net.c -+++ drivers/net/virtio_net.c +--- linux-4.14.336/drivers/net/virtio_net.c ++++ linux-4.14.336/drivers/net/virtio_net.c @@ -2277,10 +2277,11 @@ static int virtnet_find_vqs(struct virtnet_info *vi) { vq_callback_t **callbacks; @@ -5957,8 +5957,8 @@ index 067ebdd0d589..8e1a3c523b09 100644 if (ctx) diff --git drivers/net/wan/lmc/lmc_proto.c drivers/net/wan/lmc/lmc_proto.c index f600075e84a2..7ae39a2b6340 100644 ---- drivers/net/wan/lmc/lmc_proto.c -+++ drivers/net/wan/lmc/lmc_proto.c +--- linux-4.14.336/drivers/net/wan/lmc/lmc_proto.c ++++ linux-4.14.336/drivers/net/wan/lmc/lmc_proto.c @@ -103,17 +103,13 @@ __be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ switch(sc->if_type){ case LMC_PPP: @@ -5979,8 +5979,8 @@ index f600075e84a2..7ae39a2b6340 100644 diff --git drivers/net/wireless/ath/ath9k/htc_drv_txrx.c drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index e62ed7f42281..763521fca11d 100644 ---- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c -+++ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +--- linux-4.14.336/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c ++++ linux-4.14.336/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c @@ -647,9 +647,10 @@ void ath9k_htc_txstatus(struct ath9k_htc_priv *priv, void *wmi_event) struct ath9k_htc_tx_event *tx_pend; int i; @@ -5996,8 +5996,8 @@ index e62ed7f42281..763521fca11d 100644 skb = ath9k_htc_tx_get_packet(priv, __txs); diff --git drivers/net/wireless/marvell/libertas/Kconfig drivers/net/wireless/marvell/libertas/Kconfig index e6268ceacbf1..28985cdac541 100644 ---- drivers/net/wireless/marvell/libertas/Kconfig -+++ drivers/net/wireless/marvell/libertas/Kconfig +--- linux-4.14.336/drivers/net/wireless/marvell/libertas/Kconfig ++++ linux-4.14.336/drivers/net/wireless/marvell/libertas/Kconfig @@ -1,8 +1,6 @@ config LIBERTAS tristate "Marvell 8xxx Libertas WLAN driver support" @@ -6009,8 +6009,8 @@ index e6268ceacbf1..28985cdac541 100644 ---help--- diff --git drivers/net/wireless/marvell/mwifiex/cfg80211.c drivers/net/wireless/marvell/mwifiex/cfg80211.c index a88bddc38389..76205d6b2f9c 100644 ---- drivers/net/wireless/marvell/mwifiex/cfg80211.c -+++ drivers/net/wireless/marvell/mwifiex/cfg80211.c +--- linux-4.14.336/drivers/net/wireless/marvell/mwifiex/cfg80211.c ++++ linux-4.14.336/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -1940,6 +1940,8 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, mwifiex_set_sys_config_invalid_data(bss_cfg); @@ -6022,8 +6022,8 @@ index a88bddc38389..76205d6b2f9c 100644 if (params->dtim_period) diff --git drivers/net/wireless/marvell/mwifiex/fw.h drivers/net/wireless/marvell/mwifiex/fw.h index c802b73a15c5..99b40bc6e7a6 100644 ---- drivers/net/wireless/marvell/mwifiex/fw.h -+++ drivers/net/wireless/marvell/mwifiex/fw.h +--- linux-4.14.336/drivers/net/wireless/marvell/mwifiex/fw.h ++++ linux-4.14.336/drivers/net/wireless/marvell/mwifiex/fw.h @@ -168,6 +168,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { #define TLV_TYPE_STA_MAC_ADDR (PROPRIETARY_TLV_BASE_ID + 32) #define TLV_TYPE_BSSID (PROPRIETARY_TLV_BASE_ID + 35) @@ -6034,8 +6034,8 @@ index c802b73a15c5..99b40bc6e7a6 100644 #define TLV_TYPE_UAP_BCAST_SSID (PROPRIETARY_TLV_BASE_ID + 48) diff --git drivers/net/wireless/marvell/mwifiex/ioctl.h drivers/net/wireless/marvell/mwifiex/ioctl.h index 0dd592ea6e83..96ff91655a77 100644 ---- drivers/net/wireless/marvell/mwifiex/ioctl.h -+++ drivers/net/wireless/marvell/mwifiex/ioctl.h +--- linux-4.14.336/drivers/net/wireless/marvell/mwifiex/ioctl.h ++++ linux-4.14.336/drivers/net/wireless/marvell/mwifiex/ioctl.h @@ -119,6 +119,7 @@ struct mwifiex_uap_bss_param { u8 qos_info; u8 power_constraint; @@ -6046,8 +6046,8 @@ index 0dd592ea6e83..96ff91655a77 100644 enum { diff --git drivers/net/wireless/marvell/mwifiex/uap_cmd.c drivers/net/wireless/marvell/mwifiex/uap_cmd.c index 0939a8c8f3ab..1ab253c97c14 100644 ---- drivers/net/wireless/marvell/mwifiex/uap_cmd.c -+++ drivers/net/wireless/marvell/mwifiex/uap_cmd.c +--- linux-4.14.336/drivers/net/wireless/marvell/mwifiex/uap_cmd.c ++++ linux-4.14.336/drivers/net/wireless/marvell/mwifiex/uap_cmd.c @@ -479,6 +479,7 @@ void mwifiex_config_uap_11d(struct mwifiex_private *priv, static int mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size) @@ -6072,8 +6072,8 @@ index 0939a8c8f3ab..1ab253c97c14 100644 ssid->header.type = cpu_to_le16(TLV_TYPE_UAP_SSID); diff --git drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index bfd704b17a44..9263a6a64788 100644 ---- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c -+++ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -6366,6 +6366,18 @@ static const struct usb_device_id dev_table[] = { .driver_info = (unsigned long)&rtl8192eu_fops}, {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x818c, 0xff, 0xff, 0xff), @@ -6095,8 +6095,8 @@ index bfd704b17a44..9263a6a64788 100644 }; diff --git drivers/net/wireless/realtek/rtlwifi/pci.c drivers/net/wireless/realtek/rtlwifi/pci.c index ab74f3155854..b6c3a6d422ea 100644 ---- drivers/net/wireless/realtek/rtlwifi/pci.c -+++ drivers/net/wireless/realtek/rtlwifi/pci.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/pci.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -194,21 +194,29 @@ static bool _rtl_pci_platform_switch_device_pci_aspm( struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); @@ -6260,8 +6260,8 @@ index ab74f3155854..b6c3a6d422ea 100644 rtl_pci_parse_configuration(pdev, hw); diff --git drivers/net/wireless/realtek/rtlwifi/pci.h drivers/net/wireless/realtek/rtlwifi/pci.h index d9039ea10ba4..19b7a57313da 100644 ---- drivers/net/wireless/realtek/rtlwifi/pci.h -+++ drivers/net/wireless/realtek/rtlwifi/pci.h +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/pci.h ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/pci.h @@ -262,11 +262,6 @@ struct mp_adapter { u16 pcibridge_vendorid; u16 pcibridge_deviceid; @@ -6276,8 +6276,8 @@ index d9039ea10ba4..19b7a57313da 100644 diff --git drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c index 14a256062614..44cabfa1ca27 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c @@ -38,7 +38,6 @@ static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw, static void _rtl88e_phy_rf_serial_write(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset, @@ -6342,8 +6342,8 @@ index 14a256062614..44cabfa1ca27 100644 struct rtl_priv *rtlpriv = rtl_priv(hw); diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c index 7c6e5d91439d..bc2b3849828d 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c @@ -39,7 +39,7 @@ u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask) RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask); @@ -6383,8 +6383,8 @@ index 7c6e5d91439d..bc2b3849828d 100644 rtl_set_bbreg(hw, RFPGA0_TXINFO, 0x3, 0x2); diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h index d11261e05a2e..76f574047c62 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h @@ -218,7 +218,6 @@ bool rtl92c_phy_set_rf_power_state(struct ieee80211_hw *hw, void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); void rtl92c_phy_set_io(struct ieee80211_hw *hw); @@ -6395,8 +6395,8 @@ index d11261e05a2e..76f574047c62 100644 u8 txpwridx); diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c index 7c6d7fc1ef9a..9f478d8af804 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c @@ -61,7 +61,7 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw, rfpath, regaddr); } @@ -6426,8 +6426,8 @@ index 7c6d7fc1ef9a..9f478d8af804 100644 (data << bitshift)); diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h index 93f3bc0197b4..e084a91e26d9 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h @@ -116,7 +116,6 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset); u32 _rtl92c_phy_fw_rf_serial_read(struct ieee80211_hw *hw, @@ -6438,8 +6438,8 @@ index 93f3bc0197b4..e084a91e26d9 100644 void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw, diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c index f068dd5317a7..5a5476a2dc2f 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c @@ -54,7 +54,7 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw, original_value = _rtl92c_phy_fw_rf_serial_read(hw, rfpath, regaddr); @@ -6469,8 +6469,8 @@ index f068dd5317a7..5a5476a2dc2f 100644 (data << bitshift)); diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c index 53734250479c..2ee779614269 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c @@ -182,17 +182,14 @@ static u32 targetchnl_2g[TARGET_CHNL_NUM_2G] = { 25711, 25658, 25606, 25554, 25502, 25451, 25328 }; @@ -6599,8 +6599,8 @@ index 53734250479c..2ee779614269 100644 group = 11; diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c index 8b072ee8e0d5..9a3e88d6a570 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c @@ -38,7 +38,6 @@ static u32 _rtl92ee_phy_rf_serial_read(struct ieee80211_hw *hw, static void _rtl92ee_phy_rf_serial_write(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset, @@ -6665,8 +6665,8 @@ index 8b072ee8e0d5..9a3e88d6a570 100644 return _rtl92ee_phy_config_mac_with_headerfile(hw); diff --git drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c index 86cb853f7169..0430a3b823d6 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c @@ -36,18 +36,6 @@ #include "hw.h" #include "table.h" @@ -6724,8 +6724,8 @@ index 86cb853f7169..0430a3b823d6 100644 diff --git drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c index 5cf29f5a4b54..e6ac496e898e 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c @@ -72,7 +72,7 @@ u32 rtl8723e_phy_query_rf_reg(struct ieee80211_hw *hw, rfpath, regaddr); } @@ -6755,8 +6755,8 @@ index 5cf29f5a4b54..e6ac496e898e 100644 (data << bitshift)); diff --git drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c index 9606641519e7..f1b42f9d6cd1 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c @@ -63,7 +63,7 @@ u32 rtl8723be_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags); @@ -6777,8 +6777,8 @@ index 9606641519e7..f1b42f9d6cd1 100644 } diff --git drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c index 43d24e1ee5e6..af9cd74e09d4 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c @@ -75,13 +75,9 @@ EXPORT_SYMBOL_GPL(rtl8723_phy_set_bb_reg); u32 rtl8723_phy_calculate_bit_shift(u32 bitmask) @@ -6797,8 +6797,8 @@ index 43d24e1ee5e6..af9cd74e09d4 100644 diff --git drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c index 176deb2b5386..f96d823e7f14 100644 ---- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c @@ -49,7 +49,13 @@ static u32 _rtl8821ae_phy_rf_serial_read(struct ieee80211_hw *hw, static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset, @@ -6834,8 +6834,8 @@ index 176deb2b5386..f96d823e7f14 100644 bool rtstatus = 0; diff --git drivers/net/wireless/realtek/rtlwifi/wifi.h drivers/net/wireless/realtek/rtlwifi/wifi.h index c73ce334ce6c..61f5b6fc1754 100644 ---- drivers/net/wireless/realtek/rtlwifi/wifi.h -+++ drivers/net/wireless/realtek/rtlwifi/wifi.h +--- linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/wifi.h ++++ linux-4.14.336/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -3095,4 +3095,11 @@ static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw, return ieee80211_find_sta(mac->vif, mac_addr); } @@ -6850,8 +6850,8 @@ index c73ce334ce6c..61f5b6fc1754 100644 #endif diff --git drivers/net/xen-netback/netback.c drivers/net/xen-netback/netback.c index 47e7e9aab9cf..901ddea37da6 100644 ---- drivers/net/xen-netback/netback.c -+++ drivers/net/xen-netback/netback.c +--- linux-4.14.336/drivers/net/xen-netback/netback.c ++++ linux-4.14.336/drivers/net/xen-netback/netback.c @@ -97,13 +97,12 @@ module_param_named(hash_cache_size, xenvif_hash_cache_size, uint, 0644); MODULE_PARM_DESC(hash_cache_size, "Number of flows in the hash cache"); @@ -7050,8 +7050,8 @@ index 47e7e9aab9cf..901ddea37da6 100644 static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx) diff --git drivers/pci/host/pcie-mediatek.c drivers/pci/host/pcie-mediatek.c index 60c3110b5151..6a47a6681f8d 100644 ---- drivers/pci/host/pcie-mediatek.c -+++ drivers/pci/host/pcie-mediatek.c +--- linux-4.14.336/drivers/pci/host/pcie-mediatek.c ++++ linux-4.14.336/drivers/pci/host/pcie-mediatek.c @@ -628,6 +628,14 @@ static irqreturn_t mtk_pcie_intr_handler(int irq, void *data) while ((status = readl(port->base + PCIE_INT_STATUS)) & MSI_STATUS) { unsigned long imsi_status; @@ -7078,8 +7078,8 @@ index 60c3110b5151..6a47a6681f8d 100644 diff --git drivers/pci/msi.c drivers/pci/msi.c index bbddf492da9f..548045dda97c 100644 ---- drivers/pci/msi.c -+++ drivers/pci/msi.c +--- linux-4.14.336/drivers/pci/msi.c ++++ linux-4.14.336/drivers/pci/msi.c @@ -1380,7 +1380,7 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, { return (irq_hw_number_t)desc->msi_attrib.entry_nr | @@ -7091,8 +7091,8 @@ index bbddf492da9f..548045dda97c 100644 static inline bool pci_msi_desc_is_multi_msi(struct msi_desc *desc) diff --git drivers/pci/quirks.c drivers/pci/quirks.c index e32147929cf3..ef9303547484 100644 ---- drivers/pci/quirks.c -+++ drivers/pci/quirks.c +--- linux-4.14.336/drivers/pci/quirks.c ++++ linux-4.14.336/drivers/pci/quirks.c @@ -441,10 +441,13 @@ static void quirk_amd_dwc_class(struct pci_dev *pdev) { u32 class = pdev->class; @@ -7133,8 +7133,8 @@ index e32147929cf3..ef9303547484 100644 * Entire 1st generation (Light Ridge, Eagle Ridge, Light Peak) and part diff --git drivers/phy/ti/phy-omap-usb2.c drivers/phy/ti/phy-omap-usb2.c index fe909fd8144f..ae94e1e66bcc 100644 ---- drivers/phy/ti/phy-omap-usb2.c -+++ drivers/phy/ti/phy-omap-usb2.c +--- linux-4.14.336/drivers/phy/ti/phy-omap-usb2.c ++++ linux-4.14.336/drivers/phy/ti/phy-omap-usb2.c @@ -64,7 +64,7 @@ static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled) { struct omap_usb *phy = phy_to_omapusb(otg->usb_phy); @@ -7155,8 +7155,8 @@ index fe909fd8144f..ae94e1e66bcc 100644 return phy->comparator->start_srp(phy->comparator); diff --git drivers/pnp/pnpacpi/rsparser.c drivers/pnp/pnpacpi/rsparser.c index 43d8ed577e70..d8cee80e8df8 100644 ---- drivers/pnp/pnpacpi/rsparser.c -+++ drivers/pnp/pnpacpi/rsparser.c +--- linux-4.14.336/drivers/pnp/pnpacpi/rsparser.c ++++ linux-4.14.336/drivers/pnp/pnpacpi/rsparser.c @@ -160,13 +160,13 @@ static int vendor_resource_matches(struct pnp_dev *dev, static void pnpacpi_parse_allocated_vendor(struct pnp_dev *dev, struct acpi_resource_vendor_typed *vendor) @@ -7179,8 +7179,8 @@ index 43d8ed577e70..d8cee80e8df8 100644 diff --git drivers/power/supply/bq27xxx_battery_i2c.c drivers/power/supply/bq27xxx_battery_i2c.c index 426ce81333a5..3eb839405d3f 100644 ---- drivers/power/supply/bq27xxx_battery_i2c.c -+++ drivers/power/supply/bq27xxx_battery_i2c.c +--- linux-4.14.336/drivers/power/supply/bq27xxx_battery_i2c.c ++++ linux-4.14.336/drivers/power/supply/bq27xxx_battery_i2c.c @@ -217,7 +217,9 @@ static int bq27xxx_battery_i2c_remove(struct i2c_client *client) { struct bq27xxx_device_info *di = i2c_get_clientdata(client); @@ -7194,8 +7194,8 @@ index 426ce81333a5..3eb839405d3f 100644 mutex_lock(&battery_mutex); diff --git drivers/regulator/pwm-regulator.c drivers/regulator/pwm-regulator.c index a2fd140eff81..5faa5906ad69 100644 ---- drivers/regulator/pwm-regulator.c -+++ drivers/regulator/pwm-regulator.c +--- linux-4.14.336/drivers/regulator/pwm-regulator.c ++++ linux-4.14.336/drivers/regulator/pwm-regulator.c @@ -164,6 +164,9 @@ static int pwm_regulator_get_voltage(struct regulator_dev *rdev) pwm_get_state(drvdata->pwm, &pstate); @@ -7208,8 +7208,8 @@ index a2fd140eff81..5faa5906ad69 100644 * The dutycycle for min_uV might be greater than the one for max_uV. diff --git drivers/reset/hisilicon/hi6220_reset.c drivers/reset/hisilicon/hi6220_reset.c index d5e5229308f2..d77a7ad7e57a 100644 ---- drivers/reset/hisilicon/hi6220_reset.c -+++ drivers/reset/hisilicon/hi6220_reset.c +--- linux-4.14.336/drivers/reset/hisilicon/hi6220_reset.c ++++ linux-4.14.336/drivers/reset/hisilicon/hi6220_reset.c @@ -107,7 +107,7 @@ static int hi6220_reset_probe(struct platform_device *pdev) if (!data) return -ENOMEM; @@ -7221,8 +7221,8 @@ index d5e5229308f2..d77a7ad7e57a 100644 if (IS_ERR(regmap)) { diff --git drivers/rpmsg/virtio_rpmsg_bus.c drivers/rpmsg/virtio_rpmsg_bus.c index 82b83002fcba..5aeb976fb4ee 100644 ---- drivers/rpmsg/virtio_rpmsg_bus.c -+++ drivers/rpmsg/virtio_rpmsg_bus.c +--- linux-4.14.336/drivers/rpmsg/virtio_rpmsg_bus.c ++++ linux-4.14.336/drivers/rpmsg/virtio_rpmsg_bus.c @@ -389,6 +389,7 @@ static void virtio_rpmsg_release_device(struct device *dev) struct rpmsg_device *rpdev = to_rpmsg_device(dev); struct virtio_rpmsg_channel *vch = to_virtio_rpmsg_channel(rpdev); @@ -7233,8 +7233,8 @@ index 82b83002fcba..5aeb976fb4ee 100644 diff --git drivers/s390/block/scm_blk.c drivers/s390/block/scm_blk.c index 5c944ee76ec1..a37fd27258bd 100644 ---- drivers/s390/block/scm_blk.c -+++ drivers/s390/block/scm_blk.c +--- linux-4.14.336/drivers/s390/block/scm_blk.c ++++ linux-4.14.336/drivers/s390/block/scm_blk.c @@ -17,6 +17,7 @@ #include #include @@ -7269,8 +7269,8 @@ index 5c944ee76ec1..a37fd27258bd 100644 diff --git drivers/s390/net/qeth_l3_main.c drivers/s390/net/qeth_l3_main.c index 8bccfd686b73..7d9a64e2691a 100644 ---- drivers/s390/net/qeth_l3_main.c -+++ drivers/s390/net/qeth_l3_main.c +--- linux-4.14.336/drivers/s390/net/qeth_l3_main.c ++++ linux-4.14.336/drivers/s390/net/qeth_l3_main.c @@ -364,9 +364,10 @@ static void qeth_l3_clear_ip_htable(struct qeth_card *card, int recover) if (!recover) { hash_del(&addr->hnode); @@ -7301,8 +7301,8 @@ index 8bccfd686b73..7d9a64e2691a 100644 } diff --git drivers/scsi/Kconfig drivers/scsi/Kconfig index ba1bfb30a272..aeb73c170b3a 100644 ---- drivers/scsi/Kconfig -+++ drivers/scsi/Kconfig +--- linux-4.14.336/drivers/scsi/Kconfig ++++ linux-4.14.336/drivers/scsi/Kconfig @@ -1394,7 +1394,7 @@ source "drivers/scsi/arm/Kconfig" config JAZZ_ESP @@ -7314,8 +7314,8 @@ index ba1bfb30a272..aeb73c170b3a 100644 This is the driver for the onboard SCSI host adapter of MIPS Magnum diff --git drivers/scsi/fcoe/fcoe_ctlr.c drivers/scsi/fcoe/fcoe_ctlr.c index 57826f7bb9f2..1c8fa41aa3ab 100644 ---- drivers/scsi/fcoe/fcoe_ctlr.c -+++ drivers/scsi/fcoe/fcoe_ctlr.c +--- linux-4.14.336/drivers/scsi/fcoe/fcoe_ctlr.c ++++ linux-4.14.336/drivers/scsi/fcoe/fcoe_ctlr.c @@ -330,17 +330,16 @@ static void fcoe_ctlr_announce(struct fcoe_ctlr *fip) { struct fcoe_fcf *sel; @@ -7402,8 +7402,8 @@ index 57826f7bb9f2..1c8fa41aa3ab 100644 /** diff --git drivers/scsi/isci/request.c drivers/scsi/isci/request.c index 2f151708b59a..13ecf554762e 100644 ---- drivers/scsi/isci/request.c -+++ drivers/scsi/isci/request.c +--- linux-4.14.336/drivers/scsi/isci/request.c ++++ linux-4.14.336/drivers/scsi/isci/request.c @@ -3398,7 +3398,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost, return SCI_FAILURE; } @@ -7415,8 +7415,8 @@ index 2f151708b59a..13ecf554762e 100644 static struct isci_request *isci_request_from_tag(struct isci_host *ihost, u16 tag) diff --git drivers/scsi/libfc/fc_fcp.c drivers/scsi/libfc/fc_fcp.c index 772c35a5c49e..72ceffc58112 100644 ---- drivers/scsi/libfc/fc_fcp.c -+++ drivers/scsi/libfc/fc_fcp.c +--- linux-4.14.336/drivers/scsi/libfc/fc_fcp.c ++++ linux-4.14.336/drivers/scsi/libfc/fc_fcp.c @@ -283,6 +283,11 @@ static int fc_fcp_send_abort(struct fc_fcp_pkt *fsp) if (!fsp->seq_ptr) return -EINVAL; @@ -7458,8 +7458,8 @@ index 772c35a5c49e..72ceffc58112 100644 /** diff --git drivers/scsi/lpfc/lpfc.h drivers/scsi/lpfc/lpfc.h index 5fc41aa53ceb..97a2f6c6337c 100644 ---- drivers/scsi/lpfc/lpfc.h -+++ drivers/scsi/lpfc/lpfc.h +--- linux-4.14.336/drivers/scsi/lpfc/lpfc.h ++++ linux-4.14.336/drivers/scsi/lpfc/lpfc.h @@ -31,6 +31,7 @@ struct lpfc_sli2_slim; @@ -7470,8 +7470,8 @@ index 5fc41aa53ceb..97a2f6c6337c 100644 #define LPFC_PCI_DEV_OC 0x2 diff --git drivers/scsi/lpfc/lpfc_init.c drivers/scsi/lpfc/lpfc_init.c index 3e9574eede20..0f954853ccad 100644 ---- drivers/scsi/lpfc/lpfc_init.c -+++ drivers/scsi/lpfc/lpfc_init.c +--- linux-4.14.336/drivers/scsi/lpfc/lpfc_init.c ++++ linux-4.14.336/drivers/scsi/lpfc/lpfc_init.c @@ -11086,7 +11086,7 @@ out: int lpfc_sli4_request_firmware_update(struct lpfc_hba *phba, uint8_t fw_upgrade) @@ -7492,8 +7492,8 @@ index 3e9574eede20..0f954853ccad 100644 ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, diff --git drivers/spi/spi-ppc4xx.c drivers/spi/spi-ppc4xx.c index 967d94844b30..58765a62fc15 100644 ---- drivers/spi/spi-ppc4xx.c -+++ drivers/spi/spi-ppc4xx.c +--- linux-4.14.336/drivers/spi/spi-ppc4xx.c ++++ linux-4.14.336/drivers/spi/spi-ppc4xx.c @@ -173,10 +173,8 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t) int scr; u8 cdm = 0; @@ -7517,8 +7517,8 @@ index 967d94844b30..58765a62fc15 100644 } diff --git drivers/staging/iio/impedance-analyzer/ad5933.c drivers/staging/iio/impedance-analyzer/ad5933.c index 6d31001d1825..344053df0383 100644 ---- drivers/staging/iio/impedance-analyzer/ad5933.c -+++ drivers/staging/iio/impedance-analyzer/ad5933.c +--- linux-4.14.336/drivers/staging/iio/impedance-analyzer/ad5933.c ++++ linux-4.14.336/drivers/staging/iio/impedance-analyzer/ad5933.c @@ -658,7 +658,7 @@ static void ad5933_work(struct work_struct *work) struct ad5933_state, work.work); struct iio_dev *indio_dev = i2c_get_clientdata(st->client); @@ -7530,8 +7530,8 @@ index 6d31001d1825..344053df0383 100644 diff --git drivers/target/target_core_device.c drivers/target/target_core_device.c index 907b06056f02..ccefa4eb9f1f 100644 ---- drivers/target/target_core_device.c -+++ drivers/target/target_core_device.c +--- linux-4.14.336/drivers/target/target_core_device.c ++++ linux-4.14.336/drivers/target/target_core_device.c @@ -164,7 +164,6 @@ int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u64 unpacked_lun) struct se_session *se_sess = se_cmd->se_sess; struct se_node_acl *nacl = se_sess->se_node_acl; @@ -7553,8 +7553,8 @@ index 907b06056f02..ccefa4eb9f1f 100644 EXPORT_SYMBOL(transport_lookup_tmr_lun); diff --git drivers/target/target_core_transport.c drivers/target/target_core_transport.c index c20997bf314e..41ebdd629b9d 100644 ---- drivers/target/target_core_transport.c -+++ drivers/target/target_core_transport.c +--- linux-4.14.336/drivers/target/target_core_transport.c ++++ linux-4.14.336/drivers/target/target_core_transport.c @@ -3424,6 +3424,10 @@ int transport_generic_handle_tmr( unsigned long flags; bool aborted = false; @@ -7568,8 +7568,8 @@ index c20997bf314e..41ebdd629b9d 100644 aborted = true; diff --git drivers/tty/serial/imx.c drivers/tty/serial/imx.c index 7fccf69931c5..6cfa6a908336 100644 ---- drivers/tty/serial/imx.c -+++ drivers/tty/serial/imx.c +--- linux-4.14.336/drivers/tty/serial/imx.c ++++ linux-4.14.336/drivers/tty/serial/imx.c @@ -2215,7 +2215,7 @@ static int serial_imx_probe(struct platform_device *pdev) /* For register access, we only need to enable the ipg clock. */ ret = clk_prepare_enable(sport->clk_ipg); @@ -7581,8 +7581,8 @@ index 7fccf69931c5..6cfa6a908336 100644 diff --git drivers/tty/serial/sc16is7xx.c drivers/tty/serial/sc16is7xx.c index 73280d400eb2..3afaab69f0e2 100644 ---- drivers/tty/serial/sc16is7xx.c -+++ drivers/tty/serial/sc16is7xx.c +--- linux-4.14.336/drivers/tty/serial/sc16is7xx.c ++++ linux-4.14.336/drivers/tty/serial/sc16is7xx.c @@ -29,6 +29,7 @@ #include #include @@ -7608,8 +7608,8 @@ index 73280d400eb2..3afaab69f0e2 100644 return ret; diff --git drivers/uio/uio.c drivers/uio/uio.c index be33a5ce3d8e..3ebea6388220 100644 ---- drivers/uio/uio.c -+++ drivers/uio/uio.c +--- linux-4.14.336/drivers/uio/uio.c ++++ linux-4.14.336/drivers/uio/uio.c @@ -465,13 +465,13 @@ static int uio_open(struct inode *inode, struct file *filep) mutex_lock(&minor_lock); @@ -7639,8 +7639,8 @@ index be33a5ce3d8e..3ebea6388220 100644 } diff --git drivers/usb/chipidea/core.c drivers/usb/chipidea/core.c index 4cacb91c4729..a4880b137f1b 100644 ---- drivers/usb/chipidea/core.c -+++ drivers/usb/chipidea/core.c +--- linux-4.14.336/drivers/usb/chipidea/core.c ++++ linux-4.14.336/drivers/usb/chipidea/core.c @@ -542,6 +542,13 @@ static irqreturn_t ci_irq_handler(int irq, void *data) u32 otgsc = 0; @@ -7657,8 +7657,8 @@ index 4cacb91c4729..a4880b137f1b 100644 pm_runtime_get(ci->dev); diff --git drivers/usb/core/hub.c drivers/usb/core/hub.c index 4a0765bca8e7..afe3a46a0d2d 100644 ---- drivers/usb/core/hub.c -+++ drivers/usb/core/hub.c +--- linux-4.14.336/drivers/usb/core/hub.c ++++ linux-4.14.336/drivers/usb/core/hub.c @@ -43,8 +43,8 @@ #define USB_VENDOR_TEXAS_INSTRUMENTS 0x0451 #define USB_PRODUCT_TUSB8041_USB3 0x8140 @@ -7709,8 +7709,8 @@ index 4a0765bca8e7..afe3a46a0d2d 100644 #endif diff --git drivers/usb/dwc3/ep0.c drivers/usb/dwc3/ep0.c index 17bc5b958ea0..f3f9fca246b8 100644 ---- drivers/usb/dwc3/ep0.c -+++ drivers/usb/dwc3/ep0.c +--- linux-4.14.336/drivers/usb/dwc3/ep0.c ++++ linux-4.14.336/drivers/usb/dwc3/ep0.c @@ -246,7 +246,10 @@ static void dwc3_ep0_stall_and_restart(struct dwc3 *dwc) struct dwc3_request *req; @@ -7725,8 +7725,8 @@ index 17bc5b958ea0..f3f9fca246b8 100644 dwc->ep0state = EP0_SETUP_PHASE; diff --git drivers/usb/gadget/function/f_mass_storage.c drivers/usb/gadget/function/f_mass_storage.c index 6aee3cf50c74..43bceee1d6c7 100644 ---- drivers/usb/gadget/function/f_mass_storage.c -+++ drivers/usb/gadget/function/f_mass_storage.c +--- linux-4.14.336/drivers/usb/gadget/function/f_mass_storage.c ++++ linux-4.14.336/drivers/usb/gadget/function/f_mass_storage.c @@ -576,21 +576,37 @@ static int start_transfer(struct fsg_dev *fsg, struct usb_ep *ep, static bool start_in_transfer(struct fsg_common *common, struct fsg_buffhd *bh) @@ -7769,8 +7769,8 @@ index 6aee3cf50c74..43bceee1d6c7 100644 diff --git drivers/usb/gadget/function/f_ncm.c drivers/usb/gadget/function/f_ncm.c index 47d1f4e960cb..9a75e4c49976 100644 ---- drivers/usb/gadget/function/f_ncm.c -+++ drivers/usb/gadget/function/f_ncm.c +--- linux-4.14.336/drivers/usb/gadget/function/f_ncm.c ++++ linux-4.14.336/drivers/usb/gadget/function/f_ncm.c @@ -1370,7 +1370,15 @@ parse_ntb: "Parsed NTB with %d frames\n", dgram_counter); @@ -7790,8 +7790,8 @@ index 47d1f4e960cb..9a75e4c49976 100644 } diff --git drivers/usb/mon/mon_bin.c drivers/usb/mon/mon_bin.c index a6da9b72f46b..21b184d2170a 100644 ---- drivers/usb/mon/mon_bin.c -+++ drivers/usb/mon/mon_bin.c +--- linux-4.14.336/drivers/usb/mon/mon_bin.c ++++ linux-4.14.336/drivers/usb/mon/mon_bin.c @@ -1246,14 +1246,19 @@ static int mon_bin_vma_fault(struct vm_fault *vmf) struct mon_reader_bin *rp = vmf->vma->vm_private_data; unsigned long offset, chunk_idx; @@ -7815,8 +7815,8 @@ index a6da9b72f46b..21b184d2170a 100644 diff --git drivers/usb/phy/phy-mxs-usb.c drivers/usb/phy/phy-mxs-usb.c index 6e462a8d8309..bbfdd926bc70 100644 ---- drivers/usb/phy/phy-mxs-usb.c -+++ drivers/usb/phy/phy-mxs-usb.c +--- linux-4.14.336/drivers/usb/phy/phy-mxs-usb.c ++++ linux-4.14.336/drivers/usb/phy/phy-mxs-usb.c @@ -303,8 +303,7 @@ static void __mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool disconnect) static bool mxs_phy_is_otg_host(struct mxs_phy *mxs_phy) @@ -7829,8 +7829,8 @@ index 6e462a8d8309..bbfdd926bc70 100644 static void mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool on) diff --git drivers/usb/serial/cp210x.c drivers/usb/serial/cp210x.c index df524ce8c050..4158432fc16f 100644 ---- drivers/usb/serial/cp210x.c -+++ drivers/usb/serial/cp210x.c +--- linux-4.14.336/drivers/usb/serial/cp210x.c ++++ linux-4.14.336/drivers/usb/serial/cp210x.c @@ -150,6 +150,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ @@ -7841,8 +7841,8 @@ index df524ce8c050..4158432fc16f 100644 { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ diff --git drivers/usb/serial/option.c drivers/usb/serial/option.c index 902bbe52a1d6..8744d91de155 100644 ---- drivers/usb/serial/option.c -+++ drivers/usb/serial/option.c +--- linux-4.14.336/drivers/usb/serial/option.c ++++ linux-4.14.336/drivers/usb/serial/option.c @@ -2271,6 +2271,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0111, 0xff) }, /* Fibocom FM160 (MBIM mode) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */ @@ -7853,8 +7853,8 @@ index 902bbe52a1d6..8744d91de155 100644 { USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */ diff --git drivers/usb/serial/qcserial.c drivers/usb/serial/qcserial.c index 6ea6cbbebfba..03dc86977e6d 100644 ---- drivers/usb/serial/qcserial.c -+++ drivers/usb/serial/qcserial.c +--- linux-4.14.336/drivers/usb/serial/qcserial.c ++++ linux-4.14.336/drivers/usb/serial/qcserial.c @@ -188,6 +188,8 @@ static const struct usb_device_id id_table[] = { {DEVICE_SWI(0x413c, 0x81d0)}, /* Dell Wireless 5819 */ {DEVICE_SWI(0x413c, 0x81d1)}, /* Dell Wireless 5818 */ @@ -7866,8 +7866,8 @@ index 6ea6cbbebfba..03dc86977e6d 100644 {DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */ diff --git drivers/vhost/vhost.c drivers/vhost/vhost.c index 93cdeb516594..03eb2941ff6c 100644 ---- drivers/vhost/vhost.c -+++ drivers/vhost/vhost.c +--- linux-4.14.336/drivers/vhost/vhost.c ++++ linux-4.14.336/drivers/vhost/vhost.c @@ -2483,12 +2483,11 @@ EXPORT_SYMBOL_GPL(vhost_disable_notify); /* Create a new message. */ struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type) @@ -7885,8 +7885,8 @@ index 93cdeb516594..03eb2941ff6c 100644 return node; diff --git drivers/video/fbdev/core/fb_defio.c drivers/video/fbdev/core/fb_defio.c index 487d5e336e1b..36972138340d 100644 ---- drivers/video/fbdev/core/fb_defio.c -+++ drivers/video/fbdev/core/fb_defio.c +--- linux-4.14.336/drivers/video/fbdev/core/fb_defio.c ++++ linux-4.14.336/drivers/video/fbdev/core/fb_defio.c @@ -78,11 +78,7 @@ int fb_deferred_io_fsync(struct file *file, loff_t start, loff_t end, int datasy return 0; @@ -7902,8 +7902,8 @@ index 487d5e336e1b..36972138340d 100644 return 0; diff --git drivers/video/fbdev/savage/savagefb_driver.c drivers/video/fbdev/savage/savagefb_driver.c index c20468362f11..a4f15b9de2b6 100644 ---- drivers/video/fbdev/savage/savagefb_driver.c -+++ drivers/video/fbdev/savage/savagefb_driver.c +--- linux-4.14.336/drivers/video/fbdev/savage/savagefb_driver.c ++++ linux-4.14.336/drivers/video/fbdev/savage/savagefb_driver.c @@ -869,6 +869,9 @@ static int savagefb_check_var(struct fb_var_screeninfo *var, DBG("savagefb_check_var"); @@ -7916,8 +7916,8 @@ index c20468362f11..a4f15b9de2b6 100644 switch (var->bits_per_pixel) { diff --git drivers/video/fbdev/sis/sis_main.c drivers/video/fbdev/sis/sis_main.c index e92303823a4b..9575a481eeaf 100644 ---- drivers/video/fbdev/sis/sis_main.c -+++ drivers/video/fbdev/sis/sis_main.c +--- linux-4.14.336/drivers/video/fbdev/sis/sis_main.c ++++ linux-4.14.336/drivers/video/fbdev/sis/sis_main.c @@ -1437,6 +1437,8 @@ sisfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) vtotal = var->upper_margin + var->lower_margin + var->vsync_len; @@ -7929,8 +7929,8 @@ index e92303823a4b..9575a481eeaf 100644 if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) { diff --git drivers/watchdog/bcm2835_wdt.c drivers/watchdog/bcm2835_wdt.c index adb699145a07..4e653e71e232 100644 ---- drivers/watchdog/bcm2835_wdt.c -+++ drivers/watchdog/bcm2835_wdt.c +--- linux-4.14.336/drivers/watchdog/bcm2835_wdt.c ++++ linux-4.14.336/drivers/watchdog/bcm2835_wdt.c @@ -44,6 +44,7 @@ #define SECS_TO_WDOG_TICKS(x) ((x) << 16) @@ -7950,8 +7950,8 @@ index adb699145a07..4e653e71e232 100644 diff --git drivers/watchdog/watchdog_dev.c drivers/watchdog/watchdog_dev.c index 337ca3690d62..d26fb9016a9f 100644 ---- drivers/watchdog/watchdog_dev.c -+++ drivers/watchdog/watchdog_dev.c +--- linux-4.14.336/drivers/watchdog/watchdog_dev.c ++++ linux-4.14.336/drivers/watchdog/watchdog_dev.c @@ -956,6 +956,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) /* Fill in the data structures */ @@ -7971,8 +7971,8 @@ index 337ca3690d62..d26fb9016a9f 100644 diff --git fs/aio.c fs/aio.c index 2eb3dba5ed16..816f1443626b 100644 ---- fs/aio.c -+++ fs/aio.c +--- linux-4.14.336/fs/aio.c ++++ linux-4.14.336/fs/aio.c @@ -562,6 +562,13 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel) struct kioctx *ctx = req->ki_ctx; unsigned long flags; @@ -7998,8 +7998,8 @@ index 2eb3dba5ed16..816f1443626b 100644 if (iocb->aio_flags & IOCB_FLAG_RESFD) { diff --git fs/btrfs/dev-replace.c fs/btrfs/dev-replace.c index f1e9dd246ab0..3238bd9c0d39 100644 ---- fs/btrfs/dev-replace.c -+++ fs/btrfs/dev-replace.c +--- linux-4.14.336/fs/btrfs/dev-replace.c ++++ linux-4.14.336/fs/btrfs/dev-replace.c @@ -426,6 +426,23 @@ leave: return ret; } @@ -8040,8 +8040,8 @@ index f1e9dd246ab0..3238bd9c0d39 100644 args->start.srcdevid, diff --git fs/btrfs/extent-tree.c fs/btrfs/extent-tree.c index deb01e59da02..6741710a149e 100644 ---- fs/btrfs/extent-tree.c -+++ fs/btrfs/extent-tree.c +--- linux-4.14.336/fs/btrfs/extent-tree.c ++++ linux-4.14.336/fs/btrfs/extent-tree.c @@ -2070,7 +2070,8 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, u64 bytes_left, end; u64 aligned_start = ALIGN(start, 1 << 9); @@ -8054,8 +8054,8 @@ index deb01e59da02..6741710a149e 100644 start = aligned_start; diff --git fs/btrfs/ioctl.c fs/btrfs/ioctl.c index 93b83dc298ac..c8bc8cf5a41f 100644 ---- fs/btrfs/ioctl.c -+++ fs/btrfs/ioctl.c +--- linux-4.14.336/fs/btrfs/ioctl.c ++++ linux-4.14.336/fs/btrfs/ioctl.c @@ -2668,6 +2668,10 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) kfree(range); goto out; @@ -8069,8 +8069,8 @@ index 93b83dc298ac..c8bc8cf5a41f 100644 range->flags |= BTRFS_DEFRAG_RANGE_START_IO; diff --git fs/btrfs/send.c fs/btrfs/send.c index f2cb7fec7547..fa9797f8501e 100644 ---- fs/btrfs/send.c -+++ fs/btrfs/send.c +--- linux-4.14.336/fs/btrfs/send.c ++++ linux-4.14.336/fs/btrfs/send.c @@ -6662,7 +6662,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) } @@ -8082,8 +8082,8 @@ index f2cb7fec7547..fa9797f8501e 100644 diff --git fs/cachefiles/bind.c fs/cachefiles/bind.c index d9f001078e08..5aa9f4578f3e 100644 ---- fs/cachefiles/bind.c -+++ fs/cachefiles/bind.c +--- linux-4.14.336/fs/cachefiles/bind.c ++++ linux-4.14.336/fs/cachefiles/bind.c @@ -248,6 +248,8 @@ error_open_root: kmem_cache_free(cachefiles_object_jar, fsdef); error_root_object: @@ -8103,8 +8103,8 @@ index d9f001078e08..5aa9f4578f3e 100644 kfree(cache->secctx); diff --git fs/ceph/caps.c fs/ceph/caps.c index e36786f574b8..b84ce90953c6 100644 ---- fs/ceph/caps.c -+++ fs/ceph/caps.c +--- linux-4.14.336/fs/ceph/caps.c ++++ linux-4.14.336/fs/ceph/caps.c @@ -4026,12 +4026,14 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry, struct inode *dir, int mds, int drop, int unless) @@ -8138,8 +8138,8 @@ index e36786f574b8..b84ce90953c6 100644 if (ret && di->lease_session && di->lease_session->s_mds == mds) { diff --git fs/compat_ioctl.c fs/compat_ioctl.c index f445bc9cdc94..74e8507419d7 100644 ---- fs/compat_ioctl.c -+++ fs/compat_ioctl.c +--- linux-4.14.336/fs/compat_ioctl.c ++++ linux-4.14.336/fs/compat_ioctl.c @@ -1546,8 +1546,7 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, if (!f.file) goto out; @@ -8152,8 +8152,8 @@ index f445bc9cdc94..74e8507419d7 100644 diff --git fs/dcache.c fs/dcache.c index 9ac1290ae44f..5a9a773ece54 100644 ---- fs/dcache.c -+++ fs/dcache.c +--- linux-4.14.336/fs/dcache.c ++++ linux-4.14.336/fs/dcache.c @@ -709,12 +709,12 @@ static inline bool fast_dput(struct dentry *dentry) */ if (unlikely(ret < 0)) { @@ -8180,8 +8180,8 @@ index 9ac1290ae44f..5a9a773ece54 100644 return 1; diff --git fs/ext4/mballoc.c fs/ext4/mballoc.c index 91d1de198fed..64ce26ec9c68 100644 ---- fs/ext4/mballoc.c -+++ fs/ext4/mballoc.c +--- linux-4.14.336/fs/ext4/mballoc.c ++++ linux-4.14.336/fs/ext4/mballoc.c @@ -1817,6 +1817,9 @@ int ext4_mb_try_best_found(struct ext4_allocation_context *ac, return err; @@ -8226,8 +8226,8 @@ index 91d1de198fed..64ce26ec9c68 100644 diff --git fs/ext4/move_extent.c fs/ext4/move_extent.c index ef60f2e92da6..a10c560405b2 100644 ---- fs/ext4/move_extent.c -+++ fs/ext4/move_extent.c +--- linux-4.14.336/fs/ext4/move_extent.c ++++ linux-4.14.336/fs/ext4/move_extent.c @@ -628,6 +628,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, goto out; o_end = o_start + len; @@ -8257,8 +8257,8 @@ index ef60f2e92da6..a10c560405b2 100644 if (*moved_len) { diff --git fs/ext4/resize.c fs/ext4/resize.c index f0b27be5892a..47ecf0826899 100644 ---- fs/ext4/resize.c -+++ fs/ext4/resize.c +--- linux-4.14.336/fs/ext4/resize.c ++++ linux-4.14.336/fs/ext4/resize.c @@ -237,7 +237,7 @@ struct ext4_new_flex_group_data { * * Returns NULL on failure otherwise address of the allocated structure. @@ -8314,8 +8314,8 @@ index f0b27be5892a..47ecf0826899 100644 bh = sb_bread(sb, n_blocks_count - 1); diff --git fs/f2fs/namei.c fs/f2fs/namei.c index 9fb98fce7096..eb9db586c01d 100644 ---- fs/f2fs/namei.c -+++ fs/f2fs/namei.c +--- linux-4.14.336/fs/f2fs/namei.c ++++ linux-4.14.336/fs/f2fs/namei.c @@ -882,7 +882,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, } @@ -8327,8 +8327,8 @@ index 9fb98fce7096..eb9db586c01d 100644 } else { diff --git fs/f2fs/xattr.c fs/f2fs/xattr.c index b3c64ab0d5a5..f52c01804f81 100644 ---- fs/f2fs/xattr.c -+++ fs/f2fs/xattr.c +--- linux-4.14.336/fs/f2fs/xattr.c ++++ linux-4.14.336/fs/f2fs/xattr.c @@ -695,6 +695,12 @@ static int __f2fs_setxattr(struct inode *inode, int index, memcpy(pval, value, size); last->e_value_size = cpu_to_le16(size); @@ -8344,8 +8344,8 @@ index b3c64ab0d5a5..f52c01804f81 100644 error = write_all_xattrs(inode, new_hsize, base_addr, ipage); diff --git fs/fuse/dir.c fs/fuse/dir.c index 8e5125904762..bd602b7e8e46 100644 ---- fs/fuse/dir.c -+++ fs/fuse/dir.c +--- linux-4.14.336/fs/fuse/dir.c ++++ linux-4.14.336/fs/fuse/dir.c @@ -1299,8 +1299,16 @@ retry: dput(dentry); dentry = alias; @@ -8366,8 +8366,8 @@ index 8e5125904762..bd602b7e8e46 100644 set_bit(FUSE_I_INIT_RDPLUS, &get_fuse_inode(inode)->state); diff --git fs/jbd2/journal.c fs/jbd2/journal.c index 93a466cf58ba..ee114f0b625a 100644 ---- fs/jbd2/journal.c -+++ fs/jbd2/journal.c +--- linux-4.14.336/fs/jbd2/journal.c ++++ linux-4.14.336/fs/jbd2/journal.c @@ -1361,9 +1361,11 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags) return -EIO; } @@ -8383,8 +8383,8 @@ index 93a466cf58ba..ee114f0b625a 100644 * Oh, dear. A previous attempt to write the journal diff --git fs/jfs/jfs_dmap.c fs/jfs/jfs_dmap.c index ed7989d7b2ba..6c6efb5a168b 100644 ---- fs/jfs/jfs_dmap.c -+++ fs/jfs/jfs_dmap.c +--- linux-4.14.336/fs/jfs/jfs_dmap.c ++++ linux-4.14.336/fs/jfs/jfs_dmap.c @@ -76,10 +76,10 @@ */ static void dbAllocBits(struct bmap * bmp, struct dmap * dp, s64 blkno, @@ -8587,8 +8587,8 @@ index ed7989d7b2ba..6c6efb5a168b 100644 */ diff --git fs/jfs/jfs_dtree.c fs/jfs/jfs_dtree.c index de2bcb36e079..14a16bb906e8 100644 ---- fs/jfs/jfs_dtree.c -+++ fs/jfs/jfs_dtree.c +--- linux-4.14.336/fs/jfs/jfs_dtree.c ++++ linux-4.14.336/fs/jfs/jfs_dtree.c @@ -645,6 +645,11 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data, for (base = 0, lim = p->header.nextindex; lim; lim >>= 1) { index = base + (lim >> 1); @@ -8612,8 +8612,8 @@ index de2bcb36e079..14a16bb906e8 100644 } diff --git fs/jfs/jfs_imap.c fs/jfs/jfs_imap.c index 131dce5316ac..5cdcf68a4803 100644 ---- fs/jfs/jfs_imap.c -+++ fs/jfs/jfs_imap.c +--- linux-4.14.336/fs/jfs/jfs_imap.c ++++ linux-4.14.336/fs/jfs/jfs_imap.c @@ -2200,6 +2200,9 @@ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno) /* get the ag and iag numbers for this iag. */ @@ -8626,8 +8626,8 @@ index 131dce5316ac..5cdcf68a4803 100644 /* check if this is the last free extent within the diff --git fs/jfs/jfs_mount.c fs/jfs/jfs_mount.c index f1a705d15904..97d91c1686b8 100644 ---- fs/jfs/jfs_mount.c -+++ fs/jfs/jfs_mount.c +--- linux-4.14.336/fs/jfs/jfs_mount.c ++++ linux-4.14.336/fs/jfs/jfs_mount.c @@ -184,15 +184,15 @@ int jfs_mount(struct super_block *sb) } jfs_info("jfs_mount: ipimap:0x%p", ipimap); @@ -8649,8 +8649,8 @@ index f1a705d15904..97d91c1686b8 100644 /* diff --git fs/nfs/nfs4proc.c fs/nfs/nfs4proc.c index ff41d726f758..77c207a0fb81 100644 ---- fs/nfs/nfs4proc.c -+++ fs/nfs/nfs4proc.c +--- linux-4.14.336/fs/nfs/nfs4proc.c ++++ linux-4.14.336/fs/nfs/nfs4proc.c @@ -161,6 +161,7 @@ static int nfs4_map_errors(int err) case -NFS4ERR_RESOURCE: case -NFS4ERR_LAYOUTTRYLATER: @@ -8677,8 +8677,8 @@ index ff41d726f758..77c207a0fb81 100644 case -NFS4ERR_DELEG_REVOKED: diff --git fs/nfsd/nfs4state.c fs/nfsd/nfs4state.c index 2adbf471d107..6720c82ac351 100644 ---- fs/nfsd/nfs4state.c -+++ fs/nfsd/nfs4state.c +--- linux-4.14.336/fs/nfsd/nfs4state.c ++++ linux-4.14.336/fs/nfsd/nfs4state.c @@ -6351,12 +6351,16 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, if (sop->so_is_open_owner || !same_owner_str(sop, owner)) continue; @@ -8702,8 +8702,8 @@ index 2adbf471d107..6720c82ac351 100644 } diff --git fs/nilfs2/dat.c fs/nilfs2/dat.c index 185db3c3033b..63bd20032fa7 100644 ---- fs/nilfs2/dat.c -+++ fs/nilfs2/dat.c +--- linux-4.14.336/fs/nilfs2/dat.c ++++ linux-4.14.336/fs/nilfs2/dat.c @@ -49,8 +49,21 @@ static inline struct nilfs_dat_info *NILFS_DAT_I(struct inode *dat) static int nilfs_dat_prepare_entry(struct inode *dat, struct nilfs_palloc_req *req, int create) @@ -8755,8 +8755,8 @@ index 185db3c3033b..63bd20032fa7 100644 entry = nilfs_palloc_block_get_entry(dat, req->pr_entry_nr, diff --git fs/nilfs2/file.c fs/nilfs2/file.c index c5fa3dee72fc..43501da7ef66 100644 ---- fs/nilfs2/file.c -+++ fs/nilfs2/file.c +--- linux-4.14.336/fs/nilfs2/file.c ++++ linux-4.14.336/fs/nilfs2/file.c @@ -114,7 +114,13 @@ static int nilfs_page_mkwrite(struct vm_fault *vmf) nilfs_transaction_commit(inode->i_sb); @@ -8774,8 +8774,8 @@ index c5fa3dee72fc..43501da7ef66 100644 return block_page_mkwrite_return(ret); diff --git fs/nilfs2/recovery.c fs/nilfs2/recovery.c index 5139efed1888..cff597333afe 100644 ---- fs/nilfs2/recovery.c -+++ fs/nilfs2/recovery.c +--- linux-4.14.336/fs/nilfs2/recovery.c ++++ linux-4.14.336/fs/nilfs2/recovery.c @@ -481,9 +481,10 @@ static int nilfs_prepare_segment_for_recovery(struct the_nilfs *nilfs, static int nilfs_recovery_copy_block(struct the_nilfs *nilfs, @@ -8808,8 +8808,8 @@ index 5139efed1888..cff597333afe 100644 diff --git fs/nilfs2/segment.c fs/nilfs2/segment.c index ca4b1675c147..b9fd60e07701 100644 ---- fs/nilfs2/segment.c -+++ fs/nilfs2/segment.c +--- linux-4.14.336/fs/nilfs2/segment.c ++++ linux-4.14.336/fs/nilfs2/segment.c @@ -1715,7 +1715,6 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) list_for_each_entry(bh, &segbuf->sb_payload_buffers, @@ -8863,8 +8863,8 @@ index ca4b1675c147..b9fd60e07701 100644 fs_page = bh->b_page; diff --git fs/pstore/ram.c fs/pstore/ram.c index dc5a40058c2f..bbd90fef7fcd 100644 ---- fs/pstore/ram.c -+++ fs/pstore/ram.c +--- linux-4.14.336/fs/pstore/ram.c ++++ linux-4.14.336/fs/pstore/ram.c @@ -586,6 +586,7 @@ static int ramoops_init_przs(const char *name, } @@ -8875,8 +8875,8 @@ index dc5a40058c2f..bbd90fef7fcd 100644 goto fail; diff --git fs/pstore/ram_core.c fs/pstore/ram_core.c index 58ac4e1a61a3..a323ed939aa8 100644 ---- fs/pstore/ram_core.c -+++ fs/pstore/ram_core.c +--- linux-4.14.336/fs/pstore/ram_core.c ++++ linux-4.14.336/fs/pstore/ram_core.c @@ -190,7 +190,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz, { int numerr; @@ -8888,8 +8888,8 @@ index 58ac4e1a61a3..a323ed939aa8 100644 if (!ecc_info || !ecc_info->ecc_size) diff --git include/crypto/if_alg.h include/crypto/if_alg.h index 2ea6a95ca825..f803dc8c45ad 100644 ---- include/crypto/if_alg.h -+++ include/crypto/if_alg.h +--- linux-4.14.336/include/crypto/if_alg.h ++++ linux-4.14.336/include/crypto/if_alg.h @@ -146,6 +146,7 @@ struct af_alg_async_req { * @enc: Cryptographic operation to be performed when * recvmsg is invoked. @@ -8909,8 +8909,8 @@ index 2ea6a95ca825..f803dc8c45ad 100644 int af_alg_register_type(const struct af_alg_type *type); diff --git include/drm/drm_bridge.h include/drm/drm_bridge.h index 6522d4cbc9d9..bfbd38c0b609 100644 ---- include/drm/drm_bridge.h -+++ include/drm/drm_bridge.h +--- linux-4.14.336/include/drm/drm_bridge.h ++++ linux-4.14.336/include/drm/drm_bridge.h @@ -161,7 +161,7 @@ struct drm_bridge_funcs { * or &drm_encoder_helper_funcs.dpms hook. * @@ -8922,8 +8922,8 @@ index 6522d4cbc9d9..bfbd38c0b609 100644 * The post_disable callback is optional. diff --git include/drm/drm_mipi_dsi.h include/drm/drm_mipi_dsi.h index 689f615471ab..a059f1d968b7 100644 ---- include/drm/drm_mipi_dsi.h -+++ include/drm/drm_mipi_dsi.h +--- linux-4.14.336/include/drm/drm_mipi_dsi.h ++++ linux-4.14.336/include/drm/drm_mipi_dsi.h @@ -163,6 +163,7 @@ struct mipi_dsi_device_info { * struct mipi_dsi_device - DSI peripheral device * @host: DSI host for this peripheral @@ -8942,8 +8942,8 @@ index 689f615471ab..a059f1d968b7 100644 unsigned int channel; diff --git include/linux/bpf.h include/linux/bpf.h index 3aa05ea79ba1..0d7a61df056b 100644 ---- include/linux/bpf.h -+++ include/linux/bpf.h +--- linux-4.14.336/include/linux/bpf.h ++++ linux-4.14.336/include/linux/bpf.h @@ -38,7 +38,11 @@ struct bpf_map_ops { /* funcs called by prog_array and perf_event_array map */ void *(*map_fd_get_ptr)(struct bpf_map *map, struct file *map_file, @@ -8959,8 +8959,8 @@ index 3aa05ea79ba1..0d7a61df056b 100644 }; diff --git include/linux/device.h include/linux/device.h index 65e06a066b67..27b70b810463 100644 ---- include/linux/device.h -+++ include/linux/device.h +--- linux-4.14.336/include/linux/device.h ++++ linux-4.14.336/include/linux/device.h @@ -1474,6 +1474,9 @@ do { \ WARN_ONCE(condition, "%s %s: " format, \ dev_driver_string(dev), dev_name(dev), ## arg) @@ -8973,8 +8973,8 @@ index 65e06a066b67..27b70b810463 100644 MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor)) diff --git include/linux/dmaengine.h include/linux/dmaengine.h index 8089e28539f1..d5a7d320e05c 100644 ---- include/linux/dmaengine.h -+++ include/linux/dmaengine.h +--- linux-4.14.336/include/linux/dmaengine.h ++++ linux-4.14.336/include/linux/dmaengine.h @@ -816,7 +816,8 @@ static inline int dmaengine_slave_config(struct dma_chan *chan, static inline bool is_slave_direction(enum dma_transfer_direction direction) @@ -8987,8 +8987,8 @@ index 8089e28539f1..d5a7d320e05c 100644 static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single( diff --git include/linux/fs.h include/linux/fs.h index ff0a992846a3..bd6072556269 100644 ---- include/linux/fs.h -+++ include/linux/fs.h +--- linux-4.14.336/include/linux/fs.h ++++ linux-4.14.336/include/linux/fs.h @@ -296,6 +296,8 @@ enum rw_hint { #define IOCB_SYNC (1 << 5) #define IOCB_WRITE (1 << 6) @@ -9000,8 +9000,8 @@ index ff0a992846a3..bd6072556269 100644 struct file *ki_filp; diff --git include/linux/lsm_hooks.h include/linux/lsm_hooks.h index 569debc49f3d..28ff40daccff 100644 ---- include/linux/lsm_hooks.h -+++ include/linux/lsm_hooks.h +--- linux-4.14.336/include/linux/lsm_hooks.h ++++ linux-4.14.336/include/linux/lsm_hooks.h @@ -466,6 +466,12 @@ * simple integer value. When @arg represents a user space pointer, it * should never be used by the security module. @@ -9034,8 +9034,8 @@ index 569debc49f3d..28ff40daccff 100644 struct list_head file_mprotect; diff --git include/linux/pci_ids.h include/linux/pci_ids.h index 83f576d45d78..c977e636a1dd 100644 ---- include/linux/pci_ids.h -+++ include/linux/pci_ids.h +--- linux-4.14.336/include/linux/pci_ids.h ++++ linux-4.14.336/include/linux/pci_ids.h @@ -2953,6 +2953,7 @@ #define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0 #define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2 @@ -9046,8 +9046,8 @@ index 83f576d45d78..c977e636a1dd 100644 #define PCI_DEVICE_ID_INTEL_E6XX_CU 0x8183 diff --git include/linux/security.h include/linux/security.h index 1c8968a267c2..cf77cd971795 100644 ---- include/linux/security.h -+++ include/linux/security.h +--- linux-4.14.336/include/linux/security.h ++++ linux-4.14.336/include/linux/security.h @@ -306,6 +306,8 @@ int security_file_permission(struct file *file, int mask); int security_file_alloc(struct file *file); void security_file_free(struct file *file); @@ -9073,8 +9073,8 @@ index 1c8968a267c2..cf77cd971795 100644 { diff --git include/linux/spi/spi.h include/linux/spi/spi.h index a8f6606dd498..5c7741ca3b99 100644 ---- include/linux/spi/spi.h -+++ include/linux/spi/spi.h +--- linux-4.14.336/include/linux/spi/spi.h ++++ linux-4.14.336/include/linux/spi/spi.h @@ -153,6 +153,7 @@ struct spi_device { #define SPI_MODE_1 (0|SPI_CPHA) #define SPI_MODE_2 (SPI_CPOL|0) @@ -9086,8 +9086,8 @@ index a8f6606dd498..5c7741ca3b99 100644 diff --git include/linux/units.h include/linux/units.h new file mode 100644 index 000000000000..a0af6d2ef4e5 ---- /dev/null -+++ include/linux/units.h +--- linux-4.14.336//dev/null ++++ linux-4.14.336/include/linux/units.h @@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_UNITS_H @@ -9183,8 +9183,8 @@ index 000000000000..a0af6d2ef4e5 +#endif /* _LINUX_UNITS_H */ diff --git include/net/af_unix.h include/net/af_unix.h index 7ec1cdb66be8..e514508bdc92 100644 ---- include/net/af_unix.h -+++ include/net/af_unix.h +--- linux-4.14.336/include/net/af_unix.h ++++ linux-4.14.336/include/net/af_unix.h @@ -43,12 +43,6 @@ struct unix_skb_parms { #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb)) @@ -9221,8 +9221,8 @@ index 7ec1cdb66be8..e514508bdc92 100644 long unix_inq_len(struct sock *sk); diff --git include/net/bluetooth/hci_core.h include/net/bluetooth/hci_core.h index 8f899ad4a754..bac3d79139b2 100644 ---- include/net/bluetooth/hci_core.h -+++ include/net/bluetooth/hci_core.h +--- linux-4.14.336/include/net/bluetooth/hci_core.h ++++ linux-4.14.336/include/net/bluetooth/hci_core.h @@ -647,7 +647,6 @@ void hci_inquiry_cache_flush(struct hci_dev *hdev); /* ----- HCI Connections ----- */ enum { @@ -9233,8 +9233,8 @@ index 8f899ad4a754..bac3d79139b2 100644 HCI_CONN_MODE_CHANGE_PEND, diff --git include/net/dst_ops.h include/net/dst_ops.h index 443863c7b8da..632086b2f644 100644 ---- include/net/dst_ops.h -+++ include/net/dst_ops.h +--- linux-4.14.336/include/net/dst_ops.h ++++ linux-4.14.336/include/net/dst_ops.h @@ -16,7 +16,7 @@ struct dst_ops { unsigned short family; unsigned int gc_thresh; @@ -9259,8 +9259,8 @@ index 443863c7b8da..632086b2f644 100644 static inline int dst_entries_init(struct dst_ops *dst) diff --git include/net/llc_pdu.h include/net/llc_pdu.h index 49aa79c7b278..581cd37aa98b 100644 ---- include/net/llc_pdu.h -+++ include/net/llc_pdu.h +--- linux-4.14.336/include/net/llc_pdu.h ++++ linux-4.14.336/include/net/llc_pdu.h @@ -262,8 +262,7 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type, */ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa) @@ -9283,8 +9283,8 @@ index 49aa79c7b278..581cd37aa98b 100644 /** diff --git include/net/netns/ipv6.h include/net/netns/ipv6.h index c004d051c2d3..290ca18589ee 100644 ---- include/net/netns/ipv6.h -+++ include/net/netns/ipv6.h +--- linux-4.14.336/include/net/netns/ipv6.h ++++ linux-4.14.336/include/net/netns/ipv6.h @@ -64,8 +64,8 @@ struct netns_ipv6 { struct dst_ops ip6_dst_ops; rwlock_t fib6_walker_lock; @@ -9298,8 +9298,8 @@ index c004d051c2d3..290ca18589ee 100644 struct rt6_info *ip6_prohibit_entry; diff --git include/uapi/linux/btrfs.h include/uapi/linux/btrfs.h index 86d2a52b4665..ee7a34c237a5 100644 ---- include/uapi/linux/btrfs.h -+++ include/uapi/linux/btrfs.h +--- linux-4.14.336/include/uapi/linux/btrfs.h ++++ linux-4.14.336/include/uapi/linux/btrfs.h @@ -522,6 +522,9 @@ struct btrfs_ioctl_clone_range_args { */ #define BTRFS_DEFRAG_RANGE_COMPRESS 1 @@ -9312,8 +9312,8 @@ index 86d2a52b4665..ee7a34c237a5 100644 __u64 start; diff --git include/uapi/linux/netfilter/nf_tables.h include/uapi/linux/netfilter/nf_tables.h index c7bb18ea4962..835e9f345f35 100644 ---- include/uapi/linux/netfilter/nf_tables.h -+++ include/uapi/linux/netfilter/nf_tables.h +--- linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h ++++ linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h @@ -229,9 +229,11 @@ enum nft_rule_attributes { /** * enum nft_rule_compat_flags - nf_tables rule compat flags @@ -9328,8 +9328,8 @@ index c7bb18ea4962..835e9f345f35 100644 }; diff --git kernel/audit.c kernel/audit.c index b694a265533f..819bdf0b6e5f 100644 ---- kernel/audit.c -+++ kernel/audit.c +--- linux-4.14.336/kernel/audit.c ++++ linux-4.14.336/kernel/audit.c @@ -458,15 +458,19 @@ static int audit_set_failure(u32 state) * @pid: auditd PID * @portid: auditd netlink portid @@ -9415,8 +9415,8 @@ index b694a265533f..819bdf0b6e5f 100644 nlh = nlmsg_next(nlh, &len); diff --git kernel/bpf/arraymap.c kernel/bpf/arraymap.c index a8f55ea4146b..3291c856cea9 100644 ---- kernel/bpf/arraymap.c -+++ kernel/bpf/arraymap.c +--- linux-4.14.336/kernel/bpf/arraymap.c ++++ linux-4.14.336/kernel/bpf/arraymap.c @@ -416,7 +416,7 @@ int bpf_fd_array_map_update_elem(struct bpf_map *map, struct file *map_file, old_ptr = xchg(array->ptrs + index, new_ptr); @@ -9468,8 +9468,8 @@ index a8f55ea4146b..3291c856cea9 100644 cgroup_put(ptr); diff --git kernel/bpf/hashtab.c kernel/bpf/hashtab.c index ecc58137525b..db2c3e019daf 100644 ---- kernel/bpf/hashtab.c -+++ kernel/bpf/hashtab.c +--- linux-4.14.336/kernel/bpf/hashtab.c ++++ linux-4.14.336/kernel/bpf/hashtab.c @@ -655,7 +655,7 @@ static void htab_put_fd_value(struct bpf_htab *htab, struct htab_elem *l) if (map->ops->map_fd_put_ptr) { @@ -9499,8 +9499,8 @@ index ecc58137525b..db2c3e019daf 100644 } diff --git kernel/bpf/lpm_trie.c kernel/bpf/lpm_trie.c index c28c584b734e..ef324c9c1eca 100644 ---- kernel/bpf/lpm_trie.c -+++ kernel/bpf/lpm_trie.c +--- linux-4.14.336/kernel/bpf/lpm_trie.c ++++ linux-4.14.336/kernel/bpf/lpm_trie.c @@ -192,6 +192,9 @@ static void *trie_lookup_elem(struct bpf_map *map, void *_key) struct lpm_trie_node *node, *found = NULL; struct bpf_lpm_trie_key *key = _key; @@ -9513,8 +9513,8 @@ index c28c584b734e..ef324c9c1eca 100644 for (node = rcu_dereference(trie->root); node;) { diff --git kernel/bpf/map_in_map.c kernel/bpf/map_in_map.c index c0c494b7647b..1878aace6a5c 100644 ---- kernel/bpf/map_in_map.c -+++ kernel/bpf/map_in_map.c +--- linux-4.14.336/kernel/bpf/map_in_map.c ++++ linux-4.14.336/kernel/bpf/map_in_map.c @@ -101,7 +101,7 @@ void *bpf_map_fd_get_ptr(struct bpf_map *map, return inner_map; } @@ -9526,8 +9526,8 @@ index c0c494b7647b..1878aace6a5c 100644 * rcu grace period by itself. diff --git kernel/bpf/map_in_map.h kernel/bpf/map_in_map.h index 6183db9ec08c..1e652a7bf60e 100644 ---- kernel/bpf/map_in_map.h -+++ kernel/bpf/map_in_map.h +--- linux-4.14.336/kernel/bpf/map_in_map.h ++++ linux-4.14.336/kernel/bpf/map_in_map.h @@ -18,7 +18,7 @@ bool bpf_map_meta_equal(const struct bpf_map *meta0, const struct bpf_map *meta1); void *bpf_map_fd_get_ptr(struct bpf_map *map, struct file *map_file, @@ -9539,8 +9539,8 @@ index 6183db9ec08c..1e652a7bf60e 100644 #endif diff --git kernel/debug/kdb/kdb_main.c kernel/debug/kdb/kdb_main.c index 15d902daeef6..01a4312ede49 100644 ---- kernel/debug/kdb/kdb_main.c -+++ kernel/debug/kdb/kdb_main.c +--- linux-4.14.336/kernel/debug/kdb/kdb_main.c ++++ linux-4.14.336/kernel/debug/kdb/kdb_main.c @@ -399,6 +399,13 @@ int kdb_set(int argc, const char **argv) if (argc != 2) return KDB_ARGCOUNT; @@ -9573,8 +9573,8 @@ index 15d902daeef6..01a4312ede49 100644 * Fetch command from keyboard diff --git kernel/power/swap.c kernel/power/swap.c index 8b37085a6690..b62a56de91d6 100644 ---- kernel/power/swap.c -+++ kernel/power/swap.c +--- linux-4.14.336/kernel/power/swap.c ++++ linux-4.14.336/kernel/power/swap.c @@ -595,11 +595,11 @@ static int crc32_threadfn(void *data) unsigned i; @@ -9733,8 +9733,8 @@ index 8b37085a6690..b62a56de91d6 100644 stop = ktime_get(); diff --git kernel/sched/membarrier.c kernel/sched/membarrier.c index 9bcbacba82a8..d936a130814e 100644 ---- kernel/sched/membarrier.c -+++ kernel/sched/membarrier.c +--- linux-4.14.336/kernel/sched/membarrier.c ++++ linux-4.14.336/kernel/sched/membarrier.c @@ -30,6 +30,8 @@ (MEMBARRIER_CMD_SHARED | MEMBARRIER_CMD_PRIVATE_EXPEDITED \ | MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) @@ -9762,8 +9762,8 @@ index 9bcbacba82a8..d936a130814e 100644 diff --git kernel/sched/rt.c kernel/sched/rt.c index c093bb0f52eb..85cc7ab4f38d 100644 ---- kernel/sched/rt.c -+++ kernel/sched/rt.c +--- linux-4.14.336/kernel/sched/rt.c ++++ linux-4.14.336/kernel/sched/rt.c @@ -10,7 +10,7 @@ #include @@ -9804,8 +9804,8 @@ index c093bb0f52eb..85cc7ab4f38d 100644 return ret; diff --git kernel/sysctl.c kernel/sysctl.c index de4a197570b1..5bee2eb28ff6 100644 ---- kernel/sysctl.c -+++ kernel/sysctl.c +--- linux-4.14.336/kernel/sysctl.c ++++ linux-4.14.336/kernel/sysctl.c @@ -124,6 +124,7 @@ static int zero; static int __maybe_unused one = 1; static int __maybe_unused two = 2; @@ -9834,8 +9834,8 @@ index de4a197570b1..5bee2eb28ff6 100644 .procname = "sched_rr_timeslice_ms", diff --git kernel/time/tick-sched.c kernel/time/tick-sched.c index 3c7b400512eb..387de1b6dd93 100644 ---- kernel/time/tick-sched.c -+++ kernel/time/tick-sched.c +--- linux-4.14.336/kernel/time/tick-sched.c ++++ linux-4.14.336/kernel/time/tick-sched.c @@ -1278,13 +1278,23 @@ void tick_setup_sched_timer(void) void tick_cancel_sched_timer(int cpu) { @@ -9862,8 +9862,8 @@ index 3c7b400512eb..387de1b6dd93 100644 diff --git kernel/trace/ring_buffer.c kernel/trace/ring_buffer.c index 3fc09d765f2a..8c09e8ca1561 100644 ---- kernel/trace/ring_buffer.c -+++ kernel/trace/ring_buffer.c +--- linux-4.14.336/kernel/trace/ring_buffer.c ++++ linux-4.14.336/kernel/trace/ring_buffer.c @@ -2776,6 +2776,12 @@ rb_reserve_next_event(struct ring_buffer *buffer, int nr_loops = 0; u64 diff; @@ -9879,8 +9879,8 @@ index 3fc09d765f2a..8c09e8ca1561 100644 #ifdef CONFIG_RING_BUFFER_ALLOW_SWAP diff --git kernel/trace/trace.c kernel/trace/trace.c index c5fe020336be..755d6146c738 100644 ---- kernel/trace/trace.c -+++ kernel/trace/trace.c +--- linux-4.14.336/kernel/trace/trace.c ++++ linux-4.14.336/kernel/trace/trace.c @@ -3826,7 +3826,11 @@ static int s_show(struct seq_file *m, void *v) iter->leftover = ret; @@ -9896,8 +9896,8 @@ index c5fe020336be..755d6146c738 100644 * If we overflow the seq_file buffer, then it will diff --git kernel/trace/trace_events_trigger.c kernel/trace/trace_events_trigger.c index 40c1a2dd48f0..871ea0fa78bb 100644 ---- kernel/trace/trace_events_trigger.c -+++ kernel/trace/trace_events_trigger.c +--- linux-4.14.336/kernel/trace/trace_events_trigger.c ++++ linux-4.14.336/kernel/trace/trace_events_trigger.c @@ -1127,8 +1127,10 @@ register_snapshot_trigger(char *glob, struct event_trigger_ops *ops, struct event_trigger_data *data, struct trace_event_file *file) @@ -9913,8 +9913,8 @@ index 40c1a2dd48f0..871ea0fa78bb 100644 } diff --git kernel/trace/trace_output.c kernel/trace/trace_output.c index e3ab66e6fd85..3ca9ddfef2b8 100644 ---- kernel/trace/trace_output.c -+++ kernel/trace/trace_output.c +--- linux-4.14.336/kernel/trace/trace_output.c ++++ linux-4.14.336/kernel/trace/trace_output.c @@ -1319,11 +1319,12 @@ static enum print_line_t trace_print_print(struct trace_iterator *iter, { struct print_entry *field; @@ -9944,8 +9944,8 @@ index e3ab66e6fd85..3ca9ddfef2b8 100644 } diff --git mm/memcontrol.c mm/memcontrol.c index 22d13c98e274..e6a351e69ac3 100644 ---- mm/memcontrol.c -+++ mm/memcontrol.c +--- linux-4.14.336/mm/memcontrol.c ++++ linux-4.14.336/mm/memcontrol.c @@ -1747,6 +1747,9 @@ static void drain_stock(struct memcg_stock_pcp *stock) { struct mem_cgroup *old = stock->cached; @@ -10006,8 +10006,8 @@ index 22d13c98e274..e6a351e69ac3 100644 mutex_unlock(&percpu_charge_mutex); diff --git mm/memory-failure.c mm/memory-failure.c index e7827b9e6397..e179ffa15026 100644 ---- mm/memory-failure.c -+++ mm/memory-failure.c +--- linux-4.14.336/mm/memory-failure.c ++++ linux-4.14.336/mm/memory-failure.c @@ -952,7 +952,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, * This check implies we don't kill processes if their pages * are in the swap cache early. Those are always late kills. @@ -10032,8 +10032,8 @@ index e7827b9e6397..e179ffa15026 100644 * try_to_unmap() might put mlocked page in lru cache, so call diff --git mm/memory.c mm/memory.c index 0136af15ba18..aa0c46997ce8 100644 ---- mm/memory.c -+++ mm/memory.c +--- linux-4.14.336/mm/memory.c ++++ linux-4.14.336/mm/memory.c @@ -2958,8 +2958,8 @@ void unmap_mapping_range(struct address_space *mapping, loff_t const holebegin, loff_t const holelen, int even_cows) { @@ -10047,8 +10047,8 @@ index 0136af15ba18..aa0c46997ce8 100644 if (sizeof(holelen) > sizeof(hlen)) { diff --git mm/page-writeback.c mm/page-writeback.c index 29f9980c13ac..2193086847b3 100644 ---- mm/page-writeback.c -+++ mm/page-writeback.c +--- linux-4.14.336/mm/page-writeback.c ++++ linux-4.14.336/mm/page-writeback.c @@ -1531,7 +1531,7 @@ static inline void wb_dirty_limits(struct dirty_throttle_control *dtc) */ dtc->wb_thresh = __wb_calc_thresh(dtc); @@ -10060,8 +10060,8 @@ index 29f9980c13ac..2193086847b3 100644 * In order to avoid the stacked BDI deadlock we need diff --git net/8021q/vlan_netlink.c net/8021q/vlan_netlink.c index fdf39dd5e755..aad09715ac49 100644 ---- net/8021q/vlan_netlink.c -+++ net/8021q/vlan_netlink.c +--- linux-4.14.336/net/8021q/vlan_netlink.c ++++ linux-4.14.336/net/8021q/vlan_netlink.c @@ -105,12 +105,16 @@ static int vlan_changelink(struct net_device *dev, struct nlattr *tb[], } if (data[IFLA_VLAN_INGRESS_QOS]) { @@ -10081,8 +10081,8 @@ index fdf39dd5e755..aad09715ac49 100644 if (err) diff --git net/bluetooth/hci_conn.c net/bluetooth/hci_conn.c index ce4bbc426946..017abffccc15 100644 ---- net/bluetooth/hci_conn.c -+++ net/bluetooth/hci_conn.c +--- linux-4.14.336/net/bluetooth/hci_conn.c ++++ linux-4.14.336/net/bluetooth/hci_conn.c @@ -1221,12 +1221,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp); @@ -10101,8 +10101,8 @@ index ce4bbc426946..017abffccc15 100644 diff --git net/bluetooth/hci_core.c net/bluetooth/hci_core.c index 2bf0bdee7186..8faecd94bf5a 100644 ---- net/bluetooth/hci_core.c -+++ net/bluetooth/hci_core.c +--- linux-4.14.336/net/bluetooth/hci_core.c ++++ linux-4.14.336/net/bluetooth/hci_core.c @@ -2167,6 +2167,7 @@ static void hci_error_reset(struct work_struct *work) { struct hci_dev *hdev = container_of(work, struct hci_dev, error_reset); @@ -10127,8 +10127,8 @@ index 2bf0bdee7186..8faecd94bf5a 100644 void hci_uuids_clear(struct hci_dev *hdev) diff --git net/bluetooth/hci_event.c net/bluetooth/hci_event.c index 07605fcc9091..987ba33375c9 100644 ---- net/bluetooth/hci_event.c -+++ net/bluetooth/hci_event.c +--- linux-4.14.336/net/bluetooth/hci_event.c ++++ linux-4.14.336/net/bluetooth/hci_event.c @@ -2459,14 +2459,8 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) if (!ev->status) { @@ -10181,8 +10181,8 @@ index 07605fcc9091..987ba33375c9 100644 HCI_ERROR_INVALID_LL_PARAMS); diff --git net/bluetooth/l2cap_core.c net/bluetooth/l2cap_core.c index 6bae68b5d439..e52657f05f78 100644 ---- net/bluetooth/l2cap_core.c -+++ net/bluetooth/l2cap_core.c +--- linux-4.14.336/net/bluetooth/l2cap_core.c ++++ linux-4.14.336/net/bluetooth/l2cap_core.c @@ -5313,7 +5313,13 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn, memset(&rsp, 0, sizeof(rsp)); @@ -10200,8 +10200,8 @@ index 6bae68b5d439..e52657f05f78 100644 else diff --git net/core/dst.c net/core/dst.c index a6c47da7d0f8..2d121958d5b0 100644 ---- net/core/dst.c -+++ net/core/dst.c +--- linux-4.14.336/net/core/dst.c ++++ linux-4.14.336/net/core/dst.c @@ -99,10 +99,10 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev, { struct dst_entry *dst; @@ -10219,8 +10219,8 @@ index a6c47da7d0f8..2d121958d5b0 100644 if (!dst) diff --git net/ipv4/af_inet.c net/ipv4/af_inet.c index 1eee002b12d2..5feb84c43564 100644 ---- net/ipv4/af_inet.c -+++ net/ipv4/af_inet.c +--- linux-4.14.336/net/ipv4/af_inet.c ++++ linux-4.14.336/net/ipv4/af_inet.c @@ -1480,10 +1480,12 @@ EXPORT_SYMBOL(inet_current_timestamp); int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len) @@ -10238,8 +10238,8 @@ index 1eee002b12d2..5feb84c43564 100644 return -EINVAL; diff --git net/ipv4/ip_output.c net/ipv4/ip_output.c index c242c412dabc..947655e4ab5c 100644 ---- net/ipv4/ip_output.c -+++ net/ipv4/ip_output.c +--- linux-4.14.336/net/ipv4/ip_output.c ++++ linux-4.14.336/net/ipv4/ip_output.c @@ -1114,6 +1114,16 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, struct ip_options_rcu *opt; struct rtable *rt; @@ -10275,8 +10275,8 @@ index c242c412dabc..947655e4ab5c 100644 /* We stole this route, caller should not release it. */ diff --git net/ipv4/tcp.c net/ipv4/tcp.c index 0859f968c9b2..eb5458cbdc1c 100644 ---- net/ipv4/tcp.c -+++ net/ipv4/tcp.c +--- linux-4.14.336/net/ipv4/tcp.c ++++ linux-4.14.336/net/ipv4/tcp.c @@ -701,6 +701,7 @@ static void tcp_push(struct sock *sk, int flags, int mss_now, if (!test_bit(TSQ_THROTTLED, &sk->sk_tsq_flags)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAUTOCORKING); @@ -10287,8 +10287,8 @@ index 0859f968c9b2..eb5458cbdc1c 100644 * before we set TSQ_THROTTLED. diff --git net/ipv6/addrconf_core.c net/ipv6/addrconf_core.c index e6c5a4b5921d..f5a267972c57 100644 ---- net/ipv6/addrconf_core.c -+++ net/ipv6/addrconf_core.c +--- linux-4.14.336/net/ipv6/addrconf_core.c ++++ linux-4.14.336/net/ipv6/addrconf_core.c @@ -140,19 +140,26 @@ const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) { EXPORT_SYMBOL_GPL(ipv6_stub); @@ -10325,8 +10325,8 @@ index e6c5a4b5921d..f5a267972c57 100644 static void snmp6_free_dev(struct inet6_dev *idev) diff --git net/ipv6/ip6_tunnel.c net/ipv6/ip6_tunnel.c index d59bf0da2912..cfe3a72a1159 100644 ---- net/ipv6/ip6_tunnel.c -+++ net/ipv6/ip6_tunnel.c +--- linux-4.14.336/net/ipv6/ip6_tunnel.c ++++ linux-4.14.336/net/ipv6/ip6_tunnel.c @@ -404,7 +404,7 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw) const struct ipv6hdr *ipv6h = (const struct ipv6hdr *)raw; unsigned int nhoff = raw - skb->data; @@ -10384,8 +10384,8 @@ index d59bf0da2912..cfe3a72a1159 100644 return 0; diff --git net/ipv6/route.c net/ipv6/route.c index 79b67f8048b5..6e4d31524268 100644 ---- net/ipv6/route.c -+++ net/ipv6/route.c +--- linux-4.14.336/net/ipv6/route.c ++++ linux-4.14.336/net/ipv6/route.c @@ -85,7 +85,7 @@ static struct dst_entry *ip6_negative_advice(struct dst_entry *); static void ip6_dst_destroy(struct dst_entry *); static void ip6_dst_ifdown(struct dst_entry *, @@ -10455,8 +10455,8 @@ index 79b67f8048b5..6e4d31524268 100644 out: diff --git net/ipv6/seg6.c net/ipv6/seg6.c index 9c45165fe79b..b785bf569049 100644 ---- net/ipv6/seg6.c -+++ net/ipv6/seg6.c +--- linux-4.14.336/net/ipv6/seg6.c ++++ linux-4.14.336/net/ipv6/seg6.c @@ -447,22 +447,24 @@ int __init seg6_init(void) { int err = -ENOMEM; @@ -10505,8 +10505,8 @@ index 9c45165fe79b..b785bf569049 100644 diff --git net/iucv/af_iucv.c net/iucv/af_iucv.c index 07e397a5edc6..d7dd92274957 100644 ---- net/iucv/af_iucv.c -+++ net/iucv/af_iucv.c +--- linux-4.14.336/net/iucv/af_iucv.c ++++ linux-4.14.336/net/iucv/af_iucv.c @@ -2458,7 +2458,7 @@ static int __init afiucv_init(void) { int err; @@ -10550,8 +10550,8 @@ index 07e397a5edc6..d7dd92274957 100644 dev_remove_pack(&iucv_packet_type); diff --git net/l2tp/l2tp_ip6.c net/l2tp/l2tp_ip6.c index d797708a1a5e..4a5f6ca12342 100644 ---- net/l2tp/l2tp_ip6.c -+++ net/l2tp/l2tp_ip6.c +--- linux-4.14.336/net/l2tp/l2tp_ip6.c ++++ linux-4.14.336/net/l2tp/l2tp_ip6.c @@ -658,7 +658,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) back_from_confirm: @@ -10563,8 +10563,8 @@ index d797708a1a5e..4a5f6ca12342 100644 &fl6, (struct rt6_info *)dst, diff --git net/llc/af_llc.c net/llc/af_llc.c index 1e20b719fb3c..727af511297c 100644 ---- net/llc/af_llc.c -+++ net/llc/af_llc.c +--- linux-4.14.336/net/llc/af_llc.c ++++ linux-4.14.336/net/llc/af_llc.c @@ -227,6 +227,8 @@ static int llc_ui_release(struct socket *sock) if (llc->dev) dev_put(llc->dev); @@ -10630,8 +10630,8 @@ index 1e20b719fb3c..727af511297c 100644 goto out; diff --git net/llc/llc_core.c net/llc/llc_core.c index 64d4bef04e73..4900a27b5176 100644 ---- net/llc/llc_core.c -+++ net/llc/llc_core.c +--- linux-4.14.336/net/llc/llc_core.c ++++ linux-4.14.336/net/llc/llc_core.c @@ -135,22 +135,15 @@ static struct packet_type llc_packet_type __read_mostly = { .func = llc_rcv, }; @@ -10657,8 +10657,8 @@ index 64d4bef04e73..4900a27b5176 100644 module_init(llc_init); diff --git net/mac80211/sta_info.c net/mac80211/sta_info.c index 4e406cd11573..f2663c0a1e6f 100644 ---- net/mac80211/sta_info.c -+++ net/mac80211/sta_info.c +--- linux-4.14.336/net/mac80211/sta_info.c ++++ linux-4.14.336/net/mac80211/sta_info.c @@ -602,6 +602,8 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) if (ieee80211_vif_is_mesh(&sdata->vif)) mesh_accept_plinks_update(sdata); @@ -10670,8 +10670,8 @@ index 4e406cd11573..f2663c0a1e6f 100644 sta_info_hash_del(local, sta); diff --git net/mac80211/tx.c net/mac80211/tx.c index 3914214dee05..995b0f444351 100644 ---- net/mac80211/tx.c -+++ net/mac80211/tx.c +--- linux-4.14.336/net/mac80211/tx.c ++++ linux-4.14.336/net/mac80211/tx.c @@ -2808,7 +2808,7 @@ void ieee80211_check_fast_xmit(struct sta_info *sta) sdata->vif.type == NL80211_IFTYPE_STATION) goto out; @@ -10683,8 +10683,8 @@ index 3914214dee05..995b0f444351 100644 if (test_sta_flag(sta, WLAN_STA_PS_STA) || diff --git net/ncsi/internal.h net/ncsi/internal.h index 8055e3965cef..2477caf9c967 100644 ---- net/ncsi/internal.h -+++ net/ncsi/internal.h +--- linux-4.14.336/net/ncsi/internal.h ++++ linux-4.14.336/net/ncsi/internal.h @@ -69,9 +69,12 @@ enum { }; @@ -10703,8 +10703,8 @@ index 8055e3965cef..2477caf9c967 100644 u32 mf_id; /* Manufacture ID */ diff --git net/ncsi/ncsi-netlink.c net/ncsi/ncsi-netlink.c index 9073911ac97b..5c88201ec9d8 100644 ---- net/ncsi/ncsi-netlink.c -+++ net/ncsi/ncsi-netlink.c +--- linux-4.14.336/net/ncsi/ncsi-netlink.c ++++ linux-4.14.336/net/ncsi/ncsi-netlink.c @@ -71,8 +71,8 @@ static int ncsi_write_channel_info(struct sk_buff *skb, if (ndp->force_channel == nc) nla_put_flag(skb, NCSI_CHANNEL_ATTR_FORCED); @@ -10718,8 +10718,8 @@ index 9073911ac97b..5c88201ec9d8 100644 vid_nest = nla_nest_start(skb, NCSI_CHANNEL_ATTR_VLAN_LIST); diff --git net/ncsi/ncsi-pkt.h net/ncsi/ncsi-pkt.h index 91b4b66438df..0bf62b4883d4 100644 ---- net/ncsi/ncsi-pkt.h -+++ net/ncsi/ncsi-pkt.h +--- linux-4.14.336/net/ncsi/ncsi-pkt.h ++++ linux-4.14.336/net/ncsi/ncsi-pkt.h @@ -164,9 +164,12 @@ struct ncsi_rsp_gls_pkt { /* Get Version ID */ struct ncsi_rsp_gvi_pkt { @@ -10737,8 +10737,8 @@ index 91b4b66438df..0bf62b4883d4 100644 __be16 pci_ids[4]; /* PCI IDs */ diff --git net/ncsi/ncsi-rsp.c net/ncsi/ncsi-rsp.c index 42878d843c3c..1ae1de24b202 100644 ---- net/ncsi/ncsi-rsp.c -+++ net/ncsi/ncsi-rsp.c +--- linux-4.14.336/net/ncsi/ncsi-rsp.c ++++ linux-4.14.336/net/ncsi/ncsi-rsp.c @@ -20,6 +20,19 @@ #include "internal.h" #include "ncsi-pkt.h" @@ -10782,8 +10782,8 @@ index 42878d843c3c..1ae1de24b202 100644 ncv->fw_version = ntohl(rsp->fw_version); diff --git net/netfilter/ipvs/ip_vs_xmit.c net/netfilter/ipvs/ip_vs_xmit.c index 97d411033f8a..8792cad28e29 100644 ---- net/netfilter/ipvs/ip_vs_xmit.c -+++ net/netfilter/ipvs/ip_vs_xmit.c +--- linux-4.14.336/net/netfilter/ipvs/ip_vs_xmit.c ++++ linux-4.14.336/net/netfilter/ipvs/ip_vs_xmit.c @@ -270,8 +270,8 @@ static inline bool decrement_ttl(struct netns_ipvs *ipvs, skb->dev = dst->dev; icmpv6_send(skb, ICMPV6_TIME_EXCEED, @@ -10806,8 +10806,8 @@ index 97d411033f8a..8792cad28e29 100644 } diff --git net/netfilter/nf_log.c net/netfilter/nf_log.c index cdc744aa5889..a16156598905 100644 ---- net/netfilter/nf_log.c -+++ net/netfilter/nf_log.c +--- linux-4.14.336/net/netfilter/nf_log.c ++++ linux-4.14.336/net/netfilter/nf_log.c @@ -202,11 +202,12 @@ void nf_logger_put(int pf, enum nf_log_type type) return; } @@ -10826,8 +10826,8 @@ index cdc744aa5889..a16156598905 100644 EXPORT_SYMBOL_GPL(nf_logger_put); diff --git net/netfilter/nf_tables_api.c net/netfilter/nf_tables_api.c index 27c24c99d23b..407346ba89d4 100644 ---- net/netfilter/nf_tables_api.c -+++ net/netfilter/nf_tables_api.c +--- linux-4.14.336/net/netfilter/nf_tables_api.c ++++ linux-4.14.336/net/netfilter/nf_tables_api.c @@ -22,6 +22,8 @@ #include #include @@ -10920,8 +10920,8 @@ index 27c24c99d23b..407346ba89d4 100644 desc->len = sizeof(data->verdict); diff --git net/netfilter/nft_byteorder.c net/netfilter/nft_byteorder.c index dba16126c7ee..8c4ee49a80fb 100644 ---- net/netfilter/nft_byteorder.c -+++ net/netfilter/nft_byteorder.c +--- linux-4.14.336/net/netfilter/nft_byteorder.c ++++ linux-4.14.336/net/netfilter/nft_byteorder.c @@ -41,19 +41,20 @@ static void nft_byteorder_eval(const struct nft_expr *expr, switch (priv->size) { @@ -10947,8 +10947,8 @@ index dba16126c7ee..8c4ee49a80fb 100644 } diff --git net/netfilter/nft_compat.c net/netfilter/nft_compat.c index 8281656808ae..b87b7338266c 100644 ---- net/netfilter/nft_compat.c -+++ net/netfilter/nft_compat.c +--- linux-4.14.336/net/netfilter/nft_compat.c ++++ linux-4.14.336/net/netfilter/nft_compat.c @@ -214,6 +214,7 @@ static const struct nla_policy nft_rule_compat_policy[NFTA_RULE_COMPAT_MAX + 1] static int nft_parse_compat(const struct nlattr *attr, u16 *proto, bool *inv) { @@ -10980,8 +10980,8 @@ index 8281656808ae..b87b7338266c 100644 diff --git net/netlabel/netlabel_calipso.c net/netlabel/netlabel_calipso.c index d177dd066504..e0d63fb927bd 100644 ---- net/netlabel/netlabel_calipso.c -+++ net/netlabel/netlabel_calipso.c +--- linux-4.14.336/net/netlabel/netlabel_calipso.c ++++ linux-4.14.336/net/netlabel/netlabel_calipso.c @@ -68,6 +68,28 @@ static const struct nla_policy calipso_genl_policy[NLBL_CALIPSO_A_MAX + 1] = { [NLBL_CALIPSO_A_MTYPE] = { .type = NLA_U32 }, }; @@ -11072,8 +11072,8 @@ index d177dd066504..e0d63fb927bd 100644 * @doi_def: the DOI structure diff --git net/netlabel/netlabel_cipso_v4.c net/netlabel/netlabel_cipso_v4.c index e252f62bb8c2..a0a145db3fc7 100644 ---- net/netlabel/netlabel_cipso_v4.c -+++ net/netlabel/netlabel_cipso_v4.c +--- linux-4.14.336/net/netlabel/netlabel_cipso_v4.c ++++ linux-4.14.336/net/netlabel/netlabel_cipso_v4.c @@ -420,7 +420,7 @@ static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info) !info->attrs[NLBL_CIPSOV4_A_MTYPE]) return -EINVAL; @@ -11094,8 +11094,8 @@ index e252f62bb8c2..a0a145db3fc7 100644 ret_val = netlbl_domhsh_walk(&skip_bkt, &skip_chain, diff --git net/netlabel/netlabel_mgmt.c net/netlabel/netlabel_mgmt.c index 71ba69cb50c9..43c51242dcd2 100644 ---- net/netlabel/netlabel_mgmt.c -+++ net/netlabel/netlabel_mgmt.c +--- linux-4.14.336/net/netlabel/netlabel_mgmt.c ++++ linux-4.14.336/net/netlabel/netlabel_mgmt.c @@ -447,7 +447,7 @@ static int netlbl_mgmt_add(struct sk_buff *skb, struct genl_info *info) (info->attrs[NLBL_MGMT_A_IPV6MASK] != NULL))) return -EINVAL; @@ -11134,8 +11134,8 @@ index 71ba69cb50c9..43c51242dcd2 100644 } diff --git net/netlabel/netlabel_unlabeled.c net/netlabel/netlabel_unlabeled.c index 0067f472367b..ff52ff2278ed 100644 ---- net/netlabel/netlabel_unlabeled.c -+++ net/netlabel/netlabel_unlabeled.c +--- linux-4.14.336/net/netlabel/netlabel_unlabeled.c ++++ linux-4.14.336/net/netlabel/netlabel_unlabeled.c @@ -827,7 +827,7 @@ static int netlbl_unlabel_accept(struct sk_buff *skb, struct genl_info *info) if (info->attrs[NLBL_UNLABEL_A_ACPTFLG]) { value = nla_get_u8(info->attrs[NLBL_UNLABEL_A_ACPTFLG]); @@ -11183,8 +11183,8 @@ index 0067f472367b..ff52ff2278ed 100644 if (ret_val != 0) diff --git net/netlabel/netlabel_user.h net/netlabel/netlabel_user.h index 4a397cde1a48..2c608677b43b 100644 ---- net/netlabel/netlabel_user.h -+++ net/netlabel/netlabel_user.h +--- linux-4.14.336/net/netlabel/netlabel_user.h ++++ linux-4.14.336/net/netlabel/netlabel_user.h @@ -42,11 +42,9 @@ /** @@ -11200,8 +11200,8 @@ index 4a397cde1a48..2c608677b43b 100644 audit_info->loginuid = audit_get_loginuid(current); diff --git net/netlink/af_netlink.c net/netlink/af_netlink.c index 89ece1f093e2..ee42244aada1 100644 ---- net/netlink/af_netlink.c -+++ net/netlink/af_netlink.c +--- linux-4.14.336/net/netlink/af_netlink.c ++++ linux-4.14.336/net/netlink/af_netlink.c @@ -162,7 +162,7 @@ static inline u32 netlink_group_mask(u32 group) static struct sk_buff *netlink_to_full_skb(const struct sk_buff *skb, gfp_t gfp_mask) @@ -11222,8 +11222,8 @@ index 89ece1f093e2..ee42244aada1 100644 } diff --git net/nfc/nci/core.c net/nfc/nci/core.c index d42c603dd635..2d9934dbbead 100644 ---- net/nfc/nci/core.c -+++ net/nfc/nci/core.c +--- linux-4.14.336/net/nfc/nci/core.c ++++ linux-4.14.336/net/nfc/nci/core.c @@ -1209,6 +1209,10 @@ void nci_free_device(struct nci_dev *ndev) { nfc_free_device(ndev->nfc_dev); @@ -11237,8 +11237,8 @@ index d42c603dd635..2d9934dbbead 100644 EXPORT_SYMBOL(nci_free_device); diff --git net/packet/af_packet.c net/packet/af_packet.c index ea29453fcf7a..6a02cf8d7141 100644 ---- net/packet/af_packet.c -+++ net/packet/af_packet.c +--- linux-4.14.336/net/packet/af_packet.c ++++ linux-4.14.336/net/packet/af_packet.c @@ -1890,7 +1890,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, */ @@ -11259,8 +11259,8 @@ index ea29453fcf7a..6a02cf8d7141 100644 diff --git net/rds/af_rds.c net/rds/af_rds.c index b405f77d664c..2628c1d3844e 100644 ---- net/rds/af_rds.c -+++ net/rds/af_rds.c +--- linux-4.14.336/net/rds/af_rds.c ++++ linux-4.14.336/net/rds/af_rds.c @@ -315,7 +315,7 @@ static int rds_recv_track_latency(struct rds_sock *rs, char __user *optval, rs->rs_rx_traces = trace.rx_traces; @@ -11272,8 +11272,8 @@ index b405f77d664c..2628c1d3844e 100644 } diff --git net/rxrpc/conn_event.c net/rxrpc/conn_event.c index 2432c118397f..8d14aebae621 100644 ---- net/rxrpc/conn_event.c -+++ net/rxrpc/conn_event.c +--- linux-4.14.336/net/rxrpc/conn_event.c ++++ linux-4.14.336/net/rxrpc/conn_event.c @@ -48,6 +48,14 @@ static void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn, _enter("%d", conn->debug_id); @@ -11291,8 +11291,8 @@ index 2432c118397f..8d14aebae621 100644 /* If the last call got moved on whilst we were waiting to run, just diff --git net/rxrpc/conn_service.c net/rxrpc/conn_service.c index f6fcdb3130a1..7c5745997cd4 100644 ---- net/rxrpc/conn_service.c -+++ net/rxrpc/conn_service.c +--- linux-4.14.336/net/rxrpc/conn_service.c ++++ linux-4.14.336/net/rxrpc/conn_service.c @@ -29,7 +29,7 @@ struct rxrpc_connection *rxrpc_find_service_conn_rcu(struct rxrpc_peer *peer, struct rxrpc_conn_proto k; struct rxrpc_skb_priv *sp = rxrpc_skb(skb); @@ -11312,8 +11312,8 @@ index f6fcdb3130a1..7c5745997cd4 100644 p = rcu_dereference_raw(peer->service_conns.rb_node); diff --git net/sched/Kconfig net/sched/Kconfig index 782114a230ae..1a3ee928c57c 100644 ---- net/sched/Kconfig -+++ net/sched/Kconfig +--- linux-4.14.336/net/sched/Kconfig ++++ linux-4.14.336/net/sched/Kconfig @@ -44,23 +44,6 @@ if NET_SCHED comment "Queueing/Scheduling" @@ -11379,8 +11379,8 @@ index 782114a230ae..1a3ee928c57c 100644 ---help--- diff --git net/sched/Makefile net/sched/Makefile index c156c182f546..b2c2cea1fd91 100644 ---- net/sched/Makefile -+++ net/sched/Makefile +--- linux-4.14.336/net/sched/Makefile ++++ linux-4.14.336/net/sched/Makefile @@ -28,20 +28,17 @@ obj-$(CONFIG_NET_IFE_SKBPRIO) += act_meta_skbprio.o obj-$(CONFIG_NET_IFE_SKBTCINDEX) += act_meta_skbtcindex.o obj-$(CONFIG_NET_ACT_TUNNEL_KEY)+= act_tunnel_key.o @@ -11405,8 +11405,8 @@ index c156c182f546..b2c2cea1fd91 100644 diff --git net/sched/sch_atm.c net/sched/sch_atm.c deleted file mode 100644 index 184ce9050457..000000000000 ---- net/sched/sch_atm.c -+++ /dev/null +--- linux-4.14.336/net/sched/sch_atm.c ++++ linux-4.14.336//dev/null @@ -1,701 +0,0 @@ -/* net/sched/sch_atm.c - ATM VC selection "queueing discipline" */ - @@ -12112,8 +12112,8 @@ index 184ce9050457..000000000000 diff --git net/sched/sch_cbq.c net/sched/sch_cbq.c deleted file mode 100644 index 92ff508367e8..000000000000 ---- net/sched/sch_cbq.c -+++ /dev/null +--- linux-4.14.336/net/sched/sch_cbq.c ++++ linux-4.14.336//dev/null @@ -1,1794 +0,0 @@ -/* - * net/sched/sch_cbq.c Class-Based Queueing discipline. @@ -13912,8 +13912,8 @@ index 92ff508367e8..000000000000 diff --git net/sched/sch_dsmark.c net/sched/sch_dsmark.c deleted file mode 100644 index b972d50828ca..000000000000 ---- net/sched/sch_dsmark.c -+++ /dev/null +--- linux-4.14.336/net/sched/sch_dsmark.c ++++ linux-4.14.336//dev/null @@ -1,514 +0,0 @@ -/* net/sched/sch_dsmark.c - Differentiated Services field marker */ - @@ -14431,8 +14431,8 @@ index b972d50828ca..000000000000 -MODULE_LICENSE("GPL"); diff --git net/sunrpc/xprtmultipath.c net/sunrpc/xprtmultipath.c index e2d64c7138c3..699d5ba128fa 100644 ---- net/sunrpc/xprtmultipath.c -+++ net/sunrpc/xprtmultipath.c +--- linux-4.14.336/net/sunrpc/xprtmultipath.c ++++ linux-4.14.336/net/sunrpc/xprtmultipath.c @@ -235,8 +235,9 @@ struct rpc_xprt *xprt_iter_current_entry(struct rpc_xprt_iter *xpi) return xprt_switch_find_current_entry(head, xpi->xpi_cursor); } @@ -14466,8 +14466,8 @@ index e2d64c7138c3..699d5ba128fa 100644 const struct rpc_xprt *cur) diff --git net/tipc/bearer.c net/tipc/bearer.c index 506cbd1b2223..db21e00806f5 100644 ---- net/tipc/bearer.c -+++ net/tipc/bearer.c +--- linux-4.14.336/net/tipc/bearer.c ++++ linux-4.14.336/net/tipc/bearer.c @@ -931,6 +931,12 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info) #ifdef CONFIG_TIPC_MEDIA_UDP @@ -14483,8 +14483,8 @@ index 506cbd1b2223..db21e00806f5 100644 if (err) { diff --git net/unix/af_unix.c net/unix/af_unix.c index 8d25d50f916e..b1855778acd0 100644 ---- net/unix/af_unix.c -+++ net/unix/af_unix.c +--- linux-4.14.336/net/unix/af_unix.c ++++ linux-4.14.336/net/unix/af_unix.c @@ -1127,13 +1127,11 @@ static void unix_state_double_lock(struct sock *sk1, struct sock *sk2) unix_state_lock(sk1); return; @@ -14515,8 +14515,8 @@ index 8d25d50f916e..b1855778acd0 100644 unix_state_unlock(sk); diff --git net/unix/diag.c net/unix/diag.c index 3183d9b8ab33..d6ceac688def 100644 ---- net/unix/diag.c -+++ net/unix/diag.c +--- linux-4.14.336/net/unix/diag.c ++++ linux-4.14.336/net/unix/diag.c @@ -80,7 +80,7 @@ static int sk_diag_dump_icons(struct sock *sk, struct sk_buff *nlskb) * queue lock. With the other's queue locked it's * OK to lock the state. @@ -14528,8 +14528,8 @@ index 3183d9b8ab33..d6ceac688def 100644 unix_state_unlock(req); diff --git net/wireless/nl80211.c net/wireless/nl80211.c index b4b564182db0..4f43f4dfb996 100644 ---- net/wireless/nl80211.c -+++ net/wireless/nl80211.c +--- linux-4.14.336/net/wireless/nl80211.c ++++ linux-4.14.336/net/wireless/nl80211.c @@ -2717,6 +2717,7 @@ static int nl80211_dump_interface(struct sk_buff *skb, struct netlink_callback * if_idx++; } @@ -14549,8 +14549,8 @@ index b4b564182db0..4f43f4dfb996 100644 diff --git net/wireless/scan.c net/wireless/scan.c index 8bbcdcf5c829..88fe0e8e8b18 100644 ---- net/wireless/scan.c -+++ net/wireless/scan.c +--- linux-4.14.336/net/wireless/scan.c ++++ linux-4.14.336/net/wireless/scan.c @@ -1015,8 +1015,12 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev, list_add(&new->hidden_list, &hidden->hidden_list); @@ -14566,8 +14566,8 @@ index 8bbcdcf5c829..88fe0e8e8b18 100644 /* diff --git security/apparmor/policy_unpack.c security/apparmor/policy_unpack.c index 2cef8d4404cc..4f41aa6ff897 100644 ---- security/apparmor/policy_unpack.c -+++ security/apparmor/policy_unpack.c +--- linux-4.14.336/security/apparmor/policy_unpack.c ++++ linux-4.14.336/security/apparmor/policy_unpack.c @@ -604,6 +604,10 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) tmpname = aa_splitn_fqname(name, strlen(name), &tmpns, &ns_len); @@ -14581,8 +14581,8 @@ index 2cef8d4404cc..4f41aa6ff897 100644 info = "out of memory"; diff --git security/security.c security/security.c index b5e3d7a91b33..90c2094380e2 100644 ---- security/security.c -+++ security/security.c +--- linux-4.14.336/security/security.c ++++ linux-4.14.336/security/security.c @@ -884,6 +884,23 @@ int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return call_int_hook(file_ioctl, 0, file, cmd, arg); } @@ -14609,8 +14609,8 @@ index b5e3d7a91b33..90c2094380e2 100644 /* diff --git security/selinux/hooks.c security/selinux/hooks.c index 38a4db1f3aaa..a1613e22a734 100644 ---- security/selinux/hooks.c -+++ security/selinux/hooks.c +--- linux-4.14.336/security/selinux/hooks.c ++++ linux-4.14.336/security/selinux/hooks.c @@ -3571,6 +3571,33 @@ static int selinux_file_ioctl(struct file *file, unsigned int cmd, return error; } @@ -14655,8 +14655,8 @@ index 38a4db1f3aaa..a1613e22a734 100644 LSM_HOOK_INIT(file_mprotect, selinux_file_mprotect), diff --git security/smack/smack_lsm.c security/smack/smack_lsm.c index fe070669dc18..a6e81ef73b42 100644 ---- security/smack/smack_lsm.c -+++ security/smack/smack_lsm.c +--- linux-4.14.336/security/smack/smack_lsm.c ++++ linux-4.14.336/security/smack/smack_lsm.c @@ -4651,6 +4651,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = { LSM_HOOK_INIT(file_alloc_security, smack_file_alloc_security), LSM_HOOK_INIT(file_free_security, smack_file_free_security), @@ -14667,8 +14667,8 @@ index fe070669dc18..a6e81ef73b42 100644 LSM_HOOK_INIT(mmap_file, smack_mmap_file), diff --git security/tomoyo/tomoyo.c security/tomoyo/tomoyo.c index 213b8c593668..195f9b706926 100644 ---- security/tomoyo/tomoyo.c -+++ security/tomoyo/tomoyo.c +--- linux-4.14.336/security/tomoyo/tomoyo.c ++++ linux-4.14.336/security/tomoyo/tomoyo.c @@ -516,6 +516,7 @@ static struct security_hook_list tomoyo_hooks[] __lsm_ro_after_init = { LSM_HOOK_INIT(path_rename, tomoyo_path_rename), LSM_HOOK_INIT(inode_getattr, tomoyo_inode_getattr), @@ -14679,8 +14679,8 @@ index 213b8c593668..195f9b706926 100644 LSM_HOOK_INIT(path_chroot, tomoyo_path_chroot), diff --git sound/core/Makefile sound/core/Makefile index ee4a4a6b99ba..753bf1a0dbf3 100644 ---- sound/core/Makefile -+++ sound/core/Makefile +--- linux-4.14.336/sound/core/Makefile ++++ linux-4.14.336/sound/core/Makefile @@ -30,7 +30,6 @@ snd-pcm-dmaengine-objs := pcm_dmaengine.o snd-rawmidi-objs := rawmidi.o snd-timer-objs := timer.o @@ -14691,8 +14691,8 @@ index ee4a4a6b99ba..753bf1a0dbf3 100644 diff --git sound/pci/hda/hda_intel.c sound/pci/hda/hda_intel.c index 978719fc4cd3..bb76b9c26da8 100644 ---- sound/pci/hda/hda_intel.c -+++ sound/pci/hda/hda_intel.c +--- linux-4.14.336/sound/pci/hda/hda_intel.c ++++ linux-4.14.336/sound/pci/hda/hda_intel.c @@ -2545,6 +2545,12 @@ static const struct pci_device_id azx_ids[] = { /* Cannonlake */ { PCI_DEVICE(0x8086, 0x9dc8), @@ -14708,8 +14708,8 @@ index 978719fc4cd3..bb76b9c26da8 100644 .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, diff --git sound/pci/hda/patch_conexant.c sound/pci/hda/patch_conexant.c index 9263cb56df7d..6215d85428c7 100644 ---- sound/pci/hda/patch_conexant.c -+++ sound/pci/hda/patch_conexant.c +--- linux-4.14.336/sound/pci/hda/patch_conexant.c ++++ linux-4.14.336/sound/pci/hda/patch_conexant.c @@ -263,6 +263,7 @@ enum { CXT_FIXUP_MUTE_LED_GPIO, CXT_FIXUP_HEADSET_MIC, @@ -14765,8 +14765,8 @@ index 9263cb56df7d..6215d85428c7 100644 diff --git sound/pci/oxygen/oxygen_mixer.c sound/pci/oxygen/oxygen_mixer.c index 4ca12665ff73..64a82688d7fb 100644 ---- sound/pci/oxygen/oxygen_mixer.c -+++ sound/pci/oxygen/oxygen_mixer.c +--- linux-4.14.336/sound/pci/oxygen/oxygen_mixer.c ++++ linux-4.14.336/sound/pci/oxygen/oxygen_mixer.c @@ -730,7 +730,7 @@ static int ac97_fp_rec_volume_put(struct snd_kcontrol *ctl, oldreg = oxygen_read_ac97(chip, 1, AC97_REC_GAIN); newreg = oldreg & ~0x0707; @@ -14778,8 +14778,8 @@ index 4ca12665ff73..64a82688d7fb 100644 oxygen_write_ac97(chip, 1, AC97_REC_GAIN, newreg); diff --git sound/soc/codecs/cs35l33.c sound/soc/codecs/cs35l33.c index e2c1194ea61a..32048c4c7e71 100644 ---- sound/soc/codecs/cs35l33.c -+++ sound/soc/codecs/cs35l33.c +--- linux-4.14.336/sound/soc/codecs/cs35l33.c ++++ linux-4.14.336/sound/soc/codecs/cs35l33.c @@ -26,13 +26,11 @@ #include #include @@ -14805,8 +14805,8 @@ index e2c1194ea61a..32048c4c7e71 100644 __func__); diff --git sound/soc/codecs/cs35l34.c sound/soc/codecs/cs35l34.c index 1e05026bedca..8a0ca34d828e 100644 ---- sound/soc/codecs/cs35l34.c -+++ sound/soc/codecs/cs35l34.c +--- linux-4.14.336/sound/soc/codecs/cs35l34.c ++++ linux-4.14.336/sound/soc/codecs/cs35l34.c @@ -24,14 +24,12 @@ #include #include @@ -14833,8 +14833,8 @@ index 1e05026bedca..8a0ca34d828e 100644 diff --git sound/soc/codecs/cs43130.c sound/soc/codecs/cs43130.c index 643e37fc218e..ad5d527e6e52 100644 ---- sound/soc/codecs/cs43130.c -+++ sound/soc/codecs/cs43130.c +--- linux-4.14.336/sound/soc/codecs/cs43130.c ++++ linux-4.14.336/sound/soc/codecs/cs43130.c @@ -581,7 +581,7 @@ static int cs43130_set_sp_fmt(int dai_id, unsigned int bitwidth_sclk, break; case SND_SOC_DAIFMT_LEFT_J: @@ -14864,8 +14864,8 @@ index 643e37fc218e..ad5d527e6e52 100644 }; diff --git sound/soc/codecs/da7219-aad.c sound/soc/codecs/da7219-aad.c index 793c8768f7c4..5a31a4db1e23 100644 ---- sound/soc/codecs/da7219-aad.c -+++ sound/soc/codecs/da7219-aad.c +--- linux-4.14.336/sound/soc/codecs/da7219-aad.c ++++ linux-4.14.336/sound/soc/codecs/da7219-aad.c @@ -650,7 +650,7 @@ static struct da7219_aad_pdata *da7219_aad_fw_to_pdata(struct snd_soc_codec *cod aad_pdata->mic_det_thr = da7219_aad_fw_mic_det_thr(codec, fw_val32); @@ -14877,8 +14877,8 @@ index 793c8768f7c4..5a31a4db1e23 100644 aad_pdata->jack_ins_deb = diff --git sound/soc/codecs/rt5645.c sound/soc/codecs/rt5645.c index 822c42101c3f..536a33820265 100644 ---- sound/soc/codecs/rt5645.c -+++ sound/soc/codecs/rt5645.c +--- linux-4.14.336/sound/soc/codecs/rt5645.c ++++ linux-4.14.336/sound/soc/codecs/rt5645.c @@ -417,6 +417,7 @@ struct rt5645_priv { struct regulator_bulk_data supplies[ARRAY_SIZE(rt5645_supply_names)]; struct rt5645_eq_param_s *eq_param; @@ -14941,8 +14941,8 @@ index 822c42101c3f..536a33820265 100644 diff --git tools/lib/subcmd/help.c tools/lib/subcmd/help.c index 2859f107abc8..4260c8b4257b 100644 ---- tools/lib/subcmd/help.c -+++ tools/lib/subcmd/help.c +--- linux-4.14.336/tools/lib/subcmd/help.c ++++ linux-4.14.336/tools/lib/subcmd/help.c @@ -50,11 +50,21 @@ void uniq(struct cmdnames *cmds) if (!cmds->cnt) return; @@ -14971,8 +14971,8 @@ index 2859f107abc8..4260c8b4257b 100644 void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes) diff --git tools/testing/selftests/powerpc/math/fpu_preempt.c tools/testing/selftests/powerpc/math/fpu_preempt.c index 0f85b79d883d..c91f3b36e884 100644 ---- tools/testing/selftests/powerpc/math/fpu_preempt.c -+++ tools/testing/selftests/powerpc/math/fpu_preempt.c +--- linux-4.14.336/tools/testing/selftests/powerpc/math/fpu_preempt.c ++++ linux-4.14.336/tools/testing/selftests/powerpc/math/fpu_preempt.c @@ -41,19 +41,20 @@ __thread double darray[] = {0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, int threads_starting; int running; @@ -15000,8 +15000,8 @@ index 0f85b79d883d..c91f3b36e884 100644 int test_preempt_fpu(void) diff --git tools/testing/selftests/powerpc/math/vmx_preempt.c tools/testing/selftests/powerpc/math/vmx_preempt.c index 9ef376c55b13..7ba95ceaaa50 100644 ---- tools/testing/selftests/powerpc/math/vmx_preempt.c -+++ tools/testing/selftests/powerpc/math/vmx_preempt.c +--- linux-4.14.336/tools/testing/selftests/powerpc/math/vmx_preempt.c ++++ linux-4.14.336/tools/testing/selftests/powerpc/math/vmx_preempt.c @@ -41,19 +41,21 @@ __thread vector int varray[] = {{1, 2, 3, 4}, {5, 6, 7, 8}, {9, 10,11,12}, int threads_starting; int running; @@ -15030,8 +15030,8 @@ index 9ef376c55b13..7ba95ceaaa50 100644 int test_preempt_vmx(void) diff --git virt/kvm/arm/vgic/vgic-its.c virt/kvm/arm/vgic/vgic-its.c index fd25c2161060..a4398f58a830 100644 ---- virt/kvm/arm/vgic/vgic-its.c -+++ virt/kvm/arm/vgic/vgic-its.c +--- linux-4.14.336/virt/kvm/arm/vgic/vgic-its.c ++++ linux-4.14.336/virt/kvm/arm/vgic/vgic-its.c @@ -424,6 +424,9 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu) } diff --git a/steps/linux-4.14.341-openela/patches/ddfd117714014cebe7b5d008fdec8eaec620cba1.patch b/steps/linux-4.14.341-openela/patches/ddfd117714014cebe7b5d008fdec8eaec620cba1.patch index 942a535d..1d9ca5ae 100644 --- a/steps/linux-4.14.341-openela/patches/ddfd117714014cebe7b5d008fdec8eaec620cba1.patch +++ b/steps/linux-4.14.341-openela/patches/ddfd117714014cebe7b5d008fdec8eaec620cba1.patch @@ -33,8 +33,8 @@ Signed-off-by: Greg Kroah-Hartman diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 0116b2ee9e64f..4699acd602af4 100644 ---- arch/x86/include/asm/virtext.h -+++ arch/x86/include/asm/virtext.h +--- linux-4.14.336/arch/x86/include/asm/virtext.h ++++ linux-4.14.336/arch/x86/include/asm/virtext.h @@ -114,21 +114,7 @@ static inline void cpu_svm_disable(void) wrmsrl(MSR_VM_HSAVE_PA, 0); diff --git a/steps/linux-4.14.341-openela/patches/deblob.patch b/steps/linux-4.14.341-openela/patches/deblob.patch index 74c5a6fb..037d304d 100644 --- a/steps/linux-4.14.341-openela/patches/deblob.patch +++ b/steps/linux-4.14.341-openela/patches/deblob.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only Remove drivers containing embedded blobs diff -ruN ../linux-4.14.336/Documentation/networking/cops.txt ./Documentation/networking/cops.txt ---- ../linux-4.14.336/Documentation/networking/cops.txt 2024-01-10 14:45:41.000000000 +0100 -+++ ./Documentation/networking/cops.txt 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/Documentation/networking/cops.txt 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./Documentation/networking/cops.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -Text File for the COPS LocalTalk Linux driver (cops.c). - By Jay Schulist @@ -72,8 +72,8 @@ diff -ruN ../linux-4.14.336/Documentation/networking/cops.txt ./Documentation/ne -lt1 -seed -phase 1 -net 2000 -addr 2000.20 -zone "LocalTalk2" -eth0 -seed -phase 2 -net 3000 -addr 3000.30 -zone "EtherTalk" diff -ruN ../linux-4.14.336/arch/powerpc/include/asm/cpm1.h ./arch/powerpc/include/asm/cpm1.h ---- ../linux-4.14.336/arch/powerpc/include/asm/cpm1.h 2024-01-10 14:45:41.000000000 +0100 -+++ ./arch/powerpc/include/asm/cpm1.h 2024-02-14 20:39:09.131692114 +0100 +--- linux-4.14.336/../linux-4.14.336/arch/powerpc/include/asm/cpm1.h 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./arch/powerpc/include/asm/cpm1.h 2024-02-14 20:39:09.131692114 +0100 @@ -56,8 +56,6 @@ extern void cpm_setbrg(uint brg, uint rate); @@ -84,8 +84,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/include/asm/cpm1.h ./arch/powerpc/inclu /* Parameter RAM offsets. diff -ruN ../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig ./arch/powerpc/platforms/8xx/Kconfig ---- ../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig 2024-01-10 14:45:41.000000000 +0100 -+++ ./arch/powerpc/platforms/8xx/Kconfig 2024-02-14 21:00:16.561611905 +0100 +--- linux-4.14.336/../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./arch/powerpc/platforms/8xx/Kconfig 2024-02-14 21:00:16.561611905 +0100 @@ -145,35 +145,4 @@ If in doubt, say Y here. @@ -123,8 +123,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig ./arch/powerpc/pl - endmenu diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/Makefile ./arch/powerpc/sysdev/Makefile ---- ../linux-4.14.336/arch/powerpc/sysdev/Makefile 2024-01-10 14:45:41.000000000 +0100 -+++ ./arch/powerpc/sysdev/Makefile 2024-02-14 20:37:04.311700569 +0100 +--- linux-4.14.336/../linux-4.14.336/arch/powerpc/sysdev/Makefile 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./arch/powerpc/sysdev/Makefile 2024-02-14 20:37:04.311700569 +0100 @@ -46,7 +46,6 @@ obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o @@ -134,8 +134,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/Makefile ./arch/powerpc/sysdev/M obj-$(CONFIG_PPC_MPC512x) += mpc5xxx_clocks.o obj-$(CONFIG_PPC_MPC52xx) += mpc5xxx_clocks.o diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/cpm1.c ./arch/powerpc/sysdev/cpm1.c ---- ../linux-4.14.336/arch/powerpc/sysdev/cpm1.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./arch/powerpc/sysdev/cpm1.c 2024-02-14 20:38:38.041694200 +0100 +--- linux-4.14.336/../linux-4.14.336/arch/powerpc/sysdev/cpm1.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./arch/powerpc/sysdev/cpm1.c 2024-02-14 20:38:38.041694200 +0100 @@ -218,10 +218,6 @@ while (in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG); #endif @@ -148,8 +148,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/cpm1.c ./arch/powerpc/sysdev/cpm * On 860T, this also enables FEC priority 6. I am not sure * this is what we really want for some applications, but the diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/micropatch.c ./arch/powerpc/sysdev/micropatch.c ---- ../linux-4.14.336/arch/powerpc/sysdev/micropatch.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./arch/powerpc/sysdev/micropatch.c 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/arch/powerpc/sysdev/micropatch.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./arch/powerpc/sysdev/micropatch.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,749 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - @@ -901,8 +901,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/micropatch.c ./arch/powerpc/sysd -} -#endif diff -ruN ../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c ./drivers/i2c/busses/i2c-cpm.c ---- ../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/i2c/busses/i2c-cpm.c 2024-02-14 20:42:10.901680998 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/i2c/busses/i2c-cpm.c 2024-02-14 20:42:10.901680998 +0100 @@ -461,20 +461,9 @@ } @@ -925,8 +925,8 @@ diff -ruN ../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c ./drivers/i2c/busses/i2 } else if (of_device_is_compatible(ofdev->dev.of_node, "fsl,cpm2-i2c")) { diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig ./drivers/media/usb/dvb-usb/Kconfig ---- ../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/media/usb/dvb-usb/Kconfig 2024-02-14 21:41:13.341455995 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/media/usb/dvb-usb/Kconfig 2024-02-14 21:41:13.341455995 +0100 @@ -242,22 +242,6 @@ help Say Y here to support the Opera DVB-S USB2.0 receiver. @@ -951,8 +951,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig ./drivers/media/us tristate "Pinnacle PCTV HDTV Pro USB device/TT Connect S2-3600" depends on DVB_USB diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile ./drivers/media/usb/dvb-usb/Makefile ---- ../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/media/usb/dvb-usb/Makefile 2024-02-14 21:40:58.271457116 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/media/usb/dvb-usb/Makefile 2024-02-14 21:40:58.271457116 +0100 @@ -53,12 +53,6 @@ dvb-usb-opera-objs := opera1.o obj-$(CONFIG_DVB_USB_OPERA1) += dvb-usb-opera.o @@ -967,8 +967,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile ./drivers/media/u obj-$(CONFIG_DVB_USB_PCTV452E) += dvb-usb-pctv452e.o diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c ./drivers/media/usb/dvb-usb/af9005-fe.c ---- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/media/usb/dvb-usb/af9005-fe.c 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005-fe.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1484 +0,0 @@ -/* Frontend part of the Linux driver for the Afatech 9005 - * USB1.1 DVB-T receiver. @@ -2455,8 +2455,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c ./drivers/medi - .read_ucblocks = af9005_fe_read_unc_blocks, -}; diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c ./drivers/media/usb/dvb-usb/af9005-remote.c ---- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/media/usb/dvb-usb/af9005-remote.c 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005-remote.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,153 +0,0 @@ -/* DVB USB compliant Linux driver for the Afatech 9005 - * USB1.1 DVB-T receiver. @@ -2612,8 +2612,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c ./drivers/ -MODULE_VERSION("1.0"); -MODULE_LICENSE("GPL"); diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h ./drivers/media/usb/dvb-usb/af9005-script.h ---- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/media/usb/dvb-usb/af9005-script.h 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005-script.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,204 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* @@ -2820,8 +2820,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h ./drivers/ - {0xa349, 0x0, 0x6, 0x2}, -}; diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c ./drivers/media/usb/dvb-usb/af9005.c ---- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/media/usb/dvb-usb/af9005.c 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1151 +0,0 @@ -/* DVB USB compliant Linux driver for the Afatech 9005 - * USB1.1 DVB-T receiver. @@ -3975,8 +3975,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c ./drivers/media/u -MODULE_VERSION("1.0"); -MODULE_LICENSE("GPL"); diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h ./drivers/media/usb/dvb-usb/af9005.h ---- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/media/usb/dvb-usb/af9005.h 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,3492 +0,0 @@ -/* Common header-file of the Linux driver for the Afatech 9005 - * USB1.1 DVB-T receiver. @@ -7471,8 +7471,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h ./drivers/media/u - -#endif diff -ruN ../linux-4.14.336/drivers/net/Space.c ./drivers/net/Space.c ---- ../linux-4.14.336/drivers/net/Space.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/net/Space.c 2024-02-14 21:04:46.981594989 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/net/Space.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/net/Space.c 2024-02-14 21:04:46.981594989 +0100 @@ -150,11 +150,6 @@ for (num = 0; num < 8; ++num) ethif_probe2(num); @@ -7486,8 +7486,8 @@ diff -ruN ../linux-4.14.336/drivers/net/Space.c ./drivers/net/Space.c ltpc_probe(); #endif diff -ruN ../linux-4.14.336/drivers/net/appletalk/Kconfig ./drivers/net/appletalk/Kconfig ---- ../linux-4.14.336/drivers/net/appletalk/Kconfig 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/net/appletalk/Kconfig 2024-02-14 21:04:25.861596249 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/Kconfig 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/net/appletalk/Kconfig 2024-02-14 21:04:25.861596249 +0100 @@ -49,32 +49,6 @@ This driver is experimental, which means that it may not work. See the file . @@ -7522,8 +7522,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/Kconfig ./drivers/net/appletal tristate "Appletalk-IP driver support" depends on DEV_APPLETALK && ATALK diff -ruN ../linux-4.14.336/drivers/net/appletalk/Makefile ./drivers/net/appletalk/Makefile ---- ../linux-4.14.336/drivers/net/appletalk/Makefile 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/net/appletalk/Makefile 2024-02-14 21:04:05.191597490 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/Makefile 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/net/appletalk/Makefile 2024-02-14 21:04:05.191597490 +0100 @@ -3,5 +3,4 @@ # @@ -7531,8 +7531,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/Makefile ./drivers/net/appleta -obj-$(CONFIG_COPS) += cops.o obj-$(CONFIG_LTPC) += ltpc.o diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.c ./drivers/net/appletalk/cops.c ---- ../linux-4.14.336/drivers/net/appletalk/cops.c 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/net/appletalk/cops.c 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops.c 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/net/appletalk/cops.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1010 +0,0 @@ -/* cops.c: LocalTalk driver for Linux. - * @@ -8545,8 +8545,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.c ./drivers/net/appletalk -module_exit(cops_module_exit); -#endif /* MODULE */ diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.h ./drivers/net/appletalk/cops.h ---- ../linux-4.14.336/drivers/net/appletalk/cops.h 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/net/appletalk/cops.h 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops.h 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/net/appletalk/cops.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* cops.h: LocalTalk driver for Linux. @@ -8610,8 +8610,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.h ./drivers/net/appletalk - -#endif diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h ./drivers/net/appletalk/cops_ffdrv.h ---- ../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/net/appletalk/cops_ffdrv.h 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/net/appletalk/cops_ffdrv.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,532 +0,0 @@ - -/* @@ -9146,8 +9146,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h ./drivers/net/app - -#endif diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops_ltdrv.h ./drivers/net/appletalk/cops_ltdrv.h ---- ../linux-4.14.336/drivers/net/appletalk/cops_ltdrv.h 2024-01-10 14:45:41.000000000 +0100 -+++ ./drivers/net/appletalk/cops_ltdrv.h 1970-01-01 01:00:00.000000000 +0100 +--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops_ltdrv.h 2024-01-10 14:45:41.000000000 +0100 ++++ linux-4.14.336/./drivers/net/appletalk/cops_ltdrv.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,241 +0,0 @@ -/* - * The firmware this driver downloads into the Localtalk card is a diff --git a/steps/linux-4.14.341-openela/patches/disable-broken-check.patch b/steps/linux-4.14.341-openela/patches/disable-broken-check.patch index c048bdf8..7d844c3e 100644 --- a/steps/linux-4.14.341-openela/patches/disable-broken-check.patch +++ b/steps/linux-4.14.341-openela/patches/disable-broken-check.patch @@ -7,8 +7,8 @@ a result of the dodgy installation of linux-headers. However, there is no problem with this, and it is verified that BITS_PER_LONG __BITS_PER_LONG have functional and correct values. ---- tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:26.616768608 +1000 -+++ tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:36.786847443 +1000 +--- linux-4.14.336/tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:26.616768608 +1000 ++++ linux-4.14.336/tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:36.786847443 +1000 @@ -9,10 +9,6 @@ #define BITS_PER_LONG __WORDSIZE #endif diff --git a/steps/linux-4.14.341-openela/patches/drm_edid.patch b/steps/linux-4.14.341-openela/patches/drm_edid.patch index 7e6c03db..4ad86891 100644 --- a/steps/linux-4.14.341-openela/patches/drm_edid.patch +++ b/steps/linux-4.14.341-openela/patches/drm_edid.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only Remove BUILD_BUG_ON check as it causes a link error ---- drivers/gpu/drm/drm_edid.c.bak 2024-02-16 08:36:01.168832650 +0100 -+++ drivers/gpu/drm/drm_edid.c 2024-02-16 08:36:58.148828524 +0100 +--- linux-4.14.336/drivers/gpu/drm/drm_edid.c.bak 2024-02-16 08:36:01.168832650 +0100 ++++ linux-4.14.336/drivers/gpu/drm/drm_edid.c 2024-02-16 08:36:58.148828524 +0100 @@ -2879,15 +2879,6 @@ * get the other variants by simply increasing the * vertical front porch length. diff --git a/steps/linux-4.14.341-openela/patches/i2c-hid-dmi-quirks.patch b/steps/linux-4.14.341-openela/patches/i2c-hid-dmi-quirks.patch index acc50491..2329372a 100644 --- a/steps/linux-4.14.341-openela/patches/i2c-hid-dmi-quirks.patch +++ b/steps/linux-4.14.341-openela/patches/i2c-hid-dmi-quirks.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only Name the union in i2c_hid_desc_override, to avoid unknown field error ---- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c.bak 2024-02-15 13:27:20.177877726 +0100 -+++ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c 2024-02-15 15:11:15.787482938 +0100 +--- linux-4.14.336/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c.bak 2024-02-15 13:27:20.177877726 +0100 ++++ linux-4.14.336/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c 2024-02-15 15:11:15.787482938 +0100 @@ -18,7 +18,7 @@ union { struct i2c_hid_desc *i2c_hid_desc; diff --git a/steps/linux-4.14.341-openela/patches/i915_sw_fence.patch b/steps/linux-4.14.341-openela/patches/i915_sw_fence.patch index 2190dd1e..dfdcc036 100644 --- a/steps/linux-4.14.341-openela/patches/i915_sw_fence.patch +++ b/steps/linux-4.14.341-openela/patches/i915_sw_fence.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only Neuter the __i915_sw_fence_call define, which our gcc can't understand ---- drivers/gpu/drm/i915/i915_sw_fence.h.bak 2024-02-15 12:21:07.758127759 +0100 -+++ drivers/gpu/drm/i915/i915_sw_fence.h 2024-02-15 12:22:04.498124232 +0100 +--- linux-4.14.336/drivers/gpu/drm/i915/i915_sw_fence.h.bak 2024-02-15 12:21:07.758127759 +0100 ++++ linux-4.14.336/drivers/gpu/drm/i915/i915_sw_fence.h 2024-02-15 12:22:04.498124232 +0100 @@ -37,7 +37,7 @@ typedef int (*i915_sw_fence_notify_t)(struct i915_sw_fence *, diff --git a/steps/linux-4.14.341-openela/patches/initramfs_list.patch b/steps/linux-4.14.341-openela/patches/initramfs_list.patch index a3da57e7..2d2ff327 100644 --- a/steps/linux-4.14.341-openela/patches/initramfs_list.patch +++ b/steps/linux-4.14.341-openela/patches/initramfs_list.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only Use gen_initramfs_list.sh from outside kernel source tree. ---- scripts/gen_initramfs_list.sh 2021-10-10 20:37:12.220231015 +1100 -+++ scripts/gen_initramfs_list.sh 2021-10-10 20:37:22.694296140 +1100 +--- linux-4.14.336/scripts/gen_initramfs_list.sh 2021-10-10 20:37:12.220231015 +1100 ++++ linux-4.14.336/scripts/gen_initramfs_list.sh 2021-10-10 20:37:22.694296140 +1100 @@ -310,7 +310,7 @@ fi fi diff --git a/steps/linux-4.14.341-openela/patches/linking.patch b/steps/linux-4.14.341-openela/patches/linking.patch index 8f042f56..f90e9cbc 100644 --- a/steps/linux-4.14.341-openela/patches/linking.patch +++ b/steps/linux-4.14.341-openela/patches/linking.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only This seemingly useless statement (redefined a couple of lines later) is not liked by our version of binutils. ---- arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:45:14.787124887 +1000 -+++ arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:43:16.234180449 +1000 +--- linux-4.14.336/arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:45:14.787124887 +1000 ++++ linux-4.14.336/arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:43:16.234180449 +1000 @@ -170,7 +170,6 @@ . = __vvar_beginning_hack + PAGE_SIZE; } :data diff --git a/steps/linux-4.14.341-openela/patches/regen.patch b/steps/linux-4.14.341-openela/patches/regen.patch index 9b4acca2..f42c6cc5 100644 --- a/steps/linux-4.14.341-openela/patches/regen.patch +++ b/steps/linux-4.14.341-openela/patches/regen.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only We do not use the _shipped version of the keymap generated using loadkeys. For some reason the makefile needs to be patched for this to work... ---- drivers/tty/vt/Makefile 2021-07-27 21:11:24.743104498 +1000 -+++ drivers/tty/vt/Makefile 2021-07-27 21:11:34.261186200 +1000 +--- linux-4.14.336/drivers/tty/vt/Makefile 2021-07-27 21:11:24.743104498 +1000 ++++ linux-4.14.336/drivers/tty/vt/Makefile 2021-07-27 21:11:34.261186200 +1000 @@ -22,7 +22,7 @@ # Uncomment if you're changing the keymap and have an appropriate # loadkeys version for the map. By default, we'll use the shipped diff --git a/steps/linux-4.14.341-openela/patches/remove-alternative-asm.patch b/steps/linux-4.14.341-openela/patches/remove-alternative-asm.patch index fcada091..0f306a91 100644 --- a/steps/linux-4.14.341-openela/patches/remove-alternative-asm.patch +++ b/steps/linux-4.14.341-openela/patches/remove-alternative-asm.patch @@ -7,8 +7,8 @@ couple of edgecase macros. It seems that ALTERNATIVE is one of these. As we know what your system will be (not Xen), we can manually evaluate and write out the ALTERNATIVEs. ---- arch/x86/entry/entry_32.S 2021-07-31 11:40:07.458032771 +1000 -+++ arch/x86/entry/entry_32.S 2021-07-31 11:40:42.835298841 +1000 +--- linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:07.458032771 +1000 ++++ linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:42.835298841 +1000 @@ -412,9 +412,8 @@ movl %esp, %eax @@ -21,8 +21,8 @@ out the ALTERNATIVEs. /* Opportunistic SYSEXIT */ TRACE_IRQS_ON /* User mode traces as IRQs on. */ ---- arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:41:40.379731622 +1000 -+++ arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:43:40.294633506 +1000 +--- linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:41:40.379731622 +1000 ++++ linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:43:40.294633506 +1000 @@ -55,8 +55,6 @@ /* If SYSENTER (Intel) or SYSCALL32 (AMD) is available, use it. */ ALTERNATIVE_2 "", SYSENTER_SEQUENCE, X86_FEATURE_SYSENTER32, \ diff --git a/steps/linux-4.14.341-openela/patches/remove-kconfig.patch b/steps/linux-4.14.341-openela/patches/remove-kconfig.patch index 68319089..b32773a6 100644 --- a/steps/linux-4.14.341-openela/patches/remove-kconfig.patch +++ b/steps/linux-4.14.341-openela/patches/remove-kconfig.patch @@ -6,8 +6,8 @@ kconfig uses gperf, which we don't have at this stage. We manually generate everything (in the actual script) that is actually required within kconfig, and forgo everything that is not really required for the build. ---- Makefile 2021-07-30 21:25:43.577592065 +1000 -+++ Makefile 2021-07-30 21:26:40.349015612 +1000 +--- linux-4.14.336/Makefile 2021-07-30 21:25:43.577592065 +1000 ++++ linux-4.14.336/Makefile 2021-07-30 21:26:40.349015612 +1000 @@ -547,10 +547,10 @@ export KBUILD_DEFCONFIG KBUILD_KCONFIG diff --git a/steps/linux-4.14.341-openela/patches/wno-array-bounds.patch b/steps/linux-4.14.341-openela/patches/wno-array-bounds.patch index 05b63ac8..ae6fd187 100644 --- a/steps/linux-4.14.341-openela/patches/wno-array-bounds.patch +++ b/steps/linux-4.14.341-openela/patches/wno-array-bounds.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only Remove -Wno-array-bounds which gcc-4.0.4 doesn't recognize ---- drivers/net/ethernet/broadcom/Makefile.bak 2024-02-15 17:05:34.617050047 +0100 -+++ drivers/net/ethernet/broadcom/Makefile 2024-02-15 17:06:06.097047984 +0100 +--- linux-4.14.336/drivers/net/ethernet/broadcom/Makefile.bak 2024-02-15 17:05:34.617050047 +0100 ++++ linux-4.14.336/drivers/net/ethernet/broadcom/Makefile 2024-02-15 17:06:06.097047984 +0100 @@ -16,8 +16,3 @@ obj-$(CONFIG_BGMAC_PLATFORM) += bgmac-platform.o obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o diff --git a/steps/linux-headers-4.14.341-openela/patches/4.14.341-openela.patch b/steps/linux-headers-4.14.341-openela/patches/4.14.341-openela.patch index 986678eb..cab1164a 100644 --- a/steps/linux-headers-4.14.341-openela/patches/4.14.341-openela.patch +++ b/steps/linux-headers-4.14.341-openela/patches/4.14.341-openela.patch @@ -7,8 +7,8 @@ Patch kernel headers up to 4.14.341-openela diff --git include/crypto/if_alg.h include/crypto/if_alg.h index 2ea6a95ca825..f803dc8c45ad 100644 ---- include/crypto/if_alg.h -+++ include/crypto/if_alg.h +--- linux-4.14.336/include/crypto/if_alg.h ++++ linux-4.14.336/include/crypto/if_alg.h @@ -146,6 +146,7 @@ struct af_alg_async_req { * @enc: Cryptographic operation to be performed when * recvmsg is invoked. @@ -28,8 +28,8 @@ index 2ea6a95ca825..f803dc8c45ad 100644 int af_alg_register_type(const struct af_alg_type *type); diff --git include/drm/drm_bridge.h include/drm/drm_bridge.h index 6522d4cbc9d9..bfbd38c0b609 100644 ---- include/drm/drm_bridge.h -+++ include/drm/drm_bridge.h +--- linux-4.14.336/include/drm/drm_bridge.h ++++ linux-4.14.336/include/drm/drm_bridge.h @@ -161,7 +161,7 @@ struct drm_bridge_funcs { * or &drm_encoder_helper_funcs.dpms hook. * @@ -41,8 +41,8 @@ index 6522d4cbc9d9..bfbd38c0b609 100644 * The post_disable callback is optional. diff --git include/drm/drm_mipi_dsi.h include/drm/drm_mipi_dsi.h index 689f615471ab..a059f1d968b7 100644 ---- include/drm/drm_mipi_dsi.h -+++ include/drm/drm_mipi_dsi.h +--- linux-4.14.336/include/drm/drm_mipi_dsi.h ++++ linux-4.14.336/include/drm/drm_mipi_dsi.h @@ -163,6 +163,7 @@ struct mipi_dsi_device_info { * struct mipi_dsi_device - DSI peripheral device * @host: DSI host for this peripheral @@ -61,8 +61,8 @@ index 689f615471ab..a059f1d968b7 100644 unsigned int channel; diff --git include/linux/bpf.h include/linux/bpf.h index 3aa05ea79ba1..0d7a61df056b 100644 ---- include/linux/bpf.h -+++ include/linux/bpf.h +--- linux-4.14.336/include/linux/bpf.h ++++ linux-4.14.336/include/linux/bpf.h @@ -38,7 +38,11 @@ struct bpf_map_ops { /* funcs called by prog_array and perf_event_array map */ void *(*map_fd_get_ptr)(struct bpf_map *map, struct file *map_file, @@ -78,8 +78,8 @@ index 3aa05ea79ba1..0d7a61df056b 100644 }; diff --git include/linux/device.h include/linux/device.h index 65e06a066b67..27b70b810463 100644 ---- include/linux/device.h -+++ include/linux/device.h +--- linux-4.14.336/include/linux/device.h ++++ linux-4.14.336/include/linux/device.h @@ -1474,6 +1474,9 @@ do { \ WARN_ONCE(condition, "%s %s: " format, \ dev_driver_string(dev), dev_name(dev), ## arg) @@ -92,8 +92,8 @@ index 65e06a066b67..27b70b810463 100644 MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor)) diff --git include/linux/dmaengine.h include/linux/dmaengine.h index 8089e28539f1..d5a7d320e05c 100644 ---- include/linux/dmaengine.h -+++ include/linux/dmaengine.h +--- linux-4.14.336/include/linux/dmaengine.h ++++ linux-4.14.336/include/linux/dmaengine.h @@ -816,7 +816,8 @@ static inline int dmaengine_slave_config(struct dma_chan *chan, static inline bool is_slave_direction(enum dma_transfer_direction direction) @@ -106,8 +106,8 @@ index 8089e28539f1..d5a7d320e05c 100644 static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single( diff --git include/linux/fs.h include/linux/fs.h index ff0a992846a3..bd6072556269 100644 ---- include/linux/fs.h -+++ include/linux/fs.h +--- linux-4.14.336/include/linux/fs.h ++++ linux-4.14.336/include/linux/fs.h @@ -296,6 +296,8 @@ enum rw_hint { #define IOCB_SYNC (1 << 5) #define IOCB_WRITE (1 << 6) @@ -119,8 +119,8 @@ index ff0a992846a3..bd6072556269 100644 struct file *ki_filp; diff --git include/linux/lsm_hooks.h include/linux/lsm_hooks.h index 569debc49f3d..28ff40daccff 100644 ---- include/linux/lsm_hooks.h -+++ include/linux/lsm_hooks.h +--- linux-4.14.336/include/linux/lsm_hooks.h ++++ linux-4.14.336/include/linux/lsm_hooks.h @@ -466,6 +466,12 @@ * simple integer value. When @arg represents a user space pointer, it * should never be used by the security module. @@ -153,8 +153,8 @@ index 569debc49f3d..28ff40daccff 100644 struct list_head file_mprotect; diff --git include/linux/pci_ids.h include/linux/pci_ids.h index 83f576d45d78..c977e636a1dd 100644 ---- include/linux/pci_ids.h -+++ include/linux/pci_ids.h +--- linux-4.14.336/include/linux/pci_ids.h ++++ linux-4.14.336/include/linux/pci_ids.h @@ -2953,6 +2953,7 @@ #define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0 #define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2 @@ -165,8 +165,8 @@ index 83f576d45d78..c977e636a1dd 100644 #define PCI_DEVICE_ID_INTEL_E6XX_CU 0x8183 diff --git include/linux/security.h include/linux/security.h index 1c8968a267c2..cf77cd971795 100644 ---- include/linux/security.h -+++ include/linux/security.h +--- linux-4.14.336/include/linux/security.h ++++ linux-4.14.336/include/linux/security.h @@ -306,6 +306,8 @@ int security_file_permission(struct file *file, int mask); int security_file_alloc(struct file *file); void security_file_free(struct file *file); @@ -192,8 +192,8 @@ index 1c8968a267c2..cf77cd971795 100644 { diff --git include/linux/spi/spi.h include/linux/spi/spi.h index a8f6606dd498..5c7741ca3b99 100644 ---- include/linux/spi/spi.h -+++ include/linux/spi/spi.h +--- linux-4.14.336/include/linux/spi/spi.h ++++ linux-4.14.336/include/linux/spi/spi.h @@ -153,6 +153,7 @@ struct spi_device { #define SPI_MODE_1 (0|SPI_CPHA) #define SPI_MODE_2 (SPI_CPOL|0) @@ -206,7 +206,7 @@ diff --git include/linux/units.h include/linux/units.h new file mode 100644 index 000000000000..a0af6d2ef4e5 --- /dev/null -+++ include/linux/units.h ++++ linux-4.14.336/include/linux/units.h @@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_UNITS_H @@ -302,8 +302,8 @@ index 000000000000..a0af6d2ef4e5 +#endif /* _LINUX_UNITS_H */ diff --git include/net/af_unix.h include/net/af_unix.h index 7ec1cdb66be8..e514508bdc92 100644 ---- include/net/af_unix.h -+++ include/net/af_unix.h +--- linux-4.14.336/include/net/af_unix.h ++++ linux-4.14.336/include/net/af_unix.h @@ -43,12 +43,6 @@ struct unix_skb_parms { #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb)) @@ -340,10 +340,10 @@ index 7ec1cdb66be8..e514508bdc92 100644 long unix_inq_len(struct sock *sk); diff --git include/net/bluetooth/hci_core.h include/net/bluetooth/hci_core.h index 8f899ad4a754..bac3d79139b2 100644 ---- include/net/bluetooth/hci_core.h -+++ include/net/bluetooth/hci_core.h +--- linux-4.14.336/include/net/bluetooth/hci_core.h ++++ linux-4.14.336/include/net/bluetooth/hci_core.h @@ -647,7 +647,6 @@ void hci_inquiry_cache_flush(struct hci_dev *hdev); - /* ----- HCI Connections ----- */ + /* ----- linux-4.14.336/HCI Connections ----- */ enum { HCI_CONN_AUTH_PEND, - HCI_CONN_REAUTH_PEND, @@ -352,8 +352,8 @@ index 8f899ad4a754..bac3d79139b2 100644 HCI_CONN_MODE_CHANGE_PEND, diff --git include/net/dst_ops.h include/net/dst_ops.h index 443863c7b8da..632086b2f644 100644 ---- include/net/dst_ops.h -+++ include/net/dst_ops.h +--- linux-4.14.336/include/net/dst_ops.h ++++ linux-4.14.336/include/net/dst_ops.h @@ -16,7 +16,7 @@ struct dst_ops { unsigned short family; unsigned int gc_thresh; @@ -378,8 +378,8 @@ index 443863c7b8da..632086b2f644 100644 static inline int dst_entries_init(struct dst_ops *dst) diff --git include/net/llc_pdu.h include/net/llc_pdu.h index 49aa79c7b278..581cd37aa98b 100644 ---- include/net/llc_pdu.h -+++ include/net/llc_pdu.h +--- linux-4.14.336/include/net/llc_pdu.h ++++ linux-4.14.336/include/net/llc_pdu.h @@ -262,8 +262,7 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type, */ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa) @@ -402,8 +402,8 @@ index 49aa79c7b278..581cd37aa98b 100644 /** diff --git include/net/netns/ipv6.h include/net/netns/ipv6.h index c004d051c2d3..290ca18589ee 100644 ---- include/net/netns/ipv6.h -+++ include/net/netns/ipv6.h +--- linux-4.14.336/include/net/netns/ipv6.h ++++ linux-4.14.336/include/net/netns/ipv6.h @@ -64,8 +64,8 @@ struct netns_ipv6 { struct dst_ops ip6_dst_ops; rwlock_t fib6_walker_lock; @@ -417,8 +417,8 @@ index c004d051c2d3..290ca18589ee 100644 struct rt6_info *ip6_prohibit_entry; diff --git include/uapi/linux/btrfs.h include/uapi/linux/btrfs.h index 86d2a52b4665..ee7a34c237a5 100644 ---- include/uapi/linux/btrfs.h -+++ include/uapi/linux/btrfs.h +--- linux-4.14.336/include/uapi/linux/btrfs.h ++++ linux-4.14.336/include/uapi/linux/btrfs.h @@ -522,6 +522,9 @@ struct btrfs_ioctl_clone_range_args { */ #define BTRFS_DEFRAG_RANGE_COMPRESS 1 @@ -431,8 +431,8 @@ index 86d2a52b4665..ee7a34c237a5 100644 __u64 start; diff --git include/uapi/linux/netfilter/nf_tables.h include/uapi/linux/netfilter/nf_tables.h index c7bb18ea4962..835e9f345f35 100644 ---- include/uapi/linux/netfilter/nf_tables.h -+++ include/uapi/linux/netfilter/nf_tables.h +--- linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h ++++ linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h @@ -229,9 +229,11 @@ enum nft_rule_attributes { /** * enum nft_rule_compat_flags - nf_tables rule compat flags diff --git a/steps/linux-headers-4.14.341-openela/patches/winsize.patch b/steps/linux-headers-4.14.341-openela/patches/winsize.patch index 1d2058bd..0a7d3d82 100644 --- a/steps/linux-headers-4.14.341-openela/patches/winsize.patch +++ b/steps/linux-headers-4.14.341-openela/patches/winsize.patch @@ -2,8 +2,8 @@ SPDX-FileCopyrightText: 2021 fosslinux SPDX-License-Identifier: GPL-2.0-only ---- include/uapi/asm-generic/termios.h.bak 2021-07-23 14:23:51.330460544 +1000 -+++ include/uapi/asm-generic/termios.h 2021-07-23 19:08:27.112810109 +1000 +--- linux-4.14.336/include/uapi/asm-generic/termios.h.bak 2021-07-23 14:23:51.330460544 +1000 ++++ linux-4.14.336/include/uapi/asm-generic/termios.h 2021-07-23 19:08:27.112810109 +1000 @@ -12,13 +12,6 @@ #include #include diff --git a/steps/musl-1.1.24/patches/avoid_set_thread_area.patch b/steps/musl-1.1.24/patches/avoid_set_thread_area.patch index e7706e58..cf07420a 100644 --- a/steps/musl-1.1.24/patches/avoid_set_thread_area.patch +++ b/steps/musl-1.1.24/patches/avoid_set_thread_area.patch @@ -1,8 +1,8 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT diff -r -u musl-1.1.24.orig/arch/i386/pthread_arch.h musl-1.1.24/arch/i386/pthread_arch.h ---- arch/i386/pthread_arch.h 2019-10-13 21:58:27.000000000 +0000 -+++ arch/i386/pthread_arch.h 2023-04-07 11:56:04.649119523 +0000 +--- musl-1.1.24/arch/i386/pthread_arch.h 2019-10-13 21:58:27.000000000 +0000 ++++ musl-1.1.24/arch/i386/pthread_arch.h 2023-04-07 11:56:04.649119523 +0000 @@ -1,8 +1,8 @@ +extern pthread_t g_pthread; + @@ -16,8 +16,8 @@ diff -r -u musl-1.1.24.orig/arch/i386/pthread_arch.h musl-1.1.24/arch/i386/pthre #define TP_ADJ(p) (p) diff -r -u musl-1.1.24.orig/src/env/__init_tls.c musl-1.1.24/src/env/__init_tls.c ---- src/env/__init_tls.c 2019-10-13 21:58:27.000000000 +0000 -+++ src/env/__init_tls.c 2023-04-07 11:56:43.565120289 +0000 +--- musl-1.1.24/src/env/__init_tls.c 2019-10-13 21:58:27.000000000 +0000 ++++ musl-1.1.24/src/env/__init_tls.c 2023-04-07 11:56:43.565120289 +0000 @@ -10,20 +10,19 @@ #include "syscall.h" diff --git a/steps/musl-1.1.24/patches/avoid_sys_clone.patch b/steps/musl-1.1.24/patches/avoid_sys_clone.patch index 10540d2c..8dd33e24 100644 --- a/steps/musl-1.1.24/patches/avoid_sys_clone.patch +++ b/steps/musl-1.1.24/patches/avoid_sys_clone.patch @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT ---- src/process/posix_spawn.c 2019-10-13 21:58:27.000000000 +0000 -+++ src/process/posix_spawn.c 2023-04-07 11:50:47.253113271 +0000 +--- musl-1.1.24/src/process/posix_spawn.c 2019-10-13 21:58:27.000000000 +0000 ++++ musl-1.1.24/src/process/posix_spawn.c 2023-04-07 11:50:47.253113271 +0000 @@ -182,8 +182,11 @@ args.envp = envp; pthread_sigmask(SIG_BLOCK, SIGALL_SET, &args.oldmask); diff --git a/steps/musl-1.1.24/patches/fenv.patch b/steps/musl-1.1.24/patches/fenv.patch index e82ac9de..ded8e7f8 100644 --- a/steps/musl-1.1.24/patches/fenv.patch +++ b/steps/musl-1.1.24/patches/fenv.patch @@ -7,8 +7,8 @@ tcc does not seem to support stmxcsr and ldmxcsr. Remove those. This might break float exception handling but we are unlikely to need it. diff -U3 -r src/fenv/i386/fenv.s src/fenv/i386/fenv.s ---- src/fenv/i386/fenv.s 2019-10-13 22:58:27.000000000 +0100 -+++ src/fenv/i386/fenv.s 2021-02-01 00:27:04.924135707 +0000 +--- musl-1.1.24/src/fenv/i386/fenv.s 2019-10-13 22:58:27.000000000 +0100 ++++ musl-1.1.24/src/fenv/i386/fenv.s 2021-02-01 00:27:04.924135707 +0000 @@ -17,7 +17,6 @@ jz 1f fnclex diff --git a/steps/musl-1.1.24/patches/madvise_preserve_errno.patch b/steps/musl-1.1.24/patches/madvise_preserve_errno.patch index 3d964a5f..15b32693 100644 --- a/steps/musl-1.1.24/patches/madvise_preserve_errno.patch +++ b/steps/musl-1.1.24/patches/madvise_preserve_errno.patch @@ -1,8 +1,8 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT diff -r -u musl-1.1.24.orig/src/malloc/malloc.c musl-1.1.24/src/malloc/malloc.c ---- src/malloc/malloc.c 2019-10-13 21:58:27.000000000 +0000 -+++ src/malloc/malloc.c 2023-12-22 23:18:21.088570834 +0000 +--- musl-1.1.24/src/malloc/malloc.c 2019-10-13 21:58:27.000000000 +0000 ++++ musl-1.1.24/src/malloc/malloc.c 2023-12-22 23:18:21.088570834 +0000 @@ -496,7 +496,9 @@ uintptr_t a = (uintptr_t)self + SIZE_ALIGN+PAGE_SIZE-1 & -PAGE_SIZE; uintptr_t b = (uintptr_t)next - SIZE_ALIGN & -PAGE_SIZE; diff --git a/steps/musl-1.1.24/patches/makefile.patch b/steps/musl-1.1.24/patches/makefile.patch index 0e5a02b0..67c7fbe9 100644 --- a/steps/musl-1.1.24/patches/makefile.patch +++ b/steps/musl-1.1.24/patches/makefile.patch @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 fosslinux SPDX-License-Identifier: MIT tcc -ar does not support creating empty archives ---- Makefile 2019-10-13 22:58:27.000000000 +0100 -+++ Makefile 2021-02-01 00:21:14.974687663 +0000 +--- musl-1.1.24/Makefile 2019-10-13 22:58:27.000000000 +0100 ++++ musl-1.1.24/Makefile 2021-02-01 00:21:14.974687663 +0000 @@ -167,7 +167,7 @@ $(EMPTY_LIBS): diff --git a/steps/musl-1.1.24/patches/set_thread_area.patch b/steps/musl-1.1.24/patches/set_thread_area.patch index 6fc23878..752c6404 100644 --- a/steps/musl-1.1.24/patches/set_thread_area.patch +++ b/steps/musl-1.1.24/patches/set_thread_area.patch @@ -20,8 +20,8 @@ SYS_set_thread_area's return value being an error) before modifying diff --git src/thread/i386/__set_thread_area.s src/thread/i386/__set_thread_area.s index c2c21dd5..aa6852be 100644 ---- src/thread/i386/__set_thread_area.s -+++ src/thread/i386/__set_thread_area.s +--- musl-1.1.24/src/thread/i386/__set_thread_area.s ++++ musl-1.1.24/src/thread/i386/__set_thread_area.s @@ -28,6 +28,7 @@ __set_thread_area: ret 2: diff --git a/steps/musl-1.1.24/patches/sigsetjmp.patch b/steps/musl-1.1.24/patches/sigsetjmp.patch index dbd009e4..1a3b3cfb 100644 --- a/steps/musl-1.1.24/patches/sigsetjmp.patch +++ b/steps/musl-1.1.24/patches/sigsetjmp.patch @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 fosslinux SPDX-License-Identifier: MIT tcc does not like jecxz instruction. ---- src/signal/i386/sigsetjmp.s 2019-10-13 22:58:27.000000000 +0100 -+++ src/signal/i386/sigsetjmp.s 2021-02-01 00:19:25.671735415 +0000 +--- musl-1.1.24/src/signal/i386/sigsetjmp.s 2019-10-13 22:58:27.000000000 +0100 ++++ musl-1.1.24/src/signal/i386/sigsetjmp.s 2021-02-01 00:19:25.671735415 +0000 @@ -5,7 +5,8 @@ sigsetjmp: __sigsetjmp: diff --git a/steps/musl-1.1.24/patches/va_list.patch b/steps/musl-1.1.24/patches/va_list.patch index ed017c9c..8666d9e2 100644 --- a/steps/musl-1.1.24/patches/va_list.patch +++ b/steps/musl-1.1.24/patches/va_list.patch @@ -13,8 +13,8 @@ Subject: [PATCH] stdarg.h: add support for tcc. diff --git a/arch/i386/bits/alltypes.h.in b/arch/i386/bits/alltypes.h.in index 1a8432d3..44cb5987 100644 ---- arch/i386/bits/alltypes.h.in -+++ arch/i386/bits/alltypes.h.in +--- musl-1.1.24/arch/i386/bits/alltypes.h.in ++++ musl-1.1.24/arch/i386/bits/alltypes.h.in @@ -2,7 +2,19 @@ #define _Int64 long long #define _Reg int diff --git a/steps/musl-1.2.4/patches/avoid_set_thread_area.patch b/steps/musl-1.2.4/patches/avoid_set_thread_area.patch index 5a71766b..c5a51874 100644 --- a/steps/musl-1.2.4/patches/avoid_set_thread_area.patch +++ b/steps/musl-1.2.4/patches/avoid_set_thread_area.patch @@ -1,8 +1,8 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT diff -r -u musl-1.2.3.orig/arch/i386/pthread_arch.h musl-1.2.3/arch/i386/pthread_arch.h ---- arch/i386/pthread_arch.h 2022-04-07 17:12:40.000000000 +0000 -+++ arch/i386/pthread_arch.h 2023-04-07 12:07:07.929132587 +0000 +--- musl-1.2.4/arch/i386/pthread_arch.h 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.4/arch/i386/pthread_arch.h 2023-04-07 12:07:07.929132587 +0000 @@ -1,8 +1,7 @@ +extern uintptr_t g_pthread; static inline uintptr_t __get_tp() @@ -15,16 +15,16 @@ diff -r -u musl-1.2.3.orig/arch/i386/pthread_arch.h musl-1.2.3/arch/i386/pthread #define MC_PC gregs[REG_EIP] diff -r -u musl-1.2.3.orig/arch/i386/syscall_arch.h musl-1.2.3/arch/i386/syscall_arch.h ---- arch/i386/syscall_arch.h 2022-04-07 17:12:40.000000000 +0000 -+++ arch/i386/syscall_arch.h 2022-12-20 17:28:21.734839560 +0000 +--- musl-1.2.4/arch/i386/syscall_arch.h 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.4/arch/i386/syscall_arch.h 2022-12-20 17:28:21.734839560 +0000 @@ -1,3 +1,4 @@ +#define SYSCALL_NO_TLS 1 #define __SYSCALL_LL_E(x) \ ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \ ((union { long long ll; long l[2]; }){ .ll = x }).l[1] diff -r -u musl-1.2.3.orig/src/env/__init_tls.c musl-1.2.3/src/env/__init_tls.c ---- src/env/__init_tls.c 2022-04-07 17:12:40.000000000 +0000 -+++ src/env/__init_tls.c 2023-04-07 12:07:38.677133193 +0000 +--- musl-1.2.4/src/env/__init_tls.c 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.4/src/env/__init_tls.c 2023-04-07 12:07:38.677133193 +0000 @@ -10,20 +10,19 @@ #include "syscall.h" diff --git a/steps/musl-1.2.4/patches/avoid_sys_clone.patch b/steps/musl-1.2.4/patches/avoid_sys_clone.patch index 0cc7e5a6..b3631254 100644 --- a/steps/musl-1.2.4/patches/avoid_sys_clone.patch +++ b/steps/musl-1.2.4/patches/avoid_sys_clone.patch @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT ---- src/process/posix_spawn.c 2022-04-07 17:12:40.000000000 +0000 -+++ src/process/posix_spawn.c 2023-04-07 12:01:57.217126467 +0000 +--- musl-1.2.4/src/process/posix_spawn.c 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.4/src/process/posix_spawn.c 2023-04-07 12:01:57.217126467 +0000 @@ -190,8 +190,11 @@ goto fail; } diff --git a/steps/perl-5.10.1/patches/undefined_hack.patch b/steps/perl-5.10.1/patches/undefined_hack.patch index 35708dd2..c24aba8d 100644 --- a/steps/perl-5.10.1/patches/undefined_hack.patch +++ b/steps/perl-5.10.1/patches/undefined_hack.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: Artistic-1.0-Perl There are a bunch of aliases that perl's build system somehow makes but I'm not sure how to appropriately do them, so just patch them. ---- lib/ExtUtils/Constant.pm 2021-04-20 21:06:43.272663878 +1000 -+++ lib/ExtUtils/Constant.pm 2021-04-20 21:07:11.116805426 +1000 +--- perl-5.10.1/lib/ExtUtils/Constant.pm 2021-04-20 21:06:43.272663878 +1000 ++++ perl-5.10.1/lib/ExtUtils/Constant.pm 2021-04-20 21:07:11.116805426 +1000 @@ -253,11 +253,11 @@ switch (type) { case PERL_constant_NOTFOUND: @@ -30,8 +30,8 @@ I'm not sure how to appropriately do them, so just patch them. "Unexpected return type %d while processing $package_sprintf_safe macro %s, used", type, s)); PUSHs(sv); ---- ext/Data-Dumper/Dumper.xs 2009-06-11 02:42:23.000000000 +1000 -+++ ext/Data-Dumper/Dumper.xs 2021-04-21 18:19:32.548468344 +1000 +--- perl-5.10.1/ext/Data-Dumper/Dumper.xs 2009-06-11 02:42:23.000000000 +1000 ++++ perl-5.10.1/ext/Data-Dumper/Dumper.xs 2021-04-21 18:19:32.548468344 +1000 @@ -312,7 +312,7 @@ { dSP; ENTER; SAVETMPS; PUSHMARK(sp); diff --git a/steps/perl-5.32.1/patches/reproducibility.patch b/steps/perl-5.32.1/patches/reproducibility.patch index ae5e029f..899debea 100644 --- a/steps/perl-5.32.1/patches/reproducibility.patch +++ b/steps/perl-5.32.1/patches/reproducibility.patch @@ -7,8 +7,8 @@ generate with correct values for live-bootstrap. NOTE: this patch CANNOT be applied to a non-live-bootstrap environment. ---- ../metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:03.155396204 +1100 -+++ ../metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:49.392396204 +1100 +--- metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:03.155396204 +1100 ++++ metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:49.392396204 +1100 @@ -79,7 +79,7 @@ ?X: Very GCCian. *) archname=`echo $targetarch|sed 's,^[^-]*-,,'` ;; @@ -18,8 +18,8 @@ NOTE: this patch CANNOT be applied to a non-live-bootstrap environment. case "$archname" in '') dflt="$tarch";; *) dflt="$archname";; ---- ../metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:31:26.911396204 +1100 -+++ ../metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:32:31.846396204 +1100 +--- metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:31:26.911396204 +1100 ++++ metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:32:31.846396204 +1100 @@ -117,16 +117,13 @@ ?X: on some machines to avoid the error message when uname is not found; e.g. ?X: old SUN-OS 3.2 would not execute hostname in (uname -a || hostname). Sigh! diff --git a/steps/perl-5.32.1/patches/reproducibility2.patch b/steps/perl-5.32.1/patches/reproducibility2.patch index 8204d55e..05207279 100644 --- a/steps/perl-5.32.1/patches/reproducibility2.patch +++ b/steps/perl-5.32.1/patches/reproducibility2.patch @@ -7,8 +7,8 @@ generate with correct values for live-bootstrap. NOTE: this patch CANNOT be applied to a non-live-bootstrap environment. ---- ../metaconfig-5.32.1~rc1/dist/U/archname.U 2022-02-26 10:51:45.343097807 +1100 -+++ ../metaconfig-5.32.1~rc1/dist/U/archname.U 2022-02-26 10:51:51.742527859 +1100 +--- perl-5.32.1/../metaconfig-5.32.1~rc1/dist/U/archname.U 2022-02-26 10:51:45.343097807 +1100 ++++ perl-5.32.1/../metaconfig-5.32.1~rc1/dist/U/archname.U 2022-02-26 10:51:51.742527859 +1100 @@ -72,5 +72,5 @@ rp='What is your architecture name' . ./myread @@ -16,8 +16,8 @@ NOTE: this patch CANNOT be applied to a non-live-bootstrap environment. -myarchname="$tarch" +myarchname="i386" ---- ../metaconfig-5.32.1~rc1/dist/U/Oldconfig.U 2022-02-27 10:55:04.890396204 +1100 -+++ ../metaconfig-5.32.1~rc1/dist/U/Oldconfig.U 2022-02-27 11:00:31.324396204 +1100 +--- perl-5.32.1/../metaconfig-5.32.1~rc1/dist/U/Oldconfig.U 2022-02-27 10:55:04.890396204 +1100 ++++ perl-5.32.1/../metaconfig-5.32.1~rc1/dist/U/Oldconfig.U 2022-02-27 11:00:31.324396204 +1100 @@ -109,16 +109,13 @@ ?LINT:extern hostarch libswanted libs ?LINT:change hostarch libswanted libs diff --git a/steps/python-2.0.1/files/disable-unicode.patch b/steps/python-2.0.1/files/disable-unicode.patch index 52b66eb9..0e295d4e 100644 --- a/steps/python-2.0.1/files/disable-unicode.patch +++ b/steps/python-2.0.1/files/disable-unicode.patch @@ -10,8 +10,8 @@ unicodetype_db.h indiscriminately. We are effectively restricted to ASCII characters with this change, but it works. ---- Objects/unicodectype.c 2000-09-26 08:48:13.000000000 +1100 -+++ Objects/unicodectype.c 2022-10-03 21:09:02.108869321 +1100 +--- Python-2.0.1/Objects/unicodectype.c 2000-09-26 08:48:13.000000000 +1100 ++++ Python-2.0.1/Objects/unicodectype.c 2022-10-03 21:09:02.108869321 +1100 @@ -29,30 +29,12 @@ const unsigned char digit; } _PyUnicode_TypeRecord; diff --git a/steps/python-2.0.1/pass1.sh b/steps/python-2.0.1/pass1.sh index 7a658a8d..b116dfb0 100755 --- a/steps/python-2.0.1/pass1.sh +++ b/steps/python-2.0.1/pass1.sh @@ -19,7 +19,7 @@ src_prepare() { sed -i "/^unicodedata/d" Modules/Setup.in # Patch - patch -Np0 -i disable-unicode.patch + patch -Np1 -i disable-unicode.patch # Regenerate autoconf autoreconf-2.71 -fi diff --git a/steps/python-2.0.1/patches/destdir.patch b/steps/python-2.0.1/patches/destdir.patch index 3d8d6a58..dc2bde73 100644 --- a/steps/python-2.0.1/patches/destdir.patch +++ b/steps/python-2.0.1/patches/destdir.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: Python-2.0.1 Python 2.0 does not support DESTDIR, so add it in. ---- Makefile.in 2022-10-21 17:56:48.034287578 +1100 -+++ Makefile.in 2022-10-21 18:07:54.267542882 +1100 +--- Python-2.0.1/Makefile.in 2022-10-21 17:56:48.034287578 +1100 ++++ Python-2.0.1/Makefile.in 2022-10-21 18:07:54.267542882 +1100 @@ -224,16 +224,16 @@ # Install the interpreter (by creating a hard link to python$(VERSION)) @@ -193,8 +193,8 @@ Python 2.0 does not support DESTDIR, so add it in. prefix="$(prefix)" \ exec_prefix="$(exec_prefix)" \ sharedinstall ---- Modules/Makefile.pre.in 2022-10-21 17:56:44.635251486 +1100 -+++ Modules/Makefile.pre.in 2022-10-21 17:57:00.124415957 +1100 +--- Python-2.0.1/Modules/Makefile.pre.in 2022-10-21 17:56:44.635251486 +1100 ++++ Python-2.0.1/Modules/Makefile.pre.in 2022-10-21 17:57:00.124415957 +1100 @@ -240,7 +240,7 @@ sharedinstall: $(DESTSHARED) $(SHAREDMODS) -for i in X $(SHAREDMODS); do \ diff --git a/steps/python-2.0.1/patches/posixmodule.patch b/steps/python-2.0.1/patches/posixmodule.patch index b2c62b7f..5ceb30e7 100644 --- a/steps/python-2.0.1/patches/posixmodule.patch +++ b/steps/python-2.0.1/patches/posixmodule.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: Python-2.0.1 musl (correctly) implements the POSIX posix_close function, however this was added well after Python 2.0.1 was released. ---- Modules/posixmodule.c 2022-09-16 16:46:09.809812072 +1000 -+++ Modules/posixmodule.c 2022-09-16 16:47:23.254166370 +1000 +--- Python-2.0.1/Modules/posixmodule.c 2022-09-16 16:46:09.809812072 +1000 ++++ Python-2.0.1/Modules/posixmodule.c 2022-09-16 16:47:23.254166370 +1000 @@ -3267,12 +3267,12 @@ } diff --git a/steps/python-2.0.1/patches/pyc.patch b/steps/python-2.0.1/patches/pyc.patch index 91ab3d22..031ad83b 100644 --- a/steps/python-2.0.1/patches/pyc.patch +++ b/steps/python-2.0.1/patches/pyc.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: Python-2.0.1 Disable creation of pyc files. ---- Lib/py_compile.py 2024-01-22 11:28:00.291261389 +1100 -+++ Lib/py_compile.py 2024-01-22 11:28:13.462600939 +1100 +--- Python-2.0.1/Lib/py_compile.py 2024-01-22 11:28:00.291261389 +1100 ++++ Python-2.0.1/Lib/py_compile.py 2024-01-22 11:28:13.462600939 +1100 @@ -41,6 +41,7 @@ directories). @@ -14,8 +14,8 @@ Disable creation of pyc files. import os, marshal, __builtin__ f = open(file) try: ---- Python/import.c 2024-01-22 12:23:34.349395727 +1100 -+++ Python/import.c 2024-01-22 12:23:30.299285640 +1100 +--- Python-2.0.1/Python/import.c 2024-01-22 12:23:34.349395727 +1100 ++++ Python-2.0.1/Python/import.c 2024-01-22 12:23:30.299285640 +1100 @@ -672,6 +672,7 @@ static void write_compiled_module(PyCodeObject *co, char *cpathname, long mtime) diff --git a/steps/python-2.0.1/patches/undefs.patch b/steps/python-2.0.1/patches/undefs.patch index 91ac1f19..85c29d84 100644 --- a/steps/python-2.0.1/patches/undefs.patch +++ b/steps/python-2.0.1/patches/undefs.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: Python-2.0.1 Python 2.0.1's Makefile does not support custom CFLAGS for some reason, so we have to patch our __DATE__ __TIME__ undefs in. ---- Makefile.in 2022-12-23 18:33:56.486325025 +1100 -+++ Makefile.in 2022-12-23 18:46:05.910387214 +1100 +--- Python-2.0.1/Makefile.in 2022-12-23 18:33:56.486325025 +1100 ++++ Python-2.0.1/Makefile.in 2022-12-23 18:46:05.910387214 +1100 @@ -127,7 +127,7 @@ DIST= $(DISTFILES) $(DISTDIRS) diff --git a/steps/python-2.3.7/files/disable-unicode.patch b/steps/python-2.3.7/files/disable-unicode.patch index 0e419f00..6073fad3 100644 --- a/steps/python-2.3.7/files/disable-unicode.patch +++ b/steps/python-2.3.7/files/disable-unicode.patch @@ -8,8 +8,8 @@ identical reasoning. Python 2.3's unicode regeneration code is a bit too incompatible with Python 2.0.1. ---- Objects/unicodectype.c 2022-10-05 18:11:21.989603599 +1100 -+++ Objects/unicodectype.c 2022-10-05 18:14:57.335843857 +1100 +--- Python-2.3.7/Objects/unicodectype.c 2022-10-05 18:11:21.989603599 +1100 ++++ Python-2.3.7/Objects/unicodectype.c 2022-10-05 18:14:57.335843857 +1100 @@ -29,31 +29,12 @@ const unsigned char digit; } _PyUnicode_TypeRecord; @@ -96,8 +96,8 @@ with Python 2.0.1. } int _PyUnicode_IsDigit(Py_UNICODE ch) ---- Makefile.pre.in 2005-01-12 00:49:02.000000000 +1100 -+++ Makefile.pre.in 2022-10-05 18:35:05.979846971 +1100 +--- Python-2.3.7/Makefile.pre.in 2005-01-12 00:49:02.000000000 +1100 ++++ Python-2.3.7/Makefile.pre.in 2022-10-05 18:35:05.979846971 +1100 @@ -456,8 +456,7 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c diff --git a/steps/python-2.3.7/pass1.sh b/steps/python-2.3.7/pass1.sh index ab679de3..3fcf338c 100755 --- a/steps/python-2.3.7/pass1.sh +++ b/steps/python-2.3.7/pass1.sh @@ -18,7 +18,7 @@ src_prepare() { grep generated -r . -l | grep encodings | xargs rm # Disable unicode - patch -Np0 -i disable-unicode.patch + patch -Np1 -i disable-unicode.patch # Regenerate sre_constants.h rm Modules/sre_constants.h diff --git a/steps/python-2.3.7/patches/posixmodule.patch b/steps/python-2.3.7/patches/posixmodule.patch index 47fad59c..3cbce54f 100644 --- a/steps/python-2.3.7/patches/posixmodule.patch +++ b/steps/python-2.3.7/patches/posixmodule.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 musl (correctly) implements the POSIX posix_close function, however this was added after Python 2.3.7 was released. ---- Modules/posixmodule.c 2022-10-05 18:38:46.718131893 +1100 -+++ Modules/posixmodule.c 2022-10-05 18:39:07.049250312 +1100 +--- Python-2.3.7/Modules/posixmodule.c 2022-10-05 18:38:46.718131893 +1100 ++++ Python-2.3.7/Modules/posixmodule.c 2022-10-05 18:39:07.049250312 +1100 @@ -5208,12 +5208,12 @@ } diff --git a/steps/python-2.3.7/patches/pyc.patch b/steps/python-2.3.7/patches/pyc.patch index be5ce17a..c4de1d2a 100644 --- a/steps/python-2.3.7/patches/pyc.patch +++ b/steps/python-2.3.7/patches/pyc.patch @@ -3,8 +3,8 @@ SPDX-FileCopyrightText: 2024 fosslinux SPDX-License-Identifier: PSF-2.0 Disable creation of pyc files. ---- Lib/py_compile.py 2024-01-22 11:28:44.333395804 +1100 -+++ Lib/py_compile.py 2024-01-22 11:28:53.703636809 +1100 +--- Python-2.3.7/Lib/py_compile.py 2024-01-22 11:28:44.333395804 +1100 ++++ Python-2.3.7/Lib/py_compile.py 2024-01-22 11:28:53.703636809 +1100 @@ -112,6 +112,7 @@ directories). @@ -13,8 +13,8 @@ Disable creation of pyc files. f = open(file, 'U') try: timestamp = long(os.fstat(f.fileno()).st_mtime) ---- Python/import.c 2024-01-22 12:24:05.300236204 +1100 -+++ Python/import.c 2024-01-22 12:24:36.513082356 +1100 +--- Python-2.3.7/Python/import.c 2024-01-22 12:24:05.300236204 +1100 ++++ Python-2.3.7/Python/import.c 2024-01-22 12:24:36.513082356 +1100 @@ -807,6 +807,7 @@ static void write_compiled_module(PyCodeObject *co, char *cpathname, long mtime) diff --git a/steps/python-2.5.6/files/graminit-regen.patch b/steps/python-2.5.6/files/graminit-regen.patch index 36abdbb7..2e5e660c 100644 --- a/steps/python-2.5.6/files/graminit-regen.patch +++ b/steps/python-2.5.6/files/graminit-regen.patch @@ -10,8 +10,8 @@ graminit.h. We apply this patch before regen-ing graminit.h and revert it afterward. ---- Parser/parsetok.c 2022-10-09 20:22:15.431229996 +1100 -+++ Parser/parsetok.c 2022-10-09 20:22:57.981822483 +1100 +--- Python-2.5.6/Parser/parsetok.c 2022-10-09 20:22:15.431229996 +1100 ++++ Python-2.5.6/Parser/parsetok.c 2022-10-09 20:22:57.981822483 +1100 @@ -8,7 +8,6 @@ #include "parser.h" #include "parsetok.h" diff --git a/steps/python-2.5.6/pass1.sh b/steps/python-2.5.6/pass1.sh index 1344492e..4ab190bf 100755 --- a/steps/python-2.5.6/pass1.sh +++ b/steps/python-2.5.6/pass1.sh @@ -56,7 +56,7 @@ src_configure() { src_compile() { # Temporarily break include cycle - patch -Np0 -i graminit-regen.patch + patch -Np1 -i graminit-regen.patch # Build pgen make "${MAKEJOBS}" Parser/pgen # Regen graminit.c and graminit.h @@ -71,7 +71,7 @@ src_compile() { python token.py # Undo change - patch -Np0 -R -i graminit-regen.patch + patch -Np1 -R -i graminit-regen.patch # Now build the main program make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__" } diff --git a/steps/python-2.5.6/patches/keyword.patch b/steps/python-2.5.6/patches/keyword.patch index d6c40c9a..cc432772 100644 --- a/steps/python-2.5.6/patches/keyword.patch +++ b/steps/python-2.5.6/patches/keyword.patch @@ -6,8 +6,8 @@ frozenset() is a feature only added in Python 2.5, but we are building Python 2.5, so we must bypass this logic. (It is not critical, so we can just remove it). ---- Lib/keyword.py 2022-10-11 12:51:13.050744758 +1100 -+++ Lib/keyword.py 2022-10-11 12:52:05.946372559 +1100 +--- Python-2.5.6/Lib/keyword.py 2022-10-11 12:51:13.050744758 +1100 ++++ Python-2.5.6/Lib/keyword.py 2022-10-11 12:52:05.946372559 +1100 @@ -10,7 +10,7 @@ python Lib/keyword.py """ diff --git a/steps/python-2.5.6/patches/pgen-timestamp.patch b/steps/python-2.5.6/patches/pgen-timestamp.patch index 7a44dac8..2b477c8d 100644 --- a/steps/python-2.5.6/patches/pgen-timestamp.patch +++ b/steps/python-2.5.6/patches/pgen-timestamp.patch @@ -7,8 +7,8 @@ Don't ignore pgen error (on "make Parser/pgen.stamp") diff --git a/Makefile.pre.in b/Makefile.pre.in index 25a82aff01..03f85fd04b 100644 ---- Makefile.pre.in -+++ Makefile.pre.in +--- Python-2.5.6/Makefile.pre.in ++++ Python-2.5.6/Makefile.pre.in @@ -471,10 +471,12 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile Modules/python.o: $(srcdir)/Modules/python.c $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c diff --git a/steps/python-2.5.6/patches/posixmodule.patch b/steps/python-2.5.6/patches/posixmodule.patch index 15dcf5d5..5d369797 100644 --- a/steps/python-2.5.6/patches/posixmodule.patch +++ b/steps/python-2.5.6/patches/posixmodule.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 musl (correctly) implements the POSIX posix_close function, however this was added after Python 2.5.6 was released. ---- Modules/posixmodule.c 2022-10-05 18:38:46.718131893 +1100 -+++ Modules/posixmodule.c 2022-10-05 18:39:07.049250312 +1100 +--- Python-2.5.6/Modules/posixmodule.c 2022-10-05 18:38:46.718131893 +1100 ++++ Python-2.5.6/Modules/posixmodule.c 2022-10-05 18:39:07.049250312 +1100 @@ -5208,12 +5208,12 @@ } diff --git a/steps/python-2.5.6/patches/pyc.patch b/steps/python-2.5.6/patches/pyc.patch index 1900eb7e..a1d09ab3 100644 --- a/steps/python-2.5.6/patches/pyc.patch +++ b/steps/python-2.5.6/patches/pyc.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: PSF-2.0 Disable creation of pyc files. ---- Lib/py_compile.py 2024-01-22 11:28:44.333395804 +1100 -+++ Lib/py_compile.py 2024-01-22 11:28:53.703636809 +1100 +--- Python-2.5.6/Lib/py_compile.py 2024-01-22 11:28:44.333395804 +1100 ++++ Python-2.5.6/Lib/py_compile.py 2024-01-22 11:28:53.703636809 +1100 @@ -112,6 +112,7 @@ directories). @@ -14,8 +14,8 @@ Disable creation of pyc files. f = open(file, 'U') try: timestamp = long(os.fstat(f.fileno()).st_mtime) ---- Python/import.c 2024-01-22 12:24:59.390701654 +1100 -+++ Python/import.c 2024-01-22 12:25:18.643222249 +1100 +--- Python-2.5.6/Python/import.c 2024-01-22 12:24:59.390701654 +1100 ++++ Python-2.5.6/Python/import.c 2024-01-22 12:25:18.643222249 +1100 @@ -869,6 +869,7 @@ static void write_compiled_module(PyCodeObject *co, char *cpathname, time_t mtime) diff --git a/steps/python-2.5.6/patches/sorted.patch b/steps/python-2.5.6/patches/sorted.patch index 0ea76ae6..172243a1 100644 --- a/steps/python-2.5.6/patches/sorted.patch +++ b/steps/python-2.5.6/patches/sorted.patch @@ -8,8 +8,8 @@ We cannot use .sort(), as it doesn't support the key= parameter. Instead we just use a basic custom selection sort to sort it ourselves using a custom key. ---- Tools/compiler/astgen.py.bak 2022-07-11 09:24:59.600238862 +1000 -+++ Tools/compiler/astgen.py 2022-07-11 09:32:25.814974174 +1000 +--- Python-2.5.6/Tools/compiler/astgen.py.bak 2022-07-11 09:24:59.600238862 +1000 ++++ Python-2.5.6/Tools/compiler/astgen.py 2022-07-11 09:32:25.814974174 +1000 @@ -215,7 +215,15 @@ # some extra code for a Node's __init__ method name = mo.group(1) diff --git a/steps/python-2.5.6/patches/sre_constants.patch b/steps/python-2.5.6/patches/sre_constants.patch index cb77ea11..036627e1 100644 --- a/steps/python-2.5.6/patches/sre_constants.patch +++ b/steps/python-2.5.6/patches/sre_constants.patch @@ -8,8 +8,8 @@ which is not available when we are building Python 2.5. Sorting is absolutely unnessecary when generating defines for a header file so we can just remove it. ---- Lib/sre_constants.py 2004-08-25 12:22:30.000000000 +1000 -+++ Lib/sre_constants.py 2022-10-09 20:18:40.332233858 +1100 +--- Python-2.5.6/Lib/sre_constants.py 2004-08-25 12:22:30.000000000 +1000 ++++ Python-2.5.6/Lib/sre_constants.py 2022-10-09 20:18:40.332233858 +1100 @@ -219,7 +219,6 @@ if __name__ == "__main__": def dump(f, d, prefix): diff --git a/steps/python-3.1.5/files/graminit-regen.patch b/steps/python-3.1.5/files/graminit-regen.patch index 7c420573..f73c7d5e 100644 --- a/steps/python-3.1.5/files/graminit-regen.patch +++ b/steps/python-3.1.5/files/graminit-regen.patch @@ -10,8 +10,8 @@ graminit.h. We apply this patch before regen-ing graminit.h and revert it afterward. ---- Parser/parsetok.c 2022-10-11 14:11:29.522466304 +1100 -+++ Parser/parsetok.c 2022-10-11 14:11:42.786627172 +1100 +--- Python-3.1.5/Parser/parsetok.c 2022-10-11 14:11:29.522466304 +1100 ++++ Python-3.1.5/Parser/parsetok.c 2022-10-11 14:11:42.786627172 +1100 @@ -8,7 +8,6 @@ #include "parser.h" #include "parsetok.h" diff --git a/steps/python-3.1.5/files/py2.patch b/steps/python-3.1.5/files/py2.patch index 050be06b..23241a63 100644 --- a/steps/python-3.1.5/files/py2.patch +++ b/steps/python-3.1.5/files/py2.patch @@ -9,8 +9,8 @@ files. We only apply this to the first build. ---- Tools/unicode/makeunicodedata.py 2012-04-10 09:25:37.000000000 +1000 -+++ Tools/unicode/makeunicodedata.py 2022-07-13 14:13:37.864821008 +1000 +--- Python-3.1.5/Tools/unicode/makeunicodedata.py 2012-04-10 09:25:37.000000000 +1000 ++++ Python-3.1.5/Tools/unicode/makeunicodedata.py 2022-07-13 14:13:37.864821008 +1000 @@ -67,7 +67,7 @@ def maketables(trace=0): @@ -448,8 +448,8 @@ We only apply this to the first build. if __debug__: # exhaustively verify that the decomposition is correct mask = ~((~0) << shift) # i.e., low-bit mask of shift bits ---- Lib/token.py 2012-04-10 09:25:36.000000000 +1000 -+++ Lib/token.py 2022-07-13 14:13:37.893821468 +1000 +--- Python-3.1.5/Lib/token.py 2012-04-10 09:25:36.000000000 +1000 ++++ Python-3.1.5/Lib/token.py 2022-07-13 14:13:37.893821468 +1000 @@ -93,11 +93,7 @@ outFileName = "Lib/token.py" if len(args) > 1: diff --git a/steps/python-3.1.5/pass1.sh b/steps/python-3.1.5/pass1.sh index 40fb1acc..ac67e453 100755 --- a/steps/python-3.1.5/pass1.sh +++ b/steps/python-3.1.5/pass1.sh @@ -5,7 +5,7 @@ src_prepare() { default - patch -Np0 -i py2.patch + patch -Np1 -i py2.patch # Delete generated files rm Include/Python-ast.h Python/Python-ast.c @@ -50,7 +50,7 @@ src_configure() { src_compile() { # Temporarily break include cycle - patch -Np0 -i graminit-regen.patch + patch -Np1 -i graminit-regen.patch # Build pgen make "${MAKEJOBS}" Parser/pgen # Regen graminit.c and graminit.h @@ -65,7 +65,7 @@ src_compile() { python token.py # Undo change - patch -Np0 -R -i graminit-regen.patch + patch -Np1 -R -i graminit-regen.patch # Now build the main program make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__" } diff --git a/steps/python-3.1.5/pass2.sh b/steps/python-3.1.5/pass2.sh index e112889a..3873176b 100755 --- a/steps/python-3.1.5/pass2.sh +++ b/steps/python-3.1.5/pass2.sh @@ -55,7 +55,7 @@ src_configure() { src_compile() { # Temporarily break include cycle - patch -Np0 -i graminit-regen.patch + patch -Np1 -i graminit-regen.patch # Build pgen PYTHONDONTWRITEBYTECODE=1 make "${MAKEJOBS}" Parser/pgen # Regen graminit.c and graminit.h @@ -70,7 +70,7 @@ src_compile() { python -B token.py # Undo change - patch -Np0 -R -i graminit-regen.patch + patch -Np1 -R -i graminit-regen.patch # Now build the main program PYTHONDONTWRITEBYTECODE=1 make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__" } diff --git a/steps/python-3.1.5/patches/install-perms.patch b/steps/python-3.1.5/patches/install-perms.patch index 7a22347f..f1e18165 100644 --- a/steps/python-3.1.5/patches/install-perms.patch +++ b/steps/python-3.1.5/patches/install-perms.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 Install libraries with 755 instead of 555 so we can strip them. (This is what is in modern versions of python). ---- Makefile.pre.in 2023-03-15 21:49:08.274186777 +1100 -+++ Makefile.pre.in 2023-03-15 21:50:02.466143662 +1100 +--- Python-3.1.5/Makefile.pre.in 2023-03-15 21:49:08.274186777 +1100 ++++ Python-3.1.5/Makefile.pre.in 2023-03-15 21:50:02.466143662 +1100 @@ -54,8 +54,7 @@ INSTALL_DATA= @INSTALL_DATA@ # Shared libraries must be installed with executable mode on some systems; diff --git a/steps/python-3.1.5/patches/openssl.patch b/steps/python-3.1.5/patches/openssl.patch index 1062327d..e57dc758 100644 --- a/steps/python-3.1.5/patches/openssl.patch +++ b/steps/python-3.1.5/patches/openssl.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 openssl is too new for this version of Python. Tell Python build system we don't have openssl. ---- setup.py 2022-12-19 10:51:49.749157041 +1100 -+++ setup.py 2022-12-19 10:52:37.223748681 +1100 +--- Python-3.1.5/setup.py 2022-12-19 10:51:49.749157041 +1100 ++++ Python-3.1.5/setup.py 2022-12-19 10:52:37.223748681 +1100 @@ -712,7 +712,7 @@ #print('openssl_ver = 0x%08x' % openssl_ver) diff --git a/steps/python-3.1.5/patches/posixmodule.patch b/steps/python-3.1.5/patches/posixmodule.patch index 56bc7a0c..4aea9da1 100644 --- a/steps/python-3.1.5/patches/posixmodule.patch +++ b/steps/python-3.1.5/patches/posixmodule.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 musl (correctly) implements the POSIX posix_close function, however this was added after Python 3.1.5 was released. ---- Modules/posixmodule.c 2022-10-15 10:20:33.311399832 +1100 -+++ Modules/posixmodule.c 2022-10-15 10:21:03.522921510 +1100 +--- Python-3.1.5/Modules/posixmodule.c 2022-10-15 10:20:33.311399832 +1100 ++++ Python-3.1.5/Modules/posixmodule.c 2022-10-15 10:21:03.522921510 +1100 @@ -4993,12 +4993,12 @@ } diff --git a/steps/python-3.11.1/patches/empty-date.patch b/steps/python-3.11.1/patches/empty-date.patch index f11a67fb..9f631373 100644 --- a/steps/python-3.11.1/patches/empty-date.patch +++ b/steps/python-3.11.1/patches/empty-date.patch @@ -7,8 +7,8 @@ not comply with this so the parser in Lib/platform.py fails on it. Upstream PR: https://github.com/python/cpython/pull/100389 ---- Modules/getbuildinfo.c 2022-12-21 13:41:18.120573458 +1100 -+++ Modules/getbuildinfo.c 2022-12-21 13:41:30.399716652 +1100 +--- Python-3.11.1/Modules/getbuildinfo.c 2022-12-21 13:41:18.120573458 +1100 ++++ Python-3.11.1/Modules/getbuildinfo.c 2022-12-21 13:41:30.399716652 +1100 @@ -8,7 +8,7 @@ #ifdef __DATE__ #define DATE __DATE__ diff --git a/steps/python-3.11.1/patches/multiarch.patch b/steps/python-3.11.1/patches/multiarch.patch index e3f2b283..9bfa8f54 100644 --- a/steps/python-3.11.1/patches/multiarch.patch +++ b/steps/python-3.11.1/patches/multiarch.patch @@ -6,8 +6,8 @@ On x86_64 system our GCC has multiarch a little broken for Python's build system which doesn't really bother me so just pretend that there is no multiarch. ---- configure.ac.bak 2022-12-21 19:35:44.560977616 +1100 -+++ configure.ac 2022-12-21 19:36:00.735143246 +1100 +--- Python-3.11.1/configure.ac.bak 2022-12-21 19:35:44.560977616 +1100 ++++ Python-3.11.1/configure.ac 2022-12-21 19:36:00.735143246 +1100 @@ -1096,7 +1096,7 @@ AS_CASE([$ac_sys_system], [Darwin*], [MULTIARCH=""], diff --git a/steps/python-3.3.7/patches/install-perms.patch b/steps/python-3.3.7/patches/install-perms.patch index 7a22347f..15640808 100644 --- a/steps/python-3.3.7/patches/install-perms.patch +++ b/steps/python-3.3.7/patches/install-perms.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 Install libraries with 755 instead of 555 so we can strip them. (This is what is in modern versions of python). ---- Makefile.pre.in 2023-03-15 21:49:08.274186777 +1100 -+++ Makefile.pre.in 2023-03-15 21:50:02.466143662 +1100 +--- Python-3.3.7/Makefile.pre.in 2023-03-15 21:49:08.274186777 +1100 ++++ Python-3.3.7/Makefile.pre.in 2023-03-15 21:50:02.466143662 +1100 @@ -54,8 +54,7 @@ INSTALL_DATA= @INSTALL_DATA@ # Shared libraries must be installed with executable mode on some systems; diff --git a/steps/python-3.3.7/patches/symbol.patch b/steps/python-3.3.7/patches/symbol.patch index a2d0a96f..9bab5b38 100644 --- a/steps/python-3.3.7/patches/symbol.patch +++ b/steps/python-3.3.7/patches/symbol.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 token is in the standard library which takes precedence over files in the path. Rename this file so we can actually import it. ---- Lib/symbol.py 2022-12-19 21:52:07.101953334 +1100 -+++ Lib/symbol.py 2022-12-19 21:52:14.752082879 +1100 +--- Python-3.3.7/Lib/symbol.py 2022-12-19 21:52:07.101953334 +1100 ++++ Python-3.3.7/Lib/symbol.py 2022-12-19 21:52:14.752082879 +1100 @@ -102,10 +102,10 @@ def main(): diff --git a/steps/python-3.4.10/patches/install-perms.patch b/steps/python-3.4.10/patches/install-perms.patch index 7a22347f..022365f3 100644 --- a/steps/python-3.4.10/patches/install-perms.patch +++ b/steps/python-3.4.10/patches/install-perms.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 Install libraries with 755 instead of 555 so we can strip them. (This is what is in modern versions of python). ---- Makefile.pre.in 2023-03-15 21:49:08.274186777 +1100 -+++ Makefile.pre.in 2023-03-15 21:50:02.466143662 +1100 +--- Python-3.4.10/Makefile.pre.in 2023-03-15 21:49:08.274186777 +1100 ++++ Python-3.4.10/Makefile.pre.in 2023-03-15 21:50:02.466143662 +1100 @@ -54,8 +54,7 @@ INSTALL_DATA= @INSTALL_DATA@ # Shared libraries must be installed with executable mode on some systems; diff --git a/steps/python-3.4.10/patches/symbol.patch b/steps/python-3.4.10/patches/symbol.patch index a2d0a96f..42eae30a 100644 --- a/steps/python-3.4.10/patches/symbol.patch +++ b/steps/python-3.4.10/patches/symbol.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 token is in the standard library which takes precedence over files in the path. Rename this file so we can actually import it. ---- Lib/symbol.py 2022-12-19 21:52:07.101953334 +1100 -+++ Lib/symbol.py 2022-12-19 21:52:14.752082879 +1100 +--- Python-3.4.10/Lib/symbol.py 2022-12-19 21:52:07.101953334 +1100 ++++ Python-3.4.10/Lib/symbol.py 2022-12-19 21:52:14.752082879 +1100 @@ -102,10 +102,10 @@ def main(): diff --git a/steps/python-3.8.16/patches/empty-date.patch b/steps/python-3.8.16/patches/empty-date.patch index 8d5ac0c0..b59901fb 100644 --- a/steps/python-3.8.16/patches/empty-date.patch +++ b/steps/python-3.8.16/patches/empty-date.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 When defined __DATE__ is in the format MMM DD YYYY. xx/xx/xx does not comply with this so the parser in Lib/platform.py fails on it. ---- Modules/getbuildinfo.c 2022-12-21 13:41:18.120573458 +1100 -+++ Modules/getbuildinfo.c 2022-12-21 13:41:30.399716652 +1100 +--- Python-3.8.16/Modules/getbuildinfo.c 2022-12-21 13:41:18.120573458 +1100 ++++ Python-3.8.16/Modules/getbuildinfo.c 2022-12-21 13:41:30.399716652 +1100 @@ -8,7 +8,7 @@ #ifdef __DATE__ #define DATE __DATE__ diff --git a/steps/python-3.8.16/patches/maxgroups.patch b/steps/python-3.8.16/patches/maxgroups.patch index c4047242..c1a316be 100644 --- a/steps/python-3.8.16/patches/maxgroups.patch +++ b/steps/python-3.8.16/patches/maxgroups.patch @@ -6,8 +6,8 @@ MAXGROUPS constant was introduced in this upgrade. Hardcode it from a "normal" system. This seems particularly unproblematic if it is wrong, since it does next to nothing. ---- Lib/sre_constants.py 2022-12-20 12:05:01.176104156 +1100 -+++ Lib/sre_constants.py 2022-12-20 12:05:21.710376396 +1100 +--- Python-3.8.16/Lib/sre_constants.py 2022-12-20 12:05:01.176104156 +1100 ++++ Python-3.8.16/Lib/sre_constants.py 2022-12-20 12:05:21.710376396 +1100 @@ -15,7 +15,8 @@ MAGIC = 20171005 diff --git a/steps/python-3.8.16/patches/refractor.patch b/steps/python-3.8.16/patches/refractor.patch index 45493197..c42ee242 100644 --- a/steps/python-3.8.16/patches/refractor.patch +++ b/steps/python-3.8.16/patches/refractor.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: PSF-2.0 I'm not sure what was going on here when this was written, or how it ever worked! But this small simple fix works 0.0 ---- Lib/sre_constants.py 2022-12-20 18:30:21.883561534 +1100 -+++ Lib/sre_constants.py 2022-12-20 18:31:23.209190748 +1100 +--- Python-3.8.16/Lib/sre_constants.py 2022-12-20 18:30:21.883561534 +1100 ++++ Python-3.8.16/Lib/sre_constants.py 2022-12-20 18:31:23.209190748 +1100 @@ -56,6 +56,7 @@ class _NamedIntConstant(int): def __new__(cls, value, name): diff --git a/steps/tcc-0.9.27/patches/dont-skip-weak-symbols-ar.patch b/steps/tcc-0.9.27/patches/dont-skip-weak-symbols-ar.patch index ae147bf6..cb08b300 100644 --- a/steps/tcc-0.9.27/patches/dont-skip-weak-symbols-ar.patch +++ b/steps/tcc-0.9.27/patches/dont-skip-weak-symbols-ar.patch @@ -33,8 +33,8 @@ f in w.o diff --git a/tcctools.c b/tcctools.c index cf174965..4567b81a 100644 ---- tcctools.c -+++ tcctools.c +--- tcc-0.9.27/tcctools.c ++++ tcc-0.9.27/tcctools.c @@ -200,6 +200,9 @@ ST_FUNC int tcc_tool_ar(TCCState *s1, int argc, char **argv) (sym->st_info == 0x10 || sym->st_info == 0x11 diff --git a/steps/tcc-0.9.27/patches/ignore-static-inside-array.patch b/steps/tcc-0.9.27/patches/ignore-static-inside-array.patch index e3972f2f..8844eca3 100644 --- a/steps/tcc-0.9.27/patches/ignore-static-inside-array.patch +++ b/steps/tcc-0.9.27/patches/ignore-static-inside-array.patch @@ -26,8 +26,8 @@ add comment about above deficiency] diff --git tccgen.c tccgen.c index 7ed89ac..6ef40e4 100644 ---- tccgen.c -+++ tccgen.c +--- tcc-0.9.27/tccgen.c ++++ tcc-0.9.27/tccgen.c @@ -4335,8 +4335,23 @@ static int post_type(CType *type, AttributeDef *ad, int storage, int td) int saved_nocode_wanted = nocode_wanted; /* array definition */ diff --git a/steps/tcc-0.9.27/patches/static-link.patch b/steps/tcc-0.9.27/patches/static-link.patch index c1ef8e14..f99ab941 100644 --- a/steps/tcc-0.9.27/patches/static-link.patch +++ b/steps/tcc-0.9.27/patches/static-link.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: LGPL-2.0-or-later static linking is the only typing of linking mes libc supports, so default to it. ---- libtcc.c 2021-01-14 08:25:30.774995301 +1100 -+++ libtcc.c 2021-01-14 08:26:37.594417450 +1100 +--- tcc-0.9.27/libtcc.c 2021-01-14 08:25:30.774995301 +1100 ++++ tcc-0.9.27/libtcc.c 2021-01-14 08:26:37.594417450 +1100 @@ -734,6 +734,7 @@ ++nb_states; diff --git a/steps/util-linux-2.19.1/patches/broken-programs.patch b/steps/util-linux-2.19.1/patches/broken-programs.patch index 08621dc8..32371080 100644 --- a/steps/util-linux-2.19.1/patches/broken-programs.patch +++ b/steps/util-linux-2.19.1/patches/broken-programs.patch @@ -12,8 +12,8 @@ We disable the following programs for the following reasons: * column: musl incompatibility. diff --color -ru misc-utils/Makefile.am misc-utils/Makefile.am ---- misc-utils/Makefile.am 2021-06-13 09:34:49.669370352 +1000 -+++ misc-utils/Makefile.am 2021-06-13 09:42:06.644523490 +1000 +--- util-linux-2.19.1/misc-utils/Makefile.am 2021-06-13 09:34:49.669370352 +1000 ++++ util-linux-2.19.1/misc-utils/Makefile.am 2021-06-13 09:42:06.644523490 +1000 @@ -6,8 +6,8 @@ sbin_PROGRAMS = usrsbin_exec_PROGRAMS = @@ -45,8 +45,8 @@ diff --color -ru misc-utils/Makefile.am misc-utils/Makefile.am sbin_PROGRAMS += blkid.static blkid_static_SOURCES = $(blkid_SOURCES) diff --color -ru sys-utils/Makefile.am sys-utils/Makefile.am ---- sys-utils/Makefile.am 2021-06-13 09:34:49.686370532 +1000 -+++ sys-utils/Makefile.am 2021-06-13 09:42:06.644523490 +1000 +--- util-linux-2.19.1/sys-utils/Makefile.am 2021-06-13 09:34:49.686370532 +1000 ++++ util-linux-2.19.1/sys-utils/Makefile.am 2021-06-13 09:42:06.644523490 +1000 @@ -2,7 +2,7 @@ bin_PROGRAMS = @@ -68,8 +68,8 @@ diff --color -ru sys-utils/Makefile.am sys-utils/Makefile.am dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ diff --color -ru text-utils/Makefile.am text-utils/Makefile.am ---- text-utils/Makefile.am 2021-06-13 09:34:49.696370638 +1000 -+++ text-utils/Makefile.am 2021-06-13 09:46:19.230591066 +1000 +--- util-linux-2.19.1/text-utils/Makefile.am 2021-06-13 09:34:49.696370638 +1000 ++++ util-linux-2.19.1/text-utils/Makefile.am 2021-06-13 09:46:19.230591066 +1000 @@ -2,7 +2,7 @@ EXTRA_DIST = README.clear README.col diff --git a/steps/util-linux-2.19.1/patches/disable-tests.patch b/steps/util-linux-2.19.1/patches/disable-tests.patch index 2d0a6e4e..6832018a 100644 --- a/steps/util-linux-2.19.1/patches/disable-tests.patch +++ b/steps/util-linux-2.19.1/patches/disable-tests.patch @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later The tests/ subfolder is broken and useless unless we run `make test' which we don't. ---- Makefile.am 2021-06-13 09:50:21.775597435 +1000 -+++ Makefile.am 2021-06-13 09:50:10.900501284 +1000 +--- util-linux-2.19.1/Makefile.am 2021-06-13 09:50:21.775597435 +1000 ++++ util-linux-2.19.1/Makefile.am 2021-06-13 09:50:10.900501284 +1000 @@ -29,8 +29,7 @@ po \ schedutils \ diff --git a/steps/util-linux-2.19.1/patches/headers-bsd.patch b/steps/util-linux-2.19.1/patches/headers-bsd.patch index 739d131f..e5857901 100644 --- a/steps/util-linux-2.19.1/patches/headers-bsd.patch +++ b/steps/util-linux-2.19.1/patches/headers-bsd.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: BSD-4-Clause headers.patch but for files licensed BSD. ---- fdisk/fdiskbsdlabel.c 2021-06-12 16:09:49.519140837 +1000 -+++ fdisk/fdiskbsdlabel.c 2021-06-12 16:10:00.875220602 +1000 +--- util-linux-2.19.1/fdisk/fdiskbsdlabel.c 2021-06-12 16:09:49.519140837 +1000 ++++ util-linux-2.19.1/fdisk/fdiskbsdlabel.c 2021-06-12 16:10:00.875220602 +1000 @@ -53,6 +53,7 @@ #include "nls.h" @@ -14,8 +14,8 @@ headers.patch but for files licensed BSD. #include "common.h" #include "fdisk.h" ---- login-utils/ttymsg.c 2021-06-12 16:11:45.911958381 +1000 -+++ login-utils/ttymsg.c 2021-06-12 19:09:30.108310127 +1000 +--- util-linux-2.19.1/login-utils/ttymsg.c 2021-06-12 16:11:45.911958381 +1000 ++++ util-linux-2.19.1/login-utils/ttymsg.c 2021-06-12 19:09:30.108310127 +1000 @@ -51,6 +51,7 @@ #include #include diff --git a/steps/util-linux-2.19.1/patches/headers-gpl2.patch b/steps/util-linux-2.19.1/patches/headers-gpl2.patch index 0241fd38..b37972d4 100644 --- a/steps/util-linux-2.19.1/patches/headers-gpl2.patch +++ b/steps/util-linux-2.19.1/patches/headers-gpl2.patch @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later headers.patch but for files licensed GPL 2.0 or later. ---- misc-utils/findmnt.c 2021-06-12 19:13:40.306009682 +1000 -+++ misc-utils/findmnt.c 2021-06-12 19:13:58.223132046 +1000 +--- util-linux-2.19.1/misc-utils/findmnt.c 2021-06-12 19:13:40.306009682 +1000 ++++ util-linux-2.19.1/misc-utils/findmnt.c 2021-06-12 19:13:58.223132046 +1000 @@ -30,6 +30,7 @@ #include #endif @@ -14,8 +14,8 @@ headers.patch but for files licensed GPL 2.0 or later. #define USE_UNSTABLE_LIBMOUNT_API #include ---- fsck/fsck.c 2021-06-22 18:30:27.843680552 +1000 -+++ fsck/fsck.c 2021-06-22 18:30:41.327764247 +1000 +--- util-linux-2.19.1/fsck/fsck.c 2021-06-22 18:30:27.843680552 +1000 ++++ util-linux-2.19.1/fsck/fsck.c 2021-06-22 18:30:41.327764247 +1000 @@ -32,6 +32,7 @@ #include #include diff --git a/steps/util-linux-2.19.1/patches/headers.patch b/steps/util-linux-2.19.1/patches/headers.patch index cae7d7d0..f7633add 100644 --- a/steps/util-linux-2.19.1/patches/headers.patch +++ b/steps/util-linux-2.19.1/patches/headers.patch @@ -12,8 +12,8 @@ ttymsg. (This is the main patch file. See -bsd.patch for files with such licensing). diff --color -ru shlibs/blkid/src/devname.c shlibs/blkid/src/devname.c ---- shlibs/blkid/src/devname.c 2021-06-12 14:24:30.982387640 +1000 -+++ shlibs/blkid/src/devname.c 2021-06-12 14:25:42.934921608 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/devname.c 2021-06-12 14:24:30.982387640 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/devname.c 2021-06-12 14:25:42.934921608 +1000 @@ -33,6 +33,7 @@ #include #endif @@ -23,8 +23,8 @@ diff --color -ru shlibs/blkid/src/devname.c shlibs/blkid/src/devname.c #include "blkidP.h" diff --color -ru shlibs/blkid/src/devno.c shlibs/blkid/src/devno.c ---- shlibs/blkid/src/devno.c 2021-06-12 14:24:30.987387677 +1000 -+++ shlibs/blkid/src/devno.c 2021-06-12 14:25:27.750808925 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/devno.c 2021-06-12 14:24:30.987387677 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/devno.c 2021-06-12 14:25:27.750808925 +1000 @@ -31,6 +31,7 @@ #endif #include @@ -34,8 +34,8 @@ diff --color -ru shlibs/blkid/src/devno.c shlibs/blkid/src/devno.c #include "blkidP.h" #include "pathnames.h" diff --color -ru shlibs/blkid/src/partitions/partitions.c shlibs/blkid/src/partitions/partitions.c ---- shlibs/blkid/src/partitions/partitions.c 2021-06-12 14:24:30.983387647 +1000 -+++ shlibs/blkid/src/partitions/partitions.c 2021-06-12 14:25:24.326783515 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/partitions/partitions.c 2021-06-12 14:24:30.983387647 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/partitions/partitions.c 2021-06-12 14:25:24.326783515 +1000 @@ -19,6 +19,7 @@ #include #include @@ -45,8 +45,8 @@ diff --color -ru shlibs/blkid/src/partitions/partitions.c shlibs/blkid/src/parti #include "partitions.h" diff --color -ru shlibs/blkid/src/topology/evms.c shlibs/blkid/src/topology/evms.c ---- shlibs/blkid/src/topology/evms.c 2021-06-12 14:24:30.984387655 +1000 -+++ shlibs/blkid/src/topology/evms.c 2021-06-12 14:25:30.390828517 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/topology/evms.c 2021-06-12 14:24:30.984387655 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/topology/evms.c 2021-06-12 14:25:30.390828517 +1000 @@ -19,6 +19,7 @@ #include #include @@ -56,8 +56,8 @@ diff --color -ru shlibs/blkid/src/topology/evms.c shlibs/blkid/src/topology/evms #include "topology.h" diff --color -ru shlibs/blkid/src/topology/lvm.c shlibs/blkid/src/topology/lvm.c ---- shlibs/blkid/src/topology/lvm.c 2021-06-12 14:24:30.984387655 +1000 -+++ shlibs/blkid/src/topology/lvm.c 2021-06-12 14:25:37.510881355 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/topology/lvm.c 2021-06-12 14:24:30.984387655 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/topology/lvm.c 2021-06-12 14:25:37.510881355 +1000 @@ -18,6 +18,7 @@ #include #include @@ -67,8 +67,8 @@ diff --color -ru shlibs/blkid/src/topology/lvm.c shlibs/blkid/src/topology/lvm.c #include "topology.h" diff --color -ru shlibs/blkid/src/topology/md.c shlibs/blkid/src/topology/md.c ---- shlibs/blkid/src/topology/md.c 2021-06-12 14:24:30.984387655 +1000 -+++ shlibs/blkid/src/topology/md.c 2021-06-12 14:25:34.679860346 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/topology/md.c 2021-06-12 14:24:30.984387655 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/topology/md.c 2021-06-12 14:25:34.679860346 +1000 @@ -19,6 +19,7 @@ #include #include @@ -77,8 +77,8 @@ diff --color -ru shlibs/blkid/src/topology/md.c shlibs/blkid/src/topology/md.c #include "topology.h" ---- shlibs/blkid/src/topology/dm.c 2021-06-12 14:29:01.195392922 +1000 -+++ shlibs/blkid/src/topology/dm.c 2021-06-12 14:29:05.897427816 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/topology/dm.c 2021-06-12 14:29:01.195392922 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/topology/dm.c 2021-06-12 14:29:05.897427816 +1000 @@ -18,6 +18,7 @@ #include #include @@ -88,8 +88,8 @@ diff --color -ru shlibs/blkid/src/topology/md.c shlibs/blkid/src/topology/md.c #include "topology.h" diff --color -ru shlibs/blkid/src/evaluate.c shlibs/blkid/src/evaluate.c ---- shlibs/blkid/src/evaluate.c 2021-06-12 16:11:45.893958255 +1000 -+++ shlibs/blkid/src/evaluate.c 2021-06-12 16:12:20.652202397 +1000 +--- util-linux-2.19.1/shlibs/blkid/src/evaluate.c 2021-06-12 16:11:45.893958255 +1000 ++++ util-linux-2.19.1/shlibs/blkid/src/evaluate.c 2021-06-12 16:12:20.652202397 +1000 @@ -21,6 +21,7 @@ #endif #include @@ -99,8 +99,8 @@ diff --color -ru shlibs/blkid/src/evaluate.c shlibs/blkid/src/evaluate.c #include "pathnames.h" #include "canonicalize.h" diff --color -ru shlibs/mount/src/fs.c shlibs/mount/src/fs.c ---- shlibs/mount/src/fs.c 2021-06-12 16:11:45.897958283 +1000 -+++ shlibs/mount/src/fs.c 2021-06-12 16:12:14.812161377 +1000 +--- util-linux-2.19.1/shlibs/mount/src/fs.c 2021-06-12 16:11:45.897958283 +1000 ++++ util-linux-2.19.1/shlibs/mount/src/fs.c 2021-06-12 16:12:14.812161377 +1000 @@ -18,6 +18,7 @@ #include #include @@ -109,8 +109,8 @@ diff --color -ru shlibs/mount/src/fs.c shlibs/mount/src/fs.c #include "nls.h" #include "mountP.h" ---- shlibs/mount/src/tab_parse.c 2021-06-12 19:04:38.773393353 +1000 -+++ shlibs/mount/src/tab_parse.c 2021-06-12 19:04:51.115474555 +1000 +--- util-linux-2.19.1/shlibs/mount/src/tab_parse.c 2021-06-12 19:04:38.773393353 +1000 ++++ util-linux-2.19.1/shlibs/mount/src/tab_parse.c 2021-06-12 19:04:51.115474555 +1000 @@ -14,6 +14,7 @@ #include #include diff --git a/steps/util-linux-2.19.1/patches/pkg-config.patch b/steps/util-linux-2.19.1/patches/pkg-config.patch index 28f2857d..de32c8bc 100644 --- a/steps/util-linux-2.19.1/patches/pkg-config.patch +++ b/steps/util-linux-2.19.1/patches/pkg-config.patch @@ -6,8 +6,8 @@ We don't have pkg-config, hence: a) disable gtk-doc (uses pkg-config exclusively) b) disable pkg-config type checks ---- configure.ac 2021-06-12 11:23:41.719074631 +1000 -+++ configure.ac 2021-06-12 11:26:17.748153926 +1000 +--- util-linux-2.19.1/configure.ac 2021-06-12 11:23:41.719074631 +1000 ++++ util-linux-2.19.1/configure.ac 2021-06-12 11:26:17.748153926 +1000 @@ -84,9 +84,6 @@ dnl libtool-2 LT_INIT @@ -80,8 +80,8 @@ b) disable pkg-config type checks shlibs/mount/samples/Makefile shlibs/uuid/uuid.pc shlibs/uuid/Makefile ---- shlibs/mount/Makefile.am.bak 2021-06-12 11:32:07.578612839 +1000 -+++ shlibs/mount/Makefile.am 2021-06-12 11:32:20.247701887 +1000 +--- util-linux-2.19.1/shlibs/mount/Makefile.am.bak 2021-06-12 11:32:07.578612839 +1000 ++++ util-linux-2.19.1/shlibs/mount/Makefile.am 2021-06-12 11:32:20.247701887 +1000 @@ -2,11 +2,6 @@ SUBDIRS = src samples @@ -94,8 +94,8 @@ b) disable pkg-config type checks pkgconfigdir = $(usrlib_execdir)/pkgconfig pkgconfig_DATA = mount.pc ---- shlibs/blkid/Makefile.am.bak 2021-06-12 11:32:03.546584499 +1000 -+++ shlibs/blkid/Makefile.am 2021-06-12 11:32:10.790635416 +1000 +--- util-linux-2.19.1/shlibs/blkid/Makefile.am.bak 2021-06-12 11:32:03.546584499 +1000 ++++ util-linux-2.19.1/shlibs/blkid/Makefile.am 2021-06-12 11:32:10.790635416 +1000 @@ -2,10 +2,6 @@ SUBDIRS = src samples From 5bc79d8e208d0d37fdcc4f1575aaffd6094c04e3 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 21 Dec 2024 15:13:13 +1100 Subject: [PATCH 2/4] Remove pregenerated header files from musl 1.1 Some pregenerated header files exist in the src/ctype and src/locale directories. They are generated by out-of-tree code found on GitHub, musl-chartable-tools. This causes a slight reordering of the early bootstrap, as the early environment is quite spartan and has broken/missing tools to regenerate these files. With an added rebuild everything works fine. --- parts.rst | 26 ++++++--- steps/SHA256SUMS.pkgs | 49 ++++++++--------- steps/manifest | 3 +- steps/musl-1.1.24/files/cut.patch | 21 ++++++++ .../files/disable_ctype_headers.patch | 53 +++++++++++++++++++ steps/musl-1.1.24/pass1.sh | 7 +++ steps/musl-1.1.24/pass3.sh | 23 +++++--- steps/musl-1.1.24/pass4.sh | 42 +++++++++++++++ .../avoid_set_thread_area.patch | 0 .../avoid_sys_clone.patch | 0 .../madvise_preserve_errno.patch | 0 .../set_thread_area.patch | 0 .../va_list.patch | 0 steps/musl-1.1.24/sources | 1 + 14 files changed, 186 insertions(+), 39 deletions(-) create mode 100644 steps/musl-1.1.24/files/cut.patch create mode 100644 steps/musl-1.1.24/files/disable_ctype_headers.patch create mode 100755 steps/musl-1.1.24/pass4.sh rename steps/musl-1.1.24/{patches-pass3 => patches-pass4}/avoid_set_thread_area.patch (100%) rename steps/musl-1.1.24/{patches-pass3 => patches-pass4}/avoid_sys_clone.patch (100%) rename steps/musl-1.1.24/{patches-pass3 => patches-pass4}/madvise_preserve_errno.patch (100%) rename steps/musl-1.1.24/{patches-pass3 => patches-pass4}/set_thread_area.patch (100%) rename steps/musl-1.1.24/{patches-pass3 => patches-pass4}/va_list.patch (100%) diff --git a/parts.rst b/parts.rst index 82d2cc0f..fb187b2b 100644 --- a/parts.rst +++ b/parts.rst @@ -399,6 +399,9 @@ from building many newer or more complex programs. ``tcc`` has slight problems when building and linking ``musl``, so we apply a few patches. +We also get rid of a few functions from ``musl``, as they rely on pregenerated +files we are unable to generate at this stage. + We do not use any of ``/usr/lib/mes`` or ``/usr/include/mes`` any longer, rather using ``/usr/lib`` and ``/usr/include`` like normal. @@ -422,6 +425,19 @@ tcc 0.9.27 (musl v2) Now that we have a ‘fixed’ ``musl``, we now recompile ``tcc`` as ``tcc`` uses floats extensively. +grep 2.4 +======== + +GNU ``grep`` is a pattern matching utility. ``grep`` is needed to rebuild some +generated header files in ``musl``. + +musl 1.1.24 (v3) +================ + +We are now able to regenerate those header files that we couldn't regenerate +earlier. We unlock the full range of ``musl`` support, required for a +number of applications (e.g. ``flex``) before the next ``musl`` rebuild. + sed 4.0.9 ========= @@ -485,12 +501,6 @@ a 3 stage process: Finally we have a fully functional ``bison`` executable. -grep 2.4 -======== - -GNU ``grep`` is a pattern matching utility. Is is not immediately needed -but will be useful later for autotools. - diffutils 2.7 ============= @@ -692,10 +702,10 @@ In particular we can now use full featured ``ar`` instead of ``tcc -ar``, the GNU linker ``ld``, which allows us building shared libraries, and the GNU assembler ``as``. -musl 1.1.24 (v3) +musl 1.1.24 (v4) ================ -We rebuild musl for the third time. This time we can use GNU as to build assembly source files, +We rebuild musl for the fourth time. This time we can use GNU as to build assembly source files, so those assembly files that tcc failed to compile no longer have to be patched. tcc 0.9.27 (musl v3) diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index feac9927..f2b6d8ba 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -16,39 +16,39 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4 autoconf-2.64_ 57100612d902537b72ee2fd3dfecc903f2ea3959f1a480af87c6a1ef9a9d7c03 automake-1.16.3_0.tar.bz2 1c7e09ac08f156960420fca1f6e8560c1855bf01b001a0648b56153d6ceb9c28 automake-1.6.3_0.tar.bz2 444131776779d1f27628088a817bfb8c9aa85f4b036b934794a71e484ec9bd70 automake-1.6.3_1.tar.bz2 -e8ff13753943e43972a8cf1672819f001718ed38e5497cf7b554c21a507ba22b automake-1.7.8_0.tar.bz2 ef08694bf8e78ffcf56f9c8a63b0f189e301c06f02ab240e15e4c7fe354c2a0d automake-1.7_0.tar.bz2 +e8ff13753943e43972a8cf1672819f001718ed38e5497cf7b554c21a507ba22b automake-1.7.8_0.tar.bz2 9922651b64ad2e29b944082f26db223008220155048f25d64df1f6d82071ff1c automake-1.8.5_0.tar.bz2 c5807850a377e4bb9aa4121d9781d145bdd80327626a9419630a75ce2c8d9c71 automake-1.9.6_0.tar.bz2 f8a55bf656f950ee3c5cea48af03f552166f6db9926b78c78843f3cc52a6e22d bash-5.2.15_0.tar.bz2 ebc631ee8e9382650005984ec5f3910492ccb6fb2656b4c0af0f4afc16998906 bc-1.07.1_0.tar.bz2 -80328d87ef69df910a3f146009b668744a0363d80fb1f289a02941705d2161d6 binutils-2.30_0.tar.bz2 +5d777f774df7fb0153aa73b501c7fe1a57f152a3aa2c86e83a04e68b5df4f696 binutils-2.30_0.tar.bz2 da658346866061324b92a6b734561257acfdb981783ad5794d67a0cd56e14e58 binutils-2.41_0.tar.bz2 026447a32ab08a8a5150bab82a2f150af4a2ed90c47cfde631e1460eaed019aa binutils-2.41_1.tar.bz2 f0bb18831983493b82fde53917e8d16c6a380761ac5e71e14769a82193fee788 bison-2.3_0.tar.bz2 -e4a3c9466d95c58bb072159da3473d71b40eb069b756acefba293588c4495a6f bison-3.4.1_0.tar.bz2 -fd3a3b855c3cbc42d719a0cbbae773d27e0e12b563641124ba2870b7103da1f8 bison-3.4.1_1.tar.bz2 -5232f6f8f3864b5827a015ce0414d484bb8aeb9f34ba66ceb7093da0a79561a8 bison-3.4.1_2.tar.bz2 +81554c867db75101422797d227dd76c8a12c87246393126542ff92a0b97db6c1 bison-3.4.1_0.tar.bz2 +f7437edc081071cc3ecd3384abf4c63f33183858b8cae6b4ac3105c66f88b3b6 bison-3.4.1_1.tar.bz2 +8064a96c8ccfbab1245554ac30e68fcc73da24a3dd02f8450658fdb106c7f405 bison-3.4.1_2.tar.bz2 6d5e4debdec03aee096dbcefcad878fb5c6a069f895ee7ade878d9eeb97fb83e bison-3.4.2_0.tar.bz2 -727b0f28369b78f171dce4e227b05cea474dcb638c357387429c125f0d80fbc8 bzip2-1.0.8_0.tar.bz2 +e8271c1213b6cc7c9ae2ddb018cd093cbbd5f6e842548c0747ce95b13b6b9447 bzip2-1.0.8_0.tar.bz2 96b6b91e1d3c5f48da471f10dd22415fa05baacaafe964cc86285493d0ca27ce ca-certificates-3.99_0.tar.bz2 -da3a3c7e0e6ce94ccb3d39885bc44207eb94c912b324a4c7669b5a752648b02d coreutils-5.0_0.tar.bz2 -56b84ab2035847524d595bb417c2b91c290174965550be321cd3d5d1f77aa2e5 coreutils-6.10_0.tar.bz2 +982a3496ce3277c562acc896ba796939fe55a37432b2c76ab16b76e051a045a2 coreutils-5.0_0.tar.bz2 +27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0 coreutils-6.10_0.tar.bz2 9fa31a4aeaa5132205efb796c8f546c94c1cfef6b5c27e64f6ebe06ca0360e67 coreutils-9.4_0.tar.bz2 abd629e5675196c39dae00afbe23e2116bbd277be1d82214e2ec557a3b03994f curl-8.5.0_0.tar.bz2 db8757b5fe77f56073caa034bfe9b3af6076d7299db966c4348e06f01a34415f curl-8.5.0_1.tar.bz2 9534d834b018343b8335d0ef0b5faff3ee18e4ecbecf43a2a80deb972283f5d6 dhcpcd-10.0.1_0.tar.bz2 -e6372051f90c40d1f4a5cca2f8930187b363dfc916bcb973c72bca6c0aba3cd5 diffutils-2.7_0.tar.bz2 +0462b6a04899a98d60c33f9d16fa00e2e6b7c21cc80ccebc8358fc08105467a2 diffutils-2.7_0.tar.bz2 41e3129b974391fe4ace69914fdef9b0fe72c6f5d87d495750fb89bdd999fa01 diffutils-3.10_0.tar.bz2 bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0.tar.bz2 26c0835a8b9be115082a2866e906363947528169c7274bd3b82752df77e99f11 e2fsprogs-1.45.7_0.tar.bz2 9c6f7e156f299f1d0948537e28f00d40e727a3debae3cce158e9bce827136214 ed-1.4_0.tar.bz2 0061d240f9bb2bb534db7003ddcc4eae9981954ad72e8f41ff1d76dc449ebd37 file-5.44_0.tar.bz2 eec07e0d710ed3dd8d0ba6a1ec6ca9f1fa3a611bbb225195435679175317bf90 findutils-4.2.33_0.tar.bz2 -80798628ccb38521f42e1ca1abe4f0244e4b283e6f662cd354ab70e61a9b4675 flex-2.5.11_0.tar.bz2 +6f2194592682f4a448ccb0aa897e707a8a00eeb69d4b1f5f0236eb6d0fef6242 flex-2.5.11_0.tar.bz2 b3a8d59229289ca5a1de6a24c9c828d2847144f6662e0d5b7f41e7ff6e57abaa flex-2.5.33_0.tar.bz2 -e10060b55e2378a065cf8590cae17400c8befc6b3bb0cbbb7093f1b9f46ec4cc flex-2.6.4_0.tar.bz2 -5619cf9a893902491a9d8a8f8da4d39efb3606d7d0a72cb4aaa9d1ff798b5495 gawk-3.0.4_0.tar.bz2 +7bd44ec26cad78e5bb146e5ab709d489b6589da6049e319a4f438603f10eda4b flex-2.6.4_0.tar.bz2 +c925739472260498342ba6dc3263da937abf5237e7e9102622bf5657ec98094a gawk-3.0.4_0.tar.bz2 62e90abe883f6ccd679adf42d00c2c18a9809bbab599411c81b6c4ac4d446452 gawk-5.3.0_0.tar.bz2 6de1c1380026ef9948387e665610185b6014f47a80453177a6c81898c95cbbd3 gc-8.0.4_0.tar.bz2 c99d080cf17ac3f75cbae67095cb76220a92d96d877c92c896a7f05c9c94e92d gcc-10.4.0_0.tar.bz2 @@ -64,7 +64,7 @@ c1989fc2855dbb0350c4e5b677028306614a9f4b5cb6c01fd459c5e1abf592b9 grep-2.4_0.tar 7e1909855a4896d42f92b3564302a9018d3443cc84efb114894ad517397b0585 grub-2.06_0.tar.bz2 e2a85aad6d51e52c9a30afeed058f95172fde1215f77243549274672990f6237 guile-3.0.9_0.tar.bz2 6585ae3bc8149ec0e3fba766278fa30e2d7f0e7d1b9a9a4a457e0afa15b109c9 gzip-1.13_0.tar.bz2 -29a1603101cfbe2660e2d695f5b9c08dc9eefd8e3389405a6530c479e271821b heirloom-devtools-070527_0.tar.bz2 +d0cb00116d742d4216af4a7ed47f20408640229909a497c184aed3d4fcd4f30a heirloom-devtools-070527_0.tar.bz2 8d2015b87337abbf287f7a39ee4cf53514120b5d3e90a93fe7d533dcc43f14fa help2man-1.36.4_0.tar.bz2 ea5639dc6198c5f243362a1a7adfbea0cb779e085975712a1b410e82d7e0cf84 kbd-1.15_0.tar.bz2 50a0f881161c68fe7c9ec6836b11a905b0d54e08e99b2476e8d1f5ac3212769e kexec-linux-1.0.0_0.tar.bz2 @@ -79,41 +79,42 @@ daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29 libtool-2.2.4_ 503007bbcddcf4e49d26514c59b4c9501f8b42f0c994a59dfdc388b1ae6b7900 libunistring-0.9.10_0.tar.bz2 540927c71fb1682175e32a655dfd4a987c494577549bf30e79ef3b1e4f039a4d linux-4.14.341-openela_0.tar.bz2 c97644d0db5b3de127b048683afee6d31453441d97ba5dea71df5838b13542a4 linux-headers-4.14.341-openela_0.tar.bz2 +d4dff784cac3d58d0cedfd9a51b52ff100ad8654e10a7c8c41590351f48f57d6 m4-1.4.7_0.tar.bz2 78b0cf6d9312e53c613186cbddd5f747310f375c1f322f33a6ac33682d2f3389 m4-1.4.19_0.tar.bz2 -0e3c21b0a1d8ca0c3f74a98ebe268809def62778ff4a486ff20c1d6e8247dc49 m4-1.4.7_0.tar.bz2 e69554b0a77b419ddd5d0a0e418ba4005ecd0f6784c92a6928a0270bd929a098 make-3.82_0.tar.bz2 6d24960d6a987f68a7e0e3abf6edb52d2e0fe4c86f6ba45327e9634dbf7d40b4 make-4.2.1_0.tar.bz2 17cd976bc0f6e897c6fffe43dd7c55d93ce0adadf1b4dc72925b80e2d266519f mpc-1.2.1_0.tar.bz2 98a9f55c01ed375fae21913284e7fa07ff434c0810f34d791f3fbaa1df221302 mpfr-4.1.0_0.tar.bz2 -258f247f20dd1544c65f7f978f7399a16e4b655375be7b1d94ad89e24ebaac94 musl-1.1.24_0.tar.bz2 -6966b565124ac639eed3dc38b7a8a8948066d6a1e59e097ff10f5e531ff15e53 musl-1.1.24_1.tar.bz2 -d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079 musl-1.1.24_2.tar.bz2 +5c590124471cc8c42b45d863c417314d05d9c89b1a3d61db8a36ba9b459ed391 musl-1.1.24_0.tar.bz2 +fc60028b78ac34eda780478638818c5f587873337cf68f607082a3a81bae28ea musl-1.1.24_1.tar.bz2 +5bf3cd3b9e5e12f88c492ba653006b4325a535ef5581d775f18a1338fc57b457 musl-1.1.24_2.tar.bz2 +d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079 musl-1.1.24_3.tar.bz2 81f79a0faf58e105c5f12d9f538d3ea7578a3b361e633ab8f47324ec23ec9de6 musl-1.2.4_0.tar.bz2 6dc5e763b747b66f72692c6820d7f46b7f4cf2e2fe05229a1d01c03919c1c936 musl-1.2.4_1.tar.bz2 820203286127e7c22cee9f1b3cff664431f10d14c3f22f00b3e771fd849fd449 musl-1.2.4_2.tar.bz2 a18c4b2e5de2bfe5bb3ee9d360484fcfebad3df042f1859d4aa333dd60f55e56 opendoas-6.8.2_0.tar.bz2 67b536b2f2a6c56e4673e462a3dbe2f42e8a4a5cb0b61b6bc1fdc14adea33f63 openssl-3.0.13_0.tar.bz2 71864d042cdc564b65eab21360902c714e9b43f80a19689c5600589529b267e7 patch-2.7.6_0.tar.bz2 -287b0a8c0de14a2817e68ab023bfc502a0880d8c34386162351d5ffaf942da70 perl-5.000_0.tar.bz2 -9617799cdc9d4be39d31af54b9bcae47941d68416e9cc9c92cbc2ed08785dbc1 perl-5.003_0.tar.bz2 +44456a0635dc56351d34bf9701487e562c2c903393db2cc99f5c3a6d2ecf52d4 perl-5.000_0.tar.bz2 +0b7ded1733433323c2056b1005828aaabb8aaca9505839333a8e80f12669f203 perl-5.003_0.tar.bz2 +012cc360816f8f46541dbb988578bcb13985c3130ee3bcf2fb9d63cc994c7e8a perl5.004-05_0.tar.bz2 +a2cbb76d60e5df1ae2439297f9e01fe9903175db600d65efb4a45e3bdaa12eb2 perl5.005-03_0.tar.bz2 74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6 perl-5.10.1_0.tar.bz2 d381e910532061ac97e48ff09906bddbcb0956b37fc47d8c666f56a56b50c589 perl-5.32.1_0.tar.bz2 -d63d2fda752759778ae2d0dd08e6c023a81afbfc63ce11db860fc6858ae26c7f perl-5.6.2_0.tar.bz2 -c39ab70bce0bd09f013109ad7370085e90d77ef2b55abcfdc922d7832524c9cf perl5.004-05_0.tar.bz2 -2ac211ad3cf966dd89434c175970e10699c363b66228abc1642766aeafe2766a perl5.005-03_0.tar.bz2 +65374665ede69c1b7944daa4658d90b9be21923f395ab0aac8f0fd2162d57705 perl-5.6.2_0.tar.bz2 1b9d4260edf7b2241d10e4c4ad17d0f90047bd4bf42f2487a7133902529e9dfe pkg-config-0.29.2_0.tar.bz2 2f7198009e4d021d52ee4ce86241b4936fb88349c20cc8b6c286261368878c3c python-2.0.1_0.tar.bz2 b5d86ddc98cfbc684b03f1c84c786caaad810d5e4c7be38089f324eb3c276ad9 python-2.0.1_1.tar.bz2 396577cdd0cc61d76420a1771c64156e49e8f9d00430c82feb88ad933b341632 python-2.3.7_0.tar.bz2 2499cb7f10f292c3506fbf1b6a876195179ec98edfe7b8c357140137a1449492 python-2.3.7_1.tar.bz2 80d8fcaf68c82238ddffb120b62fbc20d58bd9e2416cba080547a9f442e9e229 python-2.5.6_0.tar.bz2 +abadb0d4d55d42ce722b4da96a075fa46b9b133112d619a9eda32a95c5a14945 python-3.11.1_0.tar.bz2 3508248f299b73c50e3607c4c294d40face05170476a5026b0821aed69025863 python-3.1.5_0.tar.bz2 12b1ffc7ec98ba8f807160b93ba69a694d5395567c3bcac1e49e8f8d1d50de43 python-3.1.5_1.tar.bz2 -abadb0d4d55d42ce722b4da96a075fa46b9b133112d619a9eda32a95c5a14945 python-3.11.1_0.tar.bz2 60b93253a2078f849f81e7e1ed6233e30702f03b1893640eee95671d814f5514 python-3.3.7_0.tar.bz2 da7c8ec579dd225c0d8bee63d95aeeb27ac2d5a60d4eefe298508cbf86bf506c python-3.4.10_0.tar.bz2 af7a8334045fed8bd610b19194c0b46aa670070fc4738c34449ba5e93e49db8a python-3.8.16_0.tar.bz2 -c313520567176dd9bf61a271ee56e06a62e944e862f9dc4564d94b7fc884c8f9 sed-4.0.9_0.tar.bz2 +18d517fa1195aa82e3e0eb7f261eb3addb9a43492040b16be04571639781577e sed-4.0.9_0.tar.bz2 e8daec00b2c2de7b18efbec057dc9290eed06668806c6f5a48914d4a5cd95eb4 sed-4.8_0.tar.bz2 ef2f2c791c1ae74f19c98ebcd7edae6ae28bc1d9367cc3a2cdb1ac302a156cb7 shadow-4.14.3_0.tar.bz2 912d8f344104f1322255d6210c7c7e1371413ab530b2c6796e6aa565c74bf647 tar-1.34_0.tar.bz2 diff --git a/steps/manifest b/steps/manifest index 0f4a4cfb..3feacfa2 100644 --- a/steps/manifest +++ b/steps/manifest @@ -64,6 +64,8 @@ build: musl-1.1.24 build: tcc-0.9.27 build: musl-1.1.24 build: tcc-0.9.27 +build: grep-2.4 +build: musl-1.1.24 build: sed-4.0.9 build: bzip2-1.0.8 build: m4-1.4.7 @@ -74,7 +76,6 @@ uninstall: heirloom-devtools-070527 build: bison-3.4.1 build: bison-3.4.1 build: bison-3.4.1 -build: grep-2.4 build: diffutils-2.7 build: coreutils-5.0 build: coreutils-6.10 diff --git a/steps/musl-1.1.24/files/cut.patch b/steps/musl-1.1.24/files/cut.patch new file mode 100644 index 00000000..a57b4bb8 --- /dev/null +++ b/steps/musl-1.1.24/files/cut.patch @@ -0,0 +1,21 @@ +SPDX-FileCopyrightText: 2024 fosslinux + +SPDX-License-Identifier: MIT +(as per https://github.com/richfelker/musl-chartable-tools/issues/3) + +For musl-chartable-tools. + +For the earliest build where we use this, cut is bugged (always says out of +memory). We replace the cut command with equivalent sed commands. + +--- musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/iconv/Makefile 2024-12-21 12:45:54.752170920 +1100 ++++ musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/iconv/Makefile 2024-12-21 12:49:07.040155495 +1100 +@@ -12,7 +12,7 @@ + legacychars.h: arrayify $(CHARMAPS) + cat $(CHARMAPS) \ + | grep -v '^0x.. 0x00..' | grep ^0x[0123456789ABCDEFabcdef] \ +- | cut -d' ' -f2 | tr a-z A-Z | sort -u \ ++ | sed 's/[^\t]*\t//' | sed 's/\t.*//' | tr a-z A-Z | sort -u \ + | ./arrayify > $@ + + mkcodepage: mkcodepage.c legacychars.h diff --git a/steps/musl-1.1.24/files/disable_ctype_headers.patch b/steps/musl-1.1.24/files/disable_ctype_headers.patch new file mode 100644 index 00000000..cacdbabc --- /dev/null +++ b/steps/musl-1.1.24/files/disable_ctype_headers.patch @@ -0,0 +1,53 @@ +SPDX-FileCopyrightText: 2024 fosslinux + +SPDX-License-Identifier: MIT + +diff --color -ru include/wchar.h include/wchar.h +--- musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wchar.h 2024-12-21 11:29:46.207537390 +1100 ++++ musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wchar.h 2024-12-21 12:03:00.494377416 +1100 +@@ -175,10 +175,7 @@ + #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) + int wcwidth (wchar_t); + int wcswidth (const wchar_t *, size_t); +-int iswalnum(wint_t); +-int iswalpha(wint_t); + int iswblank(wint_t); +-int iswcntrl(wint_t); + int iswdigit(wint_t); + int iswgraph(wint_t); + int iswlower(wint_t); +@@ -187,9 +184,6 @@ + int iswspace(wint_t); + int iswupper(wint_t); + int iswxdigit(wint_t); +-int iswctype(wint_t, wctype_t); +-wint_t towlower(wint_t); +-wint_t towupper(wint_t); + wctype_t wctype(const char *); + + #ifndef __cplusplus +diff --color -ru include/wctype.h include/wctype.h +--- musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wctype.h 2024-12-21 11:29:46.207537390 +1100 ++++ musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wctype.h 2024-12-21 12:07:48.030354351 +1100 +@@ -24,10 +24,7 @@ + + #undef iswdigit + +-int iswalnum(wint_t); +-int iswalpha(wint_t); + int iswblank(wint_t); +-int iswcntrl(wint_t); + int iswdigit(wint_t); + int iswgraph(wint_t); + int iswlower(wint_t); +@@ -36,10 +33,6 @@ + int iswspace(wint_t); + int iswupper(wint_t); + int iswxdigit(wint_t); +-int iswctype(wint_t, wctype_t); +-wint_t towctrans(wint_t, wctrans_t); +-wint_t towlower(wint_t); +-wint_t towupper(wint_t); + wctrans_t wctrans(const char *); + wctype_t wctype(const char *); + diff --git a/steps/musl-1.1.24/pass1.sh b/steps/musl-1.1.24/pass1.sh index 25639cfa..f9e9f8eb 100755 --- a/steps/musl-1.1.24/pass1.sh +++ b/steps/musl-1.1.24/pass1.sh @@ -5,6 +5,13 @@ src_prepare() { default + # meslibc is insufficient to regenerate src/ctype or src/iconv + # disable everything using a generated header + patch -Np1 -i ../../files/disable_ctype_headers.patch + rm src/ctype/iswalpha.c src/ctype/iswalnum.c src/ctype/iswctype.c \ + src/ctype/towctrans.c + rm include/iconv.h src/locale/iconv.c src/locale/iconv_close.c + # tcc does not support complex types rm -rf src/complex diff --git a/steps/musl-1.1.24/pass3.sh b/steps/musl-1.1.24/pass3.sh index 6f7c1ae2..d91b8b76 100755 --- a/steps/musl-1.1.24/pass3.sh +++ b/steps/musl-1.1.24/pass3.sh @@ -5,8 +5,23 @@ src_prepare() { default + # regenerate headers in src/ctype and src/iconv + cd ../musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85 + patch -Np1 -i ../../files/cut.patch + cd ctype + CC=tcc make + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.1.24/src/ctype/ + cd ../iconv + CC=tcc make + cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ + ../../musl-1.1.24/src/locale/ + cd ../../musl-1.1.24 + # tcc does not support complex types rm -rf src/complex + + # Configure fails without this + mkdir -p /dev } src_configure() { @@ -15,7 +30,7 @@ src_configure() { --disable-shared \ --prefix="${PREFIX}" \ --libdir="${LIBDIR}" \ - --includedir="${PREFIX}/include" + --includedir="${PREFIX}/include/" # configure script creates this file if test -f /dev/null; then @@ -24,9 +39,5 @@ src_configure() { } src_compile() { - make "${MAKEJOBS}" PREFIX="${PREFIX}" CROSS_COMPILE= CFLAGS="-DSYSCALL_NO_TLS" AS_CMD='as -o $@ $<' -} - -src_install() { - make PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" install + make "${MAKEJOBS}" CROSS_COMPILE= AR="tcc -ar" RANLIB=true CFLAGS="-DSYSCALL_NO_TLS" } diff --git a/steps/musl-1.1.24/pass4.sh b/steps/musl-1.1.24/pass4.sh new file mode 100755 index 00000000..905311db --- /dev/null +++ b/steps/musl-1.1.24/pass4.sh @@ -0,0 +1,42 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + # regenerate headers in src/ctype and src/iconv + cd ../musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/ctype + CC=tcc make + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.1.24/src/ctype/ + cd ../iconv + CC=tcc make + cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ + ../../musl-1.1.24/src/locale/ + cd ../../musl-1.1.24 + + # tcc does not support complex types + rm -rf src/complex +} + +src_configure() { + CC=tcc ./configure \ + --host=i386 \ + --disable-shared \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --includedir="${PREFIX}/include" + + # configure script creates this file + if test -f /dev/null; then + rm /dev/null + fi +} + +src_compile() { + make "${MAKEJOBS}" PREFIX="${PREFIX}" CROSS_COMPILE= CFLAGS="-DSYSCALL_NO_TLS" AS_CMD='as -o $@ $<' +} + +src_install() { + make PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" install +} diff --git a/steps/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch b/steps/musl-1.1.24/patches-pass4/avoid_set_thread_area.patch similarity index 100% rename from steps/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch rename to steps/musl-1.1.24/patches-pass4/avoid_set_thread_area.patch diff --git a/steps/musl-1.1.24/patches-pass3/avoid_sys_clone.patch b/steps/musl-1.1.24/patches-pass4/avoid_sys_clone.patch similarity index 100% rename from steps/musl-1.1.24/patches-pass3/avoid_sys_clone.patch rename to steps/musl-1.1.24/patches-pass4/avoid_sys_clone.patch diff --git a/steps/musl-1.1.24/patches-pass3/madvise_preserve_errno.patch b/steps/musl-1.1.24/patches-pass4/madvise_preserve_errno.patch similarity index 100% rename from steps/musl-1.1.24/patches-pass3/madvise_preserve_errno.patch rename to steps/musl-1.1.24/patches-pass4/madvise_preserve_errno.patch diff --git a/steps/musl-1.1.24/patches-pass3/set_thread_area.patch b/steps/musl-1.1.24/patches-pass4/set_thread_area.patch similarity index 100% rename from steps/musl-1.1.24/patches-pass3/set_thread_area.patch rename to steps/musl-1.1.24/patches-pass4/set_thread_area.patch diff --git a/steps/musl-1.1.24/patches-pass3/va_list.patch b/steps/musl-1.1.24/patches-pass4/va_list.patch similarity index 100% rename from steps/musl-1.1.24/patches-pass3/va_list.patch rename to steps/musl-1.1.24/patches-pass4/va_list.patch diff --git a/steps/musl-1.1.24/sources b/steps/musl-1.1.24/sources index 56231d1e..08bf3277 100644 --- a/steps/musl-1.1.24/sources +++ b/steps/musl-1.1.24/sources @@ -1 +1,2 @@ https://musl.libc.org/releases/musl-1.1.24.tar.gz 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 +https://github.com/richfelker/musl-chartable-tools/archive/44d780e03e78efcb3168ceab068170206dc92e85.tar.gz 952eae3ee6da3cbc5c29faa2ac728b882d5d43e744bca31daae98c66739ea121 From 73169a54f29d3e11c414ba46660707b0ad2a56aa Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 21 Dec 2024 16:25:11 +1100 Subject: [PATCH 3/4] Same regeneration for musl 1.2.4 --- steps/musl-1.2.4/pass1.sh | 15 +++++++++++++++ steps/musl-1.2.4/pass3.sh | 15 +++++++++++++++ .../patches-pass2/mkcodepage_return.patch | 1 + steps/musl-1.2.4/patches/mkcodepage_return.patch | 12 ++++++++++++ steps/musl-1.2.4/sources | 1 + 5 files changed, 44 insertions(+) create mode 120000 steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch create mode 100644 steps/musl-1.2.4/patches/mkcodepage_return.patch diff --git a/steps/musl-1.2.4/pass1.sh b/steps/musl-1.2.4/pass1.sh index d6de474a..e8106755 100755 --- a/steps/musl-1.2.4/pass1.sh +++ b/steps/musl-1.2.4/pass1.sh @@ -13,6 +13,21 @@ src_get() { fi } +src_prepare() { + default + + # regenerate headers in src/ctype and src/iconv + cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b + cd ctype + CC=gcc make + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/ + cd ../iconv + CC=gcc make + cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ + ../../musl-1.2.4/src/locale/ + cd ../../musl-1.2.4 +} + src_configure() { CC=gcc ./configure \ --host=i386-unknown-linux-musl \ diff --git a/steps/musl-1.2.4/pass3.sh b/steps/musl-1.2.4/pass3.sh index b3e42263..31d5d981 100755 --- a/steps/musl-1.2.4/pass3.sh +++ b/steps/musl-1.2.4/pass3.sh @@ -4,6 +4,21 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +src_prepare() { + default + + # regenerate headers in src/ctype and src/iconv + cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b + cd ctype + CC=gcc make + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/ + cd ../iconv + CC=gcc make + cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ + ../../musl-1.2.4/src/locale/ + cd ../../musl-1.2.4 +} + src_configure() { ./configure \ --host=i386-unknown-linux-musl \ diff --git a/steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch b/steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch new file mode 120000 index 00000000..79187c8d --- /dev/null +++ b/steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch @@ -0,0 +1 @@ +../patches/mkcodepage_return.patch \ No newline at end of file diff --git a/steps/musl-1.2.4/patches/mkcodepage_return.patch b/steps/musl-1.2.4/patches/mkcodepage_return.patch new file mode 100644 index 00000000..03804893 --- /dev/null +++ b/steps/musl-1.2.4/patches/mkcodepage_return.patch @@ -0,0 +1,12 @@ +Inexplicable problem, where mkcodepage returns 3 instead of 0 on some inputs. +Compilation error? + +--- musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b/iconv/mkcodepage.c 2024-12-21 15:32:02.441185726 +1100 ++++ musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b/iconv/mkcodepage.c 2024-12-21 15:31:52.860186494 +1100 +@@ -63,4 +63,6 @@ + } + } + fputs("\"\n\n", f); ++ ++ return 0; + } diff --git a/steps/musl-1.2.4/sources b/steps/musl-1.2.4/sources index 3c0a41b9..cbc5e9be 100644 --- a/steps/musl-1.2.4/sources +++ b/steps/musl-1.2.4/sources @@ -1 +1,2 @@ https://musl.libc.org/releases/musl-1.2.4.tar.gz 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 +https://github.com/richfelker/musl-chartable-tools/archive/78b213a868553b1154ee9627c96ff1f14a9a3b1b.tar.gz bb52d7c11b663c2d1c5957fd862758d1da7e65b53c0a8ecfb9110d02c04badb6 From 1cdb2fe74c163d9d59b4b3a26ea1ff0f9506e197 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 22 Dec 2024 14:50:59 +1100 Subject: [PATCH 4/4] Update musl to 1.2.5 --- parts.rst | 8 +- steps/SHA256SUMS.pkgs | 134 +++++++++--------- steps/manifest | 6 +- .../musl-1.2.4/files/__stack_chk_fail_local.c | 8 -- steps/musl-1.2.4/patches-pass2/.keep | 0 .../files/ld-musl-i386.path | 0 .../files/ld-musl-i386.path.license | 0 steps/{musl-1.2.4 => musl-1.2.5}/pass1.sh | 6 +- steps/{musl-1.2.4 => musl-1.2.5}/pass2.sh | 0 steps/{musl-1.2.4 => musl-1.2.5}/pass3.sh | 6 +- .../patches-pass2/mkcodepage_return.patch | 0 .../{musl-1.2.4 => musl-1.2.5}/patches-pass3 | 0 .../patches/avoid_set_thread_area.patch | 12 +- .../patches/avoid_sys_clone.patch | 4 +- .../patches/mkcodepage_return.patch | 5 + steps/{musl-1.2.4 => musl-1.2.5}/sources | 2 +- 16 files changed, 94 insertions(+), 97 deletions(-) delete mode 100644 steps/musl-1.2.4/files/__stack_chk_fail_local.c delete mode 100644 steps/musl-1.2.4/patches-pass2/.keep rename steps/{musl-1.2.4 => musl-1.2.5}/files/ld-musl-i386.path (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/files/ld-musl-i386.path.license (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/pass1.sh (89%) rename steps/{musl-1.2.4 => musl-1.2.5}/pass2.sh (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/pass3.sh (92%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches-pass2/mkcodepage_return.patch (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches-pass3 (100%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches/avoid_set_thread_area.patch (78%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches/avoid_sys_clone.patch (73%) rename steps/{musl-1.2.4 => musl-1.2.5}/patches/mkcodepage_return.patch (71%) rename steps/{musl-1.2.4 => musl-1.2.5}/sources (60%) diff --git a/parts.rst b/parts.rst index fb187b2b..310ee466 100644 --- a/parts.rst +++ b/parts.rst @@ -286,7 +286,7 @@ patch 2.5.9 ``patch`` is a very useful tool at this stage, allowing us to make significantly more complex edits, including just changes to lines. -gzip 1.2.4 +gzip 1.2.5 ========== ``gzip`` is the most common compression format used for software source @@ -732,7 +732,7 @@ findutils 4.2.33 GNU Find Utilities can be used to search for files. We are mainly interested in ``find`` and ``xargs`` that are often used in scripts. -musl 1.2.4 +musl 1.2.5 ========== GCC can build the latest as of the time of writing musl version. @@ -889,7 +889,7 @@ swap If enabled in ``bootstrap.cfg``, creates and activates a swap file under the name ``/swapfile``. -musl 1.2.4 +musl 1.2.5 ========== At this point, it is guaranteed that we are running on Linux with thread support, @@ -1183,7 +1183,7 @@ We use the `gnu-autogen-bootstrapping - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -extern void __stack_chk_fail(void); -void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); } diff --git a/steps/musl-1.2.4/patches-pass2/.keep b/steps/musl-1.2.4/patches-pass2/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/steps/musl-1.2.4/files/ld-musl-i386.path b/steps/musl-1.2.5/files/ld-musl-i386.path similarity index 100% rename from steps/musl-1.2.4/files/ld-musl-i386.path rename to steps/musl-1.2.5/files/ld-musl-i386.path diff --git a/steps/musl-1.2.4/files/ld-musl-i386.path.license b/steps/musl-1.2.5/files/ld-musl-i386.path.license similarity index 100% rename from steps/musl-1.2.4/files/ld-musl-i386.path.license rename to steps/musl-1.2.5/files/ld-musl-i386.path.license diff --git a/steps/musl-1.2.4/pass1.sh b/steps/musl-1.2.5/pass1.sh similarity index 89% rename from steps/musl-1.2.4/pass1.sh rename to steps/musl-1.2.5/pass1.sh index e8106755..88666b1e 100755 --- a/steps/musl-1.2.4/pass1.sh +++ b/steps/musl-1.2.5/pass1.sh @@ -20,12 +20,12 @@ src_prepare() { cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b cd ctype CC=gcc make - cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/ + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.5/src/ctype/ cd ../iconv CC=gcc make cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ - ../../musl-1.2.4/src/locale/ - cd ../../musl-1.2.4 + ../../musl-1.2.5/src/locale/ + cd ../../musl-1.2.5 } src_configure() { diff --git a/steps/musl-1.2.4/pass2.sh b/steps/musl-1.2.5/pass2.sh similarity index 100% rename from steps/musl-1.2.4/pass2.sh rename to steps/musl-1.2.5/pass2.sh diff --git a/steps/musl-1.2.4/pass3.sh b/steps/musl-1.2.5/pass3.sh similarity index 92% rename from steps/musl-1.2.4/pass3.sh rename to steps/musl-1.2.5/pass3.sh index 31d5d981..02866deb 100755 --- a/steps/musl-1.2.4/pass3.sh +++ b/steps/musl-1.2.5/pass3.sh @@ -11,12 +11,12 @@ src_prepare() { cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b cd ctype CC=gcc make - cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/ + cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.5/src/ctype/ cd ../iconv CC=gcc make cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \ - ../../musl-1.2.4/src/locale/ - cd ../../musl-1.2.4 + ../../musl-1.2.5/src/locale/ + cd ../../musl-1.2.5 } src_configure() { diff --git a/steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch b/steps/musl-1.2.5/patches-pass2/mkcodepage_return.patch similarity index 100% rename from steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch rename to steps/musl-1.2.5/patches-pass2/mkcodepage_return.patch diff --git a/steps/musl-1.2.4/patches-pass3 b/steps/musl-1.2.5/patches-pass3 similarity index 100% rename from steps/musl-1.2.4/patches-pass3 rename to steps/musl-1.2.5/patches-pass3 diff --git a/steps/musl-1.2.4/patches/avoid_set_thread_area.patch b/steps/musl-1.2.5/patches/avoid_set_thread_area.patch similarity index 78% rename from steps/musl-1.2.4/patches/avoid_set_thread_area.patch rename to steps/musl-1.2.5/patches/avoid_set_thread_area.patch index c5a51874..b79c301d 100644 --- a/steps/musl-1.2.4/patches/avoid_set_thread_area.patch +++ b/steps/musl-1.2.5/patches/avoid_set_thread_area.patch @@ -1,8 +1,8 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT diff -r -u musl-1.2.3.orig/arch/i386/pthread_arch.h musl-1.2.3/arch/i386/pthread_arch.h ---- musl-1.2.4/arch/i386/pthread_arch.h 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/arch/i386/pthread_arch.h 2023-04-07 12:07:07.929132587 +0000 +--- musl-1.2.5/arch/i386/pthread_arch.h 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/arch/i386/pthread_arch.h 2023-04-07 12:07:07.929132587 +0000 @@ -1,8 +1,7 @@ +extern uintptr_t g_pthread; static inline uintptr_t __get_tp() @@ -15,16 +15,16 @@ diff -r -u musl-1.2.3.orig/arch/i386/pthread_arch.h musl-1.2.3/arch/i386/pthread #define MC_PC gregs[REG_EIP] diff -r -u musl-1.2.3.orig/arch/i386/syscall_arch.h musl-1.2.3/arch/i386/syscall_arch.h ---- musl-1.2.4/arch/i386/syscall_arch.h 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/arch/i386/syscall_arch.h 2022-12-20 17:28:21.734839560 +0000 +--- musl-1.2.5/arch/i386/syscall_arch.h 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/arch/i386/syscall_arch.h 2022-12-20 17:28:21.734839560 +0000 @@ -1,3 +1,4 @@ +#define SYSCALL_NO_TLS 1 #define __SYSCALL_LL_E(x) \ ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \ ((union { long long ll; long l[2]; }){ .ll = x }).l[1] diff -r -u musl-1.2.3.orig/src/env/__init_tls.c musl-1.2.3/src/env/__init_tls.c ---- musl-1.2.4/src/env/__init_tls.c 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/src/env/__init_tls.c 2023-04-07 12:07:38.677133193 +0000 +--- musl-1.2.5/src/env/__init_tls.c 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/src/env/__init_tls.c 2023-04-07 12:07:38.677133193 +0000 @@ -10,20 +10,19 @@ #include "syscall.h" diff --git a/steps/musl-1.2.4/patches/avoid_sys_clone.patch b/steps/musl-1.2.5/patches/avoid_sys_clone.patch similarity index 73% rename from steps/musl-1.2.4/patches/avoid_sys_clone.patch rename to steps/musl-1.2.5/patches/avoid_sys_clone.patch index b3631254..246d2462 100644 --- a/steps/musl-1.2.4/patches/avoid_sys_clone.patch +++ b/steps/musl-1.2.5/patches/avoid_sys_clone.patch @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2023 Richard Masters # SPDX-License-Identifier: MIT ---- musl-1.2.4/src/process/posix_spawn.c 2022-04-07 17:12:40.000000000 +0000 -+++ musl-1.2.4/src/process/posix_spawn.c 2023-04-07 12:01:57.217126467 +0000 +--- musl-1.2.5/src/process/posix_spawn.c 2022-04-07 17:12:40.000000000 +0000 ++++ musl-1.2.5/src/process/posix_spawn.c 2023-04-07 12:01:57.217126467 +0000 @@ -190,8 +190,11 @@ goto fail; } diff --git a/steps/musl-1.2.4/patches/mkcodepage_return.patch b/steps/musl-1.2.5/patches/mkcodepage_return.patch similarity index 71% rename from steps/musl-1.2.4/patches/mkcodepage_return.patch rename to steps/musl-1.2.5/patches/mkcodepage_return.patch index 03804893..5547a4c3 100644 --- a/steps/musl-1.2.4/patches/mkcodepage_return.patch +++ b/steps/musl-1.2.5/patches/mkcodepage_return.patch @@ -1,3 +1,8 @@ +SPDX-FileCopyrightText: 2024 fosslinux + +SPDX-License-Identifier: MIT +(as per https://github.com/richfelker/musl-chartable-tools/issues/3) + Inexplicable problem, where mkcodepage returns 3 instead of 0 on some inputs. Compilation error? diff --git a/steps/musl-1.2.4/sources b/steps/musl-1.2.5/sources similarity index 60% rename from steps/musl-1.2.4/sources rename to steps/musl-1.2.5/sources index cbc5e9be..63edef8e 100644 --- a/steps/musl-1.2.4/sources +++ b/steps/musl-1.2.5/sources @@ -1,2 +1,2 @@ -https://musl.libc.org/releases/musl-1.2.4.tar.gz 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 +https://musl.libc.org/releases/musl-1.2.5.tar.gz a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4 https://github.com/richfelker/musl-chartable-tools/archive/78b213a868553b1154ee9627c96ff1f14a9a3b1b.tar.gz bb52d7c11b663c2d1c5957fd862758d1da7e65b53c0a8ecfb9110d02c04badb6