diff -druN linux-libre-3.0.29-gnu/crypto/sha512_generic.c linux-libre-3.0.30-gnu/crypto/sha512_generic.c
--- linux-libre-3.0.29-gnu/crypto/sha512_generic.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/crypto/sha512_generic.c	2012-04-27 12:52:09.000000000 -0400
@@ -174,7 +174,7 @@
 	index = sctx->count[0] & 0x7f;
 
 	/* Update number of bytes */
-	if (!(sctx->count[0] += len))
+	if ((sctx->count[0] += len) < len)
 		sctx->count[1]++;
 
         part_len = 128 - index;
diff -druN linux-libre-3.0.29-gnu/drivers/bluetooth/ath3k.c linux-libre-3.0.30-gnu/drivers/bluetooth/ath3k.c
--- linux-libre-3.0.29-gnu/drivers/bluetooth/ath3k.c	2012-04-23 17:58:13.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/bluetooth/ath3k.c	2012-04-27 16:12:44.000000000 -0400
@@ -73,6 +73,7 @@
 	{ USB_DEVICE(0x0CF3, 0x3004) },
 	{ USB_DEVICE(0x0CF3, 0x311D) },
 	{ USB_DEVICE(0x13d3, 0x3375) },
+	{ USB_DEVICE(0x04CA, 0x3005) },
 
 	/* Atheros AR5BBU12 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -91,6 +92,7 @@
 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
 
 	{ }	/* Terminating entry */
 };
diff -druN linux-libre-3.0.29-gnu/drivers/bluetooth/btusb.c linux-libre-3.0.30-gnu/drivers/bluetooth/btusb.c
--- linux-libre-3.0.29-gnu/drivers/bluetooth/btusb.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/bluetooth/btusb.c	2012-04-27 12:52:09.000000000 -0400
@@ -125,6 +125,7 @@
 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
 
 	/* Atheros AR5BBU12 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
diff -druN linux-libre-3.0.29-gnu/drivers/media/rc/winbond-cir.c linux-libre-3.0.30-gnu/drivers/media/rc/winbond-cir.c
--- linux-libre-3.0.29-gnu/drivers/media/rc/winbond-cir.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/media/rc/winbond-cir.c	2012-04-27 12:52:09.000000000 -0400
@@ -1058,6 +1058,7 @@
 		goto exit_unregister_led;
 	}
 
+	data->dev->driver_type = RC_DRIVER_IR_RAW;
 	data->dev->driver_name = WBCIR_NAME;
 	data->dev->input_name = WBCIR_NAME;
 	data->dev->input_phys = "wbcir/cir0";
diff -druN linux-libre-3.0.29-gnu/drivers/net/8139cp.c linux-libre-3.0.30-gnu/drivers/net/8139cp.c
--- linux-libre-3.0.29-gnu/drivers/net/8139cp.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/8139cp.c	2012-04-27 12:52:09.000000000 -0400
@@ -992,6 +992,11 @@
 	cpw8(Cmd, RxOn | TxOn);
 }
 
+static void cp_enable_irq(struct cp_private *cp)
+{
+	cpw16_f(IntrMask, cp_intr_mask);
+}
+
 static void cp_init_hw (struct cp_private *cp)
 {
 	struct net_device *dev = cp->dev;
@@ -1031,8 +1036,6 @@
 
 	cpw16(MultiIntr, 0);
 
-	cpw16_f(IntrMask, cp_intr_mask);
-
 	cpw8_f(Cfg9346, Cfg9346_Lock);
 }
 
@@ -1164,6 +1167,8 @@
 	if (rc)
 		goto err_out_hw;
 
+	cp_enable_irq(cp);
+
 	netif_carrier_off(dev);
 	mii_check_media(&cp->mii_if, netif_msg_link(cp), true);
 	netif_start_queue(dev);
@@ -2052,6 +2057,7 @@
 	/* FIXME: sh*t may happen if the Rx ring buffer is depleted */
 	cp_init_rings_index (cp);
 	cp_init_hw (cp);
+	cp_enable_irq(cp);
 	netif_start_queue (dev);
 
 	spin_lock_irqsave (&cp->lock, flags);
diff -druN linux-libre-3.0.29-gnu/drivers/net/atlx/atl1.c linux-libre-3.0.30-gnu/drivers/net/atlx/atl1.c
--- linux-libre-3.0.29-gnu/drivers/net/atlx/atl1.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/atlx/atl1.c	2012-04-27 12:52:09.000000000 -0400
@@ -2476,7 +2476,7 @@
 					"pcie phy link down %x\n", status);
 			if (netif_running(adapter->netdev)) {	/* reset MAC */
 				iowrite32(0, adapter->hw.hw_addr + REG_IMR);
-				schedule_work(&adapter->pcie_dma_to_rst_task);
+				schedule_work(&adapter->reset_dev_task);
 				return IRQ_HANDLED;
 			}
 		}
@@ -2488,7 +2488,7 @@
 					"pcie DMA r/w error (status = 0x%x)\n",
 					status);
 			iowrite32(0, adapter->hw.hw_addr + REG_IMR);
-			schedule_work(&adapter->pcie_dma_to_rst_task);
+			schedule_work(&adapter->reset_dev_task);
 			return IRQ_HANDLED;
 		}
 
@@ -2633,10 +2633,10 @@
 	atl1_clean_rx_ring(adapter);
 }
 
-static void atl1_tx_timeout_task(struct work_struct *work)
+static void atl1_reset_dev_task(struct work_struct *work)
 {
 	struct atl1_adapter *adapter =
-		container_of(work, struct atl1_adapter, tx_timeout_task);
+		container_of(work, struct atl1_adapter, reset_dev_task);
 	struct net_device *netdev = adapter->netdev;
 
 	netif_device_detach(netdev);
@@ -3034,12 +3034,10 @@
 		    (unsigned long)adapter);
 	adapter->phy_timer_pending = false;
 
-	INIT_WORK(&adapter->tx_timeout_task, atl1_tx_timeout_task);
+	INIT_WORK(&adapter->reset_dev_task, atl1_reset_dev_task);
 
 	INIT_WORK(&adapter->link_chg_task, atlx_link_chg_task);
 
-	INIT_WORK(&adapter->pcie_dma_to_rst_task, atl1_tx_timeout_task);
-
 	err = register_netdev(netdev);
 	if (err)
 		goto err_common;
diff -druN linux-libre-3.0.29-gnu/drivers/net/atlx/atl1.h linux-libre-3.0.30-gnu/drivers/net/atlx/atl1.h
--- linux-libre-3.0.29-gnu/drivers/net/atlx/atl1.h	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/atlx/atl1.h	2012-04-27 12:52:09.000000000 -0400
@@ -759,9 +759,8 @@
 	u16 link_speed;
 	u16 link_duplex;
 	spinlock_t lock;
-	struct work_struct tx_timeout_task;
+	struct work_struct reset_dev_task;
 	struct work_struct link_chg_task;
-	struct work_struct pcie_dma_to_rst_task;
 
 	struct timer_list phy_config_timer;
 	bool phy_timer_pending;
diff -druN linux-libre-3.0.29-gnu/drivers/net/atlx/atlx.c linux-libre-3.0.30-gnu/drivers/net/atlx/atlx.c
--- linux-libre-3.0.29-gnu/drivers/net/atlx/atlx.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/atlx/atlx.c	2012-04-27 12:52:09.000000000 -0400
@@ -193,7 +193,7 @@
 {
 	struct atlx_adapter *adapter = netdev_priv(netdev);
 	/* Do the reset outside of interrupt context */
-	schedule_work(&adapter->tx_timeout_task);
+	schedule_work(&adapter->reset_dev_task);
 }
 
 /*
diff -druN linux-libre-3.0.29-gnu/drivers/net/bonding/bond_main.c linux-libre-3.0.30-gnu/drivers/net/bonding/bond_main.c
--- linux-libre-3.0.29-gnu/drivers/net/bonding/bond_main.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/bonding/bond_main.c	2012-04-27 12:52:09.000000000 -0400
@@ -3076,7 +3076,11 @@
 					   trans_start + delta_in_ticks)) ||
 			    bond->curr_active_slave != slave) {
 				slave->link = BOND_LINK_UP;
-				bond->current_arp_slave = NULL;
+				if (bond->current_arp_slave) {
+					bond_set_slave_inactive_flags(
+						bond->current_arp_slave);
+					bond->current_arp_slave = NULL;
+				}
 
 				pr_info("%s: link status definitely up for interface %s.\n",
 					bond->dev->name, slave->dev->name);
diff -druN linux-libre-3.0.29-gnu/drivers/net/davinci_mdio.c linux-libre-3.0.30-gnu/drivers/net/davinci_mdio.c
--- linux-libre-3.0.29-gnu/drivers/net/davinci_mdio.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/davinci_mdio.c	2012-04-27 12:52:09.000000000 -0400
@@ -181,6 +181,11 @@
 		__davinci_mdio_reset(data);
 		return -EAGAIN;
 	}
+
+	reg = __raw_readl(&regs->user[0].access);
+	if ((reg & USERACCESS_GO) == 0)
+		return 0;
+
 	dev_err(data->dev, "timed out waiting for user access\n");
 	return -ETIMEDOUT;
 }
diff -druN linux-libre-3.0.29-gnu/drivers/net/dummy.c linux-libre-3.0.30-gnu/drivers/net/dummy.c
--- linux-libre-3.0.29-gnu/drivers/net/dummy.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/dummy.c	2012-04-27 12:52:09.000000000 -0400
@@ -106,14 +106,14 @@
 	return 0;
 }
 
-static void dummy_dev_free(struct net_device *dev)
+static void dummy_dev_uninit(struct net_device *dev)
 {
 	free_percpu(dev->dstats);
-	free_netdev(dev);
 }
 
 static const struct net_device_ops dummy_netdev_ops = {
 	.ndo_init		= dummy_dev_init,
+	.ndo_uninit		= dummy_dev_uninit,
 	.ndo_start_xmit		= dummy_xmit,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_multicast_list = set_multicast_list,
@@ -127,7 +127,7 @@
 
 	/* Initialize the device structure. */
 	dev->netdev_ops = &dummy_netdev_ops;
-	dev->destructor = dummy_dev_free;
+	dev->destructor = free_netdev;
 
 	/* Fill in device structure with ethernet-generic values. */
 	dev->tx_queue_len = 0;
diff -druN linux-libre-3.0.29-gnu/drivers/net/ks8851_mll.c linux-libre-3.0.30-gnu/drivers/net/ks8851_mll.c
--- linux-libre-3.0.29-gnu/drivers/net/ks8851_mll.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/ks8851_mll.c	2012-04-27 12:52:09.000000000 -0400
@@ -38,7 +38,7 @@
 #define	DRV_NAME	"ks8851_mll"
 
 static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 };
-#define MAX_RECV_FRAMES			32
+#define MAX_RECV_FRAMES			255
 #define MAX_BUF_SIZE			2048
 #define TX_BUF_SIZE			2000
 #define RX_BUF_SIZE			2000
diff -druN linux-libre-3.0.29-gnu/drivers/net/ksz884x.c linux-libre-3.0.30-gnu/drivers/net/ksz884x.c
--- linux-libre-3.0.29-gnu/drivers/net/ksz884x.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/ksz884x.c	2012-04-27 12:52:09.000000000 -0400
@@ -5679,7 +5679,7 @@
 		memcpy(hw->override_addr, mac->sa_data, MAC_ADDR_LEN);
 	}
 
-	memcpy(dev->dev_addr, mac->sa_data, MAX_ADDR_LEN);
+	memcpy(dev->dev_addr, mac->sa_data, ETH_ALEN);
 
 	interrupt = hw_block_intr(hw);
 
diff -druN linux-libre-3.0.29-gnu/drivers/net/ppp_generic.c linux-libre-3.0.30-gnu/drivers/net/ppp_generic.c
--- linux-libre-3.0.29-gnu/drivers/net/ppp_generic.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/ppp_generic.c	2012-04-27 12:52:09.000000000 -0400
@@ -968,7 +968,6 @@
 	proto = npindex_to_proto[npi];
 	put_unaligned_be16(proto, pp);
 
-	netif_stop_queue(dev);
 	skb_queue_tail(&ppp->file.xq, skb);
 	ppp_xmit_process(ppp);
 	return NETDEV_TX_OK;
@@ -1063,6 +1062,8 @@
 		   code that we can accept some more. */
 		if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq))
 			netif_wake_queue(ppp->dev);
+		else
+			netif_stop_queue(ppp->dev);
 	}
 	ppp_xmit_unlock(ppp);
 }
diff -druN linux-libre-3.0.29-gnu/drivers/net/smsc911x.c linux-libre-3.0.30-gnu/drivers/net/smsc911x.c
--- linux-libre-3.0.29-gnu/drivers/net/smsc911x.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/smsc911x.c	2012-04-27 12:52:09.000000000 -0400
@@ -1083,10 +1083,8 @@
 
 /* Quickly dumps bad packets */
 static void
-smsc911x_rx_fastforward(struct smsc911x_data *pdata, unsigned int pktbytes)
+smsc911x_rx_fastforward(struct smsc911x_data *pdata, unsigned int pktwords)
 {
-	unsigned int pktwords = (pktbytes + NET_IP_ALIGN + 3) >> 2;
-
 	if (likely(pktwords >= 4)) {
 		unsigned int timeout = 500;
 		unsigned int val;
@@ -1150,7 +1148,7 @@
 			continue;
 		}
 
-		skb = netdev_alloc_skb(dev, pktlength + NET_IP_ALIGN);
+		skb = netdev_alloc_skb(dev, pktwords << 2);
 		if (unlikely(!skb)) {
 			SMSC_WARN(pdata, rx_err,
 				  "Unable to allocate skb for rx packet");
@@ -1160,14 +1158,12 @@
 			break;
 		}
 
-		skb->data = skb->head;
-		skb_reset_tail_pointer(skb);
+		pdata->ops->rx_readfifo(pdata,
+				 (unsigned int *)skb->data, pktwords);
 
 		/* Align IP on 16B boundary */
 		skb_reserve(skb, NET_IP_ALIGN);
 		skb_put(skb, pktlength - 4);
-		pdata->ops->rx_readfifo(pdata,
-				 (unsigned int *)skb->head, pktwords);
 		skb->protocol = eth_type_trans(skb, dev);
 		skb_checksum_none_assert(skb);
 		netif_receive_skb(skb);
@@ -1390,7 +1386,7 @@
 	smsc911x_reg_write(pdata, FIFO_INT, temp);
 
 	/* set RX Data offset to 2 bytes for alignment */
-	smsc911x_reg_write(pdata, RX_CFG, (2 << 8));
+	smsc911x_reg_write(pdata, RX_CFG, (NET_IP_ALIGN << 8));
 
 	/* enable NAPI polling before enabling RX interrupts */
 	napi_enable(&pdata->napi);
diff -druN linux-libre-3.0.29-gnu/drivers/net/usb/smsc75xx.c linux-libre-3.0.30-gnu/drivers/net/usb/smsc75xx.c
--- linux-libre-3.0.29-gnu/drivers/net/usb/smsc75xx.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/usb/smsc75xx.c	2012-04-27 12:52:09.000000000 -0400
@@ -1049,6 +1049,7 @@
 	dev->net->ethtool_ops = &smsc75xx_ethtool_ops;
 	dev->net->flags |= IFF_MULTICAST;
 	dev->net->hard_header_len += SMSC75XX_TX_OVERHEAD;
+	dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
 	return 0;
 }
 
diff -druN linux-libre-3.0.29-gnu/drivers/net/wimax/i2400m/netdev.c linux-libre-3.0.30-gnu/drivers/net/wimax/i2400m/netdev.c
--- linux-libre-3.0.29-gnu/drivers/net/wimax/i2400m/netdev.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/wimax/i2400m/netdev.c	2012-04-27 12:52:09.000000000 -0400
@@ -606,7 +606,8 @@
 	struct i2400m *i2400m = net_dev_to_i2400m(net_dev);
 
 	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver) - 1);
-	strncpy(info->fw_version, i2400m->fw_name, sizeof(info->fw_version) - 1);
+	strncpy(info->fw_version,
+	        i2400m->fw_name ? : "", sizeof(info->fw_version) - 1);
 	if (net_dev->dev.parent)
 		strncpy(info->bus_info, dev_name(net_dev->dev.parent),
 			sizeof(info->bus_info) - 1);
diff -druN linux-libre-3.0.29-gnu/drivers/net/wireless/rt2x00/rt2800usb.c linux-libre-3.0.30-gnu/drivers/net/wireless/rt2x00/rt2800usb.c
--- linux-libre-3.0.29-gnu/drivers/net/wireless/rt2x00/rt2800usb.c	2012-04-23 17:57:21.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/net/wireless/rt2x00/rt2800usb.c	2012-04-27 16:12:12.000000000 -0400
@@ -819,11 +819,14 @@
 	{ USB_DEVICE(0x050d, 0x8053) },
 	{ USB_DEVICE(0x050d, 0x805c) },
 	{ USB_DEVICE(0x050d, 0x815c) },
+	{ USB_DEVICE(0x050d, 0x825a) },
 	{ USB_DEVICE(0x050d, 0x825b) },
 	{ USB_DEVICE(0x050d, 0x935a) },
 	{ USB_DEVICE(0x050d, 0x935b) },
 	/* Buffalo */
 	{ USB_DEVICE(0x0411, 0x00e8) },
+	{ USB_DEVICE(0x0411, 0x0158) },
+	{ USB_DEVICE(0x0411, 0x015d) },
 	{ USB_DEVICE(0x0411, 0x016f) },
 	{ USB_DEVICE(0x0411, 0x01a2) },
 	/* Corega */
@@ -838,6 +841,8 @@
 	{ USB_DEVICE(0x07d1, 0x3c0e) },
 	{ USB_DEVICE(0x07d1, 0x3c0f) },
 	{ USB_DEVICE(0x07d1, 0x3c11) },
+	{ USB_DEVICE(0x07d1, 0x3c13) },
+	{ USB_DEVICE(0x07d1, 0x3c15) },
 	{ USB_DEVICE(0x07d1, 0x3c16) },
 	{ USB_DEVICE(0x2001, 0x3c1b) },
 	/* Draytek */
@@ -846,6 +851,7 @@
 	{ USB_DEVICE(0x7392, 0x7711) },
 	{ USB_DEVICE(0x7392, 0x7717) },
 	{ USB_DEVICE(0x7392, 0x7718) },
+	{ USB_DEVICE(0x7392, 0x7722) },
 	/* Encore */
 	{ USB_DEVICE(0x203d, 0x1480) },
 	{ USB_DEVICE(0x203d, 0x14a9) },
@@ -880,6 +886,7 @@
 	{ USB_DEVICE(0x1737, 0x0070) },
 	{ USB_DEVICE(0x1737, 0x0071) },
 	{ USB_DEVICE(0x1737, 0x0077) },
+	{ USB_DEVICE(0x1737, 0x0078) },
 	/* Logitec */
 	{ USB_DEVICE(0x0789, 0x0162) },
 	{ USB_DEVICE(0x0789, 0x0163) },
@@ -903,9 +910,13 @@
 	{ USB_DEVICE(0x0db0, 0x871b) },
 	{ USB_DEVICE(0x0db0, 0x871c) },
 	{ USB_DEVICE(0x0db0, 0x899a) },
+	/* Ovislink */
+	{ USB_DEVICE(0x1b75, 0x3071) },
+	{ USB_DEVICE(0x1b75, 0x3072) },
 	/* Para */
 	{ USB_DEVICE(0x20b8, 0x8888) },
 	/* Pegatron */
+	{ USB_DEVICE(0x1d4d, 0x0002) },
 	{ USB_DEVICE(0x1d4d, 0x000c) },
 	{ USB_DEVICE(0x1d4d, 0x000e) },
 	{ USB_DEVICE(0x1d4d, 0x0011) },
@@ -943,6 +954,7 @@
 	{ USB_DEVICE(0x0df6, 0x0048) },
 	{ USB_DEVICE(0x0df6, 0x0051) },
 	{ USB_DEVICE(0x0df6, 0x005f) },
+	{ USB_DEVICE(0x0df6, 0x0060) },
 	/* SMC */
 	{ USB_DEVICE(0x083a, 0x6618) },
 	{ USB_DEVICE(0x083a, 0x7511) },
@@ -957,7 +969,9 @@
 	/* Sparklan */
 	{ USB_DEVICE(0x15a9, 0x0006) },
 	/* Sweex */
+	{ USB_DEVICE(0x177f, 0x0153) },
 	{ USB_DEVICE(0x177f, 0x0302) },
+	{ USB_DEVICE(0x177f, 0x0313) },
 	/* U-Media */
 	{ USB_DEVICE(0x157e, 0x300e) },
 	{ USB_DEVICE(0x157e, 0x3013) },
@@ -975,6 +989,8 @@
 	{ USB_DEVICE(0x0586, 0x341e) },
 	{ USB_DEVICE(0x0586, 0x343e) },
 #ifdef CONFIG_RT2800USB_RT33XX
+	/* Belkin */
+	{ USB_DEVICE(0x050d, 0x945b) },
 	/* Ralink */
 	{ USB_DEVICE(0x148f, 0x3370) },
 	{ USB_DEVICE(0x148f, 0x8070) },
@@ -999,6 +1015,7 @@
 	{ USB_DEVICE(0x148f, 0x3572) },
 	/* Sitecom */
 	{ USB_DEVICE(0x0df6, 0x0041) },
+	{ USB_DEVICE(0x0df6, 0x0062) },
 	/* Toshiba */
 	{ USB_DEVICE(0x0930, 0x0a07) },
 	/* Zinwell */
@@ -1038,27 +1055,24 @@
 	{ USB_DEVICE(0x13d3, 0x3322) },
 	/* Belkin */
 	{ USB_DEVICE(0x050d, 0x1003) },
-	{ USB_DEVICE(0x050d, 0x825a) },
 	/* Buffalo */
 	{ USB_DEVICE(0x0411, 0x012e) },
 	{ USB_DEVICE(0x0411, 0x0148) },
 	{ USB_DEVICE(0x0411, 0x0150) },
-	{ USB_DEVICE(0x0411, 0x015d) },
 	/* Corega */
 	{ USB_DEVICE(0x07aa, 0x0041) },
 	{ USB_DEVICE(0x07aa, 0x0042) },
 	{ USB_DEVICE(0x18c5, 0x0008) },
 	/* D-Link */
 	{ USB_DEVICE(0x07d1, 0x3c0b) },
-	{ USB_DEVICE(0x07d1, 0x3c13) },
-	{ USB_DEVICE(0x07d1, 0x3c15) },
 	{ USB_DEVICE(0x07d1, 0x3c17) },
 	{ USB_DEVICE(0x2001, 0x3c17) },
 	/* Edimax */
 	{ USB_DEVICE(0x7392, 0x4085) },
-	{ USB_DEVICE(0x7392, 0x7722) },
 	/* Encore */
 	{ USB_DEVICE(0x203d, 0x14a1) },
+	/* Fujitsu Stylistic 550 */
+	{ USB_DEVICE(0x1690, 0x0761) },
 	/* Gemtek */
 	{ USB_DEVICE(0x15a9, 0x0010) },
 	/* Gigabyte */
@@ -1070,19 +1084,13 @@
 	/* LevelOne */
 	{ USB_DEVICE(0x1740, 0x0605) },
 	{ USB_DEVICE(0x1740, 0x0615) },
-	/* Linksys */
-	{ USB_DEVICE(0x1737, 0x0078) },
 	/* Logitec */
 	{ USB_DEVICE(0x0789, 0x0168) },
 	{ USB_DEVICE(0x0789, 0x0169) },
 	/* Motorola */
 	{ USB_DEVICE(0x100d, 0x9032) },
-	/* Ovislink */
-	{ USB_DEVICE(0x1b75, 0x3071) },
-	{ USB_DEVICE(0x1b75, 0x3072) },
 	/* Pegatron */
 	{ USB_DEVICE(0x05a6, 0x0101) },
-	{ USB_DEVICE(0x1d4d, 0x0002) },
 	{ USB_DEVICE(0x1d4d, 0x0010) },
 	/* Planex */
 	{ USB_DEVICE(0x2019, 0x5201) },
@@ -1096,16 +1104,11 @@
 	{ USB_DEVICE(0x0df6, 0x004a) },
 	{ USB_DEVICE(0x0df6, 0x004d) },
 	{ USB_DEVICE(0x0df6, 0x0053) },
-	{ USB_DEVICE(0x0df6, 0x0060) },
-	{ USB_DEVICE(0x0df6, 0x0062) },
 	/* SMC */
 	{ USB_DEVICE(0x083a, 0xa512) },
 	{ USB_DEVICE(0x083a, 0xc522) },
 	{ USB_DEVICE(0x083a, 0xd522) },
 	{ USB_DEVICE(0x083a, 0xf511) },
-	/* Sweex */
-	{ USB_DEVICE(0x177f, 0x0153) },
-	{ USB_DEVICE(0x177f, 0x0313) },
 	/* Zyxel */
 	{ USB_DEVICE(0x0586, 0x341a) },
 #endif
diff -druN linux-libre-3.0.29-gnu/drivers/pci/quirks.c linux-libre-3.0.30-gnu/drivers/pci/quirks.c
--- linux-libre-3.0.29-gnu/drivers/pci/quirks.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/pci/quirks.c	2012-04-27 12:52:09.000000000 -0400
@@ -2822,6 +2822,40 @@
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TI, 0xb800, fixup_ti816x_class);
 
+/*
+ * Some BIOS implementations leave the Intel GPU interrupts enabled,
+ * even though no one is handling them (f.e. i915 driver is never loaded).
+ * Additionally the interrupt destination is not set up properly
+ * and the interrupt ends up -somewhere-.
+ *
+ * These spurious interrupts are "sticky" and the kernel disables
+ * the (shared) interrupt line after 100.000+ generated interrupts.
+ *
+ * Fix it by disabling the still enabled interrupts.
+ * This resolves crashes often seen on monitor unplug.
+ */
+#define I915_DEIER_REG 0x4400c
+static void __devinit disable_igfx_irq(struct pci_dev *dev)
+{
+	void __iomem *regs = pci_iomap(dev, 0, 0);
+	if (regs == NULL) {
+		dev_warn(&dev->dev, "igfx quirk: Can't iomap PCI device\n");
+		return;
+	}
+
+	/* Check if any interrupt line is still enabled */
+	if (readl(regs + I915_DEIER_REG) != 0) {
+		dev_warn(&dev->dev, "BIOS left Intel GPU interrupts enabled; "
+			"disabling\n");
+
+		writel(0, regs + I915_DEIER_REG);
+	}
+
+	pci_iounmap(dev, regs);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
 			  struct pci_fixup *end)
 {
diff -druN linux-libre-3.0.29-gnu/drivers/spi/spi.c linux-libre-3.0.30-gnu/drivers/spi/spi.c
--- linux-libre-3.0.29-gnu/drivers/spi/spi.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/spi/spi.c	2012-04-27 12:52:09.000000000 -0400
@@ -318,7 +318,7 @@
 	}
 
 	spi->master = master;
-	spi->dev.parent = dev;
+	spi->dev.parent = &master->dev;
 	spi->dev.bus = &spi_bus_type;
 	spi->dev.release = spidev_release;
 	device_initialize(&spi->dev);
diff -druN linux-libre-3.0.29-gnu/drivers/tty/amiserial.c linux-libre-3.0.30-gnu/drivers/tty/amiserial.c
--- linux-libre-3.0.29-gnu/drivers/tty/amiserial.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/tty/amiserial.c	2012-04-27 12:52:09.000000000 -0400
@@ -1113,8 +1113,10 @@
 		    (new_serial.close_delay != state->close_delay) ||
 		    (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
 		    ((new_serial.flags & ~ASYNC_USR_MASK) !=
-		     (state->flags & ~ASYNC_USR_MASK)))
+		     (state->flags & ~ASYNC_USR_MASK))) {
+			tty_unlock();
 			return -EPERM;
+		}
 		state->flags = ((state->flags & ~ASYNC_USR_MASK) |
 			       (new_serial.flags & ASYNC_USR_MASK));
 		info->flags = ((info->flags & ~ASYNC_USR_MASK) |
diff -druN linux-libre-3.0.29-gnu/drivers/tty/serial/clps711x.c linux-libre-3.0.30-gnu/drivers/tty/serial/clps711x.c
--- linux-libre-3.0.29-gnu/drivers/tty/serial/clps711x.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/tty/serial/clps711x.c	2012-04-27 12:52:09.000000000 -0400
@@ -154,10 +154,9 @@
 		port->x_char = 0;
 		return IRQ_HANDLED;
 	}
-	if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-		clps711xuart_stop_tx(port);
-		return IRQ_HANDLED;
-	}
+
+	if (uart_circ_empty(xmit) || uart_tx_stopped(port))
+		goto disable_tx_irq;
 
 	count = port->fifosize >> 1;
 	do {
@@ -171,8 +170,11 @@
 	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
 		uart_write_wakeup(port);
 
-	if (uart_circ_empty(xmit))
-		clps711xuart_stop_tx(port);
+	if (uart_circ_empty(xmit)) {
+	disable_tx_irq:
+		disable_irq_nosync(TX_IRQ(port));
+		tx_enabled(port) = 0;
+	}
 
 	return IRQ_HANDLED;
 }
diff -druN linux-libre-3.0.29-gnu/drivers/tty/serial/pch_uart.c linux-libre-3.0.30-gnu/drivers/tty/serial/pch_uart.c
--- linux-libre-3.0.29-gnu/drivers/tty/serial/pch_uart.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/tty/serial/pch_uart.c	2012-04-27 12:52:09.000000000 -0400
@@ -1354,9 +1354,11 @@
 			__func__);
 		return -EOPNOTSUPP;
 #endif
-		priv->use_dma = 1;
 		priv->use_dma_flag = 1;
 		dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
+		if (!priv->use_dma)
+			pch_request_dma(port);
+		priv->use_dma = 1;
 	}
 
 	return 0;
diff -druN linux-libre-3.0.29-gnu/drivers/usb/core/hub.c linux-libre-3.0.30-gnu/drivers/usb/core/hub.c
--- linux-libre-3.0.29-gnu/drivers/usb/core/hub.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/core/hub.c	2012-04-27 12:52:09.000000000 -0400
@@ -1644,7 +1644,6 @@
 {
 	struct usb_device	*udev = *pdev;
 	int			i;
-	struct usb_hcd		*hcd = bus_to_hcd(udev->bus);
 
 	if (!udev) {
 		pr_debug ("%s nodev\n", __func__);
@@ -1672,9 +1671,7 @@
 	 * so that the hardware is now fully quiesced.
 	 */
 	dev_dbg (&udev->dev, "unregistering device\n");
-	mutex_lock(hcd->bandwidth_mutex);
 	usb_disable_device(udev, 0);
-	mutex_unlock(hcd->bandwidth_mutex);
 	usb_hcd_synchronize_unlinks(udev);
 
 	usb_remove_ep_devs(&udev->ep0);
diff -druN linux-libre-3.0.29-gnu/drivers/usb/core/message.c linux-libre-3.0.30-gnu/drivers/usb/core/message.c
--- linux-libre-3.0.29-gnu/drivers/usb/core/message.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/core/message.c	2012-04-27 12:52:09.000000000 -0400
@@ -1136,8 +1136,6 @@
  * Deallocates hcd/hardware state for the endpoints (nuking all or most
  * pending urbs) and usbcore state for the interfaces, so that usbcore
  * must usb_set_configuration() before any interfaces could be used.
- *
- * Must be called with hcd->bandwidth_mutex held.
  */
 void usb_disable_device(struct usb_device *dev, int skip_ep0)
 {
@@ -1190,7 +1188,9 @@
 			usb_disable_endpoint(dev, i + USB_DIR_IN, false);
 		}
 		/* Remove endpoints from the host controller internal state */
+		mutex_lock(hcd->bandwidth_mutex);
 		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
+		mutex_unlock(hcd->bandwidth_mutex);
 		/* Second pass: remove endpoint pointers */
 	}
 	for (i = skip_ep0; i < 16; ++i) {
@@ -1750,7 +1750,6 @@
 	/* if it's already configured, clear out old state first.
 	 * getting rid of old interfaces means unbinding their drivers.
 	 */
-	mutex_lock(hcd->bandwidth_mutex);
 	if (dev->state != USB_STATE_ADDRESS)
 		usb_disable_device(dev, 1);	/* Skip ep0 */
 
@@ -1763,6 +1762,7 @@
 	 * host controller will not allow submissions to dropped endpoints.  If
 	 * this call fails, the device state is unchanged.
 	 */
+	mutex_lock(hcd->bandwidth_mutex);
 	ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL);
 	if (ret < 0) {
 		mutex_unlock(hcd->bandwidth_mutex);
diff -druN linux-libre-3.0.29-gnu/drivers/usb/gadget/f_fs.c linux-libre-3.0.30-gnu/drivers/usb/gadget/f_fs.c
--- linux-libre-3.0.29-gnu/drivers/usb/gadget/f_fs.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/gadget/f_fs.c	2012-04-27 12:52:09.000000000 -0400
@@ -720,7 +720,7 @@
 	if (code == FUNCTIONFS_INTERFACE_REVMAP) {
 		struct ffs_function *func = ffs->func;
 		ret = func ? ffs_func_revmap_intf(func, value) : -ENODEV;
-	} else if (gadget->ops->ioctl) {
+	} else if (gadget && gadget->ops->ioctl) {
 		ret = gadget->ops->ioctl(gadget, code, value);
 	} else {
 		ret = -ENOTTY;
diff -druN linux-libre-3.0.29-gnu/drivers/usb/host/ehci-hcd.c linux-libre-3.0.30-gnu/drivers/usb/host/ehci-hcd.c
--- linux-libre-3.0.29-gnu/drivers/usb/host/ehci-hcd.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/host/ehci-hcd.c	2012-04-27 12:52:09.000000000 -0400
@@ -808,8 +808,13 @@
 		goto dead;
 	}
 
+	/*
+	 * We don't use STS_FLR, but some controllers don't like it to
+	 * remain on, so mask it out along with the other status bits.
+	 */
+	masked_status = status & (INTR_MASK | STS_FLR);
+
 	/* Shared IRQ? */
-	masked_status = status & INTR_MASK;
 	if (!masked_status || unlikely(hcd->state == HC_STATE_HALT)) {
 		spin_unlock(&ehci->lock);
 		return IRQ_NONE;
diff -druN linux-libre-3.0.29-gnu/drivers/usb/misc/yurex.c linux-libre-3.0.30-gnu/drivers/usb/misc/yurex.c
--- linux-libre-3.0.29-gnu/drivers/usb/misc/yurex.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/misc/yurex.c	2012-04-27 12:52:09.000000000 -0400
@@ -99,9 +99,7 @@
 	usb_put_dev(dev->udev);
 	if (dev->cntl_urb) {
 		usb_kill_urb(dev->cntl_urb);
-		if (dev->cntl_req)
-			usb_free_coherent(dev->udev, YUREX_BUF_SIZE,
-				dev->cntl_req, dev->cntl_urb->setup_dma);
+		kfree(dev->cntl_req);
 		if (dev->cntl_buffer)
 			usb_free_coherent(dev->udev, YUREX_BUF_SIZE,
 				dev->cntl_buffer, dev->cntl_urb->transfer_dma);
@@ -234,9 +232,7 @@
 	}
 
 	/* allocate buffer for control req */
-	dev->cntl_req = usb_alloc_coherent(dev->udev, YUREX_BUF_SIZE,
-					   GFP_KERNEL,
-					   &dev->cntl_urb->setup_dma);
+	dev->cntl_req = kmalloc(YUREX_BUF_SIZE, GFP_KERNEL);
 	if (!dev->cntl_req) {
 		err("Could not allocate cntl_req");
 		goto error;
@@ -286,7 +282,7 @@
 			 usb_rcvintpipe(dev->udev, dev->int_in_endpointAddr),
 			 dev->int_buffer, YUREX_BUF_SIZE, yurex_interrupt,
 			 dev, 1);
-	dev->cntl_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+	dev->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 	if (usb_submit_urb(dev->urb, GFP_KERNEL)) {
 		retval = -EIO;
 		err("Could not submitting URB");
diff -druN linux-libre-3.0.29-gnu/drivers/usb/musb/omap2430.c linux-libre-3.0.30-gnu/drivers/usb/musb/omap2430.c
--- linux-libre-3.0.29-gnu/drivers/usb/musb/omap2430.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/musb/omap2430.c	2012-04-27 12:52:09.000000000 -0400
@@ -295,7 +295,8 @@
 
 static int omap2430_musb_init(struct musb *musb)
 {
-	u32 l, status = 0;
+	u32 l;
+	int status = 0;
 	struct device *dev = musb->controller;
 	struct musb_hdrc_platform_data *plat = dev->platform_data;
 	struct omap_musb_board_data *data = plat->board_data;
@@ -312,7 +313,7 @@
 
 	status = pm_runtime_get_sync(dev);
 	if (status < 0) {
-		dev_err(dev, "pm_runtime_get_sync FAILED");
+		dev_err(dev, "pm_runtime_get_sync FAILED %d\n", status);
 		goto err1;
 	}
 
@@ -464,14 +465,14 @@
 		goto err2;
 	}
 
+	pm_runtime_enable(&pdev->dev);
+
 	ret = platform_device_add(musb);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to register musb device\n");
 		goto err2;
 	}
 
-	pm_runtime_enable(&pdev->dev);
-
 	return 0;
 
 err2:
diff -druN linux-libre-3.0.29-gnu/drivers/usb/serial/cp210x.c linux-libre-3.0.30-gnu/drivers/usb/serial/cp210x.c
--- linux-libre-3.0.29-gnu/drivers/usb/serial/cp210x.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/serial/cp210x.c	2012-04-27 12:52:09.000000000 -0400
@@ -285,7 +285,8 @@
 	/* Issue the request, attempting to read 'size' bytes */
 	result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
 				request, REQTYPE_DEVICE_TO_HOST, 0x0000,
-				port_priv->bInterfaceNumber, buf, size, 300);
+				port_priv->bInterfaceNumber, buf, size,
+				USB_CTRL_GET_TIMEOUT);
 
 	/* Convert data into an array of integers */
 	for (i = 0; i < length; i++)
@@ -335,12 +336,14 @@
 		result = usb_control_msg(serial->dev,
 				usb_sndctrlpipe(serial->dev, 0),
 				request, REQTYPE_HOST_TO_DEVICE, 0x0000,
-				port_priv->bInterfaceNumber, buf, size, 300);
+				port_priv->bInterfaceNumber, buf, size,
+				USB_CTRL_SET_TIMEOUT);
 	} else {
 		result = usb_control_msg(serial->dev,
 				usb_sndctrlpipe(serial->dev, 0),
 				request, REQTYPE_HOST_TO_DEVICE, data[0],
-				port_priv->bInterfaceNumber, NULL, 0, 300);
+				port_priv->bInterfaceNumber, NULL, 0,
+				USB_CTRL_SET_TIMEOUT);
 	}
 
 	kfree(buf);
diff -druN linux-libre-3.0.29-gnu/drivers/usb/serial/sierra.c linux-libre-3.0.30-gnu/drivers/usb/serial/sierra.c
--- linux-libre-3.0.29-gnu/drivers/usb/serial/sierra.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/usb/serial/sierra.c	2012-04-27 12:52:09.000000000 -0400
@@ -221,7 +221,7 @@
 };
 
 /* 'blacklist' of interfaces not served by this driver */
-static const u8 direct_ip_non_serial_ifaces[] = { 7, 8, 9, 10, 11 };
+static const u8 direct_ip_non_serial_ifaces[] = { 7, 8, 9, 10, 11, 19, 20 };
 static const struct sierra_iface_info direct_ip_interface_blacklist = {
 	.infolen = ARRAY_SIZE(direct_ip_non_serial_ifaces),
 	.ifaceinfo = direct_ip_non_serial_ifaces,
@@ -289,7 +289,6 @@
 	{ USB_DEVICE(0x1199, 0x6856) },	/* Sierra Wireless AirCard 881 U */
 	{ USB_DEVICE(0x1199, 0x6859) },	/* Sierra Wireless AirCard 885 E */
 	{ USB_DEVICE(0x1199, 0x685A) },	/* Sierra Wireless AirCard 885 E */
-	{ USB_DEVICE(0x1199, 0x68A2) }, /* Sierra Wireless MC7710 */
 	/* Sierra Wireless C885 */
 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6880, 0xFF, 0xFF, 0xFF)},
 	/* Sierra Wireless C888, Air Card 501, USB 303, USB 304 */
@@ -299,6 +298,9 @@
 	/* Sierra Wireless HSPA Non-Composite Device */
 	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
 	{ USB_DEVICE(0x1199, 0x6893) },	/* Sierra Wireless Device */
+	{ USB_DEVICE(0x1199, 0x68A2),   /* Sierra Wireless MC77xx in QMI mode */
+	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
+	},
 	{ USB_DEVICE(0x1199, 0x68A3), 	/* Sierra Wireless Direct IP modems */
 	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
 	},
diff -druN linux-libre-3.0.29-gnu/drivers/uwb/hwa-rc.c linux-libre-3.0.30-gnu/drivers/uwb/hwa-rc.c
--- linux-libre-3.0.29-gnu/drivers/uwb/hwa-rc.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/uwb/hwa-rc.c	2012-04-27 12:52:09.000000000 -0400
@@ -645,7 +645,8 @@
 		dev_err(dev, "NEEP: URB error %d\n", urb->status);
 	}
 	result = usb_submit_urb(urb, GFP_ATOMIC);
-	if (result < 0) {
+	if (result < 0 && result != -ENODEV && result != -EPERM) {
+		/* ignoring unrecoverable errors */
 		dev_err(dev, "NEEP: Can't resubmit URB (%d) resetting device\n",
 			result);
 		goto error;
diff -druN linux-libre-3.0.29-gnu/drivers/uwb/neh.c linux-libre-3.0.30-gnu/drivers/uwb/neh.c
--- linux-libre-3.0.29-gnu/drivers/uwb/neh.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/uwb/neh.c	2012-04-27 12:52:09.000000000 -0400
@@ -106,6 +106,7 @@
 	u8 evt_type;
 	__le16 evt;
 	u8 context;
+	u8 completed;
 	uwb_rc_cmd_cb_f cb;
 	void *arg;
 
@@ -408,6 +409,7 @@
 	struct device *dev = &rc->uwb_dev.dev;
 	struct uwb_rc_neh *neh;
 	struct uwb_rceb *notif;
+	unsigned long flags;
 
 	if (rceb->bEventContext == 0) {
 		notif = kmalloc(size, GFP_ATOMIC);
@@ -421,7 +423,11 @@
 	} else {
 		neh = uwb_rc_neh_lookup(rc, rceb);
 		if (neh) {
-			del_timer_sync(&neh->timer);
+			spin_lock_irqsave(&rc->neh_lock, flags);
+			/* to guard against a timeout */
+			neh->completed = 1;
+			del_timer(&neh->timer);
+			spin_unlock_irqrestore(&rc->neh_lock, flags);
 			uwb_rc_neh_cb(neh, rceb, size);
 		} else
 			dev_warn(dev, "event 0x%02x/%04x/%02x (%zu bytes): nobody cared\n",
@@ -567,6 +573,10 @@
 	unsigned long flags;
 
 	spin_lock_irqsave(&rc->neh_lock, flags);
+	if (neh->completed) {
+		spin_unlock_irqrestore(&rc->neh_lock, flags);
+		return;
+	}
 	if (neh->context)
 		__uwb_rc_neh_rm(rc, neh);
 	else
diff -druN linux-libre-3.0.29-gnu/drivers/xen/gntdev.c linux-libre-3.0.30-gnu/drivers/xen/gntdev.c
--- linux-libre-3.0.29-gnu/drivers/xen/gntdev.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/xen/gntdev.c	2012-04-27 12:52:09.000000000 -0400
@@ -664,7 +664,7 @@
 	vma->vm_flags |= VM_RESERVED|VM_DONTEXPAND;
 
 	if (use_ptemod)
-		vma->vm_flags |= VM_DONTCOPY|VM_PFNMAP;
+		vma->vm_flags |= VM_DONTCOPY;
 
 	vma->vm_private_data = map;
 
diff -druN linux-libre-3.0.29-gnu/drivers/xen/xenbus/xenbus_probe_frontend.c linux-libre-3.0.30-gnu/drivers/xen/xenbus/xenbus_probe_frontend.c
--- linux-libre-3.0.29-gnu/drivers/xen/xenbus/xenbus_probe_frontend.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/drivers/xen/xenbus/xenbus_probe_frontend.c	2012-04-27 12:52:09.000000000 -0400
@@ -132,7 +132,7 @@
 	return xenbus_read_otherend_details(xendev, "backend-id", "backend");
 }
 
-static int is_device_connecting(struct device *dev, void *data)
+static int is_device_connecting(struct device *dev, void *data, bool ignore_nonessential)
 {
 	struct xenbus_device *xendev = to_xenbus_device(dev);
 	struct device_driver *drv = data;
@@ -149,16 +149,41 @@
 	if (drv && (dev->driver != drv))
 		return 0;
 
+	if (ignore_nonessential) {
+		/* With older QEMU, for PVonHVM guests the guest config files
+		 * could contain: vfb = [ 'vnc=1, vnclisten=0.0.0.0']
+		 * which is nonsensical as there is no PV FB (there can be
+		 * a PVKB) running as HVM guest. */
+
+		if ((strncmp(xendev->nodename, "device/vkbd", 11) == 0))
+			return 0;
+
+		if ((strncmp(xendev->nodename, "device/vfb", 10) == 0))
+			return 0;
+	}
 	xendrv = to_xenbus_driver(dev->driver);
 	return (xendev->state < XenbusStateConnected ||
 		(xendev->state == XenbusStateConnected &&
 		 xendrv->is_ready && !xendrv->is_ready(xendev)));
 }
+static int essential_device_connecting(struct device *dev, void *data)
+{
+	return is_device_connecting(dev, data, true /* ignore PV[KBB+FB] */);
+}
+static int non_essential_device_connecting(struct device *dev, void *data)
+{
+	return is_device_connecting(dev, data, false);
+}
 
-static int exists_connecting_device(struct device_driver *drv)
+static int exists_essential_connecting_device(struct device_driver *drv)
 {
 	return bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
-				is_device_connecting);
+				essential_device_connecting);
+}
+static int exists_non_essential_connecting_device(struct device_driver *drv)
+{
+	return bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
+				non_essential_device_connecting);
 }
 
 static int print_device_status(struct device *dev, void *data)
@@ -189,6 +214,23 @@
 /* We only wait for device setup after most initcalls have run. */
 static int ready_to_wait_for_devices;
 
+static bool wait_loop(unsigned long start, unsigned int max_delay,
+		     unsigned int *seconds_waited)
+{
+	if (time_after(jiffies, start + (*seconds_waited+5)*HZ)) {
+		if (!*seconds_waited)
+			printk(KERN_WARNING "XENBUS: Waiting for "
+			       "devices to initialise: ");
+		*seconds_waited += 5;
+		printk("%us...", max_delay - *seconds_waited);
+		if (*seconds_waited == max_delay)
+			return true;
+	}
+
+	schedule_timeout_interruptible(HZ/10);
+
+	return false;
+}
 /*
  * On a 5-minute timeout, wait for all devices currently configured.  We need
  * to do this to guarantee that the filesystems and / or network devices
@@ -212,19 +254,14 @@
 	if (!ready_to_wait_for_devices || !xen_domain())
 		return;
 
-	while (exists_connecting_device(drv)) {
-		if (time_after(jiffies, start + (seconds_waited+5)*HZ)) {
-			if (!seconds_waited)
-				printk(KERN_WARNING "XENBUS: Waiting for "
-				       "devices to initialise: ");
-			seconds_waited += 5;
-			printk("%us...", 300 - seconds_waited);
-			if (seconds_waited == 300)
-				break;
-		}
+	while (exists_non_essential_connecting_device(drv))
+		if (wait_loop(start, 30, &seconds_waited))
+			break;
 
-		schedule_timeout_interruptible(HZ/10);
-	}
+	/* Skips PVKB and PVFB check.*/
+	while (exists_essential_connecting_device(drv))
+		if (wait_loop(start, 270, &seconds_waited))
+			break;
 
 	if (seconds_waited)
 		printk("\n");
diff -druN linux-libre-3.0.29-gnu/fs/btrfs/ctree.h linux-libre-3.0.30-gnu/fs/btrfs/ctree.h
--- linux-libre-3.0.29-gnu/fs/btrfs/ctree.h	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/btrfs/ctree.h	2012-04-27 12:52:09.000000000 -0400
@@ -1972,7 +1972,7 @@
 
 static inline bool btrfs_root_readonly(struct btrfs_root *root)
 {
-	return root->root_item.flags & BTRFS_ROOT_SUBVOL_RDONLY;
+	return (root->root_item.flags & cpu_to_le64(BTRFS_ROOT_SUBVOL_RDONLY)) != 0;
 }
 
 /* struct btrfs_super_block */
diff -druN linux-libre-3.0.29-gnu/fs/eventpoll.c linux-libre-3.0.30-gnu/fs/eventpoll.c
--- linux-libre-3.0.29-gnu/fs/eventpoll.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/eventpoll.c	2012-04-27 12:52:09.000000000 -0400
@@ -988,6 +988,10 @@
 
 static int path_count_inc(int nests)
 {
+	/* Allow an arbitrary number of depth 1 paths */
+	if (nests == 0)
+		return 0;
+
 	if (++path_count[nests] > path_limits[nests])
 		return -1;
 	return 0;
diff -druN linux-libre-3.0.29-gnu/fs/ext4/extents.c linux-libre-3.0.30-gnu/fs/ext4/extents.c
--- linux-libre-3.0.29-gnu/fs/ext4/extents.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/ext4/extents.c	2012-04-27 12:52:09.000000000 -0400
@@ -2846,7 +2846,7 @@
 		if (err)
 			goto fix_extent_len;
 		/* update the extent length and mark as initialized */
-		ex->ee_len = cpu_to_le32(ee_len);
+		ex->ee_len = cpu_to_le16(ee_len);
 		ext4_ext_try_to_merge(inode, path, ex);
 		err = ext4_ext_dirty(handle, inode, path + depth);
 		goto out;
diff -druN linux-libre-3.0.29-gnu/fs/jbd2/commit.c linux-libre-3.0.30-gnu/fs/jbd2/commit.c
--- linux-libre-3.0.29-gnu/fs/jbd2/commit.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/jbd2/commit.c	2012-04-27 12:52:09.000000000 -0400
@@ -683,7 +683,7 @@
 	if (commit_transaction->t_need_data_flush &&
 	    (journal->j_fs_dev != journal->j_dev) &&
 	    (journal->j_flags & JBD2_BARRIER))
-		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
+		blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL);
 
 	/* Done it all: now write the commit record asynchronously. */
 	if (JBD2_HAS_INCOMPAT_FEATURE(journal,
@@ -819,7 +819,7 @@
 	if (JBD2_HAS_INCOMPAT_FEATURE(journal,
 				      JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) &&
 	    journal->j_flags & JBD2_BARRIER) {
-		blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL);
+		blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL);
 	}
 
 	if (err)
diff -druN linux-libre-3.0.29-gnu/fs/lockd/clnt4xdr.c linux-libre-3.0.30-gnu/fs/lockd/clnt4xdr.c
--- linux-libre-3.0.29-gnu/fs/lockd/clnt4xdr.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/lockd/clnt4xdr.c	2012-04-27 12:52:09.000000000 -0400
@@ -241,7 +241,7 @@
 	p = xdr_inline_decode(xdr, 4);
 	if (unlikely(p == NULL))
 		goto out_overflow;
-	if (unlikely(*p > nlm4_failed))
+	if (unlikely(ntohl(*p) > ntohl(nlm4_failed)))
 		goto out_bad_xdr;
 	*stat = *p;
 	return 0;
diff -druN linux-libre-3.0.29-gnu/fs/lockd/clntxdr.c linux-libre-3.0.30-gnu/fs/lockd/clntxdr.c
--- linux-libre-3.0.29-gnu/fs/lockd/clntxdr.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/lockd/clntxdr.c	2012-04-27 12:52:09.000000000 -0400
@@ -236,7 +236,7 @@
 	p = xdr_inline_decode(xdr, 4);
 	if (unlikely(p == NULL))
 		goto out_overflow;
-	if (unlikely(*p > nlm_lck_denied_grace_period))
+	if (unlikely(ntohl(*p) > ntohl(nlm_lck_denied_grace_period)))
 		goto out_enum;
 	*stat = *p;
 	return 0;
diff -druN linux-libre-3.0.29-gnu/fs/nfsd/nfs3xdr.c linux-libre-3.0.30-gnu/fs/nfsd/nfs3xdr.c
--- linux-libre-3.0.29-gnu/fs/nfsd/nfs3xdr.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/nfsd/nfs3xdr.c	2012-04-27 12:52:09.000000000 -0400
@@ -803,13 +803,13 @@
 	return p;
 }
 
-static int
+static __be32
 compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,
 		const char *name, int namlen)
 {
 	struct svc_export	*exp;
 	struct dentry		*dparent, *dchild;
-	int rv = 0;
+	__be32 rv = nfserr_noent;
 
 	dparent = cd->fh.fh_dentry;
 	exp  = cd->fh.fh_export;
@@ -817,26 +817,20 @@
 	if (isdotent(name, namlen)) {
 		if (namlen == 2) {
 			dchild = dget_parent(dparent);
-			if (dchild == dparent) {
-				/* filesystem root - cannot return filehandle for ".." */
-				dput(dchild);
-				return -ENOENT;
-			}
+			/* filesystem root - cannot return filehandle for ".." */
+			if (dchild == dparent)
+				goto out;
 		} else
 			dchild = dget(dparent);
 	} else
 		dchild = lookup_one_len(name, dparent, namlen);
 	if (IS_ERR(dchild))
-		return -ENOENT;
-	rv = -ENOENT;
+		return rv;
 	if (d_mountpoint(dchild))
 		goto out;
-	rv = fh_compose(fhp, exp, dchild, &cd->fh);
-	if (rv)
-		goto out;
 	if (!dchild->d_inode)
 		goto out;
-	rv = 0;
+	rv = fh_compose(fhp, exp, dchild, &cd->fh);
 out:
 	dput(dchild);
 	return rv;
@@ -845,7 +839,7 @@
 static __be32 *encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, int namlen)
 {
 	struct svc_fh	fh;
-	int err;
+	__be32 err;
 
 	fh_init(&fh, NFS3_FHSIZE);
 	err = compose_entry_fh(cd, &fh, name, namlen);
diff -druN linux-libre-3.0.29-gnu/fs/ocfs2/alloc.c linux-libre-3.0.30-gnu/fs/ocfs2/alloc.c
--- linux-libre-3.0.29-gnu/fs/ocfs2/alloc.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/ocfs2/alloc.c	2012-04-27 12:52:09.000000000 -0400
@@ -1134,7 +1134,7 @@
 	}
 
 	el = path_leaf_el(path);
-	rec = &el->l_recs[le32_to_cpu(el->l_next_free_rec) - 1];
+	rec = &el->l_recs[le16_to_cpu(el->l_next_free_rec) - 1];
 
 	ocfs2_adjust_rightmost_records(handle, et, path, rec);
 
diff -druN linux-libre-3.0.29-gnu/fs/ocfs2/refcounttree.c linux-libre-3.0.30-gnu/fs/ocfs2/refcounttree.c
--- linux-libre-3.0.29-gnu/fs/ocfs2/refcounttree.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/ocfs2/refcounttree.c	2012-04-27 12:52:09.000000000 -0400
@@ -1036,14 +1036,14 @@
 
 	tmp_el = left_path->p_node[subtree_root].el;
 	blkno = left_path->p_node[subtree_root+1].bh->b_blocknr;
-	for (i = 0; i < le32_to_cpu(tmp_el->l_next_free_rec); i++) {
+	for (i = 0; i < le16_to_cpu(tmp_el->l_next_free_rec); i++) {
 		if (le64_to_cpu(tmp_el->l_recs[i].e_blkno) == blkno) {
 			*cpos_end = le32_to_cpu(tmp_el->l_recs[i+1].e_cpos);
 			break;
 		}
 	}
 
-	BUG_ON(i == le32_to_cpu(tmp_el->l_next_free_rec));
+	BUG_ON(i == le16_to_cpu(tmp_el->l_next_free_rec));
 
 out:
 	ocfs2_free_path(left_path);
@@ -1468,7 +1468,7 @@
 
 	trace_ocfs2_divide_leaf_refcount_block(
 		(unsigned long long)ref_leaf_bh->b_blocknr,
-		le32_to_cpu(rl->rl_count), le32_to_cpu(rl->rl_used));
+		le16_to_cpu(rl->rl_count), le16_to_cpu(rl->rl_used));
 
 	/*
 	 * XXX: Improvement later.
@@ -2411,7 +2411,7 @@
 				rb = (struct ocfs2_refcount_block *)
 							prev_bh->b_data;
 
-				if (le64_to_cpu(rb->rf_records.rl_used) +
+				if (le16_to_cpu(rb->rf_records.rl_used) +
 				    recs_add >
 				    le16_to_cpu(rb->rf_records.rl_count))
 					ref_blocks++;
@@ -2476,7 +2476,7 @@
 	if (prev_bh) {
 		rb = (struct ocfs2_refcount_block *)prev_bh->b_data;
 
-		if (le64_to_cpu(rb->rf_records.rl_used) + recs_add >
+		if (le16_to_cpu(rb->rf_records.rl_used) + recs_add >
 		    le16_to_cpu(rb->rf_records.rl_count))
 			ref_blocks++;
 
@@ -3629,7 +3629,7 @@
 			 * one will split a refcount rec, so totally we need
 			 * clusters * 2 new refcount rec.
 			 */
-			if (le64_to_cpu(rb->rf_records.rl_used) + clusters * 2 >
+			if (le16_to_cpu(rb->rf_records.rl_used) + clusters * 2 >
 			    le16_to_cpu(rb->rf_records.rl_count))
 				ref_blocks++;
 
diff -druN linux-libre-3.0.29-gnu/fs/ocfs2/suballoc.c linux-libre-3.0.30-gnu/fs/ocfs2/suballoc.c
--- linux-libre-3.0.29-gnu/fs/ocfs2/suballoc.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/ocfs2/suballoc.c	2012-04-27 12:52:09.000000000 -0400
@@ -600,7 +600,7 @@
 		ret = ocfs2_free_clusters(handle, cluster_ac->ac_inode,
 					  cluster_ac->ac_bh,
 					  le64_to_cpu(rec->e_blkno),
-					  le32_to_cpu(rec->e_leaf_clusters));
+					  le16_to_cpu(rec->e_leaf_clusters));
 		if (ret)
 			mlog_errno(ret);
 		/* Try all the clusters to free */
@@ -1628,7 +1628,7 @@
 {
 	unsigned int bpc = le16_to_cpu(cl->cl_bpc);
 	unsigned int bitoff = le32_to_cpu(rec->e_cpos) * bpc;
-	unsigned int bitcount = le32_to_cpu(rec->e_leaf_clusters) * bpc;
+	unsigned int bitcount = le16_to_cpu(rec->e_leaf_clusters) * bpc;
 
 	if (res->sr_bit_offset < bitoff)
 		return 0;
diff -druN linux-libre-3.0.29-gnu/fs/splice.c linux-libre-3.0.30-gnu/fs/splice.c
--- linux-libre-3.0.29-gnu/fs/splice.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/fs/splice.c	2012-04-27 12:52:09.000000000 -0400
@@ -31,6 +31,7 @@
 #include <linux/uio.h>
 #include <linux/security.h>
 #include <linux/gfp.h>
+#include <linux/socket.h>
 
 /*
  * Attempt to steal a page from a pipe buffer. This should perhaps go into
@@ -691,7 +692,9 @@
 	if (!likely(file->f_op && file->f_op->sendpage))
 		return -EINVAL;
 
-	more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len;
+	more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
+	if (sd->len < sd->total_len)
+		more |= MSG_SENDPAGE_NOTLAST;
 	return file->f_op->sendpage(file, buf->page, buf->offset,
 				    sd->len, &pos, more);
 }
diff -druN linux-libre-3.0.29-gnu/include/linux/socket.h linux-libre-3.0.30-gnu/include/linux/socket.h
--- linux-libre-3.0.29-gnu/include/linux/socket.h	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/include/linux/socket.h	2012-04-27 12:52:09.000000000 -0400
@@ -261,7 +261,7 @@
 #define MSG_NOSIGNAL	0x4000	/* Do not generate SIGPIPE */
 #define MSG_MORE	0x8000	/* Sender will send more */
 #define MSG_WAITFORONE	0x10000	/* recvmmsg(): block until 1+ packets avail */
-
+#define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */
 #define MSG_EOF         MSG_FIN
 
 #define MSG_CMSG_CLOEXEC 0x40000000	/* Set close_on_exit for file
diff -druN linux-libre-3.0.29-gnu/Makefile linux-libre-3.0.30-gnu/Makefile
--- linux-libre-3.0.29-gnu/Makefile	2012-04-23 17:45:44.000000000 -0400
+++ linux-libre-3.0.30-gnu/Makefile	2012-04-27 16:03:41.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 0
-SUBLEVEL = 29
+SUBLEVEL = 30
 EXTRAVERSION =-gnu
 NAME = Sneaky Weasel
 
diff -druN linux-libre-3.0.29-gnu/mm/swap_state.c linux-libre-3.0.30-gnu/mm/swap_state.c
--- linux-libre-3.0.29-gnu/mm/swap_state.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/mm/swap_state.c	2012-04-27 12:52:09.000000000 -0400
@@ -28,7 +28,7 @@
  */
 static const struct address_space_operations swap_aops = {
 	.writepage	= swap_writepage,
-	.set_page_dirty	= __set_page_dirty_nobuffers,
+	.set_page_dirty	= __set_page_dirty_no_writeback,
 	.migratepage	= migrate_page,
 };
 
diff -druN linux-libre-3.0.29-gnu/net/ax25/af_ax25.c linux-libre-3.0.30-gnu/net/ax25/af_ax25.c
--- linux-libre-3.0.29-gnu/net/ax25/af_ax25.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/ax25/af_ax25.c	2012-04-27 12:52:09.000000000 -0400
@@ -2006,16 +2006,17 @@
 	proc_net_remove(&init_net, "ax25_route");
 	proc_net_remove(&init_net, "ax25");
 	proc_net_remove(&init_net, "ax25_calls");
-	ax25_rt_free();
-	ax25_uid_free();
-	ax25_dev_free();
 
-	ax25_unregister_sysctl();
 	unregister_netdevice_notifier(&ax25_dev_notifier);
+	ax25_unregister_sysctl();
 
 	dev_remove_pack(&ax25_packet_type);
 
 	sock_unregister(PF_AX25);
 	proto_unregister(&ax25_proto);
+
+	ax25_rt_free();
+	ax25_uid_free();
+	ax25_dev_free();
 }
 module_exit(ax25_exit);
diff -druN linux-libre-3.0.29-gnu/net/bridge/br_multicast.c linux-libre-3.0.30-gnu/net/bridge/br_multicast.c
--- linux-libre-3.0.29-gnu/net/bridge/br_multicast.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/bridge/br_multicast.c	2012-04-27 12:52:09.000000000 -0400
@@ -241,7 +241,6 @@
 	hlist_del_rcu(&mp->hlist[mdb->ver]);
 	mdb->size--;
 
-	del_timer(&mp->query_timer);
 	call_rcu_bh(&mp->rcu, br_multicast_free_group);
 
 out:
@@ -271,7 +270,6 @@
 		rcu_assign_pointer(*pp, p->next);
 		hlist_del_init(&p->mglist);
 		del_timer(&p->timer);
-		del_timer(&p->query_timer);
 		call_rcu_bh(&p->rcu, br_multicast_free_pg);
 
 		if (!mp->ports && !mp->mglist &&
@@ -507,74 +505,6 @@
 	return NULL;
 }
 
-static void br_multicast_send_group_query(struct net_bridge_mdb_entry *mp)
-{
-	struct net_bridge *br = mp->br;
-	struct sk_buff *skb;
-
-	skb = br_multicast_alloc_query(br, &mp->addr);
-	if (!skb)
-		goto timer;
-
-	netif_rx(skb);
-
-timer:
-	if (++mp->queries_sent < br->multicast_last_member_count)
-		mod_timer(&mp->query_timer,
-			  jiffies + br->multicast_last_member_interval);
-}
-
-static void br_multicast_group_query_expired(unsigned long data)
-{
-	struct net_bridge_mdb_entry *mp = (void *)data;
-	struct net_bridge *br = mp->br;
-
-	spin_lock(&br->multicast_lock);
-	if (!netif_running(br->dev) || !mp->mglist ||
-	    mp->queries_sent >= br->multicast_last_member_count)
-		goto out;
-
-	br_multicast_send_group_query(mp);
-
-out:
-	spin_unlock(&br->multicast_lock);
-}
-
-static void br_multicast_send_port_group_query(struct net_bridge_port_group *pg)
-{
-	struct net_bridge_port *port = pg->port;
-	struct net_bridge *br = port->br;
-	struct sk_buff *skb;
-
-	skb = br_multicast_alloc_query(br, &pg->addr);
-	if (!skb)
-		goto timer;
-
-	br_deliver(port, skb);
-
-timer:
-	if (++pg->queries_sent < br->multicast_last_member_count)
-		mod_timer(&pg->query_timer,
-			  jiffies + br->multicast_last_member_interval);
-}
-
-static void br_multicast_port_group_query_expired(unsigned long data)
-{
-	struct net_bridge_port_group *pg = (void *)data;
-	struct net_bridge_port *port = pg->port;
-	struct net_bridge *br = port->br;
-
-	spin_lock(&br->multicast_lock);
-	if (!netif_running(br->dev) || hlist_unhashed(&pg->mglist) ||
-	    pg->queries_sent >= br->multicast_last_member_count)
-		goto out;
-
-	br_multicast_send_port_group_query(pg);
-
-out:
-	spin_unlock(&br->multicast_lock);
-}
-
 static struct net_bridge_mdb_entry *br_multicast_get_group(
 	struct net_bridge *br, struct net_bridge_port *port,
 	struct br_ip *group, int hash)
@@ -690,8 +620,6 @@
 	mp->addr = *group;
 	setup_timer(&mp->timer, br_multicast_group_expired,
 		    (unsigned long)mp);
-	setup_timer(&mp->query_timer, br_multicast_group_query_expired,
-		    (unsigned long)mp);
 
 	hlist_add_head_rcu(&mp->hlist[mdb->ver], &mdb->mhash[hash]);
 	mdb->size++;
@@ -746,8 +674,6 @@
 	hlist_add_head(&p->mglist, &port->mglist);
 	setup_timer(&p->timer, br_multicast_port_group_expired,
 		    (unsigned long)p);
-	setup_timer(&p->query_timer, br_multicast_port_group_query_expired,
-		    (unsigned long)p);
 
 	rcu_assign_pointer(*pp, p);
 
@@ -1291,9 +1217,6 @@
 		     time_after(mp->timer.expires, time) :
 		     try_to_del_timer_sync(&mp->timer) >= 0)) {
 			mod_timer(&mp->timer, time);
-
-			mp->queries_sent = 0;
-			mod_timer(&mp->query_timer, now);
 		}
 
 		goto out;
@@ -1310,9 +1233,6 @@
 		     time_after(p->timer.expires, time) :
 		     try_to_del_timer_sync(&p->timer) >= 0)) {
 			mod_timer(&p->timer, time);
-
-			p->queries_sent = 0;
-			mod_timer(&p->query_timer, now);
 		}
 
 		break;
@@ -1678,7 +1598,6 @@
 		hlist_for_each_entry_safe(mp, p, n, &mdb->mhash[i],
 					  hlist[ver]) {
 			del_timer(&mp->timer);
-			del_timer(&mp->query_timer);
 			call_rcu_bh(&mp->rcu, br_multicast_free_group);
 		}
 	}
diff -druN linux-libre-3.0.29-gnu/net/bridge/br_private.h linux-libre-3.0.30-gnu/net/bridge/br_private.h
--- linux-libre-3.0.29-gnu/net/bridge/br_private.h	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/bridge/br_private.h	2012-04-27 12:52:09.000000000 -0400
@@ -77,9 +77,7 @@
 	struct hlist_node		mglist;
 	struct rcu_head			rcu;
 	struct timer_list		timer;
-	struct timer_list		query_timer;
 	struct br_ip			addr;
-	u32				queries_sent;
 };
 
 struct net_bridge_mdb_entry
@@ -89,10 +87,8 @@
 	struct net_bridge_port_group __rcu *ports;
 	struct rcu_head			rcu;
 	struct timer_list		timer;
-	struct timer_list		query_timer;
 	struct br_ip			addr;
 	bool				mglist;
-	u32				queries_sent;
 };
 
 struct net_bridge_mdb_htable
diff -druN linux-libre-3.0.29-gnu/net/core/net_namespace.c linux-libre-3.0.30-gnu/net/core/net_namespace.c
--- linux-libre-3.0.29-gnu/net/core/net_namespace.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/core/net_namespace.c	2012-04-27 12:52:09.000000000 -0400
@@ -82,21 +82,29 @@
 
 static int ops_init(const struct pernet_operations *ops, struct net *net)
 {
-	int err;
+	int err = -ENOMEM;
+	void *data = NULL;
+
 	if (ops->id && ops->size) {
-		void *data = kzalloc(ops->size, GFP_KERNEL);
+		data = kzalloc(ops->size, GFP_KERNEL);
 		if (!data)
-			return -ENOMEM;
+			goto out;
 
 		err = net_assign_generic(net, *ops->id, data);
-		if (err) {
-			kfree(data);
-			return err;
-		}
+		if (err)
+			goto cleanup;
 	}
+	err = 0;
 	if (ops->init)
-		return ops->init(net);
-	return 0;
+		err = ops->init(net);
+	if (!err)
+		return 0;
+
+cleanup:
+	kfree(data);
+
+out:
+	return err;
 }
 
 static void ops_free(const struct pernet_operations *ops, struct net *net)
@@ -446,12 +454,7 @@
 static int __register_pernet_operations(struct list_head *list,
 					struct pernet_operations *ops)
 {
-	int err = 0;
-	err = ops_init(ops, &init_net);
-	if (err)
-		ops_free(ops, &init_net);
-	return err;
-	
+	return ops_init(ops, &init_net);
 }
 
 static void __unregister_pernet_operations(struct pernet_operations *ops)
diff -druN linux-libre-3.0.29-gnu/net/core/skbuff.c linux-libre-3.0.30-gnu/net/core/skbuff.c
--- linux-libre-3.0.29-gnu/net/core/skbuff.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/core/skbuff.c	2012-04-27 12:52:09.000000000 -0400
@@ -2985,6 +2985,8 @@
  */
 int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
 {
+	int len = skb->len;
+
 	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
 	    (unsigned)sk->sk_rcvbuf)
 		return -ENOMEM;
@@ -2999,7 +3001,7 @@
 
 	skb_queue_tail(&sk->sk_error_queue, skb);
 	if (!sock_flag(sk, SOCK_DEAD))
-		sk->sk_data_ready(sk, skb->len);
+		sk->sk_data_ready(sk, len);
 	return 0;
 }
 EXPORT_SYMBOL(sock_queue_err_skb);
diff -druN linux-libre-3.0.29-gnu/net/ipv4/tcp.c linux-libre-3.0.30-gnu/net/ipv4/tcp.c
--- linux-libre-3.0.29-gnu/net/ipv4/tcp.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/ipv4/tcp.c	2012-04-27 12:52:09.000000000 -0400
@@ -860,7 +860,7 @@
 	}
 
 out:
-	if (copied)
+	if (copied && !(flags & MSG_SENDPAGE_NOTLAST))
 		tcp_push(sk, flags, mss_now, tp->nonagle);
 	return copied;
 
diff -druN linux-libre-3.0.29-gnu/net/ipv4/tcp_input.c linux-libre-3.0.30-gnu/net/ipv4/tcp_input.c
--- linux-libre-3.0.29-gnu/net/ipv4/tcp_input.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/ipv4/tcp_input.c	2012-04-27 12:52:09.000000000 -0400
@@ -328,6 +328,7 @@
 			incr = __tcp_grow_window(sk, skb);
 
 		if (incr) {
+			incr = max_t(int, incr, 2 * skb->len);
 			tp->rcv_ssthresh = min(tp->rcv_ssthresh + incr,
 					       tp->window_clamp);
 			inet_csk(sk)->icsk_ack.quick |= 1;
@@ -460,8 +461,11 @@
 		if (!win_dep) {
 			m -= (new_sample >> 3);
 			new_sample += m;
-		} else if (m < new_sample)
-			new_sample = m << 3;
+		} else {
+			m <<= 3;
+			if (m < new_sample)
+				new_sample = m;
+		}
 	} else {
 		/* No previous measure. */
 		new_sample = m << 3;
diff -druN linux-libre-3.0.29-gnu/net/ipv6/mcast.c linux-libre-3.0.30-gnu/net/ipv6/mcast.c
--- linux-libre-3.0.29-gnu/net/ipv6/mcast.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/ipv6/mcast.c	2012-04-27 12:52:09.000000000 -0400
@@ -2054,7 +2054,7 @@
 		if (!delta)
 			pmc->mca_sfcount[sfmode]--;
 		for (j=0; j<i; j++)
-			(void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
+			ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
 	} else if (isexclude != (pmc->mca_sfcount[MCAST_EXCLUDE] != 0)) {
 		struct ip6_sf_list *psf;
 
diff -druN linux-libre-3.0.29-gnu/net/ipv6/tcp_ipv6.c linux-libre-3.0.30-gnu/net/ipv6/tcp_ipv6.c
--- linux-libre-3.0.29-gnu/net/ipv6/tcp_ipv6.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/ipv6/tcp_ipv6.c	2012-04-27 12:52:09.000000000 -0400
@@ -1514,6 +1514,10 @@
 	tcp_mtup_init(newsk);
 	tcp_sync_mss(newsk, dst_mtu(dst));
 	newtp->advmss = dst_metric_advmss(dst);
+	if (tcp_sk(sk)->rx_opt.user_mss &&
+	    tcp_sk(sk)->rx_opt.user_mss < newtp->advmss)
+		newtp->advmss = tcp_sk(sk)->rx_opt.user_mss;
+
 	tcp_initialize_rcv_mss(newsk);
 
 	newinet->inet_daddr = newinet->inet_saddr = LOOPBACK4_IPV6;
diff -druN linux-libre-3.0.29-gnu/net/netlink/af_netlink.c linux-libre-3.0.30-gnu/net/netlink/af_netlink.c
--- linux-libre-3.0.29-gnu/net/netlink/af_netlink.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/netlink/af_netlink.c	2012-04-27 12:52:09.000000000 -0400
@@ -830,12 +830,19 @@
 	return 0;
 }
 
-int netlink_sendskb(struct sock *sk, struct sk_buff *skb)
+static int __netlink_sendskb(struct sock *sk, struct sk_buff *skb)
 {
 	int len = skb->len;
 
 	skb_queue_tail(&sk->sk_receive_queue, skb);
 	sk->sk_data_ready(sk, len);
+	return len;
+}
+
+int netlink_sendskb(struct sock *sk, struct sk_buff *skb)
+{
+	int len = __netlink_sendskb(sk, skb);
+
 	sock_put(sk);
 	return len;
 }
@@ -960,8 +967,7 @@
 	if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf &&
 	    !test_bit(0, &nlk->state)) {
 		skb_set_owner_r(skb, sk);
-		skb_queue_tail(&sk->sk_receive_queue, skb);
-		sk->sk_data_ready(sk, skb->len);
+		__netlink_sendskb(sk, skb);
 		return atomic_read(&sk->sk_rmem_alloc) > sk->sk_rcvbuf;
 	}
 	return -1;
@@ -1682,10 +1688,8 @@
 
 		if (sk_filter(sk, skb))
 			kfree_skb(skb);
-		else {
-			skb_queue_tail(&sk->sk_receive_queue, skb);
-			sk->sk_data_ready(sk, skb->len);
-		}
+		else
+			__netlink_sendskb(sk, skb);
 		return 0;
 	}
 
@@ -1697,10 +1701,8 @@
 
 	if (sk_filter(sk, skb))
 		kfree_skb(skb);
-	else {
-		skb_queue_tail(&sk->sk_receive_queue, skb);
-		sk->sk_data_ready(sk, skb->len);
-	}
+	else
+		__netlink_sendskb(sk, skb);
 
 	if (cb->done)
 		cb->done(cb);
diff -druN linux-libre-3.0.29-gnu/net/phonet/pep.c linux-libre-3.0.30-gnu/net/phonet/pep.c
--- linux-libre-3.0.29-gnu/net/phonet/pep.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/phonet/pep.c	2012-04-27 12:52:09.000000000 -0400
@@ -1045,6 +1045,9 @@
 	int flags = msg->msg_flags;
 	int err, done;
 
+	if (len > USHRT_MAX)
+		return -EMSGSIZE;
+
 	if ((msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_NOSIGNAL|
 				MSG_CMSG_COMPAT)) ||
 			!(msg->msg_flags & MSG_EOR))
diff -druN linux-libre-3.0.29-gnu/net/sched/sch_gred.c linux-libre-3.0.30-gnu/net/sched/sch_gred.c
--- linux-libre-3.0.29-gnu/net/sched/sch_gred.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/sched/sch_gred.c	2012-04-27 12:52:09.000000000 -0400
@@ -544,11 +544,8 @@
 		opt.packets	= q->packetsin;
 		opt.bytesin	= q->bytesin;
 
-		if (gred_wred_mode(table)) {
-			q->parms.qidlestart =
-				table->tab[table->def]->parms.qidlestart;
-			q->parms.qavg = table->tab[table->def]->parms.qavg;
-		}
+		if (gred_wred_mode(table))
+			gred_load_wred_set(table, q);
 
 		opt.qave = red_calc_qavg(&q->parms, q->parms.qavg);
 
diff -druN linux-libre-3.0.29-gnu/net/sctp/socket.c linux-libre-3.0.30-gnu/net/sctp/socket.c
--- linux-libre-3.0.29-gnu/net/sctp/socket.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/sctp/socket.c	2012-04-27 12:52:09.000000000 -0400
@@ -4009,9 +4009,10 @@
 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
 				  int __user *optlen)
 {
-	if (len < sizeof(struct sctp_event_subscribe))
+	if (len <= 0)
 		return -EINVAL;
-	len = sizeof(struct sctp_event_subscribe);
+	if (len > sizeof(struct sctp_event_subscribe))
+		len = sizeof(struct sctp_event_subscribe);
 	if (put_user(len, optlen))
 		return -EFAULT;
 	if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
diff -druN linux-libre-3.0.29-gnu/net/socket.c linux-libre-3.0.30-gnu/net/socket.c
--- linux-libre-3.0.29-gnu/net/socket.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/socket.c	2012-04-27 12:52:09.000000000 -0400
@@ -791,9 +791,9 @@
 
 	sock = file->private_data;
 
-	flags = !(file->f_flags & O_NONBLOCK) ? 0 : MSG_DONTWAIT;
-	if (more)
-		flags |= MSG_MORE;
+	flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;
+	/* more is a combination of MSG_MORE and MSG_SENDPAGE_NOTLAST */
+	flags |= more;
 
 	return kernel_sendpage(sock, page, offset, size, flags);
 }
diff -druN linux-libre-3.0.29-gnu/net/wireless/util.c linux-libre-3.0.30-gnu/net/wireless/util.c
--- linux-libre-3.0.29-gnu/net/wireless/util.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/net/wireless/util.c	2012-04-27 12:52:09.000000000 -0400
@@ -990,7 +990,7 @@
 			if (rdev->wiphy.software_iftypes & BIT(iftype))
 				continue;
 			for (j = 0; j < c->n_limits; j++) {
-				if (!(limits[j].types & iftype))
+				if (!(limits[j].types & BIT(iftype)))
 					continue;
 				if (limits[j].max < num[iftype])
 					goto cont;
diff -druN linux-libre-3.0.29-gnu/sound/pci/hda/patch_conexant.c linux-libre-3.0.30-gnu/sound/pci/hda/patch_conexant.c
--- linux-libre-3.0.29-gnu/sound/pci/hda/patch_conexant.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/sound/pci/hda/patch_conexant.c	2012-04-27 12:52:09.000000000 -0400
@@ -4003,9 +4003,14 @@
 	int i;
 
 	mute_outputs(codec, spec->multiout.num_dacs, spec->multiout.dac_nids);
-	for (i = 0; i < cfg->hp_outs; i++)
+	for (i = 0; i < cfg->hp_outs; i++) {
+		unsigned int val = PIN_OUT;
+		if (snd_hda_query_pin_caps(codec, cfg->hp_pins[i]) &
+		    AC_PINCAP_HP_DRV)
+			val |= AC_PINCTL_HP_EN;
 		snd_hda_codec_write(codec, cfg->hp_pins[i], 0,
-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);
+				    AC_VERB_SET_PIN_WIDGET_CONTROL, val);
+	}
 	mute_outputs(codec, cfg->hp_outs, cfg->hp_pins);
 	mute_outputs(codec, cfg->line_outs, cfg->line_out_pins);
 	mute_outputs(codec, cfg->speaker_outs, cfg->speaker_pins);
diff -druN linux-libre-3.0.29-gnu/tools/perf/util/hist.c linux-libre-3.0.30-gnu/tools/perf/util/hist.c
--- linux-libre-3.0.29-gnu/tools/perf/util/hist.c	2012-04-22 19:29:03.000000000 -0400
+++ linux-libre-3.0.30-gnu/tools/perf/util/hist.c	2012-04-27 12:52:09.000000000 -0400
@@ -165,8 +165,8 @@
 			 * mis-adjust symbol addresses when computing
 			 * the history counter to increment.
 			 */
-			if (he->ms.map != entry->ms.map) {
-				he->ms.map = entry->ms.map;
+			if (he->ms.map != entry.ms.map) {
+				he->ms.map = entry.ms.map;
 				if (he->ms.map)
 					he->ms.map->referenced = true;
 			}
