diff --git a/config-generic b/config-generic index c08fb2e..8ea0e84 100644 --- a/config-generic +++ b/config-generic @@ -5491,6 +5491,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_TEST_POWER is not set CONFIG_APM_POWER=m # CONFIG_GENERIC_ADC_BATTERY is not set +# CONFIG_GENERIC_ADC_THERMAL is not set # CONFIG_WM831X_POWER is not set # CONFIG_BATTERY_DS2760 is not set diff --git a/gitrev b/gitrev index 8f21d79..3473b1d 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -2f7c3a18a2dc79ddf7b83ae199b099a675e1adb2 +dc03c0f9d12d85286d5e3623aa96d5c2a271b8e6 diff --git a/kernel.spec b/kernel.spec index 9964d0b..fc0011a 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 @@ -2133,6 +2133,10 @@ fi # # %changelog +* Fri May 27 2016 Laura Abbott - 4.7.0-0.rc0.git10.1 +- Linux v4.6-11010-gdc03c0f +- Kconfig, Kbuild, ceph, nfs, xfs, mmc, hwmon merges + * Thu May 26 2016 Laura Abbott - 4.7.0-0.rc0.git9.1 - Linux v4.6-10675-g2f7c3a1 - EFI, sched, perf, objtool, acpi, pm, drm merges diff --git a/sources b/sources index 5309fba..960547a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ d2927020e24a76da4ab482a8bc3e9ef3 linux-4.6.tar.xz fd23b14b9d474c3dfacb6e8ee82d3a51 perf-man-4.6.tar.gz -726e68c0a98d4792fb3923a6dcd7a0cc patch-4.6-git9.xz +93c26cf74b2272062ce649c6d1f75bd4 patch-4.6-git10.xz