diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-02 15:16:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-02 15:16:56 +0200 |
commit | b9c5b548204a25f9369a9126e94db7c42b3794cd (patch) | |
tree | 44666f3e138c69ffd463c6e02f456e3541d369c7 | |
parent | 63a3c1c2d41ac5be01713073fd13dbbb6cccc0d8 (diff) | |
parent | ea5d2e52dcda7449be013b5190351e6c5f78e45e (diff) | |
download | kernel-5.3.0-0.rc2.git4.1.vanilla.knurd.1.fc30.tar.gz kernel-5.3.0-0.rc2.git4.1.vanilla.knurd.1.fc30.tar.xz kernel-5.3.0-0.rc2.git4.1.vanilla.knurd.1.fc30.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc2.git4.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc2.git4.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc2.git4.1.vanilla.knurd.1.fc29
-rw-r--r-- | configs/fedora/generic/CONFIG_IP_VS_MH | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
-rw-r--r-- | kernel-aarch64.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl.config | 2 | ||||
-rw-r--r-- | kernel-i686-debug.config | 2 | ||||
-rw-r--r-- | kernel-i686.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
-rw-r--r-- | kernel-s390x.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
-rw-r--r-- | kernel-x86_64.config | 2 | ||||
-rw-r--r-- | kernel.spec | 5 | ||||
-rw-r--r-- | sources | 2 |
18 files changed, 21 insertions, 18 deletions
diff --git a/configs/fedora/generic/CONFIG_IP_VS_MH b/configs/fedora/generic/CONFIG_IP_VS_MH index dec81a64c..1d07e9a61 100644 --- a/configs/fedora/generic/CONFIG_IP_VS_MH +++ b/configs/fedora/generic/CONFIG_IP_VS_MH @@ -1 +1 @@ -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m @@ -1 +1 @@ -5c6207539aea8b22490f9569db5aa72ddfd0d486 +1e78030e5e5b2d8b0cad7136caf9cfab986a6bff diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index b948b2cc5..f51237d79 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2708,7 +2708,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 583898069..07165f0bf 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2692,7 +2692,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 453522938..00fb4a1ee 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2744,7 +2744,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 0493b53be..8b3b76c97 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2649,7 +2649,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 3c18d7dff..c2ca257fe 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2634,7 +2634,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index dad93ec85..207223eb5 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2729,7 +2729,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 40bc50d84..56cb3f7c9 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2468,7 +2468,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-i686.config b/kernel-i686.config index dba4785f4..599d02836 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2451,7 +2451,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index affa6297b..8149447fd 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2232,7 +2232,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 06d7c62bb..caf7a2587 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2215,7 +2215,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 38030f7d9..61d06297a 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2208,7 +2208,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-s390x.config b/kernel-s390x.config index e8625dd5d..696652ba9 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2191,7 +2191,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 084e94924..1b57db852 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2520,7 +2520,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 60a54e35a..85b9db7ba 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2503,7 +2503,7 @@ CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS=m -# CONFIG_IP_VS_MH is not set +CONFIG_IP_VS_MH=m CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_IP_VS_NQ=m CONFIG_IP_VS_OVF=m diff --git a/kernel.spec b/kernel.spec index 25795b30b..dce258b2f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1840,6 +1840,9 @@ fi # # %changelog +* Fri Aug 02 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc2.git4.1 +- Linux v5.3-rc2-70-g1e78030e5e5b + * Thu Aug 01 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc2.git3.1 - Linux v5.3-rc2-60-g5c6207539aea - Enable 8250 serial ports on powerpc @@ -1,3 +1,3 @@ SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c SHA512 (patch-5.3-rc2.xz) = 24691c1f8ccbea442d8d4e828be73c726328e50c24b4a8a07879397b939339cad00f85560781ad1d36158e022db1e5900308c091e9f453ebbe28fa23cf8b2cbe -SHA512 (patch-5.3-rc2-git3.xz) = f1d820059ffbb16242e84534757747e2a3e3ad012163ff650898a6d01ca8e7485934c425c07c6679386d4521be58350df911fce0bd2b69e841311d42c278d581 +SHA512 (patch-5.3-rc2-git4.xz) = 43a48a294c870eaf2399cab54cffb01e5cbf64a04ce4522ec3312bd012dac0d662e6e53ecd12fa340c8f816e77de839d86ad47896705b9c9fcfbadad7090090c |