- initial update for 4.9.0

diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index cce529e5d2291f2bd42e47c34055e3a62ca3ac7a..2a028f1b8485d188b111301af9346228622cdbc1 100644 (file)
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -36,7 +36,7 @@ index 185f8ea..5deb0d1 100644
 aufs4.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 01bff8e..ac77455 100644
+index f593300..8a17054 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -2256,6 +2256,19 @@ F:      include/linux/audit.h
@@ -255,9 +255,9 @@ index da2751d..2e0fca6 100644
 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
 @@ -83,4 +83,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
- extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
  
  extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
+ extern const struct pipe_buf_operations default_pipe_buf_ops;
 +
 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 +                         loff_t *ppos, size_t len, unsigned int flags);
@@ -341,35 +341,35 @@ diff --git a/include/linux/mm.h b/include/linux/mm.h
 index ef815b9..a772481 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1278,6 +1278,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1266,6 +1266,28 @@ static inline int fixup_user_fault(struc
  }
  #endif
  
 +extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
 +extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
-+                                    int);
++              int);
 +extern void vma_do_get_file(struct vm_area_struct *, const char[], int);
 +extern void vma_do_fput(struct vm_area_struct *, const char[], int);
 +
-+#define vma_file_update_time(vma)     vma_do_file_update_time(vma, __func__, \
-+                                                              __LINE__)
-+#define vma_pr_or_file(vma)           vma_do_pr_or_file(vma, __func__, \
-+                                                        __LINE__)
-+#define vma_get_file(vma)             vma_do_get_file(vma, __func__, __LINE__)
-+#define vma_fput(vma)                 vma_do_fput(vma, __func__, __LINE__)
++#define vma_file_update_time(vma)      vma_do_file_update_time(vma, __func__, \
++              __LINE__)
++#define vma_pr_or_file(vma)            vma_do_pr_or_file(vma, __func__, \
++              __LINE__)
++#define vma_get_file(vma)              vma_do_get_file(vma, __func__, __LINE__)
++#define vma_fput(vma)                  vma_do_fput(vma, __func__, __LINE__)
 +
 +#ifndef CONFIG_MMU
 +extern struct file *vmr_do_pr_or_file(struct vm_region *, const char[], int);
 +extern void vmr_do_fput(struct vm_region *, const char[], int);
 +
-+#define vmr_pr_or_file(region)                vmr_do_pr_or_file(region, __func__, \
-+                                                        __LINE__)
-+#define vmr_fput(region)              vmr_do_fput(region, __func__, __LINE__)
++#define vmr_pr_or_file(region)         vmr_do_pr_or_file(region, __func__, \
++              __LINE__)
++#define vmr_fput(region)               vmr_do_fput(region, __func__, __LINE__)
 +#endif /* !CONFIG_MMU */
 +
- extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
+ extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len,
+               unsigned int gup_flags);
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
-               void *buf, int len, int write);
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
 index 903200f..55fc528 100644
 --- a/include/linux/mm_types.h
@@ -417,7 +417,7 @@ index 2ca1faf..6b9da3f 100644
  obj-y += init-mm.o
  
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 8a287df..7583d66 100644
+index 2d0986a..4a31bad 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
 @@ -2284,7 +2284,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
@@ -35606,7 +35606,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h       2016-10-09 16:55:38.889431135 +0200
++++ linux/include/uapi/linux/aufs_type.h       2016-12-11 21:22:05.903059512 +0100
 @@ -0,0 +1,419 @@
 +/*
 + * Copyright (C) 2005-2016 Junjiro R. Okajima
@@ -35649,7 +35649,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION  "4.x-rcN-20161003"
++#define AUFS_VERSION  "4.x-rcN-20161010"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC      ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index 0701dbefc72d4d82866bd50b7774db472dc16619..c06af650d6250d059ee10c47da6f5022850fa4eb 100644 (file)
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -2081,11 +2081,10 @@
        if (seq_has_overflowed(s))
 --- linux-2.6.28-stock/include/net/netfilter/nf_conntrack.h    2009-01-07 16:05:30.000000000 -0600
 +++ linux-2.6.28/include/net/netfilter/nf_conntrack.h  2009-01-07 16:07:31.000000000 -0600
-@@ -121,6 +121,23 @@ struct nf_conn {
- #if IS_ENABLED(CONFIG_NF_NAT)
-       struct rhash_head       nat_bysource;
- #endif
-+
+@@ -120,6 +120,22 @@ struct nf_conn {
+       /* Extensions */
+       struct nf_ct_ext *ext;
+ 
 +#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
 +      defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
 +      struct {

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index c2d10f4543d01ba2aa3c7dc7c0ede601a9fbf69c..f4aaab8344954cd9838d3c02225e3514f40f327a 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -16,6 +16,7 @@ EFI_MIXED all=y
 EFI_PGT_DUMP all=n
 GCC_PLUGINS all=y
 GCC_PLUGIN_CYC_COMPLEXITY all=n
+GCC_PLUGIN_LATENT_ENTROPY all=n
 GEN_RTC all=n
 HAVE_STACK_VALIDATION all=y
 IOSF_MBI all=m
@@ -25,6 +26,7 @@ KEXEC_VERIFY_SIG all=n
 KVM_DEBUG_FS all=n
 KVM_DEVICE_ASSIGNMENT all=y
 MCE_AMD_INJ all=m
+MLX_PLATFORM all=m
 PERF_EVENTS_AMD_POWER all=m
 PERF_EVENTS_INTEL_CSTATE all=m
 PERF_EVENTS_INTEL_RAPL all=m
@@ -32,6 +34,7 @@ PERF_EVENTS_INTEL_UNCORE all=m
 PUNIT_ATOM_DEBUG all=m
 RANDOMIZE_MEMORY all=y
 STATIC_KEYS_SELFTEST all=y
+VMAP_STACK all=y
 X86_AMD_PLATFORM_DEVICE all=y
 X86_DEBUG_FPU all=n
 X86_SYSFB all=y
@@ -289,6 +292,7 @@ ACPI_BGRT all=y
 ACPI_EXTLOG all=m
 PMIC_OPREGION all=y
 ACPI_CONFIGFS all=m
+#- file drivers/acpi/arm64/Kconfig goes here
 
 #-
 #- *** FILE: drivers/acpi/apei/Kconfig ***
@@ -456,6 +460,7 @@ KS0108_PORT all=0x378
 KS0108_DELAY all=2
 CFAG12864B i386=m x86_64=m
 CFAG12864B_RATE i386=20 x86_64=20
+IMG_ASCII_LCD all=y
 
 #-
 #- *** FILE: drivers/base/Kconfig ***
@@ -474,6 +479,7 @@ WANT_DEV_COREDUMP all=y
 DEV_COREDUMP all=y
 DEBUG_DRIVER all=n
 DEBUG_DEVRES all=n
+DEBUG_TEST_DRIVER_REMOVE all=n
 #- file drivers/base/regmap/Kconfig goes here
 FENCE_TRACE all=n
 DMA_CMA all=y
@@ -605,6 +611,7 @@ BT_HCIUART_INTEL all=y
 BT_HCIUART_BCM all=y
 BT_HCIUART_QCA all=y
 BT_HCIUART_AG6XX all=y
+BT_HCIUART_MRVL all=y
 BT_HCIBCM203X all=m
 BT_HCIBPA10X all=m
 BT_HCIBFUSB all=m
@@ -768,6 +775,7 @@ COMMON_CLK_PWM all=m
 COMMON_CLK_OXNAS all=n
 #- file drivers/clk/bcm/Kconfig goes here
 #- file drivers/clk/hisilicon/Kconfig goes here
+#- file drivers/clk/mediatek/Kconfig goes here
 #- file drivers/clk/meson/Kconfig goes here
 #- file drivers/clk/mvebu/Kconfig goes here
 #- file drivers/clk/qcom/Kconfig goes here
@@ -776,6 +784,7 @@ COMMON_CLK_OXNAS all=n
 #- file drivers/clk/sunxi-ng/Kconfig goes here
 #- file drivers/clk/tegra/Kconfig goes here
 #- file drivers/clk/ti/Kconfig goes here
+#- file drivers/clk/uniphier/Kconfig goes here
 
 #-
 #- *** FILE: drivers/clk/sunxi-ng/Kconfig ***
@@ -805,7 +814,7 @@ CPU_FREQ_GOV_POWERSAVE all=m
 CPU_FREQ_GOV_USERSPACE all=m
 CPU_FREQ_GOV_ONDEMAND all=m
 CPU_FREQ_GOV_CONSERVATIVE all=m
-CPU_FREQ_GOV_SCHEDUTIL all=m
+CPU_FREQ_GOV_SCHEDUTIL all=y
 #- CPU frequency scaling drivers
 #- file drivers/cpufreq/Kconfig.x86 goes here
 #- file drivers/cpufreq/Kconfig.arm goes here
@@ -846,6 +855,7 @@ CRYPTO_DEV_CCP all=y
 #- file drivers/crypto/ccp/Kconfig goes here
 #- file drivers/crypto/qat/Kconfig goes here
 #- file drivers/crypto/vmx/Kconfig goes here
+#- file drivers/crypto/chelsio/Kconfig goes here
 
 #-
 #- *** FILE: drivers/crypto/ccp/Kconfig ***
@@ -853,6 +863,11 @@ CRYPTO_DEV_CCP all=y
 CRYPTO_DEV_CCP_DD all=m
 CRYPTO_DEV_CCP_CRYPTO all=m
 
+#-
+#- *** FILE: drivers/crypto/chelsio/Kconfig ***
+#-
+CRYPTO_DEV_CHELSIO all=m
+
 #-
 #- *** FILE: drivers/crypto/qat/Kconfig ***
 #-
@@ -868,6 +883,7 @@ CRYPTO_DEV_QAT_C62XVF all=m
 #-
 DEV_DAX all=m
 DEV_DAX_PMEM all=m
+NR_DEV_DAX all=32768
 
 #-
 #- *** FILE: drivers/devfreq/Kconfig ***
@@ -891,6 +907,7 @@ PM_DEVFREQ_EVENT all=y
 #- *** FILE: drivers/dma-buf/Kconfig ***
 #-
 SYNC_FILE all=y
+SW_SYNC all=y
 
 #-
 #- *** FILE: drivers/dma/Kconfig ***
@@ -985,6 +1002,7 @@ EXTCON_GPIO all=m
 EXTCON_MAX14577 all=m
 EXTCON_MAX3355 all=m
 EXTCON_MAX77693 all=m
+EXTCON_QCOM_SPMI_MISC all=m
 EXTCON_RT8973A all=m
 EXTCON_SM5502 all=m
 EXTCON_USB_GPIO all=m
@@ -1018,6 +1036,7 @@ FW_CFG_SYSFS_CMDLINE all=y
 #- file drivers/firmware/broadcom/Kconfig goes here
 #- file drivers/firmware/google/Kconfig goes here
 #- file drivers/firmware/efi/Kconfig goes here
+#- file drivers/firmware/meson/Kconfig goes here
 
 #-
 #- *** FILE: drivers/firmware/efi/Kconfig ***
@@ -1029,6 +1048,7 @@ EFI_RUNTIME_MAP all=y
 EFI_FAKE_MEMMAP all=n
 EFI_BOOTLOADER_CONTROL all=m
 EFI_CAPSULE_LOADER all=m
+EFI_TEST all=m
 
 #-
 #- *** FILE: drivers/firmware/google/Kconfig ***
@@ -1059,11 +1079,13 @@ GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
 GPIO_AMDPT all=m
+GPIO_AXP209 all=m
 GPIO_DWAPB all=m
 GPIO_GENERIC_PLATFORM all=m
 GPIO_ICH all=m
 GPIO_LYNXPOINT all=y
 GPIO_MENZ127 all=m
+GPIO_MOCKUP all=m
 GPIO_VX855 all=m
 GPIO_XILINX powerpc=y
 GPIO_ZX all=y
@@ -1082,6 +1104,7 @@ GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
 GPIO_TPIC2810 all=m
+GPIO_TS4900 all=m
 GPIO_ARIZONA all=m
 GPIO_CS5535 all=m
 GPIO_DA9052 all=m
@@ -1089,6 +1112,7 @@ GPIO_DLN2 all=m
 GPIO_JANZ_TTL all=m
 GPIO_KEMPLD all=m
 GPIO_LP3943 all=m
+GPIO_LP873X all=m
 GPIO_STMPE all=y
 GPIO_TIMBERDALE all=y
 GPIO_TPS65086 all=m
@@ -1119,22 +1143,13 @@ DRM_DP_AUX_CHARDEV all=y
 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
-DRM_MGA all=m
-DRM_SIS all=m
-DRM_VIA all=m
-DRM_SAVAGE all=m
 DRM_VGEM all=m
 #- file drivers/gpu/drm/exynos/Kconfig goes here
 #- file drivers/gpu/drm/rockchip/Kconfig goes here
@@ -1167,6 +1182,14 @@ DRM_VGEM all=m
 #- file drivers/gpu/drm/arc/Kconfig goes here
 #- file drivers/gpu/drm/hisilicon/Kconfig goes here
 #- file drivers/gpu/drm/mediatek/Kconfig goes here
+DRM_LEGACY all=n
+DRM_TDFX all=m
+DRM_R128 all=m
+DRM_I810 i386=m x86_64=m
+DRM_MGA all=m
+DRM_SIS all=m
+DRM_VIA all=m
+DRM_SAVAGE all=m
 
 #-
 #- *** FILE: drivers/gpu/drm/amd/acp/Kconfig ***
@@ -1176,20 +1199,17 @@ DRM_AMD_ACP all=y
 #-
 #- *** FILE: drivers/gpu/drm/amd/amdgpu/Kconfig ***
 #-
+DRM_AMDGPU_SI all=y
 DRM_AMDGPU_CIK all=y
 DRM_AMDGPU_USERPTR all=y
 DRM_AMDGPU_GART_DEBUGFS all=n
+#- file drivers/gpu/drm/amd/acp/Kconfig goes here
 
 #-
 #- *** FILE: drivers/gpu/drm/amd/amdkfd/Kconfig ***
 #-
 HSA_AMD all=m
 
-#-
-#- *** FILE: drivers/gpu/drm/amd/powerplay/Kconfig ***
-#-
-DRM_AMD_POWERPLAY all=y
-
 #-
 #- *** FILE: drivers/gpu/drm/ast/Kconfig ***
 #-
@@ -1385,12 +1405,18 @@ HID_SENSOR_CUSTOM_SENSOR all=m
 HID_ALPS all=m
 #- file drivers/hid/usbhid/Kconfig goes here
 #- file drivers/hid/i2c-hid/Kconfig goes here
+#- file drivers/hid/intel-ish-hid/Kconfig goes here
 
 #-
 #- *** FILE: drivers/hid/i2c-hid/Kconfig ***
 #-
 I2C_HID all=m
 
+#-
+#- *** FILE: drivers/hid/intel-ish-hid/Kconfig ***
+#-
+INTEL_ISH_HID all=m
+
 #-
 #- *** FILE: drivers/hid/usbhid/Kconfig ***
 #-
@@ -1571,6 +1597,7 @@ SENSORS_W83627EHF all=m
 SENSORS_WM831X all=m
 SENSORS_WM8350 all=m
 SENSORS_ULTRA45 sparc64=m
+SENSORS_XGENE all=m
 #- ACPI drivers
 SENSORS_ACPI_POWER all=m
 SENSORS_ATK0110 all=m
@@ -1822,10 +1849,14 @@ IIO_SW_TRIGGER all=m
 BMA180 all=m
 BMA220 all=m
 BMC150_ACCEL all=m
+DMARD09 all=m
 HID_SENSOR_ACCEL_3D all=m
 IIO_ST_ACCEL_3AXIS all=m
 KXSD9 all=m
+KXSD9_SPI all=m
+KXSD9_I2C all=m
 KXCJK1013 all=m
+MC3230 all=m
 MMA7455_I2C all=m
 MMA7455_SPI all=m
 MMA7660 all=m
@@ -1854,6 +1885,7 @@ CC10001_ADC all=m
 DA9150_GPADC all=m
 HI8435 all=m
 INA2XX_ADC all=m
+LTC2485 all-m
 MAX1027 all=m
 MAX1363 all=m
 MCP320X all=m
@@ -1864,7 +1896,9 @@ QCOM_SPMI_IADC all=m
 QCOM_SPMI_VADC all=m
 TI_ADC081C all=m
 TI_ADC0832 all=m
+TI_ADC12138 all=m
 TI_ADC128S052 all=m
+TI_ADC161S626 all=m
 TI_ADS1015 all=m
 TI_AM335X_ADC all=m
 VIPERBOARD_ADC all=m
@@ -1912,6 +1946,7 @@ AD5761 all=m
 AD5764 all=m
 AD5791 all=m
 AD7303 all=m
+AD8801 all=m
 M62332 all=m
 MAX517 all=m
 MCP4725 all=m
@@ -2007,6 +2042,7 @@ LTR501 all=m
 MAX44000 all=m
 OPT3001 all=m
 PA12203001 all=m
+SI1145 all=m
 STK3310 all=m
 TCS3414 all=m
 TCS3472 all=m
@@ -2064,6 +2100,7 @@ MS5637 all=m
 IIO_ST_PRESS all=m
 T5403 all=m
 HP206C all=m
+ZPA2326 all=m
 
 #-
 #- *** FILE: drivers/iio/proximity/Kconfig ***
@@ -2075,6 +2112,7 @@ SX9500 all=m
 #-
 #- *** FILE: drivers/iio/temperature/Kconfig ***
 #-
+MAXIM_THERMOCOUPLE all=m
 MLX90614 all=m
 TMP006 all=m
 TSYS01 all=m
@@ -2107,6 +2145,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/hw/nes/Kconfig goes here
 #- file drivers/infiniband/hw/ocrdma/Kconfig goes here
 #- file drivers/infiniband/hw/usnic/Kconfig goes here
+#- file drivers/infiniband/hw/hns/Kconfig goes here
 #- file drivers/infiniband/ulp/ipoib/Kconfig goes here
 #- file drivers/infiniband/ulp/srp/Kconfig goes here
 #- file drivers/infiniband/ulp/srpt/Kconfig goes here
@@ -2115,6 +2154,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/sw/rdmavt/Kconfig goes here
 #- file drivers/infiniband/sw/rxe/Kconfig goes here
 #- file drivers/infiniband/hw/hfi1/Kconfig goes here
+#- file drivers/infiniband/hw/qedr/Kconfig goes here
 
 #-
 #- *** FILE: drivers/infiniband/hw/cxgb3/Kconfig ***
@@ -2166,6 +2206,11 @@ INFINIBAND_NES_DEBUG all=n
 #-
 INFINIBAND_OCRDMA all=m
 
+#-
+#- *** FILE: drivers/infiniband/hw/qedr/Kconfig ***
+#-
+INFINIBAND_QEDR all=m
+
 #-
 #- *** FILE: drivers/infiniband/hw/qib/Kconfig ***
 #-
@@ -2296,6 +2341,7 @@ JOYSTICK_IFORCE_232 all=y
 #- *** FILE: drivers/input/keyboard/Kconfig ***
 #-
 INPUT_KEYBOARD all=y
+KEYBOARD_ADC all=m
 KEYBOARD_ADP5588 all=m 
 KEYBOARD_ADP5589 all=m
 KEYBOARD_ATKBD all=y sparc=m sparc64=m
@@ -2346,6 +2392,7 @@ INPUT_APANEL all=m
 INPUT_GP2A all=m
 INPUT_GPIO_BEEPER all=m
 INPUT_GPIO_TILT_POLLED all=m
+INPUT_GPIO_DECODER all=m
 INPUT_WISTRON_BTNS i386=m
 INPUT_ATLAS_BTNS i386=m x86_64=m
 INPUT_ATI_REMOTE2 all=m sparc=n
@@ -2423,6 +2470,7 @@ RMI4_2D_SENSOR all=y
 RMI4_F11 all=y
 RMI4_F12 all=y
 RMI4_F30 all=y
+RMI4_F54 all=y
 
 #-
 #- *** FILE: drivers/input/serio/Kconfig ***
@@ -2464,6 +2512,7 @@ TOUCHSCREEN_AD7879 all=m
 TOUCHSCREEN_AD7879_I2C all=m
 TOUCHSCREEN_AD7879_SPI all=m
 TOUCHSCREEN_ATMEL_MXT all=m
+TOUCHSCREEN_ATMEL_MXT_T37 all=y
 TOUCHSCREEN_AUO_PIXCIR all=m
 TOUCHSCREEN_BU21013 all=m
 TOUCHSCREEN_CY8CTMG110 all=m
@@ -2480,11 +2529,11 @@ TOUCHSCREEN_HAMPSHIRE all=m
 TOUCHSCREEN_EETI all=m
 TOUCHSCREEN_EGALAX all=m
 TOUCHSCREEN_EGALAX_SERIAL all=m
-TOUCHSCREEN_FT6236 all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GOODIX all=m
 TOUCHSCREEN_ILI210X all=m
 TOUCHSCREEN_GUNZE all=m
+TOUCHSCREEN_EKTF2127 all=m
 TOUCHSCREEN_ELAN all=m
 TOUCHSCREEN_ELO all=m
 TOUCHSCREEN_WACOM_W8001 all=m
@@ -2734,6 +2783,7 @@ LEDS_OT200 all=m
 LEDS_MENF21BMC all=m
 #- LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 LEDS_BLINKM all=m
+LEDS_MLXCPLD all=m
 #- LED Triggers
 #- file drivers/leds/trigger/Kconfig goes here
 
@@ -2805,6 +2855,7 @@ ALTERA_MBOX all=m
 #-
 MCB all=m
 MCB_PCI all=m
+MCB_LPC all=m
 
 #-
 #- *** FILE: drivers/md/Kconfig ***
@@ -2883,10 +2934,11 @@ DVB_NET all=y
 #- Supported FireWire (IEEE 1394) Adapters
 #- file drivers/media/firewire/Kconfig goes here
 #- file drivers/media/common/Kconfig goes here
-#- Media ancillary drivers (tuners, sensors, i2c, frontends)
+#- Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
 MEDIA_SUBDRV_AUTOSELECT all=y
 MEDIA_ATTACH all=y
 #- file drivers/media/i2c/Kconfig goes here
+#- file drivers/media/spi/Kconfig goes here
 #- file drivers/media/tuners/Kconfig goes here
 #- file drivers/media/dvb-frontends/Kconfig goes here
 
@@ -3084,6 +3136,7 @@ MEDIA_PCI_SUPPORT all=y
 #- file drivers/media/pci/meye/Kconfig goes here
 #- file drivers/media/pci/solo6x10/Kconfig goes here
 #- file drivers/media/pci/sta2x11/Kconfig goes here
+#- file drivers/media/pci/tw5864/Kconfig goes here
 #- file drivers/media/pci/tw68/Kconfig goes here
 #- file drivers/media/pci/tw686x/Kconfig goes here
 #- file drivers/media/pci/zoran/Kconfig goes here
@@ -3259,6 +3312,11 @@ DVB_BUDGET_CI all=m sparc=n
 DVB_BUDGET_AV all=m sparc=n
 DVB_BUDGET_PATCH all=m
 
+#-
+#- *** FILE: drivers/media/pci/tw5864/Kconfig ***
+#-
+VIDEO_TW5864 all=m
+
 #-
 #- *** FILE: drivers/media/pci/tw68/Kconfig ***
 #-
@@ -3292,10 +3350,10 @@ VIDEO_VIA_CAMERA all=m
 #- file drivers/media/platform/blackfin/Kconfig goes here
 #- 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
 #- file drivers/media/platform/am437x/Kconfig goes here
 #- file drivers/media/platform/xilinx/Kconfig goes here
 #- file drivers/media/platform/rcar-vin/Kconfig goes here
+#- file drivers/media/platform/atmel/Kconfig goes here
 V4L_MEM2MEM_DRIVERS all=y
 VIDEO_MEM2MEM_DEINTERLACE all=m
 VIDEO_SH_VEU all=m
@@ -3320,7 +3378,6 @@ VIDEO_RCAR_VIN all=m
 #-
 SOC_CAMERA all=m
 SOC_CAMERA_PLATFORM all=m
-VIDEO_SH_MOBILE_CSI2 all=m
 VIDEO_SH_MOBILE_CEU all=m
 
 #-
@@ -3740,6 +3797,7 @@ USB_ZR364XX all=m
 VIDEO_V4L2 all=m
 VIDEO_ADV_DEBUG all=n
 VIDEO_FIXED_MINOR_RANGES all=n
+VIDEO_PCI_SKELETON all=m
 VIDEO_TUNER all=m sparc=
 V4L2_FLASH_LED_CLASS all=m
 VIDEOBUF2_CORE all=m
@@ -3807,6 +3865,7 @@ MFD_DA9062 all=m
 MFD_DA9063 all=m
 MFD_DA9150 all=m
 MFD_DLN2 all=m
+MFD_EXYNOS_LPASS all=m
 MFD_MC13XXX all=m
 MFD_MC13XXX_SPI all=m
 MFD_MC13XXX_I2C all=m
@@ -3857,6 +3916,7 @@ TPS65010 all=m
 TPS6507X all=m
 MFD_TPS65086 all=m
 MFD_TPS65217 all=m
+MFD_TI_LP873X all=m
 MFD_TPS65218 all=m
 MFD_TPS65912_I2C all=m
 MFD_TPS65912_SPI all=y
@@ -3910,8 +3970,6 @@ HMC6352 all=m
 DS1682 all=m
 TI_DAC7512 all=m
 VMWARE_BALLOON all=m
-BMP085_I2C all=m
-BMP085_SPI all=m
 PCH_PHUB all=m
 USB_SWITCH_FSA9480 all=m
 LATTICE_ECP3_CONFIG all=m
@@ -4419,6 +4477,7 @@ NET_DSA_MV88E6060 all=y
 NET_DSA_BCM_SF2 all=m
 #- file drivers/net/dsa/b53/Kconfig goes here
 #- file drivers/net/dsa/mv88e6xxx/Kconfig goes here
+NET_DSA_QCA8K all=m
 
 #-
 #- *** FILE: drivers/net/dsa/b53/Kconfig ***
@@ -4433,6 +4492,7 @@ B53_SRAB_DRIVER all=m
 #- *** FILE: drivers/net/dsa/mv88e6xxx/Kconfig ***
 #-
 NET_DSA_MV88E6XXX all=m
+NET_DSA_MV88E6XXX_GLOBAL2 all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/3com/Kconfig ***
@@ -4466,6 +4526,7 @@ WD80x3 alpha=m i386=m
 #- file drivers/net/ethernet/allwinner/Kconfig goes here
 #- file drivers/net/ethernet/alteon/Kconfig goes here
 #- file drivers/net/ethernet/altera/Kconfig goes here
+#- file drivers/net/ethernet/amazon/Kconfig goes here
 #- file drivers/net/ethernet/amd/Kconfig goes here
 #- file drivers/net/ethernet/apm/Kconfig goes here
 #- file drivers/net/ethernet/apple/Kconfig goes here
@@ -4567,6 +4628,12 @@ ACENIC_OMIT_TIGON_I all=n
 #-
 ALTERA_TSE all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/amazon/Kconfig ***
+#-
+NET_VENDOR_AMAZON all=y
+ENA_ETHERNET all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/amd/Kconfig ***
 #-
@@ -4655,6 +4722,7 @@ NET_VENDOR_CAVIUM all=y
 THUNDER_NIC_PF all=m
 THUNDER_NIC_VF all=m
 THUNDER_NIC_BGX all=m
+THUNDER_NIC_RGX all=m
 LIQUIDIO all=m
 
 #-
@@ -4919,6 +4987,7 @@ QEDE all=m
 #- *** FILE: drivers/net/ethernet/qualcomm/Kconfig ***
 #-
 NET_VENDOR_QUALCOMM all=y
+QCOM_EMAC all=m
 
 #-
 #- *** FILE: drivers/net/ethernet/rdc/Kconfig ***
@@ -5158,39 +5227,42 @@ MCS_FIR all=m
 #- *** FILE: drivers/net/phy/Kconfig ***
 #-
 PHYLIB all=y
+#- MDIO bus device drivers
+MDIO_BCM_UNIMAC all=m
+MDIO_BITBANG all=m
+MDIO_CAVIUM all=m
+MDIO_GPIO all=m
+MDIO_OCTEON all=m
+MDIO_THUNDER all=m
 #- MII PHY device drivers
+AMD_PHY all=m
 AQUANTIA_PHY all=m
 AT803X_PHY all=m
-AMD_PHY all=m
-MARVELL_PHY all=m
-DAVICOM_PHY all=m
-QSEMI_PHY all=m
-LXT_PHY all=m
-CICADA_PHY all=m
-VITESSE_PHY all=m
-TERANETICS_PHY all=m
-SMSC_PHY all=m
-BROADCOM_PHY all=m
 BCM63XX_PHY all=m
 BCM7XXX_PHY all=m
 BCM87XX_PHY all=m
-ICPLUS_PHY all=m
-REALTEK_PHY all=m
-NATIONAL_PHY all=m
-STE10XP all=m
-LSI_ET1011C_PHY all=m
-MICREL_PHY all=m
+BROADCOM_PHY all=m
+CICADA_PHY all=m
+DAVICOM_PHY all=m
 DP83848_PHY all=m
 DP83867_PHY all=m
-MICROCHIP_PHY all=m
 FIXED_PHY all=y
-MDIO_BITBANG all=m
-MDIO_GPIO all=m
-MDIO_CAVIUM all=m
-MDIO_OCTEON all=m
-MDIO_THUNDER all=m
-MDIO_BCM_UNIMAC all=m
+ICPLUS_PHY all=m
 INTEL_XWAY_PHY all=m
+LSI_ET1011C_PHY all=m
+LXT_PHY all=m
+MARVELL_PHY all=m
+MICREL_PHY all=m
+MICROCHIP_PHY all=m
+MICROSEMI_PHY all=m
+NATIONAL_PHY all=m
+QSEMI_PHY all=m
+REALTEK_PHY all=m
+SMSC_PHY all=m
+STE10XP all=m
+TERANETICS_PHY all=m
+VITESSE_PHY all=m
+XILINX_GMII2RGMII all=m
 MICREL_KS8995MA all=m
 
 #-
@@ -5973,6 +6045,7 @@ PCIEASPM_DEFAULT all=y
 PCIEASPM_POWERSAVE all=n
 PCIEASPM_PERFORMANCE all=n
 PCIE_DPC all=y
+PCIE_PTM all=y
 
 #-
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
@@ -6031,6 +6104,7 @@ PINCONF all=y
 GENERIC_PINCONF all=y
 DEBUG_PINCTRL all=n
 PINCTRL_AMD all=y
+#- file drivers/pinctrl/aspeed/Kconfig goes here
 #- file drivers/pinctrl/bcm/Kconfig goes here
 #- file drivers/pinctrl/berlin/Kconfig goes here
 #- file drivers/pinctrl/freescale/Kconfig goes here
@@ -6172,7 +6246,18 @@ PNPBIOS i386=y
 PNPBIOS_PROC_FS i386=y
 
 #-
-#- *** FILE: drivers/power/Kconfig ***
+#- *** FILE: drivers/power/avs/Kconfig ***
+#-
+POWER_AVS all=y
+
+#-
+#- *** FILE: drivers/power/reset/Kconfig ***
+#-
+POWER_RESET all=y
+POWER_RESET_RESTART all=n
+
+#-
+#- *** FILE: drivers/power/supply/Kconfig ***
 #-
 #* ACPI_SYSFS_POWER selects POWER_SUPPLY=y
 POWER_SUPPLY all=m i386=y ia64=y x86_64=y
@@ -6222,19 +6307,6 @@ BATTERY_GOLDFISH all=m
 BATTERY_RT5033 all=m
 CHARGER_RT9455 all=m
 AXP20X_POWER all=m
-#- file drivers/power/reset/Kconfig goes here
-#- file drivers/power/avs/Kconfig goes here
-
-#-
-#- *** FILE: drivers/power/avs/Kconfig ***
-#-
-POWER_AVS all=y
-
-#-
-#- *** FILE: drivers/power/reset/Kconfig ***
-#-
-POWER_RESET all=y
-POWER_RESET_RESTART all=n
 
 #-
 #- *** FILE: drivers/powercap/Kconfig ***
@@ -6336,6 +6408,7 @@ REGULATOR_LP3972 all=m
 REGULATOR_LP872X all=m
 REGULATOR_LP8755 all=m
 REGULATOR_LTC3589 all=m
+REGULATOR_LTC3676 all=m
 REGULATOR_MAX14577 all=m
 REGULATOR_MAX1586 all=m
 REGULATOR_MAX8649 all=m
@@ -6411,6 +6484,7 @@ RTC_DRV_ABB5ZES3 all=m
 RTC_DRV_ABX80X all=m
 RTC_DRV_DS1307 all=m
 RTC_DRV_DS1307_HWMON all=y
+RTC_DRV_DS1307_CENTURY all=y
 RTC_DRV_DS1374 all=m
 RTC_DRV_DS1374_WDT all=y
 RTC_DRV_DS1672 all=m
@@ -6419,7 +6493,6 @@ RTC_DRV_MAX8907 all=m
 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_PCF8523 all=m
 RTC_DRV_PCF85063 all=m
@@ -6549,7 +6622,6 @@ BLK_DEV_3W_XXXX_RAID all=m
 SCSI_HPSA all=m
 SCSI_3W_9XXX all=m
 SCSI_3W_SAS all=m
-SCSI_7000FASST alpha=m i386=m
 SCSI_ACARD all=m
 SCSI_AHA152X i386=m
 SCSI_AHA1542 alpha=m i386=m
@@ -6563,11 +6635,11 @@ SCSI_AACRAID all=m
 SCSI_MVUMI all=m
 SCSI_DPT_I2O all=m
 SCSI_ADVANSYS all=m
-SCSI_IN2000 alpha=m i386=m
 SCSI_ARCMSR all=m sparc=n
 #- file drivers/scsi/esas2r/Kconfig goes here
 #- file drivers/scsi/megaraid/Kconfig.megaraid goes here
 #- file drivers/scsi/mpt3sas/Kconfig goes here
+#- file drivers/scsi/smartpqi/Kconfig goes here
 #- file drivers/scsi/ufs/Kconfig goes here
 SCSI_HPTIOP all=m sparc=n
 SCSI_BUSLOGIC all=m
@@ -6582,7 +6654,6 @@ FCOE_FNIC all=m
 SCSI_SNIC all=m
 SCSI_SNIC_DEBUG_FS all=y
 SCSI_DMX3191D all=m
-SCSI_DTC3280 alpha=m i386=m
 SCSI_EATA all=m
 SCSI_EATA_TAGGED_QUEUE all=y
 SCSI_EATA_LINKED_COMMANDS all=y
@@ -6617,7 +6688,6 @@ SCSI_NCR_Q720 i386=m
 SCSI_NCR53C8XX_DEFAULT_TAGS i386=8
 SCSI_NCR53C8XX_MAX_TAGS i386=32
 SCSI_NCR53C8XX_SYNC i386=20
-SCSI_PAS16 alpha=m i386=m
 SCSI_QLOGIC_FAS alpha=m i386=m
 SCSI_QLOGIC_1280 all=m
 SCSI_QLOGICPTI sparc=m sparc64=m
@@ -6629,12 +6699,6 @@ SCSI_SIM710 alpha=m i386=m
 SCSI_SYM53C416 alpha=m i386=m
 SCSI_DC395x all=m
 SCSI_AM53C974 all=m
-SCSI_T128 alpha=m i386=m
-SCSI_U14_34F alpha=m i386=m
-SCSI_U14_34F_TAGGED_QUEUE alpha=y i386=y
-SCSI_U14_34F_LINKED_COMMANDS alpha=y i386=y
-SCSI_U14_34F_MAX_TAGS alpha=8 i386=8
-SCSI_ULTRASTOR i386=m
 SCSI_NSP32 i386=m ppc=n sparc=n
 SCSI_WD719X all=m
 SCSI_DEBUG all=m
@@ -6784,6 +6848,11 @@ TCM_QLA2XXX_DEBUG all=n
 #-
 SCSI_QLA_ISCSI all=m sparc=n
 
+#-
+#- *** FILE: drivers/scsi/smartpqi/Kconfig ***
+#-
+SCSI_SMARTPQI all=m
+
 #-
 #- *** FILE: drivers/scsi/ufs/Kconfig ***
 #-
@@ -6870,7 +6939,6 @@ STAGING all=y
 #- file drivers/staging/rtl8192e/Kconfig goes here
 #- file drivers/staging/rtl8712/Kconfig goes here
 #- file drivers/staging/rtl8188eu/Kconfig goes here
-#- file drivers/staging/rtl8723au/Kconfig goes here
 #- file drivers/staging/rts5208/Kconfig goes here
 #- file drivers/staging/octeon/Kconfig goes here
 #- file drivers/staging/octeon-usb/Kconfig goes here
@@ -6902,6 +6970,8 @@ STAGING all=y
 #- file drivers/staging/most/Kconfig goes here
 #- file drivers/staging/i4l/Kconfig goes here
 #- file drivers/staging/ks7010/Kconfig goes here
+#- file drivers/staging/greybus/Kconfig goes here
+#- file drivers/staging/vc04_services/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
@@ -7095,6 +7165,30 @@ LTE_GDM724X all=m
 GOLDFISH_AUDIO all=m
 MTD_GOLDFISH_NAND all=m
 
+#-
+#- *** FILE: drivers/staging/greybus/Kconfig ***
+#-
+GREYBUS all=m
+GREYBUS_ES2 all=m
+GREYBUS_AUDIO all=m
+GREYBUS_BOOTROM all=m
+GREYBUS_FIRMWARE all=m
+GREYBUS_HID all=m
+GREYBUS_LIGHT all=m
+GREYBUS_LOG all=m
+GREYBUS_LOOPBACK all=m
+GREYBUS_POWER all=m
+GREYBUS_RAW all=m
+GREYBUS_VIBRATOR all=m
+GREYBUS_BRIDGED_PHY all=m
+GREYBUS_GPIO all=m
+GREYBUS_I2C all=m
+GREYBUS_PWM all=m
+GREYBUS_SDIO all=m
+GREYBUS_SPI all=m
+GREYBUS_UART all=m
+GREYBUS_USB all=m
+
 #-
 #- *** FILE: drivers/staging/gs_fpgaboot/Kconfig ***
 #-
@@ -7221,9 +7315,9 @@ STAGING_MEDIA all=y
 #- file drivers/staging/media/davinci_vpfe/Kconfig goes here
 #- file drivers/staging/media/omap4iss/Kconfig goes here
 #- file drivers/staging/media/pulse8-cec/Kconfig goes here
-#- file drivers/staging/media/tw686x-kh/Kconfig goes here
 #- file drivers/staging/media/s5p-cec/Kconfig goes here
 #- file drivers/staging/media/lirc/Kconfig goes here
+#- file drivers/staging/media/st-cec/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/media/bcm2048/Kconfig ***
@@ -7343,13 +7437,6 @@ RTL8192U all=m
 #-
 R8712U all=m
 
-#-
-#- *** FILE: drivers/staging/rtl8723au/Kconfig ***
-#-
-R8723AU all=m
-8723AU_AP_MODE all=y
-8723AU_BT_COEXIST all=y
-
 #-
 #- *** FILE: drivers/staging/rts5208/Kconfig ***
 #-
@@ -7518,6 +7605,7 @@ INTEL_PCH_THERMAL all=m
 #- file drivers/thermal/st/Kconfig goes here
 #- file drivers/thermal/tegra/Kconfig goes here
 GENERIC_ADC_THERMAL all=m
+#- file drivers/thermal/qcom/Kconfig goes here
 
 #-
 #- *** FILE: drivers/thermal/int340x_thermal/Kconfig ***
@@ -7696,6 +7784,7 @@ USB_USS720 all=m
 #- file drivers/usb/phy/Kconfig goes here
 #- file drivers/usb/gadget/Kconfig goes here
 USB_LED_TRIG all=y
+USB_ULPI_BUS all=m
 
 #-
 #- *** FILE: drivers/usb/atm/Kconfig ***
@@ -7733,7 +7822,7 @@ USB_OTG all=y
 USB_OTG_WHITELIST all=y
 USB_OTG_BLACKLIST_HUB all=n
 USB_OTG_FSM all=m
-USB_ULPI_BUS all=m
+USB_LEDS_TRIGGER_USBPORT all=m
 
 #-
 #- *** FILE: drivers/usb/dwc2/Kconfig ***
@@ -7931,6 +8020,7 @@ USB_ISIGHTFW all=m
 USB_YUREX all=m
 USB_EZUSB_FX2 all=m
 USB_HSIC_USB3503 all=m
+USB_HSIC_USB4604 all=m
 USB_LINK_LAYER_TEST all=m
 USB_CHAOSKEY all=m
 UCSI all=m
@@ -8069,6 +8159,8 @@ USB_UAS all=m
 #-
 USBIP_CORE all=m
 USBIP_VHCI_HCD all=m
+USBIP_VHCI_HC_PORTS all=8
+USBIP_VHCI_NR_HCS all=1
 USBIP_HOST all=m
 USBIP_VUDC all=m
 USBIP_DEBUG all=n
@@ -8314,15 +8406,9 @@ FB_HYPERV all=m
 FB_SIMPLE all=y
 #- file drivers/video/fbdev/omap/Kconfig goes here
 #- file drivers/video/fbdev/omap2/Kconfig goes here
-#- file drivers/video/fbdev/exynos/Kconfig goes here
 #- file drivers/video/fbdev/mmp/Kconfig goes here
 FB_SM712 all=m
 
-#-
-#- *** FILE: drivers/video/fbdev/exynos/Kconfig ***
-#-
-EXYNOS_VIDEO all=n
-
 #-
 #- *** FILE: drivers/video/fbdev/geode/Kconfig ***
 #-
@@ -8377,6 +8463,7 @@ VMIVME_7805 all=m
 #- VME Bridge Drivers
 VME_CA91CX42 all=m
 VME_TSI148 all=m
+VME_FAKE all=m
 
 #-
 #- *** FILE: drivers/w1/Kconfig ***
@@ -8428,6 +8515,7 @@ DA9052_WATCHDOG all=m
 DA9063_WATCHDOG all=m
 DA9062_WATCHDOG all=m
 MENF21BMC_WATCHDOG all=m
+WDAT_WDT all=m
 WM831X_WATCHDOG all=m
 WM8350_WATCHDOG all=m
 XILINX_WATCHDOG all=m
@@ -8495,6 +8583,11 @@ PCIPCWATCHDOG all=m
 WDTPCI all=m
 #- USB-based Watchdog Cards
 USBPCWATCHDOG all=m
+#- Watchdog Pretimeout Governors
+WATCHDOG_PRETIMEOUT_GOV all=y
+WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP all=n
+WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC all=y
+WATCHDOG_PRETIMEOUT_GOV_NOOP all=m
 
 #-
 #- *** FILE: drivers/xen/Kconfig ***
@@ -9370,6 +9463,7 @@ FUNCTION_TRACER all=y
 FUNCTION_GRAPH_TRACER all=y
 IRQSOFF_TRACER all=n
 SCHED_TRACER all=y
+HWLAT_TRACER all=n
 ENABLE_DEFAULT_TRACERS all=n
 FTRACE_SYSCALLS all=y
 TRACER_SNAPSHOT all=y
@@ -9550,7 +9644,6 @@ TEST_UUID all=m
 TEST_RHASHTABLE all=n
 TEST_HASH all=m
 PROVIDE_OHCI1394_DMA_INIT all=n
-BUILD_DOCSRC all=n
 DMA_API_DEBUG all=n
 TEST_LKM all=n
 TEST_USER_COPY all=n
@@ -9767,6 +9860,7 @@ NET_DROP_MONITOR all=y
 #- file net/bluetooth/Kconfig goes here
 #- file net/rxrpc/Kconfig goes here
 #- file net/kcm/Kconfig goes here
+#- file net/strparser/Kconfig goes here
 FIB_RULES all=y
 WIRELESS all=y
 #- file net/wireless/Kconfig goes here
@@ -9812,6 +9906,7 @@ BATMAN_ADV_BLA all=y
 BATMAN_ADV_DAT all=y
 BATMAN_ADV_NC all=y
 BATMAN_ADV_MCAST all= all=y
+BATMAN_ADV_DEBUGFS all=y
 BATMAN_ADV_DEBUG all=n
 
 #-
@@ -10029,6 +10124,7 @@ TCP_CONG_YEAH all=m
 TCP_CONG_ILLINOIS all=m
 TCP_CONG_DCTCP all=m
 TCP_CONG_CDG all=m
+TCP_CONG_BBR all=m
 DEFAULT_BIC all=n
 DEFAULT_CUBIC all=y
 DEFAULT_HTCP all=n
@@ -10042,7 +10138,6 @@ TCP_MD5SIG all=y
 #- *** FILE: net/ipv4/netfilter/Kconfig ***
 #-
 NF_CONNTRACK_IPV4 all=m
-NF_CONNTRACK_PROC_COMPAT all=y
 NF_TABLES_IPV4 all=m
 NFT_CHAIN_ROUTE_IPV4 all=m
 NFT_REJECT_IPV4 all=m
@@ -10279,9 +10374,10 @@ NF_TABLES_INET all=m
 NF_TABLES_NETDEV all=m
 NFT_EXTHDR all=m
 NFT_META all=m
+NFT_NUMGEN all=m
 NFT_CT all=m
-NFT_RBTREE all=m
-NFT_HASH all=m
+NFT_SET_RBTREE all=m
+NFT_SET_HASH all=m
 NFT_COUNTER all=m
 NFT_LOG all=m
 NFT_LIMIT all=m
@@ -10289,8 +10385,10 @@ NFT_MASQ all=m
 NFT_REDIR all=m
 NFT_NAT all=m
 NFT_QUEUE all=m
+NFT_QUOTA all=m
 NFT_REJECT all=m
 NFT_COMPAT all=m
+NFT_HASH all=m
 NF_DUP_NETDEV all=m
 NFT_DUP_NETDEV all=m
 NFT_FWD_NETDEV all=m
@@ -10498,6 +10596,8 @@ RFKILL_GPIO all=m
 #- *** FILE: net/rxrpc/Kconfig ***
 #-
 AF_RXRPC all=m
+AF_RXRPC_IPV6 all=y
+AF_RXRPC_INJECT_LOSS all=n
 AF_RXRPC_DEBUG all=n
 RXKAD all=y
 
@@ -10570,9 +10670,12 @@ NET_ACT_CSUM all=m
 NET_ACT_VLAN all=m
 NET_ACT_BPF all=m
 NET_ACT_CONNMARK all=m
+NET_ACT_SKBMOD all=m
 NET_ACT_IFE all=m
+NET_ACT_TUNNEL_KEY all=m
 NET_IFE_SKBMARK all=m
 NET_IFE_SKBPRIO all=m
+NET_IFE_SKBTCINDEX all=m
 NET_CLS_IND all=y
 NET_SCH_FIFO all=y
 
@@ -10747,7 +10850,6 @@ SECURITY_SELINUX_DISABLE all=n
 SECURITY_SELINUX_DEVELOP all=y
 SECURITY_SELINUX_AVC_STATS all=n
 SECURITY_SELINUX_CHECKREQPROT_VALUE all=1
-SECURITY_SELINUX_POLICYDB_VERSION_MAX all=n
 
 #-
 #- *** FILE: security/smack/Kconfig ***
@@ -10755,6 +10857,7 @@ SECURITY_SELINUX_POLICYDB_VERSION_MAX all=n
 SECURITY_SMACK all=y
 SECURITY_SMACK_BRINGUP all=y
 SECURITY_SMACK_NETFILTER all=y
+SECURITY_SMACK_APPEND_SIGNALS all=y
 
 #-
 #- *** FILE: security/tomoyo/Kconfig ***
@@ -11238,6 +11341,7 @@ SND_SOC_WM8978 all=m
 SND_SOC_WM8985 all=m
 SND_SOC_WM8991 all=m
 SND_SOC_LM4857 all=m
+SND_SOC_NAU8810 all=m
 SND_SOC_TPA6130A2 all=m
 
 #-
@@ -11291,6 +11395,7 @@ SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH all=m
 SND_SOC_INTEL_BXT_RT298_MACH all=m
 SND_SOC_INTEL_BYT_RT5640_MACH all=m
 SND_SOC_INTEL_BYT_MAX98090_MACH all=m
+SND_SOC_INTEL_BDW_RT5677_MACH all=m
 SND_SOC_INTEL_BROADWELL_MACH all=m
 SND_SOC_INTEL_BYTCR_RT5640_MACH all=m
 SND_SOC_INTEL_BYTCR_RT5651_MACH all=m
@@ -11369,16 +11474,23 @@ RD_LZ4 all=y
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+8723AU_AP_MODE all=y
+8723AU_BT_COEXIST all=y
 ACPI_INITRD_TABLE_OVERRIDE all=y
 ADB_PMU_LED_IDE ppc=y ppc64=y
 ADIS16204 all=m
 ADIS16220 all=m
 AMD_MCE_INJ all=m
 BE2NET_VXLAN all=y
+BMP085_I2C all=m
+BMP085_SPI all=m
 BNX2X_GENEVE all=y
 BNX2X_VXLAN all=y
+BUILD_DOCSRC all=n
 CHELSIO_T4_UWIRE all=y
 DEVPTS_MULTIPLE_INSTANCES all=y
+DRM_AMD_POWERPLAY all=y
+EXYNOS_VIDEO all=n
 FM10K_VXLAN all=y
 GEN_RTC_X all=n
 HAVE_BPF_JIT all=y
@@ -11397,15 +11509,32 @@ NET_DSA_MV88E6123 all=m
 NET_DSA_MV88E6131 all=y
 NET_DSA_MV88E6171 all=m
 NET_DSA_MV88E6352 all=m
+NFT_RBTREE all=m
+NF_CONNTRACK_PROC_COMPAT all=y
 QEDE_GENEVE all=y
 QEDE_VXLAN all=y
 QLCNIC_VXLAN all=y
+R8723AU all=m
+RTC_DRV_ISL12057 all=m
+SCSI_7000FASST alpha=m i386=m
+SCSI_DTC3280 alpha=m i386=m
 SCSI_GENERIC_NCR53C400 alpha=y i386=y
+SCSI_IN2000 alpha=m i386=m
+SCSI_PAS16 alpha=m i386=m
+SCSI_T128 alpha=m i386=m
+SCSI_U14_34F alpha=m i386=m
+SCSI_U14_34F_LINKED_COMMANDS alpha=y i386=y
+SCSI_U14_34F_MAX_TAGS alpha=8 i386=8
+SCSI_U14_34F_TAGGED_QUEUE alpha=y i386=y
+SCSI_ULTRASTOR i386=m
+SECURITY_SELINUX_POLICYDB_VERSION_MAX all=n
 SENSORS_BH1780 all=m
 SND_RTCTIMER alpha=m i386=m ia64=m x86_64=m
 SND_SEQ_RTCTIMER_DEFAULT alpha=y i386=y ia64=y x86_64=y
 STAGING_RDMA all=y
+TOUCHSCREEN_FT6236 all=m
 USB_LED all=m
+VIDEO_SH_MOBILE_CSI2 all=m
 VIDEO_TIMBERDALE all=m
 ZONE_DMA_FLAG all=1 sparc64=0
 ZRAM_LZ4_COMPRESS all=y

diff --git a/kernel.spec b/kernel.spec
index 58cb91394fcc92ce289013fd548228102b6766fd..ab6b50c049baa721873d0fa94dc29cd1f1524848 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,9 +69,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             2
-%define                basever         4.8
-%define                postver         .14
+%define                rel             0.1
+%define                basever         4.9
+%define                postver         .0
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -120,7 +120,7 @@ Epoch:              3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5: c1af0afbd3df35c1ccdc7a5118cd2d07
+# Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
 # Patch0-md5:  b8001f580c4da45ee7ae8d928275cf97
@@ -197,12 +197,11 @@ Patch101: kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs4-standalone.git
 # cd aufs4-standalone
-# git checkout -b aufs4.8 origin/aufs4.8
+# git checkout -b aufs4.9 origin/aufs4.9
 # cat aufs4-kbuild.patch aufs4-base.patch aufs4-mmap.patch aufs4-standalone.patch > ~/rpm/packages/kernel/kernel-aufs4.patch
 # rm -rf linux && mkdir linux
 # cp -a Documentation fs include linux
-# diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs4.patch
-# drop hunk at the end of patch (hunk is patching include/linux/Kbuild with single line change)
+# diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs4.patch
 # cat aufs4-loopback.patch >> ~/rpm/packages/kernel/kernel-aufs4.patch
 #
 Patch145:      kernel-aufs4.patch