Linux v4.7-3199-g0e06f5c
This commit is contained in:
parent
5bf108e3df
commit
0fa65442a7
@ -18,15 +18,12 @@ diff --git a/include/linux/efi.h b/include/linux/efi.h
|
|||||||
index 8cb38cfcba74..8c274b4ea8e6 100644
|
index 8cb38cfcba74..8c274b4ea8e6 100644
|
||||||
--- a/include/linux/efi.h
|
--- a/include/linux/efi.h
|
||||||
+++ b/include/linux/efi.h
|
+++ b/include/linux/efi.h
|
||||||
@@ -647,6 +647,12 @@ void efi_native_runtime_setup(void);
|
@@ -647,6 +647,9 @@ void efi_native_runtime_setup(void);
|
||||||
EFI_GUID(0x4a67b082, 0x0a4c, 0x41cf, \
|
#define LINUX_EFI_ARM_SCREEN_INFO_TABLE_GUID EFI_GUID(0xe03fc20a, 0x85dc, 0x406e, 0xb9, 0x0e, 0x4a, 0xb5, 0x02, 0x37, 0x1d, 0x95)
|
||||||
0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f)
|
#define LINUX_EFI_LOADER_ENTRY_GUID EFI_GUID(0x4a67b082, 0x0a4c, 0x41cf, 0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f)
|
||||||
|
|
||||||
+#define EFI_CERT_SHA256_GUID \
|
+#define EFI_CERT_SHA256_GUID EFI_GUID(0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28)
|
||||||
+ EFI_GUID( 0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
|
+#define EFI_CERT_X509_GUID EFI_GUID(0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72)
|
||||||
+
|
|
||||||
+#define EFI_CERT_X509_GUID \
|
|
||||||
+ EFI_GUID( 0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
|
|
||||||
+
|
+
|
||||||
typedef struct {
|
typedef struct {
|
||||||
efi_guid_t guid;
|
efi_guid_t guid;
|
||||||
|
@ -1092,8 +1092,8 @@ index 5a0a691..4806cde 100644
|
|||||||
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
|
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
|
||||||
+ select ACPI_MCFG if ACPI
|
+ select ACPI_MCFG if ACPI
|
||||||
select ARCH_HAS_DEVMEM_IS_ALLOWED
|
select ARCH_HAS_DEVMEM_IS_ALLOWED
|
||||||
|
select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
|
||||||
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
|
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
|
||||||
select ARCH_HAS_ELF_RANDOMIZE
|
|
||||||
@@ -96,6 +97,7 @@ config ARM64
|
@@ -96,6 +97,7 @@ config ARM64
|
||||||
select OF_EARLY_FLATTREE
|
select OF_EARLY_FLATTREE
|
||||||
select OF_NUMA if NUMA && OF
|
select OF_NUMA if NUMA && OF
|
||||||
|
@ -104,6 +104,8 @@ CONFIG_ACPI_PROCESSOR=y
|
|||||||
CONFIG_ACPI_THERMAL=y
|
CONFIG_ACPI_THERMAL=y
|
||||||
CONFIG_I2C_SCMI=m
|
CONFIG_I2C_SCMI=m
|
||||||
CONFIG_SENSORS_ACPI_POWER=m
|
CONFIG_SENSORS_ACPI_POWER=m
|
||||||
|
CONFIG_ACPI_TABLE_UPGRADE=y
|
||||||
|
CONFIG_ACPI_CONFIGFS=m
|
||||||
|
|
||||||
CONFIG_ARM64_CRYPTO=y
|
CONFIG_ARM64_CRYPTO=y
|
||||||
CONFIG_CRYPTO_SHA1_ARM64_CE=y
|
CONFIG_CRYPTO_SHA1_ARM64_CE=y
|
||||||
|
@ -412,6 +412,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
|
|||||||
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
|
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
|
||||||
CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
|
CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
|
||||||
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
|
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
|
||||||
|
CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
|
||||||
# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
|
# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
|
||||||
# CONFIG_CRYPTO_DEV_MXS_DCP is not set
|
# CONFIG_CRYPTO_DEV_MXS_DCP is not set
|
||||||
# CONFIG_CRYPTO_DEV_MXC_SCC is not set
|
# CONFIG_CRYPTO_DEV_MXC_SCC is not set
|
||||||
|
@ -33,6 +33,7 @@ CONFIG_KERNEL_GZIP=y
|
|||||||
# CONFIG_KERNEL_LZMA is not set
|
# CONFIG_KERNEL_LZMA is not set
|
||||||
CONFIG_SWAP=y
|
CONFIG_SWAP=y
|
||||||
CONFIG_SYSVIPC=y
|
CONFIG_SYSVIPC=y
|
||||||
|
CONFIG_IRQ_TIME_ACCOUNTING=y
|
||||||
CONFIG_BSD_PROCESS_ACCT=y
|
CONFIG_BSD_PROCESS_ACCT=y
|
||||||
CONFIG_BSD_PROCESS_ACCT_V3=y
|
CONFIG_BSD_PROCESS_ACCT_V3=y
|
||||||
# CONFIG_COMPILE_TEST is not set
|
# CONFIG_COMPILE_TEST is not set
|
||||||
@ -74,6 +75,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
|
|||||||
# CONFIG_PREEMPT is not set
|
# CONFIG_PREEMPT is not set
|
||||||
|
|
||||||
CONFIG_SLUB=y
|
CONFIG_SLUB=y
|
||||||
|
CONFIG_SLAB_FREELIST_RANDOM=y
|
||||||
CONFIG_SLUB_CPU_PARTIAL=y
|
CONFIG_SLUB_CPU_PARTIAL=y
|
||||||
# CONFIG_SLUB_STATS is not set
|
# CONFIG_SLUB_STATS is not set
|
||||||
# CONFIG_SLUB_DEBUG_ON is not set
|
# CONFIG_SLUB_DEBUG_ON is not set
|
||||||
@ -736,6 +738,14 @@ CONFIG_FUSION_LAN=m
|
|||||||
CONFIG_FUSION_SAS=m
|
CONFIG_FUSION_SAS=m
|
||||||
CONFIG_FUSION_LOGGING=y
|
CONFIG_FUSION_LOGGING=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# NVME support
|
||||||
|
#
|
||||||
|
CONFIG_NVME_RDMA=m
|
||||||
|
CONFIG_NVME_TARGET=m
|
||||||
|
CONFIG_NVME_TARGET_LOOP=m
|
||||||
|
CONFIG_NVME_TARGET_RDMA=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# IEEE 1394 (FireWire) support (JUJU alternative stack)
|
# IEEE 1394 (FireWire) support (JUJU alternative stack)
|
||||||
#
|
#
|
||||||
@ -1837,13 +1847,13 @@ CONFIG_B43=m
|
|||||||
CONFIG_B43_SDIO=y
|
CONFIG_B43_SDIO=y
|
||||||
CONFIG_B43_BCMA=y
|
CONFIG_B43_BCMA=y
|
||||||
CONFIG_B43_BCMA_PIO=y
|
CONFIG_B43_BCMA_PIO=y
|
||||||
# CONFIG_B43_DEBUG is not set
|
CONFIG_B43_DEBUG=y
|
||||||
CONFIG_B43_PHY_LP=y
|
CONFIG_B43_PHY_LP=y
|
||||||
CONFIG_B43_PHY_N=y
|
CONFIG_B43_PHY_N=y
|
||||||
CONFIG_B43_PHY_HT=y
|
CONFIG_B43_PHY_HT=y
|
||||||
CONFIG_B43_PHY_G=y
|
CONFIG_B43_PHY_G=y
|
||||||
CONFIG_B43LEGACY=m
|
CONFIG_B43LEGACY=m
|
||||||
# CONFIG_B43LEGACY_DEBUG is not set
|
CONFIG_B43LEGACY_DEBUG=y
|
||||||
CONFIG_B43LEGACY_DMA=y
|
CONFIG_B43LEGACY_DMA=y
|
||||||
CONFIG_B43LEGACY_PIO=y
|
CONFIG_B43LEGACY_PIO=y
|
||||||
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
||||||
@ -2786,6 +2796,7 @@ CONFIG_SENSORS_F71805F=m
|
|||||||
CONFIG_SENSORS_F71882FG=m
|
CONFIG_SENSORS_F71882FG=m
|
||||||
CONFIG_SENSORS_F75375S=m
|
CONFIG_SENSORS_F75375S=m
|
||||||
CONFIG_SENSORS_FSCHMD=m
|
CONFIG_SENSORS_FSCHMD=m
|
||||||
|
CONFIG_SENSORS_FTSTEUTATES=m
|
||||||
CONFIG_SENSORS_G760A=m
|
CONFIG_SENSORS_G760A=m
|
||||||
CONFIG_SENSORS_G762=m
|
CONFIG_SENSORS_G762=m
|
||||||
CONFIG_SENSORS_GL518SM=m
|
CONFIG_SENSORS_GL518SM=m
|
||||||
@ -2834,6 +2845,7 @@ CONFIG_SENSORS_PC87360=m
|
|||||||
CONFIG_SENSORS_PC87427=m
|
CONFIG_SENSORS_PC87427=m
|
||||||
CONFIG_SENSORS_PCF8591=m
|
CONFIG_SENSORS_PCF8591=m
|
||||||
CONFIG_SENSORS_SHT15=m
|
CONFIG_SENSORS_SHT15=m
|
||||||
|
CONFIG_SENSORS_SHT3x=m
|
||||||
CONFIG_SENSORS_SHTC1=m
|
CONFIG_SENSORS_SHTC1=m
|
||||||
CONFIG_SENSORS_SIS5595=m
|
CONFIG_SENSORS_SIS5595=m
|
||||||
CONFIG_CHARGER_SMB347=m
|
CONFIG_CHARGER_SMB347=m
|
||||||
@ -2871,6 +2883,7 @@ CONFIG_SENSORS_LM73=m
|
|||||||
CONFIG_SENSORS_AMC6821=m
|
CONFIG_SENSORS_AMC6821=m
|
||||||
CONFIG_SENSORS_INA2XX=m
|
CONFIG_SENSORS_INA2XX=m
|
||||||
CONFIG_SENSORS_INA209=m
|
CONFIG_SENSORS_INA209=m
|
||||||
|
CONFIG_SENSORS_INA3221=m
|
||||||
CONFIG_SENSORS_ADT7411=m
|
CONFIG_SENSORS_ADT7411=m
|
||||||
CONFIG_SENSORS_ASC7621=m
|
CONFIG_SENSORS_ASC7621=m
|
||||||
CONFIG_SENSORS_EMC1403=m
|
CONFIG_SENSORS_EMC1403=m
|
||||||
@ -2932,8 +2945,10 @@ CONFIG_IIO_BUFFER_CB=y
|
|||||||
CONFIG_IIO_TRIGGERED_BUFFER=m
|
CONFIG_IIO_TRIGGERED_BUFFER=m
|
||||||
CONFIG_IIO_TRIGGER=y
|
CONFIG_IIO_TRIGGER=y
|
||||||
CONFIG_IIO_SW_TRIGGER=y
|
CONFIG_IIO_SW_TRIGGER=y
|
||||||
|
CONFIG_IIO_SW_DEVICE=m
|
||||||
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
|
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
|
||||||
CONFIG_IIO_INTERRUPT_TRIGGER=m
|
CONFIG_IIO_INTERRUPT_TRIGGER=m
|
||||||
|
CONFIG_IIO_TIGHTLOOP_TRIGGER=m
|
||||||
CONFIG_HID_SENSOR_IIO_COMMON=m
|
CONFIG_HID_SENSOR_IIO_COMMON=m
|
||||||
CONFIG_HID_SENSOR_IIO_TRIGGER=m
|
CONFIG_HID_SENSOR_IIO_TRIGGER=m
|
||||||
CONFIG_IIO_CONFIGFS=m
|
CONFIG_IIO_CONFIGFS=m
|
||||||
@ -2944,6 +2959,7 @@ CONFIG_IIO_CONFIGFS=m
|
|||||||
# CONFIG_AD5380 is not set
|
# CONFIG_AD5380 is not set
|
||||||
# CONFIG_AD5064 is not set
|
# CONFIG_AD5064 is not set
|
||||||
# CONFIG_BMA180 is not set
|
# CONFIG_BMA180 is not set
|
||||||
|
# CONFIG_BMA220 is not set
|
||||||
CONFIG_BMC150_ACCEL=m
|
CONFIG_BMC150_ACCEL=m
|
||||||
# CONFIG_MAX1363 is not set
|
# CONFIG_MAX1363 is not set
|
||||||
# CONFIG_MAX517 is not set
|
# CONFIG_MAX517 is not set
|
||||||
@ -2977,6 +2993,7 @@ CONFIG_STK3310=m
|
|||||||
CONFIG_IIO_ST_GYRO_3AXIS=m
|
CONFIG_IIO_ST_GYRO_3AXIS=m
|
||||||
CONFIG_IIO_ST_MAGN_3AXIS=m
|
CONFIG_IIO_ST_MAGN_3AXIS=m
|
||||||
# CONFIG_BMC150_MAGN is not set
|
# CONFIG_BMC150_MAGN is not set
|
||||||
|
CONFIG_MMA7660=m
|
||||||
CONFIG_IIO_ST_ACCEL_3AXIS=m
|
CONFIG_IIO_ST_ACCEL_3AXIS=m
|
||||||
CONFIG_HID_SENSOR_INCLINOMETER_3D=m
|
CONFIG_HID_SENSOR_INCLINOMETER_3D=m
|
||||||
CONFIG_HID_SENSOR_DEVICE_ROTATION=m
|
CONFIG_HID_SENSOR_DEVICE_ROTATION=m
|
||||||
@ -3088,6 +3105,7 @@ CONFIG_PA12203001=m
|
|||||||
# CONFIG_BMC150_MAGN_I2C is not set
|
# CONFIG_BMC150_MAGN_I2C is not set
|
||||||
# CONFIG_BMC150_MAGN_SPI is not set
|
# CONFIG_BMC150_MAGN_SPI is not set
|
||||||
# CONFIG_DS1803 is not set
|
# CONFIG_DS1803 is not set
|
||||||
|
# CONFIG_MAX5487 is not set
|
||||||
# CONFIG_MCP4131 is not set
|
# CONFIG_MCP4131 is not set
|
||||||
# CONFIG_HP03 is not set
|
# CONFIG_HP03 is not set
|
||||||
# CONFIG_HP206C is not set
|
# CONFIG_HP206C is not set
|
||||||
@ -5036,6 +5054,7 @@ CONFIG_CRYPTO_SEED=m
|
|||||||
CONFIG_CRYPTO_SEQIV=m
|
CONFIG_CRYPTO_SEQIV=m
|
||||||
CONFIG_CRYPTO_SERPENT=m
|
CONFIG_CRYPTO_SERPENT=m
|
||||||
CONFIG_CRYPTO_SHA1=y
|
CONFIG_CRYPTO_SHA1=y
|
||||||
|
CONFIG_CRYPTO_SHA3=m
|
||||||
CONFIG_CRYPTO_SHA256=y
|
CONFIG_CRYPTO_SHA256=y
|
||||||
CONFIG_CRYPTO_SHA512=m
|
CONFIG_CRYPTO_SHA512=m
|
||||||
CONFIG_CRYPTO_TEA=m
|
CONFIG_CRYPTO_TEA=m
|
||||||
@ -5056,6 +5075,8 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
|
|||||||
CONFIG_CRYPTO_PCRYPT=m
|
CONFIG_CRYPTO_PCRYPT=m
|
||||||
CONFIG_CRYPTO_USER=m
|
CONFIG_CRYPTO_USER=m
|
||||||
CONFIG_CRYPTO_RSA=m
|
CONFIG_CRYPTO_RSA=m
|
||||||
|
CONFIG_CRYPTO_DH=m
|
||||||
|
CONFIG_CRYPTO_ECDH=m
|
||||||
CONFIG_CRYPTO_CHACHA20POLY1305=m
|
CONFIG_CRYPTO_CHACHA20POLY1305=m
|
||||||
CONFIG_CRYPTO_ECHAINIV=m
|
CONFIG_CRYPTO_ECHAINIV=m
|
||||||
CONFIG_CRYPTO_POLY1305=m
|
CONFIG_CRYPTO_POLY1305=m
|
||||||
@ -5218,7 +5239,7 @@ CONFIG_PM_DEBUG=y
|
|||||||
# CONFIG_DPM_WATCHDOG is not set # revisit this in debug
|
# CONFIG_DPM_WATCHDOG is not set # revisit this in debug
|
||||||
CONFIG_PM_TRACE=y
|
CONFIG_PM_TRACE=y
|
||||||
CONFIG_PM_TRACE_RTC=y
|
CONFIG_PM_TRACE_RTC=y
|
||||||
# CONFIG_PM_TEST_SUSPEND is not set
|
CONFIG_PM_TEST_SUSPEND=y
|
||||||
# CONFIG_PM_OPP is not set
|
# CONFIG_PM_OPP is not set
|
||||||
# CONFIG_PM_AUTOSLEEP is not set
|
# CONFIG_PM_AUTOSLEEP is not set
|
||||||
# CONFIG_PM_WAKELOCKS is not set
|
# CONFIG_PM_WAKELOCKS is not set
|
||||||
@ -5234,7 +5255,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
|||||||
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
||||||
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
|
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
|
||||||
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
|
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
|
||||||
CONFIG_CPU_FREQ_STAT=m
|
CONFIG_CPU_FREQ_STAT=y
|
||||||
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
||||||
|
|
||||||
|
|
||||||
@ -5536,6 +5557,7 @@ CONFIG_POWER_RESET=y
|
|||||||
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
|
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
|
||||||
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
|
# CONFIG_SYSCON_REBOOT_MODE is not set
|
||||||
|
|
||||||
# CONFIG_PDA_POWER is not set
|
# CONFIG_PDA_POWER is not set
|
||||||
|
|
||||||
@ -5654,6 +5676,7 @@ CONFIG_STAGING=y
|
|||||||
# CONFIG_ANDROID is not set
|
# CONFIG_ANDROID is not set
|
||||||
# CONFIG_STAGING_BOARD is not set
|
# CONFIG_STAGING_BOARD is not set
|
||||||
CONFIG_STAGING_MEDIA=y
|
CONFIG_STAGING_MEDIA=y
|
||||||
|
# CONFIG_MEDIA_CEC is not set
|
||||||
# CONFIG_DVB_AS102 is not set
|
# CONFIG_DVB_AS102 is not set
|
||||||
# CONFIG_SLICOSS is not set
|
# CONFIG_SLICOSS is not set
|
||||||
# CONFIG_VIDEO_DT3155 is not set
|
# CONFIG_VIDEO_DT3155 is not set
|
||||||
@ -5713,6 +5736,7 @@ CONFIG_USBIP_VUDC=m
|
|||||||
# CONFIG_WILC1000_SDIO is not set
|
# CONFIG_WILC1000_SDIO is not set
|
||||||
# CONFIG_WILC1000_SPI is not set
|
# CONFIG_WILC1000_SPI is not set
|
||||||
# CONFIG_LNET is not set
|
# CONFIG_LNET is not set
|
||||||
|
# CONFIG_KS7010 is not set
|
||||||
# END OF STAGING
|
# END OF STAGING
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -5941,6 +5965,7 @@ CONFIG_POWERCAP=y
|
|||||||
# CONFIG_HSI is not set
|
# CONFIG_HSI is not set
|
||||||
|
|
||||||
# CONFIG_CPU_IDLE is not set
|
# CONFIG_CPU_IDLE is not set
|
||||||
|
# CONFIG_CPU_IDLE_GOV_LADDER is not set
|
||||||
|
|
||||||
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
|
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
|
||||||
# CONFIG_ASM9260_TIMER is not set
|
# CONFIG_ASM9260_TIMER is not set
|
||||||
|
112
config-nodebug
112
config-nodebug
@ -2,102 +2,102 @@ CONFIG_SND_VERBOSE_PRINTK=y
|
|||||||
CONFIG_SND_DEBUG=y
|
CONFIG_SND_DEBUG=y
|
||||||
CONFIG_SND_PCM_XRUN_DEBUG=y
|
CONFIG_SND_PCM_XRUN_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
|
CONFIG_DEBUG_ATOMIC_SLEEP=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_MUTEXES is not set
|
CONFIG_DEBUG_MUTEXES=y
|
||||||
# CONFIG_DEBUG_RT_MUTEXES is not set
|
CONFIG_DEBUG_RT_MUTEXES=y
|
||||||
# CONFIG_DEBUG_LOCK_ALLOC is not set
|
CONFIG_DEBUG_LOCK_ALLOC=y
|
||||||
# CONFIG_LOCK_TORTURE_TEST is not set
|
CONFIG_LOCK_TORTURE_TEST=m
|
||||||
# CONFIG_PROVE_LOCKING is not set
|
CONFIG_PROVE_LOCKING=y
|
||||||
# CONFIG_DEBUG_SPINLOCK is not set
|
CONFIG_DEBUG_SPINLOCK=y
|
||||||
# CONFIG_PROVE_RCU is not set
|
CONFIG_PROVE_RCU=y
|
||||||
# CONFIG_PROVE_RCU_REPEATEDLY is not set
|
# CONFIG_PROVE_RCU_REPEATEDLY is not set
|
||||||
# CONFIG_DEBUG_PER_CPU_MAPS is not set
|
CONFIG_DEBUG_PER_CPU_MAPS=y
|
||||||
CONFIG_CPUMASK_OFFSTACK=y
|
CONFIG_CPUMASK_OFFSTACK=y
|
||||||
|
|
||||||
# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
|
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
|
||||||
|
|
||||||
# CONFIG_FAULT_INJECTION is not set
|
CONFIG_FAULT_INJECTION=y
|
||||||
# CONFIG_FAILSLAB is not set
|
CONFIG_FAILSLAB=y
|
||||||
# CONFIG_FAIL_PAGE_ALLOC is not set
|
CONFIG_FAIL_PAGE_ALLOC=y
|
||||||
# CONFIG_FAIL_MAKE_REQUEST is not set
|
CONFIG_FAIL_MAKE_REQUEST=y
|
||||||
# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
|
CONFIG_FAULT_INJECTION_DEBUG_FS=y
|
||||||
# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
|
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
|
||||||
# CONFIG_FAIL_IO_TIMEOUT is not set
|
CONFIG_FAIL_IO_TIMEOUT=y
|
||||||
# CONFIG_FAIL_MMC_REQUEST is not set
|
CONFIG_FAIL_MMC_REQUEST=y
|
||||||
# CONFIG_F2FS_FAULT_INJECTION is not set
|
# CONFIG_F2FS_FAULT_INJECTION is not set
|
||||||
|
|
||||||
# CONFIG_LOCK_STAT is not set
|
CONFIG_LOCK_STAT=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
CONFIG_DEBUG_STACK_USAGE=y
|
||||||
|
|
||||||
# CONFIG_ACPI_DEBUG is not set
|
CONFIG_ACPI_DEBUG=y
|
||||||
# CONFIG_ACPI_DEBUGGER is not set
|
# CONFIG_ACPI_DEBUGGER is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_SG is not set
|
CONFIG_DEBUG_SG=y
|
||||||
# CONFIG_DEBUG_PI_LIST is not set
|
CONFIG_DEBUG_PI_LIST=y
|
||||||
|
|
||||||
# CONFIG_PAGE_EXTENSION is not set
|
# CONFIG_PAGE_EXTENSION is not set
|
||||||
# CONFIG_PAGE_OWNER is not set
|
# CONFIG_PAGE_OWNER is not set
|
||||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_OBJECTS is not set
|
CONFIG_DEBUG_OBJECTS=y
|
||||||
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
|
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
|
||||||
# CONFIG_DEBUG_OBJECTS_FREE is not set
|
CONFIG_DEBUG_OBJECTS_FREE=y
|
||||||
# CONFIG_DEBUG_OBJECTS_TIMERS is not set
|
CONFIG_DEBUG_OBJECTS_TIMERS=y
|
||||||
# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
|
CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
|
||||||
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
|
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
|
||||||
|
|
||||||
CONFIG_X86_PTDUMP=y
|
CONFIG_X86_PTDUMP=y
|
||||||
# CONFIG_ARM64_PTDUMP is not set
|
CONFIG_ARM64_PTDUMP=y
|
||||||
# CONFIG_EFI_PGT_DUMP is not set
|
CONFIG_EFI_PGT_DUMP=y
|
||||||
|
|
||||||
# CONFIG_CAN_DEBUG_DEVICES is not set
|
CONFIG_CAN_DEBUG_DEVICES=y
|
||||||
|
|
||||||
# CONFIG_MODULE_FORCE_UNLOAD is not set
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||||
|
|
||||||
|
|
||||||
# CONFIG_DEBUG_NOTIFIERS is not set
|
CONFIG_DEBUG_NOTIFIERS=y
|
||||||
|
|
||||||
# CONFIG_DMA_API_DEBUG is not set
|
CONFIG_DMA_API_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_MMIOTRACE is not set
|
CONFIG_MMIOTRACE=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_CREDENTIALS is not set
|
CONFIG_DEBUG_CREDENTIALS=y
|
||||||
|
|
||||||
# off in both production debug and nodebug builds,
|
# off in both production debug and nodebug builds,
|
||||||
# on in rawhide nodebug builds
|
# on in rawhide nodebug builds
|
||||||
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
|
||||||
|
|
||||||
# CONFIG_EXT4_DEBUG is not set
|
CONFIG_EXT4_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_XFS_WARN is not set
|
# CONFIG_XFS_WARN is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
|
CONFIG_DEBUG_PERF_USE_VMALLOC=y
|
||||||
|
|
||||||
# CONFIG_JBD2_DEBUG is not set
|
CONFIG_JBD2_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_NFSD_FAULT_INJECTION is not set
|
CONFIG_NFSD_FAULT_INJECTION=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_BLK_CGROUP is not set
|
CONFIG_DEBUG_BLK_CGROUP=y
|
||||||
|
|
||||||
# CONFIG_DRBD_FAULT_INJECTION is not set
|
CONFIG_DRBD_FAULT_INJECTION=y
|
||||||
|
|
||||||
# CONFIG_ATH_DEBUG is not set
|
CONFIG_ATH_DEBUG=y
|
||||||
# CONFIG_CARL9170_DEBUGFS is not set
|
CONFIG_CARL9170_DEBUGFS=y
|
||||||
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
|
CONFIG_IWLWIFI_DEVICE_TRACING=y
|
||||||
|
|
||||||
# CONFIG_RTLWIFI_DEBUG is not set
|
# CONFIG_RTLWIFI_DEBUG is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_OBJECTS_WORK is not set
|
CONFIG_DEBUG_OBJECTS_WORK=y
|
||||||
|
|
||||||
# CONFIG_DMADEVICES_DEBUG is not set
|
CONFIG_DMADEVICES_DEBUG=y
|
||||||
# CONFIG_DMADEVICES_VDEBUG is not set
|
# CONFIG_DMADEVICES_VDEBUG is not set
|
||||||
|
|
||||||
CONFIG_PM_ADVANCED_DEBUG=y
|
CONFIG_PM_ADVANCED_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
|
CONFIG_CEPH_LIB_PRETTYDEBUG=y
|
||||||
# CONFIG_QUOTA_DEBUG is not set
|
CONFIG_QUOTA_DEBUG=y
|
||||||
|
|
||||||
|
|
||||||
CONFIG_KGDB_KDB=y
|
CONFIG_KGDB_KDB=y
|
||||||
@ -105,19 +105,19 @@ CONFIG_KDB_DEFAULT_ENABLE=0x0
|
|||||||
CONFIG_KDB_KEYBOARD=y
|
CONFIG_KDB_KEYBOARD=y
|
||||||
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
|
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
|
||||||
|
|
||||||
# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
|
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
|
||||||
# CONFIG_PERCPU_TEST is not set
|
# CONFIG_PERCPU_TEST is not set
|
||||||
# CONFIG_TEST_LIST_SORT is not set
|
CONFIG_TEST_LIST_SORT=y
|
||||||
# CONFIG_TEST_STRING_HELPERS is not set
|
# CONFIG_TEST_STRING_HELPERS is not set
|
||||||
|
|
||||||
# CONFIG_DETECT_HUNG_TASK is not set
|
CONFIG_DETECT_HUNG_TASK=y
|
||||||
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
|
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
|
||||||
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
|
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
|
||||||
# CONFIG_WQ_WATCHDOG is not set
|
CONFIG_WQ_WATCHDOG=y
|
||||||
|
|
||||||
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
|
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_KMEMLEAK is not set
|
CONFIG_DEBUG_KMEMLEAK=y
|
||||||
CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
|
CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
|
||||||
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
|
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
|
||||||
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
|
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
|
||||||
@ -128,4 +128,4 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
|
|||||||
|
|
||||||
# CONFIG_SPI_DEBUG is not set
|
# CONFIG_SPI_DEBUG is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_VM_PGFLAGS is not set
|
CONFIG_DEBUG_VM_PGFLAGS=y
|
||||||
|
@ -70,7 +70,6 @@ CONFIG_FA_DUMP=y
|
|||||||
CONFIG_RELOCATABLE=y
|
CONFIG_RELOCATABLE=y
|
||||||
|
|
||||||
CONFIG_CPU_IDLE=y
|
CONFIG_CPU_IDLE=y
|
||||||
# CONFIG_CPU_IDLE_GOV_LADDER is not set
|
|
||||||
CONFIG_POWERNV_CPUIDLE=y
|
CONFIG_POWERNV_CPUIDLE=y
|
||||||
CONFIG_PSERIES_CPUIDLE=y
|
CONFIG_PSERIES_CPUIDLE=y
|
||||||
|
|
||||||
@ -374,3 +373,5 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
|
|||||||
CONFIG_FB_SSD1307=m
|
CONFIG_FB_SSD1307=m
|
||||||
CONFIG_INPUT_PWM_BEEPER=m
|
CONFIG_INPUT_PWM_BEEPER=m
|
||||||
CONFIG_BACKLIGHT_PWM=m
|
CONFIG_BACKLIGHT_PWM=m
|
||||||
|
|
||||||
|
CONFIG_CRYPT_CRC32C_VPMSUM=m
|
||||||
|
@ -135,6 +135,7 @@ CONFIG_CRYPTO_GHASH_S390=m
|
|||||||
CONFIG_CRYPTO_SHA1_S390=m
|
CONFIG_CRYPTO_SHA1_S390=m
|
||||||
CONFIG_CRYPTO_SHA256_S390=m
|
CONFIG_CRYPTO_SHA256_S390=m
|
||||||
CONFIG_CRYPTO_SHA512_S390=m
|
CONFIG_CRYPTO_SHA512_S390=m
|
||||||
|
CONFIG_CRYPTO_CRC32_S390=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Kernel hacking
|
# Kernel hacking
|
||||||
|
@ -95,6 +95,7 @@ CONFIG_ACPI_THERMAL=y
|
|||||||
CONFIG_ACPI_TOSHIBA=m
|
CONFIG_ACPI_TOSHIBA=m
|
||||||
CONFIG_ACPI_VIDEO=m
|
CONFIG_ACPI_VIDEO=m
|
||||||
CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
|
CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
|
||||||
|
CONFIG_ACPI_CONFIGFS=m
|
||||||
# FIXME: Next two are deprecated. Remove them when they disappear upstream
|
# FIXME: Next two are deprecated. Remove them when they disappear upstream
|
||||||
# CONFIG_ACPI_PROCFS_POWER is not set
|
# CONFIG_ACPI_PROCFS_POWER is not set
|
||||||
CONFIG_PNPACPI=y
|
CONFIG_PNPACPI=y
|
||||||
@ -105,6 +106,7 @@ CONFIG_ACPI_APEI_PCIEAER=y
|
|||||||
CONFIG_ACPI_APEI_GHES=y
|
CONFIG_ACPI_APEI_GHES=y
|
||||||
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
|
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
|
||||||
# CONFIG_ACPI_APEI_EINJ is not set
|
# CONFIG_ACPI_APEI_EINJ is not set
|
||||||
|
CONFIG_DPTF_POWER=m
|
||||||
CONFIG_ACPI_IPMI=m
|
CONFIG_ACPI_IPMI=m
|
||||||
CONFIG_ACPI_CUSTOM_METHOD=m
|
CONFIG_ACPI_CUSTOM_METHOD=m
|
||||||
CONFIG_ACPI_BGRT=y
|
CONFIG_ACPI_BGRT=y
|
||||||
@ -116,6 +118,7 @@ CONFIG_INTEL_SOC_PMIC=y
|
|||||||
CONFIG_PMIC_OPREGION=y
|
CONFIG_PMIC_OPREGION=y
|
||||||
CONFIG_CRC_PMIC_OPREGION=y
|
CONFIG_CRC_PMIC_OPREGION=y
|
||||||
CONFIG_XPOWER_PMIC_OPREGION=y
|
CONFIG_XPOWER_PMIC_OPREGION=y
|
||||||
|
CONFIG_BXT_WC_PMIC_OPREGION=y
|
||||||
CONFIG_GPIO_CRYSTAL_COVE=y
|
CONFIG_GPIO_CRYSTAL_COVE=y
|
||||||
CONFIG_AXP288_ADC=y
|
CONFIG_AXP288_ADC=y
|
||||||
CONFIG_AXP288_FUEL_GAUGE=y
|
CONFIG_AXP288_FUEL_GAUGE=y
|
||||||
@ -243,6 +246,7 @@ CONFIG_FUJITSU_TABLET=m
|
|||||||
CONFIG_FUJITSU_LAPTOP=m
|
CONFIG_FUJITSU_LAPTOP=m
|
||||||
# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
|
# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
|
||||||
CONFIG_IDEAPAD_LAPTOP=m
|
CONFIG_IDEAPAD_LAPTOP=m
|
||||||
|
CONFIG_INTEL_VBTN=m
|
||||||
CONFIG_INTEL_HID_EVENT=m
|
CONFIG_INTEL_HID_EVENT=m
|
||||||
CONFIG_MSI_LAPTOP=m
|
CONFIG_MSI_LAPTOP=m
|
||||||
CONFIG_PANASONIC_LAPTOP=m
|
CONFIG_PANASONIC_LAPTOP=m
|
||||||
@ -343,7 +347,6 @@ CONFIG_MTD_CK804XROM=m
|
|||||||
|
|
||||||
CONFIG_CPU_IDLE=y
|
CONFIG_CPU_IDLE=y
|
||||||
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
|
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
|
||||||
# CONFIG_CPU_IDLE_GOV_LADDER is not set
|
|
||||||
CONFIG_CPU_IDLE_GOV_MENU=y
|
CONFIG_CPU_IDLE_GOV_MENU=y
|
||||||
|
|
||||||
CONFIG_THINKPAD_ACPI=m
|
CONFIG_THINKPAD_ACPI=m
|
||||||
@ -381,7 +384,7 @@ CONFIG_SP5100_TCO=m
|
|||||||
|
|
||||||
# CONFIG_MEMTEST is not set
|
# CONFIG_MEMTEST is not set
|
||||||
# CONFIG_DEBUG_TLBFLUSH is not set
|
# CONFIG_DEBUG_TLBFLUSH is not set
|
||||||
# CONFIG_MAXSMP is not set
|
CONFIG_MAXSMP=y
|
||||||
|
|
||||||
|
|
||||||
CONFIG_HP_ILO=m
|
CONFIG_HP_ILO=m
|
||||||
@ -461,7 +464,6 @@ CONFIG_INTEL_PMC_CORE=y
|
|||||||
|
|
||||||
CONFIG_VIDEO_VIA_CAMERA=m
|
CONFIG_VIDEO_VIA_CAMERA=m
|
||||||
|
|
||||||
CONFIG_IRQ_TIME_ACCOUNTING=y
|
|
||||||
CONFIG_X86_RESERVE_LOW=64
|
CONFIG_X86_RESERVE_LOW=64
|
||||||
|
|
||||||
# CONFIG_IRQ_DOMAIN_DEBUG is not set
|
# CONFIG_IRQ_DOMAIN_DEBUG is not set
|
||||||
|
@ -28,6 +28,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
|
|||||||
|
|
||||||
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
|
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
|
||||||
|
|
||||||
|
CONFIG_RANDOMIZE_MEMORY=y
|
||||||
# enable the 32-bit entry point for Baytrail
|
# enable the 32-bit entry point for Baytrail
|
||||||
CONFIG_EFI_MIXED=y
|
CONFIG_EFI_MIXED=y
|
||||||
|
|
||||||
@ -80,6 +81,8 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
|
|||||||
CONFIG_CRYPTO_SHA1_SSSE3=m
|
CONFIG_CRYPTO_SHA1_SSSE3=m
|
||||||
CONFIG_CRYPTO_SHA256_SSSE3=m
|
CONFIG_CRYPTO_SHA256_SSSE3=m
|
||||||
CONFIG_CRYPTO_SHA512_SSSE3=m
|
CONFIG_CRYPTO_SHA512_SSSE3=m
|
||||||
|
CONFIG_CRYPTO_SHA256_MB=m
|
||||||
|
CONFIG_CRYPTO_SHA512_MB=m
|
||||||
CONFIG_CRYPTO_BLOWFISH_X86_64=m
|
CONFIG_CRYPTO_BLOWFISH_X86_64=m
|
||||||
CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
|
CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
|
||||||
CONFIG_CRYPTO_CAMELLIA_X86_64=m
|
CONFIG_CRYPTO_CAMELLIA_X86_64=m
|
||||||
|
2
gitrev
2
gitrev
@ -1 +1 @@
|
|||||||
dd9506954539dcedd0294a065ff0976e61386fc6
|
0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
From patchwork Mon Jun 13 11:44:00 2016
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Subject: hp-wmi: fix wifi cannot be hard-unblock
|
|
||||||
From: Alex Hung <alex.hung@canonical.com>
|
|
||||||
X-Patchwork-Id: 9172765
|
|
||||||
Message-Id: <1465818240-11994-1-git-send-email-alex.hung@canonical.com>
|
|
||||||
To: dvhart@infradead.org, platform-driver-x86@vger.kernel.org,
|
|
||||||
alex.hung@canonical.com, david.ward@ll.mit.edu
|
|
||||||
Date: Mon, 13 Jun 2016 19:44:00 +0800
|
|
||||||
|
|
||||||
Several users reported wifi cannot be unblocked as discussed in [1].
|
|
||||||
This patch removes the useof 2009 flag by BIOS but uses the actual WMI
|
|
||||||
function calls - it will be skipped if WMI reports unsupported
|
|
||||||
|
|
||||||
[1] https://bugzilla.kernel.org/show_bug.cgi?id=69131
|
|
||||||
|
|
||||||
Signed-off-by: Alex Hung <alex.hung@canonical.com>
|
|
||||||
---
|
|
||||||
drivers/platform/x86/hp-wmi.c | 7 ++++++-
|
|
||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
|
|
||||||
index 6f145f2..96ffda4 100644
|
|
||||||
--- a/drivers/platform/x86/hp-wmi.c
|
|
||||||
+++ b/drivers/platform/x86/hp-wmi.c
|
|
||||||
@@ -718,6 +718,11 @@ static int __init hp_wmi_rfkill_setup(struct platform_device *device)
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
+ err = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, &wireless,
|
|
||||||
+ sizeof(wireless), 0);
|
|
||||||
+ if (err)
|
|
||||||
+ return err;
|
|
||||||
+
|
|
||||||
if (wireless & 0x1) {
|
|
||||||
wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
|
|
||||||
RFKILL_TYPE_WLAN,
|
|
||||||
@@ -882,7 +887,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
|
|
||||||
wwan_rfkill = NULL;
|
|
||||||
rfkill2_count = 0;
|
|
||||||
|
|
||||||
- if (hp_wmi_bios_2009_later() || hp_wmi_rfkill_setup(device))
|
|
||||||
+ if (hp_wmi_rfkill_setup(device))
|
|
||||||
hp_wmi_rfkill2_setup(device);
|
|
||||||
|
|
||||||
err = device_create_file(&device->dev, &dev_attr_display);
|
|
15
kernel.spec
15
kernel.spec
@ -6,7 +6,7 @@ Summary: The Linux kernel
|
|||||||
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
||||||
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
||||||
# be 0.
|
# be 0.
|
||||||
%global released_kernel 1
|
%global released_kernel 0
|
||||||
|
|
||||||
# Sign modules on x86. Make sure the config files match this setting if more
|
# Sign modules on x86. Make sure the config files match this setting if more
|
||||||
# architectures are added.
|
# architectures are added.
|
||||||
@ -42,7 +42,7 @@ Summary: The Linux kernel
|
|||||||
# For non-released -rc kernels, this will be appended after the rcX and
|
# For non-released -rc kernels, this will be appended after the rcX and
|
||||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||||
#
|
#
|
||||||
%global baserelease 2
|
%global baserelease 1
|
||||||
%global fedora_build %{baserelease}
|
%global fedora_build %{baserelease}
|
||||||
|
|
||||||
# base_sublevel is the kernel version we're starting with and patching
|
# base_sublevel is the kernel version we're starting with and patching
|
||||||
@ -69,7 +69,7 @@ Summary: The Linux kernel
|
|||||||
# The rc snapshot level
|
# The rc snapshot level
|
||||||
%define rcrev 0
|
%define rcrev 0
|
||||||
# The git snapshot level
|
# The git snapshot level
|
||||||
%define gitrev 2
|
%define gitrev 1
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%define rpmversion 4.%{upstream_sublevel}.0
|
%define rpmversion 4.%{upstream_sublevel}.0
|
||||||
%endif
|
%endif
|
||||||
@ -125,7 +125,7 @@ Summary: The Linux kernel
|
|||||||
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
|
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
|
||||||
# and 0 for rawhide (all kernels are debug kernels).
|
# and 0 for rawhide (all kernels are debug kernels).
|
||||||
# See also 'make debug' and 'make release'.
|
# See also 'make debug' and 'make release'.
|
||||||
%define debugbuildsenabled 1
|
%define debugbuildsenabled 0
|
||||||
|
|
||||||
# Want to build a vanilla kernel build without any non-upstream patches?
|
# Want to build a vanilla kernel build without any non-upstream patches?
|
||||||
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
||||||
@ -604,9 +604,6 @@ Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch
|
|||||||
#CVE-2016-3134 rhbz 1317383 1317384
|
#CVE-2016-3134 rhbz 1317383 1317384
|
||||||
Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
|
Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
|
||||||
|
|
||||||
#rhbz 1338025
|
|
||||||
Patch728: hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
|
|
||||||
|
|
||||||
#skl_update_other_pipe_wm issue patch-series from drm-next, rhbz 1305038
|
#skl_update_other_pipe_wm issue patch-series from drm-next, rhbz 1305038
|
||||||
Patch801: 0001-drm-i915-Reorganize-WM-structs-unions-in-CRTC-state.patch
|
Patch801: 0001-drm-i915-Reorganize-WM-structs-unions-in-CRTC-state.patch
|
||||||
Patch802: 0002-drm-i915-Rename-s-skl_compute_pipe_wm-skl_build_pipe.patch
|
Patch802: 0002-drm-i915-Rename-s-skl_compute_pipe_wm-skl_build_pipe.patch
|
||||||
@ -2162,6 +2159,10 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 27 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc0.git1.1
|
||||||
|
- Linux v4.7-3199-g0e06f5c
|
||||||
|
- Reenable debugging options.
|
||||||
|
|
||||||
* Tue Jul 26 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-2
|
* Tue Jul 26 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-2
|
||||||
- rebuild for koji errors
|
- rebuild for koji errors
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user