kernel: bump 5.15 to 5.15.152

[openwrt/openwrt.git] / target / linux / generic / hack-5.15 / 251-kconfig.patch

diff --git a/target/linux/generic/hack-5.15/251-kconfig.patch b/target/linux/generic/hack-5.15/251-kconfig.patch
index 3304e9543a068cf8f4307bed8d3ff4d2a0b8af46..00c23db955e83c9fc7731d7f6c7979f4d9849bea 100644 (file)
--- a/target/linux/generic/hack-5.15/251-kconfig.patch
+++ b/target/linux/generic/hack-5.15/251-kconfig.patch
@@ -16,7 +16,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -33,7 +33,7 @@ config CRYPTO_FIPS
+@@ -34,7 +34,7 @@ config CRYPTO_FIPS
          this is.
  
  config CRYPTO_ALGAPI
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        select CRYPTO_ALGAPI2
        help
          This option provides the API for cryptographic algorithms.
-@@ -42,7 +42,7 @@ config CRYPTO_ALGAPI2
+@@ -43,7 +43,7 @@ config CRYPTO_ALGAPI2
        tristate
  
  config CRYPTO_AEAD
@@ -34,7 +34,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        select CRYPTO_AEAD2
        select CRYPTO_ALGAPI
  
-@@ -53,7 +53,7 @@ config CRYPTO_AEAD2
+@@ -54,7 +54,7 @@ config CRYPTO_AEAD2
        select CRYPTO_RNG2
  
  config CRYPTO_SKCIPHER
@@ -43,7 +43,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        select CRYPTO_SKCIPHER2
        select CRYPTO_ALGAPI
  
-@@ -63,7 +63,7 @@ config CRYPTO_SKCIPHER2
+@@ -64,7 +64,7 @@ config CRYPTO_SKCIPHER2
        select CRYPTO_RNG2
  
  config CRYPTO_HASH
@@ -52,7 +52,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        select CRYPTO_HASH2
        select CRYPTO_ALGAPI
  
-@@ -72,7 +72,7 @@ config CRYPTO_HASH2
+@@ -73,7 +73,7 @@ config CRYPTO_HASH2
        select CRYPTO_ALGAPI2
  
  config CRYPTO_RNG
@@ -92,7 +92,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
        bool
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -438,16 +438,16 @@ config BCH_CONST_T
+@@ -443,16 +443,16 @@ config BCH_CONST_T
  # Textsearch support is select'ed if needed
  #
  config TEXTSEARCH
@@ -124,59 +124,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
  
  config NETFILTER_FAMILY_BRIDGE
        bool
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,6 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0-only
- config WIRELESS_EXT
--      bool
-+      bool "Wireless extensions"
- 
- config WEXT_CORE
-       def_bool y
-@@ -12,10 +12,10 @@ config WEXT_PROC
-       depends on WEXT_CORE
- 
- config WEXT_SPY
--      bool
-+      bool "WEXT_SPY"
- 
- config WEXT_PRIV
--      bool
-+      bool "WEXT_PRIV"
- 
- config CFG80211
-       tristate "cfg80211 - wireless configuration API"
-@@ -204,7 +204,7 @@ config CFG80211_WEXT_EXPORT
- endif # CFG80211
- 
- config LIB80211
--      tristate
-+      tristate "LIB80211"
-       default n
-       help
-         This options enables a library of common routines used
-@@ -213,17 +213,17 @@ config LIB80211
-         Drivers should select this themselves if needed.
- 
- config LIB80211_CRYPT_WEP
--      tristate
-+      tristate "LIB80211_CRYPT_WEP"
-       select CRYPTO_LIB_ARC4
- 
- config LIB80211_CRYPT_CCMP
--      tristate
-+      tristate "LIB80211_CRYPT_CCMP"
-       select CRYPTO
-       select CRYPTO_AES
-       select CRYPTO_CCM
- 
- config LIB80211_CRYPT_TKIP
--      tristate
-+      tristate "LIB80211_CRYPT_TKIP"
-       select CRYPTO_LIB_ARC4
- 
- config LIB80211_DEBUG
 --- a/sound/core/Kconfig
 +++ b/sound/core/Kconfig
 @@ -17,7 +17,7 @@ config SND_DMAENGINE_PCM
@@ -197,3 +144,14 @@ Signed-off-by: John Crispin <john@phrozen.org>
  
  config SND_JACK
        bool
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -430,7 +430,7 @@ config NET_DEVLINK
+       default n
+ 
+ config PAGE_POOL
+-      bool
++      bool "Page pool support"
+ 
+ config PAGE_POOL_STATS
+       default n