udpate

Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>

defconfig

@@ -1,10 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-<<<<<<< HEAD
-# Linux/x86 6.3.0-rc5 Kernel Configuration
-=======
 # Linux/x86 6.5.0-rc1 Kernel Configuration
->>>>>>> 31bd4b9 (update)
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.1 20220421 (Red Hat 11.3.1-2)"
 CONFIG_CC_IS_GCC=y
@@ -181,10 +177,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-<<<<<<< HEAD
-CONFIG_GCC12_NO_ARRAY_BOUNDS=y
-=======
->>>>>>> 31bd4b9 (update)
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_NUMA_BALANCING is not set
@@ -440,6 +432,7 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+# CONFIG_X86_SGX is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_HANDOVER_PROTOCOL=y
@@ -831,12 +824,8 @@ CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
-<<<<<<< HEAD
-# CONFIG_BLK_DEV_INTEGRITY is not set
-=======
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
->>>>>>> 31bd4b9 (update)
 # CONFIG_BLK_DEV_ZONED is not set
 # CONFIG_BLK_DEV_THROTTLING is not set
 # CONFIG_BLK_WBT is not set
@@ -973,12 +962,9 @@ CONFIG_SECRETMEM=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
 # CONFIG_LRU_GEN is not set
-<<<<<<< HEAD
-=======
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
->>>>>>> 31bd4b9 (update)
 
 #
 # Data Access Monitoring
@@ -1693,7 +1679,7 @@ CONFIG_VIRTIO_BLK=y
 # SCSI device support
 #
 CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI_COMMON=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
@@ -1718,15 +1704,10 @@ CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 CONFIG_SCSI_ISCSI_ATTRS=y
-<<<<<<< HEAD
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-=======
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
 # CONFIG_SCSI_SAS_ATA is not set
 CONFIG_SCSI_SAS_HOST_SMP=y
->>>>>>> 31bd4b9 (update)
 # CONFIG_SCSI_SRP_ATTRS is not set
 # end of SCSI Transports
 
@@ -1754,13 +1735,17 @@ CONFIG_SCSI_HISI_SAS_DEBUGFS_DEFAULT_ENABLE=y
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS is not set
 # CONFIG_SCSI_MPI3MR is not set
-# CONFIG_SCSI_SMARTPQI is not set
+CONFIG_SCSI_SMARTPQI=m
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_MYRB is not set
@@ -1783,7 +1768,7 @@ CONFIG_SCSI_HISI_SAS_DEBUGFS_DEFAULT_ENABLE=y
 # CONFIG_SCSI_WD719X is not set
 CONFIG_SCSI_DEBUG=m
 # CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
+CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_VIRTIO=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_DH is not set
@@ -1804,9 +1789,6 @@ CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MOBILE_LPM_POLICY=0
 # CONFIG_SATA_AHCI_PLATFORM is not set
-<<<<<<< HEAD
-# CONFIG_AHCI_DWC is not set
-=======
 # CONFIG_AHCI_BRCM is not set
 # CONFIG_AHCI_DA850 is not set
 # CONFIG_AHCI_DM816 is not set
@@ -1820,7 +1802,6 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0
 # CONFIG_SATA_FSL is not set
 # CONFIG_SATA_GEMINI is not set
 # CONFIG_SATA_AHCI_SEATTLE is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_ACARD_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
@@ -2118,12 +2099,6 @@ CONFIG_E1000E_HWTS=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
-<<<<<<< HEAD
-CONFIG_NET_VENDOR_WANGXUN=y
-# CONFIG_NGBE is not set
-# CONFIG_TXGBE is not set
-=======
->>>>>>> 31bd4b9 (update)
 # CONFIG_JME is not set
 # CONFIG_KORINA is not set
 CONFIG_NET_VENDOR_LITEX=y
@@ -3043,6 +3018,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_FAM15H_POWER is not set
 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_BT1_PVT is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
@@ -3087,10 +3063,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX197 is not set
 # CONFIG_SENSORS_MAX31730 is not set
 # CONFIG_SENSORS_MAX31760 is not set
-<<<<<<< HEAD
-=======
 # CONFIG_MAX31827 is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
@@ -3413,11 +3386,8 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_EXYNOS_LPASS is not set
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MP2629 is not set
-<<<<<<< HEAD
-=======
 # CONFIG_MFD_MXS_LRADC is not set
 # CONFIG_MFD_MX25_TSADC is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MFD_INTEL_LPSS_ACPI is not set
@@ -3443,10 +3413,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_MENF21BMC is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
-<<<<<<< HEAD
-=======
 # CONFIG_MFD_PM8XXX is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_MFD_SY7636A is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT4831 is not set
@@ -3454,10 +3421,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_RT5120 is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_SI476X_CORE is not set
-<<<<<<< HEAD
-=======
 # CONFIG_MFD_SL28CPLD is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_RZ_MTU3 is not set
@@ -3534,13 +3498,9 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-<<<<<<< HEAD
-# CONFIG_BACKLIGHT_KTZ8866 is not set
-=======
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTZ8866 is not set
 # CONFIG_BACKLIGHT_OMAP1 is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_BACKLIGHT_APPLE is not set
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
@@ -3656,10 +3616,7 @@ CONFIG_HID_TOPSEED=y
 
 CONFIG_I2C_HID=y
 # CONFIG_I2C_HID_ACPI is not set
-<<<<<<< HEAD
-=======
 # CONFIG_I2C_HID_OF is not set
->>>>>>> 31bd4b9 (update)
 
 #
 # Intel ISH HID support
@@ -3845,12 +3802,9 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_MSM6242 is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_RP5C01 is not set
-<<<<<<< HEAD
-=======
 # CONFIG_RTC_DRV_GAMECUBE is not set
 # CONFIG_RTC_DRV_SC27XX is not set
 CONFIG_RTC_DRV_SPEAR=y
->>>>>>> 31bd4b9 (update)
 
 #
 # on-CPU RTC drivers
@@ -3916,9 +3870,6 @@ CONFIG_DMA_ACPI=y
 # CONFIG_NBPFAXI_DMA is not set
 # CONFIG_PCH_DMA is not set
 # CONFIG_PLX_DMA is not set
-<<<<<<< HEAD
-# CONFIG_XILINX_XDMA is not set
-=======
 # CONFIG_STM32_DMA is not set
 # CONFIG_STM32_DMAMUX is not set
 # CONFIG_SPRD_DMA is not set
@@ -3931,7 +3882,6 @@ CONFIG_DMA_ACPI=y
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 # CONFIG_MTK_HSDMA is not set
 # CONFIG_MTK_CQDMA is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_AMD_PTDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -4269,8 +4219,6 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 # end of Enable LiteX SoC Builder specific drivers
 
-<<<<<<< HEAD
-=======
 # CONFIG_LOONGSON2_GUTS is not set
 
 #
@@ -4283,7 +4231,6 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y
 # CONFIG_MTK_MMSYS is not set
 # end of MediaTek SoC drivers
 
->>>>>>> 31bd4b9 (update)
 # CONFIG_WPCM450_SOC is not set
 
 #
@@ -4854,10 +4801,7 @@ CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
 CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_GCM=y
-<<<<<<< HEAD
-=======
 CONFIG_CRYPTO_GENIV=y
->>>>>>> 31bd4b9 (update)
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=y
 # CONFIG_CRYPTO_ESSIV is not set
@@ -4893,10 +4837,7 @@ CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_CRCT10DIF=y
-<<<<<<< HEAD
-=======
 CONFIG_CRYPTO_CRC64_ROCKSOFT=y
->>>>>>> 31bd4b9 (update)
 # end of CRCs (cyclic redundancy checks)
 
 #
@@ -4920,10 +4861,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-<<<<<<< HEAD
-=======
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
->>>>>>> 31bd4b9 (update)
 # end of Random number generation
 
 #
@@ -5077,13 +5015,8 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
-<<<<<<< HEAD
-# CONFIG_CRC64_ROCKSOFT is not set
-# CONFIG_CRC_ITU_T is not set
-=======
 CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=y
->>>>>>> 31bd4b9 (update)
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
@@ -5148,7 +5081,7 @@ CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
-# CONFIG_IRQ_POLL is not set
+CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
@@ -5180,11 +5113,7 @@ CONFIG_SBITMAP=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CALLER=y
-<<<<<<< HEAD
-# CONFIG_STACKTRACE_BUILD_ID is not set
-=======
 CONFIG_STACKTRACE_BUILD_ID=y
->>>>>>> 31bd4b9 (update)
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@@ -5273,15 +5202,11 @@ CONFIG_ARCH_HAS_DEBUG_WX=y
 CONFIG_GENERIC_PTDUMP=y
 # CONFIG_PTDUMP_DEBUGFS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-<<<<<<< HEAD
-# CONFIG_DEBUG_KMEMLEAK is not set
-=======
 CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
 # CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF is not set
 CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
 # CONFIG_PER_VMA_LOCK_STATS is not set
->>>>>>> 31bd4b9 (update)
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SHRINKER_DEBUG is not set
 CONFIG_DEBUG_STACK_USAGE=y
@@ -5327,7 +5252,7 @@ CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_WQ_WATCHDOG=y
 # CONFIG_WQ_CPU_INTENSIVE_REPORT is not set
 # CONFIG_TEST_LOCKUP is not set