From ac65dbd50d2a2edb2a048e4ce308e09ff737bd73 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 2 Oct 2016 02:19:16 +0100
Subject: [PATCH] udeb: Move nls_utf8 from fat-modules to kernel-image

Many other filesystems need it but vfat no longer does.  It calls
built-in UTF-8 functions directly, while nominally using nls_ascii
as its I/O charset.
---
 debian/changelog                      | 2 ++
 debian/installer/modules/fat-modules  | 2 --
 debian/installer/modules/kernel-image | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ceac16c85f2..23fc14d11fb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux (4.7.5-2) UNRELEASED; urgency=medium
   * linux-image: Exclude vmlinux from stripping by dh_strip (fixes FTBFS
     on hppa)
   * udeb: Fold core-modules into kernel-image
+  * udeb: Move nls_utf8 from fat-modules to kernel-image, as many other
+    filesystems need it but vfat no longer does
 
   [ Cyril Brulebois ]
   * Add nls_ascii to the fat-modules udeb, following the change of
diff --git a/debian/installer/modules/fat-modules b/debian/installer/modules/fat-modules
index 377ae03a9ba0..0498cf834d44 100644
--- a/debian/installer/modules/fat-modules
+++ b/debian/installer/modules/fat-modules
@@ -2,7 +2,5 @@ fat ?
 vfat
 # the default codepage for fat (as of 2.6.8)
 nls_cp437 ?
-# the default i/o character set for fat (as of 2.6.25)
-nls_utf8 ?
 # the default i/o character set for fat (as of 4.7.2-1)
 nls_ascii ?
diff --git a/debian/installer/modules/kernel-image b/debian/installer/modules/kernel-image
index 996b4c9bea67..094c46af4b77 100644
--- a/debian/installer/modules/kernel-image
+++ b/debian/installer/modules/kernel-image
@@ -2,3 +2,5 @@ bitrev ?
 eeprom_93cx6 ?
 led-class ?
 mbcache
+# Default I/O charset for most filesystems that do character conversion
+nls_utf8