diff options
| author | Ben Hutchings <benh@debian.org> | 2020-08-20 01:39:05 +0100 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2020-08-20 01:39:05 +0100 |
| commit | ac9971f91d76cecddb15d914478126be5635799f (patch) | |
| tree | 4988dd0d13fccdaf883cc10e55fb51fd6e140123 | |
| parent | ec0f444f192c5100a9c2692023cef90cdc2eccd6 (diff) | |
| parent | 8bdae0bf4c70e2ecc436b47b566cb8b939bfd21c (diff) | |
| download | kernel_replicant_linux-ac9971f91d76cecddb15d914478126be5635799f.tar.gz kernel_replicant_linux-ac9971f91d76cecddb15d914478126be5635799f.tar.bz2 kernel_replicant_linux-ac9971f91d76cecddb15d914478126be5635799f.zip | |
Merge branch 'master' into master
[s390x] Add virtio_net to nic-modules
See merge request kernel-team/linux!262
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/installer/modules/s390x/nic-modules | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c5f4d50cd0ed..ce364ae7ff08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,9 @@ linux (5.8-1~exp1) UNRELEASED; urgency=medium [ Walter Lozano ] * [armhf] Enable NVMEM_IMX_OCOTP + [ Philipp Kern ] + * [s390x] Add virtio_net to nic-modules. + -- Yves-Alexis Perez <corsac@debian.org> Wed, 24 Jun 2020 21:58:24 +0200 linux (5.7.10-1) unstable; urgency=medium diff --git a/debian/installer/modules/s390x/nic-modules b/debian/installer/modules/s390x/nic-modules index 32056514d485..5e39d1f5efd7 100644 --- a/debian/installer/modules/s390x/nic-modules +++ b/debian/installer/modules/s390x/nic-modules @@ -4,3 +4,4 @@ lcs qeth qeth_l2 qeth_l3 +virtio_net |