From 512632944a1e8177659a1857cecf021ff228836b Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 18 Mar 2016 14:38:52 -0400 Subject: [PATCH] Linux v4.5-5842-g9ea446352047 - staging, rdma merges --- config-generic | 13 +++++++++++++ gitrev | 2 +- kernel.spec | 6 +++++- sources | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/config-generic b/config-generic index b639eee04..d645a2692 100644 --- a/config-generic +++ b/config-generic @@ -2953,10 +2953,13 @@ CONFIG_STK3310=m # CONFIG_TSL4531 is not set # CONFIG_NAU7802 is not set # CONFIG_TI_ADC081C is not set +# CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADS8688 is not set +# CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADC128S052 is not set # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VF610_ADC is not set +# CONFIG_VF610_DAC is not set # CONFIG_CC10001_ADC is not set # CONFIG_INV_MPU6050_IIO is not set CONFIG_IIO_ST_GYRO_3AXIS=m @@ -3003,6 +3006,7 @@ CONFIG_ACPI_ALS=m # CONFIG_AD5624R_SPI is not set # CONFIG_AD5686 is not set # CONFIG_AD5755 is not set +# CONFIG_AD5761 is not set # CONFIG_AD5764 is not set # CONFIG_AD5791 is not set # CONFIG_AD7303 is not set @@ -3019,9 +3023,14 @@ CONFIG_ACPI_ALS=m # CONFIG_ADIS16400 is not set # CONFIG_ADIS16480 is not set CONFIG_DHT11=m +# CONFIG_INV_MPU6050_I2C is not set +# CONFIG_INV_MPU6050_SPI is not set # CONFIG_MPL3115 is not set # CONFIG_MS5611 is not set # CONFIG_MPL115 is not set +# CONFIG_MPL115_I2C is not set +# CONFIG_MPL115_SPI is not set +# CONFIG_TPL0102 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set # CONFIG_AS3935 is not set @@ -3030,6 +3039,8 @@ CONFIG_KXCJK1013=m # CONFIG_ISL29125 is not set # CONFIG_JSA1212 is not set CONFIG_RPR0521=m +# CONFIG_AFE4403 is not set +# CONFIG_AFE4404 is not set CONFIG_MAX30100=m CONFIG_OPT3001=m CONFIG_PA12203001=m @@ -3040,6 +3051,7 @@ CONFIG_PA12203001=m # CONFIG_MAX1027 is not set # CONFIG_MXC4005 is not set # CONFIG_IAQCORE is not set +# CONFIG_ATLAS_PH_SENSOR is not set # CONFIG_INA2XX_ADC is not set # CONFIG_VZ89X is not set # CONFIG_HDC100X is not set @@ -5648,6 +5660,7 @@ CONFIG_USBIP_HOST=m # CONFIG_WILC1000_DRIVER is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set +# CONFIG_LNET is not set # END OF STAGING # diff --git a/gitrev b/gitrev index f90e9678e..7827018bb 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -10fdfee7f7fd8d4a6a8455ac4c9fbbc51d79b9f7 +9ea446352047d8350553250db51da2c73a610688 diff --git a/kernel.spec b/kernel.spec index bc9773f4a..d6e2b5f0b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 9 +%define gitrev 10 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2166,6 +2166,10 @@ fi # # %changelog +* Fri Mar 18 2016 Josh Boyer - 4.6.0-0.rc0.git10.1 +- Linux v4.5-5842-g9ea446352047 +- staging, rdma merges + * Fri Mar 18 2016 Josh Boyer - 4.6.0-0.rc0.git9.1 - Linux v4.5-4071-g10fdfee7f7fd - input, livepatching, trivial, hid, gpio, m68knommu, arm64, selftest merges diff --git a/sources b/sources index bcfa0808f..3aafc12e1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -dba9097c028e0f4baf12f05d19f563c7 patch-4.5-git9.xz +26a52dd2221f960d380a83cb01cf0af7 patch-4.5-git10.xz