]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
projects / mirror_ubuntu-focal-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d89d415 1ffaddd)
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 5 Aug 2018 20:04:31 +0000 (13:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 5 Aug 2018 20:04:31 +0000 (13:04 -0700)
commitc1c8626fcebed467184ffd8de0ab5c9f9d9c3594
tree2c661fee934f4a7985e4f8e29cd1ba63a330a5e4tree
parentd89d41556141a527030a15233135ba622ba3350dcommit | diff
parent1ffaddd029c867d134a1dde39f540dcc8c52e274commit | diff
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Lots of overlapping changes, mostly trivial in nature.

The mlxsw conflict was resolving using the example
resolution at:

https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c diff1 | diff2 | blob | history
drivers/net/wan/lmc/lmc_main.c diff1 | diff2 | blob | history
ipc/shm.c diff1 | diff2 | blob | history
net/l2tp/l2tp_ppp.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
net/smc/smc_cdc.c diff1 | diff2 | blob | history
tools/bpf/bpftool/map.c diff1 | diff2 | blob | history
Ubuntu Focal Linux kernel mirror