From b47c48fa74e3769a4a2288df23e3d233d6a93f4f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Jan 2016 06:54:51 +0000 Subject: Minor updates to aarch64/ARMv7/PowerPC --- config-arm64 | 10 +++++----- config-armv7-generic | 2 +- config-powerpc64-generic | 3 +-- kernel.spec | 3 +++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/config-arm64 b/config-arm64 index cde22ee36..5578f2bb5 100644 --- a/config-arm64 +++ b/config-arm64 @@ -108,9 +108,9 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m # APM Xgene CONFIG_POWER_RESET_XGENE=y CONFIG_COMMON_CLK_XGENE=y -CONFIG_AHCI_XGENE=y -CONFIG_PHY_XGENE=y -CONFIG_NET_XGENE=y +CONFIG_AHCI_XGENE=m +CONFIG_PHY_XGENE=m +CONFIG_NET_XGENE=m CONFIG_RTC_DRV_XGENE=m CONFIG_HW_RANDOM_XGENE=m CONFIG_GPIO_XGENE=y @@ -138,8 +138,8 @@ CONFIG_I2C_XGENE_SLIMPRO=m # AMD Seattle CONFIG_NET_SB1000=y -CONFIG_AMD_XGBE=m -CONFIG_AMD_XGBE_PHY=m +# CONFIG_AMD_XGBE is not set +# CONFIG_AMD_XGBE_PHY is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set CONFIG_PINCTRL_AMD=y diff --git a/config-armv7-generic b/config-armv7-generic index 1c64a1a87..1b7807153 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -457,7 +457,7 @@ CONFIG_DRM_PANEL_LG_LG4573=m CONFIG_DRM_PANEL_SAMSUNG_LD9040=m CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m CONFIG_DRM_DW_HDMI=m -# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set +CONFIG_DRM_DW_HDMI_AHB_AUDIO=m # regmap CONFIG_REGMAP_SPI=m diff --git a/config-powerpc64-generic b/config-powerpc64-generic index 5b1040d82..30b7455a9 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -74,14 +74,13 @@ CONFIG_PSERIES_CPUIDLE=y CONFIG_HW_RANDOM_PSERIES=m CONFIG_CRYPTO_DEV_NX=y -CONFIG_CRYPTO_842=m CONFIG_CRYPTO_DEV_NX_ENCRYPT=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m CONFIG_CRYPTO_DEV_VMX=y -# CONFIG_CRYPTO_DEV_VMX_ENCRYPT is not set +CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m CONFIG_XZ_DEC_POWERPC=y diff --git a/kernel.spec b/kernel.spec index be1d43190..d8eaa4456 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2043,6 +2043,9 @@ fi # # %changelog +* Sun Jan 17 2016 Peter Robinson +- Minor updates to aarch64/ARMv7/PowerPC + * Fri Jan 15 2016 Justin M. Forbes - 4.5.0-0.rc0.git4.1 - Linux v4.4-5966-g7d1fc01 -- cgit From b07458db329dd1757dec813843568c5bf70abde3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Jan 2016 07:24:19 +0000 Subject: ARM: enable nvmem drivers --- config-arm-generic | 4 ++++ config-armv7 | 4 +++- config-armv7-generic | 1 + kernel.spec | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config-arm-generic b/config-arm-generic index bbd20dd77..7442ecf09 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -124,6 +124,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_REGULATOR_ACT8865=m CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_CRYPTO_DEV_ROCKCHIP=m +CONFIG_ROCKCHIP_EFUSE=m # Tegra # CONFIG_TEGRA_AHB is not set @@ -179,6 +180,9 @@ CONFIG_ARM_MHU=m # CONFIG_PL320_MBOX is not set CONFIG_ARM_SCPI_PROTOCOL=m +# NVMem +CONFIG_NVMEM=m + # USB CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD_PLATFORM=m diff --git a/config-armv7 b/config-armv7 index f6caf9c91..00a13ebc3 100644 --- a/config-armv7 +++ b/config-armv7 @@ -347,7 +347,8 @@ CONFIG_QCOM_SMD=m CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_REGULATOR_QCOM_SMD_RPM=m -# CONFIG_QCOM_SMEM is not set +CONFIG_QCOM_SMEM=m +CONFIG_QCOM_QFPROM=m # i.MX # CONFIG_MXC_DEBUG_BOARD is not set @@ -418,6 +419,7 @@ CONFIG_FB_MXS=m # CONFIG_FB_MX3 is not set # CONFIG_FB_IMX is not set CONFIG_TOUCHSCREEN_IMX6UL_TSC=m +CONFIG_NVMEM_IMX_OCOTP=m CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_FSL_ASOC_CARD=m diff --git a/config-armv7-generic b/config-armv7-generic index 1b7807153..25005c169 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -223,6 +223,7 @@ CONFIG_USB_MUSB_SUNXI=m CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_SND_SUN4I_CODEC=m CONFIG_SUNXI_RSB=m +CONFIG_NVMEM_SUNXI_SID=m # Exynos CONFIG_ARCH_EXYNOS3=y diff --git a/kernel.spec b/kernel.spec index d8eaa4456..7d2bf711b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2045,6 +2045,7 @@ fi %changelog * Sun Jan 17 2016 Peter Robinson - Minor updates to aarch64/ARMv7/PowerPC +- ARM: enable nvmem drivers * Fri Jan 15 2016 Justin M. Forbes - 4.5.0-0.rc0.git4.1 - Linux v4.4-5966-g7d1fc01 -- cgit From aa2efe74888fe7fbe72278718ee2788616ec41d3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Jan 2016 12:49:32 +0000 Subject: filters: filter char drivers mwave pcmcia --- filter-modules.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/filter-modules.sh b/filter-modules.sh index 7f14011f4..ef86416d1 100755 --- a/filter-modules.sh +++ b/filter-modules.sh @@ -14,7 +14,9 @@ # listed here. # Set the default dirs/modules to filter out -driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1" +driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1" + +chardrvs="mwave pcmcia" netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless" @@ -83,6 +85,12 @@ do filter_dir $1 drivers/net/${netdrv} done +# Filter the char drivers +for char in ${chardrvs} +do + filter_dir $1 drivers/char/${input} +done + # Filter the ethernet drivers for eth in ${ethdrvs} do -- cgit From e528de53802caf401336726f15833c4755f63435 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Jan 2016 15:12:22 +0000 Subject: disable IPWIRELESS while I (pbr) work out why this filters properly when build with rpmbuild but not in koji --- config-generic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config-generic b/config-generic index 9fb6566a1..cb6926891 100644 --- a/config-generic +++ b/config-generic @@ -5459,7 +5459,8 @@ CONFIG_INPUT_GP2A=m # CONFIG_INTEL_MENLOW is not set CONFIG_ENCLOSURE_SERVICES=m -CONFIG_IPWIRELESS=m +# Disable temporarily while I (pbr) work out why this filters properly when build with rpmbuild but not in koji +# CONFIG_IPWIRELESS is not set CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set -- cgit From d56b26ad1a4f72c473ecdb4c2b7fb31d8c1f4a58 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Jan 2016 05:45:06 +0000 Subject: Build usb gadget/OTG on aarch64, more arm/aarch64 cleanups for 4.5 --- config-arm-generic | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- config-arm64 | 4 +++- config-armv7 | 3 ++- config-armv7-generic | 59 ++-------------------------------------------------- kernel.spec | 3 ++- 5 files changed, 65 insertions(+), 61 deletions(-) diff --git a/config-arm-generic b/config-arm-generic index 7442ecf09..d07930cb2 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -55,7 +55,7 @@ CONFIG_ARM_GIC=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y -CONFIG_HISILICON_IRQ_MBIGEN=y +# CONFIG_HISILICON_IRQ_MBIGEN is not set CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_SMMU=y CONFIG_MMC_ARMMMCI=y @@ -187,6 +187,60 @@ CONFIG_NVMEM=m CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_ULPI=y + +# usb gadget +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_VBUS_DRAW=100 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_U_SERIAL_CONSOLE=y +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_DUAL_ROLE=y +CONFIG_USB_MUSB_DSPS=m +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_MUSB_TUSB6010 is not set +# CONFIG_USB_MUSB_UX500 is not set +CONFIG_USB_GPIO_VBUS=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_OBEX=y +# CONFIG_USB_CONFIGFS_RNDIS is not set +CONFIG_USB_CONFIGFS_SERIAL=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set +# CONFIG_USB_CONFIGFS_F_FS is not set +# CONFIG_USB_CONFIGFS_F_UAC1 is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_HID is not set +# CONFIG_USB_CONFIGFS_F_UVC is not set +# CONFIG_USB_CONFIGFS_F_PRINTER is not set + +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +# CONFIG_USB_GADGET_XILINX is not set +# CONFIG_USB_FUSB300 is not set +# CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_R8A66597 is not set +# CONFIG_USB_PXA27X is not set +# CONFIG_USB_MV_UDC is not set +# CONFIG_USB_MV_U3D is not set +# CONFIG_USB_BDC_UDC is not set +# CONFIG_USB_M66592 is not set +# CONFIG_USB_AMD5536UDC is not set +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_NET2280 is not set +# CONFIG_USB_GOKU is not set +# CONFIG_USB_EG20T is not set +# CONFIG_USB_DUMMY_HCD is not set +# CONFIG_USB_ZERO_HNPTEST is not set # MMC/SD CONFIG_MMC_SPI=m @@ -212,6 +266,7 @@ CONFIG_USB_DWC2_PCI=m CONFIG_USB_DWC3=m CONFIG_USB_DWC3_DUAL_ROLE=y CONFIG_USB_DWC3_PCI=m +CONFIG_USB_DWC3_OF_SIMPLE=m # CONFIG_USB_DWC3_DEBUG is not set CONFIG_USB_DWC3_ULPI=y CONFIG_DW_WATCHDOG=m diff --git a/config-arm64 b/config-arm64 index 5578f2bb5..c6bcff93a 100644 --- a/config-arm64 +++ b/config-arm64 @@ -145,10 +145,12 @@ CONFIG_NET_SB1000=y CONFIG_PINCTRL_AMD=y # HiSilicon +CONFIG_HISILICON_IRQ_MBIGEN=y +CONFIG_PCI_HISI=y CONFIG_POWER_RESET_HISI=y CONFIG_HISI_THERMAL=m CONFIG_STUB_CLK_HI6220=y -CONFIG_PCI_HISI=y +CONFIG_PHY_HI6220_USB=m # ThunderX # CONFIG_MDIO_OCTEON is not set diff --git a/config-armv7 b/config-armv7 index 00a13ebc3..f188fdc80 100644 --- a/config-armv7 +++ b/config-armv7 @@ -106,6 +106,7 @@ CONFIG_RTC_DRV_PALMAS=m CONFIG_OMAP5_DSS_HDMI=y CONFIG_COMMON_CLK_PALMAS=m CONFIG_INPUT_PALMAS_PWRBUTTON=m +CONFIG_PALMAS_GPADC=m CONFIG_WL_TI=y CONFIG_WL18XX=m @@ -331,7 +332,6 @@ CONFIG_QCOM_WDT=m CONFIG_MFD_SPMI_PMIC=m CONFIG_SPMI=m CONFIG_SPMI_MSM_PMIC_ARB=m -CONFIG_PALMAS_GPADC=m CONFIG_QCOM_SPMI_IADC=m CONFIG_QCOM_SPMI_VADC=m CONFIG_LEDS_PM8941_WLED=m @@ -468,6 +468,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_VIDEO_CODA=m +CONFIG_IMX7D_ADC=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_MC13783=m diff --git a/config-armv7-generic b/config-armv7-generic index 25005c169..59e11800c 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -295,9 +295,8 @@ CONFIG_DRM_EXYNOS_ROTATOR=y CONFIG_DRM_EXYNOS_VIDI=y CONFIG_DRM_EXYNOS_MIXER=y CONFIG_PHY_EXYNOS_DP_VIDEO=m -# CONFIG_FB_S3C is not set CONFIG_PHY_EXYNOS_MIPI_VIDEO=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m +# CONFIG_FB_S3C is not set CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y CONFIG_VIDEO_EXYNOS_FIMC_LITE=m CONFIG_VIDEO_EXYNOS4_FIMC_IS=m @@ -466,63 +465,10 @@ CONFIG_REGMAP_SPMI=m CONFIG_REGMAP_MMIO=m CONFIG_REGMAP_IRQ=y -# usb -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_ULPI=y +# usb net CONFIG_AX88796=m CONFIG_AX88796_93CX6=y -# usb gadget -CONFIG_USB_OTG=y -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_VBUS_DRAW=100 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -CONFIG_U_SERIAL_CONSOLE=y -CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_DUAL_ROLE=y -CONFIG_USB_MUSB_DSPS=m -# CONFIG_MUSB_PIO_ONLY is not set -# CONFIG_USB_MUSB_TUSB6010 is not set -# CONFIG_USB_MUSB_UX500 is not set -CONFIG_USB_GPIO_VBUS=m -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_OBEX=y -# CONFIG_USB_CONFIGFS_RNDIS is not set -CONFIG_USB_CONFIGFS_SERIAL=y -# CONFIG_USB_CONFIGFS_F_LB_SS is not set -# CONFIG_USB_CONFIGFS_F_FS is not set -# CONFIG_USB_CONFIGFS_F_UAC1 is not set -# CONFIG_USB_CONFIGFS_F_UAC2 is not set -# CONFIG_USB_CONFIGFS_F_MIDI is not set -# CONFIG_USB_CONFIGFS_F_HID is not set -# CONFIG_USB_CONFIGFS_F_UVC is not set -# CONFIG_USB_CONFIGFS_F_PRINTER is not set - -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -# CONFIG_USB_FUSB300 is not set -# CONFIG_USB_FOTG210_UDC is not set -# CONFIG_USB_R8A66597 is not set -# CONFIG_USB_PXA27X is not set -# CONFIG_USB_MV_UDC is not set -# CONFIG_USB_MV_U3D is not set -# CONFIG_USB_BDC_UDC is not set -# CONFIG_USB_M66592 is not set -# CONFIG_USB_AMD5536UDC is not set -# CONFIG_USB_NET2272 is not set -# CONFIG_USB_NET2280 is not set -# CONFIG_USB_GOKU is not set -# CONFIG_USB_EG20T is not set -# CONFIG_USB_DUMMY_HCD is not set -# CONFIG_USB_ZERO_HNPTEST is not set - # Multifunction Devices CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS65910=y @@ -869,7 +815,6 @@ CONFIG_R8188EU=m # CONFIG_SERIAL_BCM63XX is not set # CONFIG_SERIAL_STM32 is not set # CONFIG_FB_XILINX is not set -# CONFIG_USB_GADGET_XILINX is not set # CONFIG_BRCMSTB_GISB_ARB is not set # CONFIG_SUNGEM is not set # CONFIG_FB_SAVAGE is not set diff --git a/kernel.spec b/kernel.spec index 7d2bf711b..084945803 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2044,8 +2044,9 @@ fi # %changelog * Sun Jan 17 2016 Peter Robinson -- Minor updates to aarch64/ARMv7/PowerPC +- Minor updates and cleanups to aarch64/ARMv7/PowerPC - ARM: enable nvmem drivers +- Build usb gadget/OTG on aarch64 * Fri Jan 15 2016 Justin M. Forbes - 4.5.0-0.rc0.git4.1 - Linux v4.4-5966-g7d1fc01 -- cgit From be7384caf21e1af784b74131e03dde2d19a4fa81 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Jan 2016 07:55:05 +0000 Subject: minor config cleanups (NFC) --- config-armv7 | 4 ---- config-generic | 11 +++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/config-armv7 b/config-armv7 index f188fdc80..1ce1facec 100644 --- a/config-armv7 +++ b/config-armv7 @@ -108,9 +108,6 @@ CONFIG_COMMON_CLK_PALMAS=m CONFIG_INPUT_PALMAS_PWRBUTTON=m CONFIG_PALMAS_GPADC=m -CONFIG_WL_TI=y -CONFIG_WL18XX=m -CONFIG_WILINK_PLATFORM_DATA=y CONFIG_MFD_WL1273_CORE=m CONFIG_NFC_WILINK=m @@ -376,7 +373,6 @@ CONFIG_USB_EHCI_MXC=m CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set CONFIG_USB_FSL_USB2=m CONFIG_NET_VENDOR_FREESCALE=y # CONFIG_GIANFAR is not set diff --git a/config-generic b/config-generic index cb6926891..34f0b4e77 100644 --- a/config-generic +++ b/config-generic @@ -1940,16 +1940,15 @@ CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_WLAN_VENDOR_TI=y +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLCORE=m +CONFIG_WLCORE_SDIO=m +CONFIG_WLCORE_SPI=m CONFIG_WL12XX=m - CONFIG_WL1251=m -CONFIG_WL1251_SPI=m CONFIG_WL1251_SDIO=m +CONFIG_WL1251_SPI=m CONFIG_WL18XX=m -CONFIG_WLCORE_SDIO=m -CONFIG_WLCORE_SPI=m -CONFIG_WILINK_PLATFORM_DATA=y - CONFIG_RTL_CARDS=m CONFIG_WLAN_VENDOR_REALTEK=y -- cgit From 42aa4321c736d85b027e9cf2e595db174b3cc76b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 18 Jan 2016 15:41:06 -0600 Subject: Linux v4.4-8606-g5807fca --- KEYS-Add-a-system-blacklist-keyring.patch | 6 +- config-arm-generic | 1 + config-armv7 | 4 ++ config-armv7-generic | 4 ++ config-generic | 14 ++++- config-powerpc64-generic | 1 + config-x86-32-generic | 1 + config-x86-generic | 5 ++ ...15-shut-up-gen8-SDE-irq-dmesg-noise-again.patch | 68 ---------------------- gitrev | 2 +- kernel.spec | 7 ++- sources | 2 +- 12 files changed, 39 insertions(+), 76 deletions(-) delete mode 100644 drm-i915-shut-up-gen8-SDE-irq-dmesg-noise-again.patch diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index be35564a6..469ac35ab 100644 --- a/KEYS-Add-a-system-blacklist-keyring.patch +++ b/KEYS-Add-a-system-blacklist-keyring.patch @@ -71,7 +71,7 @@ diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h index b20cd885c1fd..51d8ddc60e0f 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h -@@ -35,4 +35,8 @@ extern int system_verify_data(const void *data, unsigned long len, +@@ -35,6 +35,10 @@ extern int system_verify_data(const void *data, unsigned long len, enum key_being_used_for usage); #endif @@ -79,7 +79,9 @@ index b20cd885c1fd..51d8ddc60e0f 100644 +extern struct key *system_blacklist_keyring; +#endif + - #endif /* _KEYS_SYSTEM_KEYRING_H */ + #ifdef CONFIG_IMA_MOK_KEYRING + extern struct key *ima_mok_keyring; + extern struct key *ima_blacklist_keyring; diff --git a/init/Kconfig b/init/Kconfig index 02da9f1fd9df..782d26f02885 100644 --- a/init/Kconfig diff --git a/config-arm-generic b/config-arm-generic index d07930cb2..370769285 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -114,6 +114,7 @@ CONFIG_ROCKCHIP_IOMMU=y CONFIG_ROCKCHIP_THERMAL=m CONFIG_DRM_ROCKCHIP=m CONFIG_ROCKCHIP_DW_HDMI=m +CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_PHY_ROCKCHIP_USB=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP=m diff --git a/config-armv7 b/config-armv7 index 1ce1facec..0cc0fa55a 100644 --- a/config-armv7 +++ b/config-armv7 @@ -299,6 +299,8 @@ CONFIG_MSM_GCC_8960=m CONFIG_MSM_MMCC_8960=m CONFIG_MSM_GCC_8974=m CONFIG_MSM_MMCC_8974=m +CONFIG_MSM_GCC_8996=m +CONFIG_MSM_MMCC_8996=m CONFIG_HW_RANDOM_MSM=m CONFIG_I2C_QUP=m CONFIG_SPI_QUP=m @@ -462,6 +464,8 @@ CONFIG_DRM_IMX_IPUV3=m CONFIG_DRM_IMX_LDB=m CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m +CONFIG_DRM_ETNAVIV=m +# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set CONFIG_VIDEO_CODA=m CONFIG_IMX7D_ADC=m diff --git a/config-armv7-generic b/config-armv7-generic index 59e11800c..4ea4da8dd 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -453,8 +453,10 @@ CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_LD9040=m CONFIG_DRM_PANEL_S6E8AA0=m CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m +CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m CONFIG_DRM_PANEL_LG_LG4573=m CONFIG_DRM_PANEL_SAMSUNG_LD9040=m +CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m CONFIG_DRM_DW_HDMI=m CONFIG_DRM_DW_HDMI_AHB_AUDIO=m @@ -632,6 +634,8 @@ CONFIG_REGULATOR_MAX8660=m CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8973=m CONFIG_REGULATOR_PFUZE100=m +CONFIG_REGULATOR_PV88060=m +CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS62360=m CONFIG_REGULATOR_TPS65023=m diff --git a/config-generic b/config-generic index 34f0b4e77..f9b630382 100644 --- a/config-generic +++ b/config-generic @@ -211,6 +211,7 @@ CONFIG_BINFMT_MISC=m # CONFIG_COMMON_CLK_SI5351 is not set # CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_HI6220 is not set @@ -3128,6 +3129,7 @@ CONFIG_IPMI_POWEROFF=m # CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_SYSFS=y # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_SOFT_WATCHDOG=m CONFIG_WDTPCI=m @@ -3159,6 +3161,7 @@ CONFIG_W83977F_WDT=m CONFIG_PCIPCWATCHDOG=m CONFIG_USBPCWATCHDOG=m # CONFIG_SBC_EPX_C3_WATCHDOG is not set +# CONFIG_TS4800_WATCHDOG is not set CONFIG_WM8350_WATCHDOG=m CONFIG_WM831X_WATCHDOG=m # CONFIG_MAX63XX_WATCHDOG is not set @@ -3168,6 +3171,7 @@ CONFIG_WM831X_WATCHDOG=m # CONFIG_XILINX_WATCHDOG is not set # CONFIG_CADENCE_WATCHDOG is not set # CONFIG_BCM7038_WDT is not set +# CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -3292,6 +3296,7 @@ CONFIG_DRM_RADEON_USERPTR=y CONFIG_DRM_AMDGPU=m # CONFIG_DRM_AMDGPU_CIK is not set CONFIG_DRM_AMDGPU_USERPTR=y +CONFIG_DRM_AMD_POWERPLAY=y # CONFIG_DRM_I810 is not set # CONFIG_DRM_MGA is not set CONFIG_DRM_MGAG200=m # do not enable on f17 or older @@ -4806,6 +4811,7 @@ CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_DEBUG_VM=y # CONFIG_DEBUG_VM_VMACACHE is not set # CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible +CONFIG_DEBUG_VM_PGFLAGS=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set CONFIG_LOCKUP_DETECTOR=y # CONFIG_DEBUG_INFO_REDUCED is not set @@ -5183,6 +5189,9 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_CS42XX8_I2C is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM179X is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_PCM3168A_SPI is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set # CONFIG_SND_SOC_QCOM is not set @@ -5207,6 +5216,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_TPA6130A2 is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set @@ -5244,7 +5254,9 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_GTM601 is not set # CONFIG_SND_SOC_STI_SAS is not set -# +# CONFIG_SND_SOC_INNO_RK3036 is not set +# CONFIG_SND_SOC_IMG is not set +# CONFIG_SND_SOC_AMD_ACP is not set CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y diff --git a/config-powerpc64-generic b/config-powerpc64-generic index 30b7455a9..ffc765a13 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -60,6 +60,7 @@ CONFIG_MEMORY_HOTREMOVE=y CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y CONFIG_CGROUP_HUGETLB=y +CONFIG_MEM_SOFT_DIRTY=y CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 diff --git a/config-x86-32-generic b/config-x86-32-generic index 865fb9004..82c9e4cce 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -219,4 +219,5 @@ CONFIG_OF=y # CONFIG_COMMON_CLK_SI570 is not set # CONFIG_COMMON_CLK_QCOM is not set # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set # CONFIG_KEYBOARD_BCM is not set diff --git a/config-x86-generic b/config-x86-generic index 7db24d165..5648f7a8f 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -328,6 +328,7 @@ CONFIG_SPI_PXA2XX=m # CONFIG_SPI_ZYNQMP_GQSPI is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m @@ -417,6 +418,7 @@ CONFIG_LPC_ICH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_LYNXPOINT is not set # CONFIG_GPIO_F7188X is not set +# CONFIG_GPIO_104_IDI_48 is not set # These should all go away with IC2_ACPI is fixed # CONFIG_MFD_AS3711 is not set @@ -549,12 +551,15 @@ CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BAYTRAIL=m CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SUN4I_CODEC is not set diff --git a/drm-i915-shut-up-gen8-SDE-irq-dmesg-noise-again.patch b/drm-i915-shut-up-gen8-SDE-irq-dmesg-noise-again.patch deleted file mode 100644 index cd53bf71c..000000000 --- a/drm-i915-shut-up-gen8-SDE-irq-dmesg-noise-again.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 41ed5ee704b784a4fca02787311d59c243563013 Mon Sep 17 00:00:00 2001 -From: Jani Nikula -Date: Thu, 7 Jan 2016 10:29:10 +0200 -Subject: [PATCH] drm/i915: shut up gen8+ SDE irq dmesg noise, again - -We still keep getting - -[ 4.249930] [drm:gen8_irq_handler [i915]] *ERROR* The master control interrupt lied (SDE)! - -This reverts - -commit 820da7ae46332fa709b171eb7ba57cbd023fa6df -Author: Jani Nikula -Date: Wed Nov 25 16:47:23 2015 +0200 - - Revert "drm/i915: shut up gen8+ SDE irq dmesg noise" - -which in itself is a revert, so this is just doing - -commit 97e5ed1111dcc5300a0f59a55248cd243937a8ab -Author: Daniel Vetter -Date: Fri Oct 23 10:56:12 2015 +0200 - - drm/i915: shut up gen8+ SDE irq dmesg noise - -all over again. I'll stop pretending I understand what's going on like I -did when I thought I'd fixed this for good in - -commit 6a39d7c986be4fd18eb019e9cdbf774ec36c9f77 -Author: Jani Nikula -Date: Wed Nov 25 16:47:22 2015 +0200 - - drm/i915: fix the SDE irq dmesg warnings properly - -Reported-by: Chris Wilson -Reference: http://mid.gmane.org/20151213124945.GA5715@nuc-i3427.alporthouse.com -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92084 -Cc: drm-intel-fixes@lists.freedesktop.org -Fixes: 820da7ae4633 ("Revert "drm/i915: shut up gen8+ SDE irq dmesg noise"") -Signed-off-by: Jani Nikula ---- - drivers/gpu/drm/i915/i915_irq.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 0d228f909dcb..0f42a2782afc 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -2354,9 +2354,13 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg) - spt_irq_handler(dev, pch_iir); - else - cpt_irq_handler(dev, pch_iir); -- } else -- DRM_ERROR("The master control interrupt lied (SDE)!\n"); -- -+ } else { -+ /* -+ * Like on previous PCH there seems to be something -+ * fishy going on with forwarding PCH interrupts. -+ */ -+ DRM_DEBUG_DRIVER("The master control interrupt lied (SDE)!\n"); -+ } - } - - I915_WRITE_FW(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL); --- -2.5.0 - diff --git a/gitrev b/gitrev index 9c407044e..e23d72ea9 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -7d1fc01afc5af35e5197e0e75abe900f6bd279b8 +5807fcaa9bf7dd87241df739161c119cf78a6bc4 diff --git a/kernel.spec b/kernel.spec index 084945803..0257d4ce5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -590,8 +590,6 @@ Patch571: ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch #CVE-2015-8709 rhbz 1295287 1295288 Patch603: ptrace-being-capable-wrt-a-process-requires-mapped-u.patch -Patch604: drm-i915-shut-up-gen8-SDE-irq-dmesg-noise-again.patch - #rhbz 1295646 Patch621: drm-udl-Use-unlocked-gem-unreferencing.patch @@ -2043,6 +2041,9 @@ fi # # %changelog +* Mon Jan 18 2016 Justin M. Forbes - 4.5.0-0.rc0.git5.1 +- Linux v4.4-8606-g5807fca + * Sun Jan 17 2016 Peter Robinson - Minor updates and cleanups to aarch64/ARMv7/PowerPC - ARM: enable nvmem drivers diff --git a/sources b/sources index 128dbdbe8..ae92f519d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz dcbc8fe378a676d5d0dd208cf524e144 perf-man-4.4.tar.gz -48e32361f4429bf2b4908fd982fe6b9b patch-4.4-git4.xz +37c094912e7812f0a856e67aa313c9e8 patch-4.4-git5.xz -- cgit From ca0d39be274627eacaa8f9c9f5add98c3d3a04d3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 19 Jan 2016 06:02:05 +0000 Subject: add patch to fix cpupower utils build --- cpupower-Fix-build-error-in-cpufreq-info.patch | 40 ++++++++++++++++++++++++++ kernel.spec | 3 ++ 2 files changed, 43 insertions(+) create mode 100644 cpupower-Fix-build-error-in-cpufreq-info.patch diff --git a/cpupower-Fix-build-error-in-cpufreq-info.patch b/cpupower-Fix-build-error-in-cpufreq-info.patch new file mode 100644 index 000000000..618e3edf2 --- /dev/null +++ b/cpupower-Fix-build-error-in-cpufreq-info.patch @@ -0,0 +1,40 @@ +From patchwork Mon Jan 18 15:14:43 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: cpupower: Fix build error in cpufreq-info +From: "Shreyas B. Prabhu" +X-Patchwork-Id: 8055301 +Message-Id: <1453130083-16055-1-git-send-email-shreyas@linux.vnet.ibm.com> +To: trenn@suse.com +Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, + rafael.j.wysocki@intel.com, jtanenba@redhat.com, + "Shreyas B. Prabhu" +Date: Mon, 18 Jan 2016 20:44:43 +0530 + +Fix the following build error by including limits.h - + +utils/cpufreq-info.c: In function ‘get_latency’: +utils/cpufreq-info.c:437:29: error: ‘UINT_MAX’ undeclared (first use in +this function) + if (!latency || latency == UINT_MAX) { + ^ +Signed-off-by: Shreyas B. Prabhu +Fixes: e98f033f94f3 (cpupower: fix how "cpupower frequency-info" interprets latency) + +--- +tools/power/cpupower/utils/cpufreq-info.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c +index 8f3f5bb9c74e..590d12a25f6e 100644 +--- a/tools/power/cpupower/utils/cpufreq-info.c ++++ b/tools/power/cpupower/utils/cpufreq-info.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/kernel.spec b/kernel.spec index 0257d4ce5..4d9533c8b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -596,6 +596,9 @@ Patch621: drm-udl-Use-unlocked-gem-unreferencing.patch #CVE-2015-7566 rhbz 1296466 1297517 Patch623: usb-serial-visor-fix-crash-on-detecting-device-witho.patch +# https://patchwork.kernel.org/patch/8055301/ +Patch625: cpupower-Fix-build-error-in-cpufreq-info.patch + # END OF PATCH DEFINITIONS %endif -- cgit From 867de2c270475056b8c54e7518d53761f8fe15c7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 19 Jan 2016 12:42:38 +0000 Subject: Fix boot on TI am33xx/omap devices --- config-arm-generic | 2 +- kernel.spec | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config-arm-generic b/config-arm-generic index 370769285..12cb852cb 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -323,7 +323,7 @@ CONFIG_PINMUX=y CONFIG_PINCONF=y CONFIG_PINCTRL=y CONFIG_GENERIC_PINCONF=y -CONFIG_PINCTRL_SINGLE=m +CONFIG_PINCTRL_SINGLE=y #i2c CONFIG_I2C_ARB_GPIO_CHALLENGE=m diff --git a/kernel.spec b/kernel.spec index 4d9533c8b..0aa0c6010 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2044,6 +2044,9 @@ fi # # %changelog +* Tue Jan 19 2016 Peter Robinson +- Fix boot on TI am33xx/omap devices + * Mon Jan 18 2016 Justin M. Forbes - 4.5.0-0.rc0.git5.1 - Linux v4.4-8606-g5807fca -- cgit From e5da0c6fbe422dbea9d498729424f6a1befa498a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 19 Jan 2016 12:45:47 -0600 Subject: Linux v4.4-8855-ga200dcb --- ...-keyring-ref-leak-in-join_session_keyring.patch | 78 ++++++++++++++++++++++ config-armv7-lpae | 1 + config-generic | 3 +- gitrev | 2 +- kernel.spec | 9 ++- sources | 2 +- 6 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch diff --git a/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch new file mode 100644 index 000000000..5eec95c62 --- /dev/null +++ b/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch @@ -0,0 +1,78 @@ +From 05fd13592b60c3e9873f56705f80ff934e98b046 Mon Sep 17 00:00:00 2001 +From: David Howells +Date: Mon, 18 Jan 2016 10:53:31 +0000 +Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring() + +This fixes CVE-2016-0728. + +If a thread is asked to join as a session keyring the keyring that's already +set as its session, we leak a keyring reference. + +This can be tested with the following program: + + #include + #include + #include + #include + + int main(int argc, const char *argv[]) + { + int i = 0; + key_serial_t serial; + + serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, + "leaked-keyring"); + if (serial < 0) { + perror("keyctl"); + return -1; + } + + if (keyctl(KEYCTL_SETPERM, serial, + KEY_POS_ALL | KEY_USR_ALL) < 0) { + perror("keyctl"); + return -1; + } + + for (i = 0; i < 100; i++) { + serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, + "leaked-keyring"); + if (serial < 0) { + perror("keyctl"); + return -1; + } + } + + return 0; + } + +If, after the program has run, there something like the following line in +/proc/keys: + +3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty + +with a usage count of 100 * the number of times the program has been run, +then the kernel is malfunctioning. If leaked-keyring has zero usages or +has been garbage collected, then the problem is fixed. + +Reported-by: Yevgeny Pats +Signed-off-by: David Howells +RH-bugzilla: 1298036 +--- + security/keys/process_keys.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c +index 43b4cddbf2b3..7877e5cd4e23 100644 +--- a/security/keys/process_keys.c ++++ b/security/keys/process_keys.c +@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) + ret = PTR_ERR(keyring); + goto error2; + } else if (keyring == new->session_keyring) { ++ key_put(keyring); + ret = 0; + goto error2; + } +-- +2.5.0 + diff --git a/config-armv7-lpae b/config-armv7-lpae index 483c49960..828b13a87 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -81,3 +81,4 @@ CONFIG_GPIO_SYSCON=m # CONFIG_SND_SOC_TEGRA20_DAS is not set # CONFIG_SND_SOC_TEGRA20_SPDIF is not set # CONFIG_SND_SOC_TEGRA_RT5677 is not set +# CONFIG_DRM_OMAP is not set diff --git a/config-generic b/config-generic index f9b630382..b9109aafc 100644 --- a/config-generic +++ b/config-generic @@ -3222,6 +3222,7 @@ CONFIG_RTC_DRV_V3020=m CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_S35390A is not set +CONFIG_RTC_DRV_RX8010=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_DS1286=m @@ -5256,7 +5257,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_INNO_RK3036 is not set # CONFIG_SND_SOC_IMG is not set -# CONFIG_SND_SOC_AMD_ACP is not set +CONFIG_SND_SOC_AMD_ACP=m CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y diff --git a/gitrev b/gitrev index e23d72ea9..d5f87db06 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -5807fcaa9bf7dd87241df739161c119cf78a6bc4 +a200dcb34693084e56496960d855afdeaaf9578f diff --git a/kernel.spec b/kernel.spec index 0aa0c6010..d6d1a2cd7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -599,6 +599,9 @@ Patch623: usb-serial-visor-fix-crash-on-detecting-device-witho.patch # https://patchwork.kernel.org/patch/8055301/ Patch625: cpupower-Fix-build-error-in-cpufreq-info.patch +#CVE-2016-0728 rhbz 1296623 +Patch626: KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch + # END OF PATCH DEFINITIONS %endif @@ -2044,6 +2047,10 @@ fi # # %changelog +* Tue Jan 19 2016 Justin M. Forbes - 4.5.0-0.rc0.git6.1 +- Linux v4.4-8855-ga200dcb +- CVE-2016-0728 Keys: reference leak in join_session_keyring (rhbz 1296623) + * Tue Jan 19 2016 Peter Robinson - Fix boot on TI am33xx/omap devices diff --git a/sources b/sources index ae92f519d..0055051a8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz dcbc8fe378a676d5d0dd208cf524e144 perf-man-4.4.tar.gz -37c094912e7812f0a856e67aa313c9e8 patch-4.4-git5.xz +64ceedc19f6080bedbafdc1321d9ac95 patch-4.4-git6.xz -- cgit