diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 15:28:55 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 16:45:56 +0200 |
| commit | 50f456b46cbae27ed13badfe7b2976cd01b67a57 (patch) | |
| tree | 9911069e0538585942fe2c16685e7ed3afbff674 /target/linux/layerscape/patches-5.4/701-net-0398-enetc-add-ioctl-support-for-PHY-related-ops.patch | |
| parent | 78cf3e53b1f4ea6428925302d78f743a693d5fb1 (diff) | |
| download | upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.gz upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.bz2 upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.zip | |
kernel: bump 5.4 to 5.4.150
Manually rebased:
generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
Removed upstreamed:
layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0398-enetc-add-ioctl-support-for-PHY-related-ops.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0398-enetc-add-ioctl-support-for-PHY-related-ops.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0398-enetc-add-ioctl-support-for-PHY-related-ops.patch b/target/linux/layerscape/patches-5.4/701-net-0398-enetc-add-ioctl-support-for-PHY-related-ops.patch index c9660e3d3c..6865f23169 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0398-enetc-add-ioctl-support-for-PHY-related-ops.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0398-enetc-add-ioctl-support-for-PHY-related-ops.patch @@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c -@@ -1656,7 +1656,10 @@ int enetc_ioctl(struct net_device *ndev, +@@ -1653,7 +1653,10 @@ int enetc_ioctl(struct net_device *ndev, if (cmd == SIOCGHWTSTAMP) return enetc_hwtstamp_get(ndev, rq); #endif |