diff options
| -rw-r--r-- | config-arm-generic | 22 | ||||
| -rw-r--r-- | config-armv7 | 1 | ||||
| -rw-r--r-- | config-armv7-generic | 11 | ||||
| -rw-r--r-- | config-armv7-lpae | 1 | ||||
| -rw-r--r-- | config-generic | 113 | ||||
| -rw-r--r-- | config-powerpc64 | 1 | ||||
| -rw-r--r-- | config-powerpc64p7 | 1 | ||||
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | modsign-uefi.patch | 69 | ||||
| -rw-r--r-- | scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | 11 | ||||
| -rw-r--r-- | sources | 2 |
12 files changed, 198 insertions, 41 deletions
diff --git a/config-arm-generic b/config-arm-generic index a6021ae15..3d923896a 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -248,9 +248,31 @@ CONFIG_CMA_AREAS=7 # serial # CONFIG_SERIAL_SH_SCI is not set +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_IFX6X60 is not set # drm # CONFIG_DRM_VMWGFX is not set # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set + +# spi +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_FSL_SPI is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PL022 is not set +# CONFIG_SPI_ROCKCHIP is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +# +# CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_BMP085_SPI is not set +# CONFIG_TI_DAC7512 is not set diff --git a/config-armv7 b/config-armv7 index d09200ee7..b1b420f89 100644 --- a/config-armv7 +++ b/config-armv7 @@ -67,6 +67,7 @@ CONFIG_SND_KIRKWOOD_SOC=m CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_MMC_SDHCI_PXAV3=m +CONFIG_MVPP2=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set diff --git a/config-armv7-generic b/config-armv7-generic index b78f80e93..58abbb67b 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -183,6 +183,7 @@ CONFIG_POWER_RESET_SUN6I=y CONFIG_TOUCHSCREEN_SUN4I=m CONFIG_MFD_AXP20X=y CONFIG_REGULATOR_AXP20X=m +CONFIG_IR_SUNXI=m # Exynos CONFIG_ARCH_EXYNOS3=y @@ -445,6 +446,8 @@ CONFIG_I2C_MV64XXX=m CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_AES_ARM=m # CONFIG_CRYPTO_AES_ARM_BS is not set +CONFIG_CRYPTO_SHA1_ARM_NEON=m +CONFIG_CRYPTO_SHA512_ARM_NEON=m # DMA CONFIG_TI_PRIV_EDMA=y @@ -579,6 +582,13 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_ATMEL_SOC is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_ODROIDX2 is not set +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_EDMA_SOC is not set +# CONFIG_SND_SOC_ROCKCHIP is not set # Displays CONFIG_BACKLIGHT_TPS65217=m @@ -637,6 +647,7 @@ CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_TPS80031=m CONFIG_REGULATOR_LTC3589=m CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_DA9211=m CONFIG_CHARGER_MANAGER=y CONFIG_CHARGER_BQ2415X=m diff --git a/config-armv7-lpae b/config-armv7-lpae index e86aaad26..6f4cb519d 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -62,6 +62,7 @@ CONFIG_TI_AEMIF=m CONFIG_POWER_RESET_KEYSTONE=y CONFIG_DAVINCI_WATCHDOG=m CONFIG_SPI_DAVINCI=m +CONFIG_TI_DAVINCI_MDIO=m # CONFIG_SND_DAVINCI_SOC is not set # CONFIG_TI_SOC_THERMAL is not set diff --git a/config-generic b/config-generic index 83ab87897..f82a83860 100644 --- a/config-generic +++ b/config-generic @@ -44,6 +44,7 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_SYSCTL=y CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_IKCONFIG is not set # CONFIG_EMBEDDED is not set # CONFIG_EXPERT is not set @@ -149,6 +150,7 @@ CONFIG_MMC_USHC=m CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_VUB300=m +# CONFIG_MMC_SPI is not set # CONFIG_MMC_SDHCI_PXAV2 is not set # CONFIG_MMC_SDHCI_PXAV3 is not set # CONFIG_MMC_SDHCI_OF_ARASAN is not set @@ -221,6 +223,21 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_FENCE_TRACE is not set # CONFIG_SPI is not set +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPI_FSL_SPI is not set # CONFIG_SPMI is not set @@ -275,6 +292,8 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_TS5500 is not set # CONFIG_MTD_INTEL_VR_NOR is not set # CONFIG_MTD_PLATRAM is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_DATAFLASH is not set # Self-contained MTD device drivers # CONFIG_MTD_PMC551 is not set @@ -957,6 +976,11 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_LOG_BRIDGE=m + CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_RPFILTER=m @@ -1061,6 +1085,7 @@ CONFIG_BRIDGE_EBT_T_NAT=m CONFIG_BRIDGE_EBT_ULOG=m CONFIG_BRIDGE_EBT_VLAN=m CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m CONFIG_XFRM=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_SUB_POLICY=y @@ -1350,6 +1375,7 @@ CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T3=m CONFIG_CHELSIO_T4=m CONFIG_CHELSIO_T4VF=m +# CONFIG_CHELSIO_T4_DCB is not set CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m @@ -1428,8 +1454,11 @@ CONFIG_SKY2=m CONFIG_NET_VENDOR_MICREL=y CONFIG_KSZ884X_PCI=m # CONFIG_KS8842 is not set +# CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -1553,6 +1582,7 @@ CONFIG_SMSC_PHY=m CONFIG_STE10XP=m CONFIG_VITESSE_PHY=m CONFIG_MICREL_PHY=m +# CONFIG_MICREL_KS8995MA is not set # CONFIG_OMAP_CONTROL_PHY is not set # CONFIG_PHY_SAMSUNG_USB2 is not set @@ -1702,6 +1732,7 @@ CONFIG_B43_DEBUG=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_HT=y +# CONFIG_B43_PHY_G is not set # CONFIG_B43_FORCE_PIO is not set CONFIG_B43LEGACY=m CONFIG_B43LEGACY_DEBUG=y @@ -1715,6 +1746,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_SDIO_OOB=y CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y # CONFIG_BRCM_TRACING is not set # CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set @@ -1744,6 +1776,7 @@ CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_DEBUG is not set # CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_LIBERTAS_SPI is not set CONFIG_LIBERTAS_MESH=y CONFIG_IWLWIFI=m CONFIG_IWLDVM=m @@ -1767,6 +1800,7 @@ CONFIG_MAC80211_HWSIM=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set CONFIG_MWL8K=m # CONFIG_PRISM54 is not set # CONFIG_PCMCIA_WL3501 is not set @@ -1891,6 +1925,9 @@ CONFIG_NFC_MICROREAD_I2C=m CONFIG_NFC_TRF7970A=m CONFIG_NFC_ST21NFCA=m CONFIG_NFC_ST21NFCA_I2C=m +# CONFIG_NFC_ST21NFCB is not set +# CONFIG_NFC_ST21NFCB_I2C is not set +# CONFIG_NFC_NCI_SPI is not set # @@ -2270,6 +2307,9 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m CONFIG_TOUCHSCREEN_ZFORCE=m +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m @@ -2368,6 +2408,9 @@ CONFIG_SERIAL_ARC_NR_PORTS=1 # CONFIG_SERIAL_FSL_LPUART is not set # CONFIG_SERIAL_ST_ASC is not set # CONFIG_SERIAL_PCH_UART is not set +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_UNIX98_PTYS=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y @@ -2423,6 +2466,8 @@ CONFIG_EEPROM_AT24=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_93CX6=m CONFIG_EEPROM_MAX6875=m +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_93XX46 is not set CONFIG_I2C_NFORCE2=m # CONFIG_I2C_OCORES is not set @@ -2497,6 +2542,7 @@ CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_LIS3_I2C=m +# CONFIG_SENSORS_LIS3_SPI is not set CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -2588,6 +2634,15 @@ CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_TMP103=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_PWM_FAN=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_POWR1220=m +CONFIG_SENSORS_AD7314=m + CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_MAX16064=m @@ -2597,6 +2652,7 @@ CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_MAX1668=m CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_TPS40422=m # Industrial I/O subsystem configuration CONFIG_IIO=m @@ -2746,6 +2802,9 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m # CONFIG_PCH_PHUB is not set # CONFIG_USB_SWITCH_FSA9480 is not set # CONFIG_SRAM is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_BMP085_SPI is not set +# CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_W1=m CONFIG_W1_CON=y @@ -2889,6 +2948,19 @@ CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_PCF50633=m CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_MCP795=m +CONFIG_RTC_DRV_RX4581=m +CONFIG_RTC_DRV_PCF2123=m +CONFIG_RTC_DRV_DS3234=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_DS1347=m +CONFIG_RTC_DRV_DS1343=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_M41T93=m # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_MOXART is not set # CONFIG_RTC_DRV_ISL12057 is not set @@ -2979,6 +3051,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y +# CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y @@ -3045,6 +3118,7 @@ CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SOLO6X10=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m @@ -3069,6 +3143,7 @@ CONFIG_VIDEO_TLG2300=m # CONFIG_VIDEO_M5MOLS is not set # CONFIG_EXYNOS_VIDEO is not set CONFIG_VIDEO_USBTV=m +# CONFIG_VIDEO_AU0828_RC is not set CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -3224,6 +3299,7 @@ CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m CONFIG_IR_TTUSBIR=m CONFIG_IR_GPIO_CIR=m +CONFIG_IR_XMP_DECODER=m CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set @@ -3366,6 +3442,7 @@ CONFIG_SND_RTCTIMER=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_MAX_CARDS=32 # CONFIG_SND_SUPPORT_OLD_API is not set +# CONFIG_SND_SPI is not set # # Generic devices @@ -3679,6 +3756,7 @@ CONFIG_HID_GENERIC=y CONFIG_HID_AUREAL=m CONFIG_HID_APPLEIR=m # CONFIG_HID_CP2112 is not set +CONFIG_HID_LENOVO=m # @@ -3753,6 +3831,7 @@ CONFIG_USB_ZR364XX=m # # USB Network adaptors # +CONFIG_USB_NET_DRIVERS=y CONFIG_USB_CATC=m CONFIG_USB_HSO=m CONFIG_USB_KAWETH=m @@ -4037,6 +4116,12 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_DA9052_SPI is not set +# CONFIG_EZX_PCAP is not set # @@ -4589,6 +4674,19 @@ CONFIG_BACKLIGHT_LP855X=m CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_ILI922X is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set + CONFIG_SCHED_DEBUG=y CONFIG_FAIR_GROUP_SCHED=y @@ -4621,6 +4719,7 @@ CONFIG_BLK_CGROUP=y CONFIG_RELAY=y CONFIG_PRINTK_TIME=y +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENABLE_WARN_DEPRECATED is not set @@ -4766,6 +4865,7 @@ CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_WM8350=m CONFIG_LEDS_WM831X_STATUS=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y @@ -4942,6 +5042,8 @@ CONFIG_NET_DSA_MV88E6123_61_65=m # Used by Maemo, we don't care. # CONFIG_PHONET is not set +# CONFIG_6LOWPAN is not set + # CONFIG_ICS932S401 is not set # CONFIG_ATMEL_SSC is not set @@ -5111,6 +5213,9 @@ CONFIG_IEEE802154_6LOWPAN=m CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m +# CONFIG_IEEE802154_AT86RF230 is not set +# CONFIG_IEEE802154_MRF24J40 is not set +# CONFIG_IEEE802154_CC2520 is not set CONFIG_MAC802154=m CONFIG_NET_MPLS_GSO=m @@ -5136,6 +5241,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y CONFIG_ZSWAP=y +# CONFIG_ZBUD is not set CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set @@ -5180,6 +5286,9 @@ CONFIG_GPIO_VIPERBOARD=m # CONFIG_GPIO_BCM_KONA is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_DWAPB is not set +# CONFIG_GPIO_74X164 is not set +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MC33880 is not set # FIXME: Why? CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5215,6 +5324,8 @@ CONFIG_PSTORE_RAM=m # CONFIG_TEST_MODULE is not set # CONFIG_TEST_USER_COPY is not set # CONFIG_TEST_BPF is not set +# CONFIG_TEST_UDELAY is not set +# CONFIG_TEST_RHASHTABLE is not set # CONFIG_AVERAGE is not set # CONFIG_VMXNET3 is not set @@ -5268,3 +5379,5 @@ CONFIG_FMC_CHARDEV=m # CONFIG_RTC_DRV_EFI is not set # CONFIG_NET_XGENE is not set + +# CONFIG_GLOB_SELFTEST is not set diff --git a/config-powerpc64 b/config-powerpc64 index 7f4133593..44c2c51db 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -146,6 +146,7 @@ CONFIG_RCU_FANOUT=64 CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set +CONFIG_CMA_AREAS=7 CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=m CONFIG_KVM_BOOK3S_64_PR=m diff --git a/config-powerpc64p7 b/config-powerpc64p7 index d8ce7e0b1..4021f7dc5 100644 --- a/config-powerpc64p7 +++ b/config-powerpc64p7 @@ -137,6 +137,7 @@ CONFIG_RCU_FANOUT=64 CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set +CONFIG_CMA_AREAS=7 CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=m CONFIG_KVM_BOOK3S_64_PR=m diff --git a/config-x86-generic b/config-x86-generic index 15abf6716..8e2a36dd7 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -469,6 +469,8 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_XZ_DEC_X86=y CONFIG_MPILIB=y +CONFIG_PKCS7_MESSAGE_PARSER=m +# CONFIG_PKCS7_TEST_KEY is not set CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_MODULE_SIG=y diff --git a/kernel.spec b/kernel.spec index e82823133..9ec1f2bcd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2247,6 +2247,9 @@ fi # ||----w | # || || %changelog +* Thu Aug 07 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git2.1 +- Linux v3.16-7503-g33caee39925b + * Tue Aug 05 2014 Kyle McMartin <kyle@fedoraproject.org> - kernel-arm64.patch: fix up merge conflict and re-enable diff --git a/modsign-uefi.patch b/modsign-uefi.patch index 5f8cc3313..ceb9ec989 100644 --- a/modsign-uefi.patch +++ b/modsign-uefi.patch @@ -1,7 +1,8 @@ Bugzilla: N/A Upstream-status: Fedora mustard for now -From fa2bfe718da40bf24f92c85846577e9bc788882c Mon Sep 17 00:00:00 2001 + +From ca81c32a62c0330afedb506324ace85cc0116eaf Mon Sep 17 00:00:00 2001 From: Dave Howells <dhowells@redhat.com> Date: Tue, 23 Oct 2012 09:30:54 -0400 Subject: [PATCH 1/5] Add EFI signature data types @@ -15,10 +16,10 @@ Signed-off-by: David Howells <dhowells@redhat.com> 1 file changed, 20 insertions(+) diff --git a/include/linux/efi.h b/include/linux/efi.h -index e73f391fd3c8..3d66a61bbbca 100644 +index 3f683a13d7aa..27aae6eb65d8 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -578,6 +578,12 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes, unsigned long si +@@ -581,6 +581,12 @@ void efi_native_runtime_setup(void); #define DEVICE_TREE_GUID \ EFI_GUID( 0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 ) @@ -31,7 +32,7 @@ index e73f391fd3c8..3d66a61bbbca 100644 typedef struct { efi_guid_t guid; u64 table; -@@ -793,6 +799,20 @@ typedef struct _efi_file_io_interface { +@@ -796,6 +802,20 @@ typedef struct _efi_file_io_interface { #define EFI_INVALID_TABLE_ADDR (~0UL) @@ -53,10 +54,10 @@ index e73f391fd3c8..3d66a61bbbca 100644 * All runtime access to EFI goes through this structure: */ -- -1.9.3 +2.0.4 -From 922e0512ce70101b596558d5bb075cd40a450322 Mon Sep 17 00:00:00 2001 +From 8662475501e4f68f872c86f5e915c204ccae0cb2 Mon Sep 17 00:00:00 2001 From: Dave Howells <dhowells@redhat.com> Date: Tue, 23 Oct 2012 09:36:28 -0400 Subject: [PATCH 2/5] Add an EFI signature blob parser and key loader. @@ -74,12 +75,12 @@ Signed-off-by: David Howells <dhowells@redhat.com> create mode 100644 crypto/asymmetric_keys/efi_parser.c diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig -index 03a6eb95ab50..6306ffc2a7fe 100644 +index 4870f28403f5..4a1b50d73b80 100644 --- a/crypto/asymmetric_keys/Kconfig +++ b/crypto/asymmetric_keys/Kconfig -@@ -37,4 +37,12 @@ config X509_CERTIFICATE_PARSER - data and provides the ability to instantiate a crypto key from a - public key packet found inside the certificate. +@@ -67,4 +67,12 @@ config SIGNED_PE_FILE_VERIFICATION + This option provides support for verifying the signature(s) on a + signed PE binary. +config EFI_SIGNATURE_LIST_PARSER + bool "EFI signature list parser" @@ -91,7 +92,7 @@ index 03a6eb95ab50..6306ffc2a7fe 100644 + endif # ASYMMETRIC_KEY_TYPE diff --git a/crypto/asymmetric_keys/Makefile b/crypto/asymmetric_keys/Makefile -index 0727204aab68..cd8388e5f2f1 100644 +index e47fcd9ac5e8..6512f6596785 100644 --- a/crypto/asymmetric_keys/Makefile +++ b/crypto/asymmetric_keys/Makefile @@ -8,6 +8,7 @@ asymmetric_keys-y := asymmetric_type.o signature.o @@ -218,10 +219,10 @@ index 000000000000..424896a0b169 + return 0; +} diff --git a/include/linux/efi.h b/include/linux/efi.h -index 3d66a61bbbca..7854ff3c0f11 100644 +index 27aae6eb65d8..353dd105533e 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -901,6 +901,10 @@ extern struct efi_memory_map memmap; +@@ -906,6 +906,10 @@ extern bool efi_poweroff_required(void); (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \ (md) = (void *)(md) + (m)->desc_size) @@ -233,10 +234,10 @@ index 3d66a61bbbca..7854ff3c0f11 100644 * efi_range_is_wc - check the WC bit on an address range * @start: starting kvirt address -- -1.9.3 +2.0.4 -From 2534dedee545507c00973279d5db515e122b5104 Mon Sep 17 00:00:00 2001 +From d5bc057ec6b984222b76622b2222485bef771ceb Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@fedoraproject.org> Date: Fri, 26 Oct 2012 12:36:24 -0400 Subject: [PATCH 3/5] KEYS: Add a system blacklist keyring @@ -255,25 +256,23 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 4 files changed, 42 insertions(+) diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h -index 8dabc399bd1d..e466de10ceec 100644 +index 72665eb80692..2c7b80d31366 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h -@@ -18,6 +18,10 @@ - - extern struct key *system_trusted_keyring; +@@ -28,4 +28,8 @@ static inline struct key *get_system_trusted_keyring(void) + } + #endif +#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING +extern struct key *system_blacklist_keyring; +#endif + - #endif - #endif /* _KEYS_SYSTEM_KEYRING_H */ diff --git a/init/Kconfig b/init/Kconfig -index 9d76b99af1b9..ac5f580437a0 100644 +index a291b7ef4738..7c199415ee28 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1677,6 +1677,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1715,6 +1715,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. @@ -313,7 +312,7 @@ index be5b8fac4bd0..fed815fcdaf2 100644 &key_type_asymmetric, id); if (IS_ERR(key)) diff --git a/kernel/system_keyring.c b/kernel/system_keyring.c -index 52ebc70263f4..478c4f8ec908 100644 +index 875f64e8935b..c15e93f5a418 100644 --- a/kernel/system_keyring.c +++ b/kernel/system_keyring.c @@ -20,6 +20,9 @@ @@ -348,10 +347,10 @@ index 52ebc70263f4..478c4f8ec908 100644 } -- -1.9.3 +2.0.4 -From a72ed58241f0d62b7f9fbf4e1fbbcc1e02145098 Mon Sep 17 00:00:00 2001 +From 2f1892982340c8219cb07e38ca06275e67f7caf2 Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@fedoraproject.org> Date: Fri, 26 Oct 2012 12:42:16 -0400 Subject: [PATCH 4/5] MODSIGN: Import certificates from UEFI Secure Boot @@ -379,10 +378,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> create mode 100644 kernel/modsign_uefi.c diff --git a/include/linux/efi.h b/include/linux/efi.h -index 7854ff3c0f11..31fd75e7230b 100644 +index 353dd105533e..f89c9a427dd4 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -584,6 +584,12 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes, unsigned long si +@@ -587,6 +587,12 @@ void efi_native_runtime_setup(void); #define EFI_CERT_X509_GUID \ EFI_GUID( 0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 ) @@ -396,10 +395,10 @@ index 7854ff3c0f11..31fd75e7230b 100644 efi_guid_t guid; u64 table; diff --git a/init/Kconfig b/init/Kconfig -index ac5f580437a0..ca7268b594aa 100644 +index 7c199415ee28..673796afbf7d 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1831,6 +1831,15 @@ config MODULE_SIG_ALL +@@ -1869,6 +1869,15 @@ config MODULE_SIG_ALL comment "Do not forget to sign required modules with scripts/sign-file" depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL @@ -416,10 +415,10 @@ index ac5f580437a0..ca7268b594aa 100644 prompt "Which hash algorithm should modules be signed with?" depends on MODULE_SIG diff --git a/kernel/Makefile b/kernel/Makefile -index f2a8b6246ce9..706e7952bde5 100644 +index 0026cf531769..63f3d0023798 100644 --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -46,6 +46,7 @@ obj-$(CONFIG_UID16) += uid16.o +@@ -45,6 +45,7 @@ obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULE_SIG) += module_signing.o @@ -535,10 +534,10 @@ index 000000000000..94b0eb38a284 +} +late_initcall(load_uefi_certs); -- -1.9.3 +2.0.4 -From 11bb98e3a62de77fc66a3e2197578dd9d891b998 Mon Sep 17 00:00:00 2001 +From 396b99487836b7e5bb37422f4ffb32e722b9f794 Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@fedoraproject.org> Date: Thu, 3 Oct 2013 10:14:23 -0400 Subject: [PATCH 5/5] MODSIGN: Support not importing certs from db @@ -620,5 +619,5 @@ index 94b0eb38a284..ae28b974d49a 100644 mok = get_cert_list(L"MokListRT", &mok_var, &moksize); -- -1.9.3 +2.0.4 diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch index 2cdbc31f5..350705249 100644 --- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch +++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -1,16 +1,19 @@ Bugzilla: 754518 Upstream-status: Fedora mustard (might be worth dropping...) ---- a/drivers/scsi/sd.c -+++ a/drivers/scsi/sd.c -@@ -2362,13 +2362,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp) + +diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c +index 2c2041ca4b70..e10812d985af 100644 +--- a/drivers/scsi/sd.c ++++ b/drivers/scsi/sd.c +@@ -2749,13 +2749,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp) static int sd_revalidate_disk(struct gendisk *disk) { struct scsi_disk *sdkp = scsi_disk(disk); - struct scsi_device *sdp = sdkp->device; + struct scsi_device *sdp; unsigned char *buffer; - unsigned flush = 0; + unsigned int max_xfer; SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_revalidate_disk\n")); @@ -1,3 +1,3 @@ 5c569ed649a0c9711879f333e90c5386 linux-3.16.tar.xz 49868ce6467b35cd9ffea1120d129462 perf-man-3.16.tar.gz -c0a65cb4b44209782a97521edacb04da patch-3.16-git1.xz +817f313f183e084650d605c4b178df38 patch-3.16-git2.xz |