diff options
author | David S. Miller <davem@davemloft.net> | 2018-06-03 15:31:58 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-06-03 15:31:58 +0200 |
commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f (patch) | |
tree | 70441095d58678711d68cfef4934765251425d1f /arch/arm/kvm | |
parent | net: phy: consider PHY_IGNORE_INTERRUPT in state machine PHY_NOLINK handling (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.tar.xz linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/kvm')
0 files changed, 0 insertions, 0 deletions