From patchwork Fri Apr 12 12:52:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 1084708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44gd9K1myGz9s5c; Fri, 12 Apr 2019 22:53:09 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hEvfx-00044G-LZ; Fri, 12 Apr 2019 12:53:01 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hEvfw-00043n-HE for kernel-team@lists.ubuntu.com; Fri, 12 Apr 2019 12:53:00 +0000 Received: from 1.general.smb.uk.vpn ([10.172.193.28] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hEvfw-0002zu-7h for kernel-team@lists.ubuntu.com; Fri, 12 Apr 2019 12:53:00 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [SRU D/C] UBUNTU: [Config] Update autofs4 path in inclusion list Date: Fri, 12 Apr 2019 14:52:59 +0200 Message-Id: <20190412125259.13064-1-stefan.bader@canonical.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 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" Since a2225d931f75ddd3c39f4d0d195fad99dfd68671 (v4.18) autofs: remove left-over autofs4 stubs there is no seperate fs/autofs4 path for the module anymore. Replace it with fs/autofs so the module will again be included in the main (not extra) modules file. BugLink: https://bugs.launchpad.net/bugs/1824333 Signed-off-by: Stefan Bader Acked-by: Connor Kuehl Acked-By: You-Sheng Yang --- debian.master/control.d/generic.inclusion-list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list index 96cb2830eba4..e5b770975186 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -178,7 +178,7 @@ drivers/xen/* ! find sound/core -name oss -prune -o -name *.ko -print fs/9p/* fs/aufs/aufs.ko -fs/autofs4/autofs4.ko +fs/autofs/autofs4.ko fs/binfmt_misc.ko fs/btrfs/* fs/cachefiles/cachefiles.ko