| commit | 6f41617bf23a17d9cb7cc6ca8161534f05f80293 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Oct 03 21:00:17 2018 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Oct 03 21:00:17 2018 -0700 |
| tree | 2844d8d197a61b0603e31f09613e3272635dd1cc | |
| parent | 7bdaae270cb55d40b7fb73744c7e00a7108ee5b6 [diff] | |
| parent | cec4de302c5ff2c5eb3bfcb0c4845a095f5149b9 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net' overlapped the renaming of a netlink attribute in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>