diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-29 15:42:27 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-29 15:42:27 +0200 |
| commit | f64081f75b8c8a549985c2d23eb940a41bc95285 (patch) | |
| tree | 84b5df3de02e8b6f6bb8d1882c53ab1e9fe48396 | |
| parent | 5037efa74ca24a46542a13198c6ac0388353424a (diff) | |
| parent | 82cbb5a6a766ab9b72e6ab0702c3935d32ab9543 (diff) | |
| download | kernel-5.3.0-0.rc6.git2.1.vanilla.knurd.1.fc32.tar.gz kernel-5.3.0-0.rc6.git2.1.vanilla.knurd.1.fc32.tar.xz kernel-5.3.0-0.rc6.git2.1.vanilla.knurd.1.fc32.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc6.git2.1.vanilla.knurd.1.fc32kernel-5.3.0-0.rc6.git2.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc6.git2.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc6.git2.1.vanilla.knurd.1.fc29
| -rw-r--r-- | configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_SA1100 | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
6 files changed, 9 insertions, 5 deletions
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_SA1100 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_SA1100 new file mode 100644 index 000000000..8f0586611 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_SA1100 @@ -0,0 +1 @@ +CONFIG_RTC_DRV_SA1100=m @@ -1 +1 @@ -9e8312f5e160ade069e131d54ab8652cf0e86e1a +9cf6b756cdf2cd38b8b0dac2567f7c6daf5e79d5 diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 00fb4a1ee..067d4426b 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -5234,7 +5234,7 @@ CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_S3C=m CONFIG_RTC_DRV_S5M=m -# CONFIG_RTC_DRV_SA1100 is not set +CONFIG_RTC_DRV_SA1100=m CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_SNVS=m CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 207223eb5..c2f56ad9d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -5214,7 +5214,7 @@ CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_S3C=m CONFIG_RTC_DRV_S5M=m -# CONFIG_RTC_DRV_SA1100 is not set +CONFIG_RTC_DRV_SA1100=m CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_SNVS=m CONFIG_RTC_DRV_STK17TA8=m diff --git a/kernel.spec b/kernel.spec index d3f8d37fb..a374667e8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1829,6 +1829,9 @@ fi # # %changelog +* Thu Aug 29 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc6.git2.1 +- Linux v5.3-rc6-119-g9cf6b756cdf2 + * Wed Aug 28 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc6.git1.1 - Linux v5.3-rc6-115-g9e8312f5e160 @@ -1,3 +1,3 @@ SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c SHA512 (patch-5.3-rc6.xz) = 67863e79064488873309ac99b8691d3e9afa230900532675c8b8699768b2eba21409aceb0925dfc7e8a2403aed2b3de3d3fcd3c9fde08435cd4e4a643dc79a70 -SHA512 (patch-5.3-rc6-git1.xz) = b8b36238f34ecb99a18136dddaf3358c4774cf3847d6411508c9f9e3a8289b4ab27ed90d5d939e1271a8547598141d0e418c255915e0457c110a912c96d1eea6 +SHA512 (patch-5.3-rc6-git2.xz) = b9a11e72fa6c66a68f0fec36ebf616baa6a72071e62932b29577d352eef5549538b9170581c088f055757c2d0b7292f5a06805e4917475cc707eb272ec2b1379 |