diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-18 05:48:51 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-18 05:48:51 +0200 |
| commit | 4f731edd9534a6374ef998d211cd2981d7d88ebe (patch) | |
| tree | 48d4e56319a1c22fb25f46df575473248d50d543 | |
| parent | 88a1e567c9e3d0105ee16f7832d20ac965c9d8dd (diff) | |
| parent | d8001179ddabd3f7cf573a865149a8ddf6b16cd6 (diff) | |
| download | kernel-4f731edd9534a6374ef998d211cd2981d7d88ebe.tar.gz kernel-4f731edd9534a6374ef998d211cd2981d7d88ebe.tar.xz kernel-4f731edd9534a6374ef998d211cd2981d7d88ebe.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc1.git0.2.vanilla.knurd.1.fc26kernel-4.9.0-0.rc1.git0.2.vanilla.knurd.1.fc25kernel-4.9.0-0.rc1.git0.2.vanilla.knurd.1.fc23
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic index d65cf0765..4ef2afddb 100644 --- a/config-generic +++ b/config-generic @@ -3312,7 +3312,7 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1307_HWMON=y -CONFIG_RTC_DRV_DS1307_CENTURY=y +# CONFIG_RTC_DRV_DS1307_CENTURY is not set CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1685_FAMILY=m diff --git a/kernel.spec b/kernel.spec index 3a90cff81..1448921ec 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2162,6 +2162,9 @@ fi # # %changelog +* Mon Oct 17 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc1.git0.2 +- Disable CONFIG_RTC_DRV_DS1307_CENTURY + * Mon Oct 17 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc1.git0.1 - Linux v4.8-rc1 |