diff -druNp linux-libre-3.4.53-gnu1/arch/arm/kernel/perf_event.c linux-libre-3.4.54-gnu1/arch/arm/kernel/perf_event.c
--- linux-libre-3.4.53-gnu1/arch/arm/kernel/perf_event.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/arch/arm/kernel/perf_event.c	2013-07-21 21:19:12.000000000 -0400
@@ -824,6 +824,7 @@ perf_callchain_user(struct perf_callchai
 	struct frame_tail __user *tail;
 
 
+	perf_callchain_store(entry, regs->ARM_pc);
 	tail = (struct frame_tail __user *)regs->ARM_fp - 1;
 
 	while ((entry->nr < PERF_MAX_STACK_DEPTH) &&
diff -druNp linux-libre-3.4.53-gnu1/arch/x86/xen/time.c linux-libre-3.4.54-gnu1/arch/x86/xen/time.c
--- linux-libre-3.4.53-gnu1/arch/x86/xen/time.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/arch/x86/xen/time.c	2013-07-21 21:19:12.000000000 -0400
@@ -36,9 +36,8 @@ static DEFINE_PER_CPU(struct vcpu_runsta
 /* snapshots of runstate info */
 static DEFINE_PER_CPU(struct vcpu_runstate_info, xen_runstate_snapshot);
 
-/* unused ns of stolen and blocked time */
+/* unused ns of stolen time */
 static DEFINE_PER_CPU(u64, xen_residual_stolen);
-static DEFINE_PER_CPU(u64, xen_residual_blocked);
 
 /* return an consistent snapshot of 64-bit time/counter value */
 static u64 get64(const u64 *p)
@@ -115,7 +114,7 @@ static void do_stolen_accounting(void)
 {
 	struct vcpu_runstate_info state;
 	struct vcpu_runstate_info *snap;
-	s64 blocked, runnable, offline, stolen;
+	s64 runnable, offline, stolen;
 	cputime_t ticks;
 
 	get_runstate_snapshot(&state);
@@ -125,7 +124,6 @@ static void do_stolen_accounting(void)
 	snap = &__get_cpu_var(xen_runstate_snapshot);
 
 	/* work out how much time the VCPU has not been runn*ing*  */
-	blocked = state.time[RUNSTATE_blocked] - snap->time[RUNSTATE_blocked];
 	runnable = state.time[RUNSTATE_runnable] - snap->time[RUNSTATE_runnable];
 	offline = state.time[RUNSTATE_offline] - snap->time[RUNSTATE_offline];
 
@@ -141,17 +139,6 @@ static void do_stolen_accounting(void)
 	ticks = iter_div_u64_rem(stolen, NS_PER_TICK, &stolen);
 	__this_cpu_write(xen_residual_stolen, stolen);
 	account_steal_ticks(ticks);
-
-	/* Add the appropriate number of ticks of blocked time,
-	   including any left-overs from last time. */
-	blocked += __this_cpu_read(xen_residual_blocked);
-
-	if (blocked < 0)
-		blocked = 0;
-
-	ticks = iter_div_u64_rem(blocked, NS_PER_TICK, &blocked);
-	__this_cpu_write(xen_residual_blocked, blocked);
-	account_idle_ticks(ticks);
 }
 
 /* Get the TSC speed from Xen */
diff -druNp linux-libre-3.4.53-gnu1/drivers/acpi/ec.c linux-libre-3.4.54-gnu1/drivers/acpi/ec.c
--- linux-libre-3.4.53-gnu1/drivers/acpi/ec.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/acpi/ec.c	2013-07-21 21:19:12.000000000 -0400
@@ -974,6 +974,10 @@ static struct dmi_system_id __initdata e
 	ec_enlarge_storm_threshold, "CLEVO hardware", {
 	DMI_MATCH(DMI_SYS_VENDOR, "CLEVO Co."),
 	DMI_MATCH(DMI_PRODUCT_NAME, "M720T/M730T"),}, NULL},
+	{
+	ec_skip_dsdt_scan, "HP Folio 13", {
+	DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+	DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL},
 	{},
 };
 
diff -druNp linux-libre-3.4.53-gnu1/drivers/ata/ahci.c linux-libre-3.4.54-gnu1/drivers/ata/ahci.c
--- linux-libre-3.4.53-gnu1/drivers/ata/ahci.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/ata/ahci.c	2013-07-21 21:19:12.000000000 -0400
@@ -284,6 +284,7 @@ static const struct pci_device_id ahci_p
 
 	/* AMD */
 	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */
+	{ PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */
 	/* AMD is using RAID class only for ahci controllers */
 	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
 	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci },
diff -druNp linux-libre-3.4.53-gnu1/drivers/ata/libahci.c linux-libre-3.4.54-gnu1/drivers/ata/libahci.c
--- linux-libre-3.4.53-gnu1/drivers/ata/libahci.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/ata/libahci.c	2013-07-21 21:19:12.000000000 -0400
@@ -1543,8 +1543,7 @@ static void ahci_error_intr(struct ata_p
 		u32 fbs = readl(port_mmio + PORT_FBS);
 		int pmp = fbs >> PORT_FBS_DWE_OFFSET;
 
-		if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links) &&
-		    ata_link_online(&ap->pmp_link[pmp])) {
+		if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links)) {
 			link = &ap->pmp_link[pmp];
 			fbs_need_dec = true;
 		}
diff -druNp linux-libre-3.4.53-gnu1/drivers/dma/pl330.c linux-libre-3.4.54-gnu1/drivers/dma/pl330.c
--- linux-libre-3.4.53-gnu1/drivers/dma/pl330.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/dma/pl330.c	2013-07-21 21:19:12.000000000 -0400
@@ -2469,10 +2469,10 @@ static void pl330_free_chan_resources(st
 	struct dma_pl330_chan *pch = to_pchan(chan);
 	unsigned long flags;
 
-	spin_lock_irqsave(&pch->lock, flags);
-
 	tasklet_kill(&pch->task);
 
+	spin_lock_irqsave(&pch->lock, flags);
+
 	pl330_release_channel(pch->pl330_chid);
 	pch->pl330_chid = NULL;
 
diff -druNp linux-libre-3.4.53-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c linux-libre-3.4.54-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
--- linux-libre-3.4.53-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c	2013-07-21 21:19:12.000000000 -0400
@@ -104,7 +104,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(
 			tx_agc[RF90_PATH_A] = 0x10101010;
 			tx_agc[RF90_PATH_B] = 0x10101010;
 		} else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
-			   TXHIGHPWRLEVEL_LEVEL1) {
+			   TXHIGHPWRLEVEL_LEVEL2) {
 			tx_agc[RF90_PATH_A] = 0x00000000;
 			tx_agc[RF90_PATH_B] = 0x00000000;
 		} else{
diff -druNp linux-libre-3.4.53-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c linux-libre-3.4.54-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
--- linux-libre-3.4.53-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c	2013-07-13 18:27:23.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c	2013-07-21 23:00:58.000000000 -0400
@@ -357,6 +357,7 @@ static struct usb_device_id rtl8192c_usb
 	{RTL_USB_DEVICE(0x2001, 0x330a, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/
 	{RTL_USB_DEVICE(0x2019, 0xab2b, rtl92cu_hal_cfg)}, /*Planex -Abocom*/
 	{RTL_USB_DEVICE(0x20f4, 0x624d, rtl92cu_hal_cfg)}, /*TRENDNet*/
+	{RTL_USB_DEVICE(0x2357, 0x0100, rtl92cu_hal_cfg)}, /*TP-Link WN8200ND*/
 	{RTL_USB_DEVICE(0x7392, 0x7822, rtl92cu_hal_cfg)}, /*Edimax -Edimax*/
 	{}
 };
diff -druNp linux-libre-3.4.53-gnu1/drivers/pci/quirks.c linux-libre-3.4.54-gnu1/drivers/pci/quirks.c
--- linux-libre-3.4.53-gnu1/drivers/pci/quirks.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/pci/quirks.c	2013-07-21 21:19:12.000000000 -0400
@@ -1062,6 +1062,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE, quirk_amd_ide_mode);
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x7900, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, 0x7900, quirk_amd_ide_mode);
 
 /*
  *	Serverworks CSB5 IDE does not fully support native mode
diff -druNp linux-libre-3.4.53-gnu1/drivers/pcmcia/at91_cf.c linux-libre-3.4.54-gnu1/drivers/pcmcia/at91_cf.c
--- linux-libre-3.4.53-gnu1/drivers/pcmcia/at91_cf.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/pcmcia/at91_cf.c	2013-07-21 21:19:12.000000000 -0400
@@ -100,9 +100,9 @@ static int at91_cf_get_status(struct pcm
 		int vcc	= gpio_is_valid(cf->board->vcc_pin);
 
 		*sp = SS_DETECT | SS_3VCARD;
-		if (!rdy || gpio_get_value(rdy))
+		if (!rdy || gpio_get_value(cf->board->irq_pin))
 			*sp |= SS_READY;
-		if (!vcc || gpio_get_value(vcc))
+		if (!vcc || gpio_get_value(cf->board->vcc_pin))
 			*sp |= SS_POWERON;
 	} else
 		*sp = 0;
diff -druNp linux-libre-3.4.53-gnu1/drivers/rtc/rtc-rv3029c2.c linux-libre-3.4.54-gnu1/drivers/rtc/rtc-rv3029c2.c
--- linux-libre-3.4.53-gnu1/drivers/rtc/rtc-rv3029c2.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/rtc/rtc-rv3029c2.c	2013-07-21 21:19:12.000000000 -0400
@@ -310,7 +310,7 @@ static int rv3029c2_rtc_i2c_set_alarm(st
 		dev_dbg(&client->dev, "alarm IRQ armed\n");
 	} else {
 		/* disable AIE irq */
-		ret = rv3029c2_rtc_i2c_alarm_set_irq(client, 1);
+		ret = rv3029c2_rtc_i2c_alarm_set_irq(client, 0);
 		if (ret)
 			return ret;
 
diff -druNp linux-libre-3.4.53-gnu1/drivers/usb/gadget/f_mass_storage.c linux-libre-3.4.54-gnu1/drivers/usb/gadget/f_mass_storage.c
--- linux-libre-3.4.53-gnu1/drivers/usb/gadget/f_mass_storage.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/usb/gadget/f_mass_storage.c	2013-07-21 21:19:12.000000000 -0400
@@ -511,6 +511,7 @@ static int fsg_set_halt(struct fsg_dev *
 /* Caller must hold fsg->lock */
 static void wakeup_thread(struct fsg_common *common)
 {
+	smp_wmb();	/* ensure the write of bh->state is complete */
 	/* Tell the main thread that something has happened */
 	common->thread_wakeup_needed = 1;
 	if (common->thread_task)
@@ -730,6 +731,7 @@ static int sleep_thread(struct fsg_commo
 	}
 	__set_current_state(TASK_RUNNING);
 	common->thread_wakeup_needed = 0;
+	smp_rmb();	/* ensure the latest bh->state is visible */
 	return rc;
 }
 
diff -druNp linux-libre-3.4.53-gnu1/drivers/usb/host/xhci-mem.c linux-libre-3.4.54-gnu1/drivers/usb/host/xhci-mem.c
--- linux-libre-3.4.53-gnu1/drivers/usb/host/xhci-mem.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/usb/host/xhci-mem.c	2013-07-21 21:19:12.000000000 -0400
@@ -369,6 +369,10 @@ static struct xhci_container_ctx *xhci_a
 		ctx->size += CTX_SIZE(xhci->hcc_params);
 
 	ctx->bytes = dma_pool_alloc(xhci->device_pool, flags, &ctx->dma);
+	if (!ctx->bytes) {
+		kfree(ctx);
+		return NULL;
+	}
 	memset(ctx->bytes, 0, ctx->size);
 	return ctx;
 }
diff -druNp linux-libre-3.4.53-gnu1/drivers/usb/host/xhci-plat.c linux-libre-3.4.54-gnu1/drivers/usb/host/xhci-plat.c
--- linux-libre-3.4.53-gnu1/drivers/usb/host/xhci-plat.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/usb/host/xhci-plat.c	2013-07-21 21:19:12.000000000 -0400
@@ -179,6 +179,7 @@ static int xhci_plat_remove(struct platf
 
 	usb_remove_hcd(hcd);
 	iounmap(hcd->regs);
+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 	usb_put_hcd(hcd);
 	kfree(xhci);
 
diff -druNp linux-libre-3.4.53-gnu1/drivers/usb/serial/option.c linux-libre-3.4.54-gnu1/drivers/usb/serial/option.c
--- linux-libre-3.4.53-gnu1/drivers/usb/serial/option.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/usb/serial/option.c	2013-07-21 21:19:12.000000000 -0400
@@ -159,8 +159,6 @@ static void option_instat_callback(struc
 #define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED	0x9000
 #define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED	0x9001
 #define NOVATELWIRELESS_PRODUCT_E362		0x9010
-#define NOVATELWIRELESS_PRODUCT_G1		0xA001
-#define NOVATELWIRELESS_PRODUCT_G1_M		0xA002
 #define NOVATELWIRELESS_PRODUCT_G2		0xA010
 #define NOVATELWIRELESS_PRODUCT_MC551		0xB001
 
@@ -744,8 +742,6 @@ static const struct usb_device_id option
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC547) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) },
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1) },
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1_M) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) },
 	/* Novatel Ovation MC551 a.k.a. Verizon USB551L */
 	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) },
diff -druNp linux-libre-3.4.53-gnu1/drivers/usb/serial/qcserial.c linux-libre-3.4.54-gnu1/drivers/usb/serial/qcserial.c
--- linux-libre-3.4.53-gnu1/drivers/usb/serial/qcserial.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/drivers/usb/serial/qcserial.c	2013-07-21 21:19:12.000000000 -0400
@@ -37,7 +37,13 @@ static const struct usb_device_id id_tab
 	{DEVICE_G1K(0x04da, 0x250c)},	/* Panasonic Gobi QDL device */
 	{DEVICE_G1K(0x413c, 0x8172)},	/* Dell Gobi Modem device */
 	{DEVICE_G1K(0x413c, 0x8171)},	/* Dell Gobi QDL device */
-	{DEVICE_G1K(0x1410, 0xa001)},	/* Novatel Gobi Modem device */
+	{DEVICE_G1K(0x1410, 0xa001)},	/* Novatel/Verizon USB-1000 */
+	{DEVICE_G1K(0x1410, 0xa002)},	/* Novatel Gobi Modem device */
+	{DEVICE_G1K(0x1410, 0xa003)},	/* Novatel Gobi Modem device */
+	{DEVICE_G1K(0x1410, 0xa004)},	/* Novatel Gobi Modem device */
+	{DEVICE_G1K(0x1410, 0xa005)},	/* Novatel Gobi Modem device */
+	{DEVICE_G1K(0x1410, 0xa006)},	/* Novatel Gobi Modem device */
+	{DEVICE_G1K(0x1410, 0xa007)},	/* Novatel Gobi Modem device */
 	{DEVICE_G1K(0x1410, 0xa008)},	/* Novatel Gobi QDL device */
 	{DEVICE_G1K(0x0b05, 0x1776)},	/* Asus Gobi Modem device */
 	{DEVICE_G1K(0x0b05, 0x1774)},	/* Asus Gobi QDL device */
diff -druNp linux-libre-3.4.53-gnu1/fs/cifs/cifsencrypt.c linux-libre-3.4.54-gnu1/fs/cifs/cifsencrypt.c
--- linux-libre-3.4.53-gnu1/fs/cifs/cifsencrypt.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/cifs/cifsencrypt.c	2013-07-21 21:19:12.000000000 -0400
@@ -394,7 +394,7 @@ static int calc_ntlmv2_hash(struct cifs_
 	int rc = 0;
 	int len;
 	char nt_hash[CIFS_NTHASH_SIZE];
-	wchar_t *user;
+	__le16 *user;
 	wchar_t *domain;
 	wchar_t *server;
 
@@ -419,7 +419,7 @@ static int calc_ntlmv2_hash(struct cifs_
 		return rc;
 	}
 
-	/* convert ses->user_name to unicode and uppercase */
+	/* convert ses->user_name to unicode */
 	len = ses->user_name ? strlen(ses->user_name) : 0;
 	user = kmalloc(2 + (len * 2), GFP_KERNEL);
 	if (user == NULL) {
@@ -429,7 +429,7 @@ static int calc_ntlmv2_hash(struct cifs_
 	}
 
 	if (len) {
-		len = cifs_strtoUTF16((__le16 *)user, ses->user_name, len, nls_cp);
+		len = cifs_strtoUTF16(user, ses->user_name, len, nls_cp);
 		UniStrupr(user);
 	} else {
 		memset(user, '\0', 2);
diff -druNp linux-libre-3.4.53-gnu1/fs/cifs/cifs_unicode.h linux-libre-3.4.54-gnu1/fs/cifs/cifs_unicode.h
--- linux-libre-3.4.53-gnu1/fs/cifs/cifs_unicode.h	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/cifs/cifs_unicode.h	2013-07-21 21:19:12.000000000 -0400
@@ -323,14 +323,14 @@ UniToupper(register wchar_t uc)
 /*
  * UniStrupr:  Upper case a unicode string
  */
-static inline wchar_t *
-UniStrupr(register wchar_t *upin)
+static inline __le16 *
+UniStrupr(register __le16 *upin)
 {
-	register wchar_t *up;
+	register __le16 *up;
 
 	up = upin;
 	while (*up) {		/* For all characters */
-		*up = UniToupper(*up);
+		*up = cpu_to_le16(UniToupper(le16_to_cpu(*up)));
 		up++;
 	}
 	return upin;		/* Return input pointer */
diff -druNp linux-libre-3.4.53-gnu1/fs/cifs/inode.c linux-libre-3.4.54-gnu1/fs/cifs/inode.c
--- linux-libre-3.4.53-gnu1/fs/cifs/inode.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/cifs/inode.c	2013-07-21 21:19:12.000000000 -0400
@@ -549,6 +549,11 @@ cifs_all_info_to_fattr(struct cifs_fattr
 			fattr->cf_mode &= ~(S_IWUGO);
 
 		fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
+		if (fattr->cf_nlink < 1) {
+			cFYI(1, "replacing bogus file nlink value %u\n",
+			     fattr->cf_nlink);
+			fattr->cf_nlink = 1;
+		}
 	}
 
 	fattr->cf_uid = cifs_sb->mnt_uid;
diff -druNp linux-libre-3.4.53-gnu1/fs/ext3/namei.c linux-libre-3.4.54-gnu1/fs/ext3/namei.c
--- linux-libre-3.4.53-gnu1/fs/ext3/namei.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/ext3/namei.c	2013-07-21 21:19:12.000000000 -0400
@@ -573,11 +573,8 @@ static int htree_dirblock_to_tree(struct
 		if (!ext3_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,
 					(block<<EXT3_BLOCK_SIZE_BITS(dir->i_sb))
 						+((char *)de - bh->b_data))) {
-			/* On error, skip the f_pos to the next block. */
-			dir_file->f_pos = (dir_file->f_pos |
-					(dir->i_sb->s_blocksize - 1)) + 1;
-			brelse (bh);
-			return count;
+			/* silently ignore the rest of the block */
+			break;
 		}
 		ext3fs_dirhash(de->name, de->name_len, hinfo);
 		if ((hinfo->hash < start_hash) ||
diff -druNp linux-libre-3.4.53-gnu1/fs/ext4/extents.c linux-libre-3.4.54-gnu1/fs/ext4/extents.c
--- linux-libre-3.4.53-gnu1/fs/ext4/extents.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/ext4/extents.c	2013-07-21 21:19:12.000000000 -0400
@@ -4713,7 +4713,7 @@ static int ext4_xattr_fiemap(struct inod
 		error = ext4_get_inode_loc(inode, &iloc);
 		if (error)
 			return error;
-		physical = iloc.bh->b_blocknr << blockbits;
+		physical = (__u64)iloc.bh->b_blocknr << blockbits;
 		offset = EXT4_GOOD_OLD_INODE_SIZE +
 				EXT4_I(inode)->i_extra_isize;
 		physical += offset;
@@ -4721,7 +4721,7 @@ static int ext4_xattr_fiemap(struct inod
 		flags |= FIEMAP_EXTENT_DATA_INLINE;
 		brelse(iloc.bh);
 	} else { /* external block */
-		physical = EXT4_I(inode)->i_file_acl << blockbits;
+		physical = (__u64)EXT4_I(inode)->i_file_acl << blockbits;
 		length = inode->i_sb->s_blocksize;
 	}
 
diff -druNp linux-libre-3.4.53-gnu1/fs/ext4/inode.c linux-libre-3.4.54-gnu1/fs/ext4/inode.c
--- linux-libre-3.4.53-gnu1/fs/ext4/inode.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/ext4/inode.c	2013-07-21 21:19:12.000000000 -0400
@@ -4221,7 +4221,7 @@ int ext4_getattr(struct vfsmount *mnt, s
 		 struct kstat *stat)
 {
 	struct inode *inode;
-	unsigned long delalloc_blocks;
+	unsigned long long delalloc_blocks;
 
 	inode = dentry->d_inode;
 	generic_fillattr(inode, stat);
@@ -4238,7 +4238,7 @@ int ext4_getattr(struct vfsmount *mnt, s
 	 */
 	delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks;
 
-	stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9;
+	stat->blocks += delalloc_blocks << (inode->i_sb->s_blocksize_bits-9);
 	return 0;
 }
 
diff -druNp linux-libre-3.4.53-gnu1/fs/ext4/mballoc.c linux-libre-3.4.54-gnu1/fs/ext4/mballoc.c
--- linux-libre-3.4.53-gnu1/fs/ext4/mballoc.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/ext4/mballoc.c	2013-07-21 21:19:12.000000000 -0400
@@ -4639,11 +4639,16 @@ do_more:
 		 * blocks being freed are metadata. these blocks shouldn't
 		 * be used until this transaction is committed
 		 */
+	retry:
 		new_entry = kmem_cache_alloc(ext4_free_data_cachep, GFP_NOFS);
 		if (!new_entry) {
-			ext4_mb_unload_buddy(&e4b);
-			err = -ENOMEM;
-			goto error_return;
+			/*
+			 * We use a retry loop because
+			 * ext4_free_blocks() is not allowed to fail.
+			 */
+			cond_resched();
+			congestion_wait(BLK_RW_ASYNC, HZ/50);
+			goto retry;
 		}
 		new_entry->efd_start_cluster = bit;
 		new_entry->efd_group = block_group;
diff -druNp linux-libre-3.4.53-gnu1/fs/ext4/namei.c linux-libre-3.4.54-gnu1/fs/ext4/namei.c
--- linux-libre-3.4.53-gnu1/fs/ext4/namei.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/ext4/namei.c	2013-07-21 21:19:12.000000000 -0400
@@ -585,11 +585,8 @@ static int htree_dirblock_to_tree(struct
 		if (ext4_check_dir_entry(dir, NULL, de, bh,
 				(block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb))
 					 + ((char *)de - bh->b_data))) {
-			/* On error, skip the f_pos to the next block. */
-			dir_file->f_pos = (dir_file->f_pos |
-					(dir->i_sb->s_blocksize - 1)) + 1;
-			brelse(bh);
-			return count;
+			/* silently ignore the rest of the block */
+			break;
 		}
 		ext4fs_dirhash(de->name, de->name_len, hinfo);
 		if ((hinfo->hash < start_hash) ||
diff -druNp linux-libre-3.4.53-gnu1/fs/jbd2/transaction.c linux-libre-3.4.54-gnu1/fs/jbd2/transaction.c
--- linux-libre-3.4.53-gnu1/fs/jbd2/transaction.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/jbd2/transaction.c	2013-07-21 21:19:12.000000000 -0400
@@ -500,10 +500,10 @@ int jbd2__journal_restart(handle_t *hand
 		   &transaction->t_outstanding_credits);
 	if (atomic_dec_and_test(&transaction->t_updates))
 		wake_up(&journal->j_wait_updates);
+	tid = transaction->t_tid;
 	spin_unlock(&transaction->t_handle_lock);
 
 	jbd_debug(2, "restarting handle %p\n", handle);
-	tid = transaction->t_tid;
 	need_to_start = !tid_geq(journal->j_commit_request, tid);
 	read_unlock(&journal->j_state_lock);
 	if (need_to_start)
diff -druNp linux-libre-3.4.53-gnu1/fs/ocfs2/xattr.c linux-libre-3.4.54-gnu1/fs/ocfs2/xattr.c
--- linux-libre-3.4.53-gnu1/fs/ocfs2/xattr.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/fs/ocfs2/xattr.c	2013-07-21 21:19:12.000000000 -0400
@@ -6499,6 +6499,16 @@ static int ocfs2_reflink_xattr_inline(st
 	}
 
 	new_oi = OCFS2_I(args->new_inode);
+	/*
+	 * Adjust extent record count to reserve space for extended attribute.
+	 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().
+	 */
+	if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&
+	    !(ocfs2_inode_is_fast_symlink(args->new_inode))) {
+		struct ocfs2_extent_list *el = &new_di->id2.i_list;
+		le16_add_cpu(&el->l_count, -(inline_size /
+					sizeof(struct ocfs2_extent_rec)));
+	}
 	spin_lock(&new_oi->ip_lock);
 	new_oi->ip_dyn_features |= OCFS2_HAS_XATTR_FL | OCFS2_INLINE_XATTR_FL;
 	new_di->i_dyn_features = cpu_to_le16(new_oi->ip_dyn_features);
diff -druNp linux-libre-3.4.53-gnu1/kernel/irq/manage.c linux-libre-3.4.54-gnu1/kernel/irq/manage.c
--- linux-libre-3.4.53-gnu1/kernel/irq/manage.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/kernel/irq/manage.c	2013-07-21 21:19:12.000000000 -0400
@@ -546,9 +546,9 @@ int can_request_irq(unsigned int irq, un
 		return 0;
 
 	if (irq_settings_can_request(desc)) {
-		if (desc->action)
-			if (irqflags & desc->action->flags & IRQF_SHARED)
-				canrequest =1;
+		if (!desc->action ||
+		    irqflags & desc->action->flags & IRQF_SHARED)
+			canrequest = 1;
 	}
 	irq_put_desc_unlock(desc, flags);
 	return canrequest;
diff -druNp linux-libre-3.4.53-gnu1/kernel/timer.c linux-libre-3.4.54-gnu1/kernel/timer.c
--- linux-libre-3.4.53-gnu1/kernel/timer.c	2013-07-13 14:03:57.000000000 -0400
+++ linux-libre-3.4.54-gnu1/kernel/timer.c	2013-07-21 21:19:12.000000000 -0400
@@ -145,9 +145,11 @@ static unsigned long round_jiffies_commo
 	/* now that we have rounded, subtract the extra skew again */
 	j -= cpu * 3;
 
-	if (j <= jiffies) /* rounding ate our timeout entirely; */
-		return original;
-	return j;
+	/*
+	 * Make sure j is still in the future. Otherwise return the
+	 * unmodified value.
+	 */
+	return time_is_after_jiffies(j) ? j : original;
 }
 
 /**
diff -druNp linux-libre-3.4.53-gnu1/Makefile linux-libre-3.4.54-gnu1/Makefile
--- linux-libre-3.4.53-gnu1/Makefile	2013-07-13 18:18:53.000000000 -0400
+++ linux-libre-3.4.54-gnu1/Makefile	2013-07-21 22:52:31.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 4
-SUBLEVEL = 53
+SUBLEVEL = 54
 EXTRAVERSION =-gnu1
 NAME = Saber-toothed Squirrel
 
