diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-11 15:35:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-16 14:17:59 +0200 |
| commit | 85c87cfd2c87dc792833d4c2f87b099a82caff7b (patch) | |
| tree | 7a828a79a69eb3052f1b3742db6de635a6511c5d | |
| parent | 698a1e286e71b443d215e17abab5eb316ab33075 (diff) | |
| download | alpine_aports-85c87cfd2c87dc792833d4c2f87b099a82caff7b.tar.bz2 alpine_aports-85c87cfd2c87dc792833d4c2f87b099a82caff7b.tar.xz alpine_aports-85c87cfd2c87dc792833d4c2f87b099a82caff7b.zip | |
main/linux-hardened: enable CONFIG_MLX5_CORE_EN
requested by packet.net
(cherry picked from commit 723003788260b9edf57df250a76264477faa6cf5)
| -rw-r--r-- | main/linux-hardened/APKBUILD | 4 | ||||
| -rw-r--r-- | main/linux-hardened/config-hardened.x86_64 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/linux-hardened/APKBUILD b/main/linux-hardened/APKBUILD index 05ae0d54ba..820061418f 100644 --- a/main/linux-hardened/APKBUILD +++ b/main/linux-hardened/APKBUILD | |||
| @@ -7,7 +7,7 @@ case $pkgver in | |||
| 7 | *.*.*) _kernver=${pkgver%.*};; | 7 | *.*.*) _kernver=${pkgver%.*};; |
| 8 | *.*) _kernver=${pkgver};; | 8 | *.*) _kernver=${pkgver};; |
| 9 | esac | 9 | esac |
| 10 | pkgrel=0 | 10 | pkgrel=1 |
| 11 | pkgdesc="Linux kernel with hardening patches" | 11 | pkgdesc="Linux kernel with hardening patches" |
| 12 | url="http://alpinelinux.org" | 12 | url="http://alpinelinux.org" |
| 13 | depends="mkinitfs" | 13 | depends="mkinitfs" |
| @@ -207,7 +207,7 @@ sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a | |||
| 207 | abafa47124653a82b452aad307c4c5c889eabca5441655c42d1268c9348efa0a7366ed33dedc83ac32faf6e03c4d4c4a6d8aea9d38bb028cb9b685a4ed2bbdcf hardened-3.1-4.9.31-201704252333-alpine.patch | 207 | abafa47124653a82b452aad307c4c5c889eabca5441655c42d1268c9348efa0a7366ed33dedc83ac32faf6e03c4d4c4a6d8aea9d38bb028cb9b685a4ed2bbdcf hardened-3.1-4.9.31-201704252333-alpine.patch |
| 208 | 5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d zfs-fix.patch | 208 | 5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d zfs-fix.patch |
| 209 | e0f8793210d3974a748bd7b1cd71cf7adc3672d279a1d51bbf1a7417161fadaf377bff43fa51b943c89051c62cf608af263137e5c5f904cf70391b94d60cb14d config-hardened.x86 | 209 | e0f8793210d3974a748bd7b1cd71cf7adc3672d279a1d51bbf1a7417161fadaf377bff43fa51b943c89051c62cf608af263137e5c5f904cf70391b94d60cb14d config-hardened.x86 |
| 210 | b81a9578c165f3f091d5bbdfd34bd45d94416f90e236bd73595337da30ddc7f02bede9ff7265d0a7fb68c1a3237ecb0a2bb67a9279ab09a6cde959f54848365d config-hardened.x86_64 | 210 | d70509a365308f85dfd348d5dad9f5a9c9932434b6c37805b6a7384189599c76d6a2623b1d9e19d89552c4afbd69df7b788019cec42bc5b654635a13902763be config-hardened.x86_64 |
| 211 | 0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277 config-hardened.armhf | 211 | 0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277 config-hardened.armhf |
| 212 | 1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4 config-virthardened.x86 | 212 | 1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4 config-virthardened.x86 |
| 213 | 0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0 config-virthardened.x86_64" | 213 | 0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0 config-virthardened.x86_64" |
diff --git a/main/linux-hardened/config-hardened.x86_64 b/main/linux-hardened/config-hardened.x86_64 index 9983261233..f6331dcc75 100644 --- a/main/linux-hardened/config-hardened.x86_64 +++ b/main/linux-hardened/config-hardened.x86_64 | |||
| @@ -2484,7 +2484,7 @@ CONFIG_MLX4_EN=m | |||
| 2484 | CONFIG_MLX4_CORE=m | 2484 | CONFIG_MLX4_CORE=m |
| 2485 | CONFIG_MLX4_DEBUG=y | 2485 | CONFIG_MLX4_DEBUG=y |
| 2486 | CONFIG_MLX5_CORE=m | 2486 | CONFIG_MLX5_CORE=m |
| 2487 | # CONFIG_MLX5_CORE_EN is not set | 2487 | CONFIG_MLX5_CORE_EN=y |
| 2488 | # CONFIG_MLXSW_CORE is not set | 2488 | # CONFIG_MLXSW_CORE is not set |
| 2489 | CONFIG_NET_VENDOR_MICREL=y | 2489 | CONFIG_NET_VENDOR_MICREL=y |
| 2490 | CONFIG_KS8842=m | 2490 | CONFIG_KS8842=m |