| commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Jun 03 09:31:58 2018 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sun Jun 03 09:31:58 2018 -0400 |
| tree | 70441095d58678711d68cfef4934765251425d1f | |
| parent | eaf47b17a77fda841a1102d76c15161ee438b347 [diff] | |
| parent | 918fe1b3157978ada4267468008c5f89ef101e7d [diff] |
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>