diff --git a/arch/loongarch/configs/deepin_loongarch_desktop_defconfig b/arch/loongarch/configs/deepin_loongarch_desktop_defconfig index 82986e0016040..b4bded7e979f9 100644 --- a/arch/loongarch/configs/deepin_loongarch_desktop_defconfig +++ b/arch/loongarch/configs/deepin_loongarch_desktop_defconfig @@ -5868,7 +5868,7 @@ CONFIG_EVM=y CONFIG_EVM_EXTRA_SMACK_XATTRS=y CONFIG_EVM_ADD_XATTRS=y CONFIG_DEFAULT_SECURITY_APPARMOR=y -CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf" +CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf" CONFIG_INIT_STACK_NONE=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_LIST_HARDENED=y diff --git a/arch/x86/configs/deepin_x86_desktop_defconfig b/arch/x86/configs/deepin_x86_desktop_defconfig index 1f3a9ac8ffbed..9b676def6fb41 100644 --- a/arch/x86/configs/deepin_x86_desktop_defconfig +++ b/arch/x86/configs/deepin_x86_desktop_defconfig @@ -59,12 +59,14 @@ CONFIG_KEXEC_SIG=y CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_KEXEC_JUMP=y CONFIG_SMP=y +CONFIG_AMD_SECURE_AVIC=y +CONFIG_X86_POSTED_MSI=y CONFIG_X86_CPU_RESCTRL=y CONFIG_X86_NUMACHIP=y CONFIG_X86_VSMP=y CONFIG_X86_UV=y -CONFIG_X86_GOLDFISH=y CONFIG_X86_INTEL_MID=y +CONFIG_X86_GOLDFISH=y CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_PARAVIRT_SPINLOCKS=y @@ -72,6 +74,7 @@ CONFIG_XEN=y CONFIG_XEN_PVH=y CONFIG_JAILHOUSE_GUEST=y CONFIG_ACRN_GUEST=y +CONFIG_BHYVE_GUEST=y CONFIG_INTEL_TDX_GUEST=y CONFIG_PROCESSOR_SELECT=y CONFIG_GART_IOMMU=y @@ -86,6 +89,7 @@ CONFIG_PERF_EVENTS_AMD_UNCORE=m CONFIG_PERF_EVENTS_AMD_BRS=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m +CONFIG_X86_CPA_STATISTICS=y CONFIG_AMD_MEM_ENCRYPT=y CONFIG_NUMA=y CONFIG_ARCH_MEMORY_PROBE=y @@ -95,10 +99,10 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 CONFIG_X86_INTEL_TSX_MODE_AUTO=y CONFIG_X86_SGX=y CONFIG_X86_USER_SHADOW_STACK=y +CONFIG_INTEL_TDX_HOST=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y -CONFIG_HYGON_CSV=y CONFIG_HZ_1000=y CONFIG_LIVEPATCH=y CONFIG_HIBERNATION=y @@ -108,11 +112,11 @@ CONFIG_PM_ADVANCED_DEBUG=y CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y CONFIG_ENERGY_MODEL=y CONFIG_ACPI_FPDT=y +CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_DEBUG=y CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_SBS=m @@ -219,14 +223,21 @@ CONFIG_NUMA_EMU=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m +CONFIG_INET_PSP=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m CONFIG_TLS_DEVICE=y CONFIG_XFRM_USER=m CONFIG_XFRM_USER_COMPAT=m CONFIG_XFRM_INTERFACE=m +CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_STATISTICS=y CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_XFRM_IPTFS=m +CONFIG_SMC=m +CONFIG_SMC_DIAG=m +CONFIG_DIBS=m CONFIG_XDP_SOCKETS=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_IP_MULTICAST=y @@ -292,9 +303,11 @@ CONFIG_MPTCP=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETFILTER=y CONFIG_BRIDGE_NETFILTER=m +CONFIG_NETFILTER_NETLINK_HOOK=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y @@ -339,8 +352,12 @@ CONFIG_NFT_SYNPROXY=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FIB_NETDEV=m +CONFIG_NFT_REJECT_NETDEV=m CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m +CONFIG_NF_FLOW_TABLE_PROCFS=y +CONFIG_NETFILTER_XTABLES_COMPAT=y +CONFIG_NETFILTER_XTABLES_LEGACY=y CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m @@ -358,6 +375,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m @@ -395,6 +413,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m @@ -439,6 +458,7 @@ CONFIG_IP_VS_SH=m CONFIG_IP_VS_MH=m CONFIG_IP_VS_SED=m CONFIG_IP_VS_NQ=m +CONFIG_IP_VS_TWOS=m CONFIG_IP_VS_FTP=m CONFIG_IP_VS_PE_SIP=m CONFIG_NFT_DUP_IPV4=m @@ -453,7 +473,15 @@ CONFIG_IP_NF_MATCH_RPFILTER=m CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -468,8 +496,13 @@ CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_RPFILTER=m CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_MATCH_SRH=m +CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m @@ -509,8 +542,14 @@ CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_BRIDGE=m CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_BRIDGE_MRP=y +CONFIG_BRIDGE_CFM=y CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_HELLCREEK=m CONFIG_NET_DSA_TAG_RTL4_A=m +CONFIG_NET_DSA_TAG_RTL8_4=m +CONFIG_NET_DSA_TAG_RZN1_A5PSW=m +CONFIG_NET_DSA_TAG_XRS700X=m CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y @@ -552,12 +591,15 @@ CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m CONFIG_NET_SCH_ETS=m +CONFIG_NET_SCH_BPF=y +CONFIG_NET_SCH_DUALPI2=m CONFIG_NET_SCH_DEFAULT=y CONFIG_DEFAULT_FQ_CODEL=y CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=m @@ -570,6 +612,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_CANID=m CONFIG_NET_EMATCH_IPSET=m CONFIG_NET_EMATCH_IPT=m CONFIG_NET_CLS_ACT=y @@ -589,9 +632,13 @@ CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m CONFIG_NET_ACT_TUNNEL_KEY=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GATE=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m CONFIG_NET_TC_SKB_EXT=y CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m @@ -716,7 +763,6 @@ CONFIG_NFC_NXP_NCI=m CONFIG_NFC_NXP_NCI_I2C=m CONFIG_NFC_S3FWRN5_I2C=m CONFIG_NFC_ST95HF=m -CONFIG_NET_IFE=m CONFIG_PCI=y CONFIG_PCIEAER=y CONFIG_PCIE_ECRC=y @@ -764,7 +810,6 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_COMPRESS=y CONFIG_FW_LOADER_COMPRESS_ZSTD=y CONFIG_DEBUG_DEVRES=y -CONFIG_MHI_BUS=m CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_BUS_EP=m CONFIG_CONNECTOR=y @@ -928,7 +973,6 @@ CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_GSC_PROXY=m CONFIG_VMWARE_VMCI=m CONFIG_GENWQE=m -CONFIG_ECHO=m CONFIG_BCM_VK=m CONFIG_BCM_VK_TTY=y CONFIG_MISC_ALCOR_PCI=m @@ -1265,6 +1309,7 @@ CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=m CONFIG_AMD_XGBE=m CONFIG_AMD_XGBE_DCB=y +CONFIG_PDS_CORE=m CONFIG_AQTION=m CONFIG_ATL2=m CONFIG_ATL1=m @@ -1279,6 +1324,7 @@ CONFIG_BNX2X=m CONFIG_SYSTEMPORT=m CONFIG_BNXT=m CONFIG_BNXT_DCB=y +CONFIG_BNGE=m CONFIG_MACB=m CONFIG_MACB_PCI=m CONFIG_THUNDER_NIC_PF=m @@ -1322,10 +1368,13 @@ CONFIG_FM10K=m CONFIG_IGC=m CONFIG_IDPF=m CONFIG_JME=m +CONFIG_ADIN1110=m CONFIG_MVMDIO=m CONFIG_SKGE=m CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m +CONFIG_OCTEON_EP=m +CONFIG_OCTEON_EP_VF=m CONFIG_PRESTERA=m CONFIG_MLX4_EN=m # CONFIG_MLX4_DEBUG is not set @@ -1343,7 +1392,9 @@ CONFIG_KSZ884X_PCI=m CONFIG_ENC28J60=m CONFIG_ENCX24J600=m CONFIG_LAN743X=m +CONFIG_LAN865X=m CONFIG_YT6801=m +CONFIG_MSCC_OCELOT_SWITCH=m CONFIG_MYRI10GE=m CONFIG_FEALNX=m CONFIG_NI_XGE_MANAGEMENT_ENET=m @@ -1371,8 +1422,11 @@ CONFIG_R6040=m CONFIG_ATP=m CONFIG_8139CP=m CONFIG_8139TOO=m +CONFIG_8139TOO_TUNE_TWISTER=y CONFIG_8139TOO_8129=y CONFIG_R8169=m +CONFIG_R8169_LEDS=y +CONFIG_RTASE=m CONFIG_ROCKER=m CONFIG_SXGBE_ETH=m CONFIG_SC92031=m @@ -1385,6 +1439,7 @@ CONFIG_EPIC100=m CONFIG_SMSC911X=m CONFIG_SMSC9420=m CONFIG_STMMAC_ETH=m +CONFIG_DWMAC_INTEL_PLAT=m CONFIG_STMMAC_PCI=m CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m @@ -1398,9 +1453,14 @@ CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m CONFIG_NGBE=m +CONFIG_TXGBE=m +CONFIG_TXGBEVF=m +CONFIG_NGBEVF=m CONFIG_WIZNET_W5100=m CONFIG_WIZNET_W5300=m CONFIG_WIZNET_W5100_SPI=m +CONFIG_XILINX_EMACLITE=m +CONFIG_XILINX_AXI_EMAC=m CONFIG_XILINX_LL_TEMAC=m CONFIG_PCMCIA_XIRC2PS=m CONFIG_FDDI=y @@ -1575,9 +1635,6 @@ CONFIG_ATH11K=m CONFIG_ATH11K_AHB=m CONFIG_ATH11K_PCI=m CONFIG_ATH12K=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_B43=m CONFIG_B43_SDIO=y @@ -1588,8 +1645,6 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_USB=y CONFIG_BRCMFMAC_PCIE=y CONFIG_BRCM_TRACING=y -CONFIG_AIRO=m -CONFIG_AIRO_CS=m CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m @@ -1603,20 +1658,6 @@ CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLMLD=m # CONFIG_IWLWIFI_DEVICE_TRACING is not set -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_HERMES=m -CONFIG_HERMES_PRISM=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m @@ -1624,7 +1665,6 @@ CONFIG_P54_SPI=m CONFIG_P54_SPI_DEFAULT_EEPROM=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m CONFIG_LIBERTAS_SPI=m CONFIG_LIBERTAS_MESH=y @@ -1711,7 +1751,6 @@ CONFIG_RTW89_8852BTE=m CONFIG_RTW89_8852CE=m CONFIG_RTW89_8922AE=m CONFIG_RTW89_DEBUGMSG=y -CONFIG_RTW89_DEBUGFS=y CONFIG_RSI_91X=m # CONFIG_RSI_DEBUGFS is not set CONFIG_WFX=m @@ -1724,12 +1763,8 @@ CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m -CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m CONFIG_QTNFMAC_PCIE=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_USB_NET_RNDIS_WLAN=m CONFIG_MAC80211_HWSIM=m CONFIG_VIRT_WIFI=m CONFIG_WAN=y @@ -2114,10 +2149,12 @@ CONFIG_I2C_ALI15X3=m CONFIG_I2C_AMD756=m CONFIG_I2C_AMD8111=m CONFIG_I2C_AMD_MP2=m +CONFIG_I2C_AMD_ASF=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m +CONFIG_I2C_CHT_WC=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m CONFIG_I2C_SIS5595=m @@ -2125,11 +2162,12 @@ CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m +CONFIG_I2C_ZHAOXIN=m CONFIG_I2C_SCMI=m CONFIG_I2C_CBUS_GPIO=m CONFIG_I2C_DESIGNWARE_CORE=y CONFIG_I2C_DESIGNWARE_SLAVE=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_AMDISP=m CONFIG_I2C_DESIGNWARE_AMDPSP=y CONFIG_I2C_DESIGNWARE_BAYTRAIL=y CONFIG_I2C_DESIGNWARE_PCI=m @@ -2142,7 +2180,9 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_DLN2=m +CONFIG_I2C_CP2615=m CONFIG_I2C_PARPORT=m +CONFIG_I2C_PCI1XXXX=m CONFIG_I2C_ROBOTFUZZ_OSIF=m CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m @@ -2172,7 +2212,6 @@ CONFIG_SPI_GPIO=m CONFIG_SPI_INTEL_PCI=m CONFIG_SPI_INTEL_PLATFORM=m CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_MICROCHIP_CORE=m CONFIG_SPI_MICROCHIP_CORE_QSPI=m CONFIG_SPI_LANTIQ_SSC=m CONFIG_SPI_OC_TINY=m @@ -2203,6 +2242,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m CONFIG_PTP_1588_CLOCK_VMW=m CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_AMDISP=m CONFIG_PINCTRL_AXP209=m CONFIG_PINCTRL_AW9523=m CONFIG_PINCTRL_CY8C95X0=m @@ -2290,7 +2330,7 @@ CONFIG_GPIO_KEMPLD=m CONFIG_GPIO_LP3943=m CONFIG_GPIO_LP873X=m CONFIG_GPIO_MADERA=m -CONFIG_GPIO_PALMAS=y +CONFIG_GPIO_PALMAS=m CONFIG_GPIO_RC5T583=y CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS6586X=y @@ -2546,7 +2586,6 @@ CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NZXT_KRAKEN2=m CONFIG_SENSORS_NZXT_SMART2=m CONFIG_SENSORS_OCC_P8_I2C=m -CONFIG_SENSORS_OXP=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_ADM1266=m @@ -2761,7 +2800,6 @@ CONFIG_MFD_CS42L43_I2C=m CONFIG_MFD_MADERA=m CONFIG_MFD_MADERA_I2C=m CONFIG_MFD_MADERA_SPI=m -CONFIG_MFD_MAX5970=m CONFIG_MFD_CS47L15=y CONFIG_MFD_CS47L35=y CONFIG_MFD_CS47L85=y @@ -2794,6 +2832,7 @@ CONFIG_MFD_KEMPLD=m CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m CONFIG_MFD_88PM860X=y +CONFIG_MFD_MAX5970=m CONFIG_MFD_MAX14577=y CONFIG_MFD_MAX77541=m CONFIG_MFD_MAX77693=y @@ -2907,7 +2946,6 @@ CONFIG_REGULATOR_MC13783=m CONFIG_REGULATOR_MC13892=m CONFIG_REGULATOR_MP8859=m CONFIG_REGULATOR_MT6311=m -CONFIG_REGULATOR_MT6315=m CONFIG_REGULATOR_MT6323=m CONFIG_REGULATOR_MT6331=m CONFIG_REGULATOR_MT6332=m @@ -2923,8 +2961,6 @@ CONFIG_REGULATOR_PV88060=m CONFIG_REGULATOR_PV88080=m CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_PWM=m -CONFIG_REGULATOR_QCOM_SPMI=m -CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m @@ -2957,7 +2993,6 @@ CONFIG_REGULATOR_WM831X=m CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_WM8994=m -CONFIG_REGULATOR_QCOM_LABIBB=m CONFIG_RC_CORE=m CONFIG_LIRC=y CONFIG_RC_DECODERS=y @@ -3204,8 +3239,10 @@ CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_VIA_CAMERA=m CONFIG_SMS_SDIO_DRV=m CONFIG_DVB_FIREDTV=m +CONFIG_VIDEO_ALVIUM_CSI2=m CONFIG_VIDEO_AR0521=m CONFIG_VIDEO_GC0308=m +CONFIG_VIDEO_GC0310=m CONFIG_VIDEO_GC05A2=m CONFIG_VIDEO_GC08A3=m CONFIG_VIDEO_GC2145=m @@ -3228,12 +3265,17 @@ CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX415=m CONFIG_VIDEO_MT9M001=m CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9M114=m CONFIG_VIDEO_MT9P031=m CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_OG01A1B=m +CONFIG_VIDEO_OG0VE1B=m CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m +CONFIG_VIDEO_OV02E10=m +CONFIG_VIDEO_OV02C10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m CONFIG_VIDEO_OV13858=m @@ -3241,6 +3283,7 @@ CONFIG_VIDEO_OV13B10=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m +CONFIG_VIDEO_OV2735=m CONFIG_VIDEO_OV2740=m CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m @@ -3251,8 +3294,8 @@ CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV6211=m CONFIG_VIDEO_OV64A40=m -CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV7740=m @@ -3269,6 +3312,8 @@ CONFIG_VIDEO_RJ54N1=m CONFIG_VIDEO_S5C73M3=m CONFIG_VIDEO_S5K5BAF=m CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_VD55G1=m +CONFIG_VIDEO_VD56G3=m CONFIG_VIDEO_VGXY61=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m @@ -3312,9 +3357,13 @@ CONFIG_DVB_LGS8GL5=m CONFIG_DVB_LNBH29=m CONFIG_DVB_DUMMY_FE=m CONFIG_HD44780=m +CONFIG_LCD2S=m CONFIG_KS0108=m CONFIG_CFAG12864B=m CONFIG_IMG_ASCII_LCD=m +CONFIG_HT16K33=m +CONFIG_MAX6959=m +CONFIG_SEG_LED_GPIO=m CONFIG_PANEL=m CONFIG_AGP=y CONFIG_AGP_AMD64=y @@ -3403,7 +3452,6 @@ CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_PANEL_RAYDIUM_RM67191=m CONFIG_DRM_PANEL_RAYDIUM_RM68200=m CONFIG_DRM_PANEL_RAYDIUM_RM692E5=m @@ -3452,6 +3500,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m CONFIG_DRM_CHRONTEL_CH7033=m CONFIG_DRM_CROS_EC_ANX7688=m CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_ITE_IT6505=m CONFIG_DRM_LONTIUM_LT8912B=m CONFIG_DRM_LONTIUM_LT9211=m @@ -3491,14 +3540,25 @@ CONFIG_DRM_ETNAVIV=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_GM12U320=m +CONFIG_DRM_PANEL_MIPI_DBI=m +CONFIG_DRM_PIXPAPER=m CONFIG_TINYDRM_HX8357D=m +CONFIG_TINYDRM_ILI9163=m CONFIG_TINYDRM_ILI9225=m CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_ILI9486=m CONFIG_TINYDRM_MI0283QT=m CONFIG_TINYDRM_REPAPER=m +CONFIG_TINYDRM_SHARP_MEMORY=m CONFIG_DRM_XEN_FRONTEND=m CONFIG_DRM_VBOXVIDEO=m +CONFIG_DRM_GUD=m +CONFIG_DRM_ST7571_I2C=m +CONFIG_DRM_ST7586=m +CONFIG_DRM_ST7735R=m +CONFIG_DRM_SSD130X=m +CONFIG_DRM_SSD130X_I2C=m +CONFIG_DRM_SSD130X_SPI=m CONFIG_FB=y CONFIG_FB_CIRRUS=m CONFIG_FB_PM2=m @@ -3578,8 +3638,10 @@ CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_DA903X=m CONFIG_BACKLIGHT_DA9052=m CONFIG_BACKLIGHT_MAX8925=m +CONFIG_BACKLIGHT_MT6370=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_QCOM_WLED=m +CONFIG_BACKLIGHT_RT4831=m CONFIG_BACKLIGHT_SAHARA=m CONFIG_BACKLIGHT_WM831X=m CONFIG_BACKLIGHT_ADP5520=m @@ -3587,10 +3649,12 @@ CONFIG_BACKLIGHT_ADP8860=m CONFIG_BACKLIGHT_ADP8870=m CONFIG_BACKLIGHT_88PM860X=m CONFIG_BACKLIGHT_AAT2870=m +CONFIG_BACKLIGHT_LM3509=m CONFIG_BACKLIGHT_LM3630A=m CONFIG_BACKLIGHT_LM3639=m CONFIG_BACKLIGHT_LP855X=m CONFIG_BACKLIGHT_LP8788=m +CONFIG_BACKLIGHT_MP3309C=m CONFIG_BACKLIGHT_PANDORA=m CONFIG_BACKLIGHT_SKY81452=m CONFIG_BACKLIGHT_AS3711=m @@ -3779,12 +3843,6 @@ CONFIG_SND_SOC_FSL_RPMSG=m CONFIG_SND_SOC_IMX_AUDMUX=m CONFIG_SND_SOC_CHV3_I2S=m CONFIG_SND_I2S_HI6210_I2S=m -CONFIG_SND_SOC_IMG_I2S_IN=m -CONFIG_SND_SOC_IMG_I2S_OUT=m -CONFIG_SND_SOC_IMG_PARALLEL_OUT=m -CONFIG_SND_SOC_IMG_SPDIF_IN=m -CONFIG_SND_SOC_IMG_SPDIF_OUT=m -CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m CONFIG_SND_SOC_INTEL_CATPT=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m CONFIG_SND_SOC_INTEL_AVS=m @@ -3916,7 +3974,6 @@ CONFIG_SND_SOC_MAX9867=m CONFIG_SND_SOC_MAX98520=m CONFIG_SND_SOC_MAX98396=m CONFIG_SND_SOC_MAX9860=m -CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m CONFIG_SND_SOC_PCM1681=m CONFIG_SND_SOC_PCM1789_I2C=m @@ -4165,13 +4222,13 @@ CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m CONFIG_AMD_SFH_HID=m CONFIG_SURFACE_HID=m CONFIG_SURFACE_KBD=m +CONFIG_INTEL_THC_HID=m +CONFIG_INTEL_QUICKSPI=m +CONFIG_INTEL_QUICKI2C=m CONFIG_HID_PID=y CONFIG_USB_HIDDEV=y CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -CONFIG_INTEL_THC_HID=m -CONFIG_INTEL_QUICKSPI=m -CONFIG_INTEL_QUICKI2C=m CONFIG_USB_LED_TRIG=y CONFIG_USB_CONN_GPIO=m CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -4289,6 +4346,7 @@ CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m CONFIG_USB_SERIAL_UPD78F0730=m +CONFIG_USB_SERIAL_XR=m CONFIG_USB_SERIAL_DEBUG=m CONFIG_USB_USS720=m CONFIG_USB_EMI62=m @@ -4302,6 +4360,8 @@ CONFIG_USB_CYTHERM=m CONFIG_USB_IDMOUSE=m CONFIG_USB_APPLEDISPLAY=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_LJCA=m +CONFIG_USB_USBIO=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m @@ -4396,8 +4456,15 @@ CONFIG_TYPEC_HD3SS3220=m CONFIG_TYPEC_STUSB160X=m CONFIG_TYPEC_WUSB3801=m CONFIG_TYPEC_MUX_FSA4480=m +CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_MUX_INTEL_PMC=m +CONFIG_TYPEC_MUX_IT5205=m +CONFIG_TYPEC_MUX_NB7VPQ904M=m +CONFIG_TYPEC_MUX_PS883X=m +CONFIG_TYPEC_MUX_PTN36502=m +CONFIG_TYPEC_MUX_TUSB1046=m +CONFIG_TYPEC_MUX_WCD939X_USBSS=m CONFIG_TYPEC_DP_ALTMODE=m CONFIG_TYPEC_NVIDIA_ALTMODE=m CONFIG_USB_ROLES_INTEL_XHCI=m @@ -4666,7 +4733,6 @@ CONFIG_VFIO_PCI_VGA=y CONFIG_VIRT_DRIVERS=y CONFIG_VBOXGUEST=m CONFIG_NITRO_ENCLAVES=m -CONFIG_CSV_GUEST=m CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_PMEM=m @@ -4680,6 +4746,10 @@ CONFIG_VHOST_NET=m CONFIG_VHOST_SCSI=m CONFIG_VHOST_VSOCK=m CONFIG_VHOST_VDPA=m +CONFIG_HYPERV=y +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m +CONFIG_MSHV_ROOT=m CONFIG_XEN_DEV_EVTCHN=m CONFIG_XENFS=m CONFIG_XEN_GNTDEV_DMABUF=y @@ -4858,7 +4928,6 @@ CONFIG_FB_TFT_UPD161704=m CONFIG_MOST_COMPONENTS=m CONFIG_MOST_NET=m CONFIG_MOST_VIDEO=m -CONFIG_MOST_I2C=m CONFIG_GREYBUS_AUDIO=m CONFIG_GREYBUS_AUDIO_APB_CODEC=m CONFIG_GREYBUS_BOOTROM=m @@ -4918,13 +4987,20 @@ CONFIG_HUAWEI_WMI=m CONFIG_UV_SYSFS=m CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m CONFIG_XIAOMI_WMI=m +CONFIG_REDMI_WMI=m CONFIG_GIGABYTE_WMI=m -CONFIG_YOGABOOK=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m +CONFIG_AMD_HSMP_ACPI=m +CONFIG_AMD_HSMP_PLAT=m CONFIG_AMD_PMF=m +CONFIG_AMD_PMF_DEBUG=y CONFIG_AMD_PMC=m +CONFIG_AMD_HFI=y +CONFIG_AMD_3D_VCACHE=m +CONFIG_AMD_WBRF=y +CONFIG_AMD_ISP_PLATFORM=m CONFIG_ADV_SWBUTTON=m CONFIG_APPLE_GMUX=m CONFIG_ASUS_LAPTOP=m @@ -4945,9 +5021,8 @@ CONFIG_X86_PLATFORM_DRIVERS_HP=y CONFIG_WIRELESS_HOTKEY=m CONFIG_IBM_RTL=m CONFIG_SENSORS_HDAPS=m -CONFIG_THINKPAD_ACPI=m -CONFIG_THINKPAD_LMI=m CONFIG_INTEL_ATOMISP2_LED=m +CONFIG_INTEL_IFS=m CONFIG_INTEL_SAR_INT1092=m CONFIG_INTEL_SKL_INT3472=m CONFIG_INTEL_PMC_CORE=m @@ -4976,16 +5051,25 @@ CONFIG_INTEL_TPMI=m CONFIG_INTEL_PLR_TPMI=m CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_VSEC=m -CONFIG_IDEAPAD_LAPTOP=m +CONFIG_LENOVO_WMI_HOTKEY_UTILITIES=m +CONFIG_LENOVO_WMI_CAMERA=m +CONFIG_LENOVO_YMC=m CONFIG_THINKPAD_ACPI=m CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y CONFIG_THINKPAD_LMI=m +CONFIG_YOGABOOK=m +CONFIG_YT2_1380=m +CONFIG_LENOVO_WMI_GAMEZONE=m CONFIG_ACPI_QUICKSTART=m +CONFIG_MEEGOPAD_ANX7428=m CONFIG_MSI_EC=m CONFIG_MSI_LAPTOP=m CONFIG_MSI_WMI=m +CONFIG_MSI_WMI_PLATFORM=m CONFIG_PCENGINES_APU2=m +CONFIG_PORTWELL_EC=m CONFIG_BARCO_P50_GPIO=m +CONFIG_SAMSUNG_GALAXYBOOK=m CONFIG_SAMSUNG_LAPTOP=m CONFIG_SAMSUNG_Q10=m CONFIG_ACPI_TOSHIBA=m @@ -5002,13 +5086,18 @@ CONFIG_SYSTEM76_ACPI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_TOUCHSCREEN_DMI=y +CONFIG_INSPUR_PLATFORM_PROFILE=m +CONFIG_DASHARO_ACPI=m CONFIG_X86_ANDROID_TABLETS=m CONFIG_INTEL_IPS=m CONFIG_INTEL_SCU_PLATFORM=m CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_SIEMENS_SIMATIC_IPC=m +CONFIG_SILICOM_PLATFORM=m CONFIG_WINMATE_FM07_KEYS=m CONFIG_SEL3350_PLATFORM=m +CONFIG_OXP_EC=m +CONFIG_TUXEDO_NB04_WMI_AB=m CONFIG_COMMON_CLK_WM831X=m CONFIG_LMK04832=m CONFIG_COMMON_CLK_MAX9485=m @@ -5067,9 +5156,7 @@ CONFIG_EXTCON_USB_GPIO=m CONFIG_EXTCON_USBC_CROS_EC=m CONFIG_EXTCON_USBC_TUSB320=m CONFIG_MEMORY=y -CONFIG_IIO_BUFFER_HW_CONSUMER=m CONFIG_FPGA_DFL_EMIF=m -CONFIG_IIO_BUFFER_DMAENGINE=m CONFIG_IIO_BUFFER_HW_CONSUMER=m CONFIG_IIO_SW_DEVICE=m CONFIG_IIO_SW_TRIGGER=m @@ -5181,9 +5268,6 @@ CONFIG_NAU7802=m CONFIG_PAC1921=m CONFIG_PAC1934=m CONFIG_PALMAS_GPADC=m -CONFIG_QCOM_SPMI_IADC=m -CONFIG_QCOM_SPMI_VADC=m -CONFIG_QCOM_SPMI_ADC5=m CONFIG_RICHTEK_RTQ6056=m CONFIG_SD_ADC_MODULATOR=m CONFIG_TI_ADC081C=m @@ -5194,13 +5278,13 @@ CONFIG_TI_ADC12138=m CONFIG_TI_ADC128S052=m CONFIG_TI_ADC161S626=m CONFIG_TI_ADS1015=m -CONFIG_TI_ADS7924=m CONFIG_TI_ADS1100=m +CONFIG_TI_ADS124S08=m +CONFIG_TI_ADS131E08=m +CONFIG_TI_ADS7924=m CONFIG_TI_ADS7950=m CONFIG_TI_ADS8344=m CONFIG_TI_ADS8688=m -CONFIG_TI_ADS124S08=m -CONFIG_TI_ADS131E08=m CONFIG_TI_LMP92064=m CONFIG_TI_TLC4541=m CONFIG_TI_TSC2046=m @@ -5362,7 +5446,6 @@ CONFIG_ISL29125=m CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m -CONFIG_ROHM_BU27008=m CONFIG_ROHM_BU27034=m CONFIG_RPR0521=m CONFIG_SENSORS_LM3533=m @@ -5538,7 +5621,6 @@ CONFIG_LIBNVDIMM=y CONFIG_BLK_DEV_PMEM=m CONFIG_DEV_DAX=m CONFIG_NVMEM_RAVE_SP_EEPROM=m -CONFIG_NVMEM_SPMI_SDAM=m CONFIG_STM=m CONFIG_STM_PROTO_BASIC=m CONFIG_STM_PROTO_SYS_T=m @@ -5813,7 +5895,7 @@ CONFIG_EVM=y CONFIG_EVM_EXTRA_SMACK_XATTRS=y CONFIG_EVM_ADD_XATTRS=y CONFIG_DEFAULT_SECURITY_APPARMOR=y -CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf" +CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf" CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_FORTIFY_SOURCE=y CONFIG_HARDENED_USERCOPY=y @@ -5832,15 +5914,12 @@ CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KEYWRAP=m CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_842=m @@ -5862,7 +5941,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m -CONFIG_CRYPTO_SM4_ZHAOXIN_GMI=m CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64=m CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m @@ -5870,7 +5948,6 @@ CONFIG_CRYPTO_NHPOLY1305_SSE2=m CONFIG_CRYPTO_NHPOLY1305_AVX2=m CONFIG_CRYPTO_POLYVAL_CLMUL_NI=m CONFIG_CRYPTO_SM3_AVX_X86_64=m -CONFIG_CRYPTO_SM3_ZHAOXIN_GMI=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m CONFIG_CRYPTO_DEV_PADLOCK=y CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -5891,13 +5968,11 @@ CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_SAFEXCEL=m CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m CONFIG_CRYPTO_DEV_TSSE=m -CONFIG_HYGON_GM=y CONFIG_PKCS8_PRIVATE_KEY_PARSER=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y CONFIG_SYSTEM_EXTRA_CERTIFICATE=y CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SYSTEM_BLACKLIST_KEYRING=y -CONFIG_CRC4=m CONFIG_XZ_DEC_TEST=m CONFIG_FONTS=y CONFIG_FONT_8x8=y @@ -5950,8 +6025,6 @@ CONFIG_EARLY_PRINTK_USB_XDBC=y CONFIG_IO_DELAY_0XED=y # CONFIG_X86_DEBUG_FPU is not set CONFIG_UNWINDER_FRAME_POINTER=y -# CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_NOTIFIER_ERROR_INJECTION=m CONFIG_FUNCTION_ERROR_INJECTION=y -CONFIG_TEST_BPF=m -CONFIG_TEST_BLACKHOLE_DEV=m +# CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index 63f46a2e57882..93d2662fcf461 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -282,16 +282,22 @@ static int i2c_hid_get_report(struct i2c_hid *ihid, ihid->cmdbuf + length); length += sizeof(__le16); - /* - * In addition to report data device will supply data length - * in the first 2 bytes of the response, so adjust . - */ - error = i2c_hid_xfer(ihid, ihid->cmdbuf, length, - ihid->rawbuf, recv_len + sizeof(__le16)); - if (error) { - dev_err(&ihid->client->dev, - "failed to get a report from device: %d\n", error); - return error; + for (int i = 0; i < 5; ++i) { + /* + * In addition to report data device will supply data length + * in the first 2 bytes of the response, so adjust . + */ + error = i2c_hid_xfer(ihid, ihid->cmdbuf, length, + ihid->rawbuf, recv_len + sizeof(__le16)); + if (!error) + break; + + if (error != -EAGAIN) { + dev_err(&ihid->client->dev, + "failed to get a report from device: %d\n", error); + return error; + } + usleep_range(4000, 5000); } /* The buffer is sufficiently aligned */ diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c index a0c9df3c2cc75..f009dba982d6a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c @@ -347,6 +347,9 @@ static int mt7921_pci_probe(struct pci_dev *pdev, if (!mt7921_disable_aspm && mt76_pci_aspm_supported(pdev)) dev->aspm_supported = true; + pr_info("mt7921_pci_probe: disable_aspm:%d,aspm_supported:%d\n", + mt7921_disable_aspm, dev->aspm_supported); + ret = mt792xe_mcu_fw_pmctrl(dev); if (ret) goto err_free_dev; diff --git a/init/Makefile b/init/Makefile index d6f75d8907e09..543de4bbcd7ce 100644 --- a/init/Makefile +++ b/init/Makefile @@ -30,7 +30,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC) := PREEMPT_DYNAMIC preempt-flag-$(CONFIG_PREEMPT_RT) := PREEMPT_RT build-version = $(or $(KBUILD_BUILD_VERSION), $(build-version-auto)) -build-timestamp = $(or $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto)) +build-timestamp = $(or $(KBUILD_BUILD_VERSION_TIMESTAMP), $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto)) # Maximum length of UTS_VERSION is 64 chars filechk_uts_version = \ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 47c906b807ef2..1576cfa8e7fe7 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1157,7 +1157,7 @@ install-bin: install-tools install-tests install: install-bin try-install-man install-python_ext: - $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)' + $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)' --install-layout=deb # 'make install-doc' should call 'make -C Documentation install' $(INSTALL_DOC_TARGETS):