| commit | 44a8c4f33c0073ca614db79f22e023811bdd0f3c | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Fri Sep 04 21:18:58 2020 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Fri Sep 04 21:28:59 2020 -0700 |
| tree | 2d29271961a485f621bd14294ec57e816290541e | |
| parent | 3ab1270bfa1e8ae7db0d46fee90c5db2935ac91b [diff] | |
| parent | c70672d8d316ebd46ea447effadfe57ab7a30a50 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.
Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444a4 ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).
Signed-off-by: Jakub Kicinski <kuba@kernel.org>