From patchwork Fri Jun 17 08:09:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 636818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3rWCb808qcz9t2B; Fri, 17 Jun 2016 18:09:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=RkqudkDd; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bDoqO-0000SC-9k; Fri, 17 Jun 2016 08:09:36 +0000 Received: from mail-wm0-f52.google.com ([74.125.82.52]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bDoqI-0000RX-E1 for kernel-team@lists.ubuntu.com; Fri, 17 Jun 2016 08:09:30 +0000 Received: by mail-wm0-f52.google.com with SMTP id f126so78708211wma.1 for ; Fri, 17 Jun 2016 01:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=/tDx4jvW4SHxjA0vp+yN6qgqW12RxORIqKj7RooR2zM=; b=RkqudkDdJL7ekmHpJr9sLxTQZfeND9ORRoIM6hfQWqRmG6c87CDnrXzM3sxGzJrpG3 ttqCgyIU/Ibt+Bqn3RfdirFFRpT97wyNh0OSFtPk9D4+BvLWPEyLeZJ4q9+6C8qQMOn9 wY3JNWDGMCDsDKJMQ3MLk0hkDKnriFI1R2DFgd2WLS9DCBIVxP2hP2k+jDcbN3jMkeiR oAQj6EvD0IpYdArKTlEjLD4c6eyZTX2uzeZtfT+TDrQ+by5AX4V2VOBU0mb1tlWW4uF1 VfmbpEHsF1C4/XIO7bFxlMEQJ8gxAba6ITkmZYv+Zhy3kw5i43sjGbbnV+3RfoTmh/7t yqzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=/tDx4jvW4SHxjA0vp+yN6qgqW12RxORIqKj7RooR2zM=; b=VjtC/TdyCWtHI9Ow9Xo5Wv/ZTBfKrEviauVVnWRWd6Pr1897TBFg5l+854RXZU6pM0 3EAVEjzL8FZcWZcOLSvlJFmLfLk60Msi2DoKWaogvN7MNLiKOg6X+ZwTerp1wCKP1Erb l6pMrs6NF//kJxHinafx24BdFaKbzpMBZvxmdLTuR1cegftylGsEk36I9ONHOXAspetL KBXjfRDuM1ZQhXkIwWEqXl4hsSM1D8krlr0zEj4fsjFaADWMVymubt1GUg9cIkVbF5jK yyHwJHiTD0vh/mB12we0jv9h8nZldM9hO/HcDjmQKNlaedcIQKL4OYF4gciYGCabpGCZ NPsw== X-Gm-Message-State: ALyK8tKeoZ/SCOR5HjkWvb13Aw3duKb19Ag8+0g82cmj8PyXeghw07+Qa6oYBEePuc3ZbsRL X-Received: by 10.28.25.69 with SMTP id 66mr911020wmz.39.1466150969776; Fri, 17 Jun 2016 01:09:29 -0700 (PDT) Received: from localhost.localdomain ([193.92.114.66]) by smtp.gmail.com with ESMTPSA id t1sm47568243wjy.3.2016.06.17.01.09.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jun 2016 01:09:29 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Xenial SRU] UBUNTU: [Config] CONFIG_SQUASHFS=y Date: Fri, 17 Jun 2016 11:09:27 +0300 Message-Id: <1466150967-10795-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1593134 Signed-off-by: Tim Gardner --- debian.master/abi/4.4.0-25.44/amd64/generic.modules | 1 - debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules | 1 - debian.master/abi/4.4.0-25.44/arm64/generic.modules | 1 - debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules | 1 - debian.master/abi/4.4.0-25.44/armhf/generic.modules | 1 - debian.master/abi/4.4.0-25.44/i386/generic.modules | 1 - debian.master/abi/4.4.0-25.44/i386/lowlatency.modules | 1 - debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules | 1 - debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules | 1 - debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules | 1 - debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules | 1 - debian.master/abi/4.4.0-25.44/ppc64el/generic.modules | 1 - debian.master/abi/4.4.0-25.44/s390x/generic.modules | 1 - debian.master/config/annotations | 3 ++- debian.master/config/config.common.ubuntu | 2 +- debian.master/d-i/modules/squashfs-modules | 1 - debian.master/d-i/package-list | 6 ------ 17 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 debian.master/d-i/modules/squashfs-modules diff --git a/debian.master/abi/4.4.0-25.44/amd64/generic.modules b/debian.master/abi/4.4.0-25.44/amd64/generic.modules index 139911a..d88bc81 100644 --- a/debian.master/abi/4.4.0-25.44/amd64/generic.modules +++ b/debian.master/abi/4.4.0-25.44/amd64/generic.modules @@ -3830,7 +3830,6 @@ spi-zynqmp-gqspi spl splat spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules b/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules index 94876f2..972db47 100644 --- a/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules +++ b/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules @@ -3829,7 +3829,6 @@ spi-zynqmp-gqspi spl splat spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/arm64/generic.modules b/debian.master/abi/4.4.0-25.44/arm64/generic.modules index 1ffabb1..fb0a021 100644 --- a/debian.master/abi/4.4.0-25.44/arm64/generic.modules +++ b/debian.master/abi/4.4.0-25.44/arm64/generic.modules @@ -3655,7 +3655,6 @@ splat spmi spmi-pmic-arb sprd_serial -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules b/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules index 0580e8a..a94a572 100644 --- a/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules +++ b/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules @@ -3818,7 +3818,6 @@ spi-xcomm spi-zynqmp-gqspi spmi spmi-pmic-arb -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/armhf/generic.modules b/debian.master/abi/4.4.0-25.44/armhf/generic.modules index 7630d11..083bff4 100644 --- a/debian.master/abi/4.4.0-25.44/armhf/generic.modules +++ b/debian.master/abi/4.4.0-25.44/armhf/generic.modules @@ -3902,7 +3902,6 @@ spi-xcomm spi-zynqmp-gqspi spmi spmi-pmic-arb -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/i386/generic.modules b/debian.master/abi/4.4.0-25.44/i386/generic.modules index d706d4d..f3585c7 100644 --- a/debian.master/abi/4.4.0-25.44/i386/generic.modules +++ b/debian.master/abi/4.4.0-25.44/i386/generic.modules @@ -3964,7 +3964,6 @@ spi-topcliff-pch spi-xcomm spi-zynqmp-gqspi spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules b/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules index d6c4fe2..cfb3725 100644 --- a/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules +++ b/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules @@ -3963,7 +3963,6 @@ spi-topcliff-pch spi-xcomm spi-zynqmp-gqspi spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules index caf6c6a..4bc52af 100644 --- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules +++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules @@ -3615,7 +3615,6 @@ spi-tle62x0 spi-xcomm spi-zynqmp-gqspi spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules index 6b113bd..11e6825 100644 --- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules +++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules @@ -3593,7 +3593,6 @@ spi-tle62x0 spi-xcomm spi-zynqmp-gqspi spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules index f274197..dda92f9 100644 --- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules +++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules @@ -3600,7 +3600,6 @@ spi-tle62x0 spi-xcomm spi-zynqmp-gqspi spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules index 2e10784..bc5fb8d 100644 --- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules +++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules @@ -3627,7 +3627,6 @@ spl splat spmi spufs -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules b/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules index b9897ab..da50a80 100644 --- a/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules +++ b/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules @@ -3543,7 +3543,6 @@ spi-zynqmp-gqspi spl splat spmi -squashfs sr9700 sr9800 ssb diff --git a/debian.master/abi/4.4.0-25.44/s390x/generic.modules b/debian.master/abi/4.4.0-25.44/s390x/generic.modules index ec0c5b4..fa7a51a 100644 --- a/debian.master/abi/4.4.0-25.44/s390x/generic.modules +++ b/debian.master/abi/4.4.0-25.44/s390x/generic.modules @@ -648,7 +648,6 @@ smsgiucv_app softdog spl splat -squashfs st ste10Xp stm_console diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 5fc88eb..bf84251 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7407,7 +7407,7 @@ CONFIG_ROMFS_BACKED_BY_MTD policy<{'amd64': 'n', 'arm64': ' CONFIG_ROMFS_BACKED_BY_BOTH policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}> # Menu: File systems >> Miscellaneous filesystems >> SquashFS 4.0 - Squashed file system support -CONFIG_SQUASHFS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_SQUASHFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SQUASHFS_XATTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SQUASHFS_ZLIB policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SQUASHFS_LZ4 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -7418,6 +7418,7 @@ CONFIG_SQUASHFS_EMBEDDED policy<{'amd64': 'n', 'arm64': ' CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE policy<{'amd64': '3', 'arm64': '3', 'armhf': '3', 'i386': '3', 'powerpc': '3', 'ppc64el': '3', 's390x': '3'}> # CONFIG_SQUASHFS_4K_DEVBLK_SIZE note +CONFIG_SQUASHFS mark note # Menu: File systems >> Miscellaneous filesystems >> SquashFS 4.0 - Squashed file system support >> Decompressor parallelisation options CONFIG_SQUASHFS_DECOMP_SINGLE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1394641..01572fb 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7605,7 +7605,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_SPMI_MSM_PMIC_ARB=m CONFIG_SPU_BASE=y CONFIG_SPU_FS=m -CONFIG_SQUASHFS=m +CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y diff --git a/debian.master/d-i/modules/squashfs-modules b/debian.master/d-i/modules/squashfs-modules deleted file mode 100644 index b0c5ed0..0000000 --- a/debian.master/d-i/modules/squashfs-modules +++ /dev/null @@ -1 +0,0 @@ -squashfs ? diff --git a/debian.master/d-i/package-list b/debian.master/d-i/package-list index 8e179fa..41b775f 100644 --- a/debian.master/d-i/package-list +++ b/debian.master/d-i/package-list @@ -188,12 +188,6 @@ Priority: extra Description: Mouse support This package contains mouse drivers for the Linux kernel. -Package: squashfs-modules -Depends: kernel-image -Priority: extra -Description: squashfs modules - This package contains squashfs modules. - Package: vlan-modules Depends: kernel-image Priority: extra