David S. Miller
b4b12b0d2f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
The phylink conflict was between a bug fix by Russell King
to make sure we have a consistent PHY interface mode, and
a change in net-next to pull some code in phylink_resolve()
into the helper functions phylink_mac_link_{up,down}()
On the dp83867 side it's mostly overlapping changes, with
the 'net' side removing a condition that was supposed to
trigger for RGMII but because of how it was coded never
actually could trigger.
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-05-31 10:49:43 -07:00
..
associola.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
auth.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
bind_addr.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
chunk.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
debug.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
diag.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
endpointola.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 103
2019-05-24 17:39:00 +02:00
input.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
inqueue.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
ipv6.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
Kconfig
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
Makefile
sctp: rename sctp_diag.c as diag.c
2018-02-13 13:56:31 -05:00
objcnt.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
offload.c
sctp: deduplicate identical skb_checksum_ops
2019-05-30 14:35:44 -07:00
output.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
outqueue.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
primitive.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
proc.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
protocol.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
sm_make_chunk.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
sm_sideeffect.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
sm_statefuns.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
sm_statetable.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
socket.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
stream.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
stream_interleave.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
stream_sched.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
stream_sched_prio.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
stream_sched_rr.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
sysctl.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
transport.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
tsnmap.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
ulpevent.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00
ulpqueue.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104
2019-05-24 17:39:00 +02:00