updating patches

2019-06-06 13:44:35 -04:00 · 2019-06-06 13:44:35 -04:00 · a4a9b7ca20
parent 1717e1ec14
commit a4a9b7ca20
38 changed files with 189 additions and 34540 deletions
--- a/configs/4.19/config
+++ b/configs/4.19/config
@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.27 Kernel Configuration
+# Linux/x86 4.19.48 Kernel Configuration
 #

 #
-# Compiler: gcc (Ubuntu 8.2.0-7ubuntu1) 8.2.0
+# Compiler: gcc (Ubuntu 8.3.0-6ubuntu1~18.10) 8.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80200
+CONFIG_GCC_VERSION=80300
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@ -4006,6 +4007,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set

@ -4091,7 +4093,6 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
-CONFIG_R3964=m
 CONFIG_APPLICOM=m

 #
@ -7733,7 +7734,6 @@ CONFIG_GREYBUS_USB=m
 # Gasket devices
 #
 # CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_EROFS_FS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
@ -7774,7 +7774,7 @@ CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_SURFACE_ACPI=m
 CONFIG_SURFACE_ACPI_SSH=y
-CONFIG_SURFACE_ACPI_SSH_DEBUG_DEVICE=n
+# CONFIG_SURFACE_ACPI_SSH_DEBUG_DEVICE is not set
 CONFIG_SURFACE_ACPI_SAN=y
 CONFIG_SURFACE_ACPI_VHF=y
 CONFIG_SURFACE_ACPI_DTX=y
@ -7823,6 +7823,7 @@ CONFIG_MLX_PLATFORM=m
 CONFIG_INTEL_TURBO_MAX_3=y
 # CONFIG_TOUCHSCREEN_DMI is not set
 # CONFIG_I2C_MULTI_INSTANTIATE is not set
+# CONFIG_INTEL_ATOMISP2_PM is not set
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
--- a/configs/5.1/config
+++ b/configs/5.1/config
@ -1,15 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.0.1 Kernel Configuration
+# Linux/x86 5.1.7 Kernel Configuration
 #

 #
-# Compiler: gcc (Ubuntu 8.2.0-7ubuntu1) 8.2.0
+# Compiler: gcc (Ubuntu 8.3.0-6ubuntu1~18.10) 8.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80200
+CONFIG_GCC_VERSION=80300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@ -198,6 +199,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
@ -586,6 +588,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_INTEL_IDLE=y

 #
@ -605,7 +608,6 @@ CONFIG_AMD_NB=y
 # Binary Emulations
 #
 CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
 CONFIG_X86_X32=y
 CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
@ -647,6 +649,7 @@ CONFIG_APPLE_PROPERTIES=y
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y

 #
 # Tegra firmware driver
@ -763,6 +766,7 @@ CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_ISA_BUS_API=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
@ -773,6 +777,7 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y

 #
 # GCOV-based kernel profiling
@ -965,6 +970,7 @@ CONFIG_SKB_EXTENSIONS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 # CONFIG_TLS_DEVICE is not set
@ -1105,7 +1111,7 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
@ -1131,6 +1137,7 @@ CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 # CONFIG_NF_TABLES_SET is not set
@ -1329,11 +1336,6 @@ CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
@ -1366,17 +1368,12 @@ CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=y
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@ -1888,8 +1885,7 @@ CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SOCK_MSG=y
-CONFIG_NET_DEVLINK=m
-CONFIG_MAY_USE_DEVLINK=m
+# CONFIG_NET_DEVLINK is not set
 CONFIG_PAGE_POOL=y
 CONFIG_FAILOVER=m
 CONFIG_HAVE_EBPF_JIT=y
@ -2024,7 +2020,6 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
-# CONFIG_DMA_CMA is not set

 #
 # Bus devices
@ -2158,8 +2153,8 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
 CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_MT81xx_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_SPI_MTK_QUADSPI is not set
 # CONFIG_SPI_INTEL_SPI_PCI is not set
 # CONFIG_SPI_INTEL_SPI_PLATFORM is not set
 CONFIG_MTD_UBI=m
@ -2321,6 +2316,7 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_INTEL_MEI_TXE=m
+# CONFIG_INTEL_MEI_HDCP is not set
 CONFIG_INTEL_IPTS=m
 CONFIG_VMWARE_VMCI=m

@ -2374,6 +2370,7 @@ CONFIG_ECHO=m
 # CONFIG_MISC_ALCOR_PCI is not set
 CONFIG_MISC_RTSX_PCI=m
 # CONFIG_MISC_RTSX_USB is not set
+# CONFIG_HABANA_AI is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set

@ -2526,10 +2523,6 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@ -2664,6 +2657,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+# CONFIG_DM_INIT is not set
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@ -2717,6 +2711,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
 CONFIG_IPVLAN=m
 CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
@ -3101,6 +3096,7 @@ CONFIG_DWC_XLGMAC_PCI=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
@ -3423,6 +3419,7 @@ CONFIG_MT7601U=m
 # CONFIG_MT76x0E is not set
 # CONFIG_MT76x2E is not set
 # CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@ -3911,6 +3908,7 @@ CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_ARIZONA_HAPTICS=m
 CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_E3X0_BUTTON=m
+# CONFIG_INPUT_MSM_VIBRATOR is not set
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8925_ONKEY=m
@ -4026,6 +4024,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set

@ -4099,6 +4098,7 @@ CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
@ -4112,7 +4112,6 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
-CONFIG_R3964=m
 CONFIG_APPLICOM=m

 #
@ -4267,6 +4266,7 @@ CONFIG_SPI_DW_PCI=m
 CONFIG_SPI_DW_MID_DMA=y
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DLN2=m
+# CONFIG_SPI_NXP_FLEXSPI is not set
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_OC_TINY=m
@ -4274,6 +4274,7 @@ CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPI_SC18IS602=m
+# CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_MXIC is not set
 CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
@ -4365,6 +4366,7 @@ CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_MENZ127=m
 CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_AMD_FCH is not set

 #
 # Port-mapped I/O GPIO drivers
@ -4962,6 +4964,7 @@ CONFIG_MFD_TWL4030_AUDIO=y
 CONFIG_TWL6040_CORE=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TQMX86 is not set
 CONFIG_MFD_VX855=m
 CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
@ -5080,6 +5083,7 @@ CONFIG_IR_SHARP_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_XMP_DECODER=m
 # CONFIG_IR_IMON_DECODER is not set
+# CONFIG_IR_RCMM_DECODER is not set
 CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
@ -5325,6 +5329,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_MXB=m
@ -5387,8 +5392,6 @@ CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_VIA_CAMERA=m
 # CONFIG_VIDEO_CADENCE is not set
 # CONFIG_VIDEO_ASPEED is not set
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 CONFIG_VIDEO_SH_VEU=m
@ -5533,7 +5536,6 @@ CONFIG_VIDEO_ADV7511=m
 CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9V011=m

 #
@ -5560,24 +5562,6 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 CONFIG_VIDEO_M52790=m

-#
-# Sensors used on soc_camera driver
-#
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-
 #
 # Media SPI Adapters
 #
@ -5816,6 +5800,10 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+
+#
+# ARM devices
+#
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
@ -5849,6 +5837,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU_SVM is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_ALPHA_SUPPORT=y
 CONFIG_DRM_I915_CAPTURE_ERROR=y
@ -5896,6 +5885,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_TINYDRM=m
 CONFIG_TINYDRM_MIPI_DBI=m
@ -6293,6 +6283,7 @@ CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
+# CONFIG_SND_SOC_FSL_MICFIL is not set
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_IMG=y
@ -6327,11 +6318,14 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 # CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set

 #
 # STMicroelectronics STM32 SOC audio support
 #
 # CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
 CONFIG_SND_SOC_XTFPGA_I2S=m
 CONFIG_ZX_TDM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
@ -6358,10 +6352,12 @@ CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_ALC5623=m
 # CONFIG_SND_SOC_BD28623 is not set
 CONFIG_SND_SOC_BT_SCO=m
+# CONFIG_SND_SOC_CROS_EC_CODEC is not set
 CONFIG_SND_SOC_CS35L32=m
 CONFIG_SND_SOC_CS35L33=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
+# CONFIG_SND_SOC_CS35L36 is not set
 CONFIG_SND_SOC_CS42L42=m
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
@ -6376,6 +6372,7 @@ CONFIG_SND_SOC_CS4271_SPI=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
 # CONFIG_SND_SOC_DMIC is not set
@ -6411,6 +6408,7 @@ CONFIG_SND_SOC_PCM3168A_SPI=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_PCM512x_SPI=m
+# CONFIG_SND_SOC_RK3328 is not set
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT5616=m
 CONFIG_SND_SOC_RT5631=m
@ -6466,6 +6464,7 @@ CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8804_SPI=m
 CONFIG_SND_SOC_WM8903=m
+# CONFIG_SND_SOC_WM8904 is not set
 CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
@ -6474,6 +6473,7 @@ CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_ZX_AUD96P22=m
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
 CONFIG_SND_SOC_NAU8540=m
 CONFIG_SND_SOC_NAU8810=m
 # CONFIG_SND_SOC_NAU8822 is not set
@ -6535,6 +6535,7 @@ CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
+# CONFIG_HID_VIEWSONIC is not set
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
@ -6552,6 +6553,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MALTRON is not set
 CONFIG_HID_MAYFLASH=m
 # CONFIG_HID_REDRAGON is not set
 CONFIG_HID_MICROSOFT=m
@ -6643,6 +6645,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@ -6660,6 +6663,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
@ -7158,6 +7162,13 @@ CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@ -7166,13 +7177,6 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_ISERT=m
 CONFIG_INFINIBAND_OPA_VNIC=m
-CONFIG_INFINIBAND_RDMAVT=m
-CONFIG_RDMA_RXE=m
-CONFIG_INFINIBAND_HFI1=m
-# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
-# CONFIG_SDMA_VERBOSITY is not set
-CONFIG_INFINIBAND_QEDR=m
-CONFIG_INFINIBAND_BNXT_RE=m
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
@ -7195,6 +7199,7 @@ CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_SKX=m
+# CONFIG_EDAC_I10NM is not set
 CONFIG_EDAC_PND2=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_MC146818_LIB=y
@ -7221,6 +7226,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_88PM860X=m
 CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABB5ZES3=m
+# CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_CENTURY=y
@ -7256,8 +7262,10 @@ CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
+# CONFIG_RTC_DRV_RV3028 is not set
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
+# CONFIG_RTC_DRV_SD3078 is not set

 #
 # SPI RTC drivers
@ -7374,10 +7382,14 @@ CONFIG_KS0108_DELAY=2
 CONFIG_CFAG12864B=m
 CONFIG_CFAG12864B_RATE=20
 CONFIG_IMG_ASCII_LCD=m
-CONFIG_PANEL=m
+CONFIG_PARPORT_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
 CONFIG_CHARLCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
@ -7621,9 +7633,6 @@ CONFIG_ADIS16240=m
 #
 # Analog to digital converters
 #
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
@ -7640,7 +7649,6 @@ CONFIG_ADT7316_I2C=m
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
-CONFIG_AD7152=m
 CONFIG_AD7746=m

 #
@ -7666,7 +7674,6 @@ CONFIG_ADE7854_SPI=m
 #
 CONFIG_AD2S1210=m
 CONFIG_FB_SM750=m
-CONFIG_FB_XGI=m

 #
 # Speakup console speech
@ -7685,8 +7692,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9T031=m
 CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
@ -7697,6 +7702,10 @@ CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_AVS6EYES=m
 # CONFIG_VIDEO_IPU3_IMGU is not set

+#
+# soc_camera sensor drivers
+#
+
 #
 # Android
 #
@ -7777,13 +7786,11 @@ CONFIG_GREYBUS_UART=m
 CONFIG_GREYBUS_USB=m
 # CONFIG_DRM_VBOXVIDEO is not set
 # CONFIG_PI433 is not set
-# CONFIG_MTK_MMC is not set

 #
 # Gasket devices
 #
 # CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_EROFS_FS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
@ -7827,7 +7834,7 @@ CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_SURFACE_ACPI=m
 CONFIG_SURFACE_ACPI_SSH=y
-CONFIG_SURFACE_ACPI_SSH_DEBUG_DEVICE=n
+# CONFIG_SURFACE_ACPI_SSH_DEBUG_DEVICE is not set
 CONFIG_SURFACE_ACPI_SAN=y
 CONFIG_SURFACE_ACPI_VHF=y
 CONFIG_SURFACE_ACPI_DTX=y
@ -7876,6 +7883,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
 # CONFIG_I2C_MULTI_INSTANTIATE is not set
 # CONFIG_INTEL_ATOMISP2_PM is not set
 # CONFIG_HUAWEI_WMI is not set
+# CONFIG_PCENGINES_APU2 is not set
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
@ -7887,6 +7895,7 @@ CONFIG_CROS_EC_LPC=m
 CONFIG_CROS_EC_LPC_MEC=y
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
+# CONFIG_WILCO_EC is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
@ -7916,6 +7925,7 @@ CONFIG_CLKBLD_I8253=y
 CONFIG_MAILBOX=y
 CONFIG_PCC=y
 CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y

@ -7924,7 +7934,6 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMU_IOVA=y
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_V2=m
 CONFIG_DMAR_TABLE=y
@ -7933,6 +7942,7 @@ CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y

 #
 # Remoteproc drivers
@ -8009,6 +8019,7 @@ CONFIG_EXTCON_MAX77693=m
 CONFIG_EXTCON_MAX77843=m
 CONFIG_EXTCON_MAX8997=m
 CONFIG_EXTCON_PALMAS=m
+# CONFIG_EXTCON_PTN5150 is not set
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
@ -8076,7 +8087,11 @@ CONFIG_AD7266=m
 CONFIG_AD7291=m
 CONFIG_AD7298=m
 CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
+# CONFIG_AD7768_1 is not set
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@ -8142,6 +8157,9 @@ CONFIG_ATLAS_PH_SENSOR=m
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
 CONFIG_IAQCORE=m
+# CONFIG_PMS7003 is not set
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SPS30 is not set
 CONFIG_VZ89X=m
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
@ -8201,6 +8219,7 @@ CONFIG_MCP4922=m
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
 # CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set

 #
 # IIO dummy driver
@ -8313,6 +8332,7 @@ CONFIG_SENSORS_LM3533=m
 CONFIG_LTR501=m
 # CONFIG_LV0104CS is not set
 CONFIG_MAX44000=m
+# CONFIG_MAX44009 is not set
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
 # CONFIG_SI1133 is not set
@ -8546,6 +8566,8 @@ CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y

 #
@ -8578,11 +8600,13 @@ CONFIG_PM_OPP=y
 CONFIG_UNISYS_VISORBUS=m
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set

 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@ -8590,8 +8614,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@ -8636,7 +8658,6 @@ CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
 # CONFIG_F2FS_IO_TRACE is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 CONFIG_FS_DAX=y
@ -8762,7 +8783,6 @@ CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS_SECURITY=y
 # CONFIG_UBIFS_FS_AUTHENTICATION is not set
 CONFIG_CRAMFS=m
@ -8813,9 +8833,6 @@ CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V2=m
@ -8856,6 +8873,7 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
@ -8966,7 +8984,6 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
 # CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
@ -8982,12 +8999,12 @@ CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 # CONFIG_SECURITY_APPARMOR_DEBUG is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@ -9025,7 +9042,7 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
+CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@ -9340,8 +9357,11 @@ CONFIG_HAS_DMA=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
+# CONFIG_DMA_CMA is not set
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_CHECK_SIGNATURE=y
@ -9381,6 +9401,7 @@ CONFIG_OBJAGG=m
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@ -9396,7 +9417,6 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_PAGE_OWNER is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
@ -9414,6 +9434,7 @@ CONFIG_DEBUG_KERNEL=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
@ -9566,7 +9587,6 @@ CONFIG_HIST_TRIGGERS=y
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@ -9592,6 +9612,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_PARMAN is not set
 CONFIG_TEST_LKM=m
+# CONFIG_TEST_VMALLOC is not set
 CONFIG_TEST_USER_COPY=m
 CONFIG_TEST_BPF=m
 # CONFIG_FIND_BIT_BENCHMARK is not set
@ -9601,7 +9622,9 @@ CONFIG_TEST_UDELAY=m
 CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
 CONFIG_MEMTEST=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
@ -9616,6 +9639,7 @@ CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
@ -9624,7 +9648,6 @@ CONFIG_EARLY_PRINTK_USB=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_EARLY_PRINTK_USB_XDBC is not set
 CONFIG_X86_PTDUMP_CORE=y
 # CONFIG_X86_PTDUMP is not set
--- a/patches/4.19/0001-surface-acpi.patch
+++ b/patches/4.19/0001-surface-acpi.patch
@ -1,6 +1,6 @@
-From c92cf7a3c3c798ea4f4e2b94e1b1b439bc590136 Mon Sep 17 00:00:00 2001
+From 10039747e796d3b91ce5d32ccaef5f61c0001abb Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:48:48 -0400
+Date: Thu, 6 Jun 2019 13:33:54 -0400
 Subject: [PATCH 01/12] surface-acpi

 ---
--- a/patches/4.19/0002-suspend.patch
+++ b/patches/4.19/0002-suspend.patch
@ -1,6 +1,6 @@
-From 0a0ec97aa74e28a9fdea0649bad95ba959172ded Mon Sep 17 00:00:00 2001
+From 6184c48acb21fac3f0100abb4954c6d1c838b1f0 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:48:59 -0400
+Date: Thu, 6 Jun 2019 13:34:08 -0400
 Subject: [PATCH 02/12] suspend

 ---
@ -65,7 +65,7 @@ index 7b9ef8e734e7..b0e3ae90f5b7 100644
 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 37d897bc4cf1..7587fbff6ea5 100644
+index 28c64f84bfe7..30c013926470 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
@@ -1332,6 +1332,10 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID,
--- a/patches/4.19/0003-buttons.patch
+++ b/patches/4.19/0003-buttons.patch
@ -1,6 +1,6 @@
-From 764ba5cae99743ada66637b4317eb0cefaca1145 Mon Sep 17 00:00:00 2001
+From 9b8c7a4d6c572a4c5745c329361479f01579f5e5 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:49:09 -0400
+Date: Thu, 6 Jun 2019 13:34:21 -0400
 Subject: [PATCH 03/12] buttons

 ---
--- a/patches/4.19/0004-cameras.patch
+++ b/patches/4.19/0004-cameras.patch
@ -1,6 +1,6 @@
-From e135879f02f66d62dcaffc9aca7a72c8daf6ce1e Mon Sep 17 00:00:00 2001
+From 82174bf56d6de5b1e3110451a8098a81a23aeee2 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:49:19 -0400
+Date: Thu, 6 Jun 2019 13:34:32 -0400
 Subject: [PATCH 04/12] cameras

 ---
--- a/patches/4.19/0005-ipts.patch
+++ b/patches/4.19/0005-ipts.patch
@ -1,6 +1,6 @@
-From 867c13ecf97ac50d5d4f9c7d87271ce0d47ad0d8 Mon Sep 17 00:00:00 2001
+From 63a1bd5157c965fdbd8ea5d873e2cdf0972e9e7b Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:49:33 -0400
+Date: Thu, 6 Jun 2019 13:34:44 -0400
 Subject: [PATCH 05/12] ipts

 ---
--- a/patches/4.19/0006-hid.patch
+++ b/patches/4.19/0006-hid.patch
@ -1,6 +1,6 @@
-From 1d1ba68b6186ed4ee456334335f1f2e4fed52d22 Mon Sep 17 00:00:00 2001
+From 5b2a1f69cb5cde820daefefd099ca3f2a5798e56 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:49:42 -0400
+Date: Thu, 6 Jun 2019 13:34:54 -0400
 Subject: [PATCH 06/12] hid

 ---
@ -125,7 +125,7 @@ index 831617c386e6..21337070068a 100644
 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
 		MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
-index 94088c0ed68a..391b882fd6e5 100644
+index e24790c988c0..70f75d60c8c9 100644
 --- a/drivers/hid/hid-quirks.c
 +++ b/drivers/hid/hid-quirks.c
@@ -112,6 +112,17 @@ static const struct hid_device_id hid_quirks[] = {
--- a/patches/4.19/0007-sdcard-reader.patch
+++ b/patches/4.19/0007-sdcard-reader.patch
@ -1,6 +1,6 @@
-From 3624ea2106d56ecb0b0413028e059576d35ae2e1 Mon Sep 17 00:00:00 2001
+From 1e11b04bcc92b87388927282f8801e0b6f14ec91 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:49:52 -0400
+Date: Thu, 6 Jun 2019 13:35:09 -0400
 Subject: [PATCH 07/12] sdcard-reader

 ---
@ -8,10 +8,10 @@ Subject: [PATCH 07/12] sdcard-reader
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 3adff4da2ee1..7980accfe9df 100644
+index eb24ec0e160d..8327ac3880c8 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -4160,7 +4160,8 @@ void usb_enable_lpm(struct usb_device *udev)
+@@ -4157,7 +4157,8 @@ void usb_enable_lpm(struct usb_device *udev)
 	if (!udev || !udev->parent ||
 			udev->speed < USB_SPEED_SUPER ||
 			!udev->lpm_capable ||
--- a/patches/4.19/0008-wifi.patch
+++ b/patches/4.19/0008-wifi.patch
@ -1,6 +1,6 @@
-From ba3a53fc48453d746fe492c7a068edab0f9fbf90 Mon Sep 17 00:00:00 2001
+From cf6e06464c190de8ed1fa0c42d0feb305c87a677 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:50:02 -0400
+Date: Thu, 6 Jun 2019 13:35:21 -0400
 Subject: [PATCH 08/12] wifi

 ---
@ -33,7 +33,7 @@ index 042a1d07f686..fc9041f58e9f 100644
 
 		skb_src = skb_dequeue(&pra_list->skb_head);
 diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-index 2d87ebbfa4da..8e95553a3344 100644
+index 47ec5293c045..435c346116a2 100644
 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
 +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -428,7 +428,10 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
--- a/patches/4.19/0009-surface3-power.patch
+++ b/patches/4.19/0009-surface3-power.patch
@ -1,6 +1,6 @@
-From 2de834be2c64eee61ec15bc91c87a67bd554ab72 Mon Sep 17 00:00:00 2001
+From d67736bea842f4b73d35b0c857c6046c2d7ab968 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:50:14 -0400
+Date: Thu, 6 Jun 2019 13:35:37 -0400
 Subject: [PATCH 09/12] surface3-power

 ---
--- a/patches/4.19/0010-surface-dock.patch
+++ b/patches/4.19/0010-surface-dock.patch
@ -1,6 +1,6 @@
-From 63653d197c3ea1c536fd95eebc7ff8c81cf974e8 Mon Sep 17 00:00:00 2001
+From cb9a440ae30c94e3cfab2a080c29d48da688d890 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:50:29 -0400
+Date: Thu, 6 Jun 2019 13:35:49 -0400
 Subject: [PATCH 10/12] surface-dock

 ---
--- a/patches/4.19/0011-mwlwifi.patch
+++ b/patches/4.19/0011-mwlwifi.patch
@ -1,6 +1,6 @@
-From 6f4922a7175ff9814c89f7d3e78eabf0e6500753 Mon Sep 17 00:00:00 2001
+From 2c987ce456bb32320347a791cbdc146f1a5258d2 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:50:47 -0400
+Date: Thu, 6 Jun 2019 13:36:02 -0400
 Subject: [PATCH 11/12] mwlwifi

 ---
--- a/patches/4.19/0012-surface-lte.patch
+++ b/patches/4.19/0012-surface-lte.patch
@ -1,6 +1,6 @@
-From 971c1032f810c0653470a4871fbdcdf519f01a6d Mon Sep 17 00:00:00 2001
+From 5f3af7b383eb3af16bf63e11d16a83856d8ee677 Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:51:04 -0400
+Date: Thu, 6 Jun 2019 13:36:16 -0400
 Subject: [PATCH 12/12] surface-lte

 ---
--- a/patches/5.0/0001-surface-acpi.patch
+++ b/patches/5.0/0001-surface-acpi.patch
--- a/patches/5.0/0002-suspend.patch
+++ b/patches/5.0/0002-suspend.patch
@ -1,145 +0,0 @@
-From 689cde2d569ede2c591c49faaf5917e709033fad Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:40:30 -0400
-Subject: [PATCH 02/12] suspend
-
---
- drivers/nvme/host/nvme.h |  5 +++++
- drivers/nvme/host/pci.c  | 10 +++++++++-
- drivers/pci/quirks.c     |  4 ++++
- include/linux/pci_ids.h  |  2 ++
- kernel/power/suspend.c   | 11 +++++++++++
- kernel/sysctl.c          |  9 +++++++++
- 6 files changed, 40 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index c4a1bb41abf0..5537c35ab677 100644
--- a/drivers/nvme/host/nvme.h
-+++ b/drivers/nvme/host/nvme.h
-@@ -95,6 +95,11 @@ enum nvme_quirks {
- 	 * Ignore device provided subnqn.
- 	 */
- 	NVME_QUIRK_IGNORE_DEV_SUBNQN		= (1 << 8),
-+
-+	/*
-+	 * Do not disable nvme when suspending (s2idle)
-+	 */
-+	NVME_QUIRK_NO_DISABLE			= (1 << 9),
- };
- 
- /*
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index 7fee665ec45e..ebf615570787 100644
--- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -31,6 +31,7 @@
- #include <linux/io-64-nonatomic-lo-hi.h>
- #include <linux/sed-opal.h>
- #include <linux/pci-p2pdma.h>
-+#include <linux/suspend.h>
- 
- #include "trace.h"
- #include "nvme.h"
-@@ -2896,8 +2897,11 @@ static int nvme_suspend(struct device *dev)
- {
- 	struct pci_dev *pdev = to_pci_dev(dev);
- 	struct nvme_dev *ndev = pci_get_drvdata(pdev);
-+	struct nvme_ctrl *ctrl = &ndev->ctrl;
-+
-+	if (!(pm_suspend_via_s2idle() && (ctrl->quirks & NVME_QUIRK_NO_DISABLE)))
-+		nvme_dev_disable(ndev, true);
- 
-	nvme_dev_disable(ndev, true);
- 	return 0;
- }
- 
-@@ -3002,6 +3006,10 @@ static const struct pci_device_id nvme_id_table[] = {
- 		.driver_data = NVME_QUIRK_LIGHTNVM, },
- 	{ PCI_DEVICE(0x1d1d, 0x2601),	/* CNEX Granby */
- 		.driver_data = NVME_QUIRK_LIGHTNVM, },
-+	{ PCI_VDEVICE(SK_HYNIX, 0x1527),   /* Sk Hynix */
-+		.driver_data = NVME_QUIRK_NO_DISABLE, },
-+	{ PCI_VDEVICE(TOSHIBA, 0x010f),   /* TOSHIBA NVMe found on Surface Book with Performance Base */
-+		.driver_data = NVME_QUIRK_NO_DISABLE, },
- 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index fba03a7d5c7f..84e9fed12b55 100644
--- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -1357,6 +1357,10 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID,
-    occur when mode detecting */
- DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_VIA, PCI_ANY_ID,
- 				PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SK_HYNIX, 0x1527, quirk_no_ata_d3);
-+/* TOSHIBA NVMe disk found on Surface Book with Performance Base
-+   cannot wakeup from D3 state after s2idle */
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TOSHIBA, 0x010f, quirk_no_ata_d3);
- 
- /*
-  * This was originally an Alpha-specific thing, but it really fits here.
-diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
-index 5eaf39dbc388..20f4e40cf04a 100644
--- a/include/linux/pci_ids.h
-+++ b/include/linux/pci_ids.h
-@@ -3098,4 +3098,6 @@
- 
- #define PCI_VENDOR_ID_NCUBE		0x10ff
- 
-+#define PCI_VENDOR_ID_SK_HYNIX		0x1c5c
-+
- #endif /* _LINUX_PCI_IDS_H */
-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 0bd595a0b610..a8385e8894a5 100644
--- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -526,6 +526,8 @@ int suspend_devices_and_enter(suspend_state_t state)
- 	goto Resume_devices;
- }
- 
-+unsigned int resume_delay = 3000;
-+
- /**
-  * suspend_finish - Clean up before finishing the suspend sequence.
-  *
-@@ -534,6 +536,15 @@ int suspend_devices_and_enter(suspend_state_t state)
-  */
- static void suspend_finish(void)
- {
-+	if (resume_delay) {
-+		/* Give kernel threads a head start, such that usb-storage
-+		 * can detect devices before syslog attempts to write log
-+		 * messages from the suspend code.
-+		 */
-+		thaw_kernel_threads();
-+		pr_debug("PM: Sleeping for %d milliseconds.\n", resume_delay);
-+		msleep(resume_delay);
-+	}
- 	suspend_thaw_processes();
- 	pm_notifier_call_chain(PM_POST_SUSPEND);
- 	pm_restore_console();
-diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index f50f1471c119..eabfe9059ff6 100644
--- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -314,7 +314,16 @@ static int min_extfrag_threshold;
- static int max_extfrag_threshold = 1000;
- #endif
- 
-+extern unsigned int resume_delay;
-+
- static struct ctl_table kern_table[] = {
-+	{
-+		.procname	= "resume_delay",
-+		.data		= &resume_delay,
-+		.maxlen		= sizeof(unsigned int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec,
-+	},
- 	{
- 		.procname	= "sched_child_runs_first",
- 		.data		= &sysctl_sched_child_runs_first,
-- 
-2.19.1
-
--- a/patches/5.0/0003-buttons.patch
+++ b/patches/5.0/0003-buttons.patch
@ -1,257 +0,0 @@
-From 18655a338f67c8c5bcb96f7f48802537a08dac94 Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:40:42 -0400
-Subject: [PATCH 03/12] buttons
-
---
- drivers/input/misc/soc_button_array.c     | 133 ++++++++++++++++++++--
- drivers/platform/x86/surfacepro3_button.c |  38 +++++++
- 2 files changed, 159 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
-index 55cd6e0b409c..ad4d591cf179 100644
--- a/drivers/input/misc/soc_button_array.c
-+++ b/drivers/input/misc/soc_button_array.c
-@@ -29,6 +29,17 @@ struct soc_button_info {
- 	bool wakeup;
- };
- 
-+/**
-+ * struct soc_device_data - driver data for different device types
-+ * @button_info: specifications of buttons, if NULL specification is assumed to
-+ *               be present in _DSD
-+ * @check: device-specific check (NULL means all will be accepted)
-+ */
-+struct soc_device_data {
-+	struct soc_button_info *button_info;
-+	int (*check)(struct device *dev);
-+};
-+
- /*
-  * Some of the buttons like volume up/down are auto repeat, while others
-  * are not. To support both, we register two platform devices, and put
-@@ -310,6 +321,7 @@ static int soc_button_probe(struct platform_device *pdev)
- {
- 	struct device *dev = &pdev->dev;
- 	const struct acpi_device_id *id;
-+	struct soc_device_data *device_data;
- 	struct soc_button_info *button_info;
- 	struct soc_button_data *priv;
- 	struct platform_device *pd;
-@@ -320,18 +332,19 @@ static int soc_button_probe(struct platform_device *pdev)
- 	if (!id)
- 		return -ENODEV;
- 
-	if (!id->driver_data) {
-+	device_data = (struct soc_device_data *)id->driver_data;
-+	if (device_data && device_data->check) {
-+		error = device_data->check(dev);
-+		if (error)
-+			return error;
-+	}
-+
-+	if (device_data && device_data->button_info) {
-+		button_info = (struct soc_button_info *)device_data->button_info;
-+	} else {
- 		button_info = soc_button_get_button_info(dev);
- 		if (IS_ERR(button_info))
- 			return PTR_ERR(button_info);
-	} else {
-		button_info = (struct soc_button_info *)id->driver_data;
-	}
-
-	error = gpiod_count(dev, NULL);
-	if (error < 0) {
-		dev_dbg(dev, "no GPIO attached, ignoring...\n");
-		return -ENODEV;
- 	}
- 
- 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-@@ -357,12 +370,32 @@ static int soc_button_probe(struct platform_device *pdev)
- 	if (!priv->children[0] && !priv->children[1])
- 		return -ENODEV;
- 
-	if (!id->driver_data)
-+	if (!device_data || !device_data->button_info)
- 		devm_kfree(dev, button_info);
- 
- 	return 0;
- }
- 
-+
-+static int soc_device_check_generic(struct device *dev)
-+{
-+	int gpios;
-+
-+	gpios = gpiod_count(dev, NULL);
-+	if (gpios < 0) {
-+		dev_dbg(dev, "no GPIO attached, ignoring...\n");
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+static struct soc_device_data soc_device_ACPI0011 = {
-+	.button_info = NULL,
-+	.check = soc_device_check_generic,
-+};
-+
-+
- /*
-  * Definition of buttons on the tablet. The ACPI index of each button
-  * is defined in section 2.8.7.2 of "Windows ACPI Design Guide for SoC
-@@ -377,9 +410,85 @@ static struct soc_button_info soc_button_PNP0C40[] = {
- 	{ }
- };
- 
-+static struct soc_device_data soc_device_PNP0C40 = {
-+	.button_info = soc_button_PNP0C40,
-+	.check = soc_device_check_generic,
-+};
-+
-+
-+/*
-+ * Special device check for Surface Book 2 and Surface Pro (2017).
-+ * Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
-+ * devices use MSHW0040 for power and volume buttons, however the way they
-+ * have to be addressed differs. Make sure that we only load this drivers
-+ * for the correct devices by checking the OEM Platform Revision provided by
-+ * the _DSM method.
-+ */
-+#define MSHW0040_DSM_REVISION		0x01
-+#define MSHW0040_DSM_GET_OMPR		0x02	// get OEM Platform Revision
-+static const guid_t MSHW0040_DSM_UUID =
-+	GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4, 0x95, 0xed, 0xab, 0x16, 0x65,
-+	          0x49, 0x80, 0x35);
-+
-+static int soc_device_check_MSHW0040(struct device *dev)
-+{
-+	acpi_handle handle = ACPI_HANDLE(dev);
-+	union acpi_object *result;
-+	u64 oem_platform_rev = 0;
-+	int gpios;
-+
-+	// get OEM platform revision
-+	result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
-+					 MSHW0040_DSM_REVISION,
-+	                                 MSHW0040_DSM_GET_OMPR, NULL,
-+					 ACPI_TYPE_INTEGER);
-+
-+	if (result) {
-+		oem_platform_rev = result->integer.value;
-+		ACPI_FREE(result);
-+	}
-+
-+	if (oem_platform_rev == 0)
-+		return -ENODEV;
-+
-+	dev_dbg(dev, "OEM Platform Revision %llu\n", oem_platform_rev);
-+
-+	/*
-+	 * We are _really_ expecting GPIOs here. If we do not get any, this
-+	 * means the GPIO driver has not been loaded yet (which can happen).
-+	 * Try again later.
-+	 */
-+	gpios = gpiod_count(dev, NULL);
-+	if (gpios < 0)
-+		return -EAGAIN;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Button infos for Microsoft Surface Book 2 and Surface Pro (2017).
-+ * Obtained from DSDT/testing.
-+ */
-+static struct soc_button_info soc_button_MSHW0040[] = {
-+	{ "power", 0, EV_KEY, KEY_POWER, false, true },
-+	{ "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false },
-+	{ "volume_down", 4, EV_KEY, KEY_VOLUMEDOWN, true, false },
-+	{ }
-+};
-+
-+static struct soc_device_data soc_device_MSHW0040 = {
-+	.button_info = soc_button_MSHW0040,
-+	.check = soc_device_check_MSHW0040,
-+};
-+
-+
- static const struct acpi_device_id soc_button_acpi_match[] = {
-	{ "PNP0C40", (unsigned long)soc_button_PNP0C40 },
-	{ "ACPI0011", 0 },
-+	{ "PNP0C40", (unsigned long)&soc_device_PNP0C40 },
-+	{ "ACPI0011", (unsigned long)&soc_device_ACPI0011 },
-+
-+	/* Microsoft Surface Devices (5th and 6th generation) */
-+	{ "MSHW0040", (unsigned long)&soc_device_MSHW0040 },
-+
- 	{ }
- };
- 
-diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c
-index 1b491690ce07..eaec30380b11 100644
--- a/drivers/platform/x86/surfacepro3_button.c
-+++ b/drivers/platform/x86/surfacepro3_button.c
-@@ -24,6 +24,12 @@
- #define SURFACE_BUTTON_OBJ_NAME		"VGBI"
- #define SURFACE_BUTTON_DEVICE_NAME	"Surface Pro 3/4 Buttons"
- 
-+#define MSHW0040_DSM_REVISION		0x01
-+#define MSHW0040_DSM_GET_OMPR		0x02	// get OEM Platform Revision
-+static const guid_t MSHW0040_DSM_UUID =
-+	GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4, 0x95, 0xed, 0xab, 0x16, 0x65,
-+		  0x49, 0x80, 0x35);
-+
- #define SURFACE_BUTTON_NOTIFY_TABLET_MODE	0xc8
- 
- #define SURFACE_BUTTON_NOTIFY_PRESS_POWER	0xc6
-@@ -146,6 +152,34 @@ static int surface_button_resume(struct device *dev)
- }
- #endif
- 
-+/*
-+ * Surface Pro 4 and Surface Book 2 / Surface Pro 2017 use the same device
-+ * ID (MSHW0040) for the power/volume buttons. Make sure this is the right
-+ * device by checking for the _DSM method and OEM Platform Revision.
-+ */
-+static int surface_button_check_MSHW0040(struct acpi_device *dev)
-+{
-+	acpi_handle handle = dev->handle;
-+	union acpi_object *result;
-+	u64 oem_platform_rev = 0;
-+
-+	// get OEM platform revision
-+	result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
-+					 MSHW0040_DSM_REVISION,
-+					 MSHW0040_DSM_GET_OMPR,
-+					 NULL, ACPI_TYPE_INTEGER);
-+
-+	if (result) {
-+		oem_platform_rev = result->integer.value;
-+		ACPI_FREE(result);
-+	}
-+
-+	dev_dbg(&dev->dev, "OEM Platform Revision %llu\n", oem_platform_rev);
-+
-+	return oem_platform_rev == 0 ? 0 : -ENODEV;
-+}
-+
-+
- static int surface_button_add(struct acpi_device *device)
- {
- 	struct surface_button *button;
-@@ -158,6 +192,10 @@ static int surface_button_add(struct acpi_device *device)
- 	    strlen(SURFACE_BUTTON_OBJ_NAME)))
- 		return -ENODEV;
- 
-+	error = surface_button_check_MSHW0040(device);
-+	if (error)
-+		return error;
-+
- 	button = kzalloc(sizeof(struct surface_button), GFP_KERNEL);
- 	if (!button)
- 		return -ENOMEM;
-- 
-2.19.1
-
--- a/patches/5.0/0004-cameras.patch
+++ b/patches/5.0/0004-cameras.patch
--- a/patches/5.0/0005-ipts.patch
+++ b/patches/5.0/0005-ipts.patch
--- a/patches/5.0/0006-hid.patch
+++ b/patches/5.0/0006-hid.patch
@ -1,151 +0,0 @@
-From b711906ed798cb9b0b1b2787c7b149a21d1c7c95 Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:41:13 -0400
-Subject: [PATCH 06/12] hid
-
---
- drivers/hid/hid-ids.h        | 21 +++++++++----
- drivers/hid/hid-microsoft.c  |  3 +-
- drivers/hid/hid-multitouch.c | 57 ++++++++++++++++++++++++++++++++++++
- drivers/hid/hid-quirks.c     | 11 +++++++
- 4 files changed, 86 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 24f846d67478..b10672a0e87e 100644
--- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -811,11 +811,22 @@
- #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
- #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600  0x0750
- #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c
-#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
-#define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799
-#define USB_DEVICE_ID_MS_TOUCH_COVER_2   0x07a7
-#define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9
-#define USB_DEVICE_ID_MS_POWER_COVER     0x07da
-+#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD	0x00e3
-+#define USB_DEVICE_ID_MS_SURFACE_PRO_2		0x0799
-+#define USB_DEVICE_ID_MS_TOUCH_COVER_2		0x07a7
-+#define USB_DEVICE_ID_MS_TYPE_COVER_2		0x07a9
-+#define USB_DEVICE_ID_MS_TYPE_COVER_3		0x07de
-+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3	0x07dc
-+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1	0x07de
-+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2	0x07e2
-+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP	0x07dd
-+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4	0x07e8
-+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1	0x07e4
-+#define USB_DEVICE_ID_MS_SURFACE_BOOK		0x07cd
-+#define USB_DEVICE_ID_MS_SURFACE_BOOK_2		0x0922
-+#define USB_DEVICE_ID_MS_SURFACE_GO			0x096f
-+#define USB_DEVICE_ID_MS_SURFACE_VHF		0xf001
-+#define USB_DEVICE_ID_MS_POWER_COVER		0x07da
- #define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER	0x02fd
- #define USB_DEVICE_ID_MS_PIXART_MOUSE    0x00cb
- 
-diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
-index 330cb073cb66..f45fea460678 100644
--- a/drivers/hid/hid-microsoft.c
-+++ b/drivers/hid/hid-microsoft.c
-@@ -441,7 +441,8 @@ static const struct hid_device_id ms_devices[] = {
- 		.driver_data = MS_HIDINPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
- 		.driver_data = MS_ERGONOMY},
-
-+	{ HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF),
-+		.driver_data = MS_HIDINPUT},
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
- 		.driver_data = MS_PRESENTER },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 719a0360e40c..962aeefed5d8 100644
--- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -1970,6 +1970,63 @@ static const struct hid_device_id mt_devices[] = {
- 		HID_USB_DEVICE(USB_VENDOR_ID_LG,
- 			USB_DEVICE_ID_LG_MELFAS_MT) },
- 
-+	/* Microsoft Touch Cover */
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+		USB_DEVICE_ID_MS_TOUCH_COVER_2) },
-+
-+	/* Microsoft Type Cover */
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_2) },
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_3) },
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1) },
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1) },
-+
-+	/* Microsoft Surface Book */
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+		USB_DEVICE_ID_MS_SURFACE_BOOK) },
-+
-+	/* Microsoft Surface Book 2 */
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+		USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
-+
-+	/* Microsoft Surface Go */
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+		USB_DEVICE_ID_MS_SURFACE_GO) },
-+
-+	/* Microsoft Surface Laptop */
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
-+			USB_VENDOR_ID_MICROSOFT,
-+			USB_DEVICE_ID_MS_SURFACE_VHF) },
-+
-+	/* Microsoft Power Cover */
-+	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
-+		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
-+		USB_DEVICE_ID_MS_POWER_COVER) },
-+
- 	/* MosArt panels */
- 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
- 		MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
-diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
-index 94088c0ed68a..391b882fd6e5 100644
--- a/drivers/hid/hid-quirks.c
-+++ b/drivers/hid/hid-quirks.c
-@@ -112,6 +112,17 @@ static const struct hid_device_id hid_quirks[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_GO), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF), HID_QUIRK_ALWAYS_POLL },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER), HID_QUIRK_MULTI_INPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
-- 
-2.19.1
-
--- a/patches/5.0/0007-sdcard-reader.patch
+++ b/patches/5.0/0007-sdcard-reader.patch
@ -1,26 +0,0 @@
-From 491ef9c62c9a340dfd60887bec404a3805debff1 Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:41:25 -0400
-Subject: [PATCH 07/12] sdcard-reader
-
---
- drivers/usb/core/hub.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 1d1e61e980f3..409bce666ca5 100644
--- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -4163,7 +4163,8 @@ void usb_enable_lpm(struct usb_device *udev)
- 	if (!udev || !udev->parent ||
- 			udev->speed < USB_SPEED_SUPER ||
- 			!udev->lpm_capable ||
-			udev->state < USB_STATE_DEFAULT)
-+			udev->state < USB_STATE_DEFAULT ||
-+			!udev->bos || !udev->bos->ss_cap)
- 		return;
- 
- 	udev->lpm_disable_count--;
-- 
-2.19.1
-
--- a/patches/5.0/0008-wifi.patch
+++ b/patches/5.0/0008-wifi.patch
@ -1,270 +0,0 @@
-From 49e1ad9fe50979c6c329b21997b15b05ba1bdb2f Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:41:36 -0400
-Subject: [PATCH 08/12] wifi
-
---
- drivers/net/wireless/marvell/mwifiex/11n_aggr.c |  3 +--
- drivers/net/wireless/marvell/mwifiex/cfg80211.c |  5 ++++-
- drivers/net/wireless/marvell/mwifiex/cmdevt.c   | 10 ++++++----
- drivers/net/wireless/marvell/mwifiex/fw.h       |  1 +
- drivers/net/wireless/marvell/mwifiex/main.c     | 17 +++++++++++++----
- drivers/net/wireless/marvell/mwifiex/main.h     |  2 ++
- drivers/net/wireless/marvell/mwifiex/pcie.c     |  9 +++++++++
- drivers/net/wireless/marvell/mwifiex/sta_cmd.c  |  4 ++--
- .../net/wireless/marvell/mwifiex/sta_cmdresp.c  | 11 ++++++++---
- drivers/net/wireless/marvell/mwifiex/usb.c      |  2 ++
- scripts/leaking_addresses.pl                    |  0
- 11 files changed, 48 insertions(+), 16 deletions(-)
- mode change 100755 => 100644 scripts/leaking_addresses.pl
-
-diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
-index 042a1d07f686..fc9041f58e9f 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
-+++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
-@@ -200,8 +200,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
- 
- 	do {
- 		/* Check if AMSDU can accommodate this MSDU */
-		if ((skb_aggr->len + skb_src->len + LLC_SNAP_LEN) >
-		    adapter->tx_buf_size)
-+		if (skb_tailroom(skb_aggr) < (skb_src->len + LLC_SNAP_LEN))
- 			break;
- 
- 		skb_src = skb_dequeue(&pra_list->skb_head);
-diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-index 883752f640b4..a3295e7b6d0a 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-@@ -428,7 +428,10 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
- 		mwifiex_dbg(priv->adapter, INFO,
- 			    "info: ignore timeout value for IEEE Power Save\n");
- 
-	ps_mode = enabled;
-+	//ps_mode = enabled;
-+
-+	mwifiex_dbg(priv->adapter, INFO, "overriding ps_mode to false\n");
-+	ps_mode = 0;
- 
- 	return mwifiex_drv_set_power(priv, &ps_mode);
- }
-diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
-index 60db2b969e20..efae99018c3c 100644
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
-+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
-@@ -1000,6 +1000,7 @@ mwifiex_cmd_timeout_func(struct timer_list *t)
- 		if (cmd_node->wait_q_enabled) {
- 			adapter->cmd_wait_q.status = -ETIMEDOUT;
- 			mwifiex_cancel_pending_ioctl(adapter);
-+			adapter->cmd_sent = false;
- 		}
- 	}
- 	if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
-@@ -1007,11 +1008,11 @@ mwifiex_cmd_timeout_func(struct timer_list *t)
- 		return;
- 	}
- 
-	if (adapter->if_ops.device_dump)
-		adapter->if_ops.device_dump(adapter);
-+	//if (adapter->if_ops.device_dump)
-+	//	adapter->if_ops.device_dump(adapter);
- 
-	if (adapter->if_ops.card_reset)
-		adapter->if_ops.card_reset(adapter);
-+	//if (adapter->if_ops.card_reset)
-+	//	adapter->if_ops.card_reset(adapter);
- }
- 
- void
-@@ -1577,6 +1578,7 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
- 						    adapter->key_api_minor_ver);
- 					break;
- 				case FW_API_VER_ID:
-+				case FW_KEY_API_VER_ID:
- 					adapter->fw_api_ver =
- 							api_rev->major_ver;
- 					mwifiex_dbg(adapter, INFO,
-diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
-index b73f99dc5a72..d96a0ffc9649 100644
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
-+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
-@@ -1052,6 +1052,7 @@ struct host_cmd_ds_802_11_ps_mode_enh {
- enum API_VER_ID {
- 	KEY_API_VER_ID = 1,
- 	FW_API_VER_ID = 2,
-+	FW_KEY_API_VER_ID = 4,
- };
- 
- struct hw_spec_api_rev {
-diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
-index 20cee5c397fb..13e49a3ae812 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
-+++ b/drivers/net/wireless/marvell/mwifiex/main.c
-@@ -163,6 +163,7 @@ void mwifiex_queue_main_work(struct mwifiex_adapter *adapter)
- 	spin_lock_irqsave(&adapter->main_proc_lock, flags);
- 	if (adapter->mwifiex_processing) {
- 		adapter->more_task_flag = true;
-+		adapter->more_rx_task_flag = true;
- 		spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
- 	} else {
- 		spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
-@@ -171,18 +172,20 @@ void mwifiex_queue_main_work(struct mwifiex_adapter *adapter)
- }
- EXPORT_SYMBOL_GPL(mwifiex_queue_main_work);
- 
-static void mwifiex_queue_rx_work(struct mwifiex_adapter *adapter)
-+void mwifiex_queue_rx_work(struct mwifiex_adapter *adapter)
- {
- 	unsigned long flags;
- 
- 	spin_lock_irqsave(&adapter->rx_proc_lock, flags);
- 	if (adapter->rx_processing) {
-+		adapter->more_rx_task_flag = true;
- 		spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
- 	} else {
- 		spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
- 		queue_work(adapter->rx_workqueue, &adapter->rx_work);
- 	}
- }
-+EXPORT_SYMBOL_GPL(mwifiex_queue_rx_work);
- 
- static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
- {
-@@ -192,6 +195,7 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
- 
- 	spin_lock_irqsave(&adapter->rx_proc_lock, flags);
- 	if (adapter->rx_processing || adapter->rx_locked) {
-+		adapter->more_rx_task_flag = true;
- 		spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
- 		goto exit_rx_proc;
- 	} else {
-@@ -199,6 +203,7 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
- 		spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
- 	}
- 
-+rx_process_start:
- 	/* Check for Rx data */
- 	while ((skb = skb_dequeue(&adapter->rx_data_q))) {
- 		atomic_dec(&adapter->rx_pending);
-@@ -220,6 +225,11 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
- 		}
- 	}
- 	spin_lock_irqsave(&adapter->rx_proc_lock, flags);
-+	if (adapter->more_rx_task_flag) {
-+		adapter->more_rx_task_flag = false;
-+		spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
-+		goto rx_process_start;
-+	}
- 	adapter->rx_processing = false;
- 	spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
- 
-@@ -283,11 +293,10 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
- 				mwifiex_process_hs_config(adapter);
- 			if (adapter->if_ops.process_int_status)
- 				adapter->if_ops.process_int_status(adapter);
-+			if (adapter->rx_work_enabled && adapter->data_received)
-+				mwifiex_queue_rx_work(adapter);
- 		}
- 
-		if (adapter->rx_work_enabled && adapter->data_received)
-			mwifiex_queue_rx_work(adapter);
-
- 		/* Need to wake up the card ? */
- 		if ((adapter->ps_state == PS_STATE_SLEEP) &&
- 		    (adapter->pm_wakeup_card_req &&
-diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
-index b025ba164412..d4027a803079 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h
-+++ b/drivers/net/wireless/marvell/mwifiex/main.h
-@@ -908,6 +908,7 @@ struct mwifiex_adapter {
- 	spinlock_t main_proc_lock;
- 	u32 mwifiex_processing;
- 	u8 more_task_flag;
-+	u8 more_rx_task_flag;
- 	u16 tx_buf_size;
- 	u16 curr_tx_buf_size;
- 	/* sdio single port rx aggregation capability */
-@@ -1694,6 +1695,7 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter);
- void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags);
- void mwifiex_fw_dump_event(struct mwifiex_private *priv);
- void mwifiex_queue_main_work(struct mwifiex_adapter *adapter);
-+void mwifiex_queue_rx_work(struct mwifiex_adapter *adapter);
- int mwifiex_get_wakeup_reason(struct mwifiex_private *priv, u16 action,
- 			      int cmd_type,
- 			      struct mwifiex_ds_wakeup_reason *wakeup_reason);
-diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
-index 3fe81b2a929a..6e734a83e6bf 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
-+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
-@@ -1743,6 +1743,15 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
- 	}
- 
- 	rx_len = get_unaligned_le16(skb->data);
-+
-+	if (rx_len == 0) {
-+		mwifiex_dbg(adapter, ERROR,
-+				    "0 byte cmdrsp\n");
-+		mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
-+					   PCI_DMA_FROMDEVICE);
-+		return 0;
-+	}
-+
- 	skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len);
- 	skb_trim(skb, rx_len);
- 
-diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
-index 4ed10cf82f9a..485360e8534b 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
-+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
-@@ -30,8 +30,8 @@ static bool drcs;
- module_param(drcs, bool, 0644);
- MODULE_PARM_DESC(drcs, "multi-channel operation:1, single-channel operation:0");
- 
-static bool disable_auto_ds;
-module_param(disable_auto_ds, bool, 0);
-+static bool disable_auto_ds = 1;
-+module_param(disable_auto_ds, bool, 0644);
- MODULE_PARM_DESC(disable_auto_ds,
- 		 "deepsleep enabled=0(default), deepsleep disabled=1");
- /*
-diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
-index 69e3b624adbb..884bad677cc3 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
-+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
-@@ -48,9 +48,14 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv,
- 	struct host_cmd_ds_802_11_ps_mode_enh *pm;
- 	unsigned long flags;
- 
-	mwifiex_dbg(adapter, ERROR,
-		    "CMD_RESP: cmd %#x error, result=%#x\n",
-		    resp->command, resp->result);
-+	if (resp->command == 271 && resp->result == 2){
-+		// ignore this command as the firmware does not support it
-+	}
-+	else {
-+		mwifiex_dbg(adapter, ERROR,
-+				"CMD_RESP: cmd %#x error, result=%#x\n",
-+				resp->command, resp->result);
-+	}
- 
- 	if (adapter->curr_cmd->wait_q_enabled)
- 		adapter->cmd_wait_q.status = -1;
-diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
-index d445acc4786b..ae8e60cc17cb 100644
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
-+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
-@@ -144,6 +144,8 @@ static int mwifiex_usb_recv(struct mwifiex_adapter *adapter,
- 		skb_queue_tail(&adapter->rx_data_q, skb);
- 		adapter->data_received = true;
- 		atomic_inc(&adapter->rx_pending);
-+		if (adapter->rx_work_enabled)
-+			mwifiex_queue_rx_work(adapter);
- 		break;
- 	default:
- 		mwifiex_dbg(adapter, ERROR,
-diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
-old mode 100755
-new mode 100644
-- 
-2.19.1
-
--- a/patches/5.0/0009-surface-power.patch
+++ b/patches/5.0/0009-surface-power.patch
@ -1,655 +0,0 @@
-From 85a5077165f66cbdc567f5140d61f4cbb5762294 Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:41:49 -0400
-Subject: [PATCH 09/12] surface-power
-
---
- drivers/platform/x86/Kconfig          |   7 +
- drivers/platform/x86/Makefile         |   1 +
- drivers/platform/x86/surface3_power.c | 604 ++++++++++++++++++++++++++
- 3 files changed, 612 insertions(+)
- create mode 100644 drivers/platform/x86/surface3_power.c
-
-diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
-index a00b5f6b23ce..3d7ba7adbddd 100644
--- a/drivers/platform/x86/Kconfig
-+++ b/drivers/platform/x86/Kconfig
-@@ -1300,6 +1300,13 @@ config SURFACE_3_BUTTON
- 	---help---
- 	  This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.
- 
-+config SURFACE_3_POWER_OPREGION
-+	tristate "Surface 3 battery platform operation region support"
-+	depends on ACPI && I2C
-+	help
-+	  Select this option to enable support for ACPI operation
-+	  region of the Surface 3 battery platform driver.
-+
- config INTEL_PUNIT_IPC
- 	tristate "Intel P-Unit IPC Driver"
- 	---help---
-diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
-index 8412fe7a169d..4d3f0bad00c4 100644
--- a/drivers/platform/x86/Makefile
-+++ b/drivers/platform/x86/Makefile
-@@ -85,6 +85,7 @@ obj-$(CONFIG_INTEL_PMC_IPC)	+= intel_pmc_ipc.o
- obj-$(CONFIG_TOUCHSCREEN_DMI)	+= touchscreen_dmi.o
- obj-$(CONFIG_SURFACE_PRO3_BUTTON)	+= surfacepro3_button.o
- obj-$(CONFIG_SURFACE_3_BUTTON)	+= surface3_button.o
-+obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
- obj-$(CONFIG_INTEL_PUNIT_IPC)  += intel_punit_ipc.o
- obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
- obj-$(CONFIG_INTEL_TELEMETRY)	+= intel_telemetry_core.o \
-diff --git a/drivers/platform/x86/surface3_power.c b/drivers/platform/x86/surface3_power.c
-new file mode 100644
-index 000000000000..e0af01a60302
--- /dev/null
-+++ b/drivers/platform/x86/surface3_power.c
-@@ -0,0 +1,604 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+
-+/*
-+ * Supports for the power IC on the Surface 3 tablet.
-+ *
-+ * (C) Copyright 2016-2018 Red Hat, Inc
-+ * (C) Copyright 2016-2018 Benjamin Tissoires <benjamin.tissoires@gmail.com>
-+ * (C) Copyright 2016 Stephen Just <stephenjust@gmail.com>
-+ *
-+ */
-+
-+/*
-+ * This driver has been reverse-engineered by parsing the DSDT of the Surface 3
-+ * and looking at the registers of the chips.
-+ *
-+ * The DSDT allowed to find out that:
-+ * - the driver is required for the ACPI BAT0 device to communicate to the chip
-+ *   through an operation region.
-+ * - the various defines for the operation region functions to communicate with
-+ *   this driver
-+ * - the DSM 3f99e367-6220-4955-8b0f-06ef2ae79412 allows to trigger ACPI
-+ *   events to BAT0 (the code is all available in the DSDT).
-+ *
-+ * Further findings regarding the 2 chips declared in the MSHW0011 are:
-+ * - there are 2 chips declared:
-+ *   . 0x22 seems to control the ADP1 line status (and probably the charger)
-+ *   . 0x55 controls the battery directly
-+ * - the battery chip uses a SMBus protocol (using plain SMBus allows non
-+ *   destructive commands):
-+ *   . the commands/registers used are in the range 0x00..0x7F
-+ *   . if bit 8 (0x80) is set in the SMBus command, the returned value is the
-+ *     same as when it is not set. There is a high chance this bit is the
-+ *     read/write
-+ *   . the various registers semantic as been deduced by observing the register
-+ *     dumps.
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/acpi.h>
-+#include <linux/freezer.h>
-+#include <linux/i2c.h>
-+#include <linux/kernel.h>
-+#include <linux/kthread.h>
-+#include <linux/slab.h>
-+#include <linux/uuid.h>
-+
-+#define POLL_INTERVAL		(2 * HZ)
-+
-+struct mshw0011_data {
-+	struct i2c_client	*adp1;
-+	struct i2c_client	*bat0;
-+	unsigned short		notify_mask;
-+	struct task_struct	*poll_task;
-+	bool			kthread_running;
-+
-+	bool			charging;
-+	bool			bat_charging;
-+	u8			trip_point;
-+	s32			full_capacity;
-+};
-+
-+struct mshw0011_lookup {
-+	struct mshw0011_data	*cdata;
-+	unsigned int		n;
-+	unsigned int		index;
-+	int			addr;
-+};
-+
-+struct mshw0011_handler_data {
-+	struct acpi_connection_info	info;
-+	struct i2c_client		*client;
-+};
-+
-+struct bix {
-+	u32	revision;
-+	u32	power_unit;
-+	u32	design_capacity;
-+	u32	last_full_charg_capacity;
-+	u32	battery_technology;
-+	u32	design_voltage;
-+	u32	design_capacity_of_warning;
-+	u32	design_capacity_of_low;
-+	u32	cycle_count;
-+	u32	measurement_accuracy;
-+	u32	max_sampling_time;
-+	u32	min_sampling_time;
-+	u32	max_average_interval;
-+	u32	min_average_interval;
-+	u32	battery_capacity_granularity_1;
-+	u32	battery_capacity_granularity_2;
-+	char	model[10];
-+	char	serial[10];
-+	char	type[10];
-+	char	OEM[10];
-+} __packed;
-+
-+struct bst {
-+	u32	battery_state;
-+	s32	battery_present_rate;
-+	u32	battery_remaining_capacity;
-+	u32	battery_present_voltage;
-+} __packed;
-+
-+struct gsb_command {
-+	u8	arg0;
-+	u8	arg1;
-+	u8	arg2;
-+} __packed;
-+
-+struct gsb_buffer {
-+	u8	status;
-+	u8	len;
-+	u8	ret;
-+	union {
-+		struct gsb_command	cmd;
-+		struct bst		bst;
-+		struct bix		bix;
-+	} __packed;
-+} __packed;
-+
-+
-+#define ACPI_BATTERY_STATE_DISCHARGING	BIT(0)
-+#define ACPI_BATTERY_STATE_CHARGING	BIT(1)
-+#define ACPI_BATTERY_STATE_CRITICAL	BIT(2)
-+
-+#define MSHW0011_CMD_DEST_BAT0		0x01
-+#define MSHW0011_CMD_DEST_ADP1		0x03
-+
-+#define MSHW0011_CMD_BAT0_STA		0x01
-+#define MSHW0011_CMD_BAT0_BIX		0x02
-+#define MSHW0011_CMD_BAT0_BCT		0x03
-+#define MSHW0011_CMD_BAT0_BTM		0x04
-+#define MSHW0011_CMD_BAT0_BST		0x05
-+#define MSHW0011_CMD_BAT0_BTP		0x06
-+#define MSHW0011_CMD_ADP1_PSR		0x07
-+#define MSHW0011_CMD_BAT0_PSOC		0x09
-+#define MSHW0011_CMD_BAT0_PMAX		0x0a
-+#define MSHW0011_CMD_BAT0_PSRC		0x0b
-+#define MSHW0011_CMD_BAT0_CHGI		0x0c
-+#define MSHW0011_CMD_BAT0_ARTG		0x0d
-+
-+#define MSHW0011_NOTIFY_GET_VERSION	0x00
-+#define MSHW0011_NOTIFY_ADP1		0x01
-+#define MSHW0011_NOTIFY_BAT0_BST	0x02
-+#define MSHW0011_NOTIFY_BAT0_BIX	0x05
-+
-+#define MSHW0011_ADP1_REG_PSR		0x04
-+
-+#define MSHW0011_BAT0_REG_CAPACITY		0x0c
-+#define MSHW0011_BAT0_REG_FULL_CHG_CAPACITY	0x0e
-+#define MSHW0011_BAT0_REG_DESIGN_CAPACITY	0x40
-+#define MSHW0011_BAT0_REG_VOLTAGE	0x08
-+#define MSHW0011_BAT0_REG_RATE		0x14
-+#define MSHW0011_BAT0_REG_OEM		0x45
-+#define MSHW0011_BAT0_REG_TYPE		0x4e
-+#define MSHW0011_BAT0_REG_SERIAL_NO	0x56
-+#define MSHW0011_BAT0_REG_CYCLE_CNT	0x6e
-+
-+#define MSHW0011_EV_2_5			0x1ff
-+
-+static int
-+mshw0011_notify(struct mshw0011_data *cdata, u8 arg1, u8 arg2,
-+		unsigned int *ret_value)
-+{
-+	static const guid_t mshw0011_guid =
-+		GUID_INIT(0x3F99E367, 0x6220, 0x4955,
-+			  0x8B, 0x0F, 0x06, 0xEF, 0x2A, 0xE7, 0x94, 0x12);
-+	union acpi_object *obj;
-+	struct acpi_device *adev;
-+	acpi_handle handle;
-+	unsigned int i;
-+
-+	handle = ACPI_HANDLE(&cdata->adp1->dev);
-+	if (!handle || acpi_bus_get_device(handle, &adev))
-+		return -ENODEV;
-+
-+	obj = acpi_evaluate_dsm_typed(handle, &mshw0011_guid, arg1, arg2, NULL,
-+				      ACPI_TYPE_BUFFER);
-+	if (!obj) {
-+		dev_err(&cdata->adp1->dev, "device _DSM execution failed\n");
-+		return -ENODEV;
-+	}
-+
-+	*ret_value = 0;
-+	for (i = 0; i < obj->buffer.length; i++)
-+		*ret_value |= obj->buffer.pointer[i] << (i * 8);
-+
-+	ACPI_FREE(obj);
-+	return 0;
-+}
-+
-+static const struct bix default_bix = {
-+	.revision = 0x00,
-+	.power_unit = 0x01,
-+	.design_capacity = 0x1dca,
-+	.last_full_charg_capacity = 0x1dca,
-+	.battery_technology = 0x01,
-+	.design_voltage = 0x10df,
-+	.design_capacity_of_warning = 0x8f,
-+	.design_capacity_of_low = 0x47,
-+	.cycle_count = 0xffffffff,
-+	.measurement_accuracy = 0x00015f90,
-+	.max_sampling_time = 0x03e8,
-+	.min_sampling_time = 0x03e8,
-+	.max_average_interval = 0x03e8,
-+	.min_average_interval = 0x03e8,
-+	.battery_capacity_granularity_1 = 0x45,
-+	.battery_capacity_granularity_2 = 0x11,
-+	.model = "P11G8M",
-+	.serial = "",
-+	.type = "LION",
-+	.OEM = "",
-+};
-+
-+static int mshw0011_bix(struct mshw0011_data *cdata, struct bix *bix)
-+{
-+	struct i2c_client *client = cdata->bat0;
-+	char buf[10];
-+	int ret;
-+
-+	*bix = default_bix;
-+
-+	/* get design capacity */
-+	ret = i2c_smbus_read_word_data(client,
-+				       MSHW0011_BAT0_REG_DESIGN_CAPACITY);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "Error reading design capacity: %d\n",
-+			ret);
-+		return ret;
-+	}
-+	bix->design_capacity = ret;
-+
-+	/* get last full charge capacity */
-+	ret = i2c_smbus_read_word_data(client,
-+				       MSHW0011_BAT0_REG_FULL_CHG_CAPACITY);
-+	if (ret < 0) {
-+		dev_err(&client->dev,
-+			"Error reading last full charge capacity: %d\n", ret);
-+		return ret;
-+	}
-+	bix->last_full_charg_capacity = ret;
-+
-+	/* get serial number */
-+	ret = i2c_smbus_read_i2c_block_data(client, MSHW0011_BAT0_REG_SERIAL_NO,
-+					    10, buf);
-+	if (ret != 10) {
-+		dev_err(&client->dev, "Error reading serial no: %d\n", ret);
-+		return ret;
-+	}
-+	snprintf(bix->serial, ARRAY_SIZE(bix->serial),
-+		 "%*pE%*pE", 3, buf + 7, 6, buf);
-+
-+	/* get cycle count */
-+	ret = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_CYCLE_CNT);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "Error reading cycle count: %d\n", ret);
-+		return ret;
-+	}
-+	bix->cycle_count = ret;
-+
-+	/* get OEM name */
-+	ret = i2c_smbus_read_i2c_block_data(client, MSHW0011_BAT0_REG_OEM,
-+					    4, buf);
-+	if (ret != 4) {
-+		dev_err(&client->dev, "Error reading cycle count: %d\n", ret);
-+		return ret;
-+	}
-+	snprintf(bix->OEM, ARRAY_SIZE(bix->OEM), "%*pE", 3, buf);
-+
-+	return 0;
-+}
-+
-+static int mshw0011_bst(struct mshw0011_data *cdata, struct bst *bst)
-+{
-+	struct i2c_client *client = cdata->bat0;
-+	int rate, capacity, voltage, state;
-+	s16 tmp;
-+
-+	rate = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_RATE);
-+	if (rate < 0)
-+		return rate;
-+
-+	capacity = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_CAPACITY);
-+	if (capacity < 0)
-+		return capacity;
-+
-+	voltage = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_VOLTAGE);
-+	if (voltage < 0)
-+		return voltage;
-+
-+	tmp = rate;
-+	bst->battery_present_rate = abs((s32)tmp);
-+
-+	state = 0;
-+	if ((s32) tmp > 0)
-+		state |= ACPI_BATTERY_STATE_CHARGING;
-+	else if ((s32) tmp < 0)
-+		state |= ACPI_BATTERY_STATE_DISCHARGING;
-+	bst->battery_state = state;
-+
-+	bst->battery_remaining_capacity = capacity;
-+	bst->battery_present_voltage = voltage;
-+
-+	return 0;
-+}
-+
-+static int mshw0011_adp_psr(struct mshw0011_data *cdata)
-+{
-+	struct i2c_client *client = cdata->adp1;
-+	int ret;
-+
-+	ret = i2c_smbus_read_byte_data(client, MSHW0011_ADP1_REG_PSR);
-+	if (ret < 0)
-+		return ret;
-+
-+	return ret;
-+}
-+
-+static int mshw0011_isr(struct mshw0011_data *cdata)
-+{
-+	struct bst bst;
-+	struct bix bix;
-+	int ret;
-+	bool status, bat_status;
-+
-+	ret = mshw0011_adp_psr(cdata);
-+	if (ret < 0)
-+		return ret;
-+
-+	status = ret;
-+
-+	if (status != cdata->charging)
-+		mshw0011_notify(cdata, cdata->notify_mask,
-+				MSHW0011_NOTIFY_ADP1, &ret);
-+
-+	cdata->charging = status;
-+
-+	ret = mshw0011_bst(cdata, &bst);
-+	if (ret < 0)
-+		return ret;
-+
-+	bat_status = bst.battery_state;
-+
-+	if (bat_status != cdata->bat_charging)
-+		mshw0011_notify(cdata, cdata->notify_mask,
-+				MSHW0011_NOTIFY_BAT0_BST, &ret);
-+
-+	cdata->bat_charging = bat_status;
-+
-+	ret = mshw0011_bix(cdata, &bix);
-+	if (ret < 0)
-+		return ret;
-+	if (bix.last_full_charg_capacity != cdata->full_capacity)
-+		mshw0011_notify(cdata, cdata->notify_mask,
-+				MSHW0011_NOTIFY_BAT0_BIX, &ret);
-+
-+	cdata->full_capacity = bix.last_full_charg_capacity;
-+
-+	return 0;
-+}
-+
-+static int mshw0011_poll_task(void *data)
-+{
-+	struct mshw0011_data *cdata = data;
-+	int ret = 0;
-+
-+	cdata->kthread_running = true;
-+
-+	set_freezable();
-+
-+	while (!kthread_should_stop()) {
-+		schedule_timeout_interruptible(POLL_INTERVAL);
-+		try_to_freeze();
-+		ret = mshw0011_isr(data);
-+		if (ret)
-+			break;
-+	}
-+
-+	cdata->kthread_running = false;
-+	return ret;
-+}
-+
-+static acpi_status
-+mshw0011_space_handler(u32 function, acpi_physical_address command,
-+			u32 bits, u64 *value64,
-+			void *handler_context, void *region_context)
-+{
-+	struct gsb_buffer *gsb = (struct gsb_buffer *)value64;
-+	struct mshw0011_handler_data *data = handler_context;
-+	struct acpi_connection_info *info = &data->info;
-+	struct acpi_resource_i2c_serialbus *sb;
-+	struct i2c_client *client = data->client;
-+	struct mshw0011_data *cdata = i2c_get_clientdata(client);
-+	struct acpi_resource *ares;
-+	u32 accessor_type = function >> 16;
-+	acpi_status ret;
-+	int status = 1;
-+
-+	ret = acpi_buffer_to_resource(info->connection, info->length, &ares);
-+	if (ACPI_FAILURE(ret))
-+		return ret;
-+
-+	if (!value64 || ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS) {
-+		ret = AE_BAD_PARAMETER;
-+		goto err;
-+	}
-+
-+	sb = &ares->data.i2c_serial_bus;
-+	if (sb->type != ACPI_RESOURCE_SERIAL_TYPE_I2C) {
-+		ret = AE_BAD_PARAMETER;
-+		goto err;
-+	}
-+
-+	if (accessor_type != ACPI_GSB_ACCESS_ATTRIB_RAW_PROCESS) {
-+		ret = AE_BAD_PARAMETER;
-+		goto err;
-+	}
-+
-+	if (gsb->cmd.arg0 == MSHW0011_CMD_DEST_ADP1 &&
-+	    gsb->cmd.arg1 == MSHW0011_CMD_ADP1_PSR) {
-+		ret = mshw0011_adp_psr(cdata);
-+		if (ret >= 0) {
-+			status = ret;
-+			ret = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gsb->cmd.arg0 != MSHW0011_CMD_DEST_BAT0) {
-+		ret = AE_BAD_PARAMETER;
-+		goto err;
-+	}
-+
-+	switch (gsb->cmd.arg1) {
-+	case MSHW0011_CMD_BAT0_STA:
-+		break;
-+	case MSHW0011_CMD_BAT0_BIX:
-+		ret = mshw0011_bix(cdata, &gsb->bix);
-+		break;
-+	case MSHW0011_CMD_BAT0_BTP:
-+		cdata->trip_point = gsb->cmd.arg2;
-+		break;
-+	case MSHW0011_CMD_BAT0_BST:
-+		ret = mshw0011_bst(cdata, &gsb->bst);
-+		break;
-+	default:
-+		pr_info("command(0x%02x) is not supported.\n", gsb->cmd.arg1);
-+		ret = AE_BAD_PARAMETER;
-+		goto err;
-+	}
-+
-+ out:
-+	gsb->ret = status;
-+	gsb->status = 0;
-+
-+ err:
-+	ACPI_FREE(ares);
-+	return ret;
-+}
-+
-+static int mshw0011_install_space_handler(struct i2c_client *client)
-+{
-+	acpi_handle handle;
-+	struct mshw0011_handler_data *data;
-+	acpi_status status;
-+
-+	handle = ACPI_HANDLE(&client->dev);
-+
-+	if (!handle)
-+		return -ENODEV;
-+
-+	data = kzalloc(sizeof(struct mshw0011_handler_data),
-+			    GFP_KERNEL);
-+	if (!data)
-+		return -ENOMEM;
-+
-+	data->client = client;
-+	status = acpi_bus_attach_private_data(handle, (void *)data);
-+	if (ACPI_FAILURE(status)) {
-+		kfree(data);
-+		return -ENOMEM;
-+	}
-+
-+	status = acpi_install_address_space_handler(handle,
-+				ACPI_ADR_SPACE_GSBUS,
-+				&mshw0011_space_handler,
-+				NULL,
-+				data);
-+	if (ACPI_FAILURE(status)) {
-+		dev_err(&client->dev, "Error installing i2c space handler\n");
-+		acpi_bus_detach_private_data(handle);
-+		kfree(data);
-+		return -ENOMEM;
-+	}
-+
-+	acpi_walk_dep_device_list(handle);
-+	return 0;
-+}
-+
-+static void mshw0011_remove_space_handler(struct i2c_client *client)
-+{
-+	acpi_handle handle = ACPI_HANDLE(&client->dev);
-+	struct mshw0011_handler_data *data;
-+	acpi_status status;
-+
-+	if (!handle)
-+		return;
-+
-+	acpi_remove_address_space_handler(handle,
-+				ACPI_ADR_SPACE_GSBUS,
-+				&mshw0011_space_handler);
-+
-+	status = acpi_bus_get_private_data(handle, (void **)&data);
-+	if (ACPI_SUCCESS(status))
-+		kfree(data);
-+
-+	acpi_bus_detach_private_data(handle);
-+}
-+
-+static int mshw0011_probe(struct i2c_client *client)
-+{
-+	struct i2c_board_info board_info;
-+	struct device *dev = &client->dev;
-+	struct i2c_client *bat0;
-+
-+	struct mshw0011_data *data;
-+	int error, mask;
-+
-+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
-+	if (!data)
-+		return -ENOMEM;
-+
-+	data->adp1 = client;
-+	i2c_set_clientdata(client, data);
-+
-+	memset(&board_info, 0, sizeof(board_info));
-+	strlcpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE);
-+
-+	bat0 = i2c_acpi_new_device(dev, 1, &board_info);
-+	if (!bat0)
-+		return -ENOMEM;
-+
-+	data->bat0 = bat0;
-+	i2c_set_clientdata(bat0, data);
-+
-+	error = mshw0011_notify(data, 1, MSHW0011_NOTIFY_GET_VERSION, &mask);
-+	if (error)
-+		goto out_err;
-+
-+	data->notify_mask = mask == MSHW0011_EV_2_5;
-+
-+	data->poll_task = kthread_run(mshw0011_poll_task, data, "mshw0011_adp");
-+	if (IS_ERR(data->poll_task)) {
-+		error = PTR_ERR(data->poll_task);
-+		dev_err(&client->dev, "Unable to run kthread err %d\n", error);
-+		goto out_err;
-+	}
-+
-+	error = mshw0011_install_space_handler(client);
-+	if (error)
-+		goto out_err;
-+
-+	return 0;
-+
-+out_err:
-+	if (data->kthread_running)
-+		kthread_stop(data->poll_task);
-+	i2c_unregister_device(data->bat0);
-+	return error;
-+}
-+
-+static int mshw0011_remove(struct i2c_client *client)
-+{
-+	struct mshw0011_data *cdata = i2c_get_clientdata(client);
-+
-+	mshw0011_remove_space_handler(client);
-+
-+	if (cdata->kthread_running)
-+		kthread_stop(cdata->poll_task);
-+
-+	i2c_unregister_device(cdata->bat0);
-+
-+	return 0;
-+}
-+
-+static const struct acpi_device_id mshw0011_acpi_match[] = {
-+	{ "MSHW0011", 0 },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(acpi, mshw0011_acpi_match);
-+
-+static struct i2c_driver mshw0011_driver = {
-+	.probe_new = mshw0011_probe,
-+	.remove = mshw0011_remove,
-+	.driver = {
-+		.name = "mshw0011",
-+		.acpi_match_table = ACPI_PTR(mshw0011_acpi_match),
-+	},
-+};
-+module_i2c_driver(mshw0011_driver);
-+
-+MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>");
-+MODULE_DESCRIPTION("mshw0011 driver");
-+MODULE_LICENSE("GPL v2");
-- 
-2.19.1
-
--- a/patches/5.0/0010-surface-dock.patch
+++ b/patches/5.0/0010-surface-dock.patch
@ -1,25 +0,0 @@
-From 43ba9ee40098a29dd1db695e7c0d2ade71666419 Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:41:59 -0400
-Subject: [PATCH 10/12] surface-dock
-
---
- drivers/usb/core/quirks.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 8bc35d53408b..11fa56cbd769 100644
--- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -212,6 +212,8 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Cherry Stream G230 2.0 (G85-231) and 3.0 (G85-232) */
- 	{ USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	{ USB_DEVICE(0x045e, 0x07c6), .driver_info = USB_QUIRK_NO_LPM },
-+
- 	/* Logitech HD Pro Webcams C920, C920-C, C925e and C930e */
- 	{ USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT },
- 	{ USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT },
-- 
-2.19.1
-
--- a/patches/5.0/0011-mwlwifi.patch
+++ b/patches/5.0/0011-mwlwifi.patch
--- a/patches/5.0/0012-surface-lte.patch
+++ b/patches/5.0/0012-surface-lte.patch
@ -1,24 +0,0 @@
-From c58fc7ab7db232cfcf3ad7dd3b47e8884ec786b3 Mon Sep 17 00:00:00 2001
-From: Jake Day <jake@ninebysix.com>
-Date: Tue, 30 Apr 2019 20:45:40 -0400
-Subject: [PATCH 12/12] surface-lte
-
---
- drivers/usb/serial/qcserial.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
-index 613f91add03d..e1428222dd73 100644
--- a/drivers/usb/serial/qcserial.c
-+++ b/drivers/usb/serial/qcserial.c
-@@ -177,6 +177,7 @@ static const struct usb_device_id id_table[] = {
- 	{DEVICE_SWI(0x413c, 0x81d0)},   /* Dell Wireless 5819 */
- 	{DEVICE_SWI(0x413c, 0x81d1)},   /* Dell Wireless 5818 */
- 	{DEVICE_SWI(0x413c, 0x81d2)},   /* Dell Wireless 5818 */
-+	{DEVICE_SWI(0x045e, 0x096e)},   /* Microsoft Surface Go LTE */
- 
- 	/* Huawei devices */
- 	{DEVICE_HWI(0x03f0, 0x581d)},	/* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */
-- 
-2.19.1
-
--- a/patches/5.1/0001-surface-acpi.patch
+++ b/patches/5.1/0001-surface-acpi.patch
@ -1,6 +1,6 @@
-From 2d5882e7390d6fbf95d79a41e234ae115bcb24a7 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 00:54:17 +0200
+From e69519a8701cd692f2c84371b1abc0bfbc64b70c Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:40:15 -0400
 Subject: [PATCH 01/12] surface-acpi

 ---
@ -4135,5 +4135,5 @@ index a0ac16ee6575..0dd242ff24d1 100644
 		return -ENODEV;
 
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0002-suspend.patch
+++ b/patches/5.1/0002-suspend.patch
@ -1,6 +1,6 @@
-From 3fe86ef98282f3509f77b2b454447d792f18b7b8 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 00:56:09 +0200
+From c5b093023e84b52723da6d899902f7d4e683203f Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:40:30 -0400
 Subject: [PATCH 02/12] suspend

 ---
@ -65,7 +65,7 @@ index a90cf5d63aac..de5d5a2b1d38 100644
 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index a077f67fe1da..f8be239321a9 100644
+index cc616a5f6a8f..e2e95850383b 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
@@ -1357,6 +1357,10 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID,
@ -141,5 +141,5 @@ index c9ec050bcf46..155e94652093 100644
 		.procname	= "sched_child_runs_first",
 		.data		= &sysctl_sched_child_runs_first,
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0003-buttons.patch
+++ b/patches/5.1/0003-buttons.patch
@ -1,6 +1,6 @@
-From 7b0b4c6986dff87b46e9118da1aadce5f7ee50f4 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 00:57:01 +0200
+From 84dad3e0dc3463df79007844c490071666871a98 Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:40:42 -0400
 Subject: [PATCH 03/12] buttons

 ---
@ -253,5 +253,5 @@ index 1b491690ce07..eaec30380b11 100644
 	if (!button)
 		return -ENOMEM;
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0004-cameras.patch
+++ b/patches/5.1/0004-cameras.patch
@ -1,6 +1,6 @@
-From ce8553fab11b20873bb9105ecd0a49ae69aa8c4b Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 00:58:12 +0200
+From 37339e1807907478a17fc0f978002f6e52c9a01f Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:40:52 -0400
 Subject: [PATCH 04/12] cameras

 ---
@ -2749,5 +2749,5 @@ index 000000000000..79aef69666e8
 +};
 +#endif
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0005-ipts.patch
+++ b/patches/5.1/0005-ipts.patch
@ -1,6 +1,6 @@
-From 7216e2f8bf8006e9af0852a66afb7e68b8dea82f Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:02:29 +0200
+From 2034ee48e92c8cae6c8aa6590a5ac8b55a0b48bf Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:41:03 -0400
 Subject: [PATCH 05/12] ipts

 ---
@ -1174,7 +1174,7 @@ index 5e98fd79bd9d..523bc6354481 100644
 					    struct intel_context *ce)
 {
 diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h
-index f1aec8a6986f..2745cfb3e7dc 100644
+index f1aec8a6986f..faa403f1378d 100644
 --- a/drivers/gpu/drm/i915/intel_lrc.h
 +++ b/drivers/gpu/drm/i915/intel_lrc.h
@@ -112,6 +112,15 @@ void intel_execlists_show_requests(struct intel_engine_cs *engine,
@ -6174,5 +6174,5 @@ index 000000000000..f329bbfb8079
 +
 +#endif // INTEL_IPTS_IF_H
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0006-hid.patch
+++ b/patches/5.1/0006-hid.patch
@ -1,6 +1,6 @@
-From 6cc9c83a79ad320d66c031be1b1be5fc75d893bf Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:03:32 +0200
+From 60b85d6a779a891319435c500ff2a57bc8ac9d3f Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:41:14 -0400
 Subject: [PATCH 06/12] hid

 ---
@ -147,5 +147,5 @@ index 77ffba48cc73..517143d5b305 100644
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0007-sdcard-reader.patch
+++ b/patches/5.1/0007-sdcard-reader.patch
@ -1,6 +1,6 @@
-From 2ac6068e68209c79012a1d90a50c97cc9349bb50 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:04:02 +0200
+From 6352e8e30f86e80e27abaf9a86e280ec5c39e908 Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:41:26 -0400
 Subject: [PATCH 07/12] sdcard-reader

 ---
@ -8,7 +8,7 @@ Subject: [PATCH 07/12] sdcard-reader
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 8d4631c81b9f..904ab3de183a 100644
+index 310eef451db8..a896e86ca0d7 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
@@ -4198,7 +4198,8 @@ void usb_enable_lpm(struct usb_device *udev)
@ -22,5 +22,5 @@ index 8d4631c81b9f..904ab3de183a 100644
 
 	udev->lpm_disable_count--;
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0008-wifi.patch
+++ b/patches/5.1/0008-wifi.patch
@ -1,6 +1,6 @@
-From 05691e019642cdeaa5e1519000daa9f69006e27b Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:04:58 +0200
+From f2aae4bbd6842ac44f0d7223bb3ffc11da881b00 Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:41:37 -0400
 Subject: [PATCH 08/12] wifi

 ---
@ -33,7 +33,7 @@ index 042a1d07f686..fc9041f58e9f 100644
 
 		skb_src = skb_dequeue(&pra_list->skb_head);
 diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-index c46f0a54a0c7..bce482bbcc6d 100644
+index e582d9b3e50c..92c49eb3c5a3 100644
 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
 +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -437,7 +437,10 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
@ -266,5 +266,5 @@ diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
 old mode 100755
 new mode 100644
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0009-surface3-power.patch
+++ b/patches/5.1/0009-surface3-power.patch
@ -1,7 +1,7 @@
-From 8595ec15b6e77c335c79c938eb292700c5c9abc0 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:05:57 +0200
-Subject: [PATCH 09/12] surface-power
+From 6179098feb5e463e496d0049be30cc3cdd5768ed Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:42:01 -0400
+Subject: [PATCH 09/12] surface3-power

 ---
 drivers/platform/x86/Kconfig          |   7 +
@ -651,5 +651,5 @@ index 000000000000..e0af01a60302
 +MODULE_DESCRIPTION("mshw0011 driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0010-surface-dock.patch
+++ b/patches/5.1/0010-surface-dock.patch
@ -1,6 +1,6 @@
-From d98b685791c6001530e73a6e1a6e13a308a911d9 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:06:31 +0200
+From 2a6337d5e11ff46a01b0c5a2e32ee2deb6eec812 Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:42:13 -0400
 Subject: [PATCH 10/12] surface-dock

 ---
@ -21,5 +21,5 @@ index 8bc35d53408b..11fa56cbd769 100644
 	{ USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT },
 	{ USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT },
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0011-mwlwifi.patch
+++ b/patches/5.1/0011-mwlwifi.patch
@ -1,6 +1,6 @@
-From a24d901e392f83233e0d7e1fc205573a2a6e44be Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:07:23 +0200
+From 0fde5c18106ae169eeceed14675a1942f31e31c0 Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:42:24 -0400
 Subject: [PATCH 11/12] mwlwifi

 ---
@ -19751,5 +19751,5 @@ index 000000000000..b6fdf70c22fb
 +
 +#endif /* _VENDOR_CMD_H_ */
 -- 
-2.21.0
+2.19.1

--- a/patches/5.1/0012-surface-lte.patch
+++ b/patches/5.1/0012-surface-lte.patch
@ -1,6 +1,6 @@
-From 72d8973b13354125b9a5c6f6693f15bf57717691 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Thu, 16 May 2019 01:07:48 +0200
+From 49341203210ccb8486f1f2c380e871cb9cd1aa33 Mon Sep 17 00:00:00 2001
+From: Jake Day <jake@ninebysix.com>
+Date: Thu, 6 Jun 2019 13:42:35 -0400
 Subject: [PATCH 12/12] surface-lte

 ---
@ -20,5 +20,5 @@ index 613f91add03d..e1428222dd73 100644
 	/* Huawei devices */
 	{DEVICE_HWI(0x03f0, 0x581d)},	/* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */
 -- 
-2.21.0
+2.19.1