diff options
| author | Manuel Mendez <mmendez534@gmail.com> | 2018-02-09 15:02:01 -0500 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-02-20 15:49:40 +0000 |
| commit | 4f63409b477a4fa82e0d6ecb4cd816f3ab0eb1ed (patch) | |
| tree | 79f9190031337090ee3ff1ea5cc166f756df301a /main/linux-vanilla | |
| parent | 3e460aa505a805018391bdf58fe8dfd86f3fc57d (diff) | |
| download | aports-4f63409b477a4fa82e0d6ecb4cd816f3ab0eb1ed.tar.bz2 aports-4f63409b477a4fa82e0d6ecb4cd816f3ab0eb1ed.tar.xz | |
main/linux-vanilla: renable Netronome nics after driver rename
The Netronome nic driver was renamed in v4.11, the kernel jump from 4.9
to 4.14 in 9b052dbbcfdc3645493c91f1a80012ba3cdb0d16 correctly drops the
old nic config, but does not replace it with the new one. This commit
adds the driver back.
Diffstat (limited to 'main/linux-vanilla')
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 10 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.aarch64 | 4 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.ppc64le | 4 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.x86 | 4 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.x86_64 | 4 |
5 files changed, 17 insertions, 9 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 5463e5b973..330e08364e 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=0 +pkgrel=1 pkgdesc="Linux vanilla kernel" url="http://kernel.org" depends="mkinitfs linux-firmware" @@ -223,12 +223,12 @@ _dev() { sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz 5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782 0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch -0a405cceb2d97f0c3179aa835c7d07eaae0723550d06084a84e3562fc99fc07ff7ff57494511c4ad7c8a73e5bbe9eb1f6c5211cd3739c71836f45cd8a64ef0e1 config-vanilla.aarch64 +2afa344896be851f357f15d8e5cd4e95256d99bfb3649a74fa92469ade0a2e71e3bc363e2c7fbc67fe039074a7d5cffadc113d61aebd3529528db9371694bfea config-vanilla.aarch64 a401a5c5c5e2785f373707620c18fdd74dbfe10e4e934803451a3208e99c72970f35527875e31dd78d4b82b6f77de21361cd432ffc296251737508eb545f451a config-vanilla.armhf -949304a023d4200a8a5c4e161407242ac215982ef5cfe9db86c85a584d1251d6b898cf6273fff08221a6dd2f419cae1e456c2b7ee4d677a2bfb9891db39e37dc config-vanilla.x86 -434dd1b2a362b91fe53e0c7707f5409df6e8eb4bb36ab5ee0bdb66cb836448a34e1f2d3ab7e7bb8f39dc9127b485742de29b530a2b909c818363ab11ae882130 config-vanilla.x86_64 +dbee0f76ba3ea060f516209169cf71cf1c3093f31a79c124df1ed6e137d9c2c7b99a7735e5be688328994c694479d52a4e34fdb11ac7e91a15e0285debd4509d config-vanilla.x86 +b36058e1a8dbf4338b5654b4bf54f6a7657aadd959330b1ba2e3e4da3f4ce72238b91f1b7cca765086c6c079d5042124551a299d0e20b9f85e23a12980d8f7f3 config-vanilla.x86_64 03a14f009996319fc24fc1a4eae26e250f7cf6213bcdce0f82c3d0b4b54b81517f55e0445df0460d30f6b61f22519f04ac219ce3017c7cf72acd14c43e781a8b config-vanilla.ppc -55a37d9ea6efd8c73793d1821911007525f6372684f7f12e79706b725f4a13141e61dc949c7bc18abc6cb51675751677ff45b23d0cc041a6e50ece0bf03c8223 config-vanilla.ppc64le +2b41725c863d1dd2ab5913dd23e55c8adc9d2d34609946d19d4c2dbdb83a6deffe5861d2d6237c0eb6a4c833b45f5f3b03c329a4e00e9b599dfca5fdab124fbe config-vanilla.ppc64le 1bf03944d81712216541c29c25c2fb3005c279a7752588a9066e89bcf5dcd41a0f6c21c6178441f56aec49539fada456907c03c056bbd6b29b67c32f9579114e config-vanilla.s390x dc5e5cfbcdcd74006517d88260b88638096a141490181a65013e840cf228cbe7dbdbd550cdf422d2ca63e45a8abc31246ff4a0f81d71bbe3b58dd6a8ccea4af2 config-virt.x86 5c2d26ad351dd11e5bfc69fc45abbb2616f31050423974b64dae92aa46ab184e545aa70acddc16c8933786618329a64f02e4b424d074ee1b5a481a502f726980 config-virt.x86_64 diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64 index b56e130305..7a4316ea2f 100644 --- a/main/linux-vanilla/config-vanilla.aarch64 +++ b/main/linux-vanilla/config-vanilla.aarch64 @@ -2469,7 +2469,9 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_NETRONOME=y -# CONFIG_NFP is not set +CONFIG_NFP=m +CONFIG_NFP_APP_FLOWER=n +CONFIG_NFP_DEBUG=n CONFIG_NET_VENDOR_8390=y CONFIG_NE2K_PCI=m CONFIG_NET_VENDOR_NVIDIA=y diff --git a/main/linux-vanilla/config-vanilla.ppc64le b/main/linux-vanilla/config-vanilla.ppc64le index 408d6d3471..8624eea848 100644 --- a/main/linux-vanilla/config-vanilla.ppc64le +++ b/main/linux-vanilla/config-vanilla.ppc64le @@ -1829,7 +1829,9 @@ CONFIG_NET_VENDOR_NATSEMI=y # CONFIG_NATSEMI is not set # CONFIG_NS83820 is not set CONFIG_NET_VENDOR_NETRONOME=y -# CONFIG_NFP is not set +CONFIG_NFP=m +CONFIG_NFP_APP_FLOWER=n +CONFIG_NFP_DEBUG=n CONFIG_NET_VENDOR_8390=y # CONFIG_NE2K_PCI is not set CONFIG_NET_VENDOR_NVIDIA=y diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86 index b264bedd7b..cf408fec74 100644 --- a/main/linux-vanilla/config-vanilla.x86 +++ b/main/linux-vanilla/config-vanilla.x86 @@ -2563,7 +2563,9 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_NETRONOME=y -# CONFIG_NFP is not set +CONFIG_NFP=m +CONFIG_NFP_APP_FLOWER=n +CONFIG_NFP_DEBUG=n CONFIG_NET_VENDOR_8390=y CONFIG_PCMCIA_AXNET=m CONFIG_NE2K_PCI=m diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64 index 730b54765f..5786832f65 100644 --- a/main/linux-vanilla/config-vanilla.x86_64 +++ b/main/linux-vanilla/config-vanilla.x86_64 @@ -2608,7 +2608,9 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_NETRONOME=y -# CONFIG_NFP is not set +CONFIG_NFP=m +CONFIG_NFP_APP_FLOWER=n +CONFIG_NFP_DEBUG=n CONFIG_NET_VENDOR_8390=y CONFIG_PCMCIA_AXNET=m CONFIG_NE2K_PCI=m |