Merge pull request #1 from marmarek/stable-4.9

Sync config + few bugfixes

Makefile.builder

@@ -1,8 +1,14 @@
 ifeq ($(PACKAGE_SET),dom0)
 RPM_SPEC_FILES := kernel.spec
 else ifeq ($(PACKAGE_SET),vm)
+
 ifdef UPDATE_REPO
+# If DIST_DOM0 defined, copy kernel-devel from there
+ifneq ($(DIST_DOM0),)
 # Include kernel-devel packages in VM repo - dummy spec file
 RPM_SPEC_FILES := kernel-devel.spec
+OUTPUT_DIR = pkgs/$(DIST_DOM0)
 endif
 endif
+
+endif

config

@@ -54,7 +54,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-11.pvops.qubes.x86_64"
+CONFIG_LOCALVERSION="-12.pvops.qubes.x86_64"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -691,6 +691,7 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 # CONFIG_ACPI_APEI_EINJ is not set
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_DPTF_POWER=m
+CONFIG_ACPI_WATCHDOG=y
 # CONFIG_ACPI_EXTLOG is not set
 # CONFIG_PMIC_OPREGION is not set
 CONFIG_ACPI_CONFIGFS=m
@@ -1329,6 +1330,7 @@ CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1645,7 +1647,7 @@ CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
-# CONFIG_BT_HCIUART_MRVL is not set
+CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1776,6 +1778,7 @@ CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_MMIO=m
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_FENCE_TRACE is not set
@@ -2099,7 +2102,7 @@ CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 CONFIG_SCSI_MPT2SAS=m
-# CONFIG_SCSI_SMARTPQI is not set
+CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
@@ -2392,8 +2395,8 @@ CONFIG_B53_MDIO_DRIVER=m
 CONFIG_B53_MMAP_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 CONFIG_NET_DSA_MV88E6XXX=m
-# CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 is not set
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-# CONFIG_NET_DSA_QCA8K is not set
+CONFIG_NET_DSA_QCA8K=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2409,7 +2412,8 @@ CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ALTERA_TSE=m
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
@@ -2563,8 +2567,10 @@ CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
+CONFIG_QED_LL2=y
 CONFIG_QED_SRIOV=y
 CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
@@ -2664,7 +2670,7 @@ CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROSEMI_PHY is not set
+CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
@@ -2672,7 +2678,7 @@ CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
 CONFIG_TERANETICS_PHY=m
 CONFIG_VITESSE_PHY=m
-# CONFIG_XILINX_GMII2RGMII is not set
+CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -3148,7 +3154,7 @@ CONFIG_INPUT_EVDEV=y
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADC=m
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
@@ -3322,7 +3328,7 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
-# CONFIG_INPUT_GPIO_DECODER is not set
+CONFIG_INPUT_GPIO_DECODER=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3649,7 +3655,7 @@ CONFIG_GPIO_GENERIC=m
 # Memory mapped GPIO drivers
 #
 CONFIG_GPIO_AMDPT=m
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_ICH=m
@@ -3682,6 +3688,7 @@ CONFIG_GPIO_IT87=m
 # MFD GPIO expanders
 #
 CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_TPS65086=m
 
 #
@@ -3743,7 +3750,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_CHARGER_DA9150 is not set
 # CONFIG_BATTERY_DA9150 is not set
 # CONFIG_AXP288_FUEL_GAUGE is not set
 # CONFIG_BATTERY_MAX17040 is not set
@@ -3955,7 +3961,7 @@ CONFIG_WATCHDOG_CORE=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
-# CONFIG_WDAT_WDT is not set
+CONFIG_WDAT_WDT=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
 CONFIG_CADENCE_WATCHDOG=m
@@ -4064,7 +4070,7 @@ CONFIG_MFD_AXP20X_I2C=m
 # CONFIG_MFD_DA9063 is not set
 CONFIG_MFD_DA9150=m
 CONFIG_MFD_DLN2=m
-# CONFIG_MFD_EXYNOS_LPASS is not set
+CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
@@ -4116,7 +4122,7 @@ CONFIG_MFD_SKY81452=m
 CONFIG_MFD_TPS65086=m
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
+CONFIG_MFD_TI_LP873X=m
 # CONFIG_MFD_TPS65218 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -4365,7 +4371,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_SOLO6X10=m
-# CONFIG_VIDEO_TW5864 is not set
+CONFIG_VIDEO_TW5864=m
 # CONFIG_VIDEO_TW68 is not set
 CONFIG_VIDEO_TW686X=m
 CONFIG_VIDEO_ZORAN=m
@@ -5252,7 +5258,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_MON=y
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -5432,7 +5438,7 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HSIC_USB3503=m
-# CONFIG_USB_HSIC_USB4604 is not set
+CONFIG_USB_HSIC_USB4604=m
 # CONFIG_USB_LINK_LAYER_TEST is not set
 CONFIG_USB_CHAOSKEY=m
 CONFIG_UCSI=m
@@ -5636,7 +5642,7 @@ CONFIG_LEDS_TLC591XX=m
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_MLXCPLD is not set
+CONFIG_LEDS_MLXCPLD=m
 
 #
 # LED Triggers
@@ -5692,7 +5698,7 @@ CONFIG_INFINIBAND_ISERT=m
 CONFIG_INFINIBAND_RDMAVT=m
 CONFIG_RDMA_RXE=m
 # CONFIG_INFINIBAND_HFI1 is not set
-# CONFIG_INFINIBAND_QEDR is not set
+CONFIG_INFINIBAND_QEDR=m
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
@@ -5739,7 +5745,7 @@ CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_HWMON=y
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1307_CENTURY=y
 CONFIG_RTC_DRV_DS1374=m
 CONFIG_RTC_DRV_DS1374_WDT=y
 CONFIG_RTC_DRV_DS1672=m
@@ -5848,7 +5854,7 @@ CONFIG_KS0108_PORT=0x378
 CONFIG_KS0108_DELAY=2
 CONFIG_CFAG12864B=m
 CONFIG_CFAG12864B_RATE=20
-# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMG_ASCII_LCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 # CONFIG_UIO_PDRV_GENIRQ is not set
@@ -6185,7 +6191,6 @@ CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_BUFFER_CB=m
 CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
 # CONFIG_IIO_CONFIGFS is not set
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
@@ -6198,22 +6203,20 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_BMA180 is not set
 # CONFIG_BMC150_ACCEL is not set
 # CONFIG_DMARD09 is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
+# CONFIG_HID_SENSOR_ACCEL_3D is not set
-CONFIG_IIO_ST_ACCEL_3AXIS=m
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 # CONFIG_KXSD9 is not set
-CONFIG_KXCJK1013=m
+# CONFIG_KXCJK1013 is not set
 # CONFIG_MC3230 is not set
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7660 is not set
 # CONFIG_MMA8452 is not set
-CONFIG_MMA9551_CORE=m
+# CONFIG_MMA9551 is not set
-CONFIG_MMA9551=m
+# CONFIG_MMA9553 is not set
-CONFIG_MMA9553=m
+# CONFIG_MXC4005 is not set
-CONFIG_MXC4005=m
 # CONFIG_MXC6255 is not set
-CONFIG_STK8312=m
+# CONFIG_STK8312 is not set
-CONFIG_STK8BA50=m
+# CONFIG_STK8BA50 is not set
 
 #
 # Analog to digital converters
@@ -6221,7 +6224,7 @@ CONFIG_STK8BA50=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AXP288_ADC is not set
-CONFIG_DA9150_GPADC=m
+# CONFIG_DA9150_GPADC is not set
 # CONFIG_INA2XX_ADC is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_MAX1363 is not set
@@ -6247,13 +6250,10 @@ CONFIG_DA9150_GPADC=m
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
-CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
 # SSP Sensor Common
 #
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_CORE=m
 
 #
 # Digital to analog converters
@@ -6286,9 +6286,8 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # Digital gyroscope sensors
 #
 # CONFIG_BMG160 is not set
-CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_IIO_ST_GYRO_3AXIS=m
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 # CONFIG_ITG3200 is not set
 
 #
@@ -6306,16 +6305,16 @@ CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 #
 # CONFIG_AM2315 is not set
 # CONFIG_DHT11 is not set
-CONFIG_HDC100X=m
+# CONFIG_HDC100X is not set
-CONFIG_HTU21=m
+# CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
-CONFIG_SI7020=m
+# CONFIG_SI7020 is not set
 
 #
 # Inertial measurement units
 #
 # CONFIG_BMI160_I2C is not set
-CONFIG_KMX61=m
+# CONFIG_KMX61 is not set
 # CONFIG_INV_MPU6050_I2C is not set
 
 #
@@ -6374,7 +6373,7 @@ CONFIG_KMX61=m
 # Triggers - standalone
 #
 CONFIG_IIO_INTERRUPT_TRIGGER=m
-# CONFIG_IIO_SYSFS_TRIGGER is not set
+CONFIG_IIO_SYSFS_TRIGGER=m
 
 #
 # Digital potentiometers
@@ -6437,11 +6436,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_SUNXI is not set
 # CONFIG_TI_SYSCON_RESET is not set
 # CONFIG_RESET_ZYNQ is not set
-CONFIG_FMC=m
+# CONFIG_FMC is not set
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -6475,10 +6470,7 @@ CONFIG_ND_BTT=y
 CONFIG_BTT=y
 # CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=m
-CONFIG_STM=m
+# CONFIG_STM is not set
-# CONFIG_STM_DUMMY is not set
-CONFIG_STM_SOURCE_CONSOLE=m
-# CONFIG_STM_SOURCE_HEARTBEAT is not set
 # CONFIG_INTEL_TH is not set
 
 #

kernel.spec

@@ -50,6 +50,7 @@ BuildRequires:  dracut
 BuildRequires:  busybox
 BuildRequires:  bc
 BuildRequires:  openssl-devel
+BuildRequires:  gcc-plugin-devel
 Provides:       multiversion(kernel)
 Provides:       %name = %kernelrelease
 

rel

@@ -1 +1 @@
-14
+16