Merge 4.14.198 into neutrino-msm-hotdogb-4.14

Changes in 4.14.198: (13 commits)
        ALSA; firewire-tascam: exclude Tascam FE-8 from detection
        block: ensure bdi->io_pages is always initialized
        vfio/type1: Support faulting PFNMAP vmas
        vfio-pci: Fault mmaps to enable vma tracking
        vfio-pci: Invalidate mmaps and block MMIO access on disabled memory
        vfio/pci: Fix SR-IOV VF handling with MMIO blocking
        bnxt: don't enable NAPI until rings are ready
        netlabel: fix problems with mapping removal
        net: usb: dm9601: Add USB ID of Keenetic Plus DSL
        sctp: not disable bh in the whole sctp_get_port_local()
        tipc: fix shutdown() of connectionless socket
        net: disable netpoll on fresh napis
        Linux 4.14.198

Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 197
+SUBLEVEL = 198
 EXTRAVERSION =
 NAME = Petit Gorille
 

block/blk-core.c

@@ -854,6 +854,8 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 
 	q->backing_dev_info->ra_pages =
 			(VM_MAX_READAHEAD * 1024) / PAGE_SIZE;
+	q->backing_dev_info->io_pages =
+			(VM_MAX_READAHEAD * 1024) / PAGE_SIZE;
 	q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK;
 	q->backing_dev_info->name = "block";
 	q->node = node_id;

drivers/net/ethernet/broadcom/bnxt/bnxt.c

@@ -6378,14 +6378,14 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
 		}
 	}
 
-	bnxt_enable_napi(bp);
-
 	rc = bnxt_init_nic(bp, irq_re_init);
 	if (rc) {
 		netdev_err(bp->dev, "bnxt_init_nic err: %x\n", rc);
-		goto open_err;
+		goto open_err_irq;
 	}
 
+	bnxt_enable_napi(bp);
+
 	if (link_re_init) {
 		mutex_lock(&bp->link_lock);
 		rc = bnxt_update_phy_setting(bp);
@@ -6410,9 +6410,6 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
 		bnxt_vf_reps_open(bp);
 	return 0;
 
-open_err:
-	bnxt_disable_napi(bp);
-
 open_err_irq:
 	bnxt_del_napi(bp);
 

drivers/net/usb/dm9601.c

@@ -625,6 +625,10 @@ static const struct usb_device_id products[] = {
 	 USB_DEVICE(0x0a46, 0x1269),	/* DM9621A USB to Fast Ethernet Adapter */
 	 .driver_info = (unsigned long)&dm9601_info,
 	},
+	{
+	 USB_DEVICE(0x0586, 0x3427),	/* ZyXEL Keenetic Plus DSL xDSL modem */
+	 .driver_info = (unsigned long)&dm9601_info,
+	},
 	{},			// END
 };