diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-07 03:52:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-07 04:34:15 +0200 |
| commit | c85d6975ef923cffdd56de3e0e6aba0977282cff (patch) | |
| tree | cb497deea01827951809c9c7c0f1c22780c146be /kernel/bpf/arraymap.c | |
| parent | virtio: document queue state logic (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-c85d6975ef923cffdd56de3e0e6aba0977282cff.tar.xz linux-c85d6975ef923cffdd56de3e0e6aba0977282cff.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mellanox/mlx4/cmd.c
net/core/fib_rules.c
net/ipv4/fib_frontend.c
The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.
The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/arraymap.c')
0 files changed, 0 insertions, 0 deletions