Merge remote-tracking branch 'origin/master'

7 files changed, 25 insertions, 10 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 19d9466f8..15c2bf76f 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -493,6 +493,10 @@ CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 CONFIG_SENSORS_ARM_SCPI=m
 CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_TMP006=m
+CONFIG_BMP280=m
 
 # PHY framework
 CONFIG_GENERIC_PHY=y
@@ -638,7 +642,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_CORESIGHT is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_BMP085_SPI is not set
 # CONFIG_TI_DAC7512 is not set
 
 # https://fedoraproject.org/wiki/Features/Checkpoint_Restore
diff --git a/config-armv7 b/config-armv7
index 700940074..4c69f2848 100644
--- a/config-armv7
+++ b/config-armv7
@@ -146,7 +146,8 @@ CONFIG_PWM_OMAP_DMTIMER=m
 # CONFIG_PWM_STMPE is not set
 
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
-CONFIG_CRYPTO_DEV_OMAP_AES=m
+# Disable for the moment, terribly broken upstream
+# CONFIG_CRYPTO_DEV_OMAP_AES is not set
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 4c0e73a88..b2f8f5274 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -619,11 +619,6 @@ CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_BATTERY_SBS=m
 
 # Sensors
-CONFIG_TMP006=m
-CONFIG_BMP085=y
-CONFIG_BMP085_I2C=m
-CONFIG_BMP085_SPI=m
-CONFIG_BMP280=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
diff --git a/config-generic b/config-generic
index c26b10330..403958dd9 100644
--- a/config-generic
+++ b/config-generic
@@ -3015,10 +3015,14 @@ CONFIG_STK3310=m
 # CONFIG_CC10001_ADC is not set
 # CONFIG_INV_MPU6050_IIO is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 # CONFIG_BMC150_MAGN is not set
 CONFIG_MMA7660=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 CONFIG_ACPI_ALS=m
diff --git a/gitrev b/gitrev
index 7d3567dba..63eddb767 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-86a1679860babbacd61fc1e8c0c0f43641d5860d
+cc4163daaaa1eb0a4ce0396a7d1da4a47b3e526a
diff --git a/kernel.spec b/kernel.spec
index 2129a7de8..94b5e9463 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -987,6 +987,7 @@ input and output, etc.
 
 %prep
 # do a few sanity-checks for --with *only builds
+ulimit -a
 %if %{with_baseonly}
 %if !%{with_up}%{with_pae}
 echo "Cannot build --with baseonly, up build is disabled"
@@ -2170,6 +2171,17 @@ fi
 #
 #
 %changelog
+* Sun Sep  4 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Use IIO BMP280 driver instead of old misc driver, wider HW support
+- Minor sensor driver changes
+- Disable omap_aes currently broken
+
+* Fri Sep 02 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc4.git4.1
+- Linux v4.8-rc4-199-gcc4163d
+
+* Thu Sep 01 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc4.git3.1
+- Linux v4.8-rc4-162-g071e31e
+
 * Wed Aug 31 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc4.git2.1
 - Linux v4.8-rc4-155-g86a1679
 
diff --git a/sources b/sources
index 6f3fc8c0f..59b117c3f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 5276563eb1f39a048e4a8a887408c031  linux-4.7.tar.xz
 fe259c02c75eec61d1aa4b1211f3c853  perf-man-4.7.tar.gz
 a0c0753ff460ff35ef9908ecc97fa943  patch-4.8-rc4.xz
-e88606857eacc2107a8177deb647d76a  patch-4.8-rc4-git2.xz
+c8565986e5df2728fe62287fb2fff2a5  patch-4.8-rc4-git4.xz