diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-23 21:49:06 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-23 21:51:56 +0300 |
| commit | 5ca114400dcd46f19f31573e7c60e638bd8d644b (patch) | |
| tree | d78dc56c94548d865e505f022c08006716bdb963 /net/sched/sch_drr.c | |
| parent | f53d77e19b6587527a3dd60a0e638f115e5cd7a9 (diff) | |
| parent | a84a8ab94ed5cb65a1355fe9e8d1d55283375808 (diff) | |
| download | linux-5ca114400dcd46f19f31573e7c60e638bd8d644b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.
The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_drr.c')
0 files changed, 0 insertions, 0 deletions