1039 files changed, 1023 insertions, 2229 deletions

diff --git a/debian/README.source b/debian/README.source
index e0377461cf88..b3d0b2dc2a81 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -189,6 +189,14 @@ into the templates:
 Normally, the arch-specific contents should be controlled by
 adjusting the corresponding defines file.
 
+Build-dependencies that relate to specific binary packages can be
+specified in a Build-Depends field in the template for that binary
+package.  gencontrol.py will append the value to the source package's
+Build-Depends-Arch or Build-Depends-Indep field, as appropriate.  It
+will also use the binary package's Architecture and Build-Profile as
+the architecture-qualification and/or restriction for each build-
+dependency that doesn't already have them.
+
 TODO:
 - Patches applied to the upstream source
 - How to define a flavour
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index f6e4b9a8e5a4..14e698799853 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -86,6 +86,62 @@ class Gencontrol(Base):
         # Prepare to generate debian/tests/control
         self.tests_control = None
 
+        self.installer_packages = {}
+
+        if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
+            if self.changelog[0].distribution == 'UNRELEASED':
+                import warnings
+                warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+            else:
+                raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+        elif self.config.merge('packages').get('installer', True):
+            # Add udebs using kernel-wedge
+            kw_env = os.environ.copy()
+            kw_env['KW_DEFCONFIG_DIR'] = 'debian/installer'
+            kw_env['KW_CONFIG_DIR'] = 'debian/installer'
+            kw_proc = subprocess.Popen(
+                ['kernel-wedge', 'gen-control', vars['abiname']],
+                stdout=subprocess.PIPE,
+                env=kw_env)
+            if not isinstance(kw_proc.stdout, io.IOBase):
+                udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False))
+            else:
+                udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout))
+            kw_proc.wait()
+            if kw_proc.returncode != 0:
+                raise RuntimeError('kernel-wedge exited with code %d' %
+                                   kw_proc.returncode)
+
+            # All architectures that have some installer udebs
+            arches = set()
+            for package in udeb_packages:
+                arches.update(package['Architecture'])
+
+            # Code-signing status for those architectures
+            # If we're going to build signed udebs later, don't actually
+            # generate udebs.  Just test that we *can* build, so we find
+            # configuration errors before building linux-signed.
+            build_signed = {}
+            for arch in arches:
+                build_signed[arch] = (self.config.merge('build', arch)
+                                      .get('signed-code', False))
+
+            for package in udeb_packages:
+                # kernel-wedge currently chokes on Build-Profiles so add it now
+                if any(build_signed[arch] for arch in package['Architecture']):
+                    assert all(build_signed[arch]
+                               for arch in package['Architecture'])
+                    # XXX This is a hack to exclude the udebs from
+                    # the package list while still being able to
+                    # convince debhelper and kernel-wedge to go
+                    # part way to building them.
+                    package['Build-Profiles'] = '<pkg.linux.udeb-unsigned-test-build>'
+                else:
+                    package['Build-Profiles'] = '<!stage1>'
+
+                for arch in package['Architecture']:
+                    self.installer_packages.setdefault(arch, []).append(package)
+
     def do_main_makefile(self, makefile, makeflags, extra):
         fs_enabled = [featureset
                       for featureset in self.config['base', ]['featuresets']
@@ -220,61 +276,20 @@ class Gencontrol(Base):
                      ["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
                       (arch, makeflags)])
 
-        if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
-            if self.changelog[0].distribution == 'UNRELEASED':
-                import warnings
-                warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
-            else:
-                raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
-        elif self.config.merge('packages').get('installer', True):
-            # Add udebs using kernel-wedge
-            installer_def_dir = 'debian/installer'
-            installer_arch_dir = os.path.join(installer_def_dir, arch)
-            if os.path.isdir(installer_arch_dir):
-                kw_env = os.environ.copy()
-                kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
-                kw_env['KW_CONFIG_DIR'] = installer_arch_dir
-                kw_proc = subprocess.Popen(
-                    ['kernel-wedge', 'gen-control', vars['abiname']],
-                    stdout=subprocess.PIPE,
-                    env=kw_env)
-                if not isinstance(kw_proc.stdout, io.IOBase):
-                    udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False))
-                else:
-                    udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout))
-                kw_proc.wait()
-                if kw_proc.returncode != 0:
-                    raise RuntimeError('kernel-wedge exited with code %d' %
-                                       kw_proc.returncode)
-
-                # If we're going to build signed udebs later, don't actually
-                # generate udebs.  Just test that we *can* build, so we find
-                # configuration errors before building linux-signed.
+        udeb_packages = self.installer_packages.get(arch, [])
+        if udeb_packages:
+            merge_packages(packages, udeb_packages, arch)
 
-                # kernel-wedge currently chokes on Build-Profiles so add it now
-                for package in udeb_packages:
-                    if build_signed:
-                        # XXX This is a hack to exclude the udebs from
-                        # the package list while still being able to
-                        # convince debhelper and kernel-wedge to go
-                        # part way to building them.
-                        package['Build-Profiles'] = '<pkg.linux.udeb-unsigned-test-build>'
-                    else:
-                        package['Build-Profiles'] = '<!stage1>'
-
-                merge_packages(packages, udeb_packages, arch)
-
-                # These packages must be built after the per-flavour/
-                # per-featureset packages.  Also, this won't work
-                # correctly with an empty package list.
-                if udeb_packages:
-                    makefile.add(
-                        'binary-arch_%s' % arch,
-                        cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
-                              "PACKAGE_NAMES='%s' UDEB_UNSIGNED_TEST_BUILD=%s" %
-                              (arch, makeflags,
-                               ' '.join(p['Package'] for p in udeb_packages),
-                               build_signed)])
+            # These packages must be built after the per-flavour/
+            # per-featureset packages.  Also, this won't work
+            # correctly with an empty package list.
+            makefile.add(
+                'binary-arch_%s' % arch,
+                cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
+                      "PACKAGE_NAMES='%s' UDEB_UNSIGNED_TEST_BUILD=%s" %
+                      (arch, makeflags,
+                       ' '.join(p['Package'] for p in udeb_packages),
+                       build_signed)])
 
         # This also needs to be built after the per-flavour/per-featureset
         # packages.
diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py
index 06a542944228..82bf7423e404 100755
--- a/debian/bin/gencontrol_signed.py
+++ b/debian/bin/gencontrol_signed.py
@@ -28,6 +28,7 @@ class Gencontrol(Base):
 
         self.abiname = config_entry['abiname']
         self.vars = {
+            'template': 'linux-image-%s-signed-template' % arch,
             'upstreamversion': self.version.linux_upstream,
             'version': self.version.linux_version,
             'source_upstream': self.version.upstream,
@@ -37,7 +38,9 @@ class Gencontrol(Base):
             'arch': arch,
         }
 
-        self.template_top_dir = ('debian/linux-image-%(arch)s-signed-template/usr/share/code-signing/linux-image-%(arch)s-signed-template' %
+        self.package_dir = 'debian/%(template)s' % self.vars
+        self.template_top_dir = (self.package_dir +
+                                 '/usr/share/code-signing/%(template)s' %
                                  self.vars)
         self.template_debian_dir = self.template_top_dir + '/source-template/debian'
         os.makedirs(self.template_debian_dir, exist_ok=True)
@@ -54,6 +57,37 @@ class Gencontrol(Base):
             '-v%(imagebinaryversion)s -DBuilt-Using="linux (= %(imagesourceversion)s)"' % vars)
         makeflags['PACKAGE_VERSION'] = vars['imagebinaryversion']
 
+        self.installer_packages = {}
+
+        if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
+            if self.changelog[0].distribution == 'UNRELEASED':
+                import warnings
+                warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+            else:
+                raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
+        elif self.config.merge('packages').get('installer', True):
+            # Add udebs using kernel-wedge
+            kw_env = os.environ.copy()
+            kw_env['KW_DEFCONFIG_DIR'] = 'debian/installer'
+            kw_env['KW_CONFIG_DIR'] = 'debian/installer'
+            kw_proc = subprocess.Popen(
+                ['kernel-wedge', 'gen-control', vars['abiname']],
+                stdout=subprocess.PIPE,
+                env=kw_env)
+            if not isinstance(kw_proc.stdout, io.IOBase):
+                udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False))
+            else:
+                udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout))
+            kw_proc.wait()
+            if kw_proc.returncode != 0:
+                raise RuntimeError('kernel-wedge exited with code %d' %
+                                   kw_proc.returncode)
+
+            for package in udeb_packages:
+                for arch in package['Architecture']:
+                    if self.config.merge('build', arch).get('signed-code', False):
+                        self.installer_packages.setdefault(arch, []).append(package)
+
     def do_main_packages(self, packages, vars, makeflags, extra):
         # Assume that arch:all packages do not get binNMU'd
         packages['source']['Build-Depends'].append(
@@ -77,46 +111,20 @@ class Gencontrol(Base):
             self.config['version', ]['abiname_base'] + abiname_part
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
-        if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
-            if self.changelog[0].distribution == 'UNRELEASED':
-                import warnings
-                warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
-            else:
-                raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
-        elif (self.config.merge('packages').get('installer', True) and
-              self.config.merge('build', arch).get('signed-code', False)):
-            # Add udebs using kernel-wedge
-            installer_def_dir = 'debian/installer'
-            installer_arch_dir = os.path.join(installer_def_dir, arch)
-            if os.path.isdir(installer_arch_dir):
-                kw_env = os.environ.copy()
-                kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
-                kw_env['KW_CONFIG_DIR'] = installer_arch_dir
-                kw_proc = subprocess.Popen(
-                    ['kernel-wedge', 'gen-control', vars['abiname']],
-                    stdout=subprocess.PIPE,
-                    env=kw_env)
-                if not isinstance(kw_proc.stdout, io.IOBase):
-                    udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False))
-                else:
-                    udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout))
-                kw_proc.wait()
-                if kw_proc.returncode != 0:
-                    raise RuntimeError('kernel-wedge exited with code %d' %
-                                       kw_proc.returncode)
-
-                merge_packages(packages, udeb_packages, arch)
-
-                # These packages must be built after the per-flavour/
-                # per-featureset packages.  Also, this won't work
-                # correctly with an empty package list.
-                if udeb_packages:
-                    makefile.add(
-                        'binary-arch_%s' % arch,
-                        cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
-                              "PACKAGE_NAMES='%s'" %
-                              (arch, makeflags,
-                               ' '.join(p['Package'] for p in udeb_packages))])
+        udeb_packages = self.installer_packages.get(arch, [])
+        if udeb_packages:
+            merge_packages(packages, udeb_packages, arch)
+
+            # These packages must be built after the per-flavour/
+            # per-featureset packages.  Also, this won't work
+            # correctly with an empty package list.
+            if udeb_packages:
+                makefile.add(
+                    'binary-arch_%s' % arch,
+                    cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
+                          "PACKAGE_NAMES='%s'" %
+                          (arch, makeflags,
+                           ' '.join(p['Package'] for p in udeb_packages))])
 
     def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
         super(Gencontrol, self).do_flavour_setup(vars, makeflags, arch, featureset, flavour, extra)
@@ -175,11 +183,21 @@ class Gencontrol(Base):
             cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-signed PACKAGE_NAME='%s' %s" % (i['Package'], makeflags)]
         makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_binary_arch)
 
-        for name in ['postinst', 'postrm', 'preinst', 'prerm']:
-            self._substitute_file('image.%s' % name, vars,
-                                  self.template_debian_dir +
-                                  '/linux-image-%s%s.%s' %
-                                  (vars['abiname'], vars['localversion'], name))
+        os.makedirs(self.package_dir + '/usr/share/lintian/overrides', 0o755,
+                    exist_ok=True)
+        with open(self.package_dir +
+                  '/usr/share/lintian/overrides/%(template)s' % self.vars,
+                  'a') as lintian_overrides:
+            for script_base in ['postinst', 'postrm', 'preinst', 'prerm']:
+                script_name = (self.template_debian_dir +
+                               '/linux-image-%s%s.%s' %
+                               (vars['abiname'], vars['localversion'],
+                                script_base))
+                self._substitute_file('image.%s' % script_base, vars, script_name)
+                lintian_overrides.write('%s: script-not-executable %s\n' %
+                                        (self.vars['template'],
+                                         os.path.relpath(script_name,
+                                                         self.package_dir)))
 
     def write(self, packages, makefile):
         self.write_changelog()
diff --git a/debian/changelog b/debian/changelog
index 841cc44cf7fa..c0af045c844e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,89 @@
+linux (4.19~rc6-1~exp1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate
+
+  [ Ben Hutchings ]
+  * [ppc64el] udeb: Fix relative #include filenames in kernel-image module
+    list (really fixes FTBFS?)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Thu, 20 Sep 2018 02:40:54 +0100
+
+linux (4.19~rc4-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate
+
+  [ Ben Hutchings ]
+  * debian/control: Add arch-qualification to build-dependencies for linux-perf
+    (Closes: #908519)
+  * debian/control: Build-depend on libunwind-dev instead of libunwind8-dev
+  * [hppa,mips*,powerpc*,sh4] debian/control: Build-depend on libunwind-dev for
+    linux-perf
+  * debian/control: Build-depend on libnuma-dev for linux-perf on all arches
+  * debian/control: Remove "cross" from profiles for build-dep on libssl-dev
+  * [mips64*] debian/control: Build-depend on gcc-multilib for linux-perf
+  * debian/lib/python: Use raw strings for all regexes
+  * debian/control: Fix restrictions for build-deps on asciidoctor and
+    patchutils
+  * Add support for specifying build-dependencies in binary package templates
+  * debian/templates: Move various build-dependencies to binary package
+    templates
+  * linux-perf: Fix generation of Perl and Python interpreter dependencies
+    (Closes: #908547)
+  * lockdep, lib{cpupower,lockdep}-dev: Remove bogus deps on ${shlibs:Depends}
+  * debian/rules.d/tools/power/linux-cpupower: Add "+" to recursive make
+    commands
+  * tools: x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2
+  * tools: turbostat: Add checks for failure of fgets() and fscanf()
+  * debian/control: Build-depend on texlive-latex-{base,extra}, dvipng for
+    linux-doc
+  * debian/rules{,.real}: Use /usr/share/dpkg/architecture.mk
+  * debian/signing_templates/rules: Use /usr/share/dpkg/architecture.mk
+  * linux-image-*-signed-template: Add ${misc:Depends} to Depends
+  * linux-image-*-signed-template: Include changelog and copyright files
+  * linux-image-*-signed-template: Depend on dpkg-dev
+  * linux-image-*-signed-template: Override lintian warnings about non-
+    executable scripts
+  * [ia64] udeb: Fix priority of sn-modules
+  * Revert "Revert "net: increase fragment memory usage limits"", as 4.19
+    includes a better fix for CVE-2018-5391
+  * debian/patches: Add Forwarded fields to several patches
+  * [ppc64el] udeb: Fix relative #include filenames in module lists (fixes
+    FTBFS)
+  * [ppc64] udeb: Revert accidental change to nic-pcmcia-modules dependencies
+    (fixes FTBFS)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 18 Sep 2018 15:52:02 +0100
+
+linux (4.19~rc3-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate
+
+  [ Ben Hutchings ]
+  * [s390x] linux-image: Install compressed kernel image (fixes FTBFS)
+  * [powerpc*] boot: Fix missing crc32poly.h when building with KERNEL_XZ
+    (fixes FTBFS)
+  * [x86] boot: Fix EFI stub alignment
+  * wireless: Update "wireless: Disable regulatory.db direct loading" for
+    4.19-rc3
+  * aufs: Update support patchset to aufs4.x-rcN 20180910
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 10 Sep 2018 20:13:55 +0100
+
+linux (4.19~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate
+
+  [ Ben Hutchings ]
+  * aufs: Disable until it is updated for Linux 4.19
+  * debian/rules.d: Update for move of bin2c back up to scripts
+  * locking/lockdep: Delete unnecesary #include (fixes liblockdep build)
+  * [hppa] debian/control: Simplify build-dependencies for 64-bit toolchain
+  * Compile with gcc-8 on all architectures
+  * udeb: Merge configuration directories and files across architectures
+  * [alpha,hppa] udeb: Remove incorrect dependency overrides
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 03 Sep 2018 21:34:41 +0100
+
 linux (4.18.10-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64
index 34b16d1b4fdc..ddde0782a249 100644
--- a/debian/config/amd64/config.cloud-amd64
+++ b/debian/config/amd64/config.cloud-amd64
@@ -596,7 +596,7 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 ##
 ## file: drivers/net/ethernet/cadence/Kconfig
 ##
-# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
 
 ##
 ## file: drivers/net/ethernet/cavium/Kconfig
@@ -688,7 +688,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 ##
 ## file: drivers/net/ethernet/neterion/Kconfig
 ##
-# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_NETERION is not set
 
 ##
 ## file: drivers/net/ethernet/netronome/Kconfig
@@ -708,7 +708,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 ##
 ## file: drivers/net/ethernet/packetengines/Kconfig
 ##
-# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
 
 ##
 ## file: drivers/net/ethernet/qlogic/Kconfig
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 186acf383afd..1f8a0ad9cdbf 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -7,6 +7,7 @@ kernel-arch: x86
 [build]
 debug-info: true
 image-file: arch/x86/boot/bzImage
+signed-code: true
 vdso: true
 
 [image]
@@ -15,8 +16,8 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-gcc-7: gcc-7 (>= 7.2.0-20~) <!stage1 !cross>, gcc-7-x86-64-linux-gnu (>= 7.2.0-20~) <!stage1 cross>
-headers%gcc-7: linux-compiler-gcc-7-x86 (>= 4.14.17-1~)
+gcc-8: gcc-8 (>= 8-20180123-1~) <!stage1 !cross>, gcc-8-x86-64-linux-gnu (>= 8-20180123-1~) <!stage1 cross>
+headers%gcc-8: linux-compiler-gcc-8-x86
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 159f0af019c8..6df193266fc7 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -121,7 +121,6 @@ CONFIG_TEGRA_ACONNECT=y
 CONFIG_HW_RANDOM_BCM2835=m
 # CONFIG_HW_RANDOM_OMAP is not set
 CONFIG_HW_RANDOM_HISI=m
-CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_CAVIUM=m
@@ -180,6 +179,7 @@ CONFIG_ARM_CPUIDLE=y
 ##
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 
 ##
@@ -431,8 +431,6 @@ CONFIG_TEGRA_MC=y
 ##
 CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_MFD_HI655X_PMIC=m
 CONFIG_MFD_MAX77620=y
 CONFIG_MFD_QCOM_RPM=m
@@ -783,6 +781,8 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
 ## file: drivers/platform/chrome/Kconfig
 ##
 CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 
 ##
diff --git a/debian/config/arm64/defines b/debian/config/arm64/defines
index 07c1e1ed733f..bfbbc4f7e333 100644
--- a/debian/config/arm64/defines
+++ b/debian/config/arm64/defines
@@ -7,6 +7,7 @@ featuresets:
 [build]
 debug-info: true
 image-file: arch/arm64/boot/Image
+signed-code: true
 vdso: true
 
 [image]
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 92f20c2f2235..86e6277de82a 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -734,10 +734,10 @@ CONFIG_NLS=m
 # CONFIG_MEMCG is not set
 # CONFIG_CFS_BANDWIDTH is not set
 # CONFIG_CGROUP_BPF is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 ## choice: Compiler optimization level
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 ## end choice
-# CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_USERFAULTFD is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index fa617f46a1ab..04e18f98bccd 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -12,7 +12,7 @@ uncompressed-image-file: arch/arm/boot/Image
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-7: linux-compiler-gcc-7-arm
+headers%gcc-8: linux-compiler-gcc-8-arm
 
 [marvell_description]
 hardware: Marvell Kirkwood/Orion
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 996f9fc8ef5d..ec197e193d1f 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -612,7 +612,6 @@ CONFIG_MFD_AS3722=y
 CONFIG_MFD_AC100=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_MC13XXX_SPI=m
@@ -945,6 +944,11 @@ CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_WM8850=y
 
 ##
+## file: drivers/platform/chrome/Kconfig
+##
+CONFIG_CROS_EC_SPI=m
+
+##
 ## file: drivers/power/avs/Kconfig
 ##
 CONFIG_POWER_AVS=y
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 30696f44ede4..d134eb51af4f 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -12,7 +12,7 @@ vdso: true
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-7: linux-compiler-gcc-7-arm
+headers%gcc-8: linux-compiler-gcc-8-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
diff --git a/debian/config/config b/debian/config/config
index dd08a454bfdc..790c62c66c24 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5,8 +5,6 @@ CONFIG_OPROFILE=m
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-#. Until we work out how to package them
-# CONFIG_GCC_PLUGINS is not set
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_VMAP_STACK=y
@@ -1864,6 +1862,7 @@ CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_S921=m
+CONFIG_DVB_TC90522=m
 CONFIG_DVB_PLL=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6405=m
@@ -2269,7 +2268,6 @@ CONFIG_DVB_USB_PCTV452E=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_USB_CINERGY_T2=m
 CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 
@@ -2907,12 +2905,12 @@ CONFIG_CAN_SOFTING_CS=m
 ##
 ## file: drivers/net/can/usb/Kconfig
 ##
+CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_8DEV_USB=m
 
 ##
 ## file: drivers/net/dsa/Kconfig
@@ -3021,7 +3019,7 @@ CONFIG_BNA=m
 ##
 ## file: drivers/net/ethernet/cadence/Kconfig
 ##
-CONFIG_NET_CADENCE=y
+CONFIG_NET_VENDOR_CADENCE=y
 # CONFIG_MACB is not set
 
 ##
@@ -3198,7 +3196,7 @@ CONFIG_NS83820=m
 ##
 ## file: drivers/net/ethernet/neterion/Kconfig
 ##
-CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_NETERION=y
 CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
@@ -3217,7 +3215,7 @@ CONFIG_NET_VENDOR_OKI=y
 ##
 ## file: drivers/net/ethernet/packetengines/Kconfig
 ##
-CONFIG_NET_PACKET_ENGINE=y
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 
@@ -4070,7 +4068,7 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_WM831X_POWER=m
 CONFIG_WM8350_POWER=m
 # CONFIG_TEST_POWER is not set
-# CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_DS2760=m
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
@@ -4451,8 +4449,6 @@ CONFIG_SPI_SPIDEV=y
 CONFIG_SSB=m
 CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_SSB_HOST_SOC is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_DRIVER_GPIO is not set
 
 ##
@@ -4544,11 +4540,6 @@ CONFIG_ASHMEM=m
 # CONFIG_AD9834 is not set
 
 ##
-## file: drivers/staging/iio/gyro/Kconfig
-##
-# CONFIG_ADIS16060 is not set
-
-##
 ## file: drivers/staging/iio/impedance-analyzer/Kconfig
 ##
 # CONFIG_AD5933 is not set
@@ -4633,11 +4624,6 @@ CONFIG_R8712U=m
 # CONFIG_RTS5208 is not set
 
 ##
-## file: drivers/staging/skein/Kconfig
-##
-# CONFIG_CRYPTO_SKEIN is not set
-
-##
 ## file: drivers/staging/sm750fb/Kconfig
 ##
 # CONFIG_FB_SM750 is not set
@@ -5269,7 +5255,6 @@ CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
 CONFIG_W1_SLAVE_DS2438=m
-CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
@@ -5410,7 +5395,6 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 ## file: fs/cifs/Kconfig
 ##
 CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
@@ -5545,7 +5529,6 @@ CONFIG_HFS_FS=m
 ## file: fs/hfsplus/Kconfig
 ##
 CONFIG_HFSPLUS_FS=m
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
 
 ##
 ## file: fs/hpfs/Kconfig
@@ -5899,6 +5882,7 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
@@ -5928,7 +5912,6 @@ CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
-CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_BPF_SYSCALL=y
@@ -6092,7 +6075,6 @@ CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
@@ -6531,7 +6513,6 @@ CONFIG_TCP_MD5SIG=y
 ##
 ## file: net/ipv4/netfilter/Kconfig
 ##
-CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
@@ -6600,7 +6581,6 @@ CONFIG_IPV6_SEG6_HMAC=y
 ##
 ## file: net/ipv6/netfilter/Kconfig
 ##
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
@@ -7100,6 +7080,12 @@ CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_SAMPLES is not set
 
 ##
+## file: scripts/gcc-plugins/Kconfig
+##
+#. Until we work out how to package them
+# CONFIG_GCC_PLUGINS is not set
+
+##
 ## file: security/Kconfig
 ##
 CONFIG_SECURITY_DMESG_RESTRICT=y
diff --git a/debian/config/defines b/debian/config/defines
index 213b38705b8b..e5f7a77f596b 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,5 +1,5 @@
 [abi]
-abiname: 2
+abiname: trunk
 ignore-changes:
  __cpuhp_*
  __xive_vm_h_*
@@ -111,7 +111,7 @@ arches:
  sparc
  sparc64
  x32
-compiler: gcc-7
+compiler: gcc-8
 featuresets:
  none
  rt
@@ -122,7 +122,7 @@ debug-info: true
 signed-code: false
 
 [featureset-rt_base]
-enabled: true
+enabled: false
 
 [description]
 part-long-up: This kernel is not suitable for SMP (multi-processor,
@@ -134,7 +134,7 @@ recommends: apparmor
 
 [relations]
 # compilers
-gcc-7: gcc-7 <!stage1 !cross>, gcc-7-@gnu-type-package@ <!stage1 cross>
+gcc-8: gcc-8 <!stage1 !cross>, gcc-8-@gnu-type-package@ <!stage1 cross>
 
 # initramfs-generators
 initramfs-fallback: linux-initramfs-tool
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index dc8d0a886491..3ba6500e2d78 100644
--- a/debian/config/hppa/defines
+++ b/debian/config/hppa/defines
@@ -28,5 +28,5 @@ hardware: multiprocessor 64-bit PA-RISC
 hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM
 
 [relations]
-gcc-7: gcc-7 <!stage1 !cross>, binutils-hppa64-linux-gnu <!stage1 !cross>, gcc-7-hppa64-linux-gnu <!stage1 !cross>, gcc-7-hppa-linux-gnu <!stage1 cross>, binutils-hppa64-linux-gnu <!stage1 cross>, gcc-7-hppa64-linux-gnu <!stage1 cross>
+gcc-8: gcc-8 <!stage1 !cross>, gcc-8-hppa-linux-gnu <!stage1 cross>, binutils-hppa64-linux-gnu <!stage1>, gcc-8-hppa64-linux-gnu <!stage1>
 
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index e4b38f6e753d..b737b2030e3a 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -6,6 +6,7 @@ kernel-arch: x86
 
 [build]
 image-file: arch/x86/boot/bzImage
+signed-code: true
 vdso: true
 
 [description]
@@ -20,8 +21,8 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-gcc-7: gcc-7 (>= 7.2.0-20~) <!stage1 !cross>, gcc-7-i686-linux-gnu (>= 7.2.0-20~) <!stage1 cross>
-headers%gcc-7: linux-compiler-gcc-7-x86 (>= 4.14.17-1~)
+gcc-8: gcc-8 (>= 8-20180123-1~) <!stage1 !cross>, gcc-8-x86-64-linux-gnu (>= 8-20180123-1~) <!stage1 cross>
+headers%gcc-8: linux-compiler-gcc-8-x86
 
 [686_description]
 hardware: older PCs
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 3001a7b9477c..f010b4ee276c 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -512,11 +512,6 @@ CONFIG_DRM_AMD_ACP=y
 CONFIG_HSA_AMD=m
 
 ##
-## file: drivers/gpu/drm/amd/display/Kconfig
-##
-CONFIG_DRM_AMD_DC_DCN1_0=y
-
-##
 ## file: drivers/gpu/drm/ast/Kconfig
 ##
 CONFIG_DRM_AST=m
@@ -1518,7 +1513,6 @@ CONFIG_COMEDI_MISC_DRIVERS=y
 CONFIG_COMEDI_BOND=m
 CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SSV_DNP=m
 # CONFIG_COMEDI_ISA_DRIVERS is not set
 CONFIG_COMEDI_II_PCI20KC=m
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 8840b201ad77..9c5e78a38fae 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -311,8 +311,8 @@ CONFIG_ADB=y
 CONFIG_ADB_MACII=y
 #. switched on for the benefit of IIfx, Q900, Q950
 CONFIG_ADB_IOP=y
-CONFIG_ADB_PMU68K=y
 CONFIG_ADB_CUDA=y
+CONFIG_ADB_PMU=y
 CONFIG_INPUT_ADBHID=y
 CONFIG_MAC_EMUMOUSEBTN=m
 
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 47de624026c2..84ee6d0b459a 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -4,7 +4,7 @@ flavours:
 kernel-arch: s390
 
 [build]
-image-file: arch/s390/boot/image
+image-file: arch/s390/boot/bzImage
 vdso: true
 
 [image]
@@ -12,7 +12,7 @@ bootloaders: s390-tools
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-7: linux-compiler-gcc-7-s390
+headers%gcc-8: linux-compiler-gcc-8-s390
 
 [s390x_build]
 debug-info: true
diff --git a/debian/installer/alpha/kernel-versions b/debian/installer/alpha/kernel-versions
deleted file mode 100644
index 1a479fb203c4..000000000000
--- a/debian/installer/alpha/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour            installedname suffix build-depends
-alpha  -       alpha-generic      -             y      -
diff --git a/debian/installer/alpha/package-list b/debian/installer/alpha/package-list
deleted file mode 100644
index d33320790244..000000000000
--- a/debian/installer/alpha/package-list
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-
-Package: usb-storage-modules
-Depends: kernel-image, scsi-modules, usb-modules
-
-Package: pata-modules
-Depends: kernel-image, ata-modules, scsi-core-modules
-
-Package: fb-modules
-Depends: kernel-image, i2c-modules
-
-Package: srm-modules
-Depends: kernel-image
-Priority: standard
-Description: SRM modules
- This package contains the srm_env module which provides access to the SRM
- environment.
diff --git a/debian/installer/amd64/TODO b/debian/installer/amd64/TODO
deleted file mode 100644
index d02dd6c7dab3..000000000000
--- a/debian/installer/amd64/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-* The 2.6 kernel is missing a lot of modules, need to get a list of all
-  modules included in the udebs, and compare vs. the full module list and
-  add missing stuff.
diff --git a/debian/installer/amd64/kernel-versions b/debian/installer/amd64/kernel-versions
deleted file mode 100644
index 1700a9426c1b..000000000000
--- a/debian/installer/amd64/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour installedname suffix build-depends
-amd64  -       amd64   -             -      -
diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list
deleted file mode 100644
index e55a71031af9..000000000000
--- a/debian/installer/amd64/package-list
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: fat-modules
-Priority: standard
-
-Package: scsi-modules
-Depends: kernel-image, scsi-core-modules, cdrom-core-modules, core-modules, ata-modules
-
-Package: kernel-image
-Provides: zlib-modules
diff --git a/debian/installer/arm64/kernel-versions b/debian/installer/arm64/kernel-versions
deleted file mode 100644
index 11d7399544a8..000000000000
--- a/debian/installer/arm64/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour installedname suffix build-depends
-arm64  -       arm64   -             -      -
diff --git a/debian/installer/arm64/package-list b/debian/installer/arm64/package-list
deleted file mode 100644
index 22daaa6cc167..000000000000
--- a/debian/installer/arm64/package-list
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: kernel-image
-Provides: zlib-modules
diff --git a/debian/installer/armel/kernel-versions b/debian/installer/armel/kernel-versions
deleted file mode 100644
index 49eb64629e7d..000000000000
--- a/debian/installer/armel/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour   installedname suffix build-depends
-armel  -       marvell   -             y      -
diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list
deleted file mode 100644
index 9c8aabcdf46b..000000000000
--- a/debian/installer/armel/package-list
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides_marvell: rtc-modules
-Provides_versatile: rtc-modules
-
-Package: fb-modules
-Depends: kernel-image, usb-modules
-
-Package: jffs2-modules
-Depends: kernel-image, zlib-modules, compress-modules, mtd-modules
diff --git a/debian/installer/armhf/kernel-versions b/debian/installer/armhf/kernel-versions
deleted file mode 100644
index c73dcc7a47ca..000000000000
--- a/debian/installer/armhf/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour  installedname suffix build-depends
-armhf  -       armmp    -             -      -
diff --git a/debian/installer/armhf/package-list b/debian/installer/armhf/package-list
deleted file mode 100644
index bc7a587d1e85..000000000000
--- a/debian/installer/armhf/package-list
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-
-Package: pata-modules
-Priority: optional
diff --git a/debian/installer/hppa/kernel-versions b/debian/installer/hppa/kernel-versions
deleted file mode 100644
index e59e12c0a7a1..000000000000
--- a/debian/installer/hppa/kernel-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# arch version flavour      installedname suffix build-depends
-hppa   -       parisc       -             y      -
-hppa   -       parisc64-smp -             y      -
diff --git a/debian/installer/hppa/package-list b/debian/installer/hppa/package-list
deleted file mode 100644
index ef7512943f09..000000000000
--- a/debian/installer/hppa/package-list
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides_parisc64-smp: i2c-modules
-
-Package: usb-storage-modules
-Depends: kernel-image, scsi-modules, usb-modules
-
-Package: pata-modules
-Depends: kernel-image, ata-modules, scsi-core-modules
-
-Package: fb-modules
-Depends: kernel-image
-Priority: standard
diff --git a/debian/installer/i386/kernel-versions b/debian/installer/i386/kernel-versions
deleted file mode 100644
index c08de1444293..000000000000
--- a/debian/installer/i386/kernel-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# arch version flavour installedname suffix build-depends
-i386   -       686     -             -      -
-i386   -       686-pae -             -      -
diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list
deleted file mode 100644
index b92d69595361..000000000000
--- a/debian/installer/i386/package-list
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: kernel-image
-Provides: rtc-modules, zlib-modules
-
-Package: fat-modules
-Priority: standard
-
-Package: fb-modules
-Depends: kernel-image, i2c-modules
diff --git a/debian/installer/ia64/TODO b/debian/installer/ia64/TODO
deleted file mode 100644
index d02dd6c7dab3..000000000000
--- a/debian/installer/ia64/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-* The 2.6 kernel is missing a lot of modules, need to get a list of all
-  modules included in the udebs, and compare vs. the full module list and
-  add missing stuff.
diff --git a/debian/installer/ia64/kernel-versions b/debian/installer/ia64/kernel-versions
deleted file mode 100644
index 24043ff95cb5..000000000000
--- a/debian/installer/ia64/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour installedname suffix build-depends
-ia64   -       itanium -             -      -
diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list
deleted file mode 100644
index 3c34246cb2c6..000000000000
--- a/debian/installer/ia64/package-list
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: fat-modules
-Priority: standard
-
-Package: ide-core-modules
-Depends: kernel-image
-Priority: standard
-Description: IDE support
- This package contains core IDE support for the kernel.
-
-Package: ide-modules
-Depends: kernel-image, ide-core-modules, sn-modules
-Priority: standard
-Description: IDE drivers
- This package contains IDE drivers for the kernel.
-
-Package: cdrom-core-modules
-Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules
-
-Package: serial-modules
-Depends: kernel-image, pcmcia-modules, sn-modules
-
-Package: sn-modules
-Depends: kernel-image
-Priority: extra
-Description: SN modules
- This package contains SN modules for Altix systems
-
-Package: kernel-image
-Provides: efi-modules, zlib-modules
diff --git a/debian/installer/kernel-versions b/debian/installer/kernel-versions
new file mode 100644
index 000000000000..5f64b533e2cb
--- /dev/null
+++ b/debian/installer/kernel-versions
@@ -0,0 +1,34 @@
+# arch     version flavour       installedname suffix build-depends
+alpha      -       alpha-generic -             y      -
+amd64      -       amd64         -             -      -
+arm64      -       arm64         -             -      -
+armel      -       marvell       -             y      -
+armhf      -       armmp         -             -      -
+hppa       -       parisc        -             y      -
+hppa       -       parisc64-smp  -             y      -
+i386       -       686           -             -      -
+i386       -       686-pae       -             -      -
+ia64       -       itanium       -             -      -
+m68k       -       m68k          -             y      -
+mips       -       4kc-malta     -             y      -
+mips       -       octeon        -             y      -
+mips64     -       5kc-malta     -             y      -
+mips64     -       octeon        -             y      -
+mips64el   -       5kc-malta     -             y      -
+mips64el   -       loongson-3    -             y      -
+mips64el   -       octeon        -             y      -
+mips64r6   -       mips64r6      -             y      -
+mips64r6el -       mips64r6el    -             y      -
+mipsel     -       4kc-malta     -             y      -
+mipsel     -       loongson-3    -             y      -
+mipsel     -       octeon        -             y      -
+mipsr6     -       mips32r6      -             y      -
+mipsr6el   -       mips32r6el    -             y      -
+powerpc    -       powerpc       -             -      -
+powerpc    -       powerpc64     -             -      -
+ppc64      -       powerpc64     -             -      -
+ppc64el    -       powerpc64le   -             -      -
+s390x      -       s390x         -             -      -
+sh4        -       sh7751r       -             y      -
+sh4        -       sh7785lcr     -             y      -
+sparc64    -       sparc64       -             y      -
diff --git a/debian/installer/m68k/kernel-versions b/debian/installer/m68k/kernel-versions
deleted file mode 100644
index ec5f9d3c4719..000000000000
--- a/debian/installer/m68k/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour installedname suffix build-depends
-m68k   -       m68k    -             y      -
diff --git a/debian/installer/m68k/package-list b/debian/installer/m68k/package-list
deleted file mode 100644
index fab89fd0c96e..000000000000
--- a/debian/installer/m68k/package-list
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: cdrom-core-modules
-Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules
- This package contains core CDROM support for the kernel.
-
-Package: ide-core-modules
-Depends: kernel-image
-Priority: standard
-Description: IDE support
- This package contains core IDE support for the kernel.
-
-Package: ide-modules
-Depends: kernel-image, ide-core-modules
-Priority: standard
-Description: IDE drivers
- This package contains IDE drivers for the kernel.
diff --git a/debian/installer/mips/kernel-versions b/debian/installer/mips/kernel-versions
deleted file mode 100644
index 4bc557556d12..000000000000
--- a/debian/installer/mips/kernel-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mips   -       4kc-malta     -             y      -
-mips   -       octeon        -             y      -
diff --git a/debian/installer/mips/package-list b/debian/installer/mips/package-list
deleted file mode 100644
index b7141bb20204..000000000000
--- a/debian/installer/mips/package-list
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
diff --git a/debian/installer/mips64/kernel-versions b/debian/installer/mips64/kernel-versions
deleted file mode 100644
index 24a6c52affe3..000000000000
--- a/debian/installer/mips64/kernel-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mips64   -       5kc-malta     -             y      -
-mips64   -       octeon        -             y      -
diff --git a/debian/installer/mips64/modules/mips64 b/debian/installer/mips64/modules/mips64
deleted file mode 120000
index d3bf739f6b7c..000000000000
--- a/debian/installer/mips64/modules/mips64
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips
\ No newline at end of file
diff --git a/debian/installer/mips64/modules/mips64-5kc-malta b/debian/installer/mips64/modules/mips64-5kc-malta
deleted file mode 120000
index 84b512ec477c..000000000000
--- a/debian/installer/mips64/modules/mips64-5kc-malta
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-4kc-malta
\ No newline at end of file
diff --git a/debian/installer/mips64/modules/mips64-octeon b/debian/installer/mips64/modules/mips64-octeon
deleted file mode 120000
index da584c69bbca..000000000000
--- a/debian/installer/mips64/modules/mips64-octeon
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-octeon
\ No newline at end of file
diff --git a/debian/installer/mips64/package-list b/debian/installer/mips64/package-list
deleted file mode 100644
index b7141bb20204..000000000000
--- a/debian/installer/mips64/package-list
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
diff --git a/debian/installer/mips64el/kernel-versions b/debian/installer/mips64el/kernel-versions
deleted file mode 100644
index 7135f7480416..000000000000
--- a/debian/installer/mips64el/kernel-versions
+++ /dev/null
@@ -1,4 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mips64el -       5kc-malta     -             y      -
-mips64el -       loongson-3    -             y      -
-mips64el -       octeon        -             y      -
diff --git a/debian/installer/mips64el/modules/mips64el-5kc-malta b/debian/installer/mips64el/modules/mips64el-5kc-malta
deleted file mode 120000
index 84b512ec477c..000000000000
--- a/debian/installer/mips64el/modules/mips64el-5kc-malta
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-4kc-malta
\ No newline at end of file
diff --git a/debian/installer/mips64el/modules/mips64el-loongson-3 b/debian/installer/mips64el/modules/mips64el-loongson-3
deleted file mode 120000
index 7f6e9670c78d..000000000000
--- a/debian/installer/mips64el/modules/mips64el-loongson-3
+++ /dev/null
@@ -1 +0,0 @@
-../../mipsel/modules/mipsel-loongson-3
\ No newline at end of file
diff --git a/debian/installer/mips64el/modules/mips64el-octeon b/debian/installer/mips64el/modules/mips64el-octeon
deleted file mode 120000
index da584c69bbca..000000000000
--- a/debian/installer/mips64el/modules/mips64el-octeon
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-octeon
\ No newline at end of file
diff --git a/debian/installer/mips64el/package-list b/debian/installer/mips64el/package-list
deleted file mode 100644
index 621363abeb8d..000000000000
--- a/debian/installer/mips64el/package-list
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
-Provides_loongson-3: i2c-modules, rtc-modules
diff --git a/debian/installer/mips64r6/kernel-versions b/debian/installer/mips64r6/kernel-versions
deleted file mode 100644
index a4e378707e02..000000000000
--- a/debian/installer/mips64r6/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mips64r6   -       mips64r6     -             y      -
diff --git a/debian/installer/mips64r6/modules/mips64r6 b/debian/installer/mips64r6/modules/mips64r6
deleted file mode 120000
index d3bf739f6b7c..000000000000
--- a/debian/installer/mips64r6/modules/mips64r6
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips
\ No newline at end of file
diff --git a/debian/installer/mips64r6/package-list b/debian/installer/mips64r6/package-list
deleted file mode 100644
index b7141bb20204..000000000000
--- a/debian/installer/mips64r6/package-list
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
diff --git a/debian/installer/mips64r6el/kernel-versions b/debian/installer/mips64r6el/kernel-versions
deleted file mode 100644
index 802b414e2b93..000000000000
--- a/debian/installer/mips64r6el/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mips64r6el   -       mips64r6el     -             y      -
diff --git a/debian/installer/mips64r6el/modules/mips64r6el b/debian/installer/mips64r6el/modules/mips64r6el
deleted file mode 120000
index d3bf739f6b7c..000000000000
--- a/debian/installer/mips64r6el/modules/mips64r6el
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips
\ No newline at end of file
diff --git a/debian/installer/mips64r6el/package-list b/debian/installer/mips64r6el/package-list
deleted file mode 100644
index b7141bb20204..000000000000
--- a/debian/installer/mips64r6el/package-list
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
diff --git a/debian/installer/mipsel/kernel-versions b/debian/installer/mipsel/kernel-versions
deleted file mode 100644
index dcf35104bbd3..000000000000
--- a/debian/installer/mipsel/kernel-versions
+++ /dev/null
@@ -1,4 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mipsel -       4kc-malta     -             y      -
-mipsel -       loongson-3    -             y      -
-mipsel -       octeon        -             y      -
diff --git a/debian/installer/mipsel/modules/mipsel-4kc-malta b/debian/installer/mipsel/modules/mipsel-4kc-malta
deleted file mode 120000
index 84b512ec477c..000000000000
--- a/debian/installer/mipsel/modules/mipsel-4kc-malta
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-4kc-malta
\ No newline at end of file
diff --git a/debian/installer/mipsel/modules/mipsel-octeon b/debian/installer/mipsel/modules/mipsel-octeon
deleted file mode 120000
index da584c69bbca..000000000000
--- a/debian/installer/mipsel/modules/mipsel-octeon
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-octeon
\ No newline at end of file
diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list
deleted file mode 100644
index 621363abeb8d..000000000000
--- a/debian/installer/mipsel/package-list
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
-Provides_loongson-3: i2c-modules, rtc-modules
diff --git a/debian/installer/mipsr6/kernel-versions b/debian/installer/mipsr6/kernel-versions
deleted file mode 100644
index db5d2d2ca07f..000000000000
--- a/debian/installer/mipsr6/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mipsr6   -       mips32r6     -             y      -
diff --git a/debian/installer/mipsr6/modules/mips32r6 b/debian/installer/mipsr6/modules/mips32r6
deleted file mode 120000
index d3bf739f6b7c..000000000000
--- a/debian/installer/mipsr6/modules/mips32r6
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips
\ No newline at end of file
diff --git a/debian/installer/mipsr6/package-list b/debian/installer/mipsr6/package-list
deleted file mode 100644
index b7141bb20204..000000000000
--- a/debian/installer/mipsr6/package-list
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
diff --git a/debian/installer/mipsr6el/kernel-versions b/debian/installer/mipsr6el/kernel-versions
deleted file mode 100644
index 6e45c34efb83..000000000000
--- a/debian/installer/mipsr6el/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour       installedname suffix build-depends
-mipsr6el   -       mips32r6el     -             y      -
diff --git a/debian/installer/mipsr6el/modules/mips32r6el b/debian/installer/mipsr6el/modules/mips32r6el
deleted file mode 120000
index d3bf739f6b7c..000000000000
--- a/debian/installer/mipsr6el/modules/mips32r6el
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips
\ No newline at end of file
diff --git a/debian/installer/mipsr6el/package-list b/debian/installer/mipsr6el/package-list
deleted file mode 100644
index b7141bb20204..000000000000
--- a/debian/installer/mipsr6el/package-list
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: rtc-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/ata-modules b/debian/installer/modules/alpha-generic/ata-modules
index b81c0f38b74a..b81c0f38b74a 100644
--- a/debian/installer/alpha/modules/alpha-generic/ata-modules
+++ b/debian/installer/modules/alpha-generic/ata-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/btrfs-modules b/debian/installer/modules/alpha-generic/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/alpha/modules/alpha-generic/btrfs-modules
+++ b/debian/installer/modules/alpha-generic/btrfs-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/cdrom-core-modules b/debian/installer/modules/alpha-generic/cdrom-core-modules
index 3ff69b48f4fc..3ff69b48f4fc 100644
--- a/debian/installer/alpha/modules/alpha-generic/cdrom-core-modules
+++ b/debian/installer/modules/alpha-generic/cdrom-core-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/compress-modules b/debian/installer/modules/alpha-generic/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/alpha/modules/alpha-generic/compress-modules
+++ b/debian/installer/modules/alpha-generic/compress-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/crc-modules b/debian/installer/modules/alpha-generic/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/alpha/modules/alpha-generic/crc-modules
+++ b/debian/installer/modules/alpha-generic/crc-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/crypto-dm-modules b/debian/installer/modules/alpha-generic/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/alpha/modules/alpha-generic/crypto-dm-modules
+++ b/debian/installer/modules/alpha-generic/crypto-dm-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/crypto-modules b/debian/installer/modules/alpha-generic/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/alpha/modules/alpha-generic/crypto-modules
+++ b/debian/installer/modules/alpha-generic/crypto-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/event-modules b/debian/installer/modules/alpha-generic/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/alpha/modules/alpha-generic/event-modules
+++ b/debian/installer/modules/alpha-generic/event-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/ext4-modules b/debian/installer/modules/alpha-generic/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/alpha/modules/alpha-generic/ext4-modules
+++ b/debian/installer/modules/alpha-generic/ext4-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/fat-modules b/debian/installer/modules/alpha-generic/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/alpha/modules/alpha-generic/fat-modules
+++ b/debian/installer/modules/alpha-generic/fat-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/fuse-modules b/debian/installer/modules/alpha-generic/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/alpha/modules/alpha-generic/fuse-modules
+++ b/debian/installer/modules/alpha-generic/fuse-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/i2c-modules b/debian/installer/modules/alpha-generic/i2c-modules
index 203a607e73ce..203a607e73ce 100644
--- a/debian/installer/alpha/modules/alpha-generic/i2c-modules
+++ b/debian/installer/modules/alpha-generic/i2c-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/input-modules b/debian/installer/modules/alpha-generic/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/alpha/modules/alpha-generic/input-modules
+++ b/debian/installer/modules/alpha-generic/input-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/isofs-modules b/debian/installer/modules/alpha-generic/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/alpha/modules/alpha-generic/isofs-modules
+++ b/debian/installer/modules/alpha-generic/isofs-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/jfs-modules b/debian/installer/modules/alpha-generic/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/alpha/modules/alpha-generic/jfs-modules
+++ b/debian/installer/modules/alpha-generic/jfs-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/kernel-image b/debian/installer/modules/alpha-generic/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/alpha/modules/alpha-generic/kernel-image
+++ b/debian/installer/modules/alpha-generic/kernel-image
diff --git a/debian/installer/alpha/modules/alpha-generic/loop-modules b/debian/installer/modules/alpha-generic/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/alpha/modules/alpha-generic/loop-modules
+++ b/debian/installer/modules/alpha-generic/loop-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/md-modules b/debian/installer/modules/alpha-generic/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/alpha/modules/alpha-generic/md-modules
+++ b/debian/installer/modules/alpha-generic/md-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/mouse-modules b/debian/installer/modules/alpha-generic/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/alpha/modules/alpha-generic/mouse-modules
+++ b/debian/installer/modules/alpha-generic/mouse-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/multipath-modules b/debian/installer/modules/alpha-generic/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/alpha/modules/alpha-generic/multipath-modules
+++ b/debian/installer/modules/alpha-generic/multipath-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/nbd-modules b/debian/installer/modules/alpha-generic/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/alpha/modules/alpha-generic/nbd-modules
+++ b/debian/installer/modules/alpha-generic/nbd-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/nic-modules b/debian/installer/modules/alpha-generic/nic-modules
index 2512e83950dd..2512e83950dd 100644
--- a/debian/installer/alpha/modules/alpha-generic/nic-modules
+++ b/debian/installer/modules/alpha-generic/nic-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/nic-pcmcia-modules b/debian/installer/modules/alpha-generic/nic-pcmcia-modules
index 7a0702cd5585..7a0702cd5585 100644
--- a/debian/installer/alpha/modules/alpha-generic/nic-pcmcia-modules
+++ b/debian/installer/modules/alpha-generic/nic-pcmcia-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/nic-shared-modules b/debian/installer/modules/alpha-generic/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/alpha/modules/alpha-generic/nic-shared-modules
+++ b/debian/installer/modules/alpha-generic/nic-shared-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/nic-usb-modules b/debian/installer/modules/alpha-generic/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/alpha/modules/alpha-generic/nic-usb-modules
+++ b/debian/installer/modules/alpha-generic/nic-usb-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/nic-wireless-modules b/debian/installer/modules/alpha-generic/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/alpha/modules/alpha-generic/nic-wireless-modules
+++ b/debian/installer/modules/alpha-generic/nic-wireless-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/pata-modules b/debian/installer/modules/alpha-generic/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/alpha/modules/alpha-generic/pata-modules
+++ b/debian/installer/modules/alpha-generic/pata-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/pcmcia-modules b/debian/installer/modules/alpha-generic/pcmcia-modules
index 2bb5350fe14f..2bb5350fe14f 100644
--- a/debian/installer/alpha/modules/alpha-generic/pcmcia-modules
+++ b/debian/installer/modules/alpha-generic/pcmcia-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/ppp-modules b/debian/installer/modules/alpha-generic/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/alpha/modules/alpha-generic/ppp-modules
+++ b/debian/installer/modules/alpha-generic/ppp-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/sata-modules b/debian/installer/modules/alpha-generic/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/alpha/modules/alpha-generic/sata-modules
+++ b/debian/installer/modules/alpha-generic/sata-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/scsi-core-modules b/debian/installer/modules/alpha-generic/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/alpha/modules/alpha-generic/scsi-core-modules
+++ b/debian/installer/modules/alpha-generic/scsi-core-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/scsi-modules b/debian/installer/modules/alpha-generic/scsi-modules
index 8909dfb79487..8909dfb79487 100644
--- a/debian/installer/alpha/modules/alpha-generic/scsi-modules
+++ b/debian/installer/modules/alpha-generic/scsi-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/serial-modules b/debian/installer/modules/alpha-generic/serial-modules
index 6ab8b8c3551b..6ab8b8c3551b 100644
--- a/debian/installer/alpha/modules/alpha-generic/serial-modules
+++ b/debian/installer/modules/alpha-generic/serial-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/squashfs-modules b/debian/installer/modules/alpha-generic/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/alpha/modules/alpha-generic/squashfs-modules
+++ b/debian/installer/modules/alpha-generic/squashfs-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/srm-modules b/debian/installer/modules/alpha-generic/srm-modules
index 01601199779b..01601199779b 100644
--- a/debian/installer/alpha/modules/alpha-generic/srm-modules
+++ b/debian/installer/modules/alpha-generic/srm-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/usb-modules b/debian/installer/modules/alpha-generic/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/alpha/modules/alpha-generic/usb-modules
+++ b/debian/installer/modules/alpha-generic/usb-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/usb-serial-modules b/debian/installer/modules/alpha-generic/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/alpha/modules/alpha-generic/usb-serial-modules
+++ b/debian/installer/modules/alpha-generic/usb-serial-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/usb-storage-modules b/debian/installer/modules/alpha-generic/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/alpha/modules/alpha-generic/usb-storage-modules
+++ b/debian/installer/modules/alpha-generic/usb-storage-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/virtio-modules b/debian/installer/modules/alpha-generic/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/alpha/modules/alpha-generic/virtio-modules
+++ b/debian/installer/modules/alpha-generic/virtio-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/xfs-modules b/debian/installer/modules/alpha-generic/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/alpha/modules/alpha-generic/xfs-modules
+++ b/debian/installer/modules/alpha-generic/xfs-modules
diff --git a/debian/installer/alpha/modules/alpha-generic/zlib-modules b/debian/installer/modules/alpha-generic/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/alpha/modules/alpha-generic/zlib-modules
+++ b/debian/installer/modules/alpha-generic/zlib-modules
diff --git a/debian/installer/amd64/modules/amd64/acpi-modules b/debian/installer/modules/amd64/acpi-modules
index 307528fb17e9..307528fb17e9 100644
--- a/debian/installer/amd64/modules/amd64/acpi-modules
+++ b/debian/installer/modules/amd64/acpi-modules
diff --git a/debian/installer/amd64/modules/amd64/ata-modules b/debian/installer/modules/amd64/ata-modules
index 9409e7cde816..9409e7cde816 100644
--- a/debian/installer/amd64/modules/amd64/ata-modules
+++ b/debian/installer/modules/amd64/ata-modules
diff --git a/debian/installer/amd64/modules/amd64/btrfs-modules b/debian/installer/modules/amd64/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/amd64/modules/amd64/btrfs-modules
+++ b/debian/installer/modules/amd64/btrfs-modules
diff --git a/debian/installer/amd64/modules/amd64/cdrom-core-modules b/debian/installer/modules/amd64/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/amd64/modules/amd64/cdrom-core-modules
+++ b/debian/installer/modules/amd64/cdrom-core-modules
diff --git a/debian/installer/amd64/modules/amd64/compress-modules b/debian/installer/modules/amd64/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/amd64/modules/amd64/compress-modules
+++ b/debian/installer/modules/amd64/compress-modules
diff --git a/debian/installer/amd64/modules/amd64/crc-modules b/debian/installer/modules/amd64/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/amd64/modules/amd64/crc-modules
+++ b/debian/installer/modules/amd64/crc-modules
diff --git a/debian/installer/amd64/modules/amd64/crypto-dm-modules b/debian/installer/modules/amd64/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/amd64/modules/amd64/crypto-dm-modules
+++ b/debian/installer/modules/amd64/crypto-dm-modules
diff --git a/debian/installer/amd64/modules/amd64/crypto-modules b/debian/installer/modules/amd64/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/amd64/modules/amd64/crypto-modules
+++ b/debian/installer/modules/amd64/crypto-modules
diff --git a/debian/installer/amd64/modules/amd64/efi-modules b/debian/installer/modules/amd64/efi-modules
index e1dc05e8f247..e1dc05e8f247 100644
--- a/debian/installer/amd64/modules/amd64/efi-modules
+++ b/debian/installer/modules/amd64/efi-modules
diff --git a/debian/installer/amd64/modules/amd64/event-modules b/debian/installer/modules/amd64/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/amd64/modules/amd64/event-modules
+++ b/debian/installer/modules/amd64/event-modules
diff --git a/debian/installer/amd64/modules/amd64/ext4-modules b/debian/installer/modules/amd64/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/amd64/modules/amd64/ext4-modules
+++ b/debian/installer/modules/amd64/ext4-modules
diff --git a/debian/installer/amd64/modules/amd64/fat-modules b/debian/installer/modules/amd64/fat-modules
index cce8fd30ca4f..cce8fd30ca4f 100644
--- a/debian/installer/amd64/modules/amd64/fat-modules
+++ b/debian/installer/modules/amd64/fat-modules
diff --git a/debian/installer/amd64/modules/amd64/fb-modules b/debian/installer/modules/amd64/fb-modules
index 06fb9d2f8ffc..06fb9d2f8ffc 100644
--- a/debian/installer/amd64/modules/amd64/fb-modules
+++ b/debian/installer/modules/amd64/fb-modules
diff --git a/debian/installer/amd64/modules/amd64/firewire-core-modules b/debian/installer/modules/amd64/firewire-core-modules
index dcac80af9651..dcac80af9651 100644
--- a/debian/installer/amd64/modules/amd64/firewire-core-modules
+++ b/debian/installer/modules/amd64/firewire-core-modules
diff --git a/debian/installer/amd64/modules/amd64/fuse-modules b/debian/installer/modules/amd64/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/amd64/modules/amd64/fuse-modules
+++ b/debian/installer/modules/amd64/fuse-modules
diff --git a/debian/installer/amd64/modules/amd64/hyperv-modules b/debian/installer/modules/amd64/hyperv-modules
index 69fdd5d22a85..69fdd5d22a85 100644
--- a/debian/installer/amd64/modules/amd64/hyperv-modules
+++ b/debian/installer/modules/amd64/hyperv-modules
diff --git a/debian/installer/amd64/modules/amd64/i2c-modules b/debian/installer/modules/amd64/i2c-modules
index 203a607e73ce..203a607e73ce 100644
--- a/debian/installer/amd64/modules/amd64/i2c-modules
+++ b/debian/installer/modules/amd64/i2c-modules
diff --git a/debian/installer/amd64/modules/amd64/input-modules b/debian/installer/modules/amd64/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/amd64/modules/amd64/input-modules
+++ b/debian/installer/modules/amd64/input-modules
diff --git a/debian/installer/amd64/modules/amd64/isofs-modules b/debian/installer/modules/amd64/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/amd64/modules/amd64/isofs-modules
+++ b/debian/installer/modules/amd64/isofs-modules
diff --git a/debian/installer/amd64/modules/amd64/jfs-modules b/debian/installer/modules/amd64/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/amd64/modules/amd64/jfs-modules
+++ b/debian/installer/modules/amd64/jfs-modules
diff --git a/debian/installer/amd64/modules/amd64/kernel-image b/debian/installer/modules/amd64/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/amd64/modules/amd64/kernel-image
+++ b/debian/installer/modules/amd64/kernel-image
diff --git a/debian/installer/amd64/modules/amd64/loop-modules b/debian/installer/modules/amd64/loop-modules
index 164467713763..164467713763 100644
--- a/debian/installer/amd64/modules/amd64/loop-modules
+++ b/debian/installer/modules/amd64/loop-modules
diff --git a/debian/installer/amd64/modules/amd64/md-modules b/debian/installer/modules/amd64/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/amd64/modules/amd64/md-modules
+++ b/debian/installer/modules/amd64/md-modules
diff --git a/debian/installer/amd64/modules/amd64/mmc-core-modules b/debian/installer/modules/amd64/mmc-core-modules
index 7bf38465cf1b..7bf38465cf1b 100644
--- a/debian/installer/amd64/modules/amd64/mmc-core-modules
+++ b/debian/installer/modules/amd64/mmc-core-modules
diff --git a/debian/installer/amd64/modules/amd64/mmc-modules b/debian/installer/modules/amd64/mmc-modules
index dadfd5334d62..dadfd5334d62 100644
--- a/debian/installer/amd64/modules/amd64/mmc-modules
+++ b/debian/installer/modules/amd64/mmc-modules
diff --git a/debian/installer/amd64/modules/amd64/mouse-modules b/debian/installer/modules/amd64/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/amd64/modules/amd64/mouse-modules
+++ b/debian/installer/modules/amd64/mouse-modules
diff --git a/debian/installer/amd64/modules/amd64/multipath-modules b/debian/installer/modules/amd64/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/amd64/modules/amd64/multipath-modules
+++ b/debian/installer/modules/amd64/multipath-modules
diff --git a/debian/installer/amd64/modules/amd64/nbd-modules b/debian/installer/modules/amd64/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/amd64/modules/amd64/nbd-modules
+++ b/debian/installer/modules/amd64/nbd-modules
diff --git a/debian/installer/amd64/modules/amd64/nic-modules b/debian/installer/modules/amd64/nic-modules
index 2512e83950dd..2512e83950dd 100644
--- a/debian/installer/amd64/modules/amd64/nic-modules
+++ b/debian/installer/modules/amd64/nic-modules
diff --git a/debian/installer/amd64/modules/amd64/nic-pcmcia-modules b/debian/installer/modules/amd64/nic-pcmcia-modules
index 7a0702cd5585..7a0702cd5585 100644
--- a/debian/installer/amd64/modules/amd64/nic-pcmcia-modules
+++ b/debian/installer/modules/amd64/nic-pcmcia-modules
diff --git a/debian/installer/amd64/modules/amd64/nic-shared-modules b/debian/installer/modules/amd64/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/amd64/modules/amd64/nic-shared-modules
+++ b/debian/installer/modules/amd64/nic-shared-modules
diff --git a/debian/installer/amd64/modules/amd64/nic-usb-modules b/debian/installer/modules/amd64/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/amd64/modules/amd64/nic-usb-modules
+++ b/debian/installer/modules/amd64/nic-usb-modules
diff --git a/debian/installer/amd64/modules/amd64/nic-wireless-modules b/debian/installer/modules/amd64/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/amd64/modules/amd64/nic-wireless-modules
+++ b/debian/installer/modules/amd64/nic-wireless-modules
diff --git a/debian/installer/amd64/modules/amd64/ntfs-modules b/debian/installer/modules/amd64/ntfs-modules
index ac1bc6a9601e..ac1bc6a9601e 100644
--- a/debian/installer/amd64/modules/amd64/ntfs-modules
+++ b/debian/installer/modules/amd64/ntfs-modules
diff --git a/debian/installer/amd64/modules/amd64/pata-modules b/debian/installer/modules/amd64/pata-modules
index 8c4e514ae724..8c4e514ae724 100644
--- a/debian/installer/amd64/modules/amd64/pata-modules
+++ b/debian/installer/modules/amd64/pata-modules
diff --git a/debian/installer/amd64/modules/amd64/pcmcia-modules b/debian/installer/modules/amd64/pcmcia-modules
index 2bb5350fe14f..2bb5350fe14f 100644
--- a/debian/installer/amd64/modules/amd64/pcmcia-modules
+++ b/debian/installer/modules/amd64/pcmcia-modules
diff --git a/debian/installer/amd64/modules/amd64/pcmcia-storage-modules b/debian/installer/modules/amd64/pcmcia-storage-modules
index f73ae5bb9b42..f73ae5bb9b42 100644
--- a/debian/installer/amd64/modules/amd64/pcmcia-storage-modules
+++ b/debian/installer/modules/amd64/pcmcia-storage-modules
diff --git a/debian/installer/amd64/modules/amd64/ppp-modules b/debian/installer/modules/amd64/ppp-modules
index f1ae9b3d15ac..f1ae9b3d15ac 100644
--- a/debian/installer/amd64/modules/amd64/ppp-modules
+++ b/debian/installer/modules/amd64/ppp-modules
diff --git a/debian/installer/amd64/modules/amd64/sata-modules b/debian/installer/modules/amd64/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/amd64/modules/amd64/sata-modules
+++ b/debian/installer/modules/amd64/sata-modules
diff --git a/debian/installer/amd64/modules/amd64/scsi-core-modules b/debian/installer/modules/amd64/scsi-core-modules
index 778a022fa751..778a022fa751 100644
--- a/debian/installer/amd64/modules/amd64/scsi-core-modules
+++ b/debian/installer/modules/amd64/scsi-core-modules
diff --git a/debian/installer/amd64/modules/amd64/scsi-modules b/debian/installer/modules/amd64/scsi-modules
index 9b1fa27b98af..9b1fa27b98af 100644
--- a/debian/installer/amd64/modules/amd64/scsi-modules
+++ b/debian/installer/modules/amd64/scsi-modules
diff --git a/debian/installer/amd64/modules/amd64/serial-modules b/debian/installer/modules/amd64/serial-modules
index 6ab8b8c3551b..6ab8b8c3551b 100644
--- a/debian/installer/amd64/modules/amd64/serial-modules
+++ b/debian/installer/modules/amd64/serial-modules
diff --git a/debian/installer/amd64/modules/amd64/sound-modules b/debian/installer/modules/amd64/sound-modules
index 68395ab3d99a..68395ab3d99a 100644
--- a/debian/installer/amd64/modules/amd64/sound-modules
+++ b/debian/installer/modules/amd64/sound-modules
diff --git a/debian/installer/amd64/modules/amd64/speakup-modules b/debian/installer/modules/amd64/speakup-modules
index 29592721a7aa..29592721a7aa 100644
--- a/debian/installer/amd64/modules/amd64/speakup-modules
+++ b/debian/installer/modules/amd64/speakup-modules
diff --git a/debian/installer/amd64/modules/amd64/squashfs-modules b/debian/installer/modules/amd64/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/amd64/modules/amd64/squashfs-modules
+++ b/debian/installer/modules/amd64/squashfs-modules
diff --git a/debian/installer/amd64/modules/amd64/udf-modules b/debian/installer/modules/amd64/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/amd64/modules/amd64/udf-modules
+++ b/debian/installer/modules/amd64/udf-modules
diff --git a/debian/installer/amd64/modules/amd64/uinput-modules b/debian/installer/modules/amd64/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/amd64/modules/amd64/uinput-modules
+++ b/debian/installer/modules/amd64/uinput-modules
diff --git a/debian/installer/amd64/modules/amd64/usb-modules b/debian/installer/modules/amd64/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/amd64/modules/amd64/usb-modules
+++ b/debian/installer/modules/amd64/usb-modules
diff --git a/debian/installer/amd64/modules/amd64/usb-serial-modules b/debian/installer/modules/amd64/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/amd64/modules/amd64/usb-serial-modules
+++ b/debian/installer/modules/amd64/usb-serial-modules
diff --git a/debian/installer/amd64/modules/amd64/usb-storage-modules b/debian/installer/modules/amd64/usb-storage-modules
index 272d95e2e8b1..272d95e2e8b1 100644
--- a/debian/installer/amd64/modules/amd64/usb-storage-modules
+++ b/debian/installer/modules/amd64/usb-storage-modules
diff --git a/debian/installer/amd64/modules/amd64/virtio-modules b/debian/installer/modules/amd64/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/amd64/modules/amd64/virtio-modules
+++ b/debian/installer/modules/amd64/virtio-modules
diff --git a/debian/installer/amd64/modules/amd64/xfs-modules b/debian/installer/modules/amd64/xfs-modules
index c020b5d399f9..c020b5d399f9 100644
--- a/debian/installer/amd64/modules/amd64/xfs-modules
+++ b/debian/installer/modules/amd64/xfs-modules
diff --git a/debian/installer/arm64/modules/arm64/ata-modules b/debian/installer/modules/arm64/ata-modules
index 04d9c88411a2..04d9c88411a2 100644
--- a/debian/installer/arm64/modules/arm64/ata-modules
+++ b/debian/installer/modules/arm64/ata-modules
diff --git a/debian/installer/arm64/modules/arm64/btrfs-modules b/debian/installer/modules/arm64/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/arm64/modules/arm64/btrfs-modules
+++ b/debian/installer/modules/arm64/btrfs-modules
diff --git a/debian/installer/arm64/modules/arm64/cdrom-core-modules b/debian/installer/modules/arm64/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/arm64/modules/arm64/cdrom-core-modules
+++ b/debian/installer/modules/arm64/cdrom-core-modules
diff --git a/debian/installer/arm64/modules/arm64/compress-modules b/debian/installer/modules/arm64/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/arm64/modules/arm64/compress-modules
+++ b/debian/installer/modules/arm64/compress-modules
diff --git a/debian/installer/arm64/modules/arm64/crc-modules b/debian/installer/modules/arm64/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/arm64/modules/arm64/crc-modules
+++ b/debian/installer/modules/arm64/crc-modules
diff --git a/debian/installer/arm64/modules/arm64/crypto-dm-modules b/debian/installer/modules/arm64/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/arm64/modules/arm64/crypto-dm-modules
+++ b/debian/installer/modules/arm64/crypto-dm-modules
diff --git a/debian/installer/arm64/modules/arm64/crypto-modules b/debian/installer/modules/arm64/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/arm64/modules/arm64/crypto-modules
+++ b/debian/installer/modules/arm64/crypto-modules
diff --git a/debian/installer/arm64/modules/arm64/efi-modules b/debian/installer/modules/arm64/efi-modules
index e1dc05e8f247..e1dc05e8f247 100644
--- a/debian/installer/arm64/modules/arm64/efi-modules
+++ b/debian/installer/modules/arm64/efi-modules
diff --git a/debian/installer/arm64/modules/arm64/event-modules b/debian/installer/modules/arm64/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/arm64/modules/arm64/event-modules
+++ b/debian/installer/modules/arm64/event-modules
diff --git a/debian/installer/arm64/modules/arm64/ext4-modules b/debian/installer/modules/arm64/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/arm64/modules/arm64/ext4-modules
+++ b/debian/installer/modules/arm64/ext4-modules
diff --git a/debian/installer/arm64/modules/arm64/fat-modules b/debian/installer/modules/arm64/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/arm64/modules/arm64/fat-modules
+++ b/debian/installer/modules/arm64/fat-modules
diff --git a/debian/installer/arm64/modules/arm64/fb-modules b/debian/installer/modules/arm64/fb-modules
index f96aaeadaf44..f96aaeadaf44 100644
--- a/debian/installer/arm64/modules/arm64/fb-modules
+++ b/debian/installer/modules/arm64/fb-modules
diff --git a/debian/installer/arm64/modules/arm64/fuse-modules b/debian/installer/modules/arm64/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/arm64/modules/arm64/fuse-modules
+++ b/debian/installer/modules/arm64/fuse-modules
diff --git a/debian/installer/arm64/modules/arm64/i2c-modules b/debian/installer/modules/arm64/i2c-modules
index bfe65b4cd88b..bfe65b4cd88b 100644
--- a/debian/installer/arm64/modules/arm64/i2c-modules
+++ b/debian/installer/modules/arm64/i2c-modules
diff --git a/debian/installer/arm64/modules/arm64/input-modules b/debian/installer/modules/arm64/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/arm64/modules/arm64/input-modules
+++ b/debian/installer/modules/arm64/input-modules
diff --git a/debian/installer/arm64/modules/arm64/isofs-modules b/debian/installer/modules/arm64/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/arm64/modules/arm64/isofs-modules
+++ b/debian/installer/modules/arm64/isofs-modules
diff --git a/debian/installer/arm64/modules/arm64/jfs-modules b/debian/installer/modules/arm64/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/arm64/modules/arm64/jfs-modules
+++ b/debian/installer/modules/arm64/jfs-modules
diff --git a/debian/installer/arm64/modules/arm64/kernel-image b/debian/installer/modules/arm64/kernel-image
index 415e620ee1ce..415e620ee1ce 100644
--- a/debian/installer/arm64/modules/arm64/kernel-image
+++ b/debian/installer/modules/arm64/kernel-image
diff --git a/debian/installer/arm64/modules/arm64/leds-modules b/debian/installer/modules/arm64/leds-modules
index 85d9f2565c1c..85d9f2565c1c 100644
--- a/debian/installer/arm64/modules/arm64/leds-modules
+++ b/debian/installer/modules/arm64/leds-modules
diff --git a/debian/installer/arm64/modules/arm64/loop-modules b/debian/installer/modules/arm64/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/arm64/modules/arm64/loop-modules
+++ b/debian/installer/modules/arm64/loop-modules
diff --git a/debian/installer/arm64/modules/arm64/md-modules b/debian/installer/modules/arm64/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/arm64/modules/arm64/md-modules
+++ b/debian/installer/modules/arm64/md-modules
diff --git a/debian/installer/arm64/modules/arm64/mmc-modules b/debian/installer/modules/arm64/mmc-modules
index dadfd5334d62..dadfd5334d62 100644
--- a/debian/installer/arm64/modules/arm64/mmc-modules
+++ b/debian/installer/modules/arm64/mmc-modules
diff --git a/debian/installer/arm64/modules/arm64/multipath-modules b/debian/installer/modules/arm64/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/arm64/modules/arm64/multipath-modules
+++ b/debian/installer/modules/arm64/multipath-modules
diff --git a/debian/installer/arm64/modules/arm64/nbd-modules b/debian/installer/modules/arm64/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/arm64/modules/arm64/nbd-modules
+++ b/debian/installer/modules/arm64/nbd-modules
diff --git a/debian/installer/arm64/modules/arm64/nic-modules b/debian/installer/modules/arm64/nic-modules
index 22ea989ab8f0..22ea989ab8f0 100644
--- a/debian/installer/arm64/modules/arm64/nic-modules
+++ b/debian/installer/modules/arm64/nic-modules
diff --git a/debian/installer/arm64/modules/arm64/nic-shared-modules b/debian/installer/modules/arm64/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/arm64/modules/arm64/nic-shared-modules
+++ b/debian/installer/modules/arm64/nic-shared-modules
diff --git a/debian/installer/arm64/modules/arm64/nic-usb-modules b/debian/installer/modules/arm64/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/arm64/modules/arm64/nic-usb-modules
+++ b/debian/installer/modules/arm64/nic-usb-modules
diff --git a/debian/installer/arm64/modules/arm64/nic-wireless-modules b/debian/installer/modules/arm64/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/arm64/modules/arm64/nic-wireless-modules
+++ b/debian/installer/modules/arm64/nic-wireless-modules
diff --git a/debian/installer/arm64/modules/arm64/ppp-modules b/debian/installer/modules/arm64/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/arm64/modules/arm64/ppp-modules
+++ b/debian/installer/modules/arm64/ppp-modules
diff --git a/debian/installer/arm64/modules/arm64/sata-modules b/debian/installer/modules/arm64/sata-modules
index 740a93c365a3..740a93c365a3 100644
--- a/debian/installer/arm64/modules/arm64/sata-modules
+++ b/debian/installer/modules/arm64/sata-modules
diff --git a/debian/installer/arm64/modules/arm64/scsi-core-modules b/debian/installer/modules/arm64/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/arm64/modules/arm64/scsi-core-modules
+++ b/debian/installer/modules/arm64/scsi-core-modules
diff --git a/debian/installer/arm64/modules/arm64/scsi-modules b/debian/installer/modules/arm64/scsi-modules
index 8909dfb79487..8909dfb79487 100644
--- a/debian/installer/arm64/modules/arm64/scsi-modules
+++ b/debian/installer/modules/arm64/scsi-modules
diff --git a/debian/installer/arm64/modules/arm64/squashfs-modules b/debian/installer/modules/arm64/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/arm64/modules/arm64/squashfs-modules
+++ b/debian/installer/modules/arm64/squashfs-modules
diff --git a/debian/installer/arm64/modules/arm64/udf-modules b/debian/installer/modules/arm64/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/arm64/modules/arm64/udf-modules
+++ b/debian/installer/modules/arm64/udf-modules
diff --git a/debian/installer/arm64/modules/arm64/uinput-modules b/debian/installer/modules/arm64/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/arm64/modules/arm64/uinput-modules
+++ b/debian/installer/modules/arm64/uinput-modules
diff --git a/debian/installer/arm64/modules/arm64/usb-modules b/debian/installer/modules/arm64/usb-modules
index 0d2a75924502..0d2a75924502 100644
--- a/debian/installer/arm64/modules/arm64/usb-modules
+++ b/debian/installer/modules/arm64/usb-modules
diff --git a/debian/installer/arm64/modules/arm64/usb-storage-modules b/debian/installer/modules/arm64/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/arm64/modules/arm64/usb-storage-modules
+++ b/debian/installer/modules/arm64/usb-storage-modules
diff --git a/debian/installer/arm64/modules/arm64/virtio-modules b/debian/installer/modules/arm64/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/arm64/modules/arm64/virtio-modules
+++ b/debian/installer/modules/arm64/virtio-modules
diff --git a/debian/installer/arm64/modules/arm64/xfs-modules b/debian/installer/modules/arm64/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/arm64/modules/arm64/xfs-modules
+++ b/debian/installer/modules/arm64/xfs-modules
diff --git a/debian/installer/armel/modules/armel-marvell/btrfs-modules b/debian/installer/modules/armel-marvell/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/armel/modules/armel-marvell/btrfs-modules
+++ b/debian/installer/modules/armel-marvell/btrfs-modules
diff --git a/debian/installer/armel/modules/armel-marvell/cdrom-core-modules b/debian/installer/modules/armel-marvell/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/armel/modules/armel-marvell/cdrom-core-modules
+++ b/debian/installer/modules/armel-marvell/cdrom-core-modules
diff --git a/debian/installer/armel/modules/armel-marvell/compress-modules b/debian/installer/modules/armel-marvell/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/armel/modules/armel-marvell/compress-modules
+++ b/debian/installer/modules/armel-marvell/compress-modules
diff --git a/debian/installer/armel/modules/armel-marvell/crc-modules b/debian/installer/modules/armel-marvell/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/armel/modules/armel-marvell/crc-modules
+++ b/debian/installer/modules/armel-marvell/crc-modules
diff --git a/debian/installer/armel/modules/armel-marvell/crypto-dm-modules b/debian/installer/modules/armel-marvell/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/armel/modules/armel-marvell/crypto-dm-modules
+++ b/debian/installer/modules/armel-marvell/crypto-dm-modules
diff --git a/debian/installer/armel/modules/armel-marvell/crypto-modules b/debian/installer/modules/armel-marvell/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/armel/modules/armel-marvell/crypto-modules
+++ b/debian/installer/modules/armel-marvell/crypto-modules
diff --git a/debian/installer/armel/modules/armel-marvell/event-modules b/debian/installer/modules/armel-marvell/event-modules
index 0bc9f776daec..0bc9f776daec 100644
--- a/debian/installer/armel/modules/armel-marvell/event-modules
+++ b/debian/installer/modules/armel-marvell/event-modules
diff --git a/debian/installer/armel/modules/armel-marvell/ext4-modules b/debian/installer/modules/armel-marvell/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/armel/modules/armel-marvell/ext4-modules
+++ b/debian/installer/modules/armel-marvell/ext4-modules
diff --git a/debian/installer/armel/modules/armel-marvell/fat-modules b/debian/installer/modules/armel-marvell/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/armel/modules/armel-marvell/fat-modules
+++ b/debian/installer/modules/armel-marvell/fat-modules
diff --git a/debian/installer/armel/modules/armel-marvell/fb-modules b/debian/installer/modules/armel-marvell/fb-modules
index c860f18783b9..c860f18783b9 100644
--- a/debian/installer/armel/modules/armel-marvell/fb-modules
+++ b/debian/installer/modules/armel-marvell/fb-modules
diff --git a/debian/installer/armel/modules/armel-marvell/fuse-modules b/debian/installer/modules/armel-marvell/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/armel/modules/armel-marvell/fuse-modules
+++ b/debian/installer/modules/armel-marvell/fuse-modules
diff --git a/debian/installer/armel/modules/armel-marvell/input-modules b/debian/installer/modules/armel-marvell/input-modules
index 34183581c0e2..34183581c0e2 100644
--- a/debian/installer/armel/modules/armel-marvell/input-modules
+++ b/debian/installer/modules/armel-marvell/input-modules
diff --git a/debian/installer/armel/modules/armel-marvell/ipv6-modules b/debian/installer/modules/armel-marvell/ipv6-modules
index 1e3fc3388c0b..1e3fc3388c0b 100644
--- a/debian/installer/armel/modules/armel-marvell/ipv6-modules
+++ b/debian/installer/modules/armel-marvell/ipv6-modules
diff --git a/debian/installer/armel/modules/armel-marvell/isofs-modules b/debian/installer/modules/armel-marvell/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/armel/modules/armel-marvell/isofs-modules
+++ b/debian/installer/modules/armel-marvell/isofs-modules
diff --git a/debian/installer/armel/modules/armel-marvell/jffs2-modules b/debian/installer/modules/armel-marvell/jffs2-modules
index 245c7d8a520e..245c7d8a520e 100644
--- a/debian/installer/armel/modules/armel-marvell/jffs2-modules
+++ b/debian/installer/modules/armel-marvell/jffs2-modules
diff --git a/debian/installer/armel/modules/armel-marvell/jfs-modules b/debian/installer/modules/armel-marvell/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/armel/modules/armel-marvell/jfs-modules
+++ b/debian/installer/modules/armel-marvell/jfs-modules
diff --git a/debian/installer/armel/modules/armel-marvell/kernel-image b/debian/installer/modules/armel-marvell/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/armel/modules/armel-marvell/kernel-image
+++ b/debian/installer/modules/armel-marvell/kernel-image
diff --git a/debian/installer/armel/modules/armel-marvell/leds-modules b/debian/installer/modules/armel-marvell/leds-modules
index b18bac13fb25..b18bac13fb25 100644
--- a/debian/installer/armel/modules/armel-marvell/leds-modules
+++ b/debian/installer/modules/armel-marvell/leds-modules
diff --git a/debian/installer/armel/modules/armel-marvell/loop-modules b/debian/installer/modules/armel-marvell/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/armel/modules/armel-marvell/loop-modules
+++ b/debian/installer/modules/armel-marvell/loop-modules
diff --git a/debian/installer/armel/modules/armel-marvell/md-modules b/debian/installer/modules/armel-marvell/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/armel/modules/armel-marvell/md-modules
+++ b/debian/installer/modules/armel-marvell/md-modules
diff --git a/debian/installer/armel/modules/armel-marvell/minix-modules b/debian/installer/modules/armel-marvell/minix-modules
index 82b9843720a1..82b9843720a1 100644
--- a/debian/installer/armel/modules/armel-marvell/minix-modules
+++ b/debian/installer/modules/armel-marvell/minix-modules
diff --git a/debian/installer/armel/modules/armel-marvell/mmc-modules b/debian/installer/modules/armel-marvell/mmc-modules
index e8c7b46f5223..e8c7b46f5223 100644
--- a/debian/installer/armel/modules/armel-marvell/mmc-modules
+++ b/debian/installer/modules/armel-marvell/mmc-modules
diff --git a/debian/installer/armel/modules/armel-marvell/mouse-modules b/debian/installer/modules/armel-marvell/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/armel/modules/armel-marvell/mouse-modules
+++ b/debian/installer/modules/armel-marvell/mouse-modules
diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/modules/armel-marvell/mtd-modules
index c1aeb935aaa8..c1aeb935aaa8 100644
--- a/debian/installer/armel/modules/armel-marvell/mtd-modules
+++ b/debian/installer/modules/armel-marvell/mtd-modules
diff --git a/debian/installer/armel/modules/armel-marvell/multipath-modules b/debian/installer/modules/armel-marvell/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/armel/modules/armel-marvell/multipath-modules
+++ b/debian/installer/modules/armel-marvell/multipath-modules
diff --git a/debian/installer/armel/modules/armel-marvell/nbd-modules b/debian/installer/modules/armel-marvell/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/armel/modules/armel-marvell/nbd-modules
+++ b/debian/installer/modules/armel-marvell/nbd-modules
diff --git a/debian/installer/armel/modules/armel-marvell/nic-modules b/debian/installer/modules/armel-marvell/nic-modules
index 1a2cdb1fc9fe..1a2cdb1fc9fe 100644
--- a/debian/installer/armel/modules/armel-marvell/nic-modules
+++ b/debian/installer/modules/armel-marvell/nic-modules
diff --git a/debian/installer/armel/modules/armel-marvell/nic-shared-modules b/debian/installer/modules/armel-marvell/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/armel/modules/armel-marvell/nic-shared-modules
+++ b/debian/installer/modules/armel-marvell/nic-shared-modules
diff --git a/debian/installer/armel/modules/armel-marvell/nic-usb-modules b/debian/installer/modules/armel-marvell/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/armel/modules/armel-marvell/nic-usb-modules
+++ b/debian/installer/modules/armel-marvell/nic-usb-modules
diff --git a/debian/installer/armel/modules/armel-marvell/ppp-modules b/debian/installer/modules/armel-marvell/ppp-modules
index f1ae9b3d15ac..f1ae9b3d15ac 100644
--- a/debian/installer/armel/modules/armel-marvell/ppp-modules
+++ b/debian/installer/modules/armel-marvell/ppp-modules
diff --git a/debian/installer/armel/modules/armel-marvell/sata-modules b/debian/installer/modules/armel-marvell/sata-modules
index 3adbfa16df88..3adbfa16df88 100644
--- a/debian/installer/armel/modules/armel-marvell/sata-modules
+++ b/debian/installer/modules/armel-marvell/sata-modules
diff --git a/debian/installer/armel/modules/armel-marvell/scsi-core-modules b/debian/installer/modules/armel-marvell/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/armel/modules/armel-marvell/scsi-core-modules
+++ b/debian/installer/modules/armel-marvell/scsi-core-modules
diff --git a/debian/installer/armel/modules/armel-marvell/squashfs-modules b/debian/installer/modules/armel-marvell/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/armel/modules/armel-marvell/squashfs-modules
+++ b/debian/installer/modules/armel-marvell/squashfs-modules
diff --git a/debian/installer/armel/modules/armel-marvell/udf-modules b/debian/installer/modules/armel-marvell/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/armel/modules/armel-marvell/udf-modules
+++ b/debian/installer/modules/armel-marvell/udf-modules
diff --git a/debian/installer/armel/modules/armel-marvell/uinput-modules b/debian/installer/modules/armel-marvell/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/armel/modules/armel-marvell/uinput-modules
+++ b/debian/installer/modules/armel-marvell/uinput-modules
diff --git a/debian/installer/armel/modules/armel-marvell/usb-modules b/debian/installer/modules/armel-marvell/usb-modules
index 772c4afee3a5..772c4afee3a5 100644
--- a/debian/installer/armel/modules/armel-marvell/usb-modules
+++ b/debian/installer/modules/armel-marvell/usb-modules
diff --git a/debian/installer/armel/modules/armel-marvell/usb-serial-modules b/debian/installer/modules/armel-marvell/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/armel/modules/armel-marvell/usb-serial-modules
+++ b/debian/installer/modules/armel-marvell/usb-serial-modules
diff --git a/debian/installer/armel/modules/armel-marvell/usb-storage-modules b/debian/installer/modules/armel-marvell/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/armel/modules/armel-marvell/usb-storage-modules
+++ b/debian/installer/modules/armel-marvell/usb-storage-modules
diff --git a/debian/installer/armel/modules/armel-marvell/zlib-modules b/debian/installer/modules/armel-marvell/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/armel/modules/armel-marvell/zlib-modules
+++ b/debian/installer/modules/armel-marvell/zlib-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/ata-modules b/debian/installer/modules/armhf-armmp/ata-modules
index 04d9c88411a2..04d9c88411a2 100644
--- a/debian/installer/armhf/modules/armhf-armmp/ata-modules
+++ b/debian/installer/modules/armhf-armmp/ata-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/btrfs-modules b/debian/installer/modules/armhf-armmp/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/armhf/modules/armhf-armmp/btrfs-modules
+++ b/debian/installer/modules/armhf-armmp/btrfs-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/compress-modules b/debian/installer/modules/armhf-armmp/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/armhf/modules/armhf-armmp/compress-modules
+++ b/debian/installer/modules/armhf-armmp/compress-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/crc-modules b/debian/installer/modules/armhf-armmp/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/armhf/modules/armhf-armmp/crc-modules
+++ b/debian/installer/modules/armhf-armmp/crc-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/crypto-dm-modules b/debian/installer/modules/armhf-armmp/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/armhf/modules/armhf-armmp/crypto-dm-modules
+++ b/debian/installer/modules/armhf-armmp/crypto-dm-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/crypto-modules b/debian/installer/modules/armhf-armmp/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/armhf/modules/armhf-armmp/crypto-modules
+++ b/debian/installer/modules/armhf-armmp/crypto-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/efi-modules b/debian/installer/modules/armhf-armmp/efi-modules
index e1dc05e8f247..e1dc05e8f247 100644
--- a/debian/installer/armhf/modules/armhf-armmp/efi-modules
+++ b/debian/installer/modules/armhf-armmp/efi-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/event-modules b/debian/installer/modules/armhf-armmp/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/armhf/modules/armhf-armmp/event-modules
+++ b/debian/installer/modules/armhf-armmp/event-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/ext4-modules b/debian/installer/modules/armhf-armmp/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/armhf/modules/armhf-armmp/ext4-modules
+++ b/debian/installer/modules/armhf-armmp/ext4-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/fat-modules b/debian/installer/modules/armhf-armmp/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/armhf/modules/armhf-armmp/fat-modules
+++ b/debian/installer/modules/armhf-armmp/fat-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/fb-modules b/debian/installer/modules/armhf-armmp/fb-modules
index 8ec57ab80a89..8ec57ab80a89 100644
--- a/debian/installer/armhf/modules/armhf-armmp/fb-modules
+++ b/debian/installer/modules/armhf-armmp/fb-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/fuse-modules b/debian/installer/modules/armhf-armmp/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/armhf/modules/armhf-armmp/fuse-modules
+++ b/debian/installer/modules/armhf-armmp/fuse-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/i2c-modules b/debian/installer/modules/armhf-armmp/i2c-modules
index 5690c2f51f22..5690c2f51f22 100644
--- a/debian/installer/armhf/modules/armhf-armmp/i2c-modules
+++ b/debian/installer/modules/armhf-armmp/i2c-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/input-modules b/debian/installer/modules/armhf-armmp/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/armhf/modules/armhf-armmp/input-modules
+++ b/debian/installer/modules/armhf-armmp/input-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/isofs-modules b/debian/installer/modules/armhf-armmp/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/armhf/modules/armhf-armmp/isofs-modules
+++ b/debian/installer/modules/armhf-armmp/isofs-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/jfs-modules b/debian/installer/modules/armhf-armmp/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/armhf/modules/armhf-armmp/jfs-modules
+++ b/debian/installer/modules/armhf-armmp/jfs-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/kernel-image b/debian/installer/modules/armhf-armmp/kernel-image
index 0651d89dccad..0651d89dccad 100644
--- a/debian/installer/armhf/modules/armhf-armmp/kernel-image
+++ b/debian/installer/modules/armhf-armmp/kernel-image
diff --git a/debian/installer/armhf/modules/armhf-armmp/leds-modules b/debian/installer/modules/armhf-armmp/leds-modules
index 85d9f2565c1c..85d9f2565c1c 100644
--- a/debian/installer/armhf/modules/armhf-armmp/leds-modules
+++ b/debian/installer/modules/armhf-armmp/leds-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/loop-modules b/debian/installer/modules/armhf-armmp/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/armhf/modules/armhf-armmp/loop-modules
+++ b/debian/installer/modules/armhf-armmp/loop-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/md-modules b/debian/installer/modules/armhf-armmp/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/armhf/modules/armhf-armmp/md-modules
+++ b/debian/installer/modules/armhf-armmp/md-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/modules/armhf-armmp/mmc-modules
index dadfd5334d62..dadfd5334d62 100644
--- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
+++ b/debian/installer/modules/armhf-armmp/mmc-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/mtd-modules b/debian/installer/modules/armhf-armmp/mtd-modules
index fb81032eaee1..fb81032eaee1 100644
--- a/debian/installer/armhf/modules/armhf-armmp/mtd-modules
+++ b/debian/installer/modules/armhf-armmp/mtd-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/multipath-modules b/debian/installer/modules/armhf-armmp/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/armhf/modules/armhf-armmp/multipath-modules
+++ b/debian/installer/modules/armhf-armmp/multipath-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/nbd-modules b/debian/installer/modules/armhf-armmp/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/armhf/modules/armhf-armmp/nbd-modules
+++ b/debian/installer/modules/armhf-armmp/nbd-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-modules b/debian/installer/modules/armhf-armmp/nic-modules
index 75a4eb931006..75a4eb931006 100644
--- a/debian/installer/armhf/modules/armhf-armmp/nic-modules
+++ b/debian/installer/modules/armhf-armmp/nic-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-shared-modules b/debian/installer/modules/armhf-armmp/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/armhf/modules/armhf-armmp/nic-shared-modules
+++ b/debian/installer/modules/armhf-armmp/nic-shared-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-usb-modules b/debian/installer/modules/armhf-armmp/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/armhf/modules/armhf-armmp/nic-usb-modules
+++ b/debian/installer/modules/armhf-armmp/nic-usb-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-wireless-modules b/debian/installer/modules/armhf-armmp/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/armhf/modules/armhf-armmp/nic-wireless-modules
+++ b/debian/installer/modules/armhf-armmp/nic-wireless-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/pata-modules b/debian/installer/modules/armhf-armmp/pata-modules
index 2ff7276d4026..2ff7276d4026 100644
--- a/debian/installer/armhf/modules/armhf-armmp/pata-modules
+++ b/debian/installer/modules/armhf-armmp/pata-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/ppp-modules b/debian/installer/modules/armhf-armmp/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/armhf/modules/armhf-armmp/ppp-modules
+++ b/debian/installer/modules/armhf-armmp/ppp-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/sata-modules b/debian/installer/modules/armhf-armmp/sata-modules
index 8e7e1ed2c5ea..8e7e1ed2c5ea 100644
--- a/debian/installer/armhf/modules/armhf-armmp/sata-modules
+++ b/debian/installer/modules/armhf-armmp/sata-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/scsi-core-modules b/debian/installer/modules/armhf-armmp/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/armhf/modules/armhf-armmp/scsi-core-modules
+++ b/debian/installer/modules/armhf-armmp/scsi-core-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/scsi-modules b/debian/installer/modules/armhf-armmp/scsi-modules
index 675462a141fa..675462a141fa 100644
--- a/debian/installer/armhf/modules/armhf-armmp/scsi-modules
+++ b/debian/installer/modules/armhf-armmp/scsi-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/squashfs-modules b/debian/installer/modules/armhf-armmp/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/armhf/modules/armhf-armmp/squashfs-modules
+++ b/debian/installer/modules/armhf-armmp/squashfs-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/udf-modules b/debian/installer/modules/armhf-armmp/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/armhf/modules/armhf-armmp/udf-modules
+++ b/debian/installer/modules/armhf-armmp/udf-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/uinput-modules b/debian/installer/modules/armhf-armmp/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/armhf/modules/armhf-armmp/uinput-modules
+++ b/debian/installer/modules/armhf-armmp/uinput-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/modules/armhf-armmp/usb-modules
index 5917b7f79aea..5917b7f79aea 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/modules/armhf-armmp/usb-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-storage-modules b/debian/installer/modules/armhf-armmp/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-storage-modules
+++ b/debian/installer/modules/armhf-armmp/usb-storage-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/virtio-modules b/debian/installer/modules/armhf-armmp/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/armhf/modules/armhf-armmp/virtio-modules
+++ b/debian/installer/modules/armhf-armmp/virtio-modules
diff --git a/debian/installer/armhf/modules/armhf-armmp/zlib-modules b/debian/installer/modules/armhf-armmp/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/armhf/modules/armhf-armmp/zlib-modules
+++ b/debian/installer/modules/armhf-armmp/zlib-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules b/debian/installer/modules/hppa-parisc64-smp/ata-modules
index 08f295ad210d..08f295ad210d 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/ata-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/btrfs-modules b/debian/installer/modules/hppa-parisc64-smp/btrfs-modules
index 677b351f7b98..677b351f7b98 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/btrfs-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/btrfs-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/cdrom-core-modules b/debian/installer/modules/hppa-parisc64-smp/cdrom-core-modules
index 9656269beb64..9656269beb64 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/cdrom-core-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/cdrom-core-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules b/debian/installer/modules/hppa-parisc64-smp/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/compress-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crc-modules b/debian/installer/modules/hppa-parisc64-smp/crc-modules
index f75e86b30df5..f75e86b30df5 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/crc-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/crc-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-dm-modules b/debian/installer/modules/hppa-parisc64-smp/crypto-dm-modules
index ed740a5513f1..ed740a5513f1 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-dm-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/crypto-dm-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-modules b/debian/installer/modules/hppa-parisc64-smp/crypto-modules
index 1c4d2d0cf592..1c4d2d0cf592 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/crypto-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/event-modules b/debian/installer/modules/hppa-parisc64-smp/event-modules
index 1a5cbb04af9d..1a5cbb04af9d 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/event-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/event-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ext4-modules b/debian/installer/modules/hppa-parisc64-smp/ext4-modules
index 00920ace1118..00920ace1118 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/ext4-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/ext4-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fat-modules b/debian/installer/modules/hppa-parisc64-smp/fat-modules
index ef6dd33ff50d..ef6dd33ff50d 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/fat-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/fat-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fb-modules b/debian/installer/modules/hppa-parisc64-smp/fb-modules
index acaf53bbaa51..acaf53bbaa51 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/fb-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/fb-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fuse-modules b/debian/installer/modules/hppa-parisc64-smp/fuse-modules
index 06f8ccf63172..06f8ccf63172 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/fuse-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/fuse-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/input-modules b/debian/installer/modules/hppa-parisc64-smp/input-modules
index cdeaa30fed3e..cdeaa30fed3e 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/input-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/input-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/isofs-modules b/debian/installer/modules/hppa-parisc64-smp/isofs-modules
index 9e8e2dfb1fae..9e8e2dfb1fae 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/isofs-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/isofs-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/jfs-modules b/debian/installer/modules/hppa-parisc64-smp/jfs-modules
index a3b6beb7d3a7..a3b6beb7d3a7 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/jfs-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/jfs-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image b/debian/installer/modules/hppa-parisc64-smp/kernel-image
index 93d59f539817..93d59f539817 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image
+++ b/debian/installer/modules/hppa-parisc64-smp/kernel-image
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/loop-modules b/debian/installer/modules/hppa-parisc64-smp/loop-modules
index 721ffecf45e4..721ffecf45e4 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/loop-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/loop-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/md-modules b/debian/installer/modules/hppa-parisc64-smp/md-modules
index d7e97202280e..d7e97202280e 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/md-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/md-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/mouse-modules b/debian/installer/modules/hppa-parisc64-smp/mouse-modules
index f9edf83b0163..f9edf83b0163 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/mouse-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/mouse-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/multipath-modules b/debian/installer/modules/hppa-parisc64-smp/multipath-modules
index 46f68a37a48f..46f68a37a48f 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/multipath-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/multipath-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nbd-modules b/debian/installer/modules/hppa-parisc64-smp/nbd-modules
index b4c4622c7318..b4c4622c7318 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/nbd-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/nbd-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-modules b/debian/installer/modules/hppa-parisc64-smp/nic-modules
index e15b2d573904..e15b2d573904 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/nic-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules b/debian/installer/modules/hppa-parisc64-smp/nic-shared-modules
index fd0b19c80712..fd0b19c80712 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/nic-shared-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-usb-modules b/debian/installer/modules/hppa-parisc64-smp/nic-usb-modules
index 261192d2e87a..261192d2e87a 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-usb-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/nic-usb-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/pata-modules b/debian/installer/modules/hppa-parisc64-smp/pata-modules
index 46bc71900e6d..46bc71900e6d 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/pata-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/pata-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ppp-modules b/debian/installer/modules/hppa-parisc64-smp/ppp-modules
index b78085c3487e..b78085c3487e 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/ppp-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/ppp-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/sata-modules b/debian/installer/modules/hppa-parisc64-smp/sata-modules
index a2ebc29835de..a2ebc29835de 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/sata-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/sata-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-core-modules b/debian/installer/modules/hppa-parisc64-smp/scsi-core-modules
index ff84a7089d9b..ff84a7089d9b 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-core-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/scsi-core-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-modules b/debian/installer/modules/hppa-parisc64-smp/scsi-modules
index 229e060a8f07..229e060a8f07 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/scsi-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/serial-modules b/debian/installer/modules/hppa-parisc64-smp/serial-modules
index a84a550e85b7..a84a550e85b7 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/serial-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/serial-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/squashfs-modules b/debian/installer/modules/hppa-parisc64-smp/squashfs-modules
index f0c79aa4ee92..f0c79aa4ee92 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/squashfs-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/squashfs-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-modules b/debian/installer/modules/hppa-parisc64-smp/usb-modules
index df2abbbd9f3c..df2abbbd9f3c 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/usb-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-serial-modules b/debian/installer/modules/hppa-parisc64-smp/usb-serial-modules
index 1dd05036f229..1dd05036f229 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-serial-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/usb-serial-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-storage-modules b/debian/installer/modules/hppa-parisc64-smp/usb-storage-modules
index 5562ed4c879e..5562ed4c879e 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-storage-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/usb-storage-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/virtio-modules b/debian/installer/modules/hppa-parisc64-smp/virtio-modules
index 2f4e67a8a6a0..2f4e67a8a6a0 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/virtio-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/virtio-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/xfs-modules b/debian/installer/modules/hppa-parisc64-smp/xfs-modules
index 7960e0bb2a6a..7960e0bb2a6a 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/xfs-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/xfs-modules
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/zlib-modules b/debian/installer/modules/hppa-parisc64-smp/zlib-modules
index b3f829cf2dd1..b3f829cf2dd1 100644
--- a/debian/installer/hppa/modules/hppa-parisc64-smp/zlib-modules
+++ b/debian/installer/modules/hppa-parisc64-smp/zlib-modules
diff --git a/debian/installer/hppa/modules/hppa/ata-modules b/debian/installer/modules/hppa/ata-modules
index b81c0f38b74a..b81c0f38b74a 100644
--- a/debian/installer/hppa/modules/hppa/ata-modules
+++ b/debian/installer/modules/hppa/ata-modules
diff --git a/debian/installer/hppa/modules/hppa/btrfs-modules b/debian/installer/modules/hppa/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/hppa/modules/hppa/btrfs-modules
+++ b/debian/installer/modules/hppa/btrfs-modules
diff --git a/debian/installer/hppa/modules/hppa/cdrom-core-modules b/debian/installer/modules/hppa/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/hppa/modules/hppa/cdrom-core-modules
+++ b/debian/installer/modules/hppa/cdrom-core-modules
diff --git a/debian/installer/hppa/modules/hppa/compress-modules b/debian/installer/modules/hppa/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/hppa/modules/hppa/compress-modules
+++ b/debian/installer/modules/hppa/compress-modules
diff --git a/debian/installer/hppa/modules/hppa/crc-modules b/debian/installer/modules/hppa/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/hppa/modules/hppa/crc-modules
+++ b/debian/installer/modules/hppa/crc-modules
diff --git a/debian/installer/hppa/modules/hppa/crypto-dm-modules b/debian/installer/modules/hppa/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/hppa/modules/hppa/crypto-dm-modules
+++ b/debian/installer/modules/hppa/crypto-dm-modules
diff --git a/debian/installer/hppa/modules/hppa/crypto-modules b/debian/installer/modules/hppa/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/hppa/modules/hppa/crypto-modules
+++ b/debian/installer/modules/hppa/crypto-modules
diff --git a/debian/installer/hppa/modules/hppa/event-modules b/debian/installer/modules/hppa/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/hppa/modules/hppa/event-modules
+++ b/debian/installer/modules/hppa/event-modules
diff --git a/debian/installer/hppa/modules/hppa/ext4-modules b/debian/installer/modules/hppa/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/hppa/modules/hppa/ext4-modules
+++ b/debian/installer/modules/hppa/ext4-modules
diff --git a/debian/installer/hppa/modules/hppa/fat-modules b/debian/installer/modules/hppa/fat-modules
index cce8fd30ca4f..cce8fd30ca4f 100644
--- a/debian/installer/hppa/modules/hppa/fat-modules
+++ b/debian/installer/modules/hppa/fat-modules
diff --git a/debian/installer/hppa/modules/hppa/fuse-modules b/debian/installer/modules/hppa/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/hppa/modules/hppa/fuse-modules
+++ b/debian/installer/modules/hppa/fuse-modules
diff --git a/debian/installer/hppa/modules/hppa/input-modules b/debian/installer/modules/hppa/input-modules
index 9d4cbf6fa7ae..9d4cbf6fa7ae 100644
--- a/debian/installer/hppa/modules/hppa/input-modules
+++ b/debian/installer/modules/hppa/input-modules
diff --git a/debian/installer/hppa/modules/hppa/isofs-modules b/debian/installer/modules/hppa/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/hppa/modules/hppa/isofs-modules
+++ b/debian/installer/modules/hppa/isofs-modules
diff --git a/debian/installer/hppa/modules/hppa/jfs-modules b/debian/installer/modules/hppa/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/hppa/modules/hppa/jfs-modules
+++ b/debian/installer/modules/hppa/jfs-modules
diff --git a/debian/installer/hppa/modules/hppa/kernel-image b/debian/installer/modules/hppa/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/hppa/modules/hppa/kernel-image
+++ b/debian/installer/modules/hppa/kernel-image
diff --git a/debian/installer/hppa/modules/hppa/loop-modules b/debian/installer/modules/hppa/loop-modules
index 164467713763..164467713763 100644
--- a/debian/installer/hppa/modules/hppa/loop-modules
+++ b/debian/installer/modules/hppa/loop-modules
diff --git a/debian/installer/hppa/modules/hppa/md-modules b/debian/installer/modules/hppa/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/hppa/modules/hppa/md-modules
+++ b/debian/installer/modules/hppa/md-modules
diff --git a/debian/installer/hppa/modules/hppa/mouse-modules b/debian/installer/modules/hppa/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/hppa/modules/hppa/mouse-modules
+++ b/debian/installer/modules/hppa/mouse-modules
diff --git a/debian/installer/hppa/modules/hppa/multipath-modules b/debian/installer/modules/hppa/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/hppa/modules/hppa/multipath-modules
+++ b/debian/installer/modules/hppa/multipath-modules
diff --git a/debian/installer/hppa/modules/hppa/nbd-modules b/debian/installer/modules/hppa/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/hppa/modules/hppa/nbd-modules
+++ b/debian/installer/modules/hppa/nbd-modules
diff --git a/debian/installer/hppa/modules/hppa/nic-modules b/debian/installer/modules/hppa/nic-modules
index 8a4b656c9ad9..8a4b656c9ad9 100644
--- a/debian/installer/hppa/modules/hppa/nic-modules
+++ b/debian/installer/modules/hppa/nic-modules
diff --git a/debian/installer/hppa/modules/hppa/nic-shared-modules b/debian/installer/modules/hppa/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/hppa/modules/hppa/nic-shared-modules
+++ b/debian/installer/modules/hppa/nic-shared-modules
diff --git a/debian/installer/hppa/modules/hppa/nic-usb-modules b/debian/installer/modules/hppa/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/hppa/modules/hppa/nic-usb-modules
+++ b/debian/installer/modules/hppa/nic-usb-modules
diff --git a/debian/installer/hppa/modules/hppa/pata-modules b/debian/installer/modules/hppa/pata-modules
index 8c4e514ae724..8c4e514ae724 100644
--- a/debian/installer/hppa/modules/hppa/pata-modules
+++ b/debian/installer/modules/hppa/pata-modules
diff --git a/debian/installer/hppa/modules/hppa/ppp-modules b/debian/installer/modules/hppa/ppp-modules
index f1ae9b3d15ac..f1ae9b3d15ac 100644
--- a/debian/installer/hppa/modules/hppa/ppp-modules
+++ b/debian/installer/modules/hppa/ppp-modules
diff --git a/debian/installer/hppa/modules/hppa/sata-modules b/debian/installer/modules/hppa/sata-modules
index 071cb860bbc5..071cb860bbc5 100644
--- a/debian/installer/hppa/modules/hppa/sata-modules
+++ b/debian/installer/modules/hppa/sata-modules
diff --git a/debian/installer/hppa/modules/hppa/scsi-core-modules b/debian/installer/modules/hppa/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/hppa/modules/hppa/scsi-core-modules
+++ b/debian/installer/modules/hppa/scsi-core-modules
diff --git a/debian/installer/hppa/modules/hppa/scsi-modules b/debian/installer/modules/hppa/scsi-modules
index 43d9b0397d61..43d9b0397d61 100644
--- a/debian/installer/hppa/modules/hppa/scsi-modules
+++ b/debian/installer/modules/hppa/scsi-modules
diff --git a/debian/installer/hppa/modules/hppa/serial-modules b/debian/installer/modules/hppa/serial-modules
index 6ab8b8c3551b..6ab8b8c3551b 100644
--- a/debian/installer/hppa/modules/hppa/serial-modules
+++ b/debian/installer/modules/hppa/serial-modules
diff --git a/debian/installer/hppa/modules/hppa/squashfs-modules b/debian/installer/modules/hppa/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/hppa/modules/hppa/squashfs-modules
+++ b/debian/installer/modules/hppa/squashfs-modules
diff --git a/debian/installer/hppa/modules/hppa/usb-modules b/debian/installer/modules/hppa/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/hppa/modules/hppa/usb-modules
+++ b/debian/installer/modules/hppa/usb-modules
diff --git a/debian/installer/hppa/modules/hppa/usb-serial-modules b/debian/installer/modules/hppa/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/hppa/modules/hppa/usb-serial-modules
+++ b/debian/installer/modules/hppa/usb-serial-modules
diff --git a/debian/installer/hppa/modules/hppa/usb-storage-modules b/debian/installer/modules/hppa/usb-storage-modules
index 272d95e2e8b1..272d95e2e8b1 100644
--- a/debian/installer/hppa/modules/hppa/usb-storage-modules
+++ b/debian/installer/modules/hppa/usb-storage-modules
diff --git a/debian/installer/hppa/modules/hppa/virtio-modules b/debian/installer/modules/hppa/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/hppa/modules/hppa/virtio-modules
+++ b/debian/installer/modules/hppa/virtio-modules
diff --git a/debian/installer/hppa/modules/hppa/xfs-modules b/debian/installer/modules/hppa/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/hppa/modules/hppa/xfs-modules
+++ b/debian/installer/modules/hppa/xfs-modules
diff --git a/debian/installer/hppa/modules/hppa/zlib-modules b/debian/installer/modules/hppa/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/hppa/modules/hppa/zlib-modules
+++ b/debian/installer/modules/hppa/zlib-modules
diff --git a/debian/installer/i386/modules/i386/acpi-modules b/debian/installer/modules/i386/acpi-modules
index 307528fb17e9..307528fb17e9 100644
--- a/debian/installer/i386/modules/i386/acpi-modules
+++ b/debian/installer/modules/i386/acpi-modules
diff --git a/debian/installer/i386/modules/i386/ata-modules b/debian/installer/modules/i386/ata-modules
index 9409e7cde816..9409e7cde816 100644
--- a/debian/installer/i386/modules/i386/ata-modules
+++ b/debian/installer/modules/i386/ata-modules
diff --git a/debian/installer/i386/modules/i386/btrfs-modules b/debian/installer/modules/i386/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/i386/modules/i386/btrfs-modules
+++ b/debian/installer/modules/i386/btrfs-modules
diff --git a/debian/installer/i386/modules/i386/cdrom-core-modules b/debian/installer/modules/i386/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/i386/modules/i386/cdrom-core-modules
+++ b/debian/installer/modules/i386/cdrom-core-modules
diff --git a/debian/installer/i386/modules/i386/compress-modules b/debian/installer/modules/i386/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/i386/modules/i386/compress-modules
+++ b/debian/installer/modules/i386/compress-modules
diff --git a/debian/installer/i386/modules/i386/crc-modules b/debian/installer/modules/i386/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/i386/modules/i386/crc-modules
+++ b/debian/installer/modules/i386/crc-modules
diff --git a/debian/installer/i386/modules/i386/crypto-dm-modules b/debian/installer/modules/i386/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/i386/modules/i386/crypto-dm-modules
+++ b/debian/installer/modules/i386/crypto-dm-modules
diff --git a/debian/installer/i386/modules/i386/crypto-modules b/debian/installer/modules/i386/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/i386/modules/i386/crypto-modules
+++ b/debian/installer/modules/i386/crypto-modules
diff --git a/debian/installer/i386/modules/i386/efi-modules b/debian/installer/modules/i386/efi-modules
index e1dc05e8f247..e1dc05e8f247 100644
--- a/debian/installer/i386/modules/i386/efi-modules
+++ b/debian/installer/modules/i386/efi-modules
diff --git a/debian/installer/i386/modules/i386/event-modules b/debian/installer/modules/i386/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/i386/modules/i386/event-modules
+++ b/debian/installer/modules/i386/event-modules
diff --git a/debian/installer/i386/modules/i386/ext4-modules b/debian/installer/modules/i386/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/i386/modules/i386/ext4-modules
+++ b/debian/installer/modules/i386/ext4-modules
diff --git a/debian/installer/i386/modules/i386/fat-modules b/debian/installer/modules/i386/fat-modules
index cce8fd30ca4f..cce8fd30ca4f 100644
--- a/debian/installer/i386/modules/i386/fat-modules
+++ b/debian/installer/modules/i386/fat-modules
diff --git a/debian/installer/i386/modules/i386/fb-modules b/debian/installer/modules/i386/fb-modules
index b664dcb55a71..b664dcb55a71 100644
--- a/debian/installer/i386/modules/i386/fb-modules
+++ b/debian/installer/modules/i386/fb-modules
diff --git a/debian/installer/i386/modules/i386/firewire-core-modules b/debian/installer/modules/i386/firewire-core-modules
index dcac80af9651..dcac80af9651 100644
--- a/debian/installer/i386/modules/i386/firewire-core-modules
+++ b/debian/installer/modules/i386/firewire-core-modules
diff --git a/debian/installer/i386/modules/i386/fuse-modules b/debian/installer/modules/i386/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/i386/modules/i386/fuse-modules
+++ b/debian/installer/modules/i386/fuse-modules
diff --git a/debian/installer/i386/modules/i386/hyperv-modules b/debian/installer/modules/i386/hyperv-modules
index 69fdd5d22a85..69fdd5d22a85 100644
--- a/debian/installer/i386/modules/i386/hyperv-modules
+++ b/debian/installer/modules/i386/hyperv-modules
diff --git a/debian/installer/i386/modules/i386/i2c-modules b/debian/installer/modules/i386/i2c-modules
index 203a607e73ce..203a607e73ce 100644
--- a/debian/installer/i386/modules/i386/i2c-modules
+++ b/debian/installer/modules/i386/i2c-modules
diff --git a/debian/installer/i386/modules/i386/input-modules b/debian/installer/modules/i386/input-modules
index cdba2e4a79c6..cdba2e4a79c6 100644
--- a/debian/installer/i386/modules/i386/input-modules
+++ b/debian/installer/modules/i386/input-modules
diff --git a/debian/installer/i386/modules/i386/isofs-modules b/debian/installer/modules/i386/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/i386/modules/i386/isofs-modules
+++ b/debian/installer/modules/i386/isofs-modules
diff --git a/debian/installer/i386/modules/i386/jfs-modules b/debian/installer/modules/i386/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/i386/modules/i386/jfs-modules
+++ b/debian/installer/modules/i386/jfs-modules
diff --git a/debian/installer/i386/modules/i386/kernel-image b/debian/installer/modules/i386/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/i386/modules/i386/kernel-image
+++ b/debian/installer/modules/i386/kernel-image
diff --git a/debian/installer/i386/modules/i386/loop-modules b/debian/installer/modules/i386/loop-modules
index 164467713763..164467713763 100644
--- a/debian/installer/i386/modules/i386/loop-modules
+++ b/debian/installer/modules/i386/loop-modules
diff --git a/debian/installer/i386/modules/i386/md-modules b/debian/installer/modules/i386/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/i386/modules/i386/md-modules
+++ b/debian/installer/modules/i386/md-modules
diff --git a/debian/installer/i386/modules/i386/mmc-core-modules b/debian/installer/modules/i386/mmc-core-modules
index 7bf38465cf1b..7bf38465cf1b 100644
--- a/debian/installer/i386/modules/i386/mmc-core-modules
+++ b/debian/installer/modules/i386/mmc-core-modules
diff --git a/debian/installer/i386/modules/i386/mmc-modules b/debian/installer/modules/i386/mmc-modules
index dadfd5334d62..dadfd5334d62 100644
--- a/debian/installer/i386/modules/i386/mmc-modules
+++ b/debian/installer/modules/i386/mmc-modules
diff --git a/debian/installer/i386/modules/i386/mouse-modules b/debian/installer/modules/i386/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/i386/modules/i386/mouse-modules
+++ b/debian/installer/modules/i386/mouse-modules
diff --git a/debian/installer/i386/modules/i386/multipath-modules b/debian/installer/modules/i386/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/i386/modules/i386/multipath-modules
+++ b/debian/installer/modules/i386/multipath-modules
diff --git a/debian/installer/i386/modules/i386/nbd-modules b/debian/installer/modules/i386/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/i386/modules/i386/nbd-modules
+++ b/debian/installer/modules/i386/nbd-modules
diff --git a/debian/installer/i386/modules/i386/nic-modules b/debian/installer/modules/i386/nic-modules
index 2512e83950dd..2512e83950dd 100644
--- a/debian/installer/i386/modules/i386/nic-modules
+++ b/debian/installer/modules/i386/nic-modules
diff --git a/debian/installer/i386/modules/i386/nic-pcmcia-modules b/debian/installer/modules/i386/nic-pcmcia-modules
index 7a0702cd5585..7a0702cd5585 100644
--- a/debian/installer/i386/modules/i386/nic-pcmcia-modules
+++ b/debian/installer/modules/i386/nic-pcmcia-modules
diff --git a/debian/installer/i386/modules/i386/nic-shared-modules b/debian/installer/modules/i386/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/i386/modules/i386/nic-shared-modules
+++ b/debian/installer/modules/i386/nic-shared-modules
diff --git a/debian/installer/i386/modules/i386/nic-usb-modules b/debian/installer/modules/i386/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/i386/modules/i386/nic-usb-modules
+++ b/debian/installer/modules/i386/nic-usb-modules
diff --git a/debian/installer/i386/modules/i386/nic-wireless-modules b/debian/installer/modules/i386/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/i386/modules/i386/nic-wireless-modules
+++ b/debian/installer/modules/i386/nic-wireless-modules
diff --git a/debian/installer/i386/modules/i386/ntfs-modules b/debian/installer/modules/i386/ntfs-modules
index ac1bc6a9601e..ac1bc6a9601e 100644
--- a/debian/installer/i386/modules/i386/ntfs-modules
+++ b/debian/installer/modules/i386/ntfs-modules
diff --git a/debian/installer/i386/modules/i386/pata-modules b/debian/installer/modules/i386/pata-modules
index 8c4e514ae724..8c4e514ae724 100644
--- a/debian/installer/i386/modules/i386/pata-modules
+++ b/debian/installer/modules/i386/pata-modules
diff --git a/debian/installer/i386/modules/i386/pcmcia-modules b/debian/installer/modules/i386/pcmcia-modules
index 2bb5350fe14f..2bb5350fe14f 100644
--- a/debian/installer/i386/modules/i386/pcmcia-modules
+++ b/debian/installer/modules/i386/pcmcia-modules
diff --git a/debian/installer/i386/modules/i386/pcmcia-storage-modules b/debian/installer/modules/i386/pcmcia-storage-modules
index f73ae5bb9b42..f73ae5bb9b42 100644
--- a/debian/installer/i386/modules/i386/pcmcia-storage-modules
+++ b/debian/installer/modules/i386/pcmcia-storage-modules
diff --git a/debian/installer/i386/modules/i386/ppp-modules b/debian/installer/modules/i386/ppp-modules
index f1ae9b3d15ac..f1ae9b3d15ac 100644
--- a/debian/installer/i386/modules/i386/ppp-modules
+++ b/debian/installer/modules/i386/ppp-modules
diff --git a/debian/installer/i386/modules/i386/sata-modules b/debian/installer/modules/i386/sata-modules
index 071cb860bbc5..071cb860bbc5 100644
--- a/debian/installer/i386/modules/i386/sata-modules
+++ b/debian/installer/modules/i386/sata-modules
diff --git a/debian/installer/i386/modules/i386/scsi-core-modules b/debian/installer/modules/i386/scsi-core-modules
index 778a022fa751..778a022fa751 100644
--- a/debian/installer/i386/modules/i386/scsi-core-modules
+++ b/debian/installer/modules/i386/scsi-core-modules
diff --git a/debian/installer/i386/modules/i386/scsi-modules b/debian/installer/modules/i386/scsi-modules
index 8909dfb79487..8909dfb79487 100644
--- a/debian/installer/i386/modules/i386/scsi-modules
+++ b/debian/installer/modules/i386/scsi-modules
diff --git a/debian/installer/i386/modules/i386/serial-modules b/debian/installer/modules/i386/serial-modules
index 6ab8b8c3551b..6ab8b8c3551b 100644
--- a/debian/installer/i386/modules/i386/serial-modules
+++ b/debian/installer/modules/i386/serial-modules
diff --git a/debian/installer/i386/modules/i386/sound-modules b/debian/installer/modules/i386/sound-modules
index 68395ab3d99a..68395ab3d99a 100644
--- a/debian/installer/i386/modules/i386/sound-modules
+++ b/debian/installer/modules/i386/sound-modules
diff --git a/debian/installer/i386/modules/i386/speakup-modules b/debian/installer/modules/i386/speakup-modules
index 29592721a7aa..29592721a7aa 100644
--- a/debian/installer/i386/modules/i386/speakup-modules
+++ b/debian/installer/modules/i386/speakup-modules
diff --git a/debian/installer/i386/modules/i386/squashfs-modules b/debian/installer/modules/i386/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/i386/modules/i386/squashfs-modules
+++ b/debian/installer/modules/i386/squashfs-modules
diff --git a/debian/installer/i386/modules/i386/udf-modules b/debian/installer/modules/i386/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/i386/modules/i386/udf-modules
+++ b/debian/installer/modules/i386/udf-modules
diff --git a/debian/installer/i386/modules/i386/uinput-modules b/debian/installer/modules/i386/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/i386/modules/i386/uinput-modules
+++ b/debian/installer/modules/i386/uinput-modules
diff --git a/debian/installer/i386/modules/i386/usb-modules b/debian/installer/modules/i386/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/i386/modules/i386/usb-modules
+++ b/debian/installer/modules/i386/usb-modules
diff --git a/debian/installer/i386/modules/i386/usb-serial-modules b/debian/installer/modules/i386/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/i386/modules/i386/usb-serial-modules
+++ b/debian/installer/modules/i386/usb-serial-modules
diff --git a/debian/installer/i386/modules/i386/usb-storage-modules b/debian/installer/modules/i386/usb-storage-modules
index 272d95e2e8b1..272d95e2e8b1 100644
--- a/debian/installer/i386/modules/i386/usb-storage-modules
+++ b/debian/installer/modules/i386/usb-storage-modules
diff --git a/debian/installer/i386/modules/i386/virtio-modules b/debian/installer/modules/i386/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/i386/modules/i386/virtio-modules
+++ b/debian/installer/modules/i386/virtio-modules
diff --git a/debian/installer/i386/modules/i386/xfs-modules b/debian/installer/modules/i386/xfs-modules
index c020b5d399f9..c020b5d399f9 100644
--- a/debian/installer/i386/modules/i386/xfs-modules
+++ b/debian/installer/modules/i386/xfs-modules
diff --git a/debian/installer/ia64/modules/ia64/ata-modules b/debian/installer/modules/ia64/ata-modules
index b81c0f38b74a..b81c0f38b74a 100644
--- a/debian/installer/ia64/modules/ia64/ata-modules
+++ b/debian/installer/modules/ia64/ata-modules
diff --git a/debian/installer/ia64/modules/ia64/btrfs-modules b/debian/installer/modules/ia64/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/ia64/modules/ia64/btrfs-modules
+++ b/debian/installer/modules/ia64/btrfs-modules
diff --git a/debian/installer/ia64/modules/ia64/cdrom-core-modules b/debian/installer/modules/ia64/cdrom-core-modules
index 2c6b1565ddff..2c6b1565ddff 100644
--- a/debian/installer/ia64/modules/ia64/cdrom-core-modules
+++ b/debian/installer/modules/ia64/cdrom-core-modules
diff --git a/debian/installer/ia64/modules/ia64/compress-modules b/debian/installer/modules/ia64/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/ia64/modules/ia64/compress-modules
+++ b/debian/installer/modules/ia64/compress-modules
diff --git a/debian/installer/ia64/modules/ia64/crc-modules b/debian/installer/modules/ia64/crc-modules
index a642ead8be53..a642ead8be53 100644
--- a/debian/installer/ia64/modules/ia64/crc-modules
+++ b/debian/installer/modules/ia64/crc-modules
diff --git a/debian/installer/ia64/modules/ia64/crypto-dm-modules b/debian/installer/modules/ia64/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/ia64/modules/ia64/crypto-dm-modules
+++ b/debian/installer/modules/ia64/crypto-dm-modules
diff --git a/debian/installer/ia64/modules/ia64/crypto-modules b/debian/installer/modules/ia64/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/ia64/modules/ia64/crypto-modules
+++ b/debian/installer/modules/ia64/crypto-modules
diff --git a/debian/installer/ia64/modules/ia64/event-modules b/debian/installer/modules/ia64/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/ia64/modules/ia64/event-modules
+++ b/debian/installer/modules/ia64/event-modules
diff --git a/debian/installer/ia64/modules/ia64/ext4-modules b/debian/installer/modules/ia64/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/ia64/modules/ia64/ext4-modules
+++ b/debian/installer/modules/ia64/ext4-modules
diff --git a/debian/installer/ia64/modules/ia64/fat-modules b/debian/installer/modules/ia64/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/ia64/modules/ia64/fat-modules
+++ b/debian/installer/modules/ia64/fat-modules
diff --git a/debian/installer/ia64/modules/ia64/fb-modules b/debian/installer/modules/ia64/fb-modules
index 1442c89f9109..1442c89f9109 100644
--- a/debian/installer/ia64/modules/ia64/fb-modules
+++ b/debian/installer/modules/ia64/fb-modules
diff --git a/debian/installer/ia64/modules/ia64/firewire-core-modules b/debian/installer/modules/ia64/firewire-core-modules
index 8e5fff165e6c..8e5fff165e6c 100644
--- a/debian/installer/ia64/modules/ia64/firewire-core-modules
+++ b/debian/installer/modules/ia64/firewire-core-modules
diff --git a/debian/installer/ia64/modules/ia64/fuse-modules b/debian/installer/modules/ia64/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/ia64/modules/ia64/fuse-modules
+++ b/debian/installer/modules/ia64/fuse-modules
diff --git a/debian/installer/ia64/modules/ia64/i2c-modules b/debian/installer/modules/ia64/i2c-modules
index 203a607e73ce..203a607e73ce 100644
--- a/debian/installer/ia64/modules/ia64/i2c-modules
+++ b/debian/installer/modules/ia64/i2c-modules
diff --git a/debian/installer/ia64/modules/ia64/ide-core-modules b/debian/installer/modules/ia64/ide-core-modules
index 96284d155017..96284d155017 100644
--- a/debian/installer/ia64/modules/ia64/ide-core-modules
+++ b/debian/installer/modules/ia64/ide-core-modules
diff --git a/debian/installer/ia64/modules/ia64/ide-modules b/debian/installer/modules/ia64/ide-modules
index 3bbc4df7631b..3bbc4df7631b 100644
--- a/debian/installer/ia64/modules/ia64/ide-modules
+++ b/debian/installer/modules/ia64/ide-modules
diff --git a/debian/installer/ia64/modules/ia64/input-modules b/debian/installer/modules/ia64/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/ia64/modules/ia64/input-modules
+++ b/debian/installer/modules/ia64/input-modules
diff --git a/debian/installer/ia64/modules/ia64/isofs-modules b/debian/installer/modules/ia64/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/ia64/modules/ia64/isofs-modules
+++ b/debian/installer/modules/ia64/isofs-modules
diff --git a/debian/installer/ia64/modules/ia64/jfs-modules b/debian/installer/modules/ia64/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/ia64/modules/ia64/jfs-modules
+++ b/debian/installer/modules/ia64/jfs-modules
diff --git a/debian/installer/ia64/modules/ia64/kernel-image b/debian/installer/modules/ia64/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/ia64/modules/ia64/kernel-image
+++ b/debian/installer/modules/ia64/kernel-image
diff --git a/debian/installer/ia64/modules/ia64/loop-modules b/debian/installer/modules/ia64/loop-modules
index 164467713763..164467713763 100644
--- a/debian/installer/ia64/modules/ia64/loop-modules
+++ b/debian/installer/modules/ia64/loop-modules
diff --git a/debian/installer/ia64/modules/ia64/md-modules b/debian/installer/modules/ia64/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/ia64/modules/ia64/md-modules
+++ b/debian/installer/modules/ia64/md-modules
diff --git a/debian/installer/ia64/modules/ia64/mouse-modules b/debian/installer/modules/ia64/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/ia64/modules/ia64/mouse-modules
+++ b/debian/installer/modules/ia64/mouse-modules
diff --git a/debian/installer/ia64/modules/ia64/multipath-modules b/debian/installer/modules/ia64/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/ia64/modules/ia64/multipath-modules
+++ b/debian/installer/modules/ia64/multipath-modules
diff --git a/debian/installer/ia64/modules/ia64/nbd-modules b/debian/installer/modules/ia64/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/ia64/modules/ia64/nbd-modules
+++ b/debian/installer/modules/ia64/nbd-modules
diff --git a/debian/installer/ia64/modules/ia64/nic-modules b/debian/installer/modules/ia64/nic-modules
index 2512e83950dd..2512e83950dd 100644
--- a/debian/installer/ia64/modules/ia64/nic-modules
+++ b/debian/installer/modules/ia64/nic-modules
diff --git a/debian/installer/ia64/modules/ia64/nic-shared-modules b/debian/installer/modules/ia64/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/ia64/modules/ia64/nic-shared-modules
+++ b/debian/installer/modules/ia64/nic-shared-modules
diff --git a/debian/installer/ia64/modules/ia64/nic-usb-modules b/debian/installer/modules/ia64/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/ia64/modules/ia64/nic-usb-modules
+++ b/debian/installer/modules/ia64/nic-usb-modules
diff --git a/debian/installer/ia64/modules/ia64/ntfs-modules b/debian/installer/modules/ia64/ntfs-modules
index ac1bc6a9601e..ac1bc6a9601e 100644
--- a/debian/installer/ia64/modules/ia64/ntfs-modules
+++ b/debian/installer/modules/ia64/ntfs-modules
diff --git a/debian/installer/ia64/modules/ia64/pata-modules b/debian/installer/modules/ia64/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/ia64/modules/ia64/pata-modules
+++ b/debian/installer/modules/ia64/pata-modules
diff --git a/debian/installer/ia64/modules/ia64/pcmcia-modules b/debian/installer/modules/ia64/pcmcia-modules
index d7a54f360f41..d7a54f360f41 100644
--- a/debian/installer/ia64/modules/ia64/pcmcia-modules
+++ b/debian/installer/modules/ia64/pcmcia-modules
diff --git a/debian/installer/ia64/modules/ia64/ppp-modules b/debian/installer/modules/ia64/ppp-modules
index f1ae9b3d15ac..f1ae9b3d15ac 100644
--- a/debian/installer/ia64/modules/ia64/ppp-modules
+++ b/debian/installer/modules/ia64/ppp-modules
diff --git a/debian/installer/ia64/modules/ia64/sata-modules b/debian/installer/modules/ia64/sata-modules
index 071cb860bbc5..071cb860bbc5 100644
--- a/debian/installer/ia64/modules/ia64/sata-modules
+++ b/debian/installer/modules/ia64/sata-modules
diff --git a/debian/installer/ia64/modules/ia64/scsi-core-modules b/debian/installer/modules/ia64/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/ia64/modules/ia64/scsi-core-modules
+++ b/debian/installer/modules/ia64/scsi-core-modules
diff --git a/debian/installer/ia64/modules/ia64/scsi-modules b/debian/installer/modules/ia64/scsi-modules
index 8909dfb79487..8909dfb79487 100644
--- a/debian/installer/ia64/modules/ia64/scsi-modules
+++ b/debian/installer/modules/ia64/scsi-modules
diff --git a/debian/installer/ia64/modules/ia64/serial-modules b/debian/installer/modules/ia64/serial-modules
index 13dac04feb1d..13dac04feb1d 100644
--- a/debian/installer/ia64/modules/ia64/serial-modules
+++ b/debian/installer/modules/ia64/serial-modules
diff --git a/debian/installer/ia64/modules/ia64/sn-modules b/debian/installer/modules/ia64/sn-modules
index 4274c5f89e87..4274c5f89e87 100644
--- a/debian/installer/ia64/modules/ia64/sn-modules
+++ b/debian/installer/modules/ia64/sn-modules
diff --git a/debian/installer/ia64/modules/ia64/squashfs-modules b/debian/installer/modules/ia64/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/ia64/modules/ia64/squashfs-modules
+++ b/debian/installer/modules/ia64/squashfs-modules
diff --git a/debian/installer/ia64/modules/ia64/udf-modules b/debian/installer/modules/ia64/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/ia64/modules/ia64/udf-modules
+++ b/debian/installer/modules/ia64/udf-modules
diff --git a/debian/installer/ia64/modules/ia64/uinput-modules b/debian/installer/modules/ia64/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/ia64/modules/ia64/uinput-modules
+++ b/debian/installer/modules/ia64/uinput-modules
diff --git a/debian/installer/ia64/modules/ia64/usb-modules b/debian/installer/modules/ia64/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/ia64/modules/ia64/usb-modules
+++ b/debian/installer/modules/ia64/usb-modules
diff --git a/debian/installer/ia64/modules/ia64/usb-storage-modules b/debian/installer/modules/ia64/usb-storage-modules
index 272d95e2e8b1..272d95e2e8b1 100644
--- a/debian/installer/ia64/modules/ia64/usb-storage-modules
+++ b/debian/installer/modules/ia64/usb-storage-modules
diff --git a/debian/installer/ia64/modules/ia64/xfs-modules b/debian/installer/modules/ia64/xfs-modules
index c020b5d399f9..c020b5d399f9 100644
--- a/debian/installer/ia64/modules/ia64/xfs-modules
+++ b/debian/installer/modules/ia64/xfs-modules
diff --git a/debian/installer/m68k/modules/m68k/affs-modules b/debian/installer/modules/m68k/affs-modules
index 21d616a1cc94..21d616a1cc94 100644
--- a/debian/installer/m68k/modules/m68k/affs-modules
+++ b/debian/installer/modules/m68k/affs-modules
diff --git a/debian/installer/m68k/modules/m68k/ata-modules b/debian/installer/modules/m68k/ata-modules
index 04d9c88411a2..04d9c88411a2 100644
--- a/debian/installer/m68k/modules/m68k/ata-modules
+++ b/debian/installer/modules/m68k/ata-modules
diff --git a/debian/installer/m68k/modules/m68k/btrfs-modules b/debian/installer/modules/m68k/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/m68k/modules/m68k/btrfs-modules
+++ b/debian/installer/modules/m68k/btrfs-modules
diff --git a/debian/installer/m68k/modules/m68k/cdrom-core-modules b/debian/installer/modules/m68k/cdrom-core-modules
index 71cccaeaab38..71cccaeaab38 100644
--- a/debian/installer/m68k/modules/m68k/cdrom-core-modules
+++ b/debian/installer/modules/m68k/cdrom-core-modules
diff --git a/debian/installer/m68k/modules/m68k/compress-modules b/debian/installer/modules/m68k/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/m68k/modules/m68k/compress-modules
+++ b/debian/installer/modules/m68k/compress-modules
diff --git a/debian/installer/m68k/modules/m68k/crc-modules b/debian/installer/modules/m68k/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/m68k/modules/m68k/crc-modules
+++ b/debian/installer/modules/m68k/crc-modules
diff --git a/debian/installer/m68k/modules/m68k/crypto-modules b/debian/installer/modules/m68k/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/m68k/modules/m68k/crypto-modules
+++ b/debian/installer/modules/m68k/crypto-modules
diff --git a/debian/installer/m68k/modules/m68k/ext4-modules b/debian/installer/modules/m68k/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/m68k/modules/m68k/ext4-modules
+++ b/debian/installer/modules/m68k/ext4-modules
diff --git a/debian/installer/m68k/modules/m68k/fat-modules b/debian/installer/modules/m68k/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/m68k/modules/m68k/fat-modules
+++ b/debian/installer/modules/m68k/fat-modules
diff --git a/debian/installer/m68k/modules/m68k/fuse-modules b/debian/installer/modules/m68k/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/m68k/modules/m68k/fuse-modules
+++ b/debian/installer/modules/m68k/fuse-modules
diff --git a/debian/installer/m68k/modules/m68k/hfs-modules b/debian/installer/modules/m68k/hfs-modules
index 57d12f64921c..57d12f64921c 100644
--- a/debian/installer/m68k/modules/m68k/hfs-modules
+++ b/debian/installer/modules/m68k/hfs-modules
diff --git a/debian/installer/m68k/modules/m68k/ide-core-modules b/debian/installer/modules/m68k/ide-core-modules
index 96284d155017..96284d155017 100644
--- a/debian/installer/m68k/modules/m68k/ide-core-modules
+++ b/debian/installer/modules/m68k/ide-core-modules
diff --git a/debian/installer/m68k/modules/m68k/ide-modules b/debian/installer/modules/m68k/ide-modules
index b01a927557ae..b01a927557ae 100644
--- a/debian/installer/m68k/modules/m68k/ide-modules
+++ b/debian/installer/modules/m68k/ide-modules
diff --git a/debian/installer/m68k/modules/m68k/isofs-modules b/debian/installer/modules/m68k/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/m68k/modules/m68k/isofs-modules
+++ b/debian/installer/modules/m68k/isofs-modules
diff --git a/debian/installer/m68k/modules/m68k/kernel-image b/debian/installer/modules/m68k/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/m68k/modules/m68k/kernel-image
+++ b/debian/installer/modules/m68k/kernel-image
diff --git a/debian/installer/m68k/modules/m68k/loop-modules b/debian/installer/modules/m68k/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/m68k/modules/m68k/loop-modules
+++ b/debian/installer/modules/m68k/loop-modules
diff --git a/debian/installer/m68k/modules/m68k/md-modules b/debian/installer/modules/m68k/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/m68k/modules/m68k/md-modules
+++ b/debian/installer/modules/m68k/md-modules
diff --git a/debian/installer/m68k/modules/m68k/nbd-modules b/debian/installer/modules/m68k/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/m68k/modules/m68k/nbd-modules
+++ b/debian/installer/modules/m68k/nbd-modules
diff --git a/debian/installer/m68k/modules/m68k/nic-modules b/debian/installer/modules/m68k/nic-modules
index 2512e83950dd..2512e83950dd 100644
--- a/debian/installer/m68k/modules/m68k/nic-modules
+++ b/debian/installer/modules/m68k/nic-modules
diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/modules/m68k/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/m68k/modules/m68k/nic-shared-modules
+++ b/debian/installer/modules/m68k/nic-shared-modules
diff --git a/debian/installer/m68k/modules/m68k/pata-modules b/debian/installer/modules/m68k/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/m68k/modules/m68k/pata-modules
+++ b/debian/installer/modules/m68k/pata-modules
diff --git a/debian/installer/m68k/modules/m68k/ppp-modules b/debian/installer/modules/m68k/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/m68k/modules/m68k/ppp-modules
+++ b/debian/installer/modules/m68k/ppp-modules
diff --git a/debian/installer/m68k/modules/m68k/scsi-core-modules b/debian/installer/modules/m68k/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/m68k/modules/m68k/scsi-core-modules
+++ b/debian/installer/modules/m68k/scsi-core-modules
diff --git a/debian/installer/m68k/modules/m68k/scsi-modules b/debian/installer/modules/m68k/scsi-modules
index f2956ef957e9..f2956ef957e9 100644
--- a/debian/installer/m68k/modules/m68k/scsi-modules
+++ b/debian/installer/modules/m68k/scsi-modules
diff --git a/debian/installer/m68k/modules/m68k/squashfs-modules b/debian/installer/modules/m68k/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/m68k/modules/m68k/squashfs-modules
+++ b/debian/installer/modules/m68k/squashfs-modules
diff --git a/debian/installer/m68k/modules/m68k/udf-modules b/debian/installer/modules/m68k/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/m68k/modules/m68k/udf-modules
+++ b/debian/installer/modules/m68k/udf-modules
diff --git a/debian/installer/m68k/modules/m68k/zlib-modules b/debian/installer/modules/m68k/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/m68k/modules/m68k/zlib-modules
+++ b/debian/installer/modules/m68k/zlib-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/affs-modules b/debian/installer/modules/mips-4kc-malta/affs-modules
index 21d616a1cc94..21d616a1cc94 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/affs-modules
+++ b/debian/installer/modules/mips-4kc-malta/affs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/ata-modules b/debian/installer/modules/mips-4kc-malta/ata-modules
index b81c0f38b74a..b81c0f38b74a 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/ata-modules
+++ b/debian/installer/modules/mips-4kc-malta/ata-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/btrfs-modules b/debian/installer/modules/mips-4kc-malta/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/btrfs-modules
+++ b/debian/installer/modules/mips-4kc-malta/btrfs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules b/debian/installer/modules/mips-4kc-malta/cdrom-core-modules
index 3ff69b48f4fc..3ff69b48f4fc 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules
+++ b/debian/installer/modules/mips-4kc-malta/cdrom-core-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/compress-modules b/debian/installer/modules/mips-4kc-malta/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/compress-modules
+++ b/debian/installer/modules/mips-4kc-malta/compress-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/crc-modules b/debian/installer/modules/mips-4kc-malta/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/crc-modules
+++ b/debian/installer/modules/mips-4kc-malta/crc-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/crypto-dm-modules b/debian/installer/modules/mips-4kc-malta/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/crypto-dm-modules
+++ b/debian/installer/modules/mips-4kc-malta/crypto-dm-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/crypto-modules b/debian/installer/modules/mips-4kc-malta/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/crypto-modules
+++ b/debian/installer/modules/mips-4kc-malta/crypto-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/event-modules b/debian/installer/modules/mips-4kc-malta/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/event-modules
+++ b/debian/installer/modules/mips-4kc-malta/event-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/ext4-modules b/debian/installer/modules/mips-4kc-malta/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/ext4-modules
+++ b/debian/installer/modules/mips-4kc-malta/ext4-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/fat-modules b/debian/installer/modules/mips-4kc-malta/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/fat-modules
+++ b/debian/installer/modules/mips-4kc-malta/fat-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/fuse-modules b/debian/installer/modules/mips-4kc-malta/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/fuse-modules
+++ b/debian/installer/modules/mips-4kc-malta/fuse-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/hfs-modules b/debian/installer/modules/mips-4kc-malta/hfs-modules
index 57d12f64921c..57d12f64921c 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/hfs-modules
+++ b/debian/installer/modules/mips-4kc-malta/hfs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/i2c-modules b/debian/installer/modules/mips-4kc-malta/i2c-modules
index 203a607e73ce..203a607e73ce 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/i2c-modules
+++ b/debian/installer/modules/mips-4kc-malta/i2c-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/input-modules b/debian/installer/modules/mips-4kc-malta/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/input-modules
+++ b/debian/installer/modules/mips-4kc-malta/input-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/isofs-modules b/debian/installer/modules/mips-4kc-malta/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/isofs-modules
+++ b/debian/installer/modules/mips-4kc-malta/isofs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/jfs-modules b/debian/installer/modules/mips-4kc-malta/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/jfs-modules
+++ b/debian/installer/modules/mips-4kc-malta/jfs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/kernel-image b/debian/installer/modules/mips-4kc-malta/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/kernel-image
+++ b/debian/installer/modules/mips-4kc-malta/kernel-image
diff --git a/debian/installer/mips/modules/mips-4kc-malta/loop-modules b/debian/installer/modules/mips-4kc-malta/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/loop-modules
+++ b/debian/installer/modules/mips-4kc-malta/loop-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/md-modules b/debian/installer/modules/mips-4kc-malta/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/md-modules
+++ b/debian/installer/modules/mips-4kc-malta/md-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/minix-modules b/debian/installer/modules/mips-4kc-malta/minix-modules
index 82b9843720a1..82b9843720a1 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/minix-modules
+++ b/debian/installer/modules/mips-4kc-malta/minix-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/mmc-core-modules b/debian/installer/modules/mips-4kc-malta/mmc-core-modules
index 7bf38465cf1b..7bf38465cf1b 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/mmc-core-modules
+++ b/debian/installer/modules/mips-4kc-malta/mmc-core-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/mmc-modules b/debian/installer/modules/mips-4kc-malta/mmc-modules
index dadfd5334d62..dadfd5334d62 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/mmc-modules
+++ b/debian/installer/modules/mips-4kc-malta/mmc-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/mouse-modules b/debian/installer/modules/mips-4kc-malta/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/mouse-modules
+++ b/debian/installer/modules/mips-4kc-malta/mouse-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/multipath-modules b/debian/installer/modules/mips-4kc-malta/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/multipath-modules
+++ b/debian/installer/modules/mips-4kc-malta/multipath-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/nbd-modules b/debian/installer/modules/mips-4kc-malta/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/nbd-modules
+++ b/debian/installer/modules/mips-4kc-malta/nbd-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-modules b/debian/installer/modules/mips-4kc-malta/nic-modules
index 44a607e904cc..44a607e904cc 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/nic-modules
+++ b/debian/installer/modules/mips-4kc-malta/nic-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-shared-modules b/debian/installer/modules/mips-4kc-malta/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/nic-shared-modules
+++ b/debian/installer/modules/mips-4kc-malta/nic-shared-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-usb-modules b/debian/installer/modules/mips-4kc-malta/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/nic-usb-modules
+++ b/debian/installer/modules/mips-4kc-malta/nic-usb-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-wireless-modules b/debian/installer/modules/mips-4kc-malta/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/nic-wireless-modules
+++ b/debian/installer/modules/mips-4kc-malta/nic-wireless-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/ntfs-modules b/debian/installer/modules/mips-4kc-malta/ntfs-modules
index ac1bc6a9601e..ac1bc6a9601e 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/ntfs-modules
+++ b/debian/installer/modules/mips-4kc-malta/ntfs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/pata-modules b/debian/installer/modules/mips-4kc-malta/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/pata-modules
+++ b/debian/installer/modules/mips-4kc-malta/pata-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/ppp-modules b/debian/installer/modules/mips-4kc-malta/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/ppp-modules
+++ b/debian/installer/modules/mips-4kc-malta/ppp-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/qnx4-modules b/debian/installer/modules/mips-4kc-malta/qnx4-modules
index cd0c96d414d0..cd0c96d414d0 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/qnx4-modules
+++ b/debian/installer/modules/mips-4kc-malta/qnx4-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/sata-modules b/debian/installer/modules/mips-4kc-malta/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/sata-modules
+++ b/debian/installer/modules/mips-4kc-malta/sata-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-core-modules b/debian/installer/modules/mips-4kc-malta/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/scsi-core-modules
+++ b/debian/installer/modules/mips-4kc-malta/scsi-core-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-modules b/debian/installer/modules/mips-4kc-malta/scsi-modules
index 8909dfb79487..8909dfb79487 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/scsi-modules
+++ b/debian/installer/modules/mips-4kc-malta/scsi-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/sound-modules b/debian/installer/modules/mips-4kc-malta/sound-modules
index 68395ab3d99a..68395ab3d99a 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/sound-modules
+++ b/debian/installer/modules/mips-4kc-malta/sound-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/squashfs-modules b/debian/installer/modules/mips-4kc-malta/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/squashfs-modules
+++ b/debian/installer/modules/mips-4kc-malta/squashfs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/udf-modules b/debian/installer/modules/mips-4kc-malta/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/udf-modules
+++ b/debian/installer/modules/mips-4kc-malta/udf-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-modules b/debian/installer/modules/mips-4kc-malta/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/usb-modules
+++ b/debian/installer/modules/mips-4kc-malta/usb-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-serial-modules b/debian/installer/modules/mips-4kc-malta/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/usb-serial-modules
+++ b/debian/installer/modules/mips-4kc-malta/usb-serial-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules b/debian/installer/modules/mips-4kc-malta/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules
+++ b/debian/installer/modules/mips-4kc-malta/usb-storage-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/virtio-modules b/debian/installer/modules/mips-4kc-malta/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/virtio-modules
+++ b/debian/installer/modules/mips-4kc-malta/virtio-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/xfs-modules b/debian/installer/modules/mips-4kc-malta/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/xfs-modules
+++ b/debian/installer/modules/mips-4kc-malta/xfs-modules
diff --git a/debian/installer/mips/modules/mips-4kc-malta/zlib-modules b/debian/installer/modules/mips-4kc-malta/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/mips/modules/mips-4kc-malta/zlib-modules
+++ b/debian/installer/modules/mips-4kc-malta/zlib-modules
diff --git a/debian/installer/mips/modules/mips-octeon/affs-modules b/debian/installer/modules/mips-octeon/affs-modules
index 21d616a1cc94..21d616a1cc94 100644
--- a/debian/installer/mips/modules/mips-octeon/affs-modules
+++ b/debian/installer/modules/mips-octeon/affs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/btrfs-modules b/debian/installer/modules/mips-octeon/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/mips/modules/mips-octeon/btrfs-modules
+++ b/debian/installer/modules/mips-octeon/btrfs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/cdrom-core-modules b/debian/installer/modules/mips-octeon/cdrom-core-modules
index 3ff69b48f4fc..3ff69b48f4fc 100644
--- a/debian/installer/mips/modules/mips-octeon/cdrom-core-modules
+++ b/debian/installer/modules/mips-octeon/cdrom-core-modules
diff --git a/debian/installer/mips/modules/mips-octeon/compress-modules b/debian/installer/modules/mips-octeon/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/mips/modules/mips-octeon/compress-modules
+++ b/debian/installer/modules/mips-octeon/compress-modules
diff --git a/debian/installer/mips/modules/mips-octeon/crc-modules b/debian/installer/modules/mips-octeon/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/mips/modules/mips-octeon/crc-modules
+++ b/debian/installer/modules/mips-octeon/crc-modules
diff --git a/debian/installer/mips/modules/mips-octeon/crypto-dm-modules b/debian/installer/modules/mips-octeon/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/mips/modules/mips-octeon/crypto-dm-modules
+++ b/debian/installer/modules/mips-octeon/crypto-dm-modules
diff --git a/debian/installer/mips/modules/mips-octeon/crypto-modules b/debian/installer/modules/mips-octeon/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/mips/modules/mips-octeon/crypto-modules
+++ b/debian/installer/modules/mips-octeon/crypto-modules
diff --git a/debian/installer/mips/modules/mips-octeon/event-modules b/debian/installer/modules/mips-octeon/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/mips/modules/mips-octeon/event-modules
+++ b/debian/installer/modules/mips-octeon/event-modules
diff --git a/debian/installer/mips/modules/mips-octeon/ext4-modules b/debian/installer/modules/mips-octeon/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/mips/modules/mips-octeon/ext4-modules
+++ b/debian/installer/modules/mips-octeon/ext4-modules
diff --git a/debian/installer/mips/modules/mips-octeon/fat-modules b/debian/installer/modules/mips-octeon/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/mips/modules/mips-octeon/fat-modules
+++ b/debian/installer/modules/mips-octeon/fat-modules
diff --git a/debian/installer/mips/modules/mips-octeon/fuse-modules b/debian/installer/modules/mips-octeon/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/mips/modules/mips-octeon/fuse-modules
+++ b/debian/installer/modules/mips-octeon/fuse-modules
diff --git a/debian/installer/mips/modules/mips-octeon/hfs-modules b/debian/installer/modules/mips-octeon/hfs-modules
index 57d12f64921c..57d12f64921c 100644
--- a/debian/installer/mips/modules/mips-octeon/hfs-modules
+++ b/debian/installer/modules/mips-octeon/hfs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/input-modules b/debian/installer/modules/mips-octeon/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/mips/modules/mips-octeon/input-modules
+++ b/debian/installer/modules/mips-octeon/input-modules
diff --git a/debian/installer/mips/modules/mips-octeon/isofs-modules b/debian/installer/modules/mips-octeon/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/mips/modules/mips-octeon/isofs-modules
+++ b/debian/installer/modules/mips-octeon/isofs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/jfs-modules b/debian/installer/modules/mips-octeon/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/mips/modules/mips-octeon/jfs-modules
+++ b/debian/installer/modules/mips-octeon/jfs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/kernel-image b/debian/installer/modules/mips-octeon/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/mips/modules/mips-octeon/kernel-image
+++ b/debian/installer/modules/mips-octeon/kernel-image
diff --git a/debian/installer/mips/modules/mips-octeon/loop-modules b/debian/installer/modules/mips-octeon/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/mips/modules/mips-octeon/loop-modules
+++ b/debian/installer/modules/mips-octeon/loop-modules
diff --git a/debian/installer/mips/modules/mips-octeon/md-modules b/debian/installer/modules/mips-octeon/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/mips/modules/mips-octeon/md-modules
+++ b/debian/installer/modules/mips-octeon/md-modules
diff --git a/debian/installer/mips/modules/mips-octeon/minix-modules b/debian/installer/modules/mips-octeon/minix-modules
index 82b9843720a1..82b9843720a1 100644
--- a/debian/installer/mips/modules/mips-octeon/minix-modules
+++ b/debian/installer/modules/mips-octeon/minix-modules
diff --git a/debian/installer/mips/modules/mips-octeon/multipath-modules b/debian/installer/modules/mips-octeon/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/mips/modules/mips-octeon/multipath-modules
+++ b/debian/installer/modules/mips-octeon/multipath-modules
diff --git a/debian/installer/mips/modules/mips-octeon/nbd-modules b/debian/installer/modules/mips-octeon/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/mips/modules/mips-octeon/nbd-modules
+++ b/debian/installer/modules/mips-octeon/nbd-modules
diff --git a/debian/installer/mips/modules/mips-octeon/nic-modules b/debian/installer/modules/mips-octeon/nic-modules
index 3a2814f9ed0c..3a2814f9ed0c 100644
--- a/debian/installer/mips/modules/mips-octeon/nic-modules
+++ b/debian/installer/modules/mips-octeon/nic-modules
diff --git a/debian/installer/mips/modules/mips-octeon/nic-shared-modules b/debian/installer/modules/mips-octeon/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/mips/modules/mips-octeon/nic-shared-modules
+++ b/debian/installer/modules/mips-octeon/nic-shared-modules
diff --git a/debian/installer/mips/modules/mips-octeon/nic-usb-modules b/debian/installer/modules/mips-octeon/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/mips/modules/mips-octeon/nic-usb-modules
+++ b/debian/installer/modules/mips-octeon/nic-usb-modules
diff --git a/debian/installer/mips/modules/mips-octeon/nic-wireless-modules b/debian/installer/modules/mips-octeon/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/mips/modules/mips-octeon/nic-wireless-modules
+++ b/debian/installer/modules/mips-octeon/nic-wireless-modules
diff --git a/debian/installer/mips/modules/mips-octeon/ntfs-modules b/debian/installer/modules/mips-octeon/ntfs-modules
index ac1bc6a9601e..ac1bc6a9601e 100644
--- a/debian/installer/mips/modules/mips-octeon/ntfs-modules
+++ b/debian/installer/modules/mips-octeon/ntfs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/pata-modules b/debian/installer/modules/mips-octeon/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/mips/modules/mips-octeon/pata-modules
+++ b/debian/installer/modules/mips-octeon/pata-modules
diff --git a/debian/installer/mips/modules/mips-octeon/ppp-modules b/debian/installer/modules/mips-octeon/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/mips/modules/mips-octeon/ppp-modules
+++ b/debian/installer/modules/mips-octeon/ppp-modules
diff --git a/debian/installer/mips/modules/mips-octeon/qnx4-modules b/debian/installer/modules/mips-octeon/qnx4-modules
index cd0c96d414d0..cd0c96d414d0 100644
--- a/debian/installer/mips/modules/mips-octeon/qnx4-modules
+++ b/debian/installer/modules/mips-octeon/qnx4-modules
diff --git a/debian/installer/mips/modules/mips-octeon/rtc-modules b/debian/installer/modules/mips-octeon/rtc-modules
index e20e792f206c..e20e792f206c 100644
--- a/debian/installer/mips/modules/mips-octeon/rtc-modules
+++ b/debian/installer/modules/mips-octeon/rtc-modules
diff --git a/debian/installer/mips/modules/mips-octeon/sata-modules b/debian/installer/modules/mips-octeon/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/mips/modules/mips-octeon/sata-modules
+++ b/debian/installer/modules/mips-octeon/sata-modules
diff --git a/debian/installer/mips/modules/mips-octeon/scsi-core-modules b/debian/installer/modules/mips-octeon/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/mips/modules/mips-octeon/scsi-core-modules
+++ b/debian/installer/modules/mips-octeon/scsi-core-modules
diff --git a/debian/installer/mips/modules/mips-octeon/scsi-modules b/debian/installer/modules/mips-octeon/scsi-modules
index b9ea5de6f00a..b9ea5de6f00a 100644
--- a/debian/installer/mips/modules/mips-octeon/scsi-modules
+++ b/debian/installer/modules/mips-octeon/scsi-modules
diff --git a/debian/installer/mips/modules/mips-octeon/sound-modules b/debian/installer/modules/mips-octeon/sound-modules
index 68395ab3d99a..68395ab3d99a 100644
--- a/debian/installer/mips/modules/mips-octeon/sound-modules
+++ b/debian/installer/modules/mips-octeon/sound-modules
diff --git a/debian/installer/mips/modules/mips-octeon/squashfs-modules b/debian/installer/modules/mips-octeon/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/mips/modules/mips-octeon/squashfs-modules
+++ b/debian/installer/modules/mips-octeon/squashfs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/udf-modules b/debian/installer/modules/mips-octeon/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/mips/modules/mips-octeon/udf-modules
+++ b/debian/installer/modules/mips-octeon/udf-modules
diff --git a/debian/installer/mips/modules/mips-octeon/usb-modules b/debian/installer/modules/mips-octeon/usb-modules
index 6c3464a6c303..6c3464a6c303 100644
--- a/debian/installer/mips/modules/mips-octeon/usb-modules
+++ b/debian/installer/modules/mips-octeon/usb-modules
diff --git a/debian/installer/mips/modules/mips-octeon/usb-serial-modules b/debian/installer/modules/mips-octeon/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/mips/modules/mips-octeon/usb-serial-modules
+++ b/debian/installer/modules/mips-octeon/usb-serial-modules
diff --git a/debian/installer/mips/modules/mips-octeon/usb-storage-modules b/debian/installer/modules/mips-octeon/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/mips/modules/mips-octeon/usb-storage-modules
+++ b/debian/installer/modules/mips-octeon/usb-storage-modules
diff --git a/debian/installer/mips/modules/mips-octeon/virtio-modules b/debian/installer/modules/mips-octeon/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/mips/modules/mips-octeon/virtio-modules
+++ b/debian/installer/modules/mips-octeon/virtio-modules
diff --git a/debian/installer/mips/modules/mips-octeon/xfs-modules b/debian/installer/modules/mips-octeon/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/mips/modules/mips-octeon/xfs-modules
+++ b/debian/installer/modules/mips-octeon/xfs-modules
diff --git a/debian/installer/mips/modules/mips-octeon/zlib-modules b/debian/installer/modules/mips-octeon/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/mips/modules/mips-octeon/zlib-modules
+++ b/debian/installer/modules/mips-octeon/zlib-modules
diff --git a/debian/installer/mips/modules/mips/btrfs-modules b/debian/installer/modules/mips/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/mips/modules/mips/btrfs-modules
+++ b/debian/installer/modules/mips/btrfs-modules
diff --git a/debian/installer/mips/modules/mips/compress-modules b/debian/installer/modules/mips/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/mips/modules/mips/compress-modules
+++ b/debian/installer/modules/mips/compress-modules
diff --git a/debian/installer/mips/modules/mips/crc-modules b/debian/installer/modules/mips/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/mips/modules/mips/crc-modules
+++ b/debian/installer/modules/mips/crc-modules
diff --git a/debian/installer/mips/modules/mips/crypto-dm-modules b/debian/installer/modules/mips/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/mips/modules/mips/crypto-dm-modules
+++ b/debian/installer/modules/mips/crypto-dm-modules
diff --git a/debian/installer/mips/modules/mips/crypto-modules b/debian/installer/modules/mips/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/mips/modules/mips/crypto-modules
+++ b/debian/installer/modules/mips/crypto-modules
diff --git a/debian/installer/mips/modules/mips/ext4-modules b/debian/installer/modules/mips/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/mips/modules/mips/ext4-modules
+++ b/debian/installer/modules/mips/ext4-modules
diff --git a/debian/installer/mips/modules/mips/fuse-modules b/debian/installer/modules/mips/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/mips/modules/mips/fuse-modules
+++ b/debian/installer/modules/mips/fuse-modules
diff --git a/debian/installer/mips/modules/mips/isofs-modules b/debian/installer/modules/mips/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/mips/modules/mips/isofs-modules
+++ b/debian/installer/modules/mips/isofs-modules
diff --git a/debian/installer/mips/modules/mips/jfs-modules b/debian/installer/modules/mips/jfs-modules
index 925a43a9e2a5..925a43a9e2a5 100644
--- a/debian/installer/mips/modules/mips/jfs-modules
+++ b/debian/installer/modules/mips/jfs-modules
diff --git a/debian/installer/mips/modules/mips/kernel-image b/debian/installer/modules/mips/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/mips/modules/mips/kernel-image
+++ b/debian/installer/modules/mips/kernel-image
diff --git a/debian/installer/mips/modules/mips/loop-modules b/debian/installer/modules/mips/loop-modules
index 164467713763..164467713763 100644
--- a/debian/installer/mips/modules/mips/loop-modules
+++ b/debian/installer/modules/mips/loop-modules
diff --git a/debian/installer/mips/modules/mips/md-modules b/debian/installer/modules/mips/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/mips/modules/mips/md-modules
+++ b/debian/installer/modules/mips/md-modules
diff --git a/debian/installer/mips/modules/mips/multipath-modules b/debian/installer/modules/mips/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/mips/modules/mips/multipath-modules
+++ b/debian/installer/modules/mips/multipath-modules
diff --git a/debian/installer/mips/modules/mips/nbd-modules b/debian/installer/modules/mips/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/mips/modules/mips/nbd-modules
+++ b/debian/installer/modules/mips/nbd-modules
diff --git a/debian/installer/mips/modules/mips/nic-shared-modules b/debian/installer/modules/mips/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/mips/modules/mips/nic-shared-modules
+++ b/debian/installer/modules/mips/nic-shared-modules
diff --git a/debian/installer/mips/modules/mips/squashfs-modules b/debian/installer/modules/mips/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/mips/modules/mips/squashfs-modules
+++ b/debian/installer/modules/mips/squashfs-modules
diff --git a/debian/installer/mips/modules/mips/udf-modules b/debian/installer/modules/mips/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/mips/modules/mips/udf-modules
+++ b/debian/installer/modules/mips/udf-modules
diff --git a/debian/installer/mips/modules/mips/xfs-modules b/debian/installer/modules/mips/xfs-modules
index c020b5d399f9..c020b5d399f9 100644
--- a/debian/installer/mips/modules/mips/xfs-modules
+++ b/debian/installer/modules/mips/xfs-modules
diff --git a/debian/installer/mips/modules/mips/zlib-modules b/debian/installer/modules/mips/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/mips/modules/mips/zlib-modules
+++ b/debian/installer/modules/mips/zlib-modules
diff --git a/debian/installer/modules/mips32r6 b/debian/installer/modules/mips32r6
new file mode 120000
index 000000000000..af28acbd9aa6
--- /dev/null
+++ b/debian/installer/modules/mips32r6
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mips32r6el b/debian/installer/modules/mips32r6el
new file mode 120000
index 000000000000..af28acbd9aa6
--- /dev/null
+++ b/debian/installer/modules/mips32r6el
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mips64 b/debian/installer/modules/mips64
new file mode 120000
index 000000000000..af28acbd9aa6
--- /dev/null
+++ b/debian/installer/modules/mips64
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mips64-5kc-malta b/debian/installer/modules/mips64-5kc-malta
new file mode 120000
index 000000000000..6bae6ca286ca
--- /dev/null
+++ b/debian/installer/modules/mips64-5kc-malta
@@ -0,0 +1 @@
+mips-4kc-malta
\ No newline at end of file
diff --git a/debian/installer/modules/mips64-octeon b/debian/installer/modules/mips64-octeon
new file mode 120000
index 000000000000..47b1b81abee1
--- /dev/null
+++ b/debian/installer/modules/mips64-octeon
@@ -0,0 +1 @@
+mips-octeon
\ No newline at end of file
diff --git a/debian/installer/modules/mips64el-5kc-malta b/debian/installer/modules/mips64el-5kc-malta
new file mode 120000
index 000000000000..6bae6ca286ca
--- /dev/null
+++ b/debian/installer/modules/mips64el-5kc-malta
@@ -0,0 +1 @@
+mips-4kc-malta
\ No newline at end of file
diff --git a/debian/installer/modules/mips64el-loongson-3 b/debian/installer/modules/mips64el-loongson-3
new file mode 120000
index 000000000000..409be8354f26
--- /dev/null
+++ b/debian/installer/modules/mips64el-loongson-3
@@ -0,0 +1 @@
+mipsel-loongson-3
\ No newline at end of file
diff --git a/debian/installer/modules/mips64el-octeon b/debian/installer/modules/mips64el-octeon
new file mode 120000
index 000000000000..47b1b81abee1
--- /dev/null
+++ b/debian/installer/modules/mips64el-octeon
@@ -0,0 +1 @@
+mips-octeon
\ No newline at end of file
diff --git a/debian/installer/modules/mips64r6 b/debian/installer/modules/mips64r6
new file mode 120000
index 000000000000..af28acbd9aa6
--- /dev/null
+++ b/debian/installer/modules/mips64r6
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mips64r6el b/debian/installer/modules/mips64r6el
new file mode 120000
index 000000000000..af28acbd9aa6
--- /dev/null
+++ b/debian/installer/modules/mips64r6el
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mipsel-4kc-malta b/debian/installer/modules/mipsel-4kc-malta
new file mode 120000
index 000000000000..6bae6ca286ca
--- /dev/null
+++ b/debian/installer/modules/mipsel-4kc-malta
@@ -0,0 +1 @@
+mips-4kc-malta
\ No newline at end of file
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/affs-modules b/debian/installer/modules/mipsel-loongson-3/affs-modules
index 21d616a1cc94..21d616a1cc94 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/affs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/affs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules b/debian/installer/modules/mipsel-loongson-3/ata-modules
index b81c0f38b74a..b81c0f38b74a 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules
+++ b/debian/installer/modules/mipsel-loongson-3/ata-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/btrfs-modules b/debian/installer/modules/mipsel-loongson-3/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/btrfs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/btrfs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/cdrom-core-modules b/debian/installer/modules/mipsel-loongson-3/cdrom-core-modules
index 3ff69b48f4fc..3ff69b48f4fc 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/cdrom-core-modules
+++ b/debian/installer/modules/mipsel-loongson-3/cdrom-core-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules b/debian/installer/modules/mipsel-loongson-3/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules
+++ b/debian/installer/modules/mipsel-loongson-3/compress-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/crc-modules b/debian/installer/modules/mipsel-loongson-3/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/crc-modules
+++ b/debian/installer/modules/mipsel-loongson-3/crc-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/crypto-dm-modules b/debian/installer/modules/mipsel-loongson-3/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/crypto-dm-modules
+++ b/debian/installer/modules/mipsel-loongson-3/crypto-dm-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/crypto-modules b/debian/installer/modules/mipsel-loongson-3/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/crypto-modules
+++ b/debian/installer/modules/mipsel-loongson-3/crypto-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/event-modules b/debian/installer/modules/mipsel-loongson-3/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/event-modules
+++ b/debian/installer/modules/mipsel-loongson-3/event-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules b/debian/installer/modules/mipsel-loongson-3/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules
+++ b/debian/installer/modules/mipsel-loongson-3/ext4-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/fat-modules b/debian/installer/modules/mipsel-loongson-3/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/fat-modules
+++ b/debian/installer/modules/mipsel-loongson-3/fat-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/fb-modules b/debian/installer/modules/mipsel-loongson-3/fb-modules
index 553c79c743a6..553c79c743a6 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/fb-modules
+++ b/debian/installer/modules/mipsel-loongson-3/fb-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/firewire-core-modules b/debian/installer/modules/mipsel-loongson-3/firewire-core-modules
index dcac80af9651..dcac80af9651 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/firewire-core-modules
+++ b/debian/installer/modules/mipsel-loongson-3/firewire-core-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/fuse-modules b/debian/installer/modules/mipsel-loongson-3/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/fuse-modules
+++ b/debian/installer/modules/mipsel-loongson-3/fuse-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/hfs-modules b/debian/installer/modules/mipsel-loongson-3/hfs-modules
index 57d12f64921c..57d12f64921c 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/hfs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/hfs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/input-modules b/debian/installer/modules/mipsel-loongson-3/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/input-modules
+++ b/debian/installer/modules/mipsel-loongson-3/input-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/isofs-modules b/debian/installer/modules/mipsel-loongson-3/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/isofs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/isofs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/jfs-modules b/debian/installer/modules/mipsel-loongson-3/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/jfs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/jfs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image b/debian/installer/modules/mipsel-loongson-3/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image
+++ b/debian/installer/modules/mipsel-loongson-3/kernel-image
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/loop-modules b/debian/installer/modules/mipsel-loongson-3/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/loop-modules
+++ b/debian/installer/modules/mipsel-loongson-3/loop-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/md-modules b/debian/installer/modules/mipsel-loongson-3/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/md-modules
+++ b/debian/installer/modules/mipsel-loongson-3/md-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/minix-modules b/debian/installer/modules/mipsel-loongson-3/minix-modules
index 82b9843720a1..82b9843720a1 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/minix-modules
+++ b/debian/installer/modules/mipsel-loongson-3/minix-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/multipath-modules b/debian/installer/modules/mipsel-loongson-3/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/multipath-modules
+++ b/debian/installer/modules/mipsel-loongson-3/multipath-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nbd-modules b/debian/installer/modules/mipsel-loongson-3/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/nbd-modules
+++ b/debian/installer/modules/mipsel-loongson-3/nbd-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nfs-modules b/debian/installer/modules/mipsel-loongson-3/nfs-modules
index 946fb8e4424c..946fb8e4424c 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/nfs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/nfs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules b/debian/installer/modules/mipsel-loongson-3/nic-modules
index a2feefcfc5d0..a2feefcfc5d0 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules
+++ b/debian/installer/modules/mipsel-loongson-3/nic-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-shared-modules b/debian/installer/modules/mipsel-loongson-3/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-shared-modules
+++ b/debian/installer/modules/mipsel-loongson-3/nic-shared-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-usb-modules b/debian/installer/modules/mipsel-loongson-3/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-usb-modules
+++ b/debian/installer/modules/mipsel-loongson-3/nic-usb-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-wireless-modules b/debian/installer/modules/mipsel-loongson-3/nic-wireless-modules
index 53fd18d7f4c7..53fd18d7f4c7 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-wireless-modules
+++ b/debian/installer/modules/mipsel-loongson-3/nic-wireless-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ntfs-modules b/debian/installer/modules/mipsel-loongson-3/ntfs-modules
index ac1bc6a9601e..ac1bc6a9601e 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/ntfs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/ntfs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules b/debian/installer/modules/mipsel-loongson-3/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules
+++ b/debian/installer/modules/mipsel-loongson-3/pata-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ppp-modules b/debian/installer/modules/mipsel-loongson-3/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/ppp-modules
+++ b/debian/installer/modules/mipsel-loongson-3/ppp-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/qnx4-modules b/debian/installer/modules/mipsel-loongson-3/qnx4-modules
index cd0c96d414d0..cd0c96d414d0 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/qnx4-modules
+++ b/debian/installer/modules/mipsel-loongson-3/qnx4-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/sata-modules b/debian/installer/modules/mipsel-loongson-3/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/sata-modules
+++ b/debian/installer/modules/mipsel-loongson-3/sata-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-core-modules b/debian/installer/modules/mipsel-loongson-3/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-core-modules
+++ b/debian/installer/modules/mipsel-loongson-3/scsi-core-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules b/debian/installer/modules/mipsel-loongson-3/scsi-modules
index b9ea5de6f00a..b9ea5de6f00a 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules
+++ b/debian/installer/modules/mipsel-loongson-3/scsi-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/sound-modules b/debian/installer/modules/mipsel-loongson-3/sound-modules
index 68395ab3d99a..68395ab3d99a 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/sound-modules
+++ b/debian/installer/modules/mipsel-loongson-3/sound-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/speakup-modules b/debian/installer/modules/mipsel-loongson-3/speakup-modules
index 29592721a7aa..29592721a7aa 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/speakup-modules
+++ b/debian/installer/modules/mipsel-loongson-3/speakup-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/squashfs-modules b/debian/installer/modules/mipsel-loongson-3/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/squashfs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/squashfs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/udf-modules b/debian/installer/modules/mipsel-loongson-3/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/udf-modules
+++ b/debian/installer/modules/mipsel-loongson-3/udf-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-modules b/debian/installer/modules/mipsel-loongson-3/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-modules
+++ b/debian/installer/modules/mipsel-loongson-3/usb-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-serial-modules b/debian/installer/modules/mipsel-loongson-3/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-serial-modules
+++ b/debian/installer/modules/mipsel-loongson-3/usb-serial-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-storage-modules b/debian/installer/modules/mipsel-loongson-3/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-storage-modules
+++ b/debian/installer/modules/mipsel-loongson-3/usb-storage-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/virtio-modules b/debian/installer/modules/mipsel-loongson-3/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/virtio-modules
+++ b/debian/installer/modules/mipsel-loongson-3/virtio-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/xfs-modules b/debian/installer/modules/mipsel-loongson-3/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/xfs-modules
+++ b/debian/installer/modules/mipsel-loongson-3/xfs-modules
diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/zlib-modules b/debian/installer/modules/mipsel-loongson-3/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/mipsel/modules/mipsel-loongson-3/zlib-modules
+++ b/debian/installer/modules/mipsel-loongson-3/zlib-modules
diff --git a/debian/installer/modules/mipsel-octeon b/debian/installer/modules/mipsel-octeon
new file mode 120000
index 000000000000..47b1b81abee1
--- /dev/null
+++ b/debian/installer/modules/mipsel-octeon
@@ -0,0 +1 @@
+mips-octeon
\ No newline at end of file
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/affs-modules b/debian/installer/modules/powerpc-powerpc64/affs-modules
index f12f6ace215a..f12f6ace215a 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/affs-modules
+++ b/debian/installer/modules/powerpc-powerpc64/affs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ata-modules b/debian/installer/modules/powerpc-powerpc64/ata-modules
index 39540d4b6a42..39540d4b6a42 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ata-modules
+++ b/debian/installer/modules/powerpc-powerpc64/ata-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/btrfs-modules b/debian/installer/modules/powerpc-powerpc64/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/btrfs-modules
+++ b/debian/installer/modules/powerpc-powerpc64/btrfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/cdrom-core-modules b/debian/installer/modules/powerpc-powerpc64/cdrom-core-modules
index feed89a1a493..feed89a1a493 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/cdrom-core-modules
+++ b/debian/installer/modules/powerpc-powerpc64/cdrom-core-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules b/debian/installer/modules/powerpc-powerpc64/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules
+++ b/debian/installer/modules/powerpc-powerpc64/compress-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crc-modules b/debian/installer/modules/powerpc-powerpc64/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crc-modules
+++ b/debian/installer/modules/powerpc-powerpc64/crc-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-dm-modules b/debian/installer/modules/powerpc-powerpc64/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-dm-modules
+++ b/debian/installer/modules/powerpc-powerpc64/crypto-dm-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-modules b/debian/installer/modules/powerpc-powerpc64/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-modules
+++ b/debian/installer/modules/powerpc-powerpc64/crypto-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/event-modules b/debian/installer/modules/powerpc-powerpc64/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/event-modules
+++ b/debian/installer/modules/powerpc-powerpc64/event-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext4-modules b/debian/installer/modules/powerpc-powerpc64/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext4-modules
+++ b/debian/installer/modules/powerpc-powerpc64/ext4-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules b/debian/installer/modules/powerpc-powerpc64/fancontrol-modules
index a3fc55cca941..a3fc55cca941 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules
+++ b/debian/installer/modules/powerpc-powerpc64/fancontrol-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fat-modules b/debian/installer/modules/powerpc-powerpc64/fat-modules
index 043dc5602954..043dc5602954 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fat-modules
+++ b/debian/installer/modules/powerpc-powerpc64/fat-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/firewire-core-modules b/debian/installer/modules/powerpc-powerpc64/firewire-core-modules
index 035ab3162504..035ab3162504 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/firewire-core-modules
+++ b/debian/installer/modules/powerpc-powerpc64/firewire-core-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules b/debian/installer/modules/powerpc-powerpc64/fuse-modules
index 49bdce41b076..49bdce41b076 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules
+++ b/debian/installer/modules/powerpc-powerpc64/fuse-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/hfs-modules b/debian/installer/modules/powerpc-powerpc64/hfs-modules
index a85f6914303d..a85f6914303d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/hfs-modules
+++ b/debian/installer/modules/powerpc-powerpc64/hfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/hypervisor-modules b/debian/installer/modules/powerpc-powerpc64/hypervisor-modules
index 29ceb6154d7b..29ceb6154d7b 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/hypervisor-modules
+++ b/debian/installer/modules/powerpc-powerpc64/hypervisor-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/input-modules b/debian/installer/modules/powerpc-powerpc64/input-modules
index 38a888940fa7..38a888940fa7 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/input-modules
+++ b/debian/installer/modules/powerpc-powerpc64/input-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/isofs-modules b/debian/installer/modules/powerpc-powerpc64/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/isofs-modules
+++ b/debian/installer/modules/powerpc-powerpc64/isofs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/jfs-modules b/debian/installer/modules/powerpc-powerpc64/jfs-modules
index b71ebd35e864..b71ebd35e864 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/jfs-modules
+++ b/debian/installer/modules/powerpc-powerpc64/jfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/kernel-image b/debian/installer/modules/powerpc-powerpc64/kernel-image
index a0b7d0cf49cd..a0b7d0cf49cd 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/kernel-image
+++ b/debian/installer/modules/powerpc-powerpc64/kernel-image
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/loop-modules b/debian/installer/modules/powerpc-powerpc64/loop-modules
index e2273687f548..e2273687f548 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/loop-modules
+++ b/debian/installer/modules/powerpc-powerpc64/loop-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/md-modules b/debian/installer/modules/powerpc-powerpc64/md-modules
index 93be33f95c56..93be33f95c56 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/md-modules
+++ b/debian/installer/modules/powerpc-powerpc64/md-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/mouse-modules b/debian/installer/modules/powerpc-powerpc64/mouse-modules
index 22aca9411c68..22aca9411c68 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/mouse-modules
+++ b/debian/installer/modules/powerpc-powerpc64/mouse-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/multipath-modules b/debian/installer/modules/powerpc-powerpc64/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/multipath-modules
+++ b/debian/installer/modules/powerpc-powerpc64/multipath-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nbd-modules b/debian/installer/modules/powerpc-powerpc64/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nbd-modules
+++ b/debian/installer/modules/powerpc-powerpc64/nbd-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules b/debian/installer/modules/powerpc-powerpc64/nic-modules
index 95052e97766d..95052e97766d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules
+++ b/debian/installer/modules/powerpc-powerpc64/nic-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-pcmcia-modules b/debian/installer/modules/powerpc-powerpc64/nic-pcmcia-modules
index 7a0702cd5585..7a0702cd5585 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-pcmcia-modules
+++ b/debian/installer/modules/powerpc-powerpc64/nic-pcmcia-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules b/debian/installer/modules/powerpc-powerpc64/nic-shared-modules
index 5b05e0d43cb9..5b05e0d43cb9 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules
+++ b/debian/installer/modules/powerpc-powerpc64/nic-shared-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pata-modules b/debian/installer/modules/powerpc-powerpc64/pata-modules
index bb9cbe3abe71..bb9cbe3abe71 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pata-modules
+++ b/debian/installer/modules/powerpc-powerpc64/pata-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-modules b/debian/installer/modules/powerpc-powerpc64/pcmcia-modules
index e508df664357..e508df664357 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-modules
+++ b/debian/installer/modules/powerpc-powerpc64/pcmcia-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-storage-modules b/debian/installer/modules/powerpc-powerpc64/pcmcia-storage-modules
index f00f24605f56..f00f24605f56 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-storage-modules
+++ b/debian/installer/modules/powerpc-powerpc64/pcmcia-storage-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ppp-modules b/debian/installer/modules/powerpc-powerpc64/ppp-modules
index eb7ab74a52f1..eb7ab74a52f1 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ppp-modules
+++ b/debian/installer/modules/powerpc-powerpc64/ppp-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/sata-modules b/debian/installer/modules/powerpc-powerpc64/sata-modules
index 591ad741022a..591ad741022a 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/sata-modules
+++ b/debian/installer/modules/powerpc-powerpc64/sata-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-core-modules b/debian/installer/modules/powerpc-powerpc64/scsi-core-modules
index c972a4717408..c972a4717408 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-core-modules
+++ b/debian/installer/modules/powerpc-powerpc64/scsi-core-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules b/debian/installer/modules/powerpc-powerpc64/scsi-modules
index d0671e575e57..d0671e575e57 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules
+++ b/debian/installer/modules/powerpc-powerpc64/scsi-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/serial-modules b/debian/installer/modules/powerpc-powerpc64/serial-modules
index 349196e30e8b..349196e30e8b 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/serial-modules
+++ b/debian/installer/modules/powerpc-powerpc64/serial-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/squashfs-modules b/debian/installer/modules/powerpc-powerpc64/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/squashfs-modules
+++ b/debian/installer/modules/powerpc-powerpc64/squashfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/udf-modules b/debian/installer/modules/powerpc-powerpc64/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/udf-modules
+++ b/debian/installer/modules/powerpc-powerpc64/udf-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/uinput-modules b/debian/installer/modules/powerpc-powerpc64/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/uinput-modules
+++ b/debian/installer/modules/powerpc-powerpc64/uinput-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-modules b/debian/installer/modules/powerpc-powerpc64/usb-modules
index 9c5b10a7b9e0..9c5b10a7b9e0 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-modules
+++ b/debian/installer/modules/powerpc-powerpc64/usb-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-serial-modules b/debian/installer/modules/powerpc-powerpc64/usb-serial-modules
index e25b5586285f..e25b5586285f 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-serial-modules
+++ b/debian/installer/modules/powerpc-powerpc64/usb-serial-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-storage-modules b/debian/installer/modules/powerpc-powerpc64/usb-storage-modules
index 5f278e65f838..5f278e65f838 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-storage-modules
+++ b/debian/installer/modules/powerpc-powerpc64/usb-storage-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/virtio-modules b/debian/installer/modules/powerpc-powerpc64/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/virtio-modules
+++ b/debian/installer/modules/powerpc-powerpc64/virtio-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/xfs-modules b/debian/installer/modules/powerpc-powerpc64/xfs-modules
index c850127e905d..c850127e905d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/xfs-modules
+++ b/debian/installer/modules/powerpc-powerpc64/xfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc/affs-modules b/debian/installer/modules/powerpc/affs-modules
index 3f0e4bb909e2..3f0e4bb909e2 100644
--- a/debian/installer/powerpc/modules/powerpc/affs-modules
+++ b/debian/installer/modules/powerpc/affs-modules
diff --git a/debian/installer/powerpc/modules/powerpc/ata-modules b/debian/installer/modules/powerpc/ata-modules
index b81c0f38b74a..b81c0f38b74a 100644
--- a/debian/installer/powerpc/modules/powerpc/ata-modules
+++ b/debian/installer/modules/powerpc/ata-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/btrfs-modules b/debian/installer/modules/powerpc/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/btrfs-modules
+++ b/debian/installer/modules/powerpc/btrfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc/cdrom-core-modules b/debian/installer/modules/powerpc/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/powerpc/modules/powerpc/cdrom-core-modules
+++ b/debian/installer/modules/powerpc/cdrom-core-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules b/debian/installer/modules/powerpc/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules
+++ b/debian/installer/modules/powerpc/compress-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/crc-modules b/debian/installer/modules/powerpc/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/crc-modules
+++ b/debian/installer/modules/powerpc/crc-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/crypto-dm-modules b/debian/installer/modules/powerpc/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/crypto-dm-modules
+++ b/debian/installer/modules/powerpc/crypto-dm-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/crypto-modules b/debian/installer/modules/powerpc/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/crypto-modules
+++ b/debian/installer/modules/powerpc/crypto-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/event-modules b/debian/installer/modules/powerpc/event-modules
index f8819afd361c..f8819afd361c 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/event-modules
+++ b/debian/installer/modules/powerpc/event-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ext4-modules b/debian/installer/modules/powerpc/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/ext4-modules
+++ b/debian/installer/modules/powerpc/ext4-modules
diff --git a/debian/installer/powerpc/modules/powerpc/fat-modules b/debian/installer/modules/powerpc/fat-modules
index cce8fd30ca4f..cce8fd30ca4f 100644
--- a/debian/installer/powerpc/modules/powerpc/fat-modules
+++ b/debian/installer/modules/powerpc/fat-modules
diff --git a/debian/installer/powerpc/modules/powerpc/fb-modules b/debian/installer/modules/powerpc/fb-modules
index 29bfc4c39054..29bfc4c39054 100644
--- a/debian/installer/powerpc/modules/powerpc/fb-modules
+++ b/debian/installer/modules/powerpc/fb-modules
diff --git a/debian/installer/powerpc/modules/powerpc/firewire-core-modules b/debian/installer/modules/powerpc/firewire-core-modules
index dcac80af9651..dcac80af9651 100644
--- a/debian/installer/powerpc/modules/powerpc/firewire-core-modules
+++ b/debian/installer/modules/powerpc/firewire-core-modules
diff --git a/debian/installer/powerpc/modules/powerpc/fuse-modules b/debian/installer/modules/powerpc/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/powerpc/modules/powerpc/fuse-modules
+++ b/debian/installer/modules/powerpc/fuse-modules
diff --git a/debian/installer/powerpc/modules/powerpc/hfs-modules b/debian/installer/modules/powerpc/hfs-modules
index 57d12f64921c..57d12f64921c 100644
--- a/debian/installer/powerpc/modules/powerpc/hfs-modules
+++ b/debian/installer/modules/powerpc/hfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc/input-modules b/debian/installer/modules/powerpc/input-modules
index 51e37ced9a77..51e37ced9a77 100644
--- a/debian/installer/powerpc/modules/powerpc/input-modules
+++ b/debian/installer/modules/powerpc/input-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/isofs-modules b/debian/installer/modules/powerpc/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/isofs-modules
+++ b/debian/installer/modules/powerpc/isofs-modules
diff --git a/debian/installer/powerpc/modules/powerpc/jfs-modules b/debian/installer/modules/powerpc/jfs-modules
index 925a43a9e2a5..925a43a9e2a5 100644
--- a/debian/installer/powerpc/modules/powerpc/jfs-modules
+++ b/debian/installer/modules/powerpc/jfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc/kernel-image b/debian/installer/modules/powerpc/kernel-image
index b17bb591a8ab..b17bb591a8ab 100644
--- a/debian/installer/powerpc/modules/powerpc/kernel-image
+++ b/debian/installer/modules/powerpc/kernel-image
diff --git a/debian/installer/powerpc/modules/powerpc/loop-modules b/debian/installer/modules/powerpc/loop-modules
index 164467713763..164467713763 100644
--- a/debian/installer/powerpc/modules/powerpc/loop-modules
+++ b/debian/installer/modules/powerpc/loop-modules
diff --git a/debian/installer/powerpc/modules/powerpc/md-modules b/debian/installer/modules/powerpc/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/powerpc/modules/powerpc/md-modules
+++ b/debian/installer/modules/powerpc/md-modules
diff --git a/debian/installer/powerpc/modules/powerpc/mouse-modules b/debian/installer/modules/powerpc/mouse-modules
index 15fcb00eaa04..15fcb00eaa04 100644
--- a/debian/installer/powerpc/modules/powerpc/mouse-modules
+++ b/debian/installer/modules/powerpc/mouse-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/multipath-modules b/debian/installer/modules/powerpc/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/multipath-modules
+++ b/debian/installer/modules/powerpc/multipath-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nbd-modules b/debian/installer/modules/powerpc/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/nbd-modules
+++ b/debian/installer/modules/powerpc/nbd-modules
diff --git a/debian/installer/powerpc/modules/powerpc/nic-modules b/debian/installer/modules/powerpc/nic-modules
index fa151067e0d4..fa151067e0d4 100644
--- a/debian/installer/powerpc/modules/powerpc/nic-modules
+++ b/debian/installer/modules/powerpc/nic-modules
diff --git a/debian/installer/powerpc/modules/powerpc/nic-pcmcia-modules b/debian/installer/modules/powerpc/nic-pcmcia-modules
index 7a0702cd5585..7a0702cd5585 100644
--- a/debian/installer/powerpc/modules/powerpc/nic-pcmcia-modules
+++ b/debian/installer/modules/powerpc/nic-pcmcia-modules
diff --git a/debian/installer/powerpc/modules/powerpc/nic-shared-modules b/debian/installer/modules/powerpc/nic-shared-modules
index a6f274a444b7..a6f274a444b7 100644
--- a/debian/installer/powerpc/modules/powerpc/nic-shared-modules
+++ b/debian/installer/modules/powerpc/nic-shared-modules
diff --git a/debian/installer/powerpc/modules/powerpc/pata-modules b/debian/installer/modules/powerpc/pata-modules
index 4c7d4296b8a7..4c7d4296b8a7 100644
--- a/debian/installer/powerpc/modules/powerpc/pata-modules
+++ b/debian/installer/modules/powerpc/pata-modules
diff --git a/debian/installer/powerpc/modules/powerpc/pcmcia-modules b/debian/installer/modules/powerpc/pcmcia-modules
index 2bb5350fe14f..2bb5350fe14f 100644
--- a/debian/installer/powerpc/modules/powerpc/pcmcia-modules
+++ b/debian/installer/modules/powerpc/pcmcia-modules
diff --git a/debian/installer/powerpc/modules/powerpc/pcmcia-storage-modules b/debian/installer/modules/powerpc/pcmcia-storage-modules
index 9fbaff306dbd..9fbaff306dbd 100644
--- a/debian/installer/powerpc/modules/powerpc/pcmcia-storage-modules
+++ b/debian/installer/modules/powerpc/pcmcia-storage-modules
diff --git a/debian/installer/powerpc/modules/powerpc/ppp-modules b/debian/installer/modules/powerpc/ppp-modules
index f1ae9b3d15ac..f1ae9b3d15ac 100644
--- a/debian/installer/powerpc/modules/powerpc/ppp-modules
+++ b/debian/installer/modules/powerpc/ppp-modules
diff --git a/debian/installer/powerpc/modules/powerpc/sata-modules b/debian/installer/modules/powerpc/sata-modules
index 071cb860bbc5..071cb860bbc5 100644
--- a/debian/installer/powerpc/modules/powerpc/sata-modules
+++ b/debian/installer/modules/powerpc/sata-modules
diff --git a/debian/installer/powerpc/modules/powerpc/scsi-core-modules b/debian/installer/modules/powerpc/scsi-core-modules
index dd65d661433d..dd65d661433d 100644
--- a/debian/installer/powerpc/modules/powerpc/scsi-core-modules
+++ b/debian/installer/modules/powerpc/scsi-core-modules
diff --git a/debian/installer/powerpc/modules/powerpc/scsi-modules b/debian/installer/modules/powerpc/scsi-modules
index c75c32da5e58..c75c32da5e58 100644
--- a/debian/installer/powerpc/modules/powerpc/scsi-modules
+++ b/debian/installer/modules/powerpc/scsi-modules
diff --git a/debian/installer/powerpc/modules/powerpc/serial-modules b/debian/installer/modules/powerpc/serial-modules
index 6ab8b8c3551b..6ab8b8c3551b 100644
--- a/debian/installer/powerpc/modules/powerpc/serial-modules
+++ b/debian/installer/modules/powerpc/serial-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/squashfs-modules b/debian/installer/modules/powerpc/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/squashfs-modules
+++ b/debian/installer/modules/powerpc/squashfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/udf-modules b/debian/installer/modules/powerpc/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/udf-modules
+++ b/debian/installer/modules/powerpc/udf-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/uinput-modules b/debian/installer/modules/powerpc/uinput-modules
index 58a833779442..58a833779442 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/uinput-modules
+++ b/debian/installer/modules/powerpc/uinput-modules
diff --git a/debian/installer/powerpc/modules/powerpc/usb-modules b/debian/installer/modules/powerpc/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/powerpc/modules/powerpc/usb-modules
+++ b/debian/installer/modules/powerpc/usb-modules
diff --git a/debian/installer/powerpc/modules/powerpc/usb-serial-modules b/debian/installer/modules/powerpc/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/powerpc/modules/powerpc/usb-serial-modules
+++ b/debian/installer/modules/powerpc/usb-serial-modules
diff --git a/debian/installer/powerpc/modules/powerpc/usb-storage-modules b/debian/installer/modules/powerpc/usb-storage-modules
index 272d95e2e8b1..272d95e2e8b1 100644
--- a/debian/installer/powerpc/modules/powerpc/usb-storage-modules
+++ b/debian/installer/modules/powerpc/usb-storage-modules
diff --git a/debian/installer/powerpc/modules/powerpc/virtio-modules b/debian/installer/modules/powerpc/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/powerpc/modules/powerpc/virtio-modules
+++ b/debian/installer/modules/powerpc/virtio-modules
diff --git a/debian/installer/powerpc/modules/powerpc/xfs-modules b/debian/installer/modules/powerpc/xfs-modules
index c020b5d399f9..c020b5d399f9 100644
--- a/debian/installer/powerpc/modules/powerpc/xfs-modules
+++ b/debian/installer/modules/powerpc/xfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/zlib-modules b/debian/installer/modules/powerpc/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/zlib-modules
+++ b/debian/installer/modules/powerpc/zlib-modules
diff --git a/debian/installer/modules/ppc64 b/debian/installer/modules/ppc64
new file mode 120000
index 000000000000..a3e2a5788e59
--- /dev/null
+++ b/debian/installer/modules/ppc64
@@ -0,0 +1 @@
+powerpc-powerpc64
\ No newline at end of file
diff --git a/debian/installer/modules/ppc64el/ata-modules b/debian/installer/modules/ppc64el/ata-modules
new file mode 100644
index 000000000000..03599667e640
--- /dev/null
+++ b/debian/installer/modules/ppc64el/ata-modules
@@ -0,0 +1 @@
+#include "../ppc64/ata-modules"
diff --git a/debian/installer/modules/ppc64el/btrfs-modules b/debian/installer/modules/ppc64el/btrfs-modules
new file mode 100644
index 000000000000..1d9d7d86f406
--- /dev/null
+++ b/debian/installer/modules/ppc64el/btrfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/btrfs-modules"
diff --git a/debian/installer/modules/ppc64el/cdrom-core-modules b/debian/installer/modules/ppc64el/cdrom-core-modules
new file mode 100644
index 000000000000..4e22480aa742
--- /dev/null
+++ b/debian/installer/modules/ppc64el/cdrom-core-modules
@@ -0,0 +1 @@
+#include "../ppc64/cdrom-core-modules"
diff --git a/debian/installer/powerpc/modules/powerpc/compress-modules b/debian/installer/modules/ppc64el/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/powerpc/modules/powerpc/compress-modules
+++ b/debian/installer/modules/ppc64el/compress-modules
diff --git a/debian/installer/modules/ppc64el/crc-modules b/debian/installer/modules/ppc64el/crc-modules
new file mode 100644
index 000000000000..6adf710eec44
--- /dev/null
+++ b/debian/installer/modules/ppc64el/crc-modules
@@ -0,0 +1 @@
+#include "../ppc64/crc-modules"
diff --git a/debian/installer/modules/ppc64el/crypto-dm-modules b/debian/installer/modules/ppc64el/crypto-dm-modules
new file mode 100644
index 000000000000..f00e29325833
--- /dev/null
+++ b/debian/installer/modules/ppc64el/crypto-dm-modules
@@ -0,0 +1 @@
+#include "../ppc64/crypto-dm-modules"
diff --git a/debian/installer/modules/ppc64el/crypto-modules b/debian/installer/modules/ppc64el/crypto-modules
new file mode 100644
index 000000000000..1d84b7f90a34
--- /dev/null
+++ b/debian/installer/modules/ppc64el/crypto-modules
@@ -0,0 +1 @@
+#include "../ppc64/crypto-modules"
diff --git a/debian/installer/modules/ppc64el/event-modules b/debian/installer/modules/ppc64el/event-modules
new file mode 100644
index 000000000000..e4a33897e135
--- /dev/null
+++ b/debian/installer/modules/ppc64el/event-modules
@@ -0,0 +1 @@
+#include "../ppc64/event-modules"
diff --git a/debian/installer/modules/ppc64el/ext4-modules b/debian/installer/modules/ppc64el/ext4-modules
new file mode 100644
index 000000000000..b145b0d960d1
--- /dev/null
+++ b/debian/installer/modules/ppc64el/ext4-modules
@@ -0,0 +1 @@
+#include "../ppc64/ext4-modules"
diff --git a/debian/installer/modules/ppc64el/fancontrol-modules b/debian/installer/modules/ppc64el/fancontrol-modules
new file mode 100644
index 000000000000..c3ace7562c5b
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fancontrol-modules
@@ -0,0 +1 @@
+#include "../ppc64/fancontrol-modules"
diff --git a/debian/installer/modules/ppc64el/fat-modules b/debian/installer/modules/ppc64el/fat-modules
new file mode 100644
index 000000000000..016d97275344
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fat-modules
@@ -0,0 +1 @@
+#include "../ppc64/fat-modules"
diff --git a/debian/installer/modules/ppc64el/firewire-core-modules b/debian/installer/modules/ppc64el/firewire-core-modules
new file mode 100644
index 000000000000..5a7791fe82db
--- /dev/null
+++ b/debian/installer/modules/ppc64el/firewire-core-modules
@@ -0,0 +1 @@
+#include "../ppc64/firewire-core-modules"
diff --git a/debian/installer/modules/ppc64el/fuse-modules b/debian/installer/modules/ppc64el/fuse-modules
new file mode 100644
index 000000000000..c90a988b2064
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fuse-modules
@@ -0,0 +1 @@
+#include "../ppc64/fuse-modules"
diff --git a/debian/installer/modules/ppc64el/hypervisor-modules b/debian/installer/modules/ppc64el/hypervisor-modules
new file mode 100644
index 000000000000..2c8e7d824e40
--- /dev/null
+++ b/debian/installer/modules/ppc64el/hypervisor-modules
@@ -0,0 +1 @@
+#include "../ppc64/hypervisor-modules"
diff --git a/debian/installer/modules/ppc64el/input-modules b/debian/installer/modules/ppc64el/input-modules
new file mode 100644
index 000000000000..94d6a1174c3f
--- /dev/null
+++ b/debian/installer/modules/ppc64el/input-modules
@@ -0,0 +1 @@
+#include "../ppc64/input-modules"
diff --git a/debian/installer/modules/ppc64el/isofs-modules b/debian/installer/modules/ppc64el/isofs-modules
new file mode 100644
index 000000000000..ff9a9e5cb501
--- /dev/null
+++ b/debian/installer/modules/ppc64el/isofs-modules
@@ -0,0 +1 @@
+#include "../ppc64/isofs-modules"
diff --git a/debian/installer/modules/ppc64el/jfs-modules b/debian/installer/modules/ppc64el/jfs-modules
new file mode 100644
index 000000000000..86a502bda7b2
--- /dev/null
+++ b/debian/installer/modules/ppc64el/jfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/jfs-modules"
diff --git a/debian/installer/modules/ppc64el/kernel-image b/debian/installer/modules/ppc64el/kernel-image
new file mode 100644
index 000000000000..243665337577
--- /dev/null
+++ b/debian/installer/modules/ppc64el/kernel-image
@@ -0,0 +1 @@
+#include "../ppc64/kernel-image"
diff --git a/debian/installer/modules/ppc64el/loop-modules b/debian/installer/modules/ppc64el/loop-modules
new file mode 100644
index 000000000000..2373df643193
--- /dev/null
+++ b/debian/installer/modules/ppc64el/loop-modules
@@ -0,0 +1 @@
+#include "../ppc64/loop-modules"
diff --git a/debian/installer/modules/ppc64el/md-modules b/debian/installer/modules/ppc64el/md-modules
new file mode 100644
index 000000000000..be97ac8b0e70
--- /dev/null
+++ b/debian/installer/modules/ppc64el/md-modules
@@ -0,0 +1 @@
+#include "../ppc64/md-modules"
diff --git a/debian/installer/modules/ppc64el/mouse-modules b/debian/installer/modules/ppc64el/mouse-modules
new file mode 100644
index 000000000000..fecdd47a4dcd
--- /dev/null
+++ b/debian/installer/modules/ppc64el/mouse-modules
@@ -0,0 +1 @@
+#include "../ppc64/mouse-modules"
diff --git a/debian/installer/modules/ppc64el/multipath-modules b/debian/installer/modules/ppc64el/multipath-modules
new file mode 100644
index 000000000000..d6965bdb86f6
--- /dev/null
+++ b/debian/installer/modules/ppc64el/multipath-modules
@@ -0,0 +1 @@
+#include "../ppc64/multipath-modules"
diff --git a/debian/installer/modules/ppc64el/nbd-modules b/debian/installer/modules/ppc64el/nbd-modules
new file mode 100644
index 000000000000..9037d8f6362d
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nbd-modules
@@ -0,0 +1 @@
+#include "../ppc64/nbd-modules"
diff --git a/debian/installer/modules/ppc64el/nic-modules b/debian/installer/modules/ppc64el/nic-modules
new file mode 100644
index 000000000000..5af435ef4036
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nic-modules
@@ -0,0 +1,6 @@
+#include "../ppc64/nic-modules"
+
+airport -
+ehea -
+ps3_gelic -
+spidernet -
diff --git a/debian/installer/modules/ppc64el/nic-shared-modules b/debian/installer/modules/ppc64el/nic-shared-modules
new file mode 100644
index 000000000000..c8ff13b12d46
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nic-shared-modules
@@ -0,0 +1 @@
+#include "../ppc64/nic-shared-modules"
diff --git a/debian/installer/modules/ppc64el/ppp-modules b/debian/installer/modules/ppc64el/ppp-modules
new file mode 100644
index 000000000000..212615220f21
--- /dev/null
+++ b/debian/installer/modules/ppc64el/ppp-modules
@@ -0,0 +1 @@
+#include "../ppc64/ppp-modules"
diff --git a/debian/installer/modules/ppc64el/sata-modules b/debian/installer/modules/ppc64el/sata-modules
new file mode 100644
index 000000000000..92f711ac9d71
--- /dev/null
+++ b/debian/installer/modules/ppc64el/sata-modules
@@ -0,0 +1 @@
+#include "../ppc64/sata-modules"
diff --git a/debian/installer/modules/ppc64el/scsi-core-modules b/debian/installer/modules/ppc64el/scsi-core-modules
new file mode 100644
index 000000000000..b764c2b2e99a
--- /dev/null
+++ b/debian/installer/modules/ppc64el/scsi-core-modules
@@ -0,0 +1 @@
+#include "../ppc64/scsi-core-modules"
diff --git a/debian/installer/modules/ppc64el/scsi-modules b/debian/installer/modules/ppc64el/scsi-modules
new file mode 100644
index 000000000000..da5091e04dee
--- /dev/null
+++ b/debian/installer/modules/ppc64el/scsi-modules
@@ -0,0 +1,3 @@
+#include "../ppc64/scsi-modules"
+
+ps3rom -
diff --git a/debian/installer/modules/ppc64el/serial-modules b/debian/installer/modules/ppc64el/serial-modules
new file mode 100644
index 000000000000..111ebcd6dc56
--- /dev/null
+++ b/debian/installer/modules/ppc64el/serial-modules
@@ -0,0 +1 @@
+#include "../ppc64/serial-modules"
diff --git a/debian/installer/modules/ppc64el/squashfs-modules b/debian/installer/modules/ppc64el/squashfs-modules
new file mode 100644
index 000000000000..557d0d204669
--- /dev/null
+++ b/debian/installer/modules/ppc64el/squashfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/squashfs-modules"
diff --git a/debian/installer/modules/ppc64el/udf-modules b/debian/installer/modules/ppc64el/udf-modules
new file mode 100644
index 000000000000..c7471ab0b958
--- /dev/null
+++ b/debian/installer/modules/ppc64el/udf-modules
@@ -0,0 +1 @@
+#include "../ppc64/udf-modules"
diff --git a/debian/installer/modules/ppc64el/uinput-modules b/debian/installer/modules/ppc64el/uinput-modules
new file mode 100644
index 000000000000..4a3898f136de
--- /dev/null
+++ b/debian/installer/modules/ppc64el/uinput-modules
@@ -0,0 +1 @@
+#include "../ppc64/uinput-modules"
diff --git a/debian/installer/modules/ppc64el/usb-modules b/debian/installer/modules/ppc64el/usb-modules
new file mode 100644
index 000000000000..a113185a2118
--- /dev/null
+++ b/debian/installer/modules/ppc64el/usb-modules
@@ -0,0 +1 @@
+#include "../ppc64/usb-modules"
diff --git a/debian/installer/modules/ppc64el/usb-serial-modules b/debian/installer/modules/ppc64el/usb-serial-modules
new file mode 100644
index 000000000000..c7fe81a40275
--- /dev/null
+++ b/debian/installer/modules/ppc64el/usb-serial-modules
@@ -0,0 +1 @@
+#include "../ppc64/usb-serial-modules"
diff --git a/debian/installer/modules/ppc64el/usb-storage-modules b/debian/installer/modules/ppc64el/usb-storage-modules
new file mode 100644
index 000000000000..43d2811a904b
--- /dev/null
+++ b/debian/installer/modules/ppc64el/usb-storage-modules
@@ -0,0 +1 @@
+#include "../ppc64/usb-storage-modules"
diff --git a/debian/installer/modules/ppc64el/virtio-modules b/debian/installer/modules/ppc64el/virtio-modules
new file mode 100644
index 000000000000..9a32c3dd7481
--- /dev/null
+++ b/debian/installer/modules/ppc64el/virtio-modules
@@ -0,0 +1 @@
+#include "../ppc64/virtio-modules"
diff --git a/debian/installer/modules/ppc64el/xfs-modules b/debian/installer/modules/ppc64el/xfs-modules
new file mode 100644
index 000000000000..3431331e90b8
--- /dev/null
+++ b/debian/installer/modules/ppc64el/xfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/xfs-modules"
diff --git a/debian/installer/powerpc/modules/powerpc/btrfs-modules b/debian/installer/modules/s390x/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/powerpc/modules/powerpc/btrfs-modules
+++ b/debian/installer/modules/s390x/btrfs-modules
diff --git a/debian/installer/ppc64el/modules/ppc64el/compress-modules b/debian/installer/modules/s390x/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/ppc64el/modules/ppc64el/compress-modules
+++ b/debian/installer/modules/s390x/compress-modules
diff --git a/debian/installer/powerpc/modules/powerpc/crc-modules b/debian/installer/modules/s390x/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/powerpc/modules/powerpc/crc-modules
+++ b/debian/installer/modules/s390x/crc-modules
diff --git a/debian/installer/powerpc/modules/powerpc/crypto-dm-modules b/debian/installer/modules/s390x/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/powerpc/modules/powerpc/crypto-dm-modules
+++ b/debian/installer/modules/s390x/crypto-dm-modules
diff --git a/debian/installer/powerpc/modules/powerpc/crypto-modules b/debian/installer/modules/s390x/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/powerpc/modules/powerpc/crypto-modules
+++ b/debian/installer/modules/s390x/crypto-modules
diff --git a/debian/installer/s390x/modules/s390x/dasd-extra-modules b/debian/installer/modules/s390x/dasd-extra-modules
index ddd10cdfb115..ddd10cdfb115 100644
--- a/debian/installer/s390x/modules/s390x/dasd-extra-modules
+++ b/debian/installer/modules/s390x/dasd-extra-modules
diff --git a/debian/installer/s390x/modules/s390x/dasd-modules b/debian/installer/modules/s390x/dasd-modules
index d3df219e70fa..d3df219e70fa 100644
--- a/debian/installer/s390x/modules/s390x/dasd-modules
+++ b/debian/installer/modules/s390x/dasd-modules
diff --git a/debian/installer/powerpc/modules/powerpc/ext4-modules b/debian/installer/modules/s390x/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/powerpc/modules/powerpc/ext4-modules
+++ b/debian/installer/modules/s390x/ext4-modules
diff --git a/debian/installer/s390x/modules/s390x/fat-modules b/debian/installer/modules/s390x/fat-modules
index cce8fd30ca4f..cce8fd30ca4f 100644
--- a/debian/installer/s390x/modules/s390x/fat-modules
+++ b/debian/installer/modules/s390x/fat-modules
diff --git a/debian/installer/s390x/modules/s390x/fuse-modules b/debian/installer/modules/s390x/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/s390x/modules/s390x/fuse-modules
+++ b/debian/installer/modules/s390x/fuse-modules
diff --git a/debian/installer/powerpc/modules/powerpc/isofs-modules b/debian/installer/modules/s390x/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/powerpc/modules/powerpc/isofs-modules
+++ b/debian/installer/modules/s390x/isofs-modules
diff --git a/debian/installer/s390x/modules/s390x/kernel-image b/debian/installer/modules/s390x/kernel-image
index fd8c3a7721ea..fd8c3a7721ea 100644
--- a/debian/installer/s390x/modules/s390x/kernel-image
+++ b/debian/installer/modules/s390x/kernel-image
diff --git a/debian/installer/s390x/modules/s390x/loop-modules b/debian/installer/modules/s390x/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/s390x/modules/s390x/loop-modules
+++ b/debian/installer/modules/s390x/loop-modules
diff --git a/debian/installer/s390x/modules/s390x/md-modules b/debian/installer/modules/s390x/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/s390x/modules/s390x/md-modules
+++ b/debian/installer/modules/s390x/md-modules
diff --git a/debian/installer/powerpc/modules/powerpc/multipath-modules b/debian/installer/modules/s390x/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/powerpc/modules/powerpc/multipath-modules
+++ b/debian/installer/modules/s390x/multipath-modules
diff --git a/debian/installer/powerpc/modules/powerpc/nbd-modules b/debian/installer/modules/s390x/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/powerpc/modules/powerpc/nbd-modules
+++ b/debian/installer/modules/s390x/nbd-modules
diff --git a/debian/installer/s390x/modules/s390x/nic-modules b/debian/installer/modules/s390x/nic-modules
index 32056514d485..32056514d485 100644
--- a/debian/installer/s390x/modules/s390x/nic-modules
+++ b/debian/installer/modules/s390x/nic-modules
diff --git a/debian/installer/s390x/modules/s390x/scsi-core-modules b/debian/installer/modules/s390x/scsi-core-modules
index 3537f82349ae..3537f82349ae 100644
--- a/debian/installer/s390x/modules/s390x/scsi-core-modules
+++ b/debian/installer/modules/s390x/scsi-core-modules
diff --git a/debian/installer/s390x/modules/s390x/scsi-modules b/debian/installer/modules/s390x/scsi-modules
index 1f0171d7e7ac..1f0171d7e7ac 100644
--- a/debian/installer/s390x/modules/s390x/scsi-modules
+++ b/debian/installer/modules/s390x/scsi-modules
diff --git a/debian/installer/powerpc/modules/powerpc/udf-modules b/debian/installer/modules/s390x/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/powerpc/modules/powerpc/udf-modules
+++ b/debian/installer/modules/s390x/udf-modules
diff --git a/debian/installer/s390x/modules/s390x/virtio-modules b/debian/installer/modules/s390x/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/s390x/modules/s390x/virtio-modules
+++ b/debian/installer/modules/s390x/virtio-modules
diff --git a/debian/installer/s390x/modules/s390x/xfs-modules b/debian/installer/modules/s390x/xfs-modules
index c020b5d399f9..c020b5d399f9 100644
--- a/debian/installer/s390x/modules/s390x/xfs-modules
+++ b/debian/installer/modules/s390x/xfs-modules
diff --git a/debian/installer/powerpc/modules/powerpc/zlib-modules b/debian/installer/modules/s390x/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/powerpc/modules/powerpc/zlib-modules
+++ b/debian/installer/modules/s390x/zlib-modules
diff --git a/debian/installer/s390x/modules/s390x/btrfs-modules b/debian/installer/modules/sh4-sh7751r/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/s390x/modules/s390x/btrfs-modules
+++ b/debian/installer/modules/sh4-sh7751r/btrfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/cdrom-core-modules b/debian/installer/modules/sh4-sh7751r/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/cdrom-core-modules
+++ b/debian/installer/modules/sh4-sh7751r/cdrom-core-modules
diff --git a/debian/installer/s390x/modules/s390x/compress-modules b/debian/installer/modules/sh4-sh7751r/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/s390x/modules/s390x/compress-modules
+++ b/debian/installer/modules/sh4-sh7751r/compress-modules
diff --git a/debian/installer/s390x/modules/s390x/crc-modules b/debian/installer/modules/sh4-sh7751r/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/s390x/modules/s390x/crc-modules
+++ b/debian/installer/modules/sh4-sh7751r/crc-modules
diff --git a/debian/installer/s390x/modules/s390x/crypto-dm-modules b/debian/installer/modules/sh4-sh7751r/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/s390x/modules/s390x/crypto-dm-modules
+++ b/debian/installer/modules/sh4-sh7751r/crypto-dm-modules
diff --git a/debian/installer/s390x/modules/s390x/crypto-modules b/debian/installer/modules/sh4-sh7751r/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/s390x/modules/s390x/crypto-modules
+++ b/debian/installer/modules/sh4-sh7751r/crypto-modules
diff --git a/debian/installer/s390x/modules/s390x/ext4-modules b/debian/installer/modules/sh4-sh7751r/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/s390x/modules/s390x/ext4-modules
+++ b/debian/installer/modules/sh4-sh7751r/ext4-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/fat-modules b/debian/installer/modules/sh4-sh7751r/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/fat-modules
+++ b/debian/installer/modules/sh4-sh7751r/fat-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/firewire-core-modules b/debian/installer/modules/sh4-sh7751r/firewire-core-modules
index dcac80af9651..dcac80af9651 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/firewire-core-modules
+++ b/debian/installer/modules/sh4-sh7751r/firewire-core-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/fuse-modules b/debian/installer/modules/sh4-sh7751r/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/fuse-modules
+++ b/debian/installer/modules/sh4-sh7751r/fuse-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/i2c-modules b/debian/installer/modules/sh4-sh7751r/i2c-modules
index 203a607e73ce..203a607e73ce 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/i2c-modules
+++ b/debian/installer/modules/sh4-sh7751r/i2c-modules
diff --git a/debian/installer/s390x/modules/s390x/isofs-modules b/debian/installer/modules/sh4-sh7751r/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/s390x/modules/s390x/isofs-modules
+++ b/debian/installer/modules/sh4-sh7751r/isofs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/jfs-modules b/debian/installer/modules/sh4-sh7751r/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/jfs-modules
+++ b/debian/installer/modules/sh4-sh7751r/jfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/kernel-image b/debian/installer/modules/sh4-sh7751r/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/kernel-image
+++ b/debian/installer/modules/sh4-sh7751r/kernel-image
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/loop-modules b/debian/installer/modules/sh4-sh7751r/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/loop-modules
+++ b/debian/installer/modules/sh4-sh7751r/loop-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/md-modules b/debian/installer/modules/sh4-sh7751r/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/md-modules
+++ b/debian/installer/modules/sh4-sh7751r/md-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/minix-modules b/debian/installer/modules/sh4-sh7751r/minix-modules
index 82b9843720a1..82b9843720a1 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/minix-modules
+++ b/debian/installer/modules/sh4-sh7751r/minix-modules
diff --git a/debian/installer/s390x/modules/s390x/multipath-modules b/debian/installer/modules/sh4-sh7751r/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/s390x/modules/s390x/multipath-modules
+++ b/debian/installer/modules/sh4-sh7751r/multipath-modules
diff --git a/debian/installer/s390x/modules/s390x/nbd-modules b/debian/installer/modules/sh4-sh7751r/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/s390x/modules/s390x/nbd-modules
+++ b/debian/installer/modules/sh4-sh7751r/nbd-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nic-modules b/debian/installer/modules/sh4-sh7751r/nic-modules
index 67761a69cc74..67761a69cc74 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/nic-modules
+++ b/debian/installer/modules/sh4-sh7751r/nic-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nic-shared-modules b/debian/installer/modules/sh4-sh7751r/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/nic-shared-modules
+++ b/debian/installer/modules/sh4-sh7751r/nic-shared-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nic-usb-modules b/debian/installer/modules/sh4-sh7751r/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/nic-usb-modules
+++ b/debian/installer/modules/sh4-sh7751r/nic-usb-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/pata-modules b/debian/installer/modules/sh4-sh7751r/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/pata-modules
+++ b/debian/installer/modules/sh4-sh7751r/pata-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/ppp-modules b/debian/installer/modules/sh4-sh7751r/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/ppp-modules
+++ b/debian/installer/modules/sh4-sh7751r/ppp-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/sata-modules b/debian/installer/modules/sh4-sh7751r/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/sata-modules
+++ b/debian/installer/modules/sh4-sh7751r/sata-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/sound-modules b/debian/installer/modules/sh4-sh7751r/sound-modules
index 68395ab3d99a..68395ab3d99a 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/sound-modules
+++ b/debian/installer/modules/sh4-sh7751r/sound-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/speakup-modules b/debian/installer/modules/sh4-sh7751r/speakup-modules
index 29592721a7aa..29592721a7aa 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/speakup-modules
+++ b/debian/installer/modules/sh4-sh7751r/speakup-modules
diff --git a/debian/installer/powerpc/modules/powerpc/squashfs-modules b/debian/installer/modules/sh4-sh7751r/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/powerpc/modules/powerpc/squashfs-modules
+++ b/debian/installer/modules/sh4-sh7751r/squashfs-modules
diff --git a/debian/installer/s390x/modules/s390x/udf-modules b/debian/installer/modules/sh4-sh7751r/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/s390x/modules/s390x/udf-modules
+++ b/debian/installer/modules/sh4-sh7751r/udf-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/usb-serial-modules b/debian/installer/modules/sh4-sh7751r/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/usb-serial-modules
+++ b/debian/installer/modules/sh4-sh7751r/usb-serial-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/usb-storage-modules b/debian/installer/modules/sh4-sh7751r/usb-storage-modules
index 8c5e81b55e3a..8c5e81b55e3a 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/usb-storage-modules
+++ b/debian/installer/modules/sh4-sh7751r/usb-storage-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/virtio-modules b/debian/installer/modules/sh4-sh7751r/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/virtio-modules
+++ b/debian/installer/modules/sh4-sh7751r/virtio-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/xfs-modules b/debian/installer/modules/sh4-sh7751r/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/xfs-modules
+++ b/debian/installer/modules/sh4-sh7751r/xfs-modules
diff --git a/debian/installer/s390x/modules/s390x/zlib-modules b/debian/installer/modules/sh4-sh7751r/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/s390x/modules/s390x/zlib-modules
+++ b/debian/installer/modules/sh4-sh7751r/zlib-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/btrfs-modules b/debian/installer/modules/sh4-sh7785lcr/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/btrfs-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/btrfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/cdrom-core-modules b/debian/installer/modules/sh4-sh7785lcr/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/cdrom-core-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/cdrom-core-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/compress-modules b/debian/installer/modules/sh4-sh7785lcr/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/compress-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/compress-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/crc-modules b/debian/installer/modules/sh4-sh7785lcr/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/crc-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/crc-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/crypto-dm-modules b/debian/installer/modules/sh4-sh7785lcr/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/crypto-dm-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/crypto-dm-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/crypto-modules b/debian/installer/modules/sh4-sh7785lcr/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/crypto-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/crypto-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/ext4-modules b/debian/installer/modules/sh4-sh7785lcr/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/ext4-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/ext4-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/fat-modules b/debian/installer/modules/sh4-sh7785lcr/fat-modules
index 274584eb65fb..274584eb65fb 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/fat-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/fat-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/firewire-core-modules b/debian/installer/modules/sh4-sh7785lcr/firewire-core-modules
index dcac80af9651..dcac80af9651 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/firewire-core-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/firewire-core-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules b/debian/installer/modules/sh4-sh7785lcr/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/fuse-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/isofs-modules b/debian/installer/modules/sh4-sh7785lcr/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/isofs-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/isofs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/jfs-modules b/debian/installer/modules/sh4-sh7785lcr/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/jfs-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/jfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image b/debian/installer/modules/sh4-sh7785lcr/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image
+++ b/debian/installer/modules/sh4-sh7785lcr/kernel-image
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/loop-modules b/debian/installer/modules/sh4-sh7785lcr/loop-modules
index c1c948fa3316..c1c948fa3316 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/loop-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/loop-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/md-modules b/debian/installer/modules/sh4-sh7785lcr/md-modules
index 26115e10b800..26115e10b800 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/md-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/md-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/minix-modules b/debian/installer/modules/sh4-sh7785lcr/minix-modules
index 82b9843720a1..82b9843720a1 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/minix-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/minix-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/multipath-modules b/debian/installer/modules/sh4-sh7785lcr/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/multipath-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/multipath-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nbd-modules b/debian/installer/modules/sh4-sh7785lcr/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/nbd-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/nbd-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-modules b/debian/installer/modules/sh4-sh7785lcr/nic-modules
index 67761a69cc74..67761a69cc74 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/nic-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-shared-modules b/debian/installer/modules/sh4-sh7785lcr/nic-shared-modules
index cc84b14dcd10..cc84b14dcd10 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-shared-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/nic-shared-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-usb-modules b/debian/installer/modules/sh4-sh7785lcr/nic-usb-modules
index c479669b477e..c479669b477e 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-usb-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/nic-usb-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/pata-modules b/debian/installer/modules/sh4-sh7785lcr/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/pata-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/pata-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/ppp-modules b/debian/installer/modules/sh4-sh7785lcr/ppp-modules
index 1f26aa1ee60e..1f26aa1ee60e 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/ppp-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/ppp-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/sata-modules b/debian/installer/modules/sh4-sh7785lcr/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/sata-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/sata-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/sound-modules b/debian/installer/modules/sh4-sh7785lcr/sound-modules
index 68395ab3d99a..68395ab3d99a 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/sound-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/sound-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/speakup-modules b/debian/installer/modules/sh4-sh7785lcr/speakup-modules
index 29592721a7aa..29592721a7aa 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/speakup-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/speakup-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/squashfs-modules b/debian/installer/modules/sh4-sh7785lcr/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/squashfs-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/squashfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/udf-modules b/debian/installer/modules/sh4-sh7785lcr/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/udf-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/udf-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/usb-serial-modules b/debian/installer/modules/sh4-sh7785lcr/usb-serial-modules
index c0a0dc3bd179..c0a0dc3bd179 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/usb-serial-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/usb-serial-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/xfs-modules b/debian/installer/modules/sh4-sh7785lcr/xfs-modules
index 98374e2bbaf8..98374e2bbaf8 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/xfs-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/xfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/zlib-modules b/debian/installer/modules/sh4-sh7785lcr/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/sh4/modules/sh4-sh7751r/zlib-modules
+++ b/debian/installer/modules/sh4-sh7785lcr/zlib-modules
diff --git a/debian/installer/sparc64/modules/sparc64/ata-modules b/debian/installer/modules/sparc64/ata-modules
index b81c0f38b74a..b81c0f38b74a 100644
--- a/debian/installer/sparc64/modules/sparc64/ata-modules
+++ b/debian/installer/modules/sparc64/ata-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/btrfs-modules b/debian/installer/modules/sparc64/btrfs-modules
index e261e1388380..e261e1388380 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/btrfs-modules
+++ b/debian/installer/modules/sparc64/btrfs-modules
diff --git a/debian/installer/sparc64/modules/sparc64/cdrom-core-modules b/debian/installer/modules/sparc64/cdrom-core-modules
index e264d7aa3488..e264d7aa3488 100644
--- a/debian/installer/sparc64/modules/sparc64/cdrom-core-modules
+++ b/debian/installer/modules/sparc64/cdrom-core-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules b/debian/installer/modules/sparc64/compress-modules
index 8046166199c2..8046166199c2 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules
+++ b/debian/installer/modules/sparc64/compress-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/crc-modules b/debian/installer/modules/sparc64/crc-modules
index 7e00de705e41..7e00de705e41 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/crc-modules
+++ b/debian/installer/modules/sparc64/crc-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/crypto-dm-modules b/debian/installer/modules/sparc64/crypto-dm-modules
index 4c8f2354cd26..4c8f2354cd26 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/crypto-dm-modules
+++ b/debian/installer/modules/sparc64/crypto-dm-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/crypto-modules b/debian/installer/modules/sparc64/crypto-modules
index 3a1e862b4cc9..3a1e862b4cc9 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/crypto-modules
+++ b/debian/installer/modules/sparc64/crypto-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/ext4-modules b/debian/installer/modules/sparc64/ext4-modules
index 394c577ce40d..394c577ce40d 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/ext4-modules
+++ b/debian/installer/modules/sparc64/ext4-modules
diff --git a/debian/installer/sparc64/modules/sparc64/fat-modules b/debian/installer/modules/sparc64/fat-modules
index cce8fd30ca4f..cce8fd30ca4f 100644
--- a/debian/installer/sparc64/modules/sparc64/fat-modules
+++ b/debian/installer/modules/sparc64/fat-modules
diff --git a/debian/installer/sparc64/modules/sparc64/fuse-modules b/debian/installer/modules/sparc64/fuse-modules
index 0b6ba0c8c8fe..0b6ba0c8c8fe 100644
--- a/debian/installer/sparc64/modules/sparc64/fuse-modules
+++ b/debian/installer/modules/sparc64/fuse-modules
diff --git a/debian/installer/sparc64/modules/sparc64/input-modules b/debian/installer/modules/sparc64/input-modules
index 5ecb595a4a49..5ecb595a4a49 100644
--- a/debian/installer/sparc64/modules/sparc64/input-modules
+++ b/debian/installer/modules/sparc64/input-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/isofs-modules b/debian/installer/modules/sparc64/isofs-modules
index da4fa9a3c77d..da4fa9a3c77d 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/isofs-modules
+++ b/debian/installer/modules/sparc64/isofs-modules
diff --git a/debian/installer/sparc64/modules/sparc64/jfs-modules b/debian/installer/modules/sparc64/jfs-modules
index 7e4d912b9529..7e4d912b9529 100644
--- a/debian/installer/sparc64/modules/sparc64/jfs-modules
+++ b/debian/installer/modules/sparc64/jfs-modules
diff --git a/debian/installer/sparc64/modules/sparc64/kernel-image b/debian/installer/modules/sparc64/kernel-image
index 1d11b1921dae..1d11b1921dae 100644
--- a/debian/installer/sparc64/modules/sparc64/kernel-image
+++ b/debian/installer/modules/sparc64/kernel-image
diff --git a/debian/installer/sparc64/modules/sparc64/md-modules b/debian/installer/modules/sparc64/md-modules
index ade088ddbb2f..ade088ddbb2f 100644
--- a/debian/installer/sparc64/modules/sparc64/md-modules
+++ b/debian/installer/modules/sparc64/md-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/multipath-modules b/debian/installer/modules/sparc64/multipath-modules
index a8b69b2537a0..a8b69b2537a0 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/multipath-modules
+++ b/debian/installer/modules/sparc64/multipath-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nbd-modules b/debian/installer/modules/sparc64/nbd-modules
index 3c9b3e5d426d..3c9b3e5d426d 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/nbd-modules
+++ b/debian/installer/modules/sparc64/nbd-modules
diff --git a/debian/installer/sparc64/modules/sparc64/nic-modules b/debian/installer/modules/sparc64/nic-modules
index ed625047dc13..ed625047dc13 100644
--- a/debian/installer/sparc64/modules/sparc64/nic-modules
+++ b/debian/installer/modules/sparc64/nic-modules
diff --git a/debian/installer/sparc64/modules/sparc64/pata-modules b/debian/installer/modules/sparc64/pata-modules
index b0cd6337a28d..b0cd6337a28d 100644
--- a/debian/installer/sparc64/modules/sparc64/pata-modules
+++ b/debian/installer/modules/sparc64/pata-modules
diff --git a/debian/installer/sparc64/modules/sparc64/ppp-modules b/debian/installer/modules/sparc64/ppp-modules
index f1ae9b3d15ac..f1ae9b3d15ac 100644
--- a/debian/installer/sparc64/modules/sparc64/ppp-modules
+++ b/debian/installer/modules/sparc64/ppp-modules
diff --git a/debian/installer/sparc64/modules/sparc64/sata-modules b/debian/installer/modules/sparc64/sata-modules
index 01318c258b5a..01318c258b5a 100644
--- a/debian/installer/sparc64/modules/sparc64/sata-modules
+++ b/debian/installer/modules/sparc64/sata-modules
diff --git a/debian/installer/sparc64/modules/sparc64/scsi-core-modules b/debian/installer/modules/sparc64/scsi-core-modules
index 6026fdf46e6c..6026fdf46e6c 100644
--- a/debian/installer/sparc64/modules/sparc64/scsi-core-modules
+++ b/debian/installer/modules/sparc64/scsi-core-modules
diff --git a/debian/installer/sparc64/modules/sparc64/scsi-modules b/debian/installer/modules/sparc64/scsi-modules
index afceaf8ecfed..afceaf8ecfed 100644
--- a/debian/installer/sparc64/modules/sparc64/scsi-modules
+++ b/debian/installer/modules/sparc64/scsi-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/squashfs-modules b/debian/installer/modules/sparc64/squashfs-modules
index 42d77887ad3d..42d77887ad3d 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/squashfs-modules
+++ b/debian/installer/modules/sparc64/squashfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/udf-modules b/debian/installer/modules/sparc64/udf-modules
index b90d7ee9b52e..b90d7ee9b52e 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/udf-modules
+++ b/debian/installer/modules/sparc64/udf-modules
diff --git a/debian/installer/sparc64/modules/sparc64/ufs-modules b/debian/installer/modules/sparc64/ufs-modules
index 163ead095a54..163ead095a54 100644
--- a/debian/installer/sparc64/modules/sparc64/ufs-modules
+++ b/debian/installer/modules/sparc64/ufs-modules
diff --git a/debian/installer/sparc64/modules/sparc64/usb-modules b/debian/installer/modules/sparc64/usb-modules
index c598dedd8112..c598dedd8112 100644
--- a/debian/installer/sparc64/modules/sparc64/usb-modules
+++ b/debian/installer/modules/sparc64/usb-modules
diff --git a/debian/installer/sparc64/modules/sparc64/usb-storage-modules b/debian/installer/modules/sparc64/usb-storage-modules
index 272d95e2e8b1..272d95e2e8b1 100644
--- a/debian/installer/sparc64/modules/sparc64/usb-storage-modules
+++ b/debian/installer/modules/sparc64/usb-storage-modules
diff --git a/debian/installer/sparc64/modules/sparc64/virtio-modules b/debian/installer/modules/sparc64/virtio-modules
index 61da39659c6f..61da39659c6f 100644
--- a/debian/installer/sparc64/modules/sparc64/virtio-modules
+++ b/debian/installer/modules/sparc64/virtio-modules
diff --git a/debian/installer/sparc64/modules/sparc64/xfs-modules b/debian/installer/modules/sparc64/xfs-modules
index c020b5d399f9..c020b5d399f9 100644
--- a/debian/installer/sparc64/modules/sparc64/xfs-modules
+++ b/debian/installer/modules/sparc64/xfs-modules
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/zlib-modules b/debian/installer/modules/sparc64/zlib-modules
index e02ad64bf9c5..e02ad64bf9c5 100644
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/zlib-modules
+++ b/debian/installer/modules/sparc64/zlib-modules
diff --git a/debian/installer/package-list b/debian/installer/package-list
index 8fb6a3158f36..1332ae0af234 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -3,6 +3,22 @@
 # architecture, which is derived from the files in the modules directory.
 #
 Package: kernel-image
+Provides_amd64: zlib-modules
+Provides_arm64: zlib-modules
+Provides_armel: rtc-modules
+Provides_i386: rtc-modules, zlib-modules
+Provides_ia64: efi-modules, zlib-modules
+Provides_loongson-3: i2c-modules, rtc-modules
+Provides_mips: rtc-modules
+Provides_mips64: rtc-modules
+Provides_mips64el: rtc-modules
+Provides_mips64r6: rtc-modules
+Provides_mips64r6el: rtc-modules
+Provides_mipsel: rtc-modules
+Provides_mipsr6: rtc-modules
+Provides_mipsr6el: rtc-modules
+Provides_parisc64-smp: i2c-modules
+Provides_sh4: event-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules
 Priority: standard
 Description: Linux kernel image and core modules for the Debian installer
  This package contains the kernel image and core modules for the Debian
@@ -33,6 +49,7 @@ Description: Shared NIC drivers
 
 Package: serial-modules
 Depends: kernel-image, pcmcia-modules
+Depends_ia64: kernel-image, pcmcia-modules, sn-modules
 Priority: optional
 Description: Serial drivers
  This package contains serial drivers for the kernel.
@@ -52,11 +69,14 @@ Description: PPP drivers
 Package: pata-modules
 Depends: kernel-image, ata-modules
 Priority: standard
+Priority_armhf: optional
 Description: PATA drivers
  This package contains PATA drivers for the kernel.
 
 Package: cdrom-core-modules
 Depends: kernel-image, scsi-core-modules, isofs-modules
+Depends_ia64: kernel-image, scsi-core-modules, ide-modules, isofs-modules
+Depends_m68k: kernel-image, scsi-core-modules, ide-modules
 Priority: standard
 Description: CDROM support
  This package contains core CDROM support for the kernel.
@@ -112,7 +132,7 @@ Description: ISOFS filesystem support
  This package contains the ISOFS filesystem module for the kernel.
 
 Package: jffs2-modules
-Depends: kernel-image, zlib-modules, compress-modules
+Depends: kernel-image, zlib-modules, compress-modules, mtd-modules
 Priority: optional
 Description: JFFS2 filesystem support
  This package contains the JFFS2 filesystem module for the kernel.
@@ -144,6 +164,9 @@ Description: XFS filesystem support
 Package: fat-modules
 Depends: kernel-image
 Priority: optional
+Priority_amd64: standard
+Priority_i386: standard
+Priority_ia64: standard
 Description: FAT filesystem support
  This package contains the FAT and VFAT filesystem modules for the kernel.
 
@@ -203,7 +226,9 @@ Description: PCMCIA storage drivers
 
 Package: fb-modules
 Depends: kernel-image, i2c-modules
+Depends_armel: kernel-image, usb-modules
 Priority: optional
+Priority_hppa: standard
 Description: Frame buffer support
  This package contains Frame buffer drivers for the kernel.
 
@@ -227,6 +252,8 @@ Description: Mouse support
 
 Package: nic-pcmcia-modules
 Depends: kernel-image, nic-shared-modules, nic-wireless-modules, pcmcia-modules, mmc-core-modules
+Depends_powerpc: kernel-image, nic-modules, nic-shared-modules, pcmcia-modules
+Depends_ppc64: kernel-image, nic-modules, nic-shared-modules, pcmcia-modules
 Priority: standard
 Description: Common PCMCIA NIC drivers
  This package contains common PCMCIA NIC drivers for the kernel.
@@ -389,3 +416,56 @@ Depends: kernel-image
 Priority: optional
 Description: MTD modules
  This package contains MTD modules.
+
+Package: srm-modules
+Depends: kernel-image
+Priority: standard
+Description: SRM modules
+ This package contains the srm_env module which provides access to the SRM
+ environment.
+
+Package: ide-core-modules
+Depends: kernel-image
+Priority: standard
+Description: IDE support
+ This package contains core IDE support for the kernel.
+
+Package: ide-modules
+Depends: kernel-image, ide-core-modules, sn-modules
+Priority: standard
+Description: IDE drivers
+ This package contains IDE drivers for the kernel.
+
+Package: sn-modules
+Depends: kernel-image
+Priority: optional
+Description: SN modules
+ This package contains SN modules for Altix systems
+
+Package: hypervisor-modules
+Depends: kernel-image
+Priority: standard
+Description: IBM 64bit hypervisor console modules
+ Contains drivers for the hypervisor console, used as console for linux
+ running in logical partitions of IBM hardware supporting it.
+
+Package: fancontrol-modules
+Depends: kernel-image
+Priority: standard
+Description: Apple powermac fancontrol modules
+ Contains drivers for macintosh i2c bus as well as for the monitoring devices
+ connected to it. This allows to control the fans during installation.
+
+Package: dasd-modules
+Depends: kernel-image
+Priority: standard
+Description: dasd modules
+ This package contains dasd modules.
+
+Package: dasd-extra-modules
+Depends: kernel-image, dasd-modules
+Priority: optional
+Description: optional dasd DIAG support
+ This package contains the module for dasd DIAG support. The udeb is
+ not loaded by default as the installer does not actually support this.
+ It can however be useful to have available in rescue situations.
diff --git a/debian/installer/powerpc/kernel-versions b/debian/installer/powerpc/kernel-versions
deleted file mode 100644
index 50cf2120af64..000000000000
--- a/debian/installer/powerpc/kernel-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# arch  version flavour   installedname suffix build-depends
-powerpc -       powerpc   -             -      -
-powerpc -       powerpc64 -             -      -
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules
deleted file mode 100644
index b32747c68e2a..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules
+++ /dev/null
@@ -1,28 +0,0 @@
-3c59x
-8139too
-de2104x
-dl2k
-dmfe
-e100
-fealnx
-hamachi
-ixgb
-natsemi
-ne2k-pci
-ns83820
-p54pci
-p54usb
-prism54 ?
-r8169
-s2io
-starfire
-tg3 ?
-tlan
-tulip
-winbond-840
-winbond-840
-yellowfin
-
-broadcom ?
-
-8021q
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-pcmcia-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-pcmcia-modules
deleted file mode 100644
index 3f521e9db033..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-pcmcia-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-modules
deleted file mode 100644
index dd5ae9ccee6d..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/affs-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/affs-modules
deleted file mode 100644
index f12f6ace215a..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/affs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/affs-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ata-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/ata-modules
deleted file mode 100644
index 39540d4b6a42..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/ata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ata-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/cdrom-core-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/cdrom-core-modules
deleted file mode 100644
index feed89a1a493..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/cdrom-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/cdrom-core-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fat-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/fat-modules
deleted file mode 100644
index 043dc5602954..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/fat-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/fat-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/firewire-core-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/firewire-core-modules
deleted file mode 100644
index 035ab3162504..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/firewire-core-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules
deleted file mode 100644
index 49bdce41b076..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/fuse-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/hfs-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/hfs-modules
deleted file mode 100644
index a85f6914303d..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/hfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/hfs-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/input-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/input-modules
deleted file mode 100644
index 38a888940fa7..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/input-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/input-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/jfs-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/jfs-modules
deleted file mode 100644
index b71ebd35e864..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/jfs-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/kernel-image b/debian/installer/powerpc/modules/powerpc-powerpc64/kernel-image
deleted file mode 100644
index a0b7d0cf49cd..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/kernel-image"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/loop-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/loop-modules
deleted file mode 100644
index e2273687f548..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/loop-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/md-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/md-modules
deleted file mode 100644
index 93be33f95c56..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/md-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/md-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/mouse-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/mouse-modules
deleted file mode 100644
index 22aca9411c68..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/mouse-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules
deleted file mode 100644
index 5b05e0d43cb9..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-shared-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/pata-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/pata-modules
deleted file mode 100644
index bb9cbe3abe71..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/pata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pata-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-modules
deleted file mode 100644
index e508df664357..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pcmcia-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-storage-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-storage-modules
deleted file mode 100644
index f00f24605f56..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-storage-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pcmcia-storage-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ppp-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/ppp-modules
deleted file mode 100644
index eb7ab74a52f1..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ppp-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/sata-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/sata-modules
deleted file mode 100644
index 591ad741022a..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/sata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/sata-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-core-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-core-modules
deleted file mode 100644
index c972a4717408..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-core-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/serial-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/serial-modules
deleted file mode 100644
index 349196e30e8b..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/serial-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/usb-modules
deleted file mode 100644
index 9c5b10a7b9e0..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-serial-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/usb-serial-modules
deleted file mode 100644
index e25b5586285f..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-serial-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-storage-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/usb-storage-modules
deleted file mode 100644
index 5f278e65f838..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-storage-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-storage-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/xfs-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/xfs-modules
deleted file mode 100644
index c850127e905d..000000000000
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/xfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/xfs-modules"
diff --git a/debian/installer/powerpc/modules/powerpc/event-modules b/debian/installer/powerpc/modules/powerpc/event-modules
deleted file mode 100644
index f8819afd361c..000000000000
--- a/debian/installer/powerpc/modules/powerpc/event-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <event-modules>
diff --git a/debian/installer/powerpc/modules/powerpc/uinput-modules b/debian/installer/powerpc/modules/powerpc/uinput-modules
deleted file mode 100644
index 58a833779442..000000000000
--- a/debian/installer/powerpc/modules/powerpc/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <uinput-modules>
diff --git a/debian/installer/powerpc/package-list b/debian/installer/powerpc/package-list
deleted file mode 100644
index 798bdf521e31..000000000000
--- a/debian/installer/powerpc/package-list
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: pata-modules
-Depends: kernel-image, ata-modules, core-modules
-
-Package: nic-pcmcia-modules
-Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, core-modules
-
-Package: hypervisor-modules
-Depends: kernel-image
-Priority: standard
-Description: IBM 64bit hypervisor console modules
- Contains drivers for the hypervisor console, used as console for linux
- running in logical partitions of IBM hardware supporting it.
-
-Package: fancontrol-modules
-Depends: kernel-image
-Priority: standard
-Description: Apple powermac fancontrol modules
- Contains drivers for macintosh i2c bus as well as for the monitoring devices
- connected to it. This allows to control the fans during installation.
diff --git a/debian/installer/ppc64/kernel-versions b/debian/installer/ppc64/kernel-versions
deleted file mode 100644
index 359bd103c707..000000000000
--- a/debian/installer/ppc64/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch  version flavour   installedname suffix build-depends
-ppc64   -       powerpc64 -             -      -
diff --git a/debian/installer/ppc64/modules/powerpc b/debian/installer/ppc64/modules/powerpc
deleted file mode 120000
index 207f2439cc9a..000000000000
--- a/debian/installer/ppc64/modules/powerpc
+++ /dev/null
@@ -1 +0,0 @@
-../../powerpc/modules/powerpc
\ No newline at end of file
diff --git a/debian/installer/ppc64/modules/ppc64 b/debian/installer/ppc64/modules/ppc64
deleted file mode 120000
index f007b6a78807..000000000000
--- a/debian/installer/ppc64/modules/ppc64
+++ /dev/null
@@ -1 +0,0 @@
-../../powerpc/modules/powerpc-powerpc64
\ No newline at end of file
diff --git a/debian/installer/ppc64/package-list b/debian/installer/ppc64/package-list
deleted file mode 120000
index d5716760226a..000000000000
--- a/debian/installer/ppc64/package-list
+++ /dev/null
@@ -1 +0,0 @@
-../powerpc/package-list
\ No newline at end of file
diff --git a/debian/installer/ppc64el/kernel-versions b/debian/installer/ppc64el/kernel-versions
deleted file mode 100644
index 5f0d460d3eb3..000000000000
--- a/debian/installer/ppc64el/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch  version flavour     installedname suffix build-depends
-ppc64el -       powerpc64le -             -      -
diff --git a/debian/installer/ppc64el/modules/ppc64el/ata-modules b/debian/installer/ppc64el/modules/ppc64el/ata-modules
deleted file mode 100644
index 77a471d2f780..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/ata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/ata-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/btrfs-modules b/debian/installer/ppc64el/modules/ppc64el/btrfs-modules
deleted file mode 100644
index 4ab00bed8c25..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/btrfs-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/cdrom-core-modules b/debian/installer/ppc64el/modules/ppc64el/cdrom-core-modules
deleted file mode 100644
index ab06dbd9b92b..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/cdrom-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/cdrom-core-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/crc-modules b/debian/installer/ppc64el/modules/ppc64el/crc-modules
deleted file mode 100644
index faf2d628d40c..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/crc-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/crc-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/crypto-dm-modules b/debian/installer/ppc64el/modules/ppc64el/crypto-dm-modules
deleted file mode 100644
index 2c530b3d41e8..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/crypto-dm-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/crypto-modules b/debian/installer/ppc64el/modules/ppc64el/crypto-modules
deleted file mode 100644
index c6170b1d3e8d..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/crypto-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/event-modules b/debian/installer/ppc64el/modules/ppc64el/event-modules
deleted file mode 100644
index b0e5f5626264..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/event-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/event-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/ext4-modules b/debian/installer/ppc64el/modules/ppc64el/ext4-modules
deleted file mode 100644
index ac5f4c066d3c..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/ext4-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/fancontrol-modules b/debian/installer/ppc64el/modules/ppc64el/fancontrol-modules
deleted file mode 100644
index 55cde68adfb7..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/fancontrol-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/fancontrol-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/fat-modules b/debian/installer/ppc64el/modules/ppc64el/fat-modules
deleted file mode 100644
index 9ef0e07a2f47..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/fat-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/fat-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/firewire-core-modules b/debian/installer/ppc64el/modules/ppc64el/firewire-core-modules
deleted file mode 100644
index 30b2c4c7c663..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/firewire-core-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/fuse-modules b/debian/installer/ppc64el/modules/ppc64el/fuse-modules
deleted file mode 100644
index 73597f9e752e..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/fuse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/fuse-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/hypervisor-modules b/debian/installer/ppc64el/modules/ppc64el/hypervisor-modules
deleted file mode 100644
index f2edc4b77578..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/hypervisor-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/hypervisor-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/input-modules b/debian/installer/ppc64el/modules/ppc64el/input-modules
deleted file mode 100644
index e4625ac77928..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/input-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/input-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/isofs-modules b/debian/installer/ppc64el/modules/ppc64el/isofs-modules
deleted file mode 100644
index 18fb993d20ef..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/isofs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/isofs-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/jfs-modules b/debian/installer/ppc64el/modules/ppc64el/jfs-modules
deleted file mode 100644
index 193513f5ff76..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/jfs-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/kernel-image b/debian/installer/ppc64el/modules/ppc64el/kernel-image
deleted file mode 100644
index 93f4a3702a4d..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/kernel-image"
diff --git a/debian/installer/ppc64el/modules/ppc64el/loop-modules b/debian/installer/ppc64el/modules/ppc64el/loop-modules
deleted file mode 100644
index fac3d38d4436..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/loop-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/md-modules b/debian/installer/ppc64el/modules/ppc64el/md-modules
deleted file mode 100644
index 03b10183f0ee..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/md-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/md-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/mouse-modules b/debian/installer/ppc64el/modules/ppc64el/mouse-modules
deleted file mode 100644
index 163e3bab08dc..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/mouse-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/multipath-modules b/debian/installer/ppc64el/modules/ppc64el/multipath-modules
deleted file mode 100644
index cb7afcb659c8..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/multipath-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/nbd-modules b/debian/installer/ppc64el/modules/ppc64el/nbd-modules
deleted file mode 100644
index 6540c0af63b8..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/nbd-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/nic-modules b/debian/installer/ppc64el/modules/ppc64el/nic-modules
deleted file mode 100644
index f8c5bb011ed6..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/nic-modules
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "../../../ppc64/modules/ppc64/nic-modules"
-
-airport -
-ehea -
-ps3_gelic -
-spidernet -
diff --git a/debian/installer/ppc64el/modules/ppc64el/nic-shared-modules b/debian/installer/ppc64el/modules/ppc64el/nic-shared-modules
deleted file mode 100644
index 13812a869972..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/nic-shared-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/ppp-modules b/debian/installer/ppc64el/modules/ppc64el/ppp-modules
deleted file mode 100644
index 626201967584..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/ppp-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/sata-modules b/debian/installer/ppc64el/modules/ppc64el/sata-modules
deleted file mode 100644
index 6907d272eba4..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/sata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/sata-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/scsi-core-modules b/debian/installer/ppc64el/modules/ppc64el/scsi-core-modules
deleted file mode 100644
index dd496f79b5ca..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/scsi-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/scsi-core-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/scsi-modules b/debian/installer/ppc64el/modules/ppc64el/scsi-modules
deleted file mode 100644
index da4567b84af7..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/scsi-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "../../../ppc64/modules/ppc64/scsi-modules"
-
-ps3rom -
diff --git a/debian/installer/ppc64el/modules/ppc64el/serial-modules b/debian/installer/ppc64el/modules/ppc64el/serial-modules
deleted file mode 100644
index 22548f450aeb..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/serial-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/squashfs-modules b/debian/installer/ppc64el/modules/ppc64el/squashfs-modules
deleted file mode 100644
index 8c0c6d1c2b8b..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/squashfs-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/udf-modules b/debian/installer/ppc64el/modules/ppc64el/udf-modules
deleted file mode 100644
index 9ab96e02600f..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/udf-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/uinput-modules b/debian/installer/ppc64el/modules/ppc64el/uinput-modules
deleted file mode 100644
index 3d3929e24acc..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/uinput-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/usb-modules b/debian/installer/ppc64el/modules/ppc64el/usb-modules
deleted file mode 100644
index 45ac3cf89c08..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/usb-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/usb-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/usb-serial-modules b/debian/installer/ppc64el/modules/ppc64el/usb-serial-modules
deleted file mode 100644
index 63a8412e7ea0..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/usb-serial-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/usb-storage-modules b/debian/installer/ppc64el/modules/ppc64el/usb-storage-modules
deleted file mode 100644
index 1679b922b3a7..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/usb-storage-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/usb-storage-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/virtio-modules b/debian/installer/ppc64el/modules/ppc64el/virtio-modules
deleted file mode 100644
index cbfbd1137421..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/virtio-modules"
diff --git a/debian/installer/ppc64el/modules/ppc64el/xfs-modules b/debian/installer/ppc64el/modules/ppc64el/xfs-modules
deleted file mode 100644
index 5e8a7ce69d9e..000000000000
--- a/debian/installer/ppc64el/modules/ppc64el/xfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../ppc64/modules/ppc64/xfs-modules"
diff --git a/debian/installer/ppc64el/package-list b/debian/installer/ppc64el/package-list
deleted file mode 120000
index a872ee13ea72..000000000000
--- a/debian/installer/ppc64el/package-list
+++ /dev/null
@@ -1 +0,0 @@
-../ppc64/package-list
\ No newline at end of file
diff --git a/debian/installer/s390x/kernel-versions b/debian/installer/s390x/kernel-versions
deleted file mode 100644
index bbe139d5aa79..000000000000
--- a/debian/installer/s390x/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour    installedname suffix build-depends
-s390x  -       s390x      -             -      -
diff --git a/debian/installer/s390x/package-list b/debian/installer/s390x/package-list
deleted file mode 100644
index 4744d084a257..000000000000
--- a/debian/installer/s390x/package-list
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: dasd-modules
-Depends: kernel-image
-Priority: standard
-Description: dasd modules
- This package contains dasd modules.
-
-Package: dasd-extra-modules
-Depends: kernel-image, dasd-modules
-Priority: optional
-Description: optional dasd DIAG support
- This package contains the module for dasd DIAG support. The udeb is
- not loaded by default as the installer does not actually support this.
- It can however be useful to have available in rescue situations.
diff --git a/debian/installer/sh4/kernel-versions b/debian/installer/sh4/kernel-versions
deleted file mode 100644
index b39e3cfb6e66..000000000000
--- a/debian/installer/sh4/kernel-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# arch version flavour   installedname suffix build-depends
-sh4    -       sh7751r   -             y      -
-sh4    -       sh7785lcr -             y      -
diff --git a/debian/installer/sh4/package-list b/debian/installer/sh4/package-list
deleted file mode 100644
index 934de9c7f8b0..000000000000
--- a/debian/installer/sh4/package-list
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-Package: kernel-image
-Provides: event-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules
diff --git a/debian/installer/sparc64/kernel-versions b/debian/installer/sparc64/kernel-versions
deleted file mode 100644
index 4811933864ca..000000000000
--- a/debian/installer/sparc64/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch  version flavour installedname suffix build-depends
-sparc64 -       sparc64 -             y      -
diff --git a/debian/installer/sparc64/modules/sparc64/btrfs-modules b/debian/installer/sparc64/modules/sparc64/btrfs-modules
deleted file mode 100644
index e261e1388380..000000000000
--- a/debian/installer/sparc64/modules/sparc64/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <btrfs-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/compress-modules b/debian/installer/sparc64/modules/sparc64/compress-modules
deleted file mode 100644
index 8046166199c2..000000000000
--- a/debian/installer/sparc64/modules/sparc64/compress-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <compress-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/crc-modules b/debian/installer/sparc64/modules/sparc64/crc-modules
deleted file mode 100644
index 7e00de705e41..000000000000
--- a/debian/installer/sparc64/modules/sparc64/crc-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crc-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/crypto-dm-modules b/debian/installer/sparc64/modules/sparc64/crypto-dm-modules
deleted file mode 100644
index 4c8f2354cd26..000000000000
--- a/debian/installer/sparc64/modules/sparc64/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-dm-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/crypto-modules b/debian/installer/sparc64/modules/sparc64/crypto-modules
deleted file mode 100644
index 3a1e862b4cc9..000000000000
--- a/debian/installer/sparc64/modules/sparc64/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/ext4-modules b/debian/installer/sparc64/modules/sparc64/ext4-modules
deleted file mode 100644
index 394c577ce40d..000000000000
--- a/debian/installer/sparc64/modules/sparc64/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <ext4-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/isofs-modules b/debian/installer/sparc64/modules/sparc64/isofs-modules
deleted file mode 100644
index da4fa9a3c77d..000000000000
--- a/debian/installer/sparc64/modules/sparc64/isofs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <isofs-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/multipath-modules b/debian/installer/sparc64/modules/sparc64/multipath-modules
deleted file mode 100644
index a8b69b2537a0..000000000000
--- a/debian/installer/sparc64/modules/sparc64/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <multipath-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/nbd-modules b/debian/installer/sparc64/modules/sparc64/nbd-modules
deleted file mode 100644
index 3c9b3e5d426d..000000000000
--- a/debian/installer/sparc64/modules/sparc64/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nbd-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/squashfs-modules b/debian/installer/sparc64/modules/sparc64/squashfs-modules
deleted file mode 100644
index 42d77887ad3d..000000000000
--- a/debian/installer/sparc64/modules/sparc64/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <squashfs-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/udf-modules b/debian/installer/sparc64/modules/sparc64/udf-modules
deleted file mode 100644
index b90d7ee9b52e..000000000000
--- a/debian/installer/sparc64/modules/sparc64/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <udf-modules>
diff --git a/debian/installer/sparc64/modules/sparc64/zlib-modules b/debian/installer/sparc64/modules/sparc64/zlib-modules
deleted file mode 100644
index e02ad64bf9c5..000000000000
--- a/debian/installer/sparc64/modules/sparc64/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list
deleted file mode 100644
index 1e5e2f638fd9..000000000000
--- a/debian/installer/sparc64/package-list
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: nic-modules
-Priority: standard
-Description: Network card modules for Sparc kernels
- This package contains the drivers for the Happy Meal/Big Mac 10/100BaseT,
- Sun QuadEthernet and MyriCOM Gigabit Ethernet SBus devices for SPARC
- systems, as well as various PCI NIC drivers (only on sparc64.)
- .
- Do not install this package on a real Debian system! You probably
- want a kernel-image package instead.
diff --git a/debian/lib/python/debian_linux/config.py b/debian/lib/python/debian_linux/config.py
index 004469af8fad..4106a7d55247 100644
--- a/debian/lib/python/debian_linux/config.py
+++ b/debian/lib/python/debian_linux/config.py
@@ -34,7 +34,7 @@ class SchemaItemInteger(object):
 
 
 class SchemaItemList(object):
-    def __init__(self, type="\s+"):
+    def __init__(self, type=r"\s+"):
         self.type = type
 
     def __call__(self, i):
diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py
index afc956ef002a..b67678d05af7 100644
--- a/debian/lib/python/debian_linux/debian.py
+++ b/debian/lib/python/debian_linux/debian.py
@@ -421,7 +421,7 @@ class PackageArchitecture(collections.MutableSet):
 
     def extend(self, value):
         if isinstance(value, str):
-            for i in re.split('\s', value.strip()):
+            for i in re.split(r'\s', value.strip()):
                 self.add(i)
         else:
             raise RuntimeError
@@ -493,7 +493,7 @@ class PackageRelation(list):
 
     def extend(self, value, override_arches=None):
         if isinstance(value, str):
-            value = (j.strip() for j in re.split(',', value.strip()))
+            value = (j.strip() for j in re.split(r',', value.strip()))
         for i in value:
             self.append(i, override_arches)
 
@@ -529,7 +529,7 @@ class PackageRelationGroup(list):
 
     def extend(self, value, override_arches=None):
         if isinstance(value, str):
-            value = (j.strip() for j in re.split('\|', value.strip()))
+            value = (j.strip() for j in re.split(r'\|', value.strip()))
         for i in value:
             self.append(i, override_arches)
 
@@ -612,11 +612,11 @@ class PackageRelationEntry(object):
             self.operator = None
         self.version = match[2]
         if match[3] is not None:
-            self.arches = re.split('\s+', match[3])
+            self.arches = re.split(r'\s+', match[3])
         else:
             self.arches = []
         if match[4] is not None:
-            self.restrictions = re.split('\s+', match[4])
+            self.restrictions = re.split(r'\s+', match[4])
         else:
             self.restrictions = []
 
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index b4764e244805..c46f9991df90 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -91,6 +91,7 @@ class Gencontrol(object):
         self.do_main(packages, makefile)
         self.do_extra(packages, makefile)
 
+        self.merge_build_depends(packages)
         self.write(packages, makefile)
 
     def do_source(self, packages):
@@ -313,6 +314,34 @@ class Gencontrol(object):
 
         return re.sub(r'@([-_a-z0-9]+)@', subst, str(s))
 
+    def merge_build_depends(self, packages):
+        # Merge Build-Depends pseudo-fields from binary packages into the
+        # source package
+        source = packages["source"]
+        arch_all = PackageArchitecture("all")
+        for name, package in packages.items():
+            if name == "source":
+                continue
+            dep = package.get("Build-Depends")
+            if not dep:
+                continue
+            del package["Build-Depends"]
+            for group in dep:
+                for item in group:
+                    if package["Architecture"] != arch_all and not item.arches:
+                        item.arches = sorted(package["Architecture"])
+                    if package.get("Build-Profiles") and not item.restrictions:
+                        profiles = package["Build-Profiles"]
+                        assert profiles[0] == "<" and profiles[-1] == ">"
+                        item.restrictions = re.split(r"\s+", profiles[1:-1])
+            if package["Architecture"] == arch_all:
+                dep_type = "Build-Depends-Indep"
+            else:
+                dep_type = "Build-Depends-Arch"
+            if dep_type not in source:
+                source[dep_type] = PackageRelation()
+            source[dep_type].extend(dep)
+
     def write(self, packages, makefile):
         self.write_control(packages.values())
         self.write_makefile(makefile)
diff --git a/debian/patches/bugfix/all/Revert-net-increase-fragment-memory-usage-limits.patch b/debian/patches/bugfix/all/Revert-net-increase-fragment-memory-usage-limits.patch
deleted file mode 100644
index eaa7d9f22ae0..000000000000
--- a/debian/patches/bugfix/all/Revert-net-increase-fragment-memory-usage-limits.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Salvatore Bonaccorso <carnil@debian.org>
-Date: Sat, 28 Jul 2018 16:48:31 +0200
-Subject: [PATCH] Revert "net: increase fragment memory usage limits"
-
-This reverts commit c2a936600f78aea00d3312ea4b66a79a4619f9b4.
-
-Revert commit as mitigation to FragmentSmack (CVE-2018-5391)
-[bwh: Adjust context to apply to sid]
----
- include/net/ipv6.h     |  4 ++--
- net/ipv4/ip_fragment.c | 22 +++++++---------------
- 2 files changed, 9 insertions(+), 17 deletions(-)
-
---- a/include/net/ipv6.h
-+++ b/include/net/ipv6.h
-@@ -379,8 +379,8 @@ static inline bool ipv6_accept_ra(struct
- 	    idev->cnf.accept_ra;
- }
- 
--#define IPV6_FRAG_HIGH_THRESH	(4 * 1024*1024)	/* 4194304 */
--#define IPV6_FRAG_LOW_THRESH	(3 * 1024*1024)	/* 3145728 */
-+#define IPV6_FRAG_HIGH_THRESH	(256 * 1024)	/* 262144 */
-+#define IPV6_FRAG_LOW_THRESH	(192 * 1024)	/* 196608 */
- #define IPV6_FRAG_TIMEOUT	(60 * HZ)	/* 60 seconds */
- 
- int __ipv6_addr_type(const struct in6_addr *addr);
---- a/net/ipv4/ip_fragment.c
-+++ b/net/ipv4/ip_fragment.c
-@@ -788,22 +788,14 @@ static int __net_init ipv4_frags_init_ne
- {
- 	int res;
- 
--	/* Fragment cache limits.
--	 *
--	 * The fragment memory accounting code, (tries to) account for
--	 * the real memory usage, by measuring both the size of frag
--	 * queue struct (inet_frag_queue (ipv4:ipq/ipv6:frag_queue))
--	 * and the SKB's truesize.
--	 *
--	 * A 64K fragment consumes 129736 bytes (44*2944)+200
--	 * (1500 truesize == 2944, sizeof(struct ipq) == 200)
--	 *
--	 * We will commit 4MB at one time. Should we cross that limit
--	 * we will prune down to 3MB, making room for approx 8 big 64K
--	 * fragments 8x128k.
-+	/*
-+	 * Fragment cache limits. We will commit 256K at one time. Should we
-+	 * cross that limit we will prune down to 192K. This should cope with
-+	 * even the most extreme cases without allowing an attacker to
-+	 * measurably harm machine performance.
- 	 */
--	net->ipv4.frags.high_thresh = 4 * 1024 * 1024;
--	net->ipv4.frags.low_thresh  = 3 * 1024 * 1024;
-+	net->ipv4.frags.high_thresh = 256 * 1024;
-+	net->ipv4.frags.low_thresh = 192 * 1024;
- 	/*
- 	 * Important NOTE! Fragment queue must be destroyed before MSL expires.
- 	 * RFC791 is wrong proposing to prolongate timer each fragment arrival
diff --git a/debian/patches/bugfix/all/floppy-Do-not-copy-a-kernel-pointer-to-user-memory-i.patch b/debian/patches/bugfix/all/floppy-Do-not-copy-a-kernel-pointer-to-user-memory-i.patch
deleted file mode 100644
index c592afd4dfe8..000000000000
--- a/debian/patches/bugfix/all/floppy-Do-not-copy-a-kernel-pointer-to-user-memory-i.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Andy Whitcroft <apw@canonical.com>
-Date: Thu, 20 Sep 2018 09:09:48 -0600
-Subject: floppy: Do not copy a kernel pointer to user memory in FDGETPRM ioctl
-Origin: https://git.kernel.org/linus/65eea8edc315589d6c993cf12dbb5d0e9ef1fe4e
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-7755
-
-The final field of a floppy_struct is the field "name", which is a pointer
-to a string in kernel memory.  The kernel pointer should not be copied to
-user memory.  The FDGETPRM ioctl copies a floppy_struct to user memory,
-including this "name" field.  This pointer cannot be used by the user
-and it will leak a kernel address to user-space, which will reveal the
-location of kernel code and data and undermine KASLR protection.
-
-Model this code after the compat ioctl which copies the returned data
-to a previously cleared temporary structure on the stack (excluding the
-name pointer) and copy out to userspace from there.  As we already have
-an inparam union with an appropriate member and that memory is already
-cleared even for read only calls make use of that as a temporary store.
-
-Based on an initial patch by Brian Belleville.
-
-CVE-2018-7755
-Signed-off-by: Andy Whitcroft <apw@canonical.com>
-
-Broke up long line.
-
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- drivers/block/floppy.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index 48f622728ce6..f2b6f4da1034 100644
---- a/drivers/block/floppy.c
-+++ b/drivers/block/floppy.c
-@@ -3467,6 +3467,9 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
- 					  (struct floppy_struct **)&outparam);
- 		if (ret)
- 			return ret;
-+		memcpy(&inparam.g, outparam,
-+				offsetof(struct floppy_struct, name));
-+		outparam = &inparam.g;
- 		break;
- 	case FDMSGON:
- 		UDP->flags |= FTD_MSG;
--- 
-2.11.0
-
diff --git a/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch b/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
index ee2355d99e42..820479896eee 100644
--- a/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
+++ b/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
@@ -9,8 +9,8 @@ sources.
 
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
-@@ -242,6 +242,11 @@ cmd_record_mcount =						\
- endif # -record-mcount
+@@ -232,6 +232,11 @@ cmd_record_mcount =						\
+ endif # CC_USING_RECORD_MCOUNT
  endif # CONFIG_FTRACE_MCOUNT_RECORD
  
 +# Don't require recordmcount source for an OOT build.
diff --git a/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch b/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
index 6749793adb71..656767bb54de 100644
--- a/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
+++ b/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
@@ -68,10 +68,10 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +	$(CC) $(1) $(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))
  
  # ld-option
- # Usage: LDFLAGS += $(call ld-option, -X)
+ # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y)
 --- a/Makefile
 +++ b/Makefile
-@@ -665,6 +665,8 @@ endif
+@@ -675,6 +675,8 @@ endif
  KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \
  			$(call cc-disable-warning,maybe-uninitialized,))
  
@@ -80,7 +80,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  # Tell gcc to never replace conditional load with a non-conditional one
  KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)
  
-@@ -772,7 +774,7 @@ KBUILD_CFLAGS_KERNEL	+= $(call cc-option
+@@ -798,7 +800,7 @@ LDFLAGS_vmlinux += --gc-sections
  endif
  
  # arch Makefile may override CC so keep this after arch Makefile is included
diff --git a/debian/patches/bugfix/all/lockdep-stub-nmi-watchdog-reset.patch b/debian/patches/bugfix/all/lockdep-stub-nmi-watchdog-reset.patch
deleted file mode 100644
index 49701917d041..000000000000
--- a/debian/patches/bugfix/all/lockdep-stub-nmi-watchdog-reset.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2b14169744f9aeccd09c30926d9f0b6a80ff6156 Mon Sep 17 00:00:00 2001
-From: Bastian Blank <waldi@debian.org>
-Date: Sun, 11 Feb 2018 06:24:15 +0000
-Subject: [PATCH 3/3] lockdep: Stub NMI watchdog reset
-
----
- tools/include/linux/nmi.h | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
- create mode 100644 tools/include/linux/nmi.h
-
-diff --git a/tools/include/linux/nmi.h b/tools/include/linux/nmi.h
-new file mode 100644
-index 000000000000..81ffb39343cc
---- /dev/null
-+++ b/tools/include/linux/nmi.h
-@@ -0,0 +1,12 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ *  linux/include/linux/nmi.h
-+ */
-+#ifndef LINUX_NMI_H
-+#define LINUX_NMI_H
-+
-+static inline void touch_nmi_watchdog(void)
-+{
-+}
-+
-+#endif
--- 
-2.16.1
-
diff --git a/debian/patches/bugfix/all/lockdep-stub-task_struct-state.patch b/debian/patches/bugfix/all/lockdep-stub-task_struct-state.patch
deleted file mode 100644
index b13b08edd6b6..000000000000
--- a/debian/patches/bugfix/all/lockdep-stub-task_struct-state.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Tue, 03 Jul 2018 06:19:07 +0100
-Subject: lockdep: Stub task_struct::state
-
----
---- a/tools/include/linux/lockdep.h
-+++ b/tools/include/linux/lockdep.h
-@@ -31,12 +31,16 @@ struct task_struct {
- 	gfp_t lockdep_reclaim_gfp;
- 	int pid;
- 	char comm[17];
-+	long state;
- };
- 
- extern struct task_struct *__curr(void);
- 
- #define current (__curr())
- 
-+/* lockdep checks task_struct::state == TASK_RUNNING */
-+#define TASK_RUNNING 0
-+
- static inline int debug_locks_off(void)
- {
- 	return 1;
diff --git a/debian/patches/bugfix/all/netfilter-ipvs-Fix-invalid-bytes-in-IP_VS_MH_TAB_IND.patch b/debian/patches/bugfix/all/netfilter-ipvs-Fix-invalid-bytes-in-IP_VS_MH_TAB_IND.patch
deleted file mode 100644
index c732c6a19d8a..000000000000
--- a/debian/patches/bugfix/all/netfilter-ipvs-Fix-invalid-bytes-in-IP_VS_MH_TAB_IND.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Mon, 2 Jul 2018 17:24:27 +0100
-Subject: netfilter: ipvs: Fix invalid bytes in IP_VS_MH_TAB_INDEX help text
-
-The help text contains several \xa0 bytes, which are not valid UTF-8
-characters but could have been non-breaking spaces in Latin 1
-encoding.  I see no reason to use non-breaking spaces here, so replace
-them with regular spaces.
-
-Fixes: 30edf801d7ed ("netfilter: ipvs: Add configurations of Maglev hashing")
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
----
- net/netfilter/ipvs/Kconfig | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
-index 05dc1b77e466..17b53eee05a5 100644
---- a/net/netfilter/ipvs/Kconfig
-+++ b/net/netfilter/ipvs/Kconfig
-@@ -296,10 +296,10 @@ config IP_VS_MH_TAB_INDEX
- 	  stored in a hash table. This table is assigned by a preference
- 	  list of the positions to each destination until all slots in
- 	  the table are filled. The index determines the prime for size of
--	  the table as 251, 509, 1021, 2039, 4093, 8191, 16381, 32749,
--	  65521 or 131071. When using weights to allow destinations to
--	  receive more connections, the table is assigned an amount
--	  proportional to the weights specified. The table needs to be large
-+	  the table as 251, 509, 1021, 2039, 4093, 8191, 16381, 32749,
-+	  65521 or 131071. When using weights to allow destinations to
-+	  receive more connections, the table is assigned an amount
-+	  proportional to the weights specified. The table needs to be large
- 	  enough to effectively fit all the destinations multiplied by their
- 	  respective weights.
- 
diff --git a/debian/patches/bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch b/debian/patches/bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch
deleted file mode 100644
index 5d9c9262b53f..000000000000
--- a/debian/patches/bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 06 Jul 2018 23:22:10 +0100
-Subject: perf Documentation: Fix out-of-tree asciidoctor man page generation
-
-The dependency for the man page rule using asciidoctor incorrectly
-specifies a source file in $(OUTPUT).  When building out-of-tree, the
-source file is not found, resulting in a fall-back to the following
-rule which uses xmlto.
-
-Fixes: ffef80ecf89f ("perf Documentation: Support for asciidoctor")
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
----
---- a/tools/perf/Documentation/Makefile
-+++ b/tools/perf/Documentation/Makefile
-@@ -285,7 +285,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt
- 	mv $@+ $@
- 
- ifdef USE_ASCIIDOCTOR
--$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.txt
-+$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : %.txt
- 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
- 	$(ASCIIDOC) -b manpage -d manpage \
- 		$(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) -o $@+ $< && \
diff --git a/debian/patches/bugfix/all/scsi-target-iscsi-Use-bin2hex-instead-of-a-re-implem.patch b/debian/patches/bugfix/all/scsi-target-iscsi-Use-bin2hex-instead-of-a-re-implem.patch
deleted file mode 100644
index 6df88837f623..000000000000
--- a/debian/patches/bugfix/all/scsi-target-iscsi-Use-bin2hex-instead-of-a-re-implem.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Vincent Pelletier <plr.vincent@gmail.com>
-Date: Sun, 9 Sep 2018 04:09:27 +0000
-Subject: scsi: target: iscsi: Use bin2hex instead of a re-implementation
-Origin: https://git.kernel.org/linus/8c39e2699f8acb2e29782a834e56306da24937fe
-
-Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>
-Reviewed-by: Mike Christie <mchristi@redhat.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
----
- drivers/target/iscsi/iscsi_target_auth.c | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
-index 6c3b4c022894..4e680d753941 100644
---- a/drivers/target/iscsi/iscsi_target_auth.c
-+++ b/drivers/target/iscsi/iscsi_target_auth.c
-@@ -26,15 +26,6 @@
- #include "iscsi_target_nego.h"
- #include "iscsi_target_auth.h"
- 
--static void chap_binaryhex_to_asciihex(char *dst, char *src, int src_len)
--{
--	int i;
--
--	for (i = 0; i < src_len; i++) {
--		sprintf(&dst[i*2], "%02x", (int) src[i] & 0xff);
--	}
--}
--
- static int chap_gen_challenge(
- 	struct iscsi_conn *conn,
- 	int caller,
-@@ -50,7 +41,7 @@ static int chap_gen_challenge(
- 	ret = get_random_bytes_wait(chap->challenge, CHAP_CHALLENGE_LENGTH);
- 	if (unlikely(ret))
- 		return ret;
--	chap_binaryhex_to_asciihex(challenge_asciihex, chap->challenge,
-+	bin2hex(challenge_asciihex, chap->challenge,
- 				CHAP_CHALLENGE_LENGTH);
- 	/*
- 	 * Set CHAP_C, and copy the generated challenge into c_str.
-@@ -289,7 +280,7 @@ static int chap_server_compute_md5(
- 		goto out;
- 	}
- 
--	chap_binaryhex_to_asciihex(response, server_digest, MD5_SIGNATURE_SIZE);
-+	bin2hex(response, server_digest, MD5_SIGNATURE_SIZE);
- 	pr_debug("[server] MD5 Server Digest: %s\n", response);
- 
- 	if (memcmp(server_digest, client_digest, MD5_SIGNATURE_SIZE) != 0) {
-@@ -411,7 +402,7 @@ static int chap_server_compute_md5(
- 	/*
- 	 * Convert response from binary hex to ascii hext.
- 	 */
--	chap_binaryhex_to_asciihex(response, digest, MD5_SIGNATURE_SIZE);
-+	bin2hex(response, digest, MD5_SIGNATURE_SIZE);
- 	*nr_out_len += sprintf(nr_out_ptr + *nr_out_len, "CHAP_R=0x%s",
- 			response);
- 	*nr_out_len += 1;
--- 
-2.11.0
-
diff --git a/debian/patches/bugfix/all/scsi-target-iscsi-Use-hex2bin-instead-of-a-re-implem.patch b/debian/patches/bugfix/all/scsi-target-iscsi-Use-hex2bin-instead-of-a-re-implem.patch
deleted file mode 100644
index 5f43ba4e0868..000000000000
--- a/debian/patches/bugfix/all/scsi-target-iscsi-Use-hex2bin-instead-of-a-re-implem.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From: Vincent Pelletier <plr.vincent@gmail.com>
-Date: Sun, 9 Sep 2018 04:09:26 +0000
-Subject: scsi: target: iscsi: Use hex2bin instead of a re-implementation
-Origin: https://git.kernel.org/linus/1816494330a83f2a064499d8ed2797045641f92c
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-14633
-
-This change has the following effects, in order of descreasing importance:
-
-1) Prevent a stack buffer overflow
-
-2) Do not append an unnecessary NULL to an anyway binary buffer, which
-   is writing one byte past client_digest when caller is:
-   chap_string_to_hex(client_digest, chap_r, strlen(chap_r));
-
-The latter was found by KASAN (see below) when input value hes expected size
-(32 hex chars), and further analysis revealed a stack buffer overflow can
-happen when network-received value is longer, allowing an unauthenticated
-remote attacker to smash up to 17 bytes after destination buffer (16 bytes
-attacker-controlled and one null).  As switching to hex2bin requires
-specifying destination buffer length, and does not internally append any null,
-it solves both issues.
-
-This addresses CVE-2018-14633.
-
-Beyond this:
-
-- Validate received value length and check hex2bin accepted the input, to log
-  this rejection reason instead of just failing authentication.
-
-- Only log received CHAP_R and CHAP_C values once they passed sanity checks.
-
-==================================================================
-BUG: KASAN: stack-out-of-bounds in chap_string_to_hex+0x32/0x60 [iscsi_target_mod]
-Write of size 1 at addr ffff8801090ef7c8 by task kworker/0:0/1021
-
-CPU: 0 PID: 1021 Comm: kworker/0:0 Tainted: G           O      4.17.8kasan.sess.connops+ #2
-Hardware name: To be filled by O.E.M. To be filled by O.E.M./Aptio CRB, BIOS 5.6.5 05/19/2014
-Workqueue: events iscsi_target_do_login_rx [iscsi_target_mod]
-Call Trace:
- dump_stack+0x71/0xac
- print_address_description+0x65/0x22e
- ? chap_string_to_hex+0x32/0x60 [iscsi_target_mod]
- kasan_report.cold.6+0x241/0x2fd
- chap_string_to_hex+0x32/0x60 [iscsi_target_mod]
- chap_server_compute_md5.isra.2+0x2cb/0x860 [iscsi_target_mod]
- ? chap_binaryhex_to_asciihex.constprop.5+0x50/0x50 [iscsi_target_mod]
- ? ftrace_caller_op_ptr+0xe/0xe
- ? __orc_find+0x6f/0xc0
- ? unwind_next_frame+0x231/0x850
- ? kthread+0x1a0/0x1c0
- ? ret_from_fork+0x35/0x40
- ? ret_from_fork+0x35/0x40
- ? iscsi_target_do_login_rx+0x3bc/0x4c0 [iscsi_target_mod]
- ? deref_stack_reg+0xd0/0xd0
- ? iscsi_target_do_login_rx+0x3bc/0x4c0 [iscsi_target_mod]
- ? is_module_text_address+0xa/0x11
- ? kernel_text_address+0x4c/0x110
- ? __save_stack_trace+0x82/0x100
- ? ret_from_fork+0x35/0x40
- ? save_stack+0x8c/0xb0
- ? 0xffffffffc1660000
- ? iscsi_target_do_login+0x155/0x8d0 [iscsi_target_mod]
- ? iscsi_target_do_login_rx+0x3bc/0x4c0 [iscsi_target_mod]
- ? process_one_work+0x35c/0x640
- ? worker_thread+0x66/0x5d0
- ? kthread+0x1a0/0x1c0
- ? ret_from_fork+0x35/0x40
- ? iscsi_update_param_value+0x80/0x80 [iscsi_target_mod]
- ? iscsit_release_cmd+0x170/0x170 [iscsi_target_mod]
- chap_main_loop+0x172/0x570 [iscsi_target_mod]
- ? chap_server_compute_md5.isra.2+0x860/0x860 [iscsi_target_mod]
- ? rx_data+0xd6/0x120 [iscsi_target_mod]
- ? iscsit_print_session_params+0xd0/0xd0 [iscsi_target_mod]
- ? cyc2ns_read_begin.part.2+0x90/0x90
- ? _raw_spin_lock_irqsave+0x25/0x50
- ? memcmp+0x45/0x70
- iscsi_target_do_login+0x875/0x8d0 [iscsi_target_mod]
- ? iscsi_target_check_first_request.isra.5+0x1a0/0x1a0 [iscsi_target_mod]
- ? del_timer+0xe0/0xe0
- ? memset+0x1f/0x40
- ? flush_sigqueue+0x29/0xd0
- iscsi_target_do_login_rx+0x3bc/0x4c0 [iscsi_target_mod]
- ? iscsi_target_nego_release+0x80/0x80 [iscsi_target_mod]
- ? iscsi_target_restore_sock_callbacks+0x130/0x130 [iscsi_target_mod]
- process_one_work+0x35c/0x640
- worker_thread+0x66/0x5d0
- ? flush_rcu_work+0x40/0x40
- kthread+0x1a0/0x1c0
- ? kthread_bind+0x30/0x30
- ret_from_fork+0x35/0x40
-
-The buggy address belongs to the page:
-page:ffffea0004243bc0 count:0 mapcount:0 mapping:0000000000000000 index:0x0
-flags: 0x17fffc000000000()
-raw: 017fffc000000000 0000000000000000 0000000000000000 00000000ffffffff
-raw: ffffea0004243c20 ffffea0004243ba0 0000000000000000 0000000000000000
-page dumped because: kasan: bad access detected
-
-Memory state around the buggy address:
- ffff8801090ef680: f2 f2 f2 f2 f2 f2 f2 01 f2 f2 f2 f2 f2 f2 f2 00
- ffff8801090ef700: f2 f2 f2 f2 f2 f2 f2 00 02 f2 f2 f2 f2 f2 f2 00
->ffff8801090ef780: 00 f2 f2 f2 f2 f2 f2 00 00 f2 f2 f2 f2 f2 f2 00
-                                              ^
- ffff8801090ef800: 00 f2 f2 f2 f2 f2 f2 00 00 00 00 02 f2 f2 f2 f2
- ffff8801090ef880: f2 f2 f2 00 00 00 00 00 00 00 00 f2 f2 f2 f2 00
-==================================================================
-
-Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>
-Reviewed-by: Mike Christie <mchristi@redhat.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
----
- drivers/target/iscsi/iscsi_target_auth.c | 30 ++++++++++++++----------------
- 1 file changed, 14 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
-index 9518ffd8b8ba..6c3b4c022894 100644
---- a/drivers/target/iscsi/iscsi_target_auth.c
-+++ b/drivers/target/iscsi/iscsi_target_auth.c
-@@ -26,18 +26,6 @@
- #include "iscsi_target_nego.h"
- #include "iscsi_target_auth.h"
- 
--static int chap_string_to_hex(unsigned char *dst, unsigned char *src, int len)
--{
--	int j = DIV_ROUND_UP(len, 2), rc;
--
--	rc = hex2bin(dst, src, j);
--	if (rc < 0)
--		pr_debug("CHAP string contains non hex digit symbols\n");
--
--	dst[j] = '\0';
--	return j;
--}
--
- static void chap_binaryhex_to_asciihex(char *dst, char *src, int src_len)
- {
- 	int i;
-@@ -248,9 +236,16 @@ static int chap_server_compute_md5(
- 		pr_err("Could not find CHAP_R.\n");
- 		goto out;
- 	}
-+	if (strlen(chap_r) != MD5_SIGNATURE_SIZE * 2) {
-+		pr_err("Malformed CHAP_R\n");
-+		goto out;
-+	}
-+	if (hex2bin(client_digest, chap_r, MD5_SIGNATURE_SIZE) < 0) {
-+		pr_err("Malformed CHAP_R\n");
-+		goto out;
-+	}
- 
- 	pr_debug("[server] Got CHAP_R=%s\n", chap_r);
--	chap_string_to_hex(client_digest, chap_r, strlen(chap_r));
- 
- 	tfm = crypto_alloc_shash("md5", 0, 0);
- 	if (IS_ERR(tfm)) {
-@@ -349,9 +344,7 @@ static int chap_server_compute_md5(
- 		pr_err("Could not find CHAP_C.\n");
- 		goto out;
- 	}
--	pr_debug("[server] Got CHAP_C=%s\n", challenge);
--	challenge_len = chap_string_to_hex(challenge_binhex, challenge,
--				strlen(challenge));
-+	challenge_len = DIV_ROUND_UP(strlen(challenge), 2);
- 	if (!challenge_len) {
- 		pr_err("Unable to convert incoming challenge\n");
- 		goto out;
-@@ -360,6 +353,11 @@ static int chap_server_compute_md5(
- 		pr_err("CHAP_C exceeds maximum binary size of 1024 bytes\n");
- 		goto out;
- 	}
-+	if (hex2bin(challenge_binhex, challenge, challenge_len) < 0) {
-+		pr_err("Malformed CHAP_C\n");
-+		goto out;
-+	}
-+	pr_debug("[server] Got CHAP_C=%s\n", challenge);
- 	/*
- 	 * During mutual authentication, the CHAP_C generated by the
- 	 * initiator must not match the original CHAP_C generated by
--- 
-2.11.0
-
diff --git a/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch b/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch
index 473c8ce260df..5ca50d2e9332 100644
--- a/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch
+++ b/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch
@@ -19,22 +19,23 @@ experience errors like these on startup:
   Kernel panic - not syncing: Fatal hardware error!
 
 Signed-off-by: Geoff Levand <geoff@infradead.org>
+[bwh: Adjust context to apply to Linux 4.19]
 ---
  arch/arm64/kernel/acpi.c | 40 ++++++++++++++++++++++++++++++++++++----
  1 file changed, 36 insertions(+), 4 deletions(-)
 
 --- a/arch/arm64/kernel/acpi.c
 +++ b/arch/arm64/kernel/acpi.c
-@@ -31,6 +31,8 @@
- #include <asm/cpu_ops.h>
+@@ -33,6 +33,8 @@
+ #include <asm/pgtable.h>
  #include <asm/smp_plat.h>
  
 +#include <acpi/apei.h>
 +
- #ifdef CONFIG_ACPI_APEI
- # include <linux/efi.h>
- # include <asm/pgtable.h>
-@@ -178,6 +180,33 @@ out:
+ int acpi_noirq = 1;		/* skip ACPI IRQ initialization */
+ int acpi_disabled = 1;
+ EXPORT_SYMBOL(acpi_disabled);
+@@ -175,6 +177,33 @@ out:
  }
  
  /*
@@ -68,7 +69,7 @@ Signed-off-by: Geoff Levand <geoff@infradead.org>
   * acpi_boot_table_init() called from setup_arch(), always.
   *	1. find RSDP and get its address, and then find XSDT
   *	2. extract all tables and checksums them all
-@@ -232,11 +261,14 @@ done:
+@@ -229,11 +258,14 @@ done:
  	if (acpi_disabled) {
  		if (earlycon_acpi_spcr_enable)
  			early_init_dt_scan_chosen_stdout();
@@ -86,4 +87,4 @@ Signed-off-by: Geoff Levand <geoff@infradead.org>
 +	acpi_fixup_m400_quirks();
  }
  
- #ifdef CONFIG_ACPI_APEI
+ pgprot_t __acpi_get_mem_attribute(phys_addr_t addr)
diff --git a/debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch b/debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch
new file mode 100644
index 000000000000..0b3acfadbe05
--- /dev/null
+++ b/debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch
@@ -0,0 +1,39 @@
+From: Krzysztof Kozlowski <krzk@kernel.org>
+Date: Wed, 29 Aug 2018 09:32:23 +0200
+Subject: powerpc/boot: Fix missing crc32poly.h when building with KERNEL_XZ
+Origin: https://patchwork.ozlabs.org/patch/963258/
+
+After commit faa16bc404d7 ("lib: Use existing define with
+polynomial") the lib/xz/xz_crc32.c includes a header from include/linux
+directory thus any other user of this code should define proper include
+path.
+
+This fixes the build error on powerpc with CONFIG_KERNEL_XZ:
+
+    In file included from ../arch/powerpc/boot/../../../lib/decompress_unxz.c:233:0,
+                     from ../arch/powerpc/boot/decompress.c:42:
+    ../arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:29: fatal error: linux/crc32poly.h: No such file or directory
+
+Reported-by: Michal Kubecek <mkubecek@suse.cz>
+Fixes: faa16bc404d7 ("lib: Use existing define with polynomial")
+Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
+Reported-by: kbuild test robot <lkp@intel.com>
+Reported-by: Meelis Roos <mroos@linux.ee>
+Tested-by: Michal Kubecek <mkubecek@suse.cz>
+---
+ arch/powerpc/boot/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
+index 0fb96c26136f..ba4182fb185d 100644
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -63,7 +63,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y)
+ BOOTCFLAGS	+= -fno-stack-protector
+ endif
+ 
+-BOOTCFLAGS	+= -I$(objtree)/$(obj) -I$(srctree)/$(obj)
++BOOTCFLAGS	+= -I$(objtree)/$(obj) -I$(srctree)/$(obj) -I$(srctree)/include
+ 
+ DTC_FLAGS	?= -p 1024
+ 
diff --git a/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch b/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch
index 948f76c11c60..d10177b4bc92 100644
--- a/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch
+++ b/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch
@@ -25,7 +25,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/arch/sh/Makefile
 +++ b/arch/sh/Makefile
-@@ -115,16 +115,16 @@ KBUILD_DEFCONFIG	:= cayman_defconfig
+@@ -119,16 +119,16 @@ LDFLAGS_vmlinux		+= --defsym phys_stext=
  endif
  
  ifdef CONFIG_CPU_LITTLE_ENDIAN
@@ -33,13 +33,13 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 -LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64 --oformat $(ld-bfd)
 +ld_bfd			:= elf32-$(UTS_MACHINE)-linux
 +LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64 --oformat $(ld_bfd)
- LDFLAGS			+= -EL
+ KBUILD_LDFLAGS		+= -EL
  else
 -ld-bfd			:= elf32-$(UTS_MACHINE)big-linux
 -LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd)
 +ld_bfd			:= elf32-$(UTS_MACHINE)big-linux
 +LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64+4 --oformat $(ld_bfd)
- LDFLAGS			+= -EB
+ KBUILD_LDFLAGS		+= -EB
  endif
  
 -export ld-bfd BITS
@@ -83,7 +83,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +       KERNEL_MEMORY suffix_y
 --- a/arch/sh/boot/compressed/Makefile
 +++ b/arch/sh/boot/compressed/Makefile
-@@ -32,7 +32,7 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+@@ -33,7 +33,7 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
  KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
  endif
  
@@ -92,7 +92,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  		   -T $(obj)/../../kernel/vmlinux.lds
  
  #
-@@ -74,7 +74,7 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.al
+@@ -75,7 +75,7 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.al
  
  OBJCOPYFLAGS += -R .empty_zero_page
  
@@ -104,7 +104,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	$(call if_changed,ld)
 --- a/arch/sh/boot/romimage/Makefile
 +++ b/arch/sh/boot/romimage/Makefile
-@@ -12,7 +12,7 @@ mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724)	:
+@@ -13,7 +13,7 @@ mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724)	:
  load-$(CONFIG_ROMIMAGE_MMCIF)		:= $(mmcif-load-y)
  obj-$(CONFIG_ROMIMAGE_MMCIF)		:= $(mmcif-obj-y)
  
@@ -113,7 +113,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  		   -T $(obj)/../../kernel/vmlinux.lds
  
  $(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
-@@ -23,7 +23,7 @@ OBJCOPYFLAGS += -j .empty_zero_page
+@@ -24,7 +24,7 @@ OBJCOPYFLAGS += -j .empty_zero_page
  $(obj)/zeropage.bin: vmlinux FORCE
  	$(call if_changed,objcopy)
  
diff --git a/debian/patches/bugfix/x86/tools-turbostat-Add-checks-for-failure-of-fgets-and-.patch b/debian/patches/bugfix/x86/tools-turbostat-Add-checks-for-failure-of-fgets-and-.patch
new file mode 100644
index 000000000000..cad050d64fa2
--- /dev/null
+++ b/debian/patches/bugfix/x86/tools-turbostat-Add-checks-for-failure-of-fgets-and-.patch
@@ -0,0 +1,114 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 11 Sep 2018 03:07:28 +0100
+Subject: tools: turbostat: Add checks for failure of fgets() and fscanf()
+Forwarded: https://marc.info/?l=linux-pm&m=153711036626779
+
+Most calls to fgets() and fscanf() are followed by error checks.
+Add an exit-on-error in the remaining cases.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ tools/power/x86/turbostat/turbostat.c | 28 +++++++++++++++++----------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
+index 980bd9d20646..b4f32dd37c67 100644
+--- a/tools/power/x86/turbostat/turbostat.c
++++ b/tools/power/x86/turbostat/turbostat.c
+@@ -2554,7 +2554,8 @@ int get_thread_siblings(struct cpu_topology *thiscpu)
+ 	filep = fopen_or_die(path, "r");
+ 	do {
+ 		offset -= BITMASK_SIZE;
+-		fscanf(filep, "%lx%c", &map, &character);
++		if (fscanf(filep, "%lx%c", &map, &character) != 2)
++			err(1, "%s: failed to parse file", path);
+ 		for (shift = 0; shift < BITMASK_SIZE; shift++) {
+ 			if ((map >> shift) & 0x1) {
+ 				so = shift + offset;
+@@ -3407,14 +3408,14 @@ dump_sysfs_cstate_config(void)
+ 		input = fopen(path, "r");
+ 		if (input == NULL)
+ 			continue;
+-		fgets(name_buf, sizeof(name_buf), input);
++		if (!fgets(name_buf, sizeof(name_buf), input))
++			err(1, "%s: failed to read file", path);
+ 
+ 		 /* truncate "C1-HSW\n" to "C1", or truncate "C1\n" to "C1" */
+ 		sp = strchr(name_buf, '-');
+ 		if (!sp)
+ 			sp = strchrnul(name_buf, '\n');
+ 		*sp = '\0';
+-
+ 		fclose(input);
+ 
+ 		sprintf(path, "/sys/devices/system/cpu/cpu%d/cpuidle/state%d/desc",
+@@ -3422,7 +3423,8 @@ dump_sysfs_cstate_config(void)
+ 		input = fopen(path, "r");
+ 		if (input == NULL)
+ 			continue;
+-		fgets(desc, sizeof(desc), input);
++		if (!fgets(desc, sizeof(desc), input))
++			err(1, "%s: failed to read file", path);
+ 
+ 		fprintf(outf, "cpu%d: %s: %s", base_cpu, name_buf, desc);
+ 		fclose(input);
+@@ -3444,7 +3446,8 @@ dump_sysfs_pstate_config(void)
+ 		fprintf(stderr, "NSFOD %s\n", path);
+ 		return;
+ 	}
+-	fgets(driver_buf, sizeof(driver_buf), input);
++	if (!fgets(driver_buf, sizeof(driver_buf), input))
++		err(1, "%s: failed to read file", path);
+ 	fclose(input);
+ 
+ 	sprintf(path, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor",
+@@ -3454,7 +3457,8 @@ dump_sysfs_pstate_config(void)
+ 		fprintf(stderr, "NSFOD %s\n", path);
+ 		return;
+ 	}
+-	fgets(governor_buf, sizeof(governor_buf), input);
++	if (!fgets(governor_buf, sizeof(governor_buf), input))
++		err(1, "%s: failed to read file", path);
+ 	fclose(input);
+ 
+ 	fprintf(outf, "cpu%d: cpufreq driver: %s", base_cpu, driver_buf);
+@@ -3463,7 +3467,8 @@ dump_sysfs_pstate_config(void)
+ 	sprintf(path, "/sys/devices/system/cpu/cpufreq/boost");
+ 	input = fopen(path, "r");
+ 	if (input != NULL) {
+-		fscanf(input, "%d", &turbo);
++		if (fscanf(input, "%d", &turbo) != 1)
++			err(1, "%s: failed to parse number from file", path);
+ 		fprintf(outf, "cpufreq boost: %d\n", turbo);
+ 		fclose(input);
+ 	}
+@@ -3471,7 +3476,8 @@ dump_sysfs_pstate_config(void)
+ 	sprintf(path, "/sys/devices/system/cpu/intel_pstate/no_turbo");
+ 	input = fopen(path, "r");
+ 	if (input != NULL) {
+-		fscanf(input, "%d", &turbo);
++		if (fscanf(input, "%d", &turbo) != 1)
++			err(1, "%s: failed to parse number from file", path);
+ 		fprintf(outf, "cpufreq intel_pstate no_turbo: %d\n", turbo);
+ 		fclose(input);
+ 	}
+@@ -5293,7 +5299,8 @@ void probe_sysfs(void)
+ 		input = fopen(path, "r");
+ 		if (input == NULL)
+ 			continue;
+-		fgets(name_buf, sizeof(name_buf), input);
++		if (!fgets(name_buf, sizeof(name_buf), input))
++			err(1, "%s: failed to read file", path);
+ 
+ 		 /* truncate "C1-HSW\n" to "C1", or truncate "C1\n" to "C1" */
+ 		sp = strchr(name_buf, '-');
+@@ -5320,7 +5327,8 @@ void probe_sysfs(void)
+ 		input = fopen(path, "r");
+ 		if (input == NULL)
+ 			continue;
+-		fgets(name_buf, sizeof(name_buf), input);
++		if (!fgets(name_buf, sizeof(name_buf), input))
++			err(1, "%s: failed to read file", path);
+ 		 /* truncate "C1-HSW\n" to "C1", or truncate "C1\n" to "C1" */
+ 		sp = strchr(name_buf, '-');
+ 		if (!sp)
diff --git a/debian/patches/bugfix/x86/tools-x86_energy_perf_policy-fix-uninitialized-varia.patch b/debian/patches/bugfix/x86/tools-x86_energy_perf_policy-fix-uninitialized-varia.patch
new file mode 100644
index 000000000000..891369e830d4
--- /dev/null
+++ b/debian/patches/bugfix/x86/tools-x86_energy_perf_policy-fix-uninitialized-varia.patch
@@ -0,0 +1,96 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 11 Sep 2018 02:38:36 +0100
+Subject: tools: x86_energy_perf_policy: Fix "uninitialized variable"
+ warnings at -O2
+Forwarded: https://marc.info/?l=linux-pm&m=153711035626776
+
+x86_energy_perf_policy first uses __get_cpuid() to check the maximum
+CPUID level and exits if it is too low.  It then assumes that later
+calls will succeed (which I think is architecturally guaranteed).  It
+also assumes that CPUID works at all (which is not guaranteed on
+x86_32).
+
+If optimisations are enabled, gcc warns about potentially
+uninitialized variables.  Fix this by adding an exit-on-error after
+every call to __get_cpuid() instead of just checking the maximum
+level.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ .../x86_energy_perf_policy.c                  | 26 +++++++++++--------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
+index 65bbe627a425..bbef8bcf44d6 100644
+--- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
++++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
+@@ -1260,6 +1260,15 @@ void probe_dev_msr(void)
+ 		if (system("/sbin/modprobe msr > /dev/null 2>&1"))
+ 			err(-5, "no /dev/cpu/0/msr, Try \"# modprobe msr\" ");
+ }
++
++static void get_cpuid_or_exit(unsigned int leaf,
++			     unsigned int *eax, unsigned int *ebx,
++			     unsigned int *ecx, unsigned int *edx)
++{
++	if (!__get_cpuid(leaf, eax, ebx, ecx, edx))
++		errx(1, "Processor not supported\n");
++}
++
+ /*
+  * early_cpuid()
+  * initialize turbo_is_enabled, has_hwp, has_epb
+@@ -1267,15 +1276,10 @@ void probe_dev_msr(void)
+  */
+ void early_cpuid(void)
+ {
+-	unsigned int eax, ebx, ecx, edx, max_level;
++	unsigned int eax, ebx, ecx, edx;
+ 	unsigned int fms, family, model;
+ 
+-	__get_cpuid(0, &max_level, &ebx, &ecx, &edx);
+-
+-	if (max_level < 6)
+-		errx(1, "Processor not supported\n");
+-
+-	__get_cpuid(1, &fms, &ebx, &ecx, &edx);
++	get_cpuid_or_exit(1, &fms, &ebx, &ecx, &edx);
+ 	family = (fms >> 8) & 0xf;
+ 	model = (fms >> 4) & 0xf;
+ 	if (family == 6 || family == 0xf)
+@@ -1289,7 +1293,7 @@ void early_cpuid(void)
+ 		bdx_highest_ratio = msr & 0xFF;
+ 	}
+ 
+-	__get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
++	get_cpuid_or_exit(0x6, &eax, &ebx, &ecx, &edx);
+ 	turbo_is_enabled = (eax >> 1) & 1;
+ 	has_hwp = (eax >> 7) & 1;
+ 	has_epb = (ecx >> 3) & 1;
+@@ -1307,7 +1311,7 @@ void parse_cpuid(void)
+ 
+ 	eax = ebx = ecx = edx = 0;
+ 
+-	__get_cpuid(0, &max_level, &ebx, &ecx, &edx);
++	get_cpuid_or_exit(0, &max_level, &ebx, &ecx, &edx);
+ 
+ 	if (ebx == 0x756e6547 && edx == 0x49656e69 && ecx == 0x6c65746e)
+ 		genuine_intel = 1;
+@@ -1316,7 +1320,7 @@ void parse_cpuid(void)
+ 		fprintf(stderr, "CPUID(0): %.4s%.4s%.4s ",
+ 			(char *)&ebx, (char *)&edx, (char *)&ecx);
+ 
+-	__get_cpuid(1, &fms, &ebx, &ecx, &edx);
++	get_cpuid_or_exit(1, &fms, &ebx, &ecx, &edx);
+ 	family = (fms >> 8) & 0xf;
+ 	model = (fms >> 4) & 0xf;
+ 	stepping = fms & 0xf;
+@@ -1341,7 +1345,7 @@ void parse_cpuid(void)
+ 		errx(1, "CPUID: no MSR");
+ 
+ 
+-	__get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
++	get_cpuid_or_exit(0x6, &eax, &ebx, &ecx, &edx);
+ 	/* turbo_is_enabled already set */
+ 	/* has_hwp already set */
+ 	has_hwp_notify = eax & (1 << 8);
diff --git a/debian/patches/bugfix/x86/x86-boot-fix-efi-stub-alignment.patch b/debian/patches/bugfix/x86/x86-boot-fix-efi-stub-alignment.patch
new file mode 100644
index 000000000000..5c38bf02c453
--- /dev/null
+++ b/debian/patches/bugfix/x86/x86-boot-fix-efi-stub-alignment.patch
@@ -0,0 +1,40 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Wed, 05 Sep 2018 17:28:12 +0100
+Subject: x86: boot: Fix EFI stub alignment
+Forwarded: https://lore.kernel.org/lkml/20180916152246.GG4765@decadent.org.uk/T/#u
+
+We currently align the end of the compressed image to a multiple of
+16.  However the PE-COFF header included in the EFI stub says that the
+file alignment is 32 bytes, and when adding an EFI signature to the
+file it must first be padded to this alignment.
+
+sbsigntool commands warn about this:
+
+    warning: file-aligned section .text extends beyond end of file
+    warning: checksum areas are greater than image size. Invalid section table?
+
+Worse, pesign-at least when creating a detached signature—uses the
+hash of the unpadded file, resulting in an invalid signature if
+padding is required.
+
+Avoid both these problems by increasing alignment to 32 bytes when
+CONFIG_EFI_STUB is enabled.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/arch/x86/boot/tools/build.c
++++ b/arch/x86/boot/tools/build.c
+@@ -391,6 +391,13 @@ int main(int argc, char ** argv)
+ 		die("Unable to mmap '%s': %m", argv[2]);
+ 	/* Number of 16-byte paragraphs, including space for a 4-byte CRC */
+ 	sys_size = (sz + 15 + 4) / 16;
++#ifdef CONFIG_EFI_STUB
++	/*
++	 * COFF requires minimum 32-byte alignment of sections, and
++	 * adding a signature is problematic without that alignment.
++	 */
++	sys_size = (sys_size + 1) & ~1;
++#endif
+ 
+ 	/* Patch the setup code with the appropriate size parameters */
+ 	buf[0x1f1] = setup_sectors-1;
diff --git a/debian/patches/debian/android-enable-building-ashmem-and-binder-as-modules.patch b/debian/patches/debian/android-enable-building-ashmem-and-binder-as-modules.patch
index 15a201f14c5d..a08c4a49f2b1 100644
--- a/debian/patches/debian/android-enable-building-ashmem-and-binder-as-modules.patch
+++ b/debian/patches/debian/android-enable-building-ashmem-and-binder-as-modules.patch
@@ -22,7 +22,7 @@ need them.
  config ANDROID_BINDER_IPC
 -	bool "Android Binder IPC Driver"
 +	tristate "Android Binder IPC Driver"
- 	depends on MMU && !M68K
+ 	depends on MMU
  	default n
  	---help---
 --- a/drivers/android/Makefile
@@ -66,7 +66,7 @@ need them.
  #include "ashmem.h"
  
  #define ASHMEM_NAME_PREFIX "dev/ashmem/"
-@@ -895,3 +896,5 @@ out:
+@@ -903,3 +904,5 @@ out:
  	return ret;
  }
  device_initcall(ashmem_init);
@@ -74,9 +74,9 @@ need them.
 +MODULE_LICENSE("GPL v2");
 --- a/drivers/android/binder_alloc.c
 +++ b/drivers/android/binder_alloc.c
-@@ -42,7 +42,7 @@ enum {
+@@ -44,7 +44,7 @@ enum {
  };
- static uint32_t binder_alloc_debug_mask;
+ static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
  
 -module_param_named(debug_mask, binder_alloc_debug_mask,
 +module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
diff --git a/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch b/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch
index d487c87f4da1..e2a8679a5fba 100644
--- a/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch
+++ b/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch
@@ -9,7 +9,7 @@ This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415
 
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -847,8 +847,8 @@ static inline void put_link(struct namei
+@@ -885,8 +885,8 @@ static inline void put_link(struct namei
  		path_put(&last->link);
  }
  
@@ -17,6 +17,6 @@ This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415
 -int sysctl_protected_hardlinks __read_mostly = 0;
 +int sysctl_protected_symlinks __read_mostly = 1;
 +int sysctl_protected_hardlinks __read_mostly = 1;
+ int sysctl_protected_fifos __read_mostly;
+ int sysctl_protected_regular __read_mostly;
  
- /**
-  * may_follow_link - Check symlink following for unsafe situations
diff --git a/debian/patches/debian/i386-686-pae-pci-set-pci-nobios-by-default.patch b/debian/patches/debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
index 2787c2518b5f..97b350666569 100644
--- a/debian/patches/debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
+++ b/debian/patches/debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
@@ -14,7 +14,7 @@ it can still be enabled using "pci=bios".
 ---
 --- a/arch/x86/pci/common.c
 +++ b/arch/x86/pci/common.c
-@@ -20,8 +20,8 @@
+@@ -19,8 +19,8 @@
  #include <asm/pci_x86.h>
  #include <asm/setup.h>
  
@@ -23,5 +23,5 @@ it can still be enabled using "pci=bios".
 +unsigned int pci_probe = PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | PCI_PROBE_MMCONF |
 +	(IS_ENABLED(CONFIG_X86_64) || IS_ENABLED(CONFIG_X86_PAE) ? 0 : PCI_PROBE_BIOS);
  
- unsigned int pci_early_dump_regs;
  static int pci_bf_sort;
+ int pci_routeirq;
diff --git a/debian/patches/debian/mips-boston-disable-its.patch b/debian/patches/debian/mips-boston-disable-its.patch
index f53102e11d03..8a991d78d452 100644
--- a/debian/patches/debian/mips-boston-disable-its.patch
+++ b/debian/patches/debian/mips-boston-disable-its.patch
@@ -17,4 +17,4 @@ u-boot-tools.
 -its-y					:= vmlinux.its.S
  its-$(CONFIG_FIT_IMAGE_FDT_BOSTON)	+= board-boston.its.S
  its-$(CONFIG_FIT_IMAGE_FDT_NI169445)	+= board-ni169445.its.S
- its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA)	+= board-xilfpga.its.S
+ its-$(CONFIG_FIT_IMAGE_FDT_OCELOT_PCB123) += board-ocelot_pcb123.its.S
diff --git a/debian/patches/debian/tools-perf-version.patch b/debian/patches/debian/tools-perf-version.patch
index 02721edf0390..e82a305b15c6 100644
--- a/debian/patches/debian/tools-perf-version.patch
+++ b/debian/patches/debian/tools-perf-version.patch
@@ -9,7 +9,7 @@ version-dependent name.  And do the same for trace.]
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -750,23 +750,23 @@ endif
+@@ -759,23 +759,23 @@ endif
  install-tools: all install-gtk
  	$(call QUIET_INSTALL, binaries) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
@@ -37,9 +37,9 @@ version-dependent name.  And do the same for trace.]
 -	$(call QUIET_INSTALL, libexec) \
 -		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
  ifndef NO_LIBBPF
- 	$(call QUIET_INSTALL, lib) \
- 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'
-@@ -804,7 +804,7 @@ ifndef NO_LIBPYTHON
+ 	$(call QUIET_INSTALL, bpf-headers) \
+ 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'; \
+@@ -811,7 +811,7 @@ ifndef NO_LIBPYTHON
  endif
  	$(call QUIET_INSTALL, perf_completion-script) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \
@@ -48,7 +48,7 @@ version-dependent name.  And do the same for trace.]
  	$(call QUIET_INSTALL, perf-tip) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(tip_instdir_SQ)'; \
  		$(INSTALL) Documentation/tips.txt -t '$(DESTDIR_SQ)$(tip_instdir_SQ)'
-@@ -829,7 +829,7 @@ install-python_ext:
+@@ -836,7 +836,7 @@ install-python_ext:
  
  # 'make install-doc' should call 'make -C Documentation install'
  $(INSTALL_DOC_TARGETS):
@@ -84,7 +84,7 @@ version-dependent name.  And do the same for trace.]
  
 --- a/tools/perf/util/Build
 +++ b/tools/perf/util/Build
-@@ -192,6 +192,7 @@ CFLAGS_libstring.o     += -Wno-unused-pa
+@@ -193,6 +193,7 @@ CFLAGS_libstring.o     += -Wno-unused-pa
  CFLAGS_hweight.o       += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
  CFLAGS_parse-events.o  += -Wno-redundant-decls
  CFLAGS_header.o        += -include $(OUTPUT)PERF-VERSION-FILE
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch
index 28c40e94e840..91c9de7b83ca 100644
--- a/debian/patches/debian/version.patch
+++ b/debian/patches/debian/version.patch
@@ -9,16 +9,17 @@ are set.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1077,7 +1077,7 @@ endif
+@@ -1098,7 +1098,8 @@ endif
+ # that need to depend on updated CONFIG_* values can be checked here.
  prepare2: prepare3 outputmakefile asm-generic
  
- prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h \
--                   include/config/auto.conf
-+                   include/config/auto.conf include/generated/package.h
+-prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
++prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h \
++                   include/generated/package.h
  	$(cmd_crmodverdir)
  
  archprepare: archheaders archscripts prepare1 scripts_basic
-@@ -1121,6 +1121,16 @@ define filechk_version.h
+@@ -1142,6 +1143,16 @@ define filechk_version.h
  	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
  endef
  
@@ -32,10 +33,10 @@ are set.
 +endef
 +endif
 +
- $(version_h): $(srctree)/Makefile FORCE
+ $(version_h): FORCE
  	$(call filechk,version.h)
  	$(Q)rm -f $(old_version_h)
-@@ -1128,6 +1138,9 @@ $(version_h): $(srctree)/Makefile FORCE
+@@ -1149,6 +1160,9 @@ $(version_h): FORCE
  include/generated/utsrelease.h: include/config/kernel.release FORCE
  	$(call filechk,utsrelease.h)
  
@@ -99,7 +100,7 @@ are set.
  
  #include <asm/pgtable.h>
  #include <asm/io.h>
-@@ -1406,8 +1407,9 @@ void show_regs(struct pt_regs * regs)
+@@ -1430,8 +1431,9 @@ void show_regs(struct pt_regs * regs)
  
  	printk("NIP:  "REG" LR: "REG" CTR: "REG"\n",
  	       regs->nip, regs->link, regs->ctr);
@@ -121,7 +122,7 @@ are set.
  
  /*
   * The number of tasks checked:
-@@ -115,10 +116,11 @@ static void check_hung_task(struct task_
+@@ -123,10 +124,11 @@ static void check_hung_task(struct task_
  			sysctl_hung_task_warnings--;
  		pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
  			t->comm, t->pid, timeout);
diff --git a/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch b/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch
index 60f3ec6e6393..ff0321177832 100644
--- a/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch
+++ b/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch
@@ -8,11 +8,9 @@ Don't complain about being unable to load regulatory.db directly.
 This is expected until we generate a signing key and update
 wireless-regdb to be signed with it.
 
-Index: debian-kernel/net/wireless/reg.c
-===================================================================
---- debian-kernel.orig/net/wireless/reg.c
-+++ debian-kernel/net/wireless/reg.c
-@@ -489,6 +489,7 @@ static void reg_regdb_apply(struct work_
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -476,6 +476,7 @@ static void reg_regdb_apply(struct work_
  
  static DECLARE_WORK(reg_regdb_work, reg_regdb_apply);
  
@@ -20,7 +18,7 @@ Index: debian-kernel/net/wireless/reg.c
  static int reg_schedule_apply(const struct ieee80211_regdomain *regdom)
  {
  	struct reg_regdb_apply_request *request;
-@@ -508,6 +509,7 @@ static int reg_schedule_apply(const stru
+@@ -495,6 +496,7 @@ static int reg_schedule_apply(const stru
  	schedule_work(&reg_regdb_work);
  	return 0;
  }
@@ -28,7 +26,7 @@ Index: debian-kernel/net/wireless/reg.c
  
  #ifdef CONFIG_CFG80211_CRDA_SUPPORT
  /* Max number of consecutive attempts to communicate with CRDA  */
-@@ -587,6 +589,36 @@ static inline int call_crda(const char *
+@@ -574,6 +576,35 @@ static inline int call_crda(const char *
  /* code to directly load a firmware database through request_firmware */
  static const struct fwdb_header *regdb;
  
@@ -53,8 +51,7 @@ Index: debian-kernel/net/wireless/reg.c
 +	return -ENOENT;
 +}
 +
-+int reg_query_regdb_wmm(char *alpha2, int freq, u32 *dbptr,
-+			struct ieee80211_wmm_rule *rule)
++int reg_query_regdb_wmm(char *alpha2, int freq, struct ieee80211_reg_rule *rule)
 +{
 +	return -ENODATA;
 +}
@@ -65,7 +62,7 @@ Index: debian-kernel/net/wireless/reg.c
  struct fwdb_country {
  	u8 alpha2[2];
  	__be16 coll_ptr;
-@@ -1152,6 +1184,8 @@ int reg_reload_regdb(void)
+@@ -1090,6 +1121,8 @@ int reg_reload_regdb(void)
  	return err;
  }
  
diff --git a/debian/patches/features/all/aufs4/aufs4-base.patch b/debian/patches/features/all/aufs4/aufs4-base.patch
index a4f6d826c6af..54513c12c0a3 100644
--- a/debian/patches/features/all/aufs4/aufs4-base.patch
+++ b/debian/patches/features/all/aufs4/aufs4-base.patch
@@ -1,19 +1,19 @@
 From: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Tue Aug 14 17:10:38 2018 +0900
-Subject: aufs4.18 base patch
-Origin: https://github.com/sfjro/aufs4-standalone/tree/799ee5199f279477d2a5e1cff2c3f9dc44fcb3af
+Date: Sat Sep 8 23:32:19 2018 +0900
+Subject: aufs4.x-rcN base patch
+Origin: https://github.com/sfjro/aufs4-standalone/tree/ecea3973efed5223878e489d212dc39fee4dabb6
 Bug-Debian: https://bugs.debian.org/541828
 
 Patch headers added by debian/patches/features/all/aufs4/gen-patch
 
 SPDX-License-Identifier: GPL-2.0
-aufs4.18 base patch
+aufs4.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 544cac8..aaa1c7a 100644
+index 9ad052a..35c459a 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2541,6 +2541,19 @@ F:	include/linux/audit.h
+@@ -2605,6 +2605,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
@@ -34,10 +34,10 @@ index 544cac8..aaa1c7a 100644
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
  S:	Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 4cb1d1b..5678bf8 100644
+index ea9debf..9e534a3 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -741,6 +741,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -739,6 +739,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	return error;
  }
  
@@ -63,10 +63,10 @@ index 4cb1d1b..5678bf8 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index ceb7b49..88a1514 100644
+index 2e7e8d8..9f57bd8 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1237,7 +1237,7 @@ enum d_walk_ret {
+@@ -1238,7 +1238,7 @@ enum d_walk_ret {
   *
   * The @enter() callbacks are called with d_lock held.
   */
@@ -76,7 +76,7 @@ index ceb7b49..88a1514 100644
  {
  	struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 12273b6..545e686 100644
+index 4137d96..c91b3e3 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -32,7 +32,7 @@
@@ -98,10 +98,10 @@ index 12273b6..545e686 100644
  		return error;
  
 diff --git a/fs/inode.c b/fs/inode.c
-index 8c86c80..af894e7 100644
+index 42f6d25..fa6ae6a 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1649,7 +1649,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(generic_update_time);
   * This does the actual work of updating an inodes time or version.  Must have
   * had called mnt_want_write() before calling this.
   */
@@ -111,10 +111,10 @@ index 8c86c80..af894e7 100644
  	int (*update_time)(struct inode *, struct timespec64 *, int);
  
 diff --git a/fs/namespace.c b/fs/namespace.c
-index bd2f4c6..eb7cd21 100644
+index 9918655..72c93f3 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -855,6 +855,12 @@ static inline int check_mnt(struct mount *mnt)
+@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
  	return mnt->mnt_ns == current->nsproxy->mnt_ns;
  }
  
@@ -128,7 +128,7 @@ index bd2f4c6..eb7cd21 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 153f8f6..ccc5bc8 100644
+index 39b4a21..19f8e04 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
@@ -201,23 +201,11 @@ index b54e054..2860782 100644
  {
  	if (wait)
  		sync_inodes_sb(sb);
-diff --git a/include/linux/file.h b/include/linux/file.h
-index 279720d..76e38ea 100644
---- a/include/linux/file.h
-+++ b/include/linux/file.h
-@@ -20,6 +20,7 @@ struct dentry;
- struct path;
- extern struct file *alloc_file(const struct path *, fmode_t mode,
- 	const struct file_operations *fop);
-+extern struct file *get_empty_filp(void);
- 
- static inline void fput_light(struct file *file, int fput_needed)
- {
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 805bf22..0d0d247f 100644
+index 3332270..e1444c2 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1273,6 +1273,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1286,6 +1286,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -225,7 +213,7 @@ index 805bf22..0d0d247f 100644
  extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
  extern int f_setown(struct file *filp, unsigned long arg, int force);
  extern void f_delown(struct file *filp);
-@@ -1733,6 +1734,7 @@ struct file_operations {
+@@ -1747,6 +1748,7 @@ struct file_operations {
  	ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
  	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
  	int (*check_flags)(int);
@@ -233,7 +221,7 @@ index 805bf22..0d0d247f 100644
  	int (*flock) (struct file *, int, struct file_lock *);
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
  	ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
-@@ -1803,6 +1805,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1817,6 +1819,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
  			      struct iovec *fast_pointer,
  			      struct iovec **ret_pointer);
  
@@ -246,7 +234,7 @@ index 805bf22..0d0d247f 100644
  extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
  extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
  extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -2218,6 +2226,7 @@ extern int current_umask(void);
+@@ -2240,6 +2248,7 @@ extern int current_umask(void);
  extern void ihold(struct inode * inode);
  extern void iput(struct inode *);
  extern int generic_update_time(struct inode *, struct timespec64 *, int);
@@ -254,7 +242,7 @@ index 805bf22..0d0d247f 100644
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
-@@ -2505,6 +2514,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2527,6 +2536,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
  	return false;
  }
  #endif
@@ -263,7 +251,7 @@ index 805bf22..0d0d247f 100644
  extern const struct file_operations def_blk_fops;
  extern const struct file_operations def_chr_fops;
 diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index 6fc77d4..27e76f0 100644
+index b0d0b51..f73ffaa 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
 @@ -313,6 +313,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@@ -318,10 +306,10 @@ index 74b4911..19789fb 100644
 +			 unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 5fa4d31..720f070 100644
+index e406c5f..b0a8d25 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
+@@ -141,7 +141,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
  unsigned long nr_lock_classes;
  static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
  
@@ -330,7 +318,7 @@ index 5fa4d31..720f070 100644
  {
  	if (!hlock->class_idx) {
  		/*
-@@ -151,6 +151,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+@@ -152,6 +152,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
  	}
  	return lock_classes + hlock->class_idx - 1;
  }
diff --git a/debian/patches/features/all/aufs4/aufs4-mmap.patch b/debian/patches/features/all/aufs4/aufs4-mmap.patch
index 1dfad130bedd..fe5f1c12d79a 100644
--- a/debian/patches/features/all/aufs4/aufs4-mmap.patch
+++ b/debian/patches/features/all/aufs4/aufs4-mmap.patch
@@ -1,19 +1,19 @@
 From: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Tue Aug 14 17:10:38 2018 +0900
-Subject: aufs4.18 mmap patch
-Origin: https://github.com/sfjro/aufs4-standalone/tree/799ee5199f279477d2a5e1cff2c3f9dc44fcb3af
+Date: Sat Sep 8 23:32:19 2018 +0900
+Subject: aufs4.x-rcN mmap patch
+Origin: https://github.com/sfjro/aufs4-standalone/tree/ecea3973efed5223878e489d212dc39fee4dabb6
 Bug-Debian: https://bugs.debian.org/541828
 
 Patch headers added by debian/patches/features/all/aufs4/gen-patch
 
 SPDX-License-Identifier: GPL-2.0
-aufs4.18 mmap patch
+aufs4.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index aaffc0c..ab72941 100644
+index ccf86f1..a44e9d9 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2004,7 +2004,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2002,7 +2002,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
  	down_read(&mm->mmap_sem);
  	vma = find_exact_vma(mm, vm_start, vm_end);
  	if (vma && vma->vm_file) {
@@ -39,10 +39,10 @@ index 3b63be6..fb9913b 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index dfd73a4..ed2ce10 100644
+index 5ea1d64..7865a470 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
-@@ -306,7 +306,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
  	const char *name = NULL;
  
  	if (file) {
@@ -54,7 +54,7 @@ index dfd73a4..ed2ce10 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1734,7 +1737,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1727,7 +1730,7 @@ static int show_numa_map(struct seq_file *m, void *v)
  	struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
  	struct vm_area_struct *vma = v;
  	struct numa_maps *md = &numa_priv->md;
@@ -64,10 +64,10 @@ index dfd73a4..ed2ce10 100644
  	struct mm_walk walk = {
  		.hugetlb_entry = gather_hugetlb_stats,
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 5b62f57..dfb4a3b 100644
+index 0b63d68..400d1c5 100644
 --- a/fs/proc/task_nommu.c
 +++ b/fs/proc/task_nommu.c
-@@ -156,7 +156,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
+@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
  	file = vma->vm_file;
  
  	if (file) {
@@ -80,10 +80,10 @@ index 5b62f57..dfb4a3b 100644
  		ino = inode->i_ino;
  		pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 68a5121..d7dd986 100644
+index a61ebe8..111f031 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1448,6 +1448,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1440,6 +1440,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  	unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
@@ -113,10 +113,10 @@ index 68a5121..d7dd986 100644
  		void *buf, int len, unsigned int gup_flags);
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 99ce070..8babe35 100644
+index cd2bc93..e499e57 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -236,6 +236,7 @@ struct vm_region {
+@@ -239,6 +239,7 @@ struct vm_region {
  	unsigned long	vm_top;		/* region allocated to here */
  	unsigned long	vm_pgoff;	/* the offset in vm_file corresponding to vm_start */
  	struct file	*vm_file;	/* the backing file or NULL */
@@ -124,7 +124,7 @@ index 99ce070..8babe35 100644
  
  	int		vm_usage;	/* region usage count (access under nommu_region_sem) */
  	bool		vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -310,6 +311,7 @@ struct vm_area_struct {
+@@ -313,6 +314,7 @@ struct vm_area_struct {
  	unsigned long vm_pgoff;		/* Offset (within vm_file) in PAGE_SIZE
  					   units */
  	struct file * vm_file;		/* File we map to (can be NULL). */
@@ -133,10 +133,10 @@ index 99ce070..8babe35 100644
  
  	atomic_long_t swap_readahead_info;
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 1b27bab..382f45d 100644
+index d896e9c..ea800e9 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -504,7 +504,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -505,7 +505,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
@@ -172,7 +172,7 @@ index 52517f2..250f675 100644
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 17bbf4d..a31c3e1 100644
+index 5f2b2b1..d71330c 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -193,7 +193,7 @@ index 17bbf4d..a31c3e1 100644
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1820,8 +1820,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1821,8 +1821,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	return addr;
  
  unmap_and_free_vma:
@@ -203,7 +203,7 @@ index 17bbf4d..a31c3e1 100644
  
  	/* Undo any partial mapping done by a device driver. */
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2640,7 +2640,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2641,7 +2641,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -212,7 +212,7 @@ index 17bbf4d..a31c3e1 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2659,7 +2659,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2660,7 +2660,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  	if (new->vm_ops && new->vm_ops->close)
  		new->vm_ops->close(new);
  	if (new->vm_file)
@@ -221,7 +221,7 @@ index 17bbf4d..a31c3e1 100644
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2821,7 +2821,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2822,7 +2822,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  	struct vm_area_struct *vma;
  	unsigned long populate = 0;
  	unsigned long ret = -EINVAL;
@@ -230,7 +230,7 @@ index 17bbf4d..a31c3e1 100644
  
  	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
  		     current->comm, current->pid);
-@@ -2896,10 +2896,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2897,10 +2897,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  		}
  	}
  
@@ -259,7 +259,7 @@ index 17bbf4d..a31c3e1 100644
  out:
  	up_write(&mm->mmap_sem);
  	if (populate)
-@@ -3207,7 +3224,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3206,7 +3223,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
  		if (anon_vma_clone(new_vma, vma))
  			goto out_free_mempol;
  		if (new_vma->vm_file)
@@ -269,10 +269,10 @@ index 17bbf4d..a31c3e1 100644
  			new_vma->vm_ops->open(new_vma);
  		vma_link(mm, new_vma, prev, rb_link, rb_parent);
 diff --git a/mm/nommu.c b/mm/nommu.c
-index 9fc9e43..25d4c49 100644
+index e4aac33..b27b200 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -281,7 +281,7 @@ index 9fc9e43..25d4c49 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -767,7 +767,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -763,7 +763,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -290,7 +290,7 @@ index 9fc9e43..25d4c49 100644
  	put_nommu_region(vma->vm_region);
  	vm_area_free(vma);
  }
-@@ -1290,7 +1290,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1286,7 +1286,7 @@ unsigned long do_mmap(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -299,7 +299,7 @@ index 9fc9e43..25d4c49 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1365,7 +1365,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1361,7 +1361,7 @@ unsigned long do_mmap(struct file *file,
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
diff --git a/debian/patches/features/all/aufs4/aufs4-standalone.patch b/debian/patches/features/all/aufs4/aufs4-standalone.patch
index edd7a5c49e5f..2eedd611c28f 100644
--- a/debian/patches/features/all/aufs4/aufs4-standalone.patch
+++ b/debian/patches/features/all/aufs4/aufs4-standalone.patch
@@ -1,19 +1,19 @@
 From: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Tue Aug 14 17:10:38 2018 +0900
-Subject: aufs4.18 standalone patch
-Origin: https://github.com/sfjro/aufs4-standalone/tree/799ee5199f279477d2a5e1cff2c3f9dc44fcb3af
+Date: Sat Sep 8 23:32:19 2018 +0900
+Subject: aufs4.x-rcN standalone patch
+Origin: https://github.com/sfjro/aufs4-standalone/tree/ecea3973efed5223878e489d212dc39fee4dabb6
 Bug-Debian: https://bugs.debian.org/541828
 
 Patch headers added by debian/patches/features/all/aufs4/gen-patch
 
 SPDX-License-Identifier: GPL-2.0
-aufs4.18 standalone patch
+aufs4.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 88a1514..e3f500a 100644
+index 9f57bd8..328a136 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1342,6 +1342,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1343,6 +1343,7 @@ void d_walk(struct dentry *parent, void *data,
  	seq = 1;
  	goto again;
  }
@@ -21,7 +21,7 @@ index 88a1514..e3f500a 100644
  
  struct check_mount {
  	struct vfsmount *mnt;
-@@ -2890,6 +2891,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2837,6 +2838,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
  
  	write_sequnlock(&rename_lock);
  }
@@ -30,7 +30,7 @@ index 88a1514..e3f500a 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index bdd0eac..edd3405 100644
+index 1ebf6e5..a72c294 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
@@ -42,7 +42,7 @@ index bdd0eac..edd3405 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 545e686..0237ad7 100644
+index c91b3e3..7751309 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
@@ -54,18 +54,18 @@ index 545e686..0237ad7 100644
  static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
                       int force)
 diff --git a/fs/file_table.c b/fs/file_table.c
-index 7ec0b3e..819ee07 100644
+index e49af4c..569020f 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
-@@ -147,6 +147,7 @@ struct file *get_empty_filp(void)
+@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
  	}
  	return ERR_PTR(-ENFILE);
  }
-+EXPORT_SYMBOL_GPL(get_empty_filp);
++EXPORT_SYMBOL_GPL(alloc_empty_file);
  
- /**
-  * alloc_file - allocate and initialize a 'struct file'
-@@ -257,6 +258,7 @@ void flush_delayed_fput(void)
+ /*
+  * Variant of alloc_empty_file() that doesn't check and modify nr_files.
+@@ -323,6 +324,7 @@ void flush_delayed_fput(void)
  {
  	delayed_fput(NULL);
  }
@@ -73,27 +73,19 @@ index 7ec0b3e..819ee07 100644
  
  static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
  
-@@ -299,6 +301,7 @@ void __fput_sync(struct file *file)
+@@ -365,6 +367,7 @@ void __fput_sync(struct file *file)
  }
  
  EXPORT_SYMBOL(fput);
 +EXPORT_SYMBOL_GPL(__fput_sync);
  
- void put_filp(struct file *file)
- {
-@@ -307,6 +310,7 @@ void put_filp(struct file *file)
- 		file_free(file);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_filp);
- 
  void __init files_init(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index af894e7..169811b 100644
+index fa6ae6a..69d4a6c 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1658,6 +1658,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
  
  	return update_time(inode, time, flags);
  }
@@ -102,10 +94,10 @@ index af894e7..169811b 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index eb7cd21..c536458 100644
+index 72c93f3..c49803c 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -437,6 +437,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
  	mnt_dec_writers(real_mount(mnt));
  	preempt_enable();
  }
@@ -113,7 +105,7 @@ index eb7cd21..c536458 100644
  
  /**
   * mnt_drop_write - give up write access to a mount
-@@ -860,6 +861,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
  {
  	return check_mnt(real_mount(mnt));
  }
@@ -121,7 +113,7 @@ index eb7cd21..c536458 100644
  
  /*
   * vfsmount lock must be held for write
-@@ -1917,6 +1919,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1832,6 +1834,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -130,18 +122,18 @@ index eb7cd21..c536458 100644
  static void cleanup_group_ids(struct mount *mnt, struct mount *end)
  {
 diff --git a/fs/notify/group.c b/fs/notify/group.c
-index aa5468f2..b38d224 100644
+index c03b836..817f22c 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
+@@ -23,6 +23,7 @@
  #include <linux/rculist.h>
  #include <linux/wait.h>
+ #include <linux/memcontrol.h>
 +#include <linux/module.h>
  
  #include <linux/fsnotify_backend.h>
  #include "fsnotify.h"
-@@ -109,6 +110,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
+@@ -112,6 +113,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
  {
  	refcount_inc(&group->refcnt);
  }
@@ -149,7 +141,7 @@ index aa5468f2..b38d224 100644
  
  /*
   * Drop a reference to a group.  Free it if it's through.
-@@ -118,6 +120,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+@@ -121,6 +123,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
  	if (refcount_dec_and_test(&group->refcnt))
  		fsnotify_final_destroy_group(group);
  }
@@ -157,7 +149,7 @@ index aa5468f2..b38d224 100644
  
  /*
   * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -147,6 +150,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+@@ -150,6 +153,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
  
  	return group;
  }
@@ -166,10 +158,10 @@ index aa5468f2..b38d224 100644
  int fsnotify_fasync(int fd, struct file *file, int on)
  {
 diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 61f4c5f..855c655 100644
+index 59cdb27..ce365c7 100644
 --- a/fs/notify/mark.c
 +++ b/fs/notify/mark.c
-@@ -245,6 +245,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+@@ -263,6 +263,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
  	queue_delayed_work(system_unbound_wq, &reaper_work,
  			   FSNOTIFY_REAPER_DELAY);
  }
@@ -177,7 +169,7 @@ index 61f4c5f..855c655 100644
  
  /*
   * Get mark reference when we found the mark via lockless traversal of object
-@@ -399,6 +400,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
+@@ -417,6 +418,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
  	mutex_unlock(&group->mark_mutex);
  	fsnotify_free_mark(mark);
  }
@@ -185,7 +177,7 @@ index 61f4c5f..855c655 100644
  
  /*
   * Sorting function for lists of fsnotify marks.
-@@ -624,6 +626,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, struct inode *inode,
+@@ -632,6 +634,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
  	mutex_unlock(&group->mark_mutex);
  	return ret;
  }
@@ -193,7 +185,7 @@ index 61f4c5f..855c655 100644
  
  /*
   * Given a list of marks, find the mark associated with given group. If found
-@@ -747,6 +750,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+@@ -754,6 +757,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
  	fsnotify_get_group(group);
  	mark->group = group;
  }
@@ -202,7 +194,7 @@ index 61f4c5f..855c655 100644
  /*
   * Destroy all marks in destroy_list, waits for SRCU period to finish before
 diff --git a/fs/open.c b/fs/open.c
-index d0e955b..527bc1a 100644
+index 0285ce7..cb81623 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -213,16 +205,8 @@ index d0e955b..527bc1a 100644
  
  long vfs_truncate(const struct path *path, loff_t length)
  {
-@@ -723,6 +724,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)
- {
- 	return ksys_fchown(fd, user, group);
- }
-+EXPORT_SYMBOL_GPL(open_check_o_direct);
- 
- int open_check_o_direct(struct file *f)
- {
 diff --git a/fs/read_write.c b/fs/read_write.c
-index ccc5bc8..36f52f4 100644
+index 19f8e04..ae78ca8 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@@ -290,10 +274,10 @@ index 2860782..ffd7ea4 100644
  /*
   * Write out and wait upon all dirty data associated with this
 diff --git a/fs/xattr.c b/fs/xattr.c
-index f9cb1db..000b62b 100644
+index daa7325..b550ad3 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
-@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
+@@ -295,6 +295,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
  	*xattr_value = value;
  	return error;
  }
@@ -302,10 +286,10 @@ index f9cb1db..000b62b 100644
  ssize_t
  __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 720f070..4f58215 100644
+index b0a8d25..5029106 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -152,6 +152,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
  	}
  	return lock_classes + hlock->class_idx - 1;
  }
@@ -323,7 +307,7 @@ index 0fef395..83fb1ec 100644
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/commoncap.c b/security/commoncap.c
-index f4c33ab..70563f1 100644
+index 2e489d6..1e146da 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -1336,12 +1336,14 @@ int cap_mmap_addr(unsigned long addr)
@@ -359,10 +343,10 @@ index cd97929..424fd23 100644
  }
 +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
 diff --git a/security/security.c b/security/security.c
-index 68f46d8..3bc1348 100644
+index 736e78d..b314539 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -537,6 +537,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -542,6 +542,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
@@ -370,7 +354,7 @@ index 68f46d8..3bc1348 100644
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -553,6 +554,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -558,6 +559,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
  		return 0;
  	return call_int_hook(path_symlink, 0, dir, dentry, old_name);
  }
@@ -378,7 +362,7 @@ index 68f46d8..3bc1348 100644
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -561,6 +563,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -566,6 +568,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		return 0;
  	return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
  }
@@ -386,7 +370,7 @@ index 68f46d8..3bc1348 100644
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
  			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -588,6 +591,7 @@ int security_path_truncate(const struct path *path)
+@@ -593,6 +596,7 @@ int security_path_truncate(const struct path *path)
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
@@ -394,7 +378,7 @@ index 68f46d8..3bc1348 100644
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -595,6 +599,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -600,6 +604,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
@@ -402,7 +386,7 @@ index 68f46d8..3bc1348 100644
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -602,6 +607,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -607,6 +612,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  		return 0;
  	return call_int_hook(path_chown, 0, path, uid, gid);
  }
@@ -410,7 +394,7 @@ index 68f46d8..3bc1348 100644
  
  int security_path_chroot(const struct path *path)
  {
-@@ -687,6 +693,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -692,6 +698,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return call_int_hook(inode_readlink, 0, dentry);
  }
@@ -418,7 +402,7 @@ index 68f46d8..3bc1348 100644
  
  int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
  			       bool rcu)
-@@ -702,6 +709,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -707,6 +714,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -426,7 +410,7 @@ index 68f46d8..3bc1348 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -873,6 +881,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -878,6 +886,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -434,7 +418,7 @@ index 68f46d8..3bc1348 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -932,6 +941,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -937,6 +946,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }
diff --git a/debian/patches/features/all/kbuild-add-build-salt-to-the-kernel-and-modules.patch b/debian/patches/features/all/kbuild-add-build-salt-to-the-kernel-and-modules.patch
deleted file mode 100644
index 6e1ca5c915c6..000000000000
--- a/debian/patches/features/all/kbuild-add-build-salt-to-the-kernel-and-modules.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 5 Jul 2018 17:49:37 -0700
-Subject: kbuild: Add build salt to the kernel and modules
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit?id=8bc0ab58aca8a96fed7e9a38e21025d1737f4a4f
-Bug-Debian: https://bugs.debian.org/872263
-
-In Fedora, the debug information is packaged separately (foo-debuginfo) and
-can be installed separately. There's been a long standing issue where only
-one version of a debuginfo info package can be installed at a time. There's
-been an effort for Fedora for parallel debuginfo to rectify this problem.
-
-Part of the requirement to allow parallel debuginfo to work is that build ids
-are unique between builds. The existing upstream rpm implementation ensures
-this by re-calculating the build-id using the version and release as a
-seed. This doesn't work 100% for the kernel because of the vDSO which is
-its own binary and doesn't get updated when embedded.
-
-Fix this by adding some data in an ELF note for both the kernel and modules.
-The data is controlled via a Kconfig option so distributions can set it
-to an appropriate value to ensure uniqueness between builds.
-
-Suggested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-Signed-off-by: Laura Abbott <labbott@redhat.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
- include/linux/build-salt.h | 20 ++++++++++++++++++++
- init/Kconfig               |  9 +++++++++
- init/version.c             |  3 +++
- scripts/mod/modpost.c      |  3 +++
- 4 files changed, 35 insertions(+)
- create mode 100644 include/linux/build-salt.h
-
---- /dev/null
-+++ b/include/linux/build-salt.h
-@@ -0,0 +1,20 @@
-+#ifndef __BUILD_SALT_H
-+#define __BUILD_SALT_H
-+
-+#include <linux/elfnote.h>
-+
-+#define LINUX_ELFNOTE_BUILD_SALT       0x100
-+
-+#ifdef __ASSEMBLER__
-+
-+#define BUILD_SALT \
-+       ELFNOTE(Linux, LINUX_ELFNOTE_BUILD_SALT, .asciz CONFIG_BUILD_SALT)
-+
-+#else
-+
-+#define BUILD_SALT \
-+       ELFNOTE32("Linux", LINUX_ELFNOTE_BUILD_SALT, CONFIG_BUILD_SALT)
-+
-+#endif
-+
-+#endif /* __BUILD_SALT_H */
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -109,6 +109,15 @@ config LOCALVERSION_AUTO
- 
- 	  which is done within the script "scripts/setlocalversion".)
- 
-+config BUILD_SALT
-+       string "Build ID Salt"
-+       default ""
-+       help
-+          The build ID is used to link binaries and their debug info. Setting
-+          this option will use the value in the calculation of the build id.
-+          This is mostly useful for distributions which want to ensure the
-+          build is unique between builds. It's safe to leave the default.
-+
- config HAVE_KERNEL_GZIP
- 	bool
- 
---- a/init/version.c
-+++ b/init/version.c
-@@ -7,6 +7,7 @@
-  */
- 
- #include <generated/compile.h>
-+#include <linux/build-salt.h>
- #include <linux/export.h>
- #include <linux/uts.h>
- #include <linux/utsname.h>
-@@ -49,3 +50,5 @@ const char linux_proc_banner[] =
- 	"%s version %s"
- 	" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
- 	" (" LINUX_COMPILER ") %s\n";
-+
-+BUILD_SALT;
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -2137,10 +2137,13 @@ static int check_modname_len(struct modu
-  **/
- static void add_header(struct buffer *b, struct module *mod)
- {
-+	buf_printf(b, "#include <linux/build-salt.h>\n");
- 	buf_printf(b, "#include <linux/module.h>\n");
- 	buf_printf(b, "#include <linux/vermagic.h>\n");
- 	buf_printf(b, "#include <linux/compiler.h>\n");
- 	buf_printf(b, "\n");
-+	buf_printf(b, "BUILD_SALT;\n");
-+	buf_printf(b, "\n");
- 	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
- 	buf_printf(b, "MODULE_INFO(name, KBUILD_MODNAME);\n");
- 	buf_printf(b, "\n");
diff --git a/debian/patches/features/all/lockdown/0003-ima-require-secure_boot-rules-in-lockdown-mode.patch b/debian/patches/features/all/lockdown/0003-ima-require-secure_boot-rules-in-lockdown-mode.patch
index 87b6557b04a7..0a69368da3fe 100644
--- a/debian/patches/features/all/lockdown/0003-ima-require-secure_boot-rules-in-lockdown-mode.patch
+++ b/debian/patches/features/all/lockdown/0003-ima-require-secure_boot-rules-in-lockdown-mode.patch
@@ -9,15 +9,16 @@ in secure boot lockdown mode.
 
 Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
 Signed-off-by: David Howells <dhowells@redhat.com>
-[bwh: Adjust context to apply after commit 6f0911a666d1
- "ima: fix updating the ima_appraise flag"]
+[bwh: Adjust context to apply after commits 6f0911a666d1
+ "ima: fix updating the ima_appraise flag" and ef96837b0de4
+ "ima: add build time policy"]
 ---
  security/integrity/ima/ima_policy.c | 39 +++++++++++++++++++++++++++----------
  1 file changed, 29 insertions(+), 10 deletions(-)
 
 --- a/security/integrity/ima/ima_policy.c
 +++ b/security/integrity/ima/ima_policy.c
-@@ -459,14 +459,21 @@ static int ima_appraise_flag(enum ima_ho
+@@ -481,14 +481,21 @@ static int ima_appraise_flag(enum ima_ho
   */
  void __init ima_init_policy(void)
  {
@@ -45,13 +46,12 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  
  	for (i = 0; i < measure_entries; i++)
  		list_add_tail(&dont_measure_rules[i].list, &ima_default_rules);
-@@ -487,12 +494,24 @@ void __init ima_init_policy(void)
- 
+@@ -510,11 +517,24 @@ void __init ima_init_policy(void)
  	/*
- 	 * Insert the appraise rules requiring file signatures, prior to
--	 * any other appraise rules.
-+	 * any other appraise rules.  In secure boot lock-down mode, also
-+	 * require these appraise rules for custom policies.
+ 	 * Insert the builtin "secure_boot" policy rules requiring file
+ 	 * signatures, prior to any other appraise rules.
++	 * In secure boot lock-down mode, also require these appraise
++	 * rules for custom policies.
  	 */
  	for (i = 0; i < secure_boot_entries; i++) {
 +		struct ima_rule_entry *entry;
@@ -70,4 +70,4 @@ Signed-off-by: David Howells <dhowells@redhat.com>
 +		}
  	}
  
- 	for (i = 0; i < appraise_entries; i++) {
+ 	/*
diff --git a/debian/patches/features/all/lockdown/0004-Enforce-module-signatures-if-the-kernel-is-locked-do.patch b/debian/patches/features/all/lockdown/0004-Enforce-module-signatures-if-the-kernel-is-locked-do.patch
index 285b1a514150..538ad6357ec9 100644
--- a/debian/patches/features/all/lockdown/0004-Enforce-module-signatures-if-the-kernel-is-locked-do.patch
+++ b/debian/patches/features/all/lockdown/0004-Enforce-module-signatures-if-the-kernel-is-locked-do.patch
@@ -9,8 +9,9 @@ signatures that we can verify or that IMA can validate the file.
 Signed-off-by: David Howells <dhowells@redhat.com>
 Reviewed-by: "Lee, Chun-Yi" <jlee@suse.com>
 Reviewed-by: James Morris <james.l.morris@oracle.com>
-[bwh: Adjust context to apply after commit 2c8fd268f418
- "module: Do not access sig_enforce directly"]
+[bwh: Adjust context to apply after commits 2c8fd268f418
+ "module: Do not access sig_enforce directly" and 5fdc7db6448a
+ "module: setup load info before module_sig_check()"]
 ---
  kernel/module.c | 19 ++++++++++++-------
  1 file changed, 12 insertions(+), 7 deletions(-)
@@ -25,7 +26,7 @@ Reviewed-by: James Morris <james.l.morris@oracle.com>
  #include <uapi/linux/module.h>
  #include "module-internal.h"
  
-@@ -2759,7 +2760,8 @@ static inline void kmemleak_load_module(
+@@ -2761,7 +2762,8 @@ static inline void kmemleak_load_module(
  #endif
  
  #ifdef CONFIG_MODULE_SIG
@@ -35,7 +36,7 @@ Reviewed-by: James Morris <james.l.morris@oracle.com>
  {
  	int err = -ENOKEY;
  	const unsigned long markerlen = sizeof(MODULE_SIG_STRING) - 1;
-@@ -2783,13 +2785,16 @@ static int module_sig_check(struct load_
+@@ -2785,13 +2787,16 @@ static int module_sig_check(struct load_
  	}
  
  	/* Not having a signature is only an error if we're strict. */
@@ -54,7 +55,7 @@ Reviewed-by: James Morris <james.l.morris@oracle.com>
  {
  	return 0;
  }
-@@ -3654,13 +3659,13 @@ static int unknown_module_param_cb(char
+@@ -3640,7 +3645,7 @@ static int unknown_module_param_cb(char
  /* Allocate and load the module: note that size of section 0 is always
     zero, and we rely on this for optional sections. */
  static int load_module(struct load_info *info, const char __user *uargs,
@@ -62,15 +63,17 @@ Reviewed-by: James Morris <james.l.morris@oracle.com>
 +		       int flags, bool can_do_ima_check)
  {
  	struct module *mod;
- 	long err;
- 	char *after_dashes;
+ 	long err = 0;
+@@ -3659,7 +3664,7 @@ static int load_module(struct load_info
+ 		goto free_copy;
+ 	}
  
 -	err = module_sig_check(info, flags);
 +	err = module_sig_check(info, flags, can_do_ima_check);
  	if (err)
  		goto free_copy;
  
-@@ -3849,7 +3854,7 @@ SYSCALL_DEFINE3(init_module, void __user
+@@ -3854,7 +3859,7 @@ SYSCALL_DEFINE3(init_module, void __user
  	if (err)
  		return err;
  
@@ -79,7 +82,7 @@ Reviewed-by: James Morris <james.l.morris@oracle.com>
  }
  
  SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
-@@ -3876,7 +3881,7 @@ SYSCALL_DEFINE3(finit_module, int, fd, c
+@@ -3881,7 +3886,7 @@ SYSCALL_DEFINE3(finit_module, int, fd, c
  	info.hdr = hdr;
  	info.len = size;
  
diff --git a/debian/patches/features/all/lockdown/0006-kexec-Disable-at-runtime-if-the-kernel-is-locked-dow.patch b/debian/patches/features/all/lockdown/0006-kexec-Disable-at-runtime-if-the-kernel-is-locked-dow.patch
index 005ae73c459a..06668c0d1633 100644
--- a/debian/patches/features/all/lockdown/0006-kexec-Disable-at-runtime-if-the-kernel-is-locked-dow.patch
+++ b/debian/patches/features/all/lockdown/0006-kexec-Disable-at-runtime-if-the-kernel-is-locked-dow.patch
@@ -16,25 +16,25 @@ Acked-by: Dave Young <dyoung@redhat.com>
 Reviewed-by: "Lee, Chun-Yi" <jlee@suse.com>
 Reviewed-by: James Morris <james.l.morris@oracle.com>
 cc: kexec@lists.infradead.org
+[bwh: Adjust context to apply after commit a210fd32a46b
+ "kexec: add call to LSM hook in original kexec_load syscall"]
 ---
  kernel/kexec.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/kernel/kexec.c b/kernel/kexec.c
-index e62ec4dc6620..7dadfed9b676 100644
 --- a/kernel/kexec.c
 +++ b/kernel/kexec.c
-@@ -201,6 +201,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
- 	if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
- 		return -EPERM;
+@@ -208,6 +208,13 @@ static inline int kexec_load_check(unsig
+ 		return result;
  
-+	/*
+ 	/*
 +	 * kexec can be used to circumvent module loading restrictions, so
 +	 * prevent loading in that case
 +	 */
 +	if (kernel_is_locked_down("kexec of unsigned images"))
 +		return -EPERM;
 +
- 	/*
++	/*
  	 * Verify we have a legal set of flags
  	 * This leaves us room for future extensions.
+ 	 */
diff --git a/debian/patches/features/arm64/arm64-add-build-salt-to-the-vdso.patch b/debian/patches/features/arm64/arm64-add-build-salt-to-the-vdso.patch
deleted file mode 100644
index 99e745fd1491..000000000000
--- a/debian/patches/features/arm64/arm64-add-build-salt-to-the-vdso.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 5 Jul 2018 17:49:40 -0700
-Subject: arm64: Add build salt to the vDSO
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit?id=13351cdf75405e38c1b7bb927624d910d328be2b
-Bug-Debian: https://bugs.debian.org/872263
-
-The vDSO needs to have a unique build id in a similar manner
-to the kernel and modules. Use the build salt macro.
-
-Acked-by: Will Deacon <will.deacon@arm.com>
-Signed-off-by: Laura Abbott <labbott@redhat.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
- arch/arm64/kernel/vdso/note.S | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/arm64/kernel/vdso/note.S
-+++ b/arch/arm64/kernel/vdso/note.S
-@@ -22,7 +22,10 @@
- #include <linux/uts.h>
- #include <linux/version.h>
- #include <linux/elfnote.h>
-+#include <linux/build-salt.h>
- 
- ELFNOTE_START(Linux, 0, "a")
- 	.long LINUX_VERSION_CODE
- ELFNOTE_END
-+
-+BUILD_SALT
diff --git a/debian/patches/features/arm64/pinebook/0001-arm64-allwinner-a64-Add-RTC-clock-to-phandle-32kHz-e.patch b/debian/patches/features/arm64/pinebook/0001-arm64-allwinner-a64-Add-RTC-clock-to-phandle-32kHz-e.patch
deleted file mode 100644
index a6b692c71f14..000000000000
--- a/debian/patches/features/arm64/pinebook/0001-arm64-allwinner-a64-Add-RTC-clock-to-phandle-32kHz-e.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e1a9a4745fd5e6e61d57803659cd54fbe757a172 Mon Sep 17 00:00:00 2001
-From: Jagan Teki <jagan@amarulasolutions.com>
-Date: Fri, 1 Jun 2018 23:05:26 +0530
-Subject: [PATCH 1/5] arm64: allwinner: a64: Add RTC clock to phandle 32kHz
- external oscillator
-
-Outside of SOC few chips need external clock source
-through RTC example Wifi chip. So RTC clock nodes to
-phandle 32kHz external oscillator.
-
-prefix rtc- with clock-output-names defined in
-dt-binding to avoid confusion with existing osc32k name.
-
-Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
-Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
----
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 1b2ef28c42bd..82516aec4153 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -634,6 +634,9 @@
- 			reg = <0x01f00000 0x54>;
- 			interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
- 				     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
-+			clock-output-names = "rtc-osc32k", "rtc-osc32k-out";
-+			clocks = <&osc32k>;
-+			#clock-cells = <1>;
- 		};
- 
- 		r_intc: interrupt-controller@1f00c00 {
--- 
-2.11.0
-
diff --git a/debian/patches/features/arm64/pinebook/0002-arm64-dts-allwinner-a64-add-R_I2C-controller.patch b/debian/patches/features/arm64/pinebook/0002-arm64-dts-allwinner-a64-add-R_I2C-controller.patch
deleted file mode 100644
index 4859af061130..000000000000
--- a/debian/patches/features/arm64/pinebook/0002-arm64-dts-allwinner-a64-add-R_I2C-controller.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 871b5352125c49a2d5f31db69baede43e003a532 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Tue, 5 Jun 2018 22:17:00 -0700
-Subject: [PATCH 2/5] arm64: dts: allwinner: a64: add R_I2C controller
-
-Allwinner A64 has a I2C controller, which is in the R_ MMIO zone and has
-two groups of pinmuxes on PL bank, so it's called R_I2C.
-
-Add support for this I2C controller and the pinmux which doesn't conflict
-with RSB.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
----
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 82516aec4153..1b31a3aaed5a 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -46,6 +46,7 @@
- #include <dt-bindings/clock/sun8i-r-ccu.h>
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- #include <dt-bindings/reset/sun50i-a64-ccu.h>
-+#include <dt-bindings/reset/sun8i-r-ccu.h>
- 
- / {
- 	interrupt-parent = <&gic>;
-@@ -658,6 +659,18 @@
- 			#reset-cells = <1>;
- 		};
- 
-+		r_i2c: i2c@1f02400 {
-+			compatible = "allwinner,sun50i-a64-i2c",
-+				     "allwinner,sun6i-a31-i2c";
-+			reg = <0x01f02400 0x400>;
-+			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&r_ccu CLK_APB0_I2C>;
-+			resets = <&r_ccu RST_APB0_I2C>;
-+			status = "disabled";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+		};
-+
- 		r_pio: pinctrl@1f02c00 {
- 			compatible = "allwinner,sun50i-a64-r-pinctrl";
- 			reg = <0x01f02c00 0x400>;
-@@ -669,6 +682,11 @@
- 			interrupt-controller;
- 			#interrupt-cells = <3>;
- 
-+			r_i2c_pins_a: i2c-a {
-+				pins = "PL8", "PL9";
-+				function = "s_i2c";
-+			};
-+
- 			r_rsb_pins: rsb {
- 				pins = "PL0", "PL1";
- 				function = "s_rsb";
--- 
-2.11.0
-
diff --git a/debian/patches/features/arm64/pinebook/0003-arm64-dts-allwinner-a64-Add-PWM-controllers.patch b/debian/patches/features/arm64/pinebook/0003-arm64-dts-allwinner-a64-Add-PWM-controllers.patch
deleted file mode 100644
index 409cd89c6885..000000000000
--- a/debian/patches/features/arm64/pinebook/0003-arm64-dts-allwinner-a64-Add-PWM-controllers.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From b5df280bb16345875c0c1baf1db5607fde005395 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <andre.przywara@arm.com>
-Date: Tue, 5 Jun 2018 22:17:01 -0700
-Subject: [PATCH 3/5] arm64: dts: allwinner: a64: Add PWM controllers
-
-The Allwinner A64 SoC features two PWM controllers, which are fully
-compatible to the one used in the A13 and H3 chips.
-
-Add the nodes for the devices (one for the "normal" PWM, the other for
-the one in the CPUS domain) and the pins their outputs are connected to.
-
-On the A64 the "normal" PWM is muxed together with one of the MDIO pins
-used to communicate with the Ethernet PHY, so it won't be usable on many
-boards. But the Pinebook laptop uses this pin for controlling the LCD
-backlight.
-
-On Pine64 the CPUS PWM pin however is routed to the "RPi2" header,
-at the same location as the PWM pin on the RaspberryPi.
-
-Tested on Pinebook and Teres-I
-
-[vasily: fixed comment message as requested by Stefan Bruens, added default
-         muxing options to pwm and r_pwm nodes]
-
-Signed-off-by: Andre Przywara <andre.przywara@arm.com>
-Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Tested-by: Harald Geyer <harald@ccbib.org>
-Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
----
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 32 +++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 1b31a3aaed5a..2777b2d02d77 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -365,6 +365,11 @@
- 				bias-pull-up;
- 			};
- 
-+			pwm_pin: pwm_pin {
-+				pins = "PD22";
-+				function = "pwm";
-+			};
-+
- 			rmii_pins: rmii_pins {
- 				pins = "PD10", "PD11", "PD13", "PD14", "PD17",
- 				       "PD18", "PD19", "PD20", "PD22", "PD23";
-@@ -630,6 +635,17 @@
- 			#interrupt-cells = <3>;
- 		};
- 
-+		pwm: pwm@1c21400 {
-+			compatible = "allwinner,sun50i-a64-pwm",
-+				     "allwinner,sun5i-a13-pwm";
-+			reg = <0x01c21400 0x400>;
-+			clocks = <&osc24M>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pwm_pin>;
-+			#pwm-cells = <3>;
-+			status = "disabled";
-+		};
-+
- 		rtc: rtc@1f00000 {
- 			compatible = "allwinner,sun6i-a31-rtc";
- 			reg = <0x01f00000 0x54>;
-@@ -671,6 +687,17 @@
- 			#size-cells = <0>;
- 		};
- 
-+		r_pwm: pwm@1f03800 {
-+			compatible = "allwinner,sun50i-a64-pwm",
-+				     "allwinner,sun5i-a13-pwm";
-+			reg = <0x01f03800 0x400>;
-+			clocks = <&osc24M>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&r_pwm_pin>;
-+			#pwm-cells = <3>;
-+			status = "disabled";
-+		};
-+
- 		r_pio: pinctrl@1f02c00 {
- 			compatible = "allwinner,sun50i-a64-r-pinctrl";
- 			reg = <0x01f02c00 0x400>;
-@@ -687,6 +714,11 @@
- 				function = "s_i2c";
- 			};
- 
-+			r_pwm_pin: pwm {
-+				pins = "PL10";
-+				function = "s_pwm";
-+			};
-+
- 			r_rsb_pins: rsb {
- 				pins = "PL0", "PL1";
- 				function = "s_rsb";
--- 
-2.11.0
-
diff --git a/debian/patches/features/arm64/pinebook/0004-arm64-dts-allwinner-add-support-for-Pinebook.patch b/debian/patches/features/arm64/pinebook/0004-arm64-dts-allwinner-add-support-for-Pinebook.patch
deleted file mode 100644
index 200f16de87c0..000000000000
--- a/debian/patches/features/arm64/pinebook/0004-arm64-dts-allwinner-add-support-for-Pinebook.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-From df35fbcfa3983c233f5fadaf8db18bfd10ac58b6 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Tue, 5 Jun 2018 22:17:02 -0700
-Subject: [PATCH 4/5] arm64: dts: allwinner: add support for Pinebook
-
-Pinebook is a A64-based laptop produced by Pine64, with the following
-peripherals:
-
-USB:
-- Two external USB ports (one is directly connected to A64's OTG
-controller, the other is under a internal hub connected to the host-only
-controller.)
-- USB HID keyboard and touchpad connected to the internal hub.
-- USB UVC camera connected to the internal hub.
-
-Power-related:
-- A DC IN jack connected to AXP803's DCIN pin.
-- A Li-Polymer battery connected to AXP803's battery pins.
-
-Storage:
-- An eMMC by Foresee on the main board (in the product revision of the
-main board it's designed to be switchable).
-- An external MicroSD card slot.
-
-Display:
-- An eDP LCD panel (1366x768) connected via an ANX6345 RGB-eDP bridge.
-- A mini HDMI port.
-
-Misc:
-- A Hall sensor designed to detect the status of lid, connected to GPIO PL12.
-- A headphone jack connected to the SoC's internal codec.
-- A debug UART port muxed with headphone jack.
-
-This commit adds basical support for it.
-
-[vasily: squashed several commits into one, added simplefb node, added usbphy
-	 to ehci0 and ohci0 nodes and other cosmetic changes to dts]
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
----
- arch/arm64/boot/dts/allwinner/Makefile             |   1 +
- .../boot/dts/allwinner/sun50i-a64-pinebook.dts     | 280 +++++++++++++++++++++
- 2 files changed, 281 insertions(+)
- create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
-
---- a/arch/arm64/boot/dts/allwinner/Makefile
-+++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-n
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb
-+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinebook.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-libretech-all-h3-cc.dtb
---- /dev/null
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
-@@ -0,0 +1,280 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz>
-+ * Copyright (C) 2018 Vasily Khoruzhick <anarsoul@gmail.com>
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+#include "sun50i-a64.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/pwm/pwm.h>
-+
-+/ {
-+	model = "Pinebook";
-+	compatible = "pine64,pinebook", "allwinner,sun50i-a64";
-+
-+	aliases {
-+		serial0 = &uart0;
-+		ethernet0 = &rtl8723cs;
-+	};
-+
-+	backlight: backlight {
-+		compatible = "pwm-backlight";
-+		pwms = <&pwm 0 50000 0>;
-+		brightness-levels = <0 5 10 15 20 30 40 55 70 85 100>;
-+		default-brightness-level = <2>;
-+		enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */
-+	};
-+
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+
-+		framebuffer-lcd {
-+			panel-supply = <&reg_dc1sw>;
-+			dvdd25-supply = <&reg_dldo2>;
-+			dvdd12-supply = <&reg_fldo1>;
-+		};
-+	};
-+
-+	gpio_keys {
-+		compatible = "gpio-keys";
-+
-+		lid_switch {
-+			label = "Lid Switch";
-+			gpios = <&r_pio 0 12 GPIO_ACTIVE_LOW>; /* PL12 */
-+			linux,input-type = <EV_SW>;
-+			linux,code = <SW_LID>;
-+			linux,can-disable;
-+		};
-+	};
-+
-+	reg_vcc3v3: vcc3v3 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+	};
-+
-+	wifi_pwrseq: wifi_pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
-+	};
-+};
-+
-+&ehci0 {
-+	phys = <&usbphy 0>;
-+	phy-names = "usb";
-+	status = "okay";
-+};
-+
-+&ehci1 {
-+	status = "okay";
-+};
-+
-+&mmc0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins>;
-+	vmmc-supply = <&reg_dcdc1>;
-+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-+	cd-inverted;
-+	disable-wp;
-+	bus-width = <4>;
-+	status = "okay";
-+};
-+
-+&mmc1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc1_pins>;
-+	vmmc-supply = <&reg_dldo4>;
-+	vqmmc-supply = <&reg_eldo1>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	status = "okay";
-+
-+	rtl8723cs: wifi@1 {
-+		reg = <1>;
-+	};
-+};
-+
-+&mmc2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc2_pins>;
-+	vmmc-supply = <&reg_dcdc1>;
-+	vqmmc-supply = <&reg_eldo1>;
-+	bus-width = <8>;
-+	non-removable;
-+	cap-mmc-hw-reset;
-+	mmc-hs200-1_8v;
-+	status = "okay";
-+};
-+
-+&ohci0 {
-+	phys = <&usbphy 0>;
-+	phy-names = "usb";
-+	status = "okay";
-+};
-+
-+&ohci1 {
-+	status = "okay";
-+};
-+
-+&pwm {
-+	status = "okay";
-+};
-+
-+&r_rsb {
-+	status = "okay";
-+
-+	axp803: pmic@3a3 {
-+		compatible = "x-powers,axp803";
-+		reg = <0x3a3>;
-+		interrupt-parent = <&r_intc>;
-+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
-+	};
-+};
-+
-+/* The ANX6345 eDP-bridge is on r_i2c */
-+&r_i2c {
-+	clock-frequency = <100000>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&r_i2c_pins_a>;
-+	status = "okay";
-+};
-+
-+#include "axp803.dtsi"
-+
-+&reg_aldo1 {
-+	regulator-min-microvolt = <2800000>;
-+	regulator-max-microvolt = <2800000>;
-+	regulator-name = "vcc-csi";
-+};
-+
-+&reg_aldo2 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1800000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "vcc-pl";
-+};
-+
-+&reg_aldo3 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <2700000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "vcc-pll-avcc";
-+};
-+
-+&reg_dc1sw {
-+	regulator-name = "vcc-lcd";
-+};
-+
-+&reg_dcdc1 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <3300000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "vcc-3v3";
-+};
-+
-+&reg_dcdc2 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1000000>;
-+	regulator-max-microvolt = <1300000>;
-+	regulator-name = "vdd-cpux";
-+};
-+
-+/* DCDC3 is polyphased with DCDC2 */
-+
-+&reg_dcdc5 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1200000>;
-+	regulator-max-microvolt = <1200000>;
-+	regulator-name = "vcc-dram";
-+};
-+
-+&reg_dcdc6 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1100000>;
-+	regulator-max-microvolt = <1100000>;
-+	regulator-name = "vdd-sys";
-+};
-+
-+&reg_dldo1 {
-+	regulator-min-microvolt = <3300000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "vcc-hdmi";
-+};
-+
-+&reg_dldo2 {
-+	regulator-min-microvolt = <2500000>;
-+	regulator-max-microvolt = <2500000>;
-+	regulator-name = "vcc-edp";
-+};
-+
-+&reg_dldo3 {
-+	regulator-min-microvolt = <3300000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "avdd-csi";
-+};
-+
-+&reg_dldo4 {
-+	regulator-min-microvolt = <3300000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "vcc-wifi";
-+};
-+
-+&reg_eldo1 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1800000>;
-+	regulator-max-microvolt = <1800000>;
-+	regulator-name = "cpvdd";
-+};
-+
-+&reg_eldo3 {
-+	regulator-min-microvolt = <1800000>;
-+	regulator-max-microvolt = <1800000>;
-+	regulator-name = "vdd-1v8-csi";
-+};
-+
-+&reg_fldo1 {
-+	regulator-min-microvolt = <1200000>;
-+	regulator-max-microvolt = <1200000>;
-+	regulator-name = "vcc-1v2-hsic";
-+};
-+
-+&reg_fldo2 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1100000>;
-+	regulator-max-microvolt = <1100000>;
-+	regulator-name = "vdd-cpus";
-+};
-+
-+&reg_ldo_io0 {
-+	regulator-min-microvolt = <3300000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "vcc-usb";
-+	status = "okay";
-+};
-+
-+&reg_rtc_ldo {
-+	regulator-name = "vcc-rtc";
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pins_a>;
-+	status = "okay";
-+};
-+
-+&usb_otg {
-+	dr_mode = "host";
-+};
-+
-+&usbphy {
-+	usb0_vbus-supply = <&reg_ldo_io0>;
-+	usb1_vbus-supply = <&reg_ldo_io0>;
-+	status = "okay";
-+};
diff --git a/debian/patches/features/arm64/pinebook/0005-arm64-dts-allwinner-a64-add-SRAM-controller-device-t.patch b/debian/patches/features/arm64/pinebook/0005-arm64-dts-allwinner-a64-add-SRAM-controller-device-t.patch
deleted file mode 100644
index 9b3020af76b8..000000000000
--- a/debian/patches/features/arm64/pinebook/0005-arm64-dts-allwinner-a64-add-SRAM-controller-device-t.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1f1f5183981d70bf0950f8467772851a05eb9148 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Wed, 11 Apr 2018 22:16:41 +0800
-Subject: [PATCH 5/5] arm64: dts: allwinner: a64: add SRAM controller device
- tree node
-
-Allwinner A64 has a SRAM controller, and in the device tree currently
-we have a syscon node to enable EMAC driver to access the EMAC clock
-register. As SRAM controller driver can now export regmap for this
-register, replace the syscon node to the SRAM controller device node,
-and let EMAC driver to acquire its EMAC clock regmap.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-[wens@csie.org: Updated compatible string]
-Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
-Signed-off-by: Chen-Yu Tsai <wens@csie.org>
----
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 2777b2d02d77..ff2ddde1e117 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -170,9 +170,24 @@
- 		ranges;
- 
- 		syscon: syscon@1c00000 {
--			compatible = "allwinner,sun50i-a64-system-controller",
--				"syscon";
-+			compatible = "allwinner,sun50i-a64-system-control";
- 			reg = <0x01c00000 0x1000>;
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges;
-+
-+			sram_c: sram@18000 {
-+				compatible = "mmio-sram";
-+				reg = <0x00018000 0x28000>;
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				ranges = <0 0x00018000 0x28000>;
-+
-+				de2_sram: sram-section@0 {
-+					compatible = "allwinner,sun50i-a64-sram-c";
-+					reg = <0x0000 0x28000>;
-+				};
-+			};
- 		};
- 
- 		dma: dma-controller@1c02000 {
--- 
-2.11.0
-
diff --git a/debian/patches/features/powerpc/mtd-powernv_flash-set-of_node-in-mtd-s-dev.patch b/debian/patches/features/powerpc/mtd-powernv_flash-set-of_node-in-mtd-s-dev.patch
deleted file mode 100644
index 99d716fbd45c..000000000000
--- a/debian/patches/features/powerpc/mtd-powernv_flash-set-of_node-in-mtd-s-dev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 13 Jul 2018 10:15:59 +0200
-Subject: mtd: powernv_flash: set of_node in mtd's dev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Origin: http://git.infradead.org/linux-mtd-next.git/commit/9ea97a7d689c55a5528bfaad499edf1a4ca02e2a
-Bug-Debian: https://bugs.debian.org/904380
-
-This enables some features implemented in mtd subsystem like reading
-label and partitioning info from DT.
-
-Reported-by: Timothy Pearson <tpearson@raptorengineering.com>
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/devices/powernv_flash.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c
-index c1312b141ae0..33593122e49b 100644
---- a/drivers/mtd/devices/powernv_flash.c
-+++ b/drivers/mtd/devices/powernv_flash.c
-@@ -223,6 +223,7 @@ static int powernv_flash_set_driver_info(struct device *dev,
- 	mtd->_read = powernv_flash_read;
- 	mtd->_write = powernv_flash_write;
- 	mtd->dev.parent = dev;
-+	mtd_set_of_node(mtd, dev->of_node);
- 	return 0;
- }
- 
diff --git a/debian/patches/features/powerpc/powerpc-add-build-salt-to-the-vdso.patch b/debian/patches/features/powerpc/powerpc-add-build-salt-to-the-vdso.patch
deleted file mode 100644
index 1d7c5cd1c720..000000000000
--- a/debian/patches/features/powerpc/powerpc-add-build-salt-to-the-vdso.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 5 Jul 2018 17:49:39 -0700
-Subject: powerpc: Add build salt to the vDSO
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit?id=29f07b97416a95d28ee62e70fd91b44956d3c8ce
-Bug-Debian: https://bugs.debian.org/872263
-
-The vDSO needs to have a unique build id in a similar manner
-to the kernel and modules. Use the build salt macro.
-
-Signed-off-by: Laura Abbott <labbott@redhat.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
- arch/powerpc/kernel/vdso32/note.S | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/powerpc/kernel/vdso32/note.S
-+++ b/arch/powerpc/kernel/vdso32/note.S
-@@ -5,6 +5,7 @@
- 
- #include <linux/uts.h>
- #include <linux/version.h>
-+#include <linux/build-salt.h>
- 
- #define ASM_ELF_NOTE_BEGIN(name, flags, vendor, type)			      \
- 	.section name, flags;						      \
-@@ -23,3 +24,5 @@
- 	ASM_ELF_NOTE_BEGIN(".note.kernel-version", "a", UTS_SYSNAME, 0)
- 	.long LINUX_VERSION_CODE
- 	ASM_ELF_NOTE_END
-+
-+BUILD_SALT
diff --git a/debian/patches/features/x86/x86-add-build-salt-to-the-vdso.patch b/debian/patches/features/x86/x86-add-build-salt-to-the-vdso.patch
deleted file mode 100644
index 2284e5e7469b..000000000000
--- a/debian/patches/features/x86/x86-add-build-salt-to-the-vdso.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 5 Jul 2018 17:49:38 -0700
-Subject: x86: Add build salt to the vDSO
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit?id=fdc3ae38182c7f983f4f8b97c86b753a3c16e269
-Bug-Debian: https://bugs.debian.org/872263
-
-The vDSO needs to have a unique build id in a similar manner
-to the kernel and modules. Use the build salt macro.
-
-Acked-by: Andy Lutomirski <luto@kernel.org>
-Signed-off-by: Laura Abbott <labbott@redhat.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
- arch/x86/entry/vdso/vdso-note.S   | 3 +++
- arch/x86/entry/vdso/vdso32/note.S | 3 +++
- 2 files changed, 6 insertions(+)
-
---- a/arch/x86/entry/vdso/vdso-note.S
-+++ b/arch/x86/entry/vdso/vdso-note.S
-@@ -3,6 +3,7 @@
-  * Here we can supply some information useful to userland.
-  */
- 
-+#include <linux/build-salt.h>
- #include <linux/uts.h>
- #include <linux/version.h>
- #include <linux/elfnote.h>
-@@ -10,3 +11,5 @@
- ELFNOTE_START(Linux, 0, "a")
- 	.long LINUX_VERSION_CODE
- ELFNOTE_END
-+
-+BUILD_SALT
---- a/arch/x86/entry/vdso/vdso32/note.S
-+++ b/arch/x86/entry/vdso/vdso32/note.S
-@@ -4,6 +4,7 @@
-  * Here we can supply some information useful to userland.
-  */
- 
-+#include <linux/build-salt.h>
- #include <linux/version.h>
- #include <linux/elfnote.h>
- 
-@@ -14,6 +15,8 @@ ELFNOTE_START(Linux, 0, "a")
- 	.long LINUX_VERSION_CODE
- ELFNOTE_END
- 
-+BUILD_SALT
-+
- #ifdef CONFIG_XEN
- /*
-  * Add a special note telling glibc's dynamic linker a fake hardware
diff --git a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch b/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
index 2c3f67d4d65d..b93f62b357f4 100644
--- a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
+++ b/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
@@ -2,6 +2,7 @@ From: Ben Hutchings <ben@decadent.org.uk>
 Date: Mon, 12 Feb 2018 23:59:26 +0000
 Subject: x86: Make x32 syscall support conditional on a kernel parameter
 Bug-Debian: https://bugs.debian.org/708070
+Forwarded: https://lore.kernel.org/lkml/1415245982.3398.53.camel@decadent.org.uk/T/#u
 
 Enabling x32 in the standard amd64 kernel would increase its attack
 surface while provide no benefit to the vast majority of its users.
diff --git a/debian/patches/series b/debian/patches/series
index 695f27d1bd45..cf8bffd9fd08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -74,6 +74,8 @@ bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch
 bugfix/powerpc/powerpc-lib-sstep-fix-building-for-powerpcspe.patch
 bugfix/powerpc/powerpc-lib-makefile-don-t-pull-in-quad.o-for-32-bit.patch
 bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch
+bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch
+bugfix/x86/x86-boot-fix-efi-stub-alignment.patch
 bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch
 bugfix/x86/x86-32-disable-3dnow-in-generic-config.patch
 
@@ -82,13 +84,6 @@ features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
 features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
 features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
 features/x86/x86-make-x32-syscall-support-conditional.patch
-# Add device-tree for Pinebook from linux next-20180625
-features/arm64/pinebook/0001-arm64-allwinner-a64-Add-RTC-clock-to-phandle-32kHz-e.patch
-features/arm64/pinebook/0002-arm64-dts-allwinner-a64-add-R_I2C-controller.patch
-features/arm64/pinebook/0003-arm64-dts-allwinner-a64-Add-PWM-controllers.patch
-features/arm64/pinebook/0004-arm64-dts-allwinner-add-support-for-Pinebook.patch
-features/arm64/pinebook/0005-arm64-dts-allwinner-a64-add-SRAM-controller-device-t.patch
-features/powerpc/mtd-powernv_flash-set-of_node-in-mtd-s-dev.patch
 
 # Miscellaneous bug fixes
 bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
@@ -97,13 +92,8 @@ bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
 bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
 debian/revert-objtool-fix-config_stack_validation-y-warning.patch
-bugfix/all/netfilter-ipvs-Fix-invalid-bytes-in-IP_VS_MH_TAB_IND.patch
 
 # Miscellaneous features
-features/all/kbuild-add-build-salt-to-the-kernel-and-modules.patch
-features/x86/x86-add-build-salt-to-the-vdso.patch
-features/powerpc/powerpc-add-build-salt-to-the-vdso.patch
-features/arm64/arm64-add-build-salt-to-the-vdso.patch
 
 # Lockdown (formerly 'securelevel') patchset
 features/all/lockdown/0001-Add-the-ability-to-lock-down-access-to-the-running-k.patch
@@ -141,10 +131,6 @@ features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch
 
 # Security fixes
 debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
-bugfix/all/Revert-net-increase-fragment-memory-usage-limits.patch
-bugfix/all/floppy-Do-not-copy-a-kernel-pointer-to-user-memory-i.patch
-bugfix/all/scsi-target-iscsi-Use-hex2bin-instead-of-a-re-implem.patch
-bugfix/all/scsi-target-iscsi-Use-bin2hex-instead-of-a-re-implem.patch
 
 # Fix exported symbol versions
 bugfix/all/module-disable-matching-missing-version-crc.patch
@@ -156,14 +142,13 @@ bugfix/all/tools-perf-man-date.patch
 bugfix/all/tools-perf-remove-shebangs.patch
 bugfix/all/tools-lib-traceevent-use-ldflags.patch
 bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch
-bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch
 bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
 bugfix/all/cpupower-bump-soname-version.patch
 bugfix/all/cpupower-fix-checks-for-cpu-existence.patch
-bugfix/all/lockdep-stub-nmi-watchdog-reset.patch
-bugfix/all/lockdep-stub-task_struct-state.patch
 bugfix/all/tools-lib-api-fs-fs.c-fix-misuse-of-strncpy.patch
 bugfix/all/usbip-fix-misuse-of-strncpy.patch
+bugfix/x86/tools-x86_energy_perf_policy-fix-uninitialized-varia.patch
+bugfix/x86/tools-turbostat-Add-checks-for-failure-of-fgets-and-.patch
 
 # wireless: Disable regulatory.db direct loading (until we sort out signing)
 debian/wireless-disable-regulatory.db-direct-loading.patch
diff --git a/debian/rules b/debian/rules
index 9059d78d2265..1ddbb45ade25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 
 SHELL    := sh -e
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 SOURCE := $(shell dpkg-parsechangelog -SSource)
 VERSION := $(shell dpkg-parsechangelog -SVersion)
 VERSION_UPSTREAM := $(shell echo "$(VERSION)" | sed -e 's,-[^-]*$$,,')
 VERSION_BINNMU := $(shell echo "$(VERSION)" | sed -rne 's,.*\+b([0-9]+)$$,\1,p')
 
+include /usr/share/dpkg/architecture.mk
+
 include debian/rules.defs
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -92,7 +93,7 @@ clean: debian/control
 
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/*.in)
 CONTROL_FILES += debian/config/defines $(wildcard debian/config/*/defines) $(wildcard debian/config/*/*/defines)
-CONTROL_FILES += $(wildcard debian/installer/*/kernel-versions) $(wildcard debian/installer/*/package-list) debian/installer/package-list
+CONTROL_FILES += debian/installer/kernel-versions debian/installer/package-list
 debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
 ifeq ($(wildcard debian/control.md5sum),)
 	$(MAKE) -f debian/rules debian/control-real
diff --git a/debian/rules.d/scripts/Makefile b/debian/rules.d/scripts/Makefile
index 41a642bb6a83..4408a6d6f1df 100644
--- a/debian/rules.d/scripts/Makefile
+++ b/debian/rules.d/scripts/Makefile
@@ -1,4 +1,5 @@
 PROGS = \
+	bin2c \
 	conmakehash \
 	extract-cert \
 	kallsyms \
diff --git a/debian/rules.d/scripts/basic/Makefile b/debian/rules.d/scripts/basic/Makefile
index 86b86a849697..127f53fa8668 100644
--- a/debian/rules.d/scripts/basic/Makefile
+++ b/debian/rules.d/scripts/basic/Makefile
@@ -1,5 +1,4 @@
 PROGS = \
-	bin2c \
 	fixdep
 
 include $(top_rulesdir)/Makefile.inc
diff --git a/debian/rules.d/tools/power/cpupower/Makefile b/debian/rules.d/tools/power/cpupower/Makefile
index 7cb91da9abf4..c43bd62f1a70 100644
--- a/debian/rules.d/tools/power/cpupower/Makefile
+++ b/debian/rules.d/tools/power/cpupower/Makefile
@@ -14,13 +14,13 @@ MAKE_CPUPOWER += PACKAGE_BUGREPORT='Debian\ \(reportbug\ linux-cpupower\)'
 MAKE_CPUPOWER += libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 all:
-	$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower
+	+$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower
 
 install:
-	$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower install DESTDIR=$(DESTDIR)
+	+$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower install DESTDIR=$(DESTDIR)
 ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	rm -rf $(DESTDIR)/usr/share/man
 endif
 
 clean:
-	$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower clean
+	+$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower clean
diff --git a/debian/rules.real b/debian/rules.real
index 48e15a9b169b..81b429386476 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -16,8 +16,16 @@ ifeq ($(DISTRIBUTOR),)
 DISTRIBUTOR := Debian
 endif
 
+include /usr/share/dpkg/architecture.mk
+
 include debian/rules.defs
 
+ifdef ARCH
+  ifneq ($(DEB_HOST_ARCH),$(ARCH))
+    $(error Attempting to build a $(ARCH) target but host architecture is $(DEB_HOST_ARCH).  Use dpkg-architecture to override the host architecture)
+  endif
+endif
+
 ifdef OVERRIDE_HOST_TYPE
   CROSS_COMPILE := $(OVERRIDE_HOST_TYPE)-
 else ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
@@ -539,12 +547,10 @@ install-signed-template_$(ARCH):
 		debian/signing_templates/rules.real \
 		debian/signing_templates/source \
 		$(CODE_SIGNING_DIR)/source-template/debian/
-	dh_fixperms
-	dh_gencontrol
-	dh_builddeb
+	+$(MAKE_SELF) install-base
 
 install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
-install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
+install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer
 install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%)
 ifeq ($(UDEB_UNSIGNED_TEST_BUILD),True)
 install-udeb_$(ARCH): export DEB_BUILD_PROFILES=pkg.linux.udeb-unsigned-test-build
@@ -668,8 +674,8 @@ install-perf: $(STAMPS_DIR)/build-tools
 	dh_testroot
 	dh_prep
 	$(call make-tools,tools/perf) install DESTDIR=$(DIR)
-	dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/
-	dh_python3 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/
+	dh_perl /usr/lib/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/
+	dh_python3 /usr/lib/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/
 	dh_installchangelogs
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	dh_installdocs
diff --git a/debian/signing_templates/control.image.in b/debian/signing_templates/control.image.in
index ebbf474dadf3..0bc4f6f8367b 100644
--- a/debian/signing_templates/control.image.in
+++ b/debian/signing_templates/control.image.in
@@ -1,5 +1,5 @@
 Package: linux-image-@abiname@@localversion@
-Depends: ${unsigned:Depends}
+Depends: ${unsigned:Depends}, ${misc:Depends}
 Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
 Breaks: ${unsigned:Breaks}
diff --git a/debian/signing_templates/control.source.in b/debian/signing_templates/control.source.in
index 3ef7f338127b..6e0870e3121a 100644
--- a/debian/signing_templates/control.source.in
+++ b/debian/signing_templates/control.source.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Ben Hutchings <ben@decadent.org.uk>
 Standards-Version: 4.1.1
-Build-Depends: debhelper (>= 10.1~), rsync, sbsigntool [amd64 arm64 i386], kernel-wedge (>= 2.93~), linux-kbuild-@version@
+Build-Depends: debhelper (>= 10.1~), rsync, sbsigntool [amd64 arm64 i386], kernel-wedge (>= 2.99~), linux-kbuild-@version@
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/kernel-team/linux.git
 Vcs-Browser: https://salsa.debian.org/kernel-team/linux
diff --git a/debian/signing_templates/rules b/debian/signing_templates/rules
index a55fc41a9c40..ad6156b8728e 100755
--- a/debian/signing_templates/rules
+++ b/debian/signing_templates/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 SHELL := sh -e
 
-DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
 
 build: build-arch build-indep
 build-arch:
diff --git a/debian/signing_templates/rules.real b/debian/signing_templates/rules.real
index 4d08ef77c232..dbb1a33a3088 100644
--- a/debian/signing_templates/rules.real
+++ b/debian/signing_templates/rules.real
@@ -59,7 +59,7 @@ install-signed:
 	dh_builddeb
 
 install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=/usr/share/linux-support-$(ABINAME)/installer
-install-udeb_$(ARCH): export KW_CONFIG_DIR=/usr/share/linux-support-$(ABINAME)/installer/$(ARCH)
+install-udeb_$(ARCH): export KW_CONFIG_DIR=/usr/share/linux-support-$(ABINAME)/installer
 install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%)
 install-udeb_$(ARCH):
 	dh_testdir
diff --git a/debian/templates/control.docs.in b/debian/templates/control.docs.in
index 4feaec26de16..12540467bd46 100644
--- a/debian/templates/control.docs.in
+++ b/debian/templates/control.docs.in
@@ -1,6 +1,8 @@
 Package: @source_basename@-doc-@version@
 Build-Profiles: <!stage1 !nodoc>
 Architecture: all
+Build-Depends: graphviz, python3-sphinx, python3-sphinx-rtd-theme,
+ texlive-latex-base, texlive-latex-extra, dvipng
 Depends: ${misc:Depends}
 Section: doc
 Multi-Arch: foreign
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index cf68233de9f5..7abbc1132f3c 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,24 +1,24 @@
-Package: linux-compiler-gcc-7-arm
+Package: linux-compiler-gcc-8-arm
 Build-Profiles: <!stage1>
-Depends: gcc-7, ${misc:Depends}
+Depends: gcc-8, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
 Description: Compiler for Linux on ARM (meta-package)
  This package depends on GCC of the appropriate version and architecture
  for Linux on armel and armhf.
 
-Package: linux-compiler-gcc-7-s390
+Package: linux-compiler-gcc-8-s390
 Build-Profiles: <!stage1>
-Depends: gcc-7, ${misc:Depends}
+Depends: gcc-8, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
 Description: Compiler for Linux on IBM zSeries (meta-package)
  This package depends on GCC of the appropriate version and architecture
  for Linux on s390 and s390x.
 
-Package: linux-compiler-gcc-7-x86
+Package: linux-compiler-gcc-8-x86
 Build-Profiles: <!stage1>
-Depends: gcc-7 (>= 7.2.0-20~), ${misc:Depends}
+Depends: gcc-8 (>= 8-20180123-1~), ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Description: Compiler for Linux on x86 (meta-package)
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index b775da2ded6e..cca790d3cae1 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -2,6 +2,7 @@ Package: @source_basename@-source-@version@
 Build-Profiles: <!stage1 !pkg.linux.nosource>
 Architecture: all
 Section: kernel
+Build-Depends: patchutils
 Depends: binutils, xz-utils, ${misc:Depends}
 Recommends: libc6-dev | libc-dev, gcc, make, bc, @source_basename@-config-@version@
 Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config
diff --git a/debian/templates/control.signed-template.in b/debian/templates/control.signed-template.in
index b4822a593382..a2834a9e7904 100644
--- a/debian/templates/control.signed-template.in
+++ b/debian/templates/control.signed-template.in
@@ -1,5 +1,6 @@
 Package: linux-image-@arch@-signed-template
 Build-Profiles: <!stage1>
+Depends: dpkg-dev, ${misc:Depends}
 Description: Template for signed linux-image packages for @arch@
  This package is used to control code signing by the Debian signing
  service.
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 941a4a7282dc..a84cd3e835c1 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -19,51 +19,17 @@ Build-Depends:
  bison <!stage1>, flex (>= 2.6.1-1.1~) <!stage1>,
 Build-Depends-Arch:
 # used by debian/rules.real to build udebs
- kernel-wedge (>= 2.93~) <!stage1>,
- kernel-wedge (>= 2.98~) [powerpc powerpcspe ppc64] <!stage1>,
+ kernel-wedge (>= 2.99~) <!stage1>,
 # used by kernel-wedge (only on Linux, thus not declared as a dependency)
  kmod <!stage1>,
 # used by upstream to build include/generated/timeconst.h
  bc <!stage1>,
 # used by upstream to build signing tools and to process certificates
- libssl-dev:native <!stage1>, libssl-dev <!stage1 !pkg.linux.notools cross>,
+ libssl-dev:native <!stage1>, libssl-dev <!stage1 !pkg.linux.notools>,
  openssl (>= 1.1.0-1~) <!stage1>,
 # used by upstream to build objtool (native for amd64 images; host arch for
 # linux-kbuild) and perf (host arch)
  libelf-dev:native [amd64] <!stage1>, libelf-dev <!stage1 !pkg.linux.notools>,
-# used by upstream to build perf documentation
- asciidoctor <!stage1 !nodoc !pkg.linux.notools>,
-# used by upstream to build perf
- gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libaudit-dev <!stage1 !pkg.linux.notools !nopython>,
- libbabeltrace-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
-# - libbabeltrace-ctf-dev may or may not be needed as well
- libbabeltrace-dev (>= 1.5.3-2~) <!stage1 !pkg.linux.notools !nopython> | libbabeltrace-ctf-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
- libdw-dev <!stage1 !pkg.linux.notools !nopython>,
- libiberty-dev <!stage1 !pkg.linux.notools !nopython>,
- libnewt-dev <!stage1 !pkg.linux.notools !nopython>,
- libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc powerpcspe ppc64 ppc64el sparc x32] <!stage1 !pkg.linux.notools !nopython>,
- libperl-dev <!stage1 !pkg.linux.notools !nopython>,
- libunwind8-dev [amd64 armel armhf arm64 i386] <!stage1 !pkg.linux.notools !nopython>,
- python3-dev <!stage1 !pkg.linux.notools !nopython>,
-# used by upstream to build usbip
- autoconf <!stage1 !pkg.linux.notools>,
- automake <!stage1 !pkg.linux.notools>,
- libtool <!stage1 !pkg.linux.notools>,
- libglib2.0-dev <!stage1 !pkg.linux.notools>,
- libudev-dev <!stage1 !pkg.linux.notools>,
- libwrap0-dev <!stage1 !pkg.linux.notools>,
-# used by debian/rules.d/tools/usb/usbip to build usbip
- rsync <!stage1 !pkg.linux.notools>,
-# used by upstream to build cpupower
- libpci-dev <!stage1 !pkg.linux.notools>,
-Build-Depends-Indep:
-# used by debian/rules.real to build linux-source
- patchutils <!stage1>,
-# used by upstream to build documentation
- graphviz <!stage1 !nodoc>,
- python3-sphinx <!stage1 !nodoc>,
- python3-sphinx-rtd-theme <!stage1 !nodoc>,
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/kernel-team/linux.git
 Vcs-Browser: https://salsa.debian.org/kernel-team/linux
diff --git a/debian/templates/control.tools-unversioned.in b/debian/templates/control.tools-unversioned.in
index dd8e0f2a8036..d6a898fe75f8 100644
--- a/debian/templates/control.tools-unversioned.in
+++ b/debian/templates/control.tools-unversioned.in
@@ -2,6 +2,7 @@ Package: linux-cpupower
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Section: admin
 Architecture: linux-any
+Build-Depends: libpci-dev
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CPU power management tools for Linux
  The cpupower command allows inspection and control of cpufreq and
@@ -22,7 +23,7 @@ Package: libcpupower-dev
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Section: libdevel
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcpupower1 (= ${binary:Version})
+Depends: ${misc:Depends}, libcpupower1 (= ${binary:Version})
 Provides: libcpufreq-dev
 Conflicts: libcpufreq-dev
 Replaces: libcpufreq-dev
@@ -32,6 +33,15 @@ Description: CPU frequency and voltage scaling tools for Linux (development file
 Package: usbip
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Architecture: linux-any
+Build-Depends:
+ autoconf,
+ automake,
+ libtool,
+ libglib2.0-dev,
+ libudev-dev,
+ libwrap0-dev,
+# used by debian/rules.d/tools/usb/usbip
+ rsync,
 Depends: usbutils, ${shlibs:Depends}, ${misc:Depends}
 Section: admin
 Description: USB device sharing system over IP network
@@ -74,7 +84,7 @@ Description: Support daemons for Linux running on Hyper-V
 Package: lockdep
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep@version@
+Depends: ${misc:Depends}, liblockdep@version@
 Recommends: liblockdep-dev
 Section: devel
 Multi-Arch: allowed
@@ -95,7 +105,7 @@ Description: Runtime locking correctness validator (shared library)
 Package: liblockdep-dev
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep@version@ (= ${binary:Version})
+Depends: ${misc:Depends}, liblockdep@version@ (= ${binary:Version})
 Section: libdevel
 Multi-Arch: same
 Description: Runtime locking correctness validator (development files)
diff --git a/debian/templates/control.tools-versioned.in b/debian/templates/control.tools-versioned.in
index 3899c7669212..d0c2c3349007 100644
--- a/debian/templates/control.tools-versioned.in
+++ b/debian/templates/control.tools-versioned.in
@@ -10,7 +10,21 @@ Package: linux-perf-@version@
 Build-Profiles: <!stage1 !pkg.linux.notools !nopython>
 Section: devel
 Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
+Build-Depends:
+ asciidoctor <!stage1 !nodoc !pkg.linux.notools !nopython>,
+ gcc-multilib [amd64 mips64 mips64el mips64r6 mips64r6el ppc64 s390x sparc64],
+ libaudit-dev,
+ libbabeltrace-dev (>= 1.5.0),
+# libbabeltrace-ctf-dev may or may not be needed as well
+ libbabeltrace-dev (>= 1.5.3-2~) | libbabeltrace-ctf-dev (>= 1.5.0),
+ libdw-dev,
+ libiberty-dev,
+ libnewt-dev,
+ libnuma-dev,
+ libperl-dev,
+ libunwind-dev [amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el sh4],
+ python3-dev,
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python3:Depends}
 Recommends: linux-base
 Provides: linux-tools-@version@
 Conflicts: linux-tools-@version@