[skip ci] Merge branch 'v5.7.x'

2020-07-12 21:43:44 +02:00 · 2020-07-12 21:43:44 +02:00 · 37573b3001
commit 37573b3001
parent dbb6f95cba dcf418425f
20 changed files with 24115 additions and 277717 deletions
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -22,7 +22,7 @@ jobs:
      with:
          submodules: recursive
    - name: Build Kernel
-      run: PATH="/usr/lib/ccache:${PATH}" make
+      run: make
      env:
          PVE_BUILD_TYPE: ${{ matrix.build_type }}
          PVE_BUILD_CC: ${{ matrix.build_cc }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -25,7 +25,7 @@ jobs:
      with:
          submodules: recursive
    - name: Build Kernel
-      run: PATH="/usr/lib/ccache:${PATH}" make
+      run: make
      env:
          PVE_BUILD_TYPE: ${{ matrix.build_type }}
          PVE_BUILD_CC: ${{ matrix.build_cc }}
--- a/.gitmodules
+++ b/.gitmodules
@ -2,6 +2,6 @@
 	path = submodules/zfsonlinux
 	url = git://git.proxmox.com/git/zfsonlinux.git

-[submodule "submodules/linux-stable"]
-	path = submodules/linux-stable
-	url = git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+[submodule "submodules/ubuntu-mainline"]
+	path = submodules/ubuntu-mainline
+	url = git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
--- a/5
+++ b/5
@ -1,7 +1,7 @@
 # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
 KERNEL_MAJ=5
 KERNEL_MIN=7
-KERNEL_PATCHLEVEL=2
+KERNEL_PATCHLEVEL=8
 # increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
 KREL=1
@ -47,7 +47,7 @@ SKIPABI=0

 BUILD_DIR=build

-KERNEL_SRC=linux-stable
+KERNEL_SRC=ubuntu-mainline
 KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org

@ -110,7 +110,6 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE}
 	rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@
 	mkdir -p ${BUILD_DIR}
 	cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC}
-	set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/ubuntu/*.patch; do echo "applying Ubuntu patch '$$patch'" && patch -p1 < $${patch}; done
 # TODO: split for archs, track and diff in our repository?
 	cat ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
 	cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config
--- a/abi-prev-5.4.30-1-pve
+++ b/abi-prev-5.4.30-1-pve
--- a/abi-prev-5.4.44-2-pve
+++ b/abi-prev-5.4.44-2-pve
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,14 @@
+pve-edge-kernel (5.7.8-1) edge; urgency=medium
+
+  * update to Linux 5.7.8 based on Ubuntu 5.7.0-15.16
+
+ -- Fabian Mastenbroek <mail.fabianm@gmail.com>  Fri, 10 Jul 2020 15:39:00 +0200
+
+pve-edge-kernel (5.7.7-1) edge; urgency=medium
+
+  * update to Linux 5.7.7 based on Ubuntu 5.7.0-14.15
+
+ -- Fabian Mastenbroek <mail.fabianm@gmail.com>  Tue, 7 Jul 2020 16:02:00 +0200

 pve-edge-kernel (5.7.2-1) edge; urgency=medium

@ -23,6 +34,12 @@ pve-edge-kernel (5.7.0-0rc6) edge; urgency=medium

 -- Fabian Mastenbroek <mail.fabianm@gmail.com>  Sun, 24 May 2020 22:17:13 +0200

+pve-edge-kernel (5.6.19-1) edge; urgency=medium
+
+  * update to Linux 5.6.19-1 based on Ubuntu 5.7.0-10.11.
+
+ -- Fabian Mastenbroek <mail.fabianm@gmail.com>  Tue, 7 Jul 2020 14:33:31 +0200
+
 pve-edge-kernel (5.6.14-1) edge; urgency=medium

  * update to Linux 5.6.14-1 based on Ubuntu 5.6.0-7.7
--- a/debian/control.in
+++ b/debian/control.in
@ -32,6 +32,7 @@ Build-Depends: asciidoc-base,
               tar,
               xmlto,
               zlib1g-dev,
+               dwarves
 Build-Conflicts: pve-edge-headers-@KVNAME@,
 Vcs-Git: git://github.com/fabianishere/pve-edge-kernel.git
 Vcs-Browser: https://github.com/fabianishere/pve-edge-kernel
@ -69,3 +70,15 @@ Depends: busybox,
 Recommends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64,
 Description: The Proxmox PVE Kernel Image
 This package contains the linux kernel and initial ramdisk used for booting
+
+Package: pve-kernel-libc-dev
+Section: devel
+Priority: optional
+Architecture: any
+Provides: linux-libc-dev,
+Conflicts: linux-libc-dev,
+Replaces: linux-libc-dev,
+Depends: ${misc:Depends}
+Description: Linux support headers for userspace development
+ This package provides userspaces headers from the Linux kernel.  These headers
+ are used by the installed headers for GNU libc and other system libraries.
--- a/debian/rules
+++ b/debian/rules
@ -15,6 +15,7 @@ CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)

 PVE_KERNEL_PKG=pve-edge-kernel-${KVNAME}
 PVE_HEADER_PKG=pve-edge-headers-${KVNAME}
+PVE_USR_HEADER_PKG=pve-kernel-libc-dev
 LINUX_TOOLS_PKG=linux-tools-${KERNEL_MAJMIN}
 KERNEL_SRC_COPY=${KERNEL_SRC}_tmp

@ -35,6 +36,7 @@ PVE_CONFIG_OPTS= \
 -m CONFIG_JFS_FS \
 -m CONFIG_HFS_FS \
 -m CONFIG_HFSPLUS_FS \
+-e CIFS_SMB_DIRECT \
 -e CONFIG_BRIDGE \
 -e CONFIG_BRIDGE_NETFILTER \
 -e CONFIG_BLK_DEV_SD \
@ -49,6 +51,21 @@ PVE_CONFIG_OPTS= \
 -d CONFIG_MEMCG_DISABLED \
 -e CONFIG_MEMCG_SWAP_ENABLED \
 -e CONFIG_HYPERV \
+-m CONFIG_VFIO_IOMMU_TYPE1 \
+-m CONFIG_VFIO_VIRQFD \
+-m CONFIG_VFIO \
+-m CONFIG_VFIO_PCI \
+-m CONFIG_USB_XHCI_HCD \
+-m CONFIG_USB_XHCI_PCI \
+-m CONFIG_USB_EHCI_HCD \
+-m CONFIG_USB_EHCI_PCI \
+-m CONFIG_USB_EHCI_HCD_PLATFORM \
+-m CONFIG_USB_OHCI_HCD \
+-m CONFIG_USB_OHCI_HCD_PCI \
+-m CONFIG_USB_OHCI_HCD_PLATFORM \
+-d CONFIG_USB_OHCI_HCD_SSB \
+-m CONFIG_USB_UHCI_HCD \
+-d CONFIG_USB_SL811_HCD_ISO \
 -e CONFIG_MEMCG_KMEM \
 -d CONFIG_DEFAULT_CFQ \
 -e CONFIG_DEFAULT_DEADLINE \
@ -59,6 +76,9 @@ PVE_CONFIG_OPTS= \
 -d CONFIG_UNWINDER_ORC \
 -d CONFIG_UNWINDER_GUESS \
 -e CONFIG_UNWINDER_FRAME_POINTER \
+-d CONFIG_SECURITY_LOCKDOWN_LSM \
+-d CONFIG_SECURITY_LOCKDOWN_LSM_EARLY \
+--set-str CONFIG_LSM yama,integrity,apparmor \
 -e CONFIG_PAGE_TABLE_ISOLATION

 debian/control: $(wildcard debian/*.in)
@ -74,7 +94,7 @@ debian/control: $(wildcard debian/*.in)

 build: .compile_mark .tools_compile_mark .modules_compile_mark

-install: .install_mark .tools_install_mark .headers_install_mark
+install: .install_mark .tools_install_mark .headers_install_mark .usr_headers_install_mark
 	dh_installdocs -A debian/copyright debian/SOURCE
 	dh_installchangelogs
 	dh_installman
@ -84,7 +104,7 @@ install: .install_mark .tools_install_mark .headers_install_mark

 binary: install
 	debian/rules fwcheck abicheck
-	dh_strip -N${PVE_HEADER_PKG}
+	dh_strip -N${PVE_HEADER_PKG} -N${PVE_USR_HEADER_PKG}
 	dh_makeshlibs
 	dh_shlibdeps
 	dh_installdeb
@ -194,6 +214,23 @@ binary: install
 	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
 	touch $@

+.usr_headers_install_mark: PKG_DIR = debian/${PVE_USR_HEADER_PKG}
+.usr_headers_install_mark: OUT_DIR = ${PKG_DIR}/usr
+.usr_headers_install_mark: .config_mark
+	rm -rf '${PKG_DIR}'
+	mkdir -p  '${PKG_DIR}'
+	$(MAKE) -C ${KERNEL_SRC} headers_check ARCH=$(KERNEL_HEADER_ARCH)
+	$(MAKE) -C ${KERNEL_SRC} headers_install ARCH=$(KERNEL_HEADER_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
+	rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
+	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
+
+# Move include/asm to arch-specific directory
+	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
+	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	test ! -d $(OUT_DIR)/include/arch || \
+		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	touch $@
+
 .modules_compile_mark: ${MODULES}/zfs.ko
 	touch $@

--- a/4
+++ b/4
@ -14,8 +14,6 @@ advansys/mcode.bin kernel/drivers/scsi/advansys.ko
 agere_ap_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
 agere_sta_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
 aic94xx-seq.fw kernel/drivers/scsi/aic94xx/aic94xx.ko
-amdgpu/arcturus_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/arcturus_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/banks_k_2_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/bonaire_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/bonaire_k_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@ -110,8 +108,6 @@ amdgpu/navi10_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/navi10_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/navi10_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/navi10_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/navi12_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/navi12_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/navi14_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/navi14_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/navi14_ce_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
--- a/patches/pve/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
+++ b/patches/pve/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
-index 8129b6b27c93..49987441862e 100644
+index 72f51275247e..597fe6f70d97 100644
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
@@ -103,7 +103,7 @@ module_param(enable_apicv, bool, S_IRUGO);
--- a/patches/pve/0006-Revert-scsi-lpfc-Fix-broken-Credit-Recovery-after-dr.patch
+++ b/patches/pve/0006-Revert-scsi-lpfc-Fix-broken-Credit-Recovery-after-dr.patch
@ -0,0 +1,129 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Fri, 15 May 2020 14:43:37 +0200
+Subject: [PATCH] Revert "scsi: lpfc: Fix broken Credit Recovery after driver
+ load"
+
+This reverts commit 77d5805eafdb5c42bdfe78f058ad9c40ee1278b4.
+We got some reports that this causes some lpfcs to report FLOGI
+errors[0][1] and while the real fix is naturally something else, it
+is nonexistent for now, so workaround with this revert.
+
+[0]: https://forum.proxmox.com/threads/proxmox-6-2-lpfc-error-port-type-wrong.69680/#post-312491
+[1]: https://lore.kernel.org/linux-scsi/20200512212855.36q2ut2io2cdtagn@zeha.at/
+---
+ drivers/scsi/lpfc/lpfc.h         |  1 -
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 59 +++++++++++---------------------
+ 2 files changed, 20 insertions(+), 40 deletions(-)
+
+diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
+index 357fdec06bae..cd5525f28556 100644
+--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
+@@ -748,7 +748,6 @@ struct lpfc_hba {
+ 					 * capability
+ 					 */
+ #define HBA_FLOGI_ISSUED	0x100000 /* FLOGI was issued */
+-#define HBA_DEFER_FLOGI		0x800000 /* Defer FLOGI till read_sparm cmpl */
+ 
+ 	uint32_t fcp_ring_in_use; /* When polling test if intr-hndlr active*/
+ 	struct lpfc_dmabuf slim2p;
+diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
+index 789eecbf32eb..95566e382b48 100644
+--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
+@@ -1163,16 +1163,13 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+ 	}
+ 
+ 	/* Start discovery by sending a FLOGI. port_state is identically
+-	 * LPFC_FLOGI while waiting for FLOGI cmpl. Check if sending
+-	 * the FLOGI is being deferred till after MBX_READ_SPARAM completes.
+	 * LPFC_FLOGI while waiting for FLOGI cmpl
+ 	 */
+-	if (vport->port_state != LPFC_FLOGI) {
+-		if (!(phba->hba_flag & HBA_DEFER_FLOGI))
+-			lpfc_initial_flogi(vport);
+-	} else {
+-		if (vport->fc_flag & FC_PT2PT)
+-			lpfc_disc_start(vport);
+-	}
+	if (vport->port_state != LPFC_FLOGI)
+		lpfc_initial_flogi(vport);
+	else if (vport->fc_flag & FC_PT2PT)
+		lpfc_disc_start(vport);
+
+ 	return;
+ 
+ out:
+@@ -3097,14 +3094,6 @@ lpfc_mbx_cmpl_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+ 	lpfc_mbuf_free(phba, mp->virt, mp->phys);
+ 	kfree(mp);
+ 	mempool_free(pmb, phba->mbox_mem_pool);
+-
+-	/* Check if sending the FLOGI is being deferred to after we get
+-	 * up to date CSPs from MBX_READ_SPARAM.
+-	 */
+-	if (phba->hba_flag & HBA_DEFER_FLOGI) {
+-		lpfc_initial_flogi(vport);
+-		phba->hba_flag &= ~HBA_DEFER_FLOGI;
+-	}
+ 	return;
+ 
+ out:
+@@ -3235,23 +3224,6 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
+ 	}
+ 
+ 	lpfc_linkup(phba);
+-	sparam_mbox = NULL;
+-
+-	if (!(phba->hba_flag & HBA_FCOE_MODE)) {
+-		cfglink_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+-		if (!cfglink_mbox)
+-			goto out;
+-		vport->port_state = LPFC_LOCAL_CFG_LINK;
+-		lpfc_config_link(phba, cfglink_mbox);
+-		cfglink_mbox->vport = vport;
+-		cfglink_mbox->mbox_cmpl = lpfc_mbx_cmpl_local_config_link;
+-		rc = lpfc_sli_issue_mbox(phba, cfglink_mbox, MBX_NOWAIT);
+-		if (rc == MBX_NOT_FINISHED) {
+-			mempool_free(cfglink_mbox, phba->mbox_mem_pool);
+-			goto out;
+-		}
+-	}
+-
+ 	sparam_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+ 	if (!sparam_mbox)
+ 		goto out;
+@@ -3272,7 +3244,20 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
+ 		goto out;
+ 	}
+ 
+-	if (phba->hba_flag & HBA_FCOE_MODE) {
+	if (!(phba->hba_flag & HBA_FCOE_MODE)) {
+		cfglink_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+		if (!cfglink_mbox)
+			goto out;
+		vport->port_state = LPFC_LOCAL_CFG_LINK;
+		lpfc_config_link(phba, cfglink_mbox);
+		cfglink_mbox->vport = vport;
+		cfglink_mbox->mbox_cmpl = lpfc_mbx_cmpl_local_config_link;
+		rc = lpfc_sli_issue_mbox(phba, cfglink_mbox, MBX_NOWAIT);
+		if (rc == MBX_NOT_FINISHED) {
+			mempool_free(cfglink_mbox, phba->mbox_mem_pool);
+			goto out;
+		}
+	} else {
+ 		vport->port_state = LPFC_VPORT_UNKNOWN;
+ 		/*
+ 		 * Add the driver's default FCF record at FCF index 0 now. This
+@@ -3329,10 +3314,6 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
+ 		}
+ 		/* Reset FCF roundrobin bmask for new discovery */
+ 		lpfc_sli4_clear_fcf_rr_bmask(phba);
+-	} else {
+-		if (phba->bbcredit_support && phba->cfg_enable_bbcr &&
+-		    !(phba->link_flag & LS_LOOPBACK_MODE))
+-			phba->hba_flag |= HBA_DEFER_FLOGI;
+ 	}
+ 
+ 	/* Prepare for LINK up registrations */
--- a/patches/pve/0007-cgroup-fix-cgroup_sk_alloc-for-sk_clone_lock.patch
+++ b/patches/pve/0007-cgroup-fix-cgroup_sk_alloc-for-sk_clone_lock.patch
@ -0,0 +1,113 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cong Wang <xiyou.wangcong@gmail.com>
+Date: Tue, 16 Jun 2020 11:03:52 -0700
+Subject: [PATCH] cgroup: fix cgroup_sk_alloc() for sk_clone_lock()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When we clone a socket in sk_clone_lock(), its sk_cgrp_data is
+copied, so the cgroup refcnt must be taken too. And, unlike the
+sk_alloc() path, sock_update_netprioidx() is not called here.
+Therefore, it is safe and necessary to grab the cgroup refcnt
+even when cgroup_sk_alloc is disabled.
+
+sk_clone_lock() is in BH context anyway, the in_interrupt()
+would terminate this function if called there. And for sk_alloc()
+skcd->val is always zero. So it's safe to factor out the code
+to make it more readable.
+
+Fixes: 090e28b229af92dc5b ("netprio_cgroup: Fix unlimited memory leak of v2 cgroups")
+Reported-by: Cameron Berkenpas <cam@neo-zeon.de>
+Reported-by: Peter Geis <pgwipeout@gmail.com>
+Reported-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
+Reported-by: Daniël Sonck <dsonck92@gmail.com>
+Tested-by: Cameron Berkenpas <cam@neo-zeon.de>
+Cc: Daniel Borkmann <daniel@iogearbox.net>
+Cc: Zefan Li <lizefan@huawei.com>
+Cc: Tejun Heo <tj@kernel.org>
+Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ include/linux/cgroup.h |  2 ++
+ kernel/cgroup/cgroup.c | 26 ++++++++++++++------------
+ net/core/sock.c        |  2 +-
+ 3 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
+index 57577075d204..14452a801d95 100644
+--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
+@@ -822,6 +822,7 @@ extern spinlock_t cgroup_sk_update_lock;
+ 
+ void cgroup_sk_alloc_disable(void);
+ void cgroup_sk_alloc(struct sock_cgroup_data *skcd);
+void cgroup_sk_clone(struct sock_cgroup_data *skcd);
+ void cgroup_sk_free(struct sock_cgroup_data *skcd);
+ 
+ static inline struct cgroup *sock_cgroup_ptr(struct sock_cgroup_data *skcd)
+@@ -847,6 +848,7 @@ static inline struct cgroup *sock_cgroup_ptr(struct sock_cgroup_data *skcd)
+ #else	/* CONFIG_CGROUP_DATA */
+ 
+ static inline void cgroup_sk_alloc(struct sock_cgroup_data *skcd) {}
+static inline void cgroup_sk_clone(struct sock_cgroup_data *skcd) {}
+ static inline void cgroup_sk_free(struct sock_cgroup_data *skcd) {}
+ 
+ #endif	/* CONFIG_CGROUP_DATA */
+diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
+index 7c9e97553a00..d56ee72f4a07 100644
+--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
+@@ -6382,18 +6382,6 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd)
+ 	if (cgroup_sk_alloc_disabled)
+ 		return;
+ 
+-	/* Socket clone path */
+-	if (skcd->val) {
+-		/*
+-		 * We might be cloning a socket which is left in an empty
+-		 * cgroup and the cgroup might have already been rmdir'd.
+-		 * Don't use cgroup_get_live().
+-		 */
+-		cgroup_get(sock_cgroup_ptr(skcd));
+-		cgroup_bpf_get(sock_cgroup_ptr(skcd));
+-		return;
+-	}
+-
+ 	/* Don't associate the sock with unrelated interrupted task's cgroup. */
+ 	if (in_interrupt())
+ 		return;
+@@ -6415,6 +6403,20 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd)
+ 	rcu_read_unlock();
+ }
+ 
+void cgroup_sk_clone(struct sock_cgroup_data *skcd)
+{
+	/* Socket clone path */
+	if (skcd->val) {
+		/*
+		 * We might be cloning a socket which is left in an empty
+		 * cgroup and the cgroup might have already been rmdir'd.
+		 * Don't use cgroup_get_live().
+		 */
+		cgroup_get(sock_cgroup_ptr(skcd));
+		cgroup_bpf_get(sock_cgroup_ptr(skcd));
+	}
+}
+
+ void cgroup_sk_free(struct sock_cgroup_data *skcd)
+ {
+ 	struct cgroup *cgrp = sock_cgroup_ptr(skcd);
+diff --git a/net/core/sock.c b/net/core/sock.c
+index 0adf7a9e5a90..6ef468767ab0 100644
+--- a/net/core/sock.c
+++ b/net/core/sock.c
+@@ -1836,7 +1836,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
+ 		/* sk->sk_memcg will be populated at accept() time */
+ 		newsk->sk_memcg = NULL;
+ 
+-		cgroup_sk_alloc(&newsk->sk_cgrp_data);
+		cgroup_sk_clone(&newsk->sk_cgrp_data);
+ 
+ 		rcu_read_lock();
+ 		filter = rcu_dereference(sk->sk_filter);
--- a/patches/ubuntu/0001-base-packaging.patch
+++ b/patches/ubuntu/0001-base-packaging.patch
--- a/patches/ubuntu/0002-UBUNTU-SAUCE-add-vmlinux.strip-to-BOOT_TARGETS1-on-p.patch
+++ b/patches/ubuntu/0002-UBUNTU-SAUCE-add-vmlinux.strip-to-BOOT_TARGETS1-on-p.patch
@ -1,27 +0,0 @@
-From 78b9612c962dba89e0ee304f45e5b2a020c4eae3 Mon Sep 17 00:00:00 2001
-From: Andy Whitcroft <apw@canonical.com>
-Date: Fri, 9 Sep 2016 14:02:29 +0100
-Subject: [PATCH 2/5] UBUNTU: SAUCE: add vmlinux.strip to BOOT_TARGETS1 on
- powerpc
-
-Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
- arch/powerpc/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index f310c32e88a4..a028b3b3ef56 100644
--- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -283,7 +283,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
- all: zImage
- 
- # With make 3.82 we cannot mix normal and wildcard targets
-BOOT_TARGETS1 := zImage zImage.initrd uImage
-+BOOT_TARGETS1 := zImage zImage.initrd uImage vmlinux.strip
- BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.% uImage.%
- 
- PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)
-- 
-2.17.1
-
--- a/patches/ubuntu/0003-UBUNTU-SAUCE-tools-hv-lsvmbus-add-manual-page.patch
+++ b/patches/ubuntu/0003-UBUNTU-SAUCE-tools-hv-lsvmbus-add-manual-page.patch
@ -1,48 +0,0 @@
-From 87f5bfcfe236761b19a7d1886d345785d4a8b45b Mon Sep 17 00:00:00 2001
-From: Andy Whitcroft <apw@canonical.com>
-Date: Fri, 27 May 2016 13:52:22 +0100
-Subject: [PATCH 3/5] UBUNTU: SAUCE: tools/hv/lsvmbus -- add manual page
-
-BugLink: http://bugs.launchpad.net/bugs/1585311
-
-Signed-off-by: Andy Whitcroft <apw@canonical.com>
-Acked-by: Tim Gardner <tim.gardner@canonical.com>
-Acked-by: Brad Figg <brad.figg@canonical.com>
-Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
- tools/hv/lsvmbus.8 | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100644 tools/hv/lsvmbus.8
-
-diff --git a/tools/hv/lsvmbus.8 b/tools/hv/lsvmbus.8
-new file mode 100644
-index 000000000000..ba07d664950e
--- /dev/null
-+++ b/tools/hv/lsvmbus.8
-@@ -0,0 +1,23 @@
-+.\"  This page Copyright (C) 2016 Andy Whitcroft <apw@canonical.com>
-+.\"  Distributed under the GPL v2 or later.
-+.TH LSVMBUS 8
-+.SH NAME
-+lsvmbus \- List Hyper-V VMBus devices
-+.SH SYNOPSIS
-+.ft B
-+.B lsvmbus [-vv]
-+.br
-+.SH DESCRIPTION
-+\fBlsvmbus\fP
-+displays devices attached to the Hyper-V VMBus.
-+.SH OPTIONS
-+.\"
-+.TP
-+.B -v
-+With -v more information is printed including the VMBus Rel_ID, class ID,
-+Rel_ID, and which channel is bound to which virtual processor.  Use -vv
-+for additional detail including the Device_ID and the sysfs path.
-+.\"
-+.SH AUTHORS
-+.nf
-+Written by Dexuan Cui <decui@microsoft.com>
-- 
-2.17.1
-
--- a/patches/ubuntu/0004-debian-changelog.patch
+++ b/patches/ubuntu/0004-debian-changelog.patch
--- a/patches/ubuntu/0005-configs-based-on-Ubuntu-5.7.0-6.7.patch
+++ b/patches/ubuntu/0005-configs-based-on-Ubuntu-5.7.0-6.7.patch
@ -1,297 +0,0 @@
-From c3bc0f62079428513e0fbdad1aefe029f769b603 Mon Sep 17 00:00:00 2001
-From: "Kernel Builder (sita)" <ubuntu-kernel-bot@canonical.com>
-Date: Sun, 7 Jun 2020 12:31:27 +0000
-Subject: [PATCH 5/5] configs (based on Ubuntu-5.7.0-6.7)
-
---
- .../config/amd64/config.common.amd64          |  1 -
- .../config/amd64/config.flavour.generic       |  1 -
- .../config/amd64/config.flavour.lowlatency    |  1 -
- .../config/arm64/config.common.arm64          |  4 +-
- .../config/armhf/config.common.armhf          |  2 -
- debian.master/config/config.common.ubuntu     | 37 +------------------
- debian.master/config/i386/config.common.i386  |  1 -
- .../config/i386/config.flavour.generic        |  1 -
- .../config/i386/config.flavour.lowlatency     |  1 -
- .../config/ppc64el/config.common.ppc64el      |  2 -
- .../config/s390x/config.common.s390x          |  1 -
- 11 files changed, 3 insertions(+), 49 deletions(-)
-
-diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
-index 11d4bde9d612..2a209f34db83 100644
--- a/debian.master/config/amd64/config.common.amd64
-+++ b/debian.master/config/amd64/config.common.amd64
-@@ -185,7 +185,6 @@ CONFIG_HFSPLUS_FS=m
- CONFIG_HFS_FS=m
- CONFIG_HIBERNATION=y
- CONFIG_HID=m
-CONFIG_HIO=m
- CONFIG_HMC6352=m
- CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_SHPC=y
-diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
-index d1662374ea94..5938d9ba3f6c 100644
--- a/debian.master/config/amd64/config.flavour.generic
-+++ b/debian.master/config/amd64/config.flavour.generic
-@@ -4,7 +4,6 @@
- CONFIG_HZ=250
- # CONFIG_HZ_1000 is not set
- CONFIG_HZ_250=y
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
- # CONFIG_LATENCYTOP is not set
- # CONFIG_PREEMPT is not set
- CONFIG_PREEMPT_VOLUNTARY=y
-diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
-index 814348dc984b..42de09fb0bff 100644
--- a/debian.master/config/amd64/config.flavour.lowlatency
-+++ b/debian.master/config/amd64/config.flavour.lowlatency
-@@ -4,7 +4,6 @@
- CONFIG_HZ=1000
- CONFIG_HZ_1000=y
- # CONFIG_HZ_250 is not set
-CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
- CONFIG_LATENCYTOP=y
- CONFIG_PREEMPT=y
- # CONFIG_PREEMPT_VOLUNTARY is not set
-diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
-index 8a04a5dea27c..b09ed523e18d 100644
--- a/debian.master/config/arm64/config.common.arm64
-+++ b/debian.master/config/arm64/config.common.arm64
-@@ -166,7 +166,7 @@ CONFIG_FEALNX=m
- CONFIG_FIREWIRE=m
- CONFIG_FIREWIRE_NOSY=m
- CONFIG_FIXED_PHY=y
-CONFIG_FORCE_MAX_ZONEORDER=13
-+CONFIG_FORCE_MAX_ZONEORDER=11
- CONFIG_FPGA_BRIDGE=m
- CONFIG_FPGA_DFL=m
- CONFIG_FRAME_WARN=1024
-@@ -197,7 +197,6 @@ CONFIG_HFSPLUS_FS=m
- CONFIG_HFS_FS=m
- # CONFIG_HIBERNATION is not set
- CONFIG_HID=m
-# CONFIG_HIO is not set
- CONFIG_HMC6352=m
- CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_SHPC=y
-@@ -287,7 +286,6 @@ CONFIG_IPMI_HANDLER=m
- # CONFIG_IPMMU_VMSA is not set
- # CONFIG_IP_DCCP_CCID3 is not set
- CONFIG_IRQ_BYPASS_MANAGER=y
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
- CONFIG_ISL29003=m
- CONFIG_ISL29020=m
- CONFIG_JFS_FS=m
-diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
-index b6521d7ec3ba..413dbe0d70ad 100644
--- a/debian.master/config/armhf/config.common.armhf
-+++ b/debian.master/config/armhf/config.common.armhf
-@@ -186,7 +186,6 @@ CONFIG_HFSPLUS_FS=m
- CONFIG_HFS_FS=m
- CONFIG_HIBERNATION=y
- CONFIG_HID=m
-# CONFIG_HIO is not set
- CONFIG_HMC6352=m
- # CONFIG_HOTPLUG_PCI is not set
- CONFIG_HPFS_FS=m
-@@ -272,7 +271,6 @@ CONFIG_IPMI_HANDLER=m
- CONFIG_IPMMU_VMSA=y
- # CONFIG_IP_DCCP_CCID3 is not set
- CONFIG_IRQ_BYPASS_MANAGER=m
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
- CONFIG_ISL29003=m
- CONFIG_ISL29020=m
- CONFIG_JFS_FS=m
-diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
-index a274792c072a..12410e033315 100644
--- a/debian.master/config/config.common.ubuntu
-+++ b/debian.master/config/config.common.ubuntu
-@@ -283,10 +283,7 @@ CONFIG_AMD_XGBE_DCB=y
- CONFIG_AMD_XGBE_HAVE_ECC=y
- CONFIG_AMILO_RFKILL=m
- CONFIG_AMLOGIC_THERMAL=m
-CONFIG_ANDROID_BINDERFS=m
-CONFIG_ANDROID_BINDER_DEVICES=""
-CONFIG_ANDROID_BINDER_IPC=m
-# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
-+# CONFIG_ANDROID_BINDER_IPC is not set
- CONFIG_APB_TIMER=y
- CONFIG_APDS9300=m
- CONFIG_APDS9960=m
-@@ -773,7 +770,7 @@ CONFIG_ARM_TI_CPUFREQ=y
- CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
- CONFIG_ARM_VIRT_EXT=y
- CONFIG_AS3935=m
-CONFIG_ASHMEM=m
-+# CONFIG_ASHMEM is not set
- CONFIG_ASN1=y
- CONFIG_ASPEED_ADC=m
- CONFIG_ASPEED_BT_IPMI_BMC=m
-@@ -909,25 +906,6 @@ CONFIG_AUDIT_ARCH=y
- CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
- CONFIG_AUDIT_COMPAT_GENERIC=y
- CONFIG_AUDIT_GENERIC=y
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BR_HFSPLUS=y
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_DEBUG is not set
-CONFIG_AUFS_DIRREN=y
-CONFIG_AUFS_EXPORT=y
-# CONFIG_AUFS_FHSM is not set
-CONFIG_AUFS_FS=m
-# CONFIG_AUFS_HNOTIFY is not set
-CONFIG_AUFS_INO_T_64=y
-# CONFIG_AUFS_RDU is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_SHWH is not set
-CONFIG_AUFS_XATTR=y
- CONFIG_AURORA_NB8800=m
- CONFIG_AUTO_ZRELADDR=y
- CONFIG_AX25=m
-@@ -2481,7 +2459,6 @@ CONFIG_DELL_SMBIOS=m
- CONFIG_DELL_SMBIOS_SMM=y
- CONFIG_DELL_SMBIOS_WMI=y
- CONFIG_DELL_SMO8800=m
-CONFIG_DELL_UART_BACKLIGHT=m
- CONFIG_DELL_WMI=m
- CONFIG_DELL_WMI_AIO=m
- CONFIG_DELL_WMI_DESCRIPTOR=m
-@@ -5187,7 +5164,6 @@ CONFIG_KGDB_KDB=y
- CONFIG_KGDB_LOW_LEVEL_TRAP=y
- CONFIG_KGDB_SERIAL_CONSOLE=y
- # CONFIG_KGDB_TESTS is not set
-CONFIG_KMSG_IDS=y
- CONFIG_KMX61=m
- CONFIG_KPC2000=y
- CONFIG_KPC2000_CORE=m
-@@ -5415,7 +5391,6 @@ CONFIG_LOCKDEP_SUPPORT=y
- CONFIG_LOCKD_V4=y
- CONFIG_LOCKUP_DETECTOR=y
- CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_DOWN_IN_SECURE_BOOT=y
- # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
- # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
- CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-@@ -8556,14 +8531,12 @@ CONFIG_RTLWIFI_USB=m
- CONFIG_RTL_CARDS=m
- CONFIG_RTS5208=m
- CONFIG_RTW88=m
-CONFIG_RTW88_8723DE=y
- CONFIG_RTW88_8822BE=y
- CONFIG_RTW88_8822CE=y
- CONFIG_RTW88_CORE=m
- # CONFIG_RTW88_DEBUG is not set
- # CONFIG_RTW88_DEBUGFS is not set
- CONFIG_RTW88_PCI=m
-# CONFIG_RTW88_REGD_USER_REG_HINTS is not set
- # CONFIG_RT_GROUP_SCHED is not set
- CONFIG_RT_MUTEXES=y
- CONFIG_RUNTIME_TESTING_MENU=y
-@@ -9156,8 +9129,6 @@ CONFIG_SGI_XP=m
- CONFIG_SGL_ALLOC=y
- CONFIG_SG_POOL=y
- CONFIG_SG_SPLIT=y
-CONFIG_SHIFT_FS=m
-CONFIG_SHIFT_FS_POSIX_ACL=y
- CONFIG_SHMEM=y
- CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
- CONFIG_SH_ETH=m
-@@ -9479,8 +9450,6 @@ CONFIG_SND_SOC_AMD_ACP=m
- CONFIG_SND_SOC_AMD_ACP3x=m
- CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
- CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-CONFIG_SND_SOC_AMD_RENOIR=m
-CONFIG_SND_SOC_AMD_RENOIR_MACH=m
- CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
- CONFIG_SND_SOC_APQ8016_SBC=m
- CONFIG_SND_SOC_ARIZONA=m
-@@ -11267,7 +11236,6 @@ CONFIG_VDPA_SIM=m
- CONFIG_VDSO=y
- CONFIG_VEML6030=m
- CONFIG_VEML6070=m
-CONFIG_VERSION_SIGNATURE=""
- CONFIG_VETH=m
- CONFIG_VEXPRESS_CONFIG=y
- CONFIG_VEXPRESS_SYSCFG=y
-@@ -11708,7 +11676,6 @@ CONFIG_WATCHDOG_RTAS=m
- CONFIG_WATCHDOG_SYSFS=y
- CONFIG_WCN36XX=m
- # CONFIG_WCN36XX_DEBUGFS is not set
-# CONFIG_WCN36XX_SNAPDRAGON_HACKS is not set
- CONFIG_WD80x3=m
- CONFIG_WDAT_WDT=m
- CONFIG_WDT=m
-diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
-index e62994cdf221..821f0a41d7cf 100644
--- a/debian.master/config/i386/config.common.i386
-+++ b/debian.master/config/i386/config.common.i386
-@@ -182,7 +182,6 @@ CONFIG_HFSPLUS_FS=m
- CONFIG_HFS_FS=m
- CONFIG_HIBERNATION=y
- CONFIG_HID=m
-CONFIG_HIO=m
- CONFIG_HMC6352=m
- CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_SHPC=y
-diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
-index 5c2e4e1d3a9f..965113b110ce 100644
--- a/debian.master/config/i386/config.flavour.generic
-+++ b/debian.master/config/i386/config.flavour.generic
-@@ -4,6 +4,5 @@
- CONFIG_HZ=250
- # CONFIG_HZ_1000 is not set
- CONFIG_HZ_250=y
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
- # CONFIG_PREEMPT is not set
- CONFIG_PREEMPT_VOLUNTARY=y
-diff --git a/debian.master/config/i386/config.flavour.lowlatency b/debian.master/config/i386/config.flavour.lowlatency
-index 6b121e3f433b..0af82e00adce 100644
--- a/debian.master/config/i386/config.flavour.lowlatency
-+++ b/debian.master/config/i386/config.flavour.lowlatency
-@@ -4,6 +4,5 @@
- CONFIG_HZ=1000
- CONFIG_HZ_1000=y
- # CONFIG_HZ_250 is not set
-CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
- CONFIG_PREEMPT=y
- # CONFIG_PREEMPT_VOLUNTARY is not set
-diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
-index 729f8e2647f3..fba24cc25001 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
-+++ b/debian.master/config/ppc64el/config.common.ppc64el
-@@ -184,7 +184,6 @@ CONFIG_HFSPLUS_FS=m
- CONFIG_HFS_FS=m
- # CONFIG_HIBERNATION is not set
- CONFIG_HID=m
-# CONFIG_HIO is not set
- CONFIG_HMC6352=m
- CONFIG_HOTPLUG_PCI=y
- # CONFIG_HOTPLUG_PCI_SHPC is not set
-@@ -270,7 +269,6 @@ CONFIG_IPACK_BUS=m
- CONFIG_IPMI_HANDLER=m
- # CONFIG_IP_DCCP_CCID3 is not set
- CONFIG_IRQ_BYPASS_MANAGER=y
-# CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
- CONFIG_ISL29003=m
- CONFIG_ISL29020=m
- CONFIG_JFS_FS=m
-diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
-index 4fdac229f6a9..5c58a16b5350 100644
--- a/debian.master/config/s390x/config.common.s390x
-+++ b/debian.master/config/s390x/config.common.s390x
-@@ -170,7 +170,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
- # CONFIG_HFSPLUS_FS is not set
- # CONFIG_HFS_FS is not set
- # CONFIG_HID is not set
-# CONFIG_HIO is not set
- # CONFIG_HMC6352 is not set
- CONFIG_HOTPLUG_PCI=y
- # CONFIG_HOTPLUG_PCI_SHPC is not set
-- 
-2.17.1
-
--- a/submodules/linux-stable
+++ b/submodules/linux-stable
@ -1 +0,0 @@
-Subproject commit c58091a3ea4c1fa8a71f38842c877fbd4c54b45d
--- a/submodules/ubuntu-mainline
+++ b/submodules/ubuntu-mainline
@ -0,0 +1 @@
+Subproject commit 108fd7bbcea20db4afa7b824b6603be1003ce006
				`@ -1 +0,0 @@`
				`Subproject commit c58091a3ea4c1fa8a71f38842c877fbd4c54b45d`
				`@ -0,0 +1 @@`
				`Subproject commit 108fd7bbcea20db4afa7b824b6603be1003ce006`