Linus Torvalds
2080cee435
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) e1000e computes header length incorrectly wrt vlans, fix from Vlad
Yasevich.
2) ns_capable() check in sock_diag netlink code, from Andrew
Lutomirski.
3) Fix invalid queue pairs handling in virtio_net, from Amos Kong.
4) Checksum offloading busted in sxgbe driver due to incorrect
descriptor layout, fix from Byungho An.
5) Fix build failure with SMC_DEBUG set to 2 or larger, from Zi Shen
Lim.
6) Fix uninitialized A and X registers in BPF interpreter, from Alexei
Starovoitov.
7) Fix arch dependencies of candence driver.
8) Fix netlink capabilities checking tree-wide, from Eric W Biederman.
9) Don't dump IFLA_VF_PORTS if netlink request didn't ask for it in
IFLA_EXT_MASK, from David Gibson.
10) IPV6 FIB dump restart doesn't handle table changes that happen
meanwhile, causing the code to loop forever or emit dups, fix from
Kumar Sandararajan.
11) Memory leak on VF removal in bnx2x, from Yuval Mintz.
12) Bug fixes for new Altera TSE driver from Vince Bridgers.
13) Fix route lookup key in SCTP, from Xugeng Zhang.
14) Use BH blocking spinlocks in SLIP, as per a similar fix to CAN/SLCAN
driver. From Oliver Hartkopp.
15) TCP doesn't bump retransmit counters in some code paths, fix from
Eric Dumazet.
16) Clamp delayed_ack in tcp_cubic to prevent theoretical divides by
zero. Fix from Liu Yu.
17) Fix locking imbalance in error paths of HHF packet scheduler, from
John Fastabend.
18) Properly reference the transport module when vsock_core_init() runs,
from Andy King.
19) Fix buffer overflow in cdc_ncm driver, from Bjørn Mork.
20) IP_ECN_decapsulate() doesn't see a correct SKB network header in
ip_tunnel_rcv(), fix from Ying Cai.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (132 commits)
net: macb: Fix race between HW and driver
net: macb: Remove 'unlikely' optimization
net: macb: Re-enable RX interrupt only when RX is done
net: macb: Clear interrupt flags
net: macb: Pass same size to DMA_UNMAP as used for DMA_MAP
ip_tunnel: Set network header properly for IP_ECN_decapsulate()
e1000e: Restrict MDIO Slow Mode workaround to relevant parts
e1000e: Fix issue with link flap on 82579
e1000e: Expand workaround for 10Mb HD throughput bug
e1000e: Workaround for dropped packets in Gig/100 speeds on 82579
net/mlx4_core: Don't issue PCIe speed/width checks for VFs
net/mlx4_core: Load the Eth driver first
net/mlx4_core: Fix slave id computation for single port VF
net/mlx4_core: Adjust port number in qp_attach wrapper when detaching
net: cdc_ncm: fix buffer overflow
Altera TSE: ALTERA_TSE should depend on HAS_DMA
vsock: Make transport the proto owner
net: sched: lock imbalance in hhf qdisc
net: mvmdio: Check for a valid interrupt instead of an error
net phy: Check for aneg completion before setting state to PHY_RUNNING
...
2014-05-05 15:59:46 -07:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
[SCSI] libsas: implement > 16 byte CDB support
2013-06-04 11:15:59 -07:00
[SCSI] arcmsr: upper 32 of dma address lost
2014-03-15 10:19:19 -07:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
Merge branch 'for-3.15/core' of git://git.kernel.dk/linux-block
2014-04-01 19:19:15 -07:00
[SCSI] bfa: Replace large udelay() with mdelay()
2014-03-19 15:04:47 -07:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
[SCSI] cxgb4i: Use cxgb4_select_ntuple to correctly calculate ntuple fields
2014-03-15 10:19:18 -07:00
[SCSI] scsi_dh_alua: ALUA handler attach should succeed while TPG is transitioning
2013-10-25 11:19:33 +01:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
scsi, fcoe: Fix CPU hotplug callback registration
2014-03-20 13:43:45 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
[SCSI] isci: update version to 1.2
2014-03-15 10:19:17 -07:00
fcp: Do not interpret check condition as underrun
2013-09-04 13:52:35 -07:00
SCSI misc on 20140401
2014-04-01 18:49:04 -07:00
[SCSI] lpfc: use NULL instead of 0 for pointer
2014-03-15 10:18:58 -07:00
[SCSI] megaraid_sas: Version and Changelog update
2014-03-15 10:19:21 -07:00
[SCSI] mpt2sas: Don't disable device twice at suspend.
2014-04-28 07:49:25 -07:00
Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block
2014-01-30 11:19:05 -08:00
SCSI: remove unnecessary pci_set_drvdata()
2013-10-14 15:26:04 +02:00
block: Abstract out bvec iterator
2013-11-23 22:33:47 -08:00
nsp_cs: switch to ->show_info()
2013-04-09 14:13:21 -04:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-04-12 16:51:08 -07:00
[SCSI] libiscsi: Reduce locking contention in fast path
2014-03-15 10:19:18 -07:00
sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue
2014-04-12 18:02:16 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
2013-11-29 08:48:39 +04:00
[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
2013-11-29 08:48:39 +04:00
[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
2013-11-29 08:48:39 +04:00
zorro: ZTWO_VADDR() should return "void __iomem *"
2013-11-26 11:09:07 +01:00
zorro: ZTWO_VADDR() should return "void __iomem *"
2013-11-26 11:09:07 +01:00
zorro: ZTWO_VADDR() should return "void __iomem *"
2013-11-26 11:09:07 +01:00
[SCSI] advansys: Remove 'last_reset' references
2013-10-25 11:44:54 +01:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
aha1740: switch to ->show_info()
2013-04-09 14:13:23 -04:00
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
[SCSI] atari_scsi: Fix sleep_on race
2014-03-10 21:15:09 +01:00
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
SCSI: remove unnecessary pci_set_drvdata()
2013-10-14 15:26:04 +02:00
[SCSI] buslogic: Added check for DMA mapping errors
2013-10-25 09:57:57 +01:00
[SCSI] BusLogic: Port driver to 64-bit.
2013-06-26 18:32:47 -07:00
scsi: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
[SCSI] scsi constants: command, sense key + additional sense strings
2013-07-09 22:52:29 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
[SCSI] dpt_i2o: return SCSI_MLQUEUE_HOST_BUSY when in reset
2013-10-25 11:40:42 +01:00
[SCSI] dpt_i2o: Remove DPTI_STATE_IOCTL
2013-10-25 11:36:26 +01:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
esp_scsi: Fix tag state corruption when autosensing.
2013-08-01 18:08:34 -07:00
esp_scsi: Fix tag state corruption when autosensing.
2013-08-01 18:08:34 -07:00
[SCSI] BusLogic: Port driver to 64-bit.
2013-06-26 18:32:47 -07:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
zorro: ZTWO_VADDR() should return "void __iomem *"
2013-11-26 11:09:07 +01:00
[SCSI] scsi_error: disable eh_deadline if no host_reset_handler is set
2014-03-15 10:18:59 -07:00
[SCSI] hpsa: fix NULL dereference in hpsa_put_ctlr_into_performant_mode()
2014-04-21 07:56:53 -07:00
[SCSI] hpsa: Add hba mode to the hpsa driver
2014-03-15 10:19:23 -07:00
[SCSI] hpsa: Add hba mode to the hpsa driver
2014-03-15 10:19:23 -07:00
imm: switch to ->show_info()
2013-04-09 14:13:16 -04:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
Merge branch 'for-3.15/core' of git://git.kernel.dk/linux-block
2014-04-01 19:19:15 -07:00
[SCSI] ipr: Add new CCIN definition for Grand Canyon support
2014-03-19 15:04:42 -07:00
[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
2013-11-29 08:48:39 +04:00
ips: switch to ->show_info()
2013-04-09 14:13:27 -04:00
[SCSI] iscsi_boot_sysfs: Fix a memory leak in iscsi_boot_destroy_kset()
2014-03-15 10:19:19 -07:00
net: Fix use after free by removing length arg from sk_data_ready callbacks.
2014-04-11 16:15:36 -04:00
net: Fix use after free by removing length arg from sk_data_ready callbacks.
2014-04-11 16:15:36 -04:00
scsi: async sd resume
2014-04-10 15:30:35 -07:00
Main batch of InfiniBand/RDMA changes for 3.15:
2014-04-03 16:57:19 -07:00
[SCSI] libiscsi: Reduce locking contention in fast path
2014-03-15 10:19:18 -07:00
[SCSI] mac_scsi: Fix crash on out of memory
2013-12-19 20:56:28 -08:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
[SCSI] aci7xxx_old: delete decade+ obsolete driver
2013-12-19 07:39:02 -08:00
[SCSI] megaraid: simplify internal command handling
2014-03-27 08:26:31 -07:00
[SCSI] megaraid: simplify internal command handling
2014-03-27 08:26:31 -07:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
SCSI: remove unnecessary pci_set_drvdata()
2013-10-14 15:26:04 +02:00
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
2013-04-15 14:30:44 -06:00
treewide: Fix common typo in "identify"
2013-10-14 15:31:06 +02:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
[SCSI] nsp32: use mdelay instead of large udelay constants
2013-06-19 17:53:35 +02:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
SCSI fixes on 20131206
2013-12-06 08:30:18 -08:00
ppa: switch to ->show_info()
2013-04-09 14:13:17 -04:00
x86, platforms: Remove SGI Visual Workstation
2014-02-27 08:07:39 -08:00
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci
2014-04-11 17:23:52 -07:00
[SCSI] scsi_debug: add ability to enable clustering
2014-03-19 15:04:37 -07:00
[SCSI] Workaround for disks that report bad optimal transfer length
2013-06-24 13:00:10 -07:00
[SCSI] More USB deadlock fixes
2014-04-21 14:28:40 -07:00
[SCSI] Fix command result state propagation
2014-04-21 14:27:26 -07:00
net: Use netlink_ns_capable to verify the permisions of netlink messages
2014-04-24 13:44:54 -04:00
scsi: async sd resume
2014-04-10 15:30:35 -07:00
scsi: async sd resume
2014-04-10 15:30:35 -07:00
fix buffer leak after "scsi: saner replacements for ->proc_info()"
2013-05-31 15:16:51 -04:00
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci
2014-04-11 17:23:52 -07:00
SCSI misc on 20140401
2014-04-01 18:49:04 -07:00
[SCSI] do not manipulate device reference counts in scsi_get/put_command
2014-03-15 10:19:24 -07:00
[SCSI] scsi_transport_fc: Add 32Gbps speed definition.
2014-03-15 10:17:50 -07:00
Merge branch 'master' into for-next
2014-02-20 14:54:28 +01:00
scsi_transport_srp: Fix two kernel-doc warnings
2014-03-24 10:05:30 -07:00
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci
2014-04-11 17:23:52 -07:00
[SCSI] sd: Quiesce mode sense error messages
2014-03-27 08:26:33 -07:00
bio-integrity: Convert to bvec_iter
2013-11-23 22:33:50 -08:00
[SCSI] ses: Use vpd information from scsi_device
2014-03-27 08:26:31 -07:00
[SCSI] Revert "sg: use rwsem to solve race during exclusive open"
2013-10-25 10:59:54 +01:00
[SCSI] sr: use block layer runtime PM
2013-12-16 10:57:51 -08:00
[SCSI] st: fix corruption of the st_modedef structures in st_set_options()
2014-03-15 10:19:22 -07:00
SCSI: remove unnecessary pci_set_drvdata()
2013-10-14 15:26:04 +02:00
[SCSI] storvsc: NULL pointer dereference fix
2014-03-12 13:16:54 +04:00
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
[SCSI] tmscsim: Move 'last_reset' into host structure
2013-10-25 11:51:37 +01:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
[SCSI] virtio-scsi: Skip setting affinity on uninitialized vq
2014-04-28 16:16:08 -07:00
[SCSI] vmw_pvscsi: Some improvements in pvscsi driver.
2014-03-19 15:04:46 -07:00
[SCSI] vmw_pvscsi: Some improvements in pvscsi driver.
2014-03-19 15:04:46 -07:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
[SCSI] remove deprecated IRQF_DISABLED from SCSI
2014-03-19 15:04:44 -07:00
zorro: ZTWO_VADDR() should return "void __iomem *"
2013-11-26 11:09:07 +01:00
2080cee435