summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2017-08-12 13:39:21 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2017-08-12 13:39:21 -0700
commit2050466643af949a442bffad64fa4a61bae7c0a0 (patch)
tree0df930dd43f92dc3d3f497db1183c688d59b6448
parentUpdated to 4.9.42 (diff)
downloadlinux-libre-unofficial_grsec-2050466643af949a442bffad64fa4a61bae7c0a0.tar.xz
Merged in upstream changes
-rw-r--r--PKGBUILD2
-rw-r--r--config.x86_642
2 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 11dbaec..8393102 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,7 +51,7 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
'SKIP'
'7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
'SKIP'
- '4c52f6e8f47d332d014d8b3cd8dba1619ea3551e00ba51dd3903df577124505e23ec5ccc6398d4b49de5bec8703d9932fa8579336462873028f0b5487aa2a256'
+ 'a25f3c25b903b24792678c4b883bc01e6ecddf8f0549173aba30bbcc07b1013d51d69f85bd123e825403e90c0781b308f7bec46c446bd70f36c8a66006822a81'
'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22'
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
'1a43bc2cded9d8831f1ef833a7e76a2d9ab4f835129d9408a1bbef2448cdf3f8c6741dffc0a6268a543fea390943cd59cd06444922fc9b33420e74ee2fc2e899'
diff --git a/config.x86_64 b/config.x86_64
index cb911b2..5ac059b 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1429,7 +1429,7 @@ CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_SOCK_CGROUP_DATA=y
-# CONFIG_CGROUP_NET_PRIO is not set
+CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_NET_CLASSID=y
CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y