[packages/kernel] - started update to 4.6
baggins
baggins at pld-linux.org
Sun May 22 16:03:46 CEST 2016
commit 193df3b5abd6bb1cddc21349574adb2572f55147
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun May 22 16:03:31 2016 +0200
- started update to 4.6
kernel-imq.patch | 2 +-
kernel-multiarch.config | 179 ++++++++++++++++++++++-------------------------
kernel-small_fixes.patch | 46 ------------
kernel-x86.config | 4 +-
kernel.spec | 8 +--
5 files changed, 90 insertions(+), 149 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0b70d72..3522158 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,9 +69,9 @@
%define have_pcmcia 0
%endif
-%define rel 1
-%define basever 4.5
-%define postver .4
+%define rel 0.1
+%define basever 4.6
+%define postver .0
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -117,7 +117,7 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5: a60d48eee08ec0536d5efb17ca819aef
+# Source0-md5: d2927020e24a76da4ab482a8bc3e9ef3
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
# Patch0-md5: 137460a1e32335e2eedc61fcfc2643fa
diff --git a/kernel-imq.patch b/kernel-imq.patch
index ceb1b6b..2ca0201 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -137,9 +137,9 @@ index 900b0c5..e093402 100644
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_IFB) += ifb.o
+obj-$(CONFIG_IMQ) += imq.o
+ obj-$(CONFIG_MACSEC) += macsec.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
- obj-$(CONFIG_MII) += mii.o
diff --git a/drivers/net/imq.c b/drivers/net/imq.c
new file mode 100644
index 0000000..f80258f
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index bbcdb9b..3929607 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -24,7 +24,6 @@ PUNIT_ATOM_DEBUG all=m
STATIC_KEYS_SELFTEST all=y
X86_AMD_PLATFORM_DEVICE all=y
X86_DEBUG_FPU all=n
-X86_DEBUG_STATIC_CPU_HAS all=n
X86_SYSFB all=y
XEN_512GB all=y
XEN_PVH all=y
@@ -200,7 +199,6 @@ CRYPTO_TWOFISH_X86_64_3WAY all=m
CRYPTO_TWOFISH_AVX_X86_64 all=m
#- Compression
CRYPTO_DEFLATE all=m
-CRYPTO_ZLIB all=m
CRYPTO_LZO all=y
CRYPTO_842 all=m
CRYPTO_LZ4 all=m
@@ -225,7 +223,6 @@ CRYPTO_USER_API_AEAD all=m
#-
ASYMMETRIC_KEY_TYPE all=m
ASYMMETRIC_PUBLIC_KEY_SUBTYPE all=m
-PUBLIC_KEY_ALGO_RSA all=m
X509_CERTIFICATE_PARSER all=m
PKCS7_MESSAGE_PARSER all=m
PKCS7_TEST_KEY all=m
@@ -482,7 +479,6 @@ PARIDE all=m
#- file drivers/block/paride/Kconfig goes here
#- file drivers/block/mtip32xx/Kconfig goes here
#- file drivers/block/zram/Kconfig goes here
-BLK_CPQ_DA all=m sparc64=n
BLK_CPQ_CISS_DA all=m sparc=n
CISS_SCSI_TAPE all=y
BLK_DEV_DAC960 all=m
@@ -731,15 +727,16 @@ XILLYBUS_PCIE all=m
COMMON_CLK_WM831X all=m
#- file drivers/clk/versatile/Kconfig goes here
COMMON_CLK_SI5351 all=m
+COMMON_CLK_CDCE706 all=m
COMMON_CLK_CS2000_CP all=m
COMMON_CLK_PWM all=m
-COMMON_CLK_CDCE706 all=m
#- file drivers/clk/bcm/Kconfig goes here
#- file drivers/clk/hisilicon/Kconfig goes here
-#- file drivers/clk/qcom/Kconfig goes here
#- file drivers/clk/mvebu/Kconfig goes here
+#- file drivers/clk/qcom/Kconfig goes here
#- file drivers/clk/samsung/Kconfig goes here
#- file drivers/clk/tegra/Kconfig goes here
+#- file drivers/clk/ti/Kconfig goes here
#-
#- *** FILE: drivers/connector/Kconfig ***
@@ -850,6 +847,7 @@ INTEL_MIC_X100_DMA all=m
PCH_DMA all=m
TIMB_DMA all=m
#- file drivers/dma/bestcomm/Kconfig goes here
+#- file drivers/dma/qcom/Kconfig goes here
#- file drivers/dma/dw/Kconfig goes here
#- file drivers/dma/hsu/Kconfig goes here
#- file drivers/dma/sh/Kconfig goes here
@@ -1039,12 +1037,14 @@ DRM_FBDEV_EMULATION all=y
DRM_LOAD_EDID_FIRMWARE all=y
#- file drivers/gpu/drm/i2c/Kconfig goes here
DRM_TDFX all=m
+#- file drivers/gpu/drm/arm/Kconfig goes here
DRM_R128 all=m
DRM_RADEON all=m
#- file drivers/gpu/drm/radeon/Kconfig goes here
DRM_AMDGPU all=m
#- file drivers/gpu/drm/amd/amdgpu/Kconfig goes here
#- file drivers/gpu/drm/amd/powerplay/Kconfig goes here
+#- file drivers/gpu/drm/amd/acp/Kconfig goes here
#- file drivers/gpu/drm/nouveau/Kconfig goes here
DRM_I810 i386=m x86_64=m
#- file drivers/gpu/drm/i915/Kconfig goes here
@@ -1883,6 +1883,9 @@ MAG3110 all=m
HID_SENSOR_MAGNETOMETER_3D all=m
MMC35240 all=m
IIO_ST_MAGN_3AXIS all=m
+SENSORS_HMC5843 all=m
+SENSORS_HMC5843_I2C all=m
+SENSORS_HMC5843_SPI all=m
#-
#- *** FILE: drivers/iio/orientation/Kconfig ***
@@ -1944,6 +1947,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
#- file drivers/infiniband/hw/qib/Kconfig goes here
#- file drivers/infiniband/hw/cxgb3/Kconfig goes here
#- file drivers/infiniband/hw/cxgb4/Kconfig goes here
+#- file drivers/infiniband/hw/i40iw/Kconfig goes here
#- file drivers/infiniband/hw/mlx4/Kconfig goes here
#- file drivers/infiniband/hw/mlx5/Kconfig goes here
#- file drivers/infiniband/hw/nes/Kconfig goes here
@@ -1954,6 +1958,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
#- file drivers/infiniband/ulp/srpt/Kconfig goes here
#- file drivers/infiniband/ulp/iser/Kconfig goes here
#- file drivers/infiniband/ulp/isert/Kconfig goes here
+#- file drivers/infiniband/sw/rdmavt/Kconfig goes here
#-
#- *** FILE: drivers/infiniband/hw/cxgb3/Kconfig ***
@@ -2055,6 +2060,7 @@ INPUT_EVBUG all=n
#- file drivers/input/tablet/Kconfig goes here
#- file drivers/input/touchscreen/Kconfig goes here
#- file drivers/input/misc/Kconfig goes here
+#- file drivers/input/rmi4/Kconfig goes here
#- file drivers/input/serio/Kconfig goes here
#- file drivers/input/gameport/Kconfig goes here
@@ -2386,11 +2392,6 @@ ISDN_CAPI all=m
#- file drivers/isdn/mISDN/Kconfig goes here
#-
-#- *** FILE: drivers/isdn/act2000/Kconfig ***
-#-
-ISDN_DRV_ACT2000 all=m
-
-#-
#- *** FILE: drivers/isdn/capi/Kconfig ***
#-
CAPI_TRACE all=y
@@ -2476,14 +2477,6 @@ ISDN_DRV_LOOP all=m
ISDN_DIVERSION all=m
#- ISDN4Linux hardware drivers
#- file drivers/isdn/hisax/Kconfig goes here
-#- file drivers/isdn/icn/Kconfig goes here
-#- file drivers/isdn/pcbit/Kconfig goes here
-#- file drivers/isdn/act2000/Kconfig goes here
-
-#-
-#- *** FILE: drivers/isdn/icn/Kconfig ***
-#-
-ISDN_DRV_ICN all=m
#-
#- *** FILE: drivers/isdn/mISDN/Kconfig ***
@@ -2494,11 +2487,6 @@ MISDN_L1OIP all=m
#- file drivers/isdn/hardware/mISDN/Kconfig goes here
#-
-#- *** FILE: drivers/isdn/pcbit/Kconfig ***
-#-
-ISDN_DRV_PCBIT all=m
-
-#-
#- *** FILE: drivers/leds/Kconfig ***
#-
NEW_LEDS all=y
@@ -2637,7 +2625,6 @@ DM_CRYPT all=m
DM_SNAPSHOT all=m
DM_THIN_PROVISIONING all=m
DM_CACHE all=m
-DM_CACHE_MQ all=m
DM_CACHE_SMQ all=m
DM_CACHE_CLEANER all=m
DM_ERA all=m
@@ -2739,6 +2726,7 @@ DVB_DYNAMIC_MINORS all=y
#-
#- Multistandard (satellite) frontends
#- Multistandard (cable + terrestrial) frontends
+DVB_MN88473 all=m
#- DVB-S (satellite) frontends
DVB_CX24110 all=m
DVB_CX24123 all=m
@@ -3090,7 +3078,6 @@ VIDEO_VIA_CAMERA all=m
#- file drivers/media/platform/davinci/Kconfig goes here
#- file drivers/media/platform/omap/Kconfig goes here
#- file drivers/media/platform/blackfin/Kconfig goes here
-VIDEO_TIMBERDALE all=m
#- file drivers/media/platform/soc_camera/Kconfig goes here
#- file drivers/media/platform/exynos4-is/Kconfig goes here
#- file drivers/media/platform/s5p-tv/Kconfig goes here
@@ -3699,6 +3686,10 @@ PCH_PHUB all=m
USB_SWITCH_FSA9480 all=m
LATTICE_ECP3_CONFIG all=m
SRAM all=n
+PANEL all=m
+PANEL_PARPORT all=0
+PANEL_PROFILE all=5
+PANEL_CHANGE_MESSAGE all=n
#- file drivers/misc/c2port/Kconfig goes here
#- file drivers/misc/eeprom/Kconfig goes here
#- file drivers/misc/cb710/Kconfig goes here
@@ -3771,6 +3762,7 @@ INTEL_MEI_TXE all=m
INTEL_MIC_BUS all=m
#- SCIF Bus Driver
SCIF_BUS all=m
+#- VOP Bus Driver
#- Intel MIC Host Driver
INTEL_MIC_HOST all=m
#- Intel MIC Card Driver
@@ -3779,6 +3771,7 @@ INTEL_MIC_CARD all=m
SCIF all=m
#- Intel MIC Coprocessor State Management (COSM) Drivers
MIC_COSM all=m
+#- VOP Driver
#-
#- *** FILE: drivers/misc/ti-st/Kconfig ***
@@ -4110,14 +4103,15 @@ CAN_CALC_BITTIMING all=y
CAN_LEDS all=y
CAN_JANZ_ICAN3 all=m
PCH_CAN all=m
-#- file drivers/net/can/mscan/Kconfig goes here
-#- file drivers/net/can/sja1000/Kconfig goes here
#- file drivers/net/can/c_can/Kconfig goes here
-#- file drivers/net/can/m_can/Kconfig goes here
#- file drivers/net/can/cc770/Kconfig goes here
+#- file drivers/net/can/ifi_canfd/Kconfig goes here
+#- file drivers/net/can/m_can/Kconfig goes here
+#- file drivers/net/can/mscan/Kconfig goes here
+#- file drivers/net/can/sja1000/Kconfig goes here
+#- file drivers/net/can/softing/Kconfig goes here
#- file drivers/net/can/spi/Kconfig goes here
#- file drivers/net/can/usb/Kconfig goes here
-#- file drivers/net/can/softing/Kconfig goes here
CAN_DEBUG_DEVICES all=n
#-
@@ -4180,7 +4174,6 @@ CAN_8DEV_USB all=m
#-
NET_DSA_MV88E6060 all=y
NET_DSA_MV88E6131 all=y
-NET_DSA_MV88E6123_61_65 all=y
NET_DSA_MV88E6171 all=m
NET_DSA_MV88E6352 all=m
NET_DSA_BCM_SF2 all=m
@@ -4251,6 +4244,7 @@ DNET all=m
#- file drivers/net/ethernet/xscale/Kconfig goes here
JME all=m
#- file drivers/net/ethernet/marvell/Kconfig goes here
+#- file drivers/net/ethernet/mediatek/Kconfig goes here
#- file drivers/net/ethernet/mellanox/Kconfig goes here
#- file drivers/net/ethernet/micrel/Kconfig goes here
#- file drivers/net/ethernet/microchip/Kconfig goes here
@@ -4263,7 +4257,6 @@ FEALNX all=m
#- file drivers/net/ethernet/nuvoton/Kconfig goes here
#- file drivers/net/ethernet/nvidia/Kconfig goes here
#- file drivers/net/ethernet/nxp/Kconfig goes here
-#- file drivers/net/ethernet/octeon/Kconfig goes here
#- file drivers/net/ethernet/oki-semi/Kconfig goes here
ETHOC all=m
#- file drivers/net/ethernet/packetengines/Kconfig goes here
@@ -5638,7 +5631,6 @@ OF all=n
PCI all=y
#- file drivers/pci/Kconfig goes here
#- file drivers/pcmcia/Kconfig goes here
-#- file drivers/pci/hotplug/Kconfig goes here
#-
#- *** FILE: drivers/parport/Kconfig ***
@@ -5658,6 +5650,7 @@ PARPORT_NOT_PC all=y
#-
#- *** FILE: drivers/pci/Kconfig ***
#-
+#- file drivers/pci/pcie/Kconfig goes here
PCI_MSI all=y sparc64=n
PCI_DEBUG all=n
PCI_REALLOC_ENABLE_AUTO all=y
@@ -5668,6 +5661,7 @@ PCI_IOV all=y
PCI_PRI all=y
PCI_PASID all=y
PCI_LABEL all=y
+#- file drivers/pci/hotplug/Kconfig goes here
#- file drivers/pci/host/Kconfig goes here
#-
@@ -5765,7 +5759,9 @@ PINCTRL_AMD all=y
#- file drivers/pinctrl/samsung/Kconfig goes here
#- file drivers/pinctrl/sh-pfc/Kconfig goes here
#- file drivers/pinctrl/spear/Kconfig goes here
+#- file drivers/pinctrl/stm32/Kconfig goes here
#- file drivers/pinctrl/sunxi/Kconfig goes here
+#- file drivers/pinctrl/tegra/Kconfig goes here
#- file drivers/pinctrl/uniphier/Kconfig goes here
#- file drivers/pinctrl/vt8500/Kconfig goes here
#- file drivers/pinctrl/mediatek/Kconfig goes here
@@ -6098,17 +6094,15 @@ RTC_DRV_DS1307 all=m
RTC_DRV_DS1374 all=m
RTC_DRV_DS1374_WDT all=y
RTC_DRV_DS1672 all=m
-RTC_DRV_DS3232 all=m
RTC_DRV_MAX6900 all=m sparc=n
RTC_DRV_RS5C372 all=m
RTC_DRV_ISL1208 all=m
RTC_DRV_ISL12022 all=m
RTC_DRV_ISL12057 all=m
RTC_DRV_X1205 all=m
-RTC_DRV_PCF2127 all=m
RTC_DRV_PCF8523 all=m
-RTC_DRV_PCF8563 all=m
RTC_DRV_PCF85063 all=m
+RTC_DRV_PCF8563 all=m
RTC_DRV_PCF8583 all=m sparc=n
RTC_DRV_M41T80 all=m
RTC_DRV_M41T80_WDT all=n ia64=y
@@ -6129,13 +6123,15 @@ RTC_DRV_DS1305 all=m
RTC_DRV_DS1343 all=m
RTC_DRV_DS1347 all=m
RTC_DRV_DS1390 all=m
-RTC_DRV_MAX6902 all=m
RTC_DRV_R9701 all=m
+RTC_DRV_RX4581 all=m
RTC_DRV_RS5C348 all=m
-RTC_DRV_DS3234 all=m
+RTC_DRV_MAX6902 all=m
RTC_DRV_PCF2123 all=m
-RTC_DRV_RX4581 all=m
RTC_DRV_MCP795 all=m
+#- SPI and I2C RTC drivers
+RTC_DRV_DS3232 all=m
+RTC_DRV_PCF2127 all=m
#- Platform RTC drivers
RTC_DRV_CMOS all=y
RTC_DRV_DS1286 all=m
@@ -6494,6 +6490,10 @@ SPI_ALTERA all=m
SPI_BITBANG all=m
SPI_BUTTERFLY all=m
SPI_CADENCE all=m
+SPI_DESIGNWARE all=y
+SPI_DW_PCI all=m
+SPI_DW_MID_DMA all=y
+SPI_DW_MMIO all=m
SPI_DLN2 all=m
SPI_GPIO all=m
SPI_LM70_LLP all=m
@@ -6506,10 +6506,6 @@ SPI_TOPCLIFF_PCH all=m
SPI_XCOMM all=m
SPI_XILINX all=m
SPI_ZYNQMP_GQSPI all=m
-SPI_DESIGNWARE all=y
-SPI_DW_PCI all=m
-SPI_DW_MID_DMA all=y
-SPI_DW_MMIO all=m
#- SPI Protocol Masters
SPI_SPIDEV all=m sparc=n
SPI_LOOPBACK_TEST all=m
@@ -6539,7 +6535,6 @@ STAGING all=y
#- file drivers/staging/wlan-ng/Kconfig goes here
#- file drivers/staging/comedi/Kconfig goes here
#- file drivers/staging/olpc_dcon/Kconfig goes here
-#- file drivers/staging/panel/Kconfig goes here
#- file drivers/staging/rtl8192u/Kconfig goes here
#- file drivers/staging/rtl8192e/Kconfig goes here
#- file drivers/staging/rtl8712/Kconfig goes here
@@ -6555,13 +6550,11 @@ STAGING all=y
#- file drivers/staging/xgifb/Kconfig goes here
#- file drivers/staging/emxx_udc/Kconfig goes here
#- file drivers/staging/speakup/Kconfig goes here
-#- file drivers/staging/ste_rmi4/Kconfig goes here
#- file drivers/staging/nvec/Kconfig goes here
#- file drivers/staging/media/Kconfig goes here
#- file drivers/staging/rdma/Kconfig goes here
#- file drivers/staging/android/Kconfig goes here
#- file drivers/staging/board/Kconfig goes here
-#- file drivers/staging/gdm72xx/Kconfig goes here
#- file drivers/staging/gdm724x/Kconfig goes here
#- file drivers/staging/fwserial/Kconfig goes here
#- file drivers/staging/goldfish/Kconfig goes here
@@ -6569,7 +6562,6 @@ STAGING all=y
#- file drivers/staging/mt29f_spinand/Kconfig goes here
#- file drivers/staging/lustre/Kconfig goes here
#- file drivers/staging/dgnc/Kconfig goes here
-#- file drivers/staging/dgap/Kconfig goes here
#- file drivers/staging/gs_fpgaboot/Kconfig goes here
#- file drivers/staging/skein/Kconfig goes here
#- file drivers/staging/unisys/Kconfig goes here
@@ -6578,6 +6570,7 @@ STAGING all=y
#- file drivers/staging/fsl-mc/Kconfig goes here
#- file drivers/staging/wilc1000/Kconfig goes here
#- file drivers/staging/most/Kconfig goes here
+#- file drivers/staging/i4l/Kconfig goes here
#-
#- *** FILE: drivers/staging/comedi/Kconfig ***
@@ -6711,11 +6704,6 @@ COMEDI_NI_LABPC all=m
COMEDI_NI_TIO all=m
#-
-#- *** FILE: drivers/staging/dgap/Kconfig ***
-#-
-DGAP all=m
-
-#-
#- *** FILE: drivers/staging/dgnc/Kconfig ***
#-
DGNC all=m
@@ -6769,20 +6757,24 @@ FWTTY_MAX_CARD_PORTS all=32
LTE_GDM724X all=m
#-
-#- *** FILE: drivers/staging/gdm72xx/Kconfig ***
+#- *** FILE: drivers/staging/gs_fpgaboot/Kconfig ***
#-
-WIMAX_GDM72XX all=m
-WIMAX_GDM72XX_QOS all=y
-WIMAX_GDM72XX_K_MODE all=y
-WIMAX_GDM72XX_WIMAX2 all=y
-WIMAX_GDM72XX_USB all=y
-WIMAX_GDM72XX_SDIO all=n
-WIMAX_GDM72XX_USB_PM all=y
+GS_FPGABOOT all=m
#-
-#- *** FILE: drivers/staging/gs_fpgaboot/Kconfig ***
+#- *** FILE: drivers/staging/i4l/act2000/Kconfig ***
#-
-GS_FPGABOOT all=m
+ISDN_DRV_ACT2000 all=m
+
+#-
+#- *** FILE: drivers/staging/i4l/icn/Kconfig ***
+#-
+ISDN_DRV_ICN all=m
+
+#-
+#- *** FILE: drivers/staging/i4l/pcbit/Kconfig ***
+#-
+ISDN_DRV_PCBIT all=m
#-
#- *** FILE: drivers/staging/iio/accel/Kconfig ***
@@ -6846,13 +6838,6 @@ TSL2583 all=m
TSL2x7x all=m
#-
-#- *** FILE: drivers/staging/iio/magnetometer/Kconfig ***
-#-
-SENSORS_HMC5843 all=m
-SENSORS_HMC5843_I2C all=m
-SENSORS_HMC5843_SPI all=m
-
-#-
#- *** FILE: drivers/staging/iio/meter/Kconfig ***
#-
ADE7753 all=m
@@ -6871,12 +6856,6 @@ AD2S1200 all=m
AD2S1210 all=m
#-
-#- *** FILE: drivers/staging/iio/trigger/Kconfig ***
-#-
-#- Triggers - standalone
-IIO_PERIODIC_RTC_TRIGGER all=m
-
-#-
#- *** FILE: drivers/staging/lustre/lnet/Kconfig ***
#-
LNET_MAX_PAYLOAD all=1048576
@@ -6899,8 +6878,11 @@ STAGING_MEDIA all=y
#- file drivers/staging/media/cxd2099/Kconfig goes here
#- file drivers/staging/media/davinci_vpfe/Kconfig goes here
#- file drivers/staging/media/mn88472/Kconfig goes here
-#- file drivers/staging/media/mn88473/Kconfig goes here
+#- file drivers/staging/media/mx2/Kconfig goes here
+#- file drivers/staging/media/mx3/Kconfig goes here
+#- file drivers/staging/media/omap1/Kconfig goes here
#- file drivers/staging/media/omap4iss/Kconfig goes here
+#- file drivers/staging/media/timb/Kconfig goes here
#- file drivers/staging/media/lirc/Kconfig goes here
#-
@@ -6932,9 +6914,9 @@ LIRC_ZILOG all=m
DVB_MN88472 all=m
#-
-#- *** FILE: drivers/staging/media/mn88473/Kconfig ***
+#- *** FILE: drivers/staging/media/timb/Kconfig ***
#-
-DVB_MN88473 all=m
+VIDEO_TIMBERDALE all=m
#-
#- *** FILE: drivers/staging/most/Kconfig ***
@@ -6991,14 +6973,6 @@ MTD_SPINAND_MT29F all=m
MTD_SPINAND_ONDIEECC all=y
#-
-#- *** FILE: drivers/staging/panel/Kconfig ***
-#-
-PANEL all=m
-PANEL_PARPORT all=0
-PANEL_PROFILE all=5
-PANEL_CHANGE_MESSAGE all=n
-
-#-
#- *** FILE: drivers/staging/rdma/Kconfig ***
#-
STAGING_RDMA all=y
@@ -7011,7 +6985,6 @@ INFINIBAND_HFI1 all=m
HFI1_DEBUG_SDMA_ORDER all=n
HFI1_VERBS_31BIT_PSN all=y
SDMA_VERBOSITY all=n
-PRESCAN_RXQ all=y
#-
#- *** FILE: drivers/staging/rtl8188eu/Kconfig ***
@@ -7091,11 +7064,6 @@ SPEAKUP_SYNTH_TXPRT all=m
SPEAKUP_SYNTH_DUMMY all=m
#-
-#- *** FILE: drivers/staging/ste_rmi4/Kconfig ***
-#-
-TOUCHSCREEN_SYNAPTICS_I2C_RMI4 all=m
-
-#-
#- *** FILE: drivers/staging/unisys/Kconfig ***
#-
UNISYSSPAR all=y
@@ -8225,6 +8193,7 @@ FS_DAX all=y
FS_POSIX_ACL all=y
FILE_LOCKING all=y
MANDATORY_FILE_LOCKING all=y
+#- file fs/crypto/Kconfig goes here
#- file fs/notify/Kconfig goes here
#- file fs/quota/Kconfig goes here
#- file fs/autofs4/Kconfig goes here
@@ -8246,6 +8215,7 @@ HUGETLBFS all=y alpha= sparc= sparc64=y
#- file fs/configfs/Kconfig goes here
#- file fs/efivarfs/Kconfig goes here
MISC_FILESYSTEMS all=y
+#- file fs/orangefs/Kconfig goes here
#- file fs/adfs/Kconfig goes here
#- file fs/affs/Kconfig goes here
#- file fs/ecryptfs/Kconfig goes here
@@ -9406,6 +9376,7 @@ NET_DROP_MONITOR all=y
#- file net/irda/Kconfig goes here
#- file net/bluetooth/Kconfig goes here
#- file net/rxrpc/Kconfig goes here
+#- file net/kcm/Kconfig goes here
FIB_RULES all=y
WIRELESS all=y
#- file net/wireless/Kconfig goes here
@@ -9644,7 +9615,6 @@ INET_TUNNEL all=m
INET_XFRM_MODE_TRANSPORT all=m
INET_XFRM_MODE_TUNNEL all=m
INET_XFRM_MODE_BEET all=m
-INET_LRO all=y
INET_DIAG all=m
INET_TCP_DIAG all=m
INET_UDP_DIAG all=m
@@ -10060,7 +10030,6 @@ NETLABEL all=y
#-
#- *** FILE: net/netlink/Kconfig ***
#-
-NETLINK_MMAP all=y
NETLINK_DIAG all=m
#-
@@ -10255,7 +10224,6 @@ WIRELESS_EXT all=y
CFG80211 all=m sparc=n
NL80211_TESTMODE all=y
CFG80211_DEVELOPER_WARNINGS all=n
-CFG80211_REG_DEBUG all=n
CFG80211_DEFAULT_PS all=y
CFG80211_DEBUGFS all=n
CFG80211_INTERNAL_REGDB all=n
@@ -10972,10 +10940,15 @@ BATTERY_BQ27X00_I2C all=y
BATTERY_BQ27X00_PLATFORM all=y
BATTERY_BQ27XXX_PLATFORM all=y
BATTERY_BQ27x00 all=m
+BLK_CPQ_DA all=m sparc64=n
BLK_DEV_CELLEB ppc64=m
BLK_DEV_XIP all=y
+CFG80211_REG_DEBUG all=n
COMEDI_UNIOXX5 all=m
+CRYPTO_ZLIB all=m
DEFAULT_SECURITY_YAMA all=n
+DGAP all=m
+DM_CACHE_MQ all=m
DRM_I915_FBDEV all=y
DRM_I915_KMS all=y
DRM_PTN3460 all=m
@@ -11008,6 +10981,8 @@ I2O_LCT_NOTIFY_ON_CHANGES all=y
I2O_PROC all=m
I2O_SCSI all=m
IDMA64 all=m
+IIO_PERIODIC_RTC_TRIGGER all=m
+INET_LRO all=y
INFINIBAND_AMSO1100 all=m sparc=
INFINIBAND_AMSO1100_DEBUG all=n sparc=
INFINIBAND_IPATH all=m
@@ -11025,12 +11000,17 @@ MEDIA_PARPORT_SUPPORT all=y
MEMCG_KMEM all=y
MMC_CLKGATE all=n
NETFILTER_NETLINK_QUEUE_CT all=y
+NETLINK_MMAP all=y
+NET_DSA_MV88E6123_61_65 all=y
NFC_ST21NFCB all=m
NFC_ST21NFCB_I2C all=m
PATA_SCC ppc64=m
+PRESCAN_RXQ all=y
+PUBLIC_KEY_ALGO_RSA all=m
RCU_CPU_STALL_INFO all=n
RCU_FANOUT_EXACT all=n
RCU_USER_QS all=n
+RTC_DRV_DS3234 all=m
RT_MUTEX_TESTER all=n
SCSI_MPT2SAS_LOGGING all=y
SCSI_MPT3SAS_LOGGING all=y
@@ -11051,6 +11031,7 @@ TCG_TIS_I2C_ST33 all=m
TCM_USER all=m
TIPC_PORTS all=8191
TOUCHSCREEN_CLEARPAD_TM1217 all=m
+TOUCHSCREEN_SYNAPTICS_I2C_RMI4 all=m
UNISYS_CHANNELSTUB all=m
UNISYS_UISLIB all=m
UNISYS_VIRTHBA all=m
@@ -11073,6 +11054,14 @@ VIDEO_W9966 all=m
WILC1000_DRIVER all=n
WILC1000_DYNAMICALLY_ALLOCATE_MEMROY all=n
WILC1000_PREALLOCATE_AT_LOADING_DRIVER all=y
+WIMAX_GDM72XX all=m
+WIMAX_GDM72XX_K_MODE all=y
+WIMAX_GDM72XX_QOS all=y
+WIMAX_GDM72XX_SDIO all=n
+WIMAX_GDM72XX_USB all=y
+WIMAX_GDM72XX_USB_PM all=y
+WIMAX_GDM72XX_WIMAX2 all=y
WL_MEDIATEK all=y
WL_TI all=y
+X86_DEBUG_STATIC_CPU_HAS all=n
ZRAM_DEBUG all=n
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 5c9ff24..d4b6034 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,49 +26,3 @@
exit
fi
done
-From 8358b02bf67d3a5d8a825070e1aa73f25fb2e4c7 Mon Sep 17 00:00:00 2001
-From: Jann Horn <jannh at google.com>
-Date: Tue, 26 Apr 2016 22:26:26 +0200
-Subject: bpf: fix double-fdput in replace_map_fd_with_map_ptr()
-
-When bpf(BPF_PROG_LOAD, ...) was invoked with a BPF program whose bytecode
-references a non-map file descriptor as a map file descriptor, the error
-handling code called fdput() twice instead of once (in __bpf_map_get() and
-in replace_map_fd_with_map_ptr()). If the file descriptor table of the
-current task is shared, this causes f_count to be decremented too much,
-allowing the struct file to be freed while it is still in use
-(use-after-free). This can be exploited to gain root privileges by an
-unprivileged user.
-
-This bug was introduced in
-commit 0246e64d9a5f ("bpf: handle pseudo BPF_LD_IMM64 insn"), but is only
-exploitable since
-commit 1be7f75d1668 ("bpf: enable non-root eBPF programs") because
-previously, CAP_SYS_ADMIN was required to reach the vulnerable code.
-
-(posted publicly according to request by maintainer)
-
-Signed-off-by: Jann Horn <jannh at google.com>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-Acked-by: Alexei Starovoitov <ast at kernel.org>
-Acked-by: Daniel Borkmann <daniel at iogearbox.net>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
- kernel/bpf/verifier.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
-index 618ef77..db2574e 100644
---- a/kernel/bpf/verifier.c
-+++ b/kernel/bpf/verifier.c
-@@ -2030,7 +2030,6 @@ static int replace_map_fd_with_map_ptr(struct verifier_env *env)
- if (IS_ERR(map)) {
- verbose("fd %d is not pointing to valid bpf_map\n",
- insn->imm);
-- fdput(f);
- return PTR_ERR(map);
- }
-
---
-cgit v0.12
-
diff --git a/kernel-x86.config b/kernel-x86.config
index 94fb63d..3224dbd 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -13,6 +13,7 @@ OPTPROBES x86=y
#- *** FILE: arch/x86/Kconfig ***
#-
64BIT i386=n x86_64=y
+DEBUG_RODATA all=y
#- file init/Kconfig goes here
#- file kernel/Kconfig.freezer goes here
SMP x86=y
@@ -130,7 +131,6 @@ PCI_GOMMCONFIG i386=n
PCI_GODIRECT i386=n
PCI_GOANY i386=y
PCI_MMCONFIG x86=y
-#- file drivers/pci/pcie/Kconfig goes here
#- file drivers/pci/Kconfig goes here
ISA i386=y
EISA i386=y
@@ -142,7 +142,6 @@ ALIX i486=y i586=y i686=y
NET5501 i486=y i586=y i686=y
GEOS i486=y i586=y i686=y
#- file drivers/pcmcia/Kconfig goes here
-#- file drivers/pci/hotplug/Kconfig goes here
RAPIDIO all=y
#- file drivers/rapidio/Kconfig goes here
#- file fs/Kconfig.binfmt goes here
@@ -205,7 +204,6 @@ X86_VERBOSE_BOOTUP x86=n
EARLY_PRINTK x86=y
EARLY_PRINTK_DBGP x86=n
X86_PTDUMP x86=n
-DEBUG_RODATA all=y
DEBUG_RODATA_TEST all=n
DEBUG_SET_MODULE_RONX all=y
DEBUG_NX_TEST x86=m
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/193df3b5abd6bb1cddc21349574adb2572f55147
More information about the pld-cvs-commit
mailing list