diff --git a/debian/changelog b/debian/changelog index eb20e9b50..22291d467 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -linux (3.13.1-1~exp1) UNRELEASED; urgency=low +linux (3.13.2-1~exp1) UNRELEASED; urgency=low * New upstream stable update: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.1 + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.2 [ Ben Hutchings ] * [x86] Enable POWERCAP, INTEL_RAPL as module (Closes: #736399) diff --git a/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch b/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch index adc0ff46f..9be7722cb 100644 --- a/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch +++ b/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch @@ -96,7 +96,7 @@ upstream submission. fw_size = firmware->size / sizeof(u32); --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c -@@ -357,10 +357,8 @@ static int ath3k_load_patch(struct usb_d +@@ -359,10 +359,8 @@ static int ath3k_load_patch(struct usb_d fw_version.rom_version); ret = request_firmware(&firmware, filename, &udev->dev); @@ -108,7 +108,7 @@ upstream submission. pt_version.rom_version = *(int *)(firmware->data + firmware->size - 8); pt_version.build_version = *(int *) -@@ -419,10 +417,8 @@ static int ath3k_load_syscfg(struct usb_ +@@ -421,10 +419,8 @@ static int ath3k_load_syscfg(struct usb_ fw_version.rom_version, clk_value, ".dfu"); ret = request_firmware(&firmware, filename, &udev->dev); @@ -1805,10 +1805,10 @@ upstream submission. rt2x00_err(rt2x00dev, "Failed to read Firmware\n"); --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c -@@ -46,7 +46,6 @@ void rtl_fw_cb(const struct firmware *fi - "Firmware callback routine entered!\n"); - complete(&rtlpriv->firmware_loading_complete); - if (!firmware) { +@@ -55,7 +55,6 @@ void rtl_fw_cb(const struct firmware *fi + if (!err) + goto found_alt; + } - pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name); rtlpriv->max_fw_size = 0; return; @@ -2684,7 +2684,7 @@ upstream submission. } --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c -@@ -3779,11 +3779,8 @@ static void azx_firmware_cb(const struct +@@ -3783,11 +3783,8 @@ static void azx_firmware_cb(const struct struct azx *chip = card->private_data; struct pci_dev *pci = chip->pci; diff --git a/debian/patches/bugfix/arm/xen-pci-fix-build-on-non-x86.patch b/debian/patches/bugfix/arm/xen-pci-fix-build-on-non-x86.patch deleted file mode 100644 index f59896ddf..000000000 --- a/debian/patches/bugfix/arm/xen-pci-fix-build-on-non-x86.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Ben Hutchings -Date: Mon, 30 Dec 2013 19:44:02 +0100 -Subject: xen/pci: Fix build on non-x86 - -We can't include if this isn't x86, and we only need -it if CONFIG_PCI_MMCONFIG is enabled. - -Fixes: 8deb3eb1461e ('xen/mcfg: Call PHYSDEVOP_pci_mmcfg_reserved for MCFG areas.') -Signed-off-by: Ben Hutchings ---- ---- a/drivers/xen/pci.c -+++ b/drivers/xen/pci.c -@@ -26,7 +26,9 @@ - #include - #include - #include "../pci/pci.h" -+#ifdef CONFIG_PCI_MMCONFIG - #include -+#endif - - static bool __read_mostly pci_seg_supported = true; - diff --git a/debian/patches/series b/debian/patches/series index 5d63cec39..330840f30 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -76,7 +76,6 @@ debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch bugfix/all/disable-some-marvell-phys.patch features/all/media-az6007-support-Technisat-Cablestar-Combo-HDCI-.patch bugfix/all/staging-lustre-Make-LUSTRE_LLITE_LLOOP-tristate.patch -bugfix/arm/xen-pci-fix-build-on-non-x86.patch bugfix/arm/ARM-orion-provide-C-style-interrupt-handler-for-MULTI_IRQ_HANDLER.patch bugfix/all/i2c-designware-remove-HAVE_CLK-build-dependecy.patch debian/snd-pcsp-disable-autoload.patch