summaryrefslogtreecommitdiff
path: root/drivers/usb/usbip/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-02 21:50:52 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-02 21:50:52 -0500
commit2a7b6216692cd66f4c94e6ebb48e43038349ca7d (patch)
treeafd3728409a6973e261120a326aa708494edc850 /drivers/usb/usbip/Makefile
parent1f3d62090d3ba4d0c14e5271be87812fc577b197 (diff)
parente4cf8a38fc0d257b4070066e46a678f4777fecaa (diff)
Merge branch 'mv88e6390-missing-phy-ID'
Andrew Lunn says: ==================== Work around missing PHY prodcut ID in mv88e6390 The internal PHYs of the MV88E6390 have a Marvell OUI, but the product ID is zero. Work around this by trapping reads to the ID, and if it is zero, return the MV88E6390 family ID. v2: Move the workaround into the central mdio read function. Enable the temperature sensor, even though it does not work on the 6390, but it does on the 6341, which has the same ID problem. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/usbip/Makefile')
0 files changed, 0 insertions, 0 deletions
e big series (13 patches) for the new qedr driver" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (27 commits) RDMA/cma: Fix unknown symbol when CONFIG_IPV6 is not enabled IB/rxe: Prevent from completer to operate on non valid QP IB/rxe: Fix rxe dev insertion to rxe_dev_list IB/umem: Release pid in error and ODP flow RDMA/qedr: Dispatch port active event from qedr_add RDMA/qedr: Fix and simplify memory leak in PD alloc RDMA/qedr: Fix RDMA CM loopback RDMA/qedr: Fix formatting RDMA/qedr: Mark three functions as static RDMA/qedr: Don't reset QP when queues aren't flushed RDMA/qedr: Don't spam dmesg if QP is in error state RDMA/qedr: Remove CQ spinlock from CM completion handlers RDMA/qedr: Return max inline data in QP query result RDMA/qedr: Return success when not changing QP state RDMA/qedr: Add uapi header qedr-abi.h RDMA/qedr: Fix MTU returned from QP query RDMA/core: Add the function ib_mtu_int_to_enum IB/vmw_pvrdma: Fix incorrect cleanup on pvrdma_pci_probe error path IB/vmw_pvrdma: Don't leak info from alloc_ucontext IB/cxgb3: fix misspelling in header guard ...
Diffstat (limited to 'net/sched/act_connmark.c')