diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/ethernet/eth.c | 1 | ||||
| -rw-r--r-- | net/packet/af_packet.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.cdrivers/usb/image?h=nds-private-remove&id=52e02f2797cf44e00da987a7736cc0f5192132f7'>52e02f2797cf44e00da987a7736cc0f5192132f7 (patch) | ||
| tree | 5edb83141db6c9544feb9a47c5e50ccd173d5e49 /drivers/usb/image | |
|---|---|---|
| parent | c9194b99ae1825bdbafc701965442a47739ff0ad (diff) | |
| parent | 064c3db9c564cc5be514ac21fb4aa26cc33db746 (diff) | |
Merge branch 'for-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Three libata fixes: an error handling fix, blacklist addition for
another fallout from upping the default max sectors, and fix for a
sense data reporting bug which affects new harddrives which can report
sense data"
* 'for-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata: sata_mv:- Handle return value of devm_ioremap.
libata: Fix ATA request sense
libata: apply MAX_SEC_1024 to all CX1-JB*-HP devices
Diffstat (limited to 'drivers/usb/image')