diff options
| author | David S. Miller | 2017-01-30 01:07:03 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-01-30 01:07:03 +0100 |
| commit | f33f4ac3d3a6e29f1c5a9d8cd1058d298f4685f4 (patch) | |
| tree | 0dc31f4a8d67dbc675a99c5e7def5aa10f058ab2 /net/ipv4/tcp.c | |
| parent | openvswitch: Simplify do_execute_actions(). (diff) | |
| parent | net: qcom/emac: add an error interrupt handler for the sgmii (diff) | |
| download | kernel-qcow2-linux-f33f4ac3d3a6e29f1c5a9d8cd1058d298f4685f4.tar.gz kernel-qcow2-linux-f33f4ac3d3a6e29f1c5a9d8cd1058d298f4685f4.tar.xz kernel-qcow2-linux-f33f4ac3d3a6e29f1c5a9d8cd1058d298f4685f4.zip | |
Merge branch 'qcom-emac-misc'
Timur Tabi says:
====================
net: qcom/emac:
Although not related, these patches affect the same files, so they should
be applied in order.
The first patch cleans up logging of when the the phy driver is attached.
The second patch always configures the SGMII to use autonegotiation mode.
The third patch removes a redundant call to emac_mac_start().
The fourth patch removes some extraneous non-functioning WOL code.
The fifth patch adds an error handler for the SGMII block.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
0 files changed, 0 insertions, 0 deletions