From 8db2f2efff88496483ec5984095ea7d05a97c42e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 4 Aug 2015 21:10:12 +0000 Subject: [PATCH 01/16] [armhf] Enable cpufreq on some sunxi platforms (Closes: #793185) svn path=/dists/sid/linux/; revision=22926 --- debian/changelog | 9 ++++++ ...t-allow-driver-to-boot-automatically.patch | 32 +++++++++++++++++++ .../regulator-axp20x-Add-module-alias.patch | 30 +++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 73 insertions(+) create mode 100644 debian/patches/features/all/cpufreq-dt-allow-driver-to-boot-automatically.patch create mode 100644 debian/patches/features/all/regulator-axp20x-Add-module-alias.patch diff --git a/debian/changelog b/debian/changelog index e2b2de889..ea3fb09dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +linux (4.1.3-2) UNRELEASED; urgency=medium + + [ Ian Campbell ] + * [armhf] Enable cpufreq on some sunxi platforms (Closes: #793185) + - Enable autoloading of the cpufreq-dt driver. + - Enable autoloading of AXP20x regulator driver. + + -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 + linux (4.1.3-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/patches/features/all/cpufreq-dt-allow-driver-to-boot-automatically.patch b/debian/patches/features/all/cpufreq-dt-allow-driver-to-boot-automatically.patch new file mode 100644 index 000000000..a78162483 --- /dev/null +++ b/debian/patches/features/all/cpufreq-dt-allow-driver-to-boot-automatically.patch @@ -0,0 +1,32 @@ +From 07949bf9c63c9a80027fe8452d5fe8b9ba9b3c23 Mon Sep 17 00:00:00 2001 +From: Felipe Balbi +Date: Fri, 8 May 2015 14:57:30 -0500 +Subject: [PATCH] cpufreq: dt: allow driver to boot automatically +Origin: http://git.kernel.org/linus/07949bf9c63c9a80027fe8452d5fe8b9ba9b3c23 + +by adding the missing MODULE_ALIAS(), cpufreq-dt +can be autoloaded by udev/systemd. + +Signed-off-by: Felipe Balbi +Acked-by: Nishanth Menon +Acked-by: Viresh Kumar +Signed-off-by: Rafael J. Wysocki +--- + drivers/cpufreq/cpufreq-dt.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c +index bab67db..528a82bf 100644 +--- a/drivers/cpufreq/cpufreq-dt.c ++++ b/drivers/cpufreq/cpufreq-dt.c +@@ -416,6 +416,7 @@ static struct platform_driver dt_cpufreq_platdrv = { + }; + module_platform_driver(dt_cpufreq_platdrv); + ++MODULE_ALIAS("platform:cpufreq-dt"); + MODULE_AUTHOR("Viresh Kumar "); + MODULE_AUTHOR("Shawn Guo "); + MODULE_DESCRIPTION("Generic cpufreq driver"); +-- +2.1.4 + diff --git a/debian/patches/features/all/regulator-axp20x-Add-module-alias.patch b/debian/patches/features/all/regulator-axp20x-Add-module-alias.patch new file mode 100644 index 000000000..21f67c4ff --- /dev/null +++ b/debian/patches/features/all/regulator-axp20x-Add-module-alias.patch @@ -0,0 +1,30 @@ +From d4ea7d86457a8d0ea40ce77bdeda1fc966cc35ec Mon Sep 17 00:00:00 2001 +From: Ian Campbell +Date: Sat, 1 Aug 2015 18:13:25 +0100 +Subject: [PATCH] regulator: axp20x: Add module alias +Origin: https://git.kernel.org/broonie/regulator/c/d4ea7d86457a8d0ea40ce77bdeda1fc966cc35ec + +This allows the module to be autoloaded. + +Together with 07949bf9c63c ("cpufreq: dt: allow driver to boot +automatically") this is sufficient to allow a modular kernel (such +as Debian's) to enable cpufreq on a Cubietruck. + +Signed-off-by: Ian Campbell +Signed-off-by: Mark Brown +--- + drivers/regulator/axp20x-regulator.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c +index 6468291..01bf347 100644 +--- a/drivers/regulator/axp20x-regulator.c ++++ b/drivers/regulator/axp20x-regulator.c +@@ -405,3 +405,4 @@ module_platform_driver(axp20x_regulator_driver); + MODULE_LICENSE("GPL v2"); + MODULE_AUTHOR("Carlo Caione "); + MODULE_DESCRIPTION("Regulator Driver for AXP20X PMIC"); ++MODULE_ALIAS("platform:axp20x-regulator"); +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index c5e94517f..a7a3c9dc3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -78,6 +78,8 @@ bugfix/all/kernel-doc-set-man-page-date.patch # Miscellaneous features features/all/efi-autoload-efi-pstore.patch +features/all/cpufreq-dt-allow-driver-to-boot-automatically.patch +features/all/regulator-axp20x-Add-module-alias.patch bugfix/x86/kvm-x86-fix-kvm_apic_has_events-to-check-for-null-po.patch bugfix/x86/0003-x86-asm-entry-64-Remove-pointless-jump-to-irq_return.patch From 9c536d2d2e2319de45ff344bd63bb446353d2ebc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 10 Aug 2015 09:53:41 +0000 Subject: [PATCH 02/16] [x86] iio: Enable drivers for ACPI-discoverable devices as modules svn path=/dists/sid/linux/; revision=22937 --- debian/changelog | 5 ++++ debian/config/kernelarch-x86/config | 39 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/debian/changelog b/debian/changelog index ea3fb09dd..9ae99ad50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ linux (4.1.3-2) UNRELEASED; urgency=medium - Enable autoloading of the cpufreq-dt driver. - Enable autoloading of AXP20x regulator driver. + [ Ben Hutchings ] + * [x86] iio: Enable drivers for ACPI-discoverable devices as modules: + AK8975, BMC150_ACCEL, BMG160, BMP280, INV_MPU6050_IIO, JSA1212, KMX61, + KXCJK1013, MMA9551, MMA9553, SX9500 + -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 linux (4.1.3-1) unstable; urgency=medium diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index ff672ba58..8e2a87b7a 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -632,12 +632,51 @@ CONFIG_SCx200_ACB=m ## CONFIG_INTEL_IDLE=y +## +## file: drivers/iio/accel/Kconfig +## +CONFIG_BMC150_ACCEL=m +CONFIG_KXCJK1013=m +CONFIG_MMA9551=m +CONFIG_MMA9553=m + +## +## file: drivers/iio/gyro/Kconfig +## +CONFIG_BMG160=m + +## +## file: drivers/iio/imu/Kconfig +## +CONFIG_KMX61=m + +## +## file: drivers/iio/imu/inv_mpu6050/Kconfig +## +CONFIG_INV_MPU6050_IIO=m + ## ## file: drivers/iio/light/Kconfig ## +CONFIG_JSA1212=m #. Cr-48, Acer AC700 CONFIG_SENSORS_TSL2563=m +## +## file: drivers/iio/magnetometer/Kconfig +## +CONFIG_AK8975=m + +## +## file: drivers/iio/pressure/Kconfig +## +CONFIG_BMP280=m + +## +## file: drivers/iio/proximity/Kconfig +## +CONFIG_SX9500=m + ## ## file: drivers/input/gameport/Kconfig ## From ea0978d10c9b2ddc8479e83c492e9820c98c707b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 18:07:21 +0200 Subject: [PATCH 03/16] Update .gitignore files based on svn:ignore properties For the top-level .gitignore, do this via the existing patch. (cherry picked from commit 55cf50555a83206dc3e3676a0e6daf00be218a4a) --- debian/.gitignore | 13 +++++++++++++ debian/changelog | 2 ++ debian/patches/debian/gitignore.patch | 14 +++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/debian/.gitignore b/debian/.gitignore index 29359e31f..9df6faf1e 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,5 +1,18 @@ !/patches !*.patch !*.diff +*.debhelper* +*.local *.pyc +*.substvars +*-di +/build/ +/config.defines.dump +/control +/control.md5sum +/files +/linux-* /po/ +/rules.gen +/stamps/ +/xen-linux-system-* diff --git a/debian/changelog b/debian/changelog index 9ae99ad50..d37bf31f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ linux (4.1.3-2) UNRELEASED; urgency=medium * [x86] iio: Enable drivers for ACPI-discoverable devices as modules: AK8975, BMC150_ACCEL, BMG160, BMP280, INV_MPU6050_IIO, JSA1212, KMX61, KXCJK1013, MMA9551, MMA9553, SX9500 + * Adjust for migration to git: + - Update .gitignore files -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch index 2dc995449..85e2740ea 100644 --- a/debian/patches/debian/gitignore.patch +++ b/debian/patches/debian/gitignore.patch @@ -3,9 +3,11 @@ Date: Thu, 17 Jan 2013 08:55:21 +0000 Subject: Tweak gitignore for Debian pkg-kernel using git svn. Forwarded: not-needed +[bwh: Tweak further for pure git] + --- a/.gitignore +++ b/.gitignore -@@ -49,22 +49,11 @@ Module.symvers +@@ -50,22 +50,11 @@ Module.symvers /Module.markers # @@ -28,3 +30,13 @@ Forwarded: not-needed # Generated include files # include/config +@@ -106,3 +95,9 @@ all.config + + # Kdevelop4 + *.kdev4 ++ ++# ++# Debian packaging: ignore everything at the top level, since it isn't ++# included in our repository ++# ++/* From de372d7baf8059ccd3c5d122180dd863183432f3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 18:15:33 +0200 Subject: [PATCH 04/16] Update Vcs-* fields to point to git (cherry picked from commit c388a4feaeaaa3c12eafb47ab4e01988a535db93) --- debian/changelog | 1 + debian/templates/control.source.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d37bf31f7..ee2f23576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ linux (4.1.3-2) UNRELEASED; urgency=medium KXCJK1013, MMA9551, MMA9553, SX9500 * Adjust for migration to git: - Update .gitignore files + - debian/control: Update Vcs-* fields -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 1f0d56c78..78e070862 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -5,6 +5,6 @@ Uploaders: Bastian Blank , Frederik Schüler , Standards-Version: 3.9.5 Build-Depends: debhelper, cpio, kmod, python, python-six, lzma [armel], kernel-wedge, quilt, patchutils, bc Build-Depends-Indep: xz-utils, xmlto -Vcs-Svn: svn://anonscm.debian.org/svn/kernel/dists/trunk/linux/ -Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/ +Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git +Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git Homepage: https://www.kernel.org/ From ecae9d006f9a0c2a39eb86d4100f1feb40c5d4ac Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 18:20:05 +0200 Subject: [PATCH 05/16] README.Debian, README.source: Update references to svn (cherry picked from commit 3925828ee5669f3f85f7d2846b7049558e3a942d) --- debian/README.Debian | 2 +- debian/README.source | 2 +- debian/changelog | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index c32fe8b54..5b769462f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -6,7 +6,7 @@ Patches Debian applies small changes to the kernel source. These are split up into separated patches addressing individual problems. Each of the patch files contains a description and mentions the author. The patches can be found -at http://svn.debian.org/wsvn/kernel/dists/trunk/linux/debian/patches/. +at https://anonscm.debian.org/cgit/kernel/linux.git/tree/debian/patches. Config Files ------------ diff --git a/debian/README.source b/debian/README.source index ad841face..9a4df4a7f 100644 --- a/debian/README.source +++ b/debian/README.source @@ -15,7 +15,7 @@ Updating the upstream source installed) 3) Unpack linux_.orig.tar.gz, cd into the new directory, - and do a 'svn export' to get the debian/ subdirectory. + and do a 'git archive' to get the debian/ subdirectory. Alternatively unpack using "make -f debian/rules orig". (the orig target of the Makefiles requires rsync) diff --git a/debian/changelog b/debian/changelog index ee2f23576..56829a71c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ linux (4.1.3-2) UNRELEASED; urgency=medium * Adjust for migration to git: - Update .gitignore files - debian/control: Update Vcs-* fields + - README.Debian, README.source: Update references to svn -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 From a42e6ab606c18d38174fbd7536427d51303cab51 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 19:02:25 +0200 Subject: [PATCH 06/16] Exclude debian directory in .gitignore I didn't think this was necessary as the debian directory is already present in the repo. But without this, git will ignore all new files under it. (cherry picked from commit 76e21fd6a2db230636520832d78f68a86b148a50) --- debian/patches/debian/gitignore.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch index 85e2740ea..eb713482f 100644 --- a/debian/patches/debian/gitignore.patch +++ b/debian/patches/debian/gitignore.patch @@ -30,7 +30,7 @@ Forwarded: not-needed # Generated include files # include/config -@@ -106,3 +95,9 @@ all.config +@@ -106,3 +95,10 @@ all.config # Kdevelop4 *.kdev4 @@ -40,3 +40,4 @@ Forwarded: not-needed +# included in our repository +# +/* ++!/debian/ From 431395942ee0a9555859e08379914f0031d4b356 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 21:48:34 +0200 Subject: [PATCH 07/16] Update to 4.1.5 --- debian/changelog | 332 +++++++++++++++++- ...he-assoc-array-edit-if-edit-is-valid.patch | 39 -- ...g-facility-check-to-init_cache_level.patch | 51 --- debian/patches/series | 2 - 4 files changed, 331 insertions(+), 93 deletions(-) delete mode 100644 debian/patches/bugfix/all/keys-ensure-we-free-the-assoc-array-edit-if-edit-is-valid.patch delete mode 100644 debian/patches/bugfix/s390/s390-cachinfo-add-missing-facility-check-to-init_cache_level.patch diff --git a/debian/changelog b/debian/changelog index 56829a71c..5c9c2af0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,334 @@ -linux (4.1.3-2) UNRELEASED; urgency=medium +linux (4.1.5-1) UNRELEASED; urgency=medium + + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 + - [armhf] pinctrl: mvebu: armada-370: fix spi0 pin description + - [armhf] pinctrl: mvebu: armada-xp: remove non-existing NAND pins + - [armhf] pinctrl: mvebu: armada-xp: remove non-existing VDD cpu_pd + functions + - [armhf] pinctrl: mvebu: armada-xp: fix functions of MPP48 + - Bluetooth: Fix race condition with user channel and setup stage + - Bluetooth: btusb: Fix memory leak in Intel setup routine + - Bluetooth: btusb: Fix secure send command length alignment on Intel 8260 + - Bluetooth: btusb: Correct typo in Roper Class 1 Bluetooth Dongle + - Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on Apple + - ath9k: fix DMA stop sequence for AR9003+ + - ath9k_htc: memory corruption calling set_bit() + - rtlwifi: Remove the clear interrupt routine from all drivers + - ieee802154: Fix sockaddr_ieee802154 implicit padding information leak. + - staging: vt6656: check ieee80211_bss_conf bssid not NULL + - staging: vt6655: check ieee80211_bss_conf bssid not NULL + - staging: vt6655: device_rx_srv check sk_buff is NULL + - staging: rtl8712: prevent buffer overrun in recvbuf2recvframe + - staging: comedi: cb_pcimdas: fix handlers for DI and DO subdevices + - hid-sensor: Fix suspend/resume delay + - ext4: fix race between truncate and __ext4_journalled_writepage() + - ext4: call sync_blockdev() before invalidate_bdev() in put_super() + - ext4: don't retry file block mapping on bigalloc fs with non-extent file + - ext4: set lazytime on remount if MS_LAZYTIME is set by mount + - ext4: fix fencepost error in lazytime optimization + - bufferhead: Add _gfp version for sb_getblk() + - ext4: avoid deadlocks in the writeback path by using sb_getblk_gfp + - ext4: fix reservation release on invalidatepage for delalloc fs + - ext4: be more strict when migrating to non-extent based file + - ext4: correctly migrate a file with a hole at the beginning + - ext4: replace open coded nofail allocation in ext4_free_blocks() + - jbd2: use GFP_NOFS in jbd2_cleanup_journal_tail() + - jbd2: fix ocfs2 corrupt when updating journal superblock fails + - NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer + - NFC: st21nfcb: Do not remove header once the payload is sent + - NFC: st21nfcb: remove st21nfcb_nci_i2c_disable + - [armhf] rtc: snvs: fix wakealarm by call enable_irq_wake earlier + - i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer() + - i2c: use parent adapter quirks in mux + - vb2: Don't WARN when v4l2_buffer.bytesused is 0 for multiplanar buffers + - media: Fix regression in some more dib0700 based devices + - rc-core: fix dib0700 scancode generation for RC5 + - cx18: add missing caps for the PCM video device + - cx24117: fix a buffer overflow when checking userspace params + - af9013: Don't accept invalid bandwidth + - saa7164: fix querycap warning + - s5h1420: fix a buffer overflow when checking userspace params + - cx24116: fix a buffer overflow when checking userspace params + - [armhf] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency, again + - libata: Do not blacklist Micron M500DC + - libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for HP 250GB SATA disk + VB0250EAVER + - libata: increase the timeout when setting transfer mode + - libata: Fall back to unqueued READ LOG EXT if the DMA variant fails + - libata: Expose TRIM capability in sysfs + - libata: add ATA_HORKAGE_NOTRIM + - libata: add ATA_HORKAGE_MAX_SEC_1024 to revert back to previous + max_sectors limit + - libata: Do not blacklist M510DC + - libata: force disable trim for SuperSSpeed S238 + - [armhf] usb: dwc3: gadget: return error if command sent to DGCMD register + fails + - [armhf] usb: dwc3: gadget: return error if command sent to DEPCMD + register fails + - [armhf] usb: dwc3: gadget: don't clear EP_BUSY too early + - [armhf] usb: dwc3: Reset the transfer resource index on SET_INTERFACE + - usb: core: Fix USB 3.0 devices lost in NOTATTACHED state after a hub port + reset + - USB: devio: fix a condition in async_completed() + - [armhf] phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in + probe function. + - [armhf] usb: phy: mxs: suspend to RAM causes NULL pointer dereference + - usb: gadget: composite: Fix NULL pointer dereference + - usb: gadget: f_fs: do not set cancel function on synchronous {read,write} + - usb: gadget: mv_udc_core: fix phy_regs I/O memory leak + - usb: f_mass_storage: limit number of reported LUNs + - [armhf] usb: musb: host: rely on port_mode to call musb_start() + - USB: cp210x: add ID for Aruba Networks controllers + - USB: option: add 2020:4000 ID + - USB: serial: Destroy serial_minors IDR on module exit + - USB: OHCI: Fix race between ED unlink and URB submission + - usb: core: lpm: set lpm_capable for root hub device + - usb: xhci: Bugfix for NULL pointer deference in xhci_endpoint_init() + function + - dm cache: fix race when issuing a POLICY_REPLACE operation + - dm stats: fix divide by zero if 'number_of_areas' arg is zero + - dm space map metadata: fix occasional leak of a metadata block on resize + - dm btree remove: fix bug in redistribute3 + - dm thin: allocate the cell_sort_array dynamically + - dm btree: silence lockdep lock inversion in dm_btree_del() + - mmc: block: Add missing mmc_blk_put() in power_ro_lock_show() + - block: loop: convert to per-device workqueue + - block: loop: avoiding too many pending per work I/O + - block: Do a full clone when splitting discard bios + - drm/vgem: Set unique to "vgem" + - [armhf] drm/tegra: dpaux: Fix transfers larger than 4 bytes + - drm/qxl: Do not cause spice-server to clean our objects + - drm/qxl: Do not leak memory if qxl_release_list_add fails + - drm/atomic: fix out of bounds read in for_each_*_in_state helpers + - drm/radeon: take the mode_config mutex when dealing with hpds (v2) + - drm/radeon: clean up radeon_audio_enable + - [x86] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path + - [x86] drm/i915: Fix IPS related flicker + - [x86] drm/i915: fix backlight after resume on 855gm + - [x86] drm/i915: Declare the swizzling unknown for L-shaped configurations + - [x86] drm/i915: Snapshot seqno of most recently submitted request. + - [x86] drm/i915: Forward all core DRM ioctls to core compat handling + - [x86] Revert "drm/i915: Declare the swizzling unknown for L-shaped + configurations" + - [x86] drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls + - drm/radeon: compute ring fix hibernation (CI GPU family) v2. + - drm/radeon: SDMA fix hibernation (CI GPU family). + - Revert "drm/radeon: dont switch vt on suspend" + - drm/radeon: only check the sink type on DP connectors + - drm/radeon: fix HDP flushing + - drm/radeon: Handle irqs only based on irq ring, not irq status regs. + - drm/radeon: Clean up reference counting and pinning of the cursor BOs + - drm/radeon: unpin cursor BOs on suspend and pin them again on resume (v2) + - drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL + - drm/radeon: add a dpm quirk for Sapphire Radeon R9 270X 2GB GDDR5 + - drm/radeon: fix user ptr race condition + - drm/radeon/ci: silence a harmless PCC warning + - drm: add a check for x/y in drm_mode_setcrtc + - drm: Provide compat ioctl for addfb2.1 + - drm: Stop resetting connector state to unknown + - libata: Fix regression when the NCQ Send and Receive log page is absent + - xfs: fix remote symlinks on V5/CRC filesystems + - xfs: don't truncate attribute extents if no extents exist + - w1_therm reference count family data + - tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add() + - vTPM: set virtual device before passing to ibmvtpm_reset_crq + - tpm: Fix initialization of the cdev + - tpm, tpm_crb: fail when TPM2 ACPI table contents look corrupted + - KEYS: fix "ca_keys=" partial key matching + - KEYS: ensure we free the assoc array edit if edit is valid + - tracing/filter: Do not WARN on operand count going below zero + - tracing/filter: Do not allow infix to exceed end of string + - tracing: Fix typo from "static inlin" to "static inline" + - tracing: Have branch tracer use recursive field of task struct + - tracing: Fix sample output of dynamic arrays + - [armel,armhf] dmaengine: mv_xor: bug fix for racing condition in + descriptors cleanup + - md: clear mddev->private when it has been freed. + - md: unlock mddev_lock on an error path. + - md: Skip cluster setup for dm-raid + - Btrfs: don't invalidate root dentry when subvolume deletion fails + - md: fix a build warning + - Btrfs: use kmem_cache_free when freeing entry in inode cache + - Btrfs: fix race between caching kthread and returning inode to inode cache + - Btrfs: fix fsync data loss after append write + - Btrfs: fix memory leak in the extent_same ioctl + - Btrfs: fix list transaction->pending_ordered corruption + - Btrfs: fix file corruption after cloning inline extents + - selinux: don't waste ebitmap space when importing NetLabel categories + - selinux: fix mprotect PROT_EXEC regression caused by mm change + - fuse: initialize fc->release before calling it + - crush: fix a bug in tree bucket decode + - ACPI / resources: free memory on error in add_region_before() + - ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage + - ACPI / LPSS: Fix up acpi_lpss_create_device() + - ACPICA: Tables: Enable both 32-bit and 64-bit FACS + - ACPICA: Tables: Fix an issue that FACS initialization is performed twice + - ACPICA: Tables: Enable default 64-bit FADT addresses favor + - ACPI / PCI: Fix regressions caused by resource_size_t overflow with + 32-bit kernel + - [armhf] serial: samsung: only use earlycon for console + - mmc: card: Fixup request missing in mmc_blk_issue_rw_rq + - mmc: sdhci: Restore behavior while creating OCR mask + - PM / clk: Fix clock error check in __pm_clk_add() + - RDMA/ocrdma: fix double free on pd + - tty: remove platform_sysrq_reset_seq + - mm/hugetlb: introduce minimum hugepage order + - PM / sleep: Increase default DPM watchdog timeout to 60 + - firmware: dmi_scan: Only honor end-of-table for 64-bit tables + - __bitmap_parselist: fix bug in empty string handling + - security_syslog() should be called once only + - mac80211: fix the beacon csa counter for mesh and ibss + - iwlwifi: mvm: fix ROC reference accounting + - cfg80211: ignore netif running state when changing iftype + - mac80211: prevent possible crypto tx tailroom corruption + - e1000e: Cleanup handling of VLAN_HLEN as a part of max frame size + - clocksource: exynos_mct: Avoid blocking calls in the cpu hotplug notifier + - [x86] ideapad_laptop: Lenovo G50-30 fix rfkill reports wireless blocked + - [x86] ideapad: fix software rfkill setting + - of/address: use atomic allocation in pci_register_io_range() + - [x86] dell-laptop: Fix allocating & freeing SMI buffer page + - ovl: lookup whiteouts outside iterate_dir() + - of: return NUMA_NO_NODE from fallback of_node_to_nid() + - watchdog: omap: assert the counter being stopped before reprogramming + - gpiolib: Add missing dummies for the unified device properties interface + - clk: Fix JSON output in debugfs + - pNFS: Fix a memory leak when attempted pnfs fails + - pNFS/flexfiles: Fix the reset of struct pgio_header when resending + - NFS: Fix size of NFSACL SETACL operations + - nfs: fixing infinite OPEN loop in 4.0 stateid recovery + - nfs: increase size of EXCHANGE_ID name string buffer + - NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes + - nfs: fix potential credential leak in ff_layout_update_mirror_cred + - nfs: always update creds in mirror, even when we have an already + connected ds + - SUNRPC: Fix a memory leak in the backchannel code + - 9p: forgetting to cancel request on interrupted zero-copy RPC + - 9p: don't leave a half-initialized inode sitting around + - rbd: use GFP_NOIO in rbd_obj_request_create() + - [x86] agp/intel: Fix typo in needs_ilk_vtd_wa() + - [mips] EDAC, octeon: Fix broken build due to model helper renames + - p9_client_write(): avoid double p9_free_req() + - [arm64] smp: Fix suspicious RCU usage with ipi tracepoints + - [arm64] bpf: fix out-of-bounds read in bpf2a64_offset() + - [arm64] bpf: fix endianness conversion bugs + - [arm64] Don't report clear pmds and puds as huge + - [armel,armhf] 8393/1: smp: Fix suspicious RCU usage with ipi tracepoints + - [armel,armhf] 8397/1: fix vdsomunge not to depend on glibc specific + error.h + - hpfs: kstrdup() out of memory handling + - hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead + - Fix firmware loader uevent buffer NULL pointer dereference + - mm: avoid setting up anonymous pages into file mapping + - [x86] mpx: Do not set ->vm_ops on MPX VMAs + https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 + - [powerpc*] powernv: Fix race in updating core_idle_state + - Revert "Input: synaptics - allocate 3 slots to keep stability in image + sensors" + - [hppa] Fix some PTE/TLB race conditions and optimize __flush_tlb_range + based on timing results + - [hppa] mm: Fix a memory leak related to pmd not attached to the pgd + - [armel,armhf] 8404/1: dma-mapping: fix off-by-one error in bitmap size + check + - [armhf] imx6: gpc: always enable PU domain if CONFIG_PM is not set + - [mips*] c-r4k: Fix cache flushing for MT cores + - [mips*] Require O32 FP64 support for MIPS64 with O32 compat + - can: replace timestamp as unique skb attribute + - can: rcar_can: fix IRQ check + - can: c_can: Fix default pinmux glitch at init + - can: rcar_can: print signed IRQ # + - can: mcp251x: fix resume when device is down + - vfs: freeing unlinked file indefinitely delayed + - [x86] init: Clear 'init_level4_pgt' earlier + - [x86] kasan: Fix KASAN shadow region page tables + - [x86] kasan: Flush TLBs after switching CR3 + - [x86] kasan: Fix boot crash on AMD processors + - crypto: omap-des - Fix unmapping of dma channels + - [s390x] process: fix sfpc inline assembly + - [s390x] sclp: clear upper register halves in _sclp_print_early + - [s390x] nmi: fix vector register corruption + - [s390x] bpf: clear correct BPF accumulator register + - bio integrity: do not assume bio_integrity_pool exists if bioset exists + - dma-debug: skip debug_dma_assert_idle() when disabled + - genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD + - ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4 + - ALSA: line6: Fix -EBUSY error during active monitoring + - ALSA: pcm: Fix lockdep warning with nonatomic PCM ops + - [x86] ALSA: hda - Add headset mic support for Acer Aspire V5-573G + - ALSA: hda: add new AMD PCI IDs with proper driver caps + - ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda + - [x86] ALSA: hda - Add headset mic pin quirk for a Dell device + - [x86] ALSA: hda - Apply fixup for another Toshiba Satellite S50D + - [x86] ALSA: hda - Apply a fixup to Dell Vostro 5480 + - ALSA: usb-audio: add dB range mapping for some devices + - [x86] ALSA: hda - Fix MacBook Pro 5,2 quirk + - [x86] perf: Fix static_key bug in load_mm_cr4() + - Revert "dm: only run the queue on completion if congested or no requests + pending" + - [arm64] irqchip/gicv3-its: Fix mapping of LPIs to collections + - scsi: fix host max depth checking for the 'queue_depth' sysfs interface + - scsi: fix memory leak with scsi-mq + - st: null pointer dereference panic caused by use after kref_put by st_open + - drivers: clk: st: Fix flexgen lock init + - drivers: clk: st: Fix mux bit-setting for Cortex A9 clocks + - drivers: clk: st: Incorrect register offset used for lock_status + - mac80211: clear subdir_stations when removing debugfs + - mnt: Clarify and correct the disconnect logic in umount_tree + - mnt: In detach_mounts detach the appropriate unmounted mount + - ftrace: Fix breakage of set_ftrace_pid + - [x86] iommu/vt-d: Fix VM domain ID leak + - [armhf] mmc: omap_hsmmc: Fix DTO and DCRC handling + - mmc: sdhci check parameters before call dma_free_coherent + - mmc: sdhci-esdhc: Make 8BIT bus work + - HID: cp2112: fix to force single data-report reply + - iwlwifi: mvm: fix antenna selection when BT is active + - iwlwifi: nvm: remove mac address byte swapping in 8000 family + - iwlwifi: pcie: prepare the device before accessing it + - md/raid1: fix test for 'was read error from last working device'. + - [armhf] spi: imx: Fix small DMA transfers + - Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen + - blkcg: fix gendisk reference leak in blkg_conf_prep() + - [armhf] regulator: s2mps11: Fix GPIO suspend enable shift wrapping bug + - ata: pmp: add quirk for Marvell 4140 SATA PMP + - usb-storage: ignore ZTE MF 823 card reader in mode 0x1225 + - [armhf] Revert "serial: imx: initialized DMA w/o HW flow enabled" + - serial: core: Fix crashes while echoing when closing + - xhci: Calculate old endpoints correctly on device reset + - xhci: report U3 when link is in resume state + - xhci: prevent bus_suspend if SS port resuming in phase 1 + - xhci: do not report PLC when link is in internal resume state + - mei: prevent unloading mei hw modules while the device is opened. + - [x86] mm: Add parenthesis for TLB tracepoint size calculation + - efi: Handle memory error structures produced based on old versions of + standard + - [arm64] efi: map the entire UEFI vendor string before reading it + - efi: Check for NULL efi kernel parameters + - [x86] efi: Use all 64 bit of efi_memmap in setup_e820() + - rds: rds_ib_device.refcount overflow + - n_tty: signal and flush atomically + - blk-mq: set default timeout as 30 seconds + - [x86] perf/intel/cqm: Return cached counter value from IRQ context + - vhost: actually track log eventfd file + - NFS: Don't revalidate the mapping if both size and change attr are up to + date + - NFSv4: We must set NFS_OPEN_STATE flag in nfs_resync_open_stateid_locked + - NFS: Fix a memory leak in nfs_do_recoalesce + - IB/ipoib: Fix CONFIG_INFINIBAND_IPOIB_CM + - iscsi-target: Fix use-after-free during TPG session shutdown + - iscsi-target: Fix iscsit_start_kthreads failure OOPs + - iscsi-target: Fix iser explicit logout TX kthread leak + - [x86] intel_pstate: Add get_scaling cpu_defaults param to Knights Landing + - qla2xxx: Fix hardware lock/unlock issue causing kernel panic. + - qla2xxx: release request queue reservation. + - qla2xxx: Remove msleep in qlt_send_term_exchange + - qla2xxx: fix command initialization in target mode. + - qla2xxx: kill sessions/log out initiator on RSCN and port down events + - drm/nouveau/fbcon/nv11-: correctly account for ring space usage + - drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads + - drm/nouveau: hold mutex when calling nouveau_abi16_fini() + - drm/nouveau/drm/nv04-nv40/instmem: protect access to priv->heap by mutex + - xfs: remote attribute headers contain an invalid LSN + - xfs: remote attributes need to be considered data [ Ian Campbell ] * [armhf] Enable cpufreq on some sunxi platforms (Closes: #793185) diff --git a/debian/patches/bugfix/all/keys-ensure-we-free-the-assoc-array-edit-if-edit-is-valid.patch b/debian/patches/bugfix/all/keys-ensure-we-free-the-assoc-array-edit-if-edit-is-valid.patch deleted file mode 100644 index 2eff4b90f..000000000 --- a/debian/patches/bugfix/all/keys-ensure-we-free-the-assoc-array-edit-if-edit-is-valid.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Colin Ian King -Subject: [PATCH] KEYS: ensure we free the assoc array edit if edit is valid -Origin: https://marc.info/?l=oss-security&m=143800676725867&w=2 - -__key_link_end is not freeing the associated array edit structure -and this leads to a 512 byte memory leak each time an identical -existing key is added with add_key(). - -The reason the add_key() system call returns okay is that -key_create_or_update() calls __key_link_begin() before checking to see -whether it can update a key directly rather than adding/replacing - which -it turns out it can. Thus __key_link() is not called through -__key_instantiate_and_link() and __key_link_end() must cancel the edit. - -CVE-2015-1333 - -Signed-off-by: Colin Ian King -Signed-off-by: David Howells ---- - -diff --git a/security/keys/keyring.c b/security/keys/keyring.c -index e72548b5897e..d33437007ad2 100644 ---- a/security/keys/keyring.c -+++ b/security/keys/keyring.c -@@ -1181,9 +1181,11 @@ void __key_link_end(struct key *keyring, - if (index_key->type == &key_type_keyring) - up_write(&keyring_serialise_link_sem); - -- if (edit && !edit->dead_leaf) { -- key_payload_reserve(keyring, -- keyring->datalen - KEYQUOTA_LINK_BYTES); -+ if (edit) { -+ if (!edit->dead_leaf) { -+ key_payload_reserve(keyring, -+ keyring->datalen - KEYQUOTA_LINK_BYTES); -+ } - assoc_array_cancel_edit(edit); - } - up_write(&keyring->sem); diff --git a/debian/patches/bugfix/s390/s390-cachinfo-add-missing-facility-check-to-init_cache_level.patch b/debian/patches/bugfix/s390/s390-cachinfo-add-missing-facility-check-to-init_cache_level.patch deleted file mode 100644 index 69fee010c..000000000 --- a/debian/patches/bugfix/s390/s390-cachinfo-add-missing-facility-check-to-init_cache_level.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Heiko Carstens -Date: Mon, 27 Jul 2015 09:53:49 +0200 -Subject: s390/cachinfo: add missing facility check to init_cache_level() -Origin: https://git.kernel.org/cgit/linux/kernel/git/s390/linux.git/commit/?id=0b991f5cdcd6201e5401f83ca3a672343c3bfc49 -Bug-Debian: https://bugs.debian.org/793929 - -Stephen Powell reported the following crash on a z890 machine: - -Kernel BUG at 00000000001219d0 [verbose debug info unavailable] -illegal operation: 0001 ilc:3 [#1] SMP -Krnl PSW : 0704e00180000000 00000000001219d0 (init_cache_level+0x38/0xe0) - R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 EA:3 -Krnl Code: 00000000001219c2: a7840056 brc 8,121a6e - 00000000001219c6: a7190000 lghi %r1,0 - #00000000001219ca: eb101000004c ecag %r1,%r0,0(%r1) - >00000000001219d0: a7390000 lghi %r3,0 - 00000000001219d4: e310f0a00024 stg %r1,160(%r15) - 00000000001219da: a7080000 lhi %r0,0 - 00000000001219de: a7b9f000 lghi %r11,-4096 - 00000000001219e2: c0a0002899d9 larl %r10,634d94 -Call Trace: - [<0000000000478ee2>] detect_cache_attributes+0x2a/0x2b8 - [<000000000097c9b0>] cacheinfo_sysfs_init+0x60/0xc8 - [<00000000001001c0>] do_one_initcall+0x98/0x1c8 - [<000000000094fdc2>] kernel_init_freeable+0x212/0x2d8 - [<000000000062352e>] kernel_init+0x26/0x118 - [<000000000062fd2e>] kernel_thread_starter+0x6/0xc - -The illegal operation was executed because of a missing facility check, -which should have made sure that the ECAG execution would only be executed -on machines which have the general-instructions-extension facility -installed. - -Reported-and-tested-by: Stephen Powell -Cc: stable@vger.kernel.org # v4.0+ -Signed-off-by: Heiko Carstens -Signed-off-by: Martin Schwidefsky - -diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c -index bff5e3b..8ba3243 100644 ---- a/arch/s390/kernel/cache.c -+++ b/arch/s390/kernel/cache.c -@@ -138,6 +138,8 @@ int init_cache_level(unsigned int cpu) - union cache_topology ct; - enum cache_type ctype; - -+ if (!test_facility(34)) -+ return -EOPNOTSUPP; - if (!this_cpu_ci) - return -EINVAL; - ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0); diff --git a/debian/patches/series b/debian/patches/series index a7a3c9dc3..ee3abd845 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -89,8 +89,6 @@ bugfix/x86/0006-x86-nmi-64-Switch-stacks-on-userspace-NMI-entry.patch bugfix/x86/0007-x86-nmi-64-Improve-nested-NMI-comments.patch bugfix/x86/0008-x86-nmi-64-Reorder-nested-NMI-checks.patch bugfix/x86/0009-x86-nmi-64-Use-DF-to-avoid-userspace-RSP-confusing-n.patch -bugfix/all/keys-ensure-we-free-the-assoc-array-edit-if-edit-is-valid.patch -bugfix/s390/s390-cachinfo-add-missing-facility-check-to-init_cache_level.patch bugfix/all/md-use-kzalloc-when-bitmap-is-disabled.patch # Hardening from grsecurity From 279bfdad45c1642697f868c509f2d62840f7b0ae Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 22:46:56 +0200 Subject: [PATCH 08/16] Bump ABI to 2 There are far too many changes to work around. --- debian/changelog | 1 + debian/config/defines | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5c9c2af0f..dd5614cc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -343,6 +343,7 @@ linux (4.1.5-1) UNRELEASED; urgency=medium - Update .gitignore files - debian/control: Update Vcs-* fields - README.Debian, README.source: Update references to svn + * Bump ABI to 2 -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/config/defines b/debian/config/defines index 9adc1c52b..3d7652d6a 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: 1 +abiname: 2 [base] arches: From 21364b62864c7f116a9ddbe4570422cc910b1695 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 22:54:01 +0200 Subject: [PATCH 09/16] virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156) --- debian/changelog | 1 + .../virtio-net-drop-netif_f_fraglist.patch | 41 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 43 insertions(+) create mode 100644 debian/patches/bugfix/all/virtio-net-drop-netif_f_fraglist.patch diff --git a/debian/changelog b/debian/changelog index dd5614cc4..67bb99989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -344,6 +344,7 @@ linux (4.1.5-1) UNRELEASED; urgency=medium - debian/control: Update Vcs-* fields - README.Debian, README.source: Update references to svn * Bump ABI to 2 + * virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156) -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/patches/bugfix/all/virtio-net-drop-netif_f_fraglist.patch b/debian/patches/bugfix/all/virtio-net-drop-netif_f_fraglist.patch new file mode 100644 index 000000000..6474d0c4e --- /dev/null +++ b/debian/patches/bugfix/all/virtio-net-drop-netif_f_fraglist.patch @@ -0,0 +1,41 @@ +From: Jason Wang +Subject: [PATCH net] virtio-net: drop NETIF_F_FRAGLIST +Date: Tue, 4 Aug 2015 17:55:45 +0800 +Origin: http://permalink.gmane.org/gmane.linux.kernel/2012169 + +virtio declares support for NETIF_F_FRAGLIST, but assumes +that there are at most MAX_SKB_FRAGS + 2 fragments which isn't +always true with a fraglist. + +A longer fraglist in the skb will make the call to skb_to_sgvec overflow +the sg array, leading to memory corruption. + +Drop NETIF_F_FRAGLIST so we only get what we can handle. + +Cc: Michael S. Tsirkin +Signed-off-by: Jason Wang +--- +The patch is needed for stable. +--- + drivers/net/virtio_net.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c +index 7fbca37..2347a73 100644 +--- a/drivers/net/virtio_net.c ++++ b/drivers/net/virtio_net.c +@@ -1756,9 +1756,9 @@ static int virtnet_probe(struct virtio_device *vdev) + /* Do we support "hardware" checksums? */ + if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) { + /* This opens up the world of extra features. */ +- dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST; ++ dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG; + if (csum) +- dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST; ++ dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG; + + if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) { + dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index ee3abd845..756d4fa37 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -96,3 +96,4 @@ features/all/grsecurity/grsecurity-kconfig.patch # Disabled until we add code into the grsecurity/ directory #features/all/grsecurity/grsecurity-kbuild.patch features/all/grsecurity/grkernsec_perf_harden.patch +bugfix/all/virtio-net-drop-netif_f_fraglist.patch From 517cfd5213de4484e9dda82c608b918578bfd5e0 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 12 Aug 2015 12:20:56 +0200 Subject: [PATCH 10/16] ovl: Add support for NFS as lower filesystem (Closes: #786925) --- debian/changelog | 1 + ...-ovl-don-t-traverse-automount-points.patch | 50 ++++ .../fix-a-braino-in-ovl_d_select_inode.patch | 28 +++ ...-allow-distributed-fs-as-lower-layer.patch | 227 ++++++++++++++++++ debian/patches/series | 3 + 5 files changed, 309 insertions(+) create mode 100644 debian/patches/bugfix/all/-ovl-don-t-traverse-automount-points.patch create mode 100644 debian/patches/bugfix/all/fix-a-braino-in-ovl_d_select_inode.patch create mode 100644 debian/patches/bugfix/all/ovl-allow-distributed-fs-as-lower-layer.patch diff --git a/debian/changelog b/debian/changelog index 67bb99989..e108ba183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -345,6 +345,7 @@ linux (4.1.5-1) UNRELEASED; urgency=medium - README.Debian, README.source: Update references to svn * Bump ABI to 2 * virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156) + * ovl: Add support for NFS as lower filesystem (Closes: #786925) -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/patches/bugfix/all/-ovl-don-t-traverse-automount-points.patch b/debian/patches/bugfix/all/-ovl-don-t-traverse-automount-points.patch new file mode 100644 index 000000000..84a92514f --- /dev/null +++ b/debian/patches/bugfix/all/-ovl-don-t-traverse-automount-points.patch @@ -0,0 +1,50 @@ +From: Miklos Szeredi +Date: Mon, 22 Jun 2015 13:53:48 +0200 +Subject: ovl: don't traverse automount points +Origin: https://git.kernel.org/linus/a6f15d9a756571babbb2b2cd4fdd1b64a5de232b +Bug-Debian: https://bugs.debian.org/786925 + +NFS and other distributed filesystems may place automount points in the +tree. Previoulsy overlayfs refused to mount such filesystems types (based +on the existence of the .d_automount callback), even if the actual export +didn't have any automount points. + +It cannot be determined in advance whether the filesystem has automount +points or not. The solution is to allow fs with .d_automount but refuse to +traverse any automount points encountered. + +Signed-off-by: Miklos Szeredi +--- + fs/overlayfs/super.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c +index bf8537c..de9d2ee 100644 +--- a/fs/overlayfs/super.c ++++ b/fs/overlayfs/super.c +@@ -303,6 +303,10 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir, + } else if (!dentry->d_inode) { + dput(dentry); + dentry = NULL; ++ } else if (dentry->d_flags & DCACHE_MANAGED_DENTRY) { ++ dput(dentry); ++ /* Don't support traversing automounts */ ++ dentry = ERR_PTR(-EREMOTE); + } + return dentry; + } +@@ -700,12 +704,12 @@ static bool ovl_is_allowed_fs_type(struct dentry *root) + + /* + * We don't support: +- * - automount filesystems ++ * - autofs + * - filesystems with revalidate (FIXME for lower layer) + * - filesystems with case insensitive names + */ + if (dop && +- (dop->d_manage || dop->d_automount || ++ (dop->d_manage || + dop->d_revalidate || dop->d_weak_revalidate || + dop->d_compare || dop->d_hash)) { + return false; diff --git a/debian/patches/bugfix/all/fix-a-braino-in-ovl_d_select_inode.patch b/debian/patches/bugfix/all/fix-a-braino-in-ovl_d_select_inode.patch new file mode 100644 index 000000000..903118e94 --- /dev/null +++ b/debian/patches/bugfix/all/fix-a-braino-in-ovl_d_select_inode.patch @@ -0,0 +1,28 @@ +From: Al Viro +Date: Sun, 12 Jul 2015 10:39:45 -0400 +Subject: fix a braino in ovl_d_select_inode() +Origin: https://git.kernel.org/linus/9391dd00d13c853ab4f2a85435288ae2202e0e43 +Bug-Debian: https://bugs.debian.org/786925 + +when opening a directory we want the overlayfs inode, not one from +the topmost layer. + +Reported-By: Andrey Jr. Melnikov +Tested-By: Andrey Jr. Melnikov +Signed-off-by: Al Viro +--- + fs/overlayfs/inode.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/fs/overlayfs/inode.c ++++ b/fs/overlayfs/inode.c +@@ -344,6 +344,9 @@ static int ovl_dentry_open(struct dentry + enum ovl_path_type type; + bool want_write = false; + ++ if (d_is_dir(dentry)) ++ return d_backing_inode(dentry); ++ + type = ovl_path_real(dentry, &realpath); + if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) { + want_write = true; diff --git a/debian/patches/bugfix/all/ovl-allow-distributed-fs-as-lower-layer.patch b/debian/patches/bugfix/all/ovl-allow-distributed-fs-as-lower-layer.patch new file mode 100644 index 000000000..66976e292 --- /dev/null +++ b/debian/patches/bugfix/all/ovl-allow-distributed-fs-as-lower-layer.patch @@ -0,0 +1,227 @@ +From: Miklos Szeredi +Date: Mon, 22 Jun 2015 13:53:48 +0200 +Subject: ovl: allow distributed fs as lower layer +Origin: https://git.kernel.org/linus/7c03b5d45b8eebf0111125053d8fe887cc262ba6 +Bug-Debian: https://bugs.debian.org/786925 + +Allow filesystems with .d_revalidate as lower layer(s), but not as upper +layer. + +For local filesystems the rule was that modifications on the layers +directly while being part of the overlay results in undefined behavior. + +This can easily be extended to distributed filesystems: we assume the tree +used as lower layer is static, which means ->d_revalidate() should always +return "1". If that is not the case, return -ESTALE, don't try to work +around the modification. + +Signed-off-by: Miklos Szeredi +--- + fs/overlayfs/super.c | 113 +++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 88 insertions(+), 25 deletions(-) + +diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c +index de9d2ee..8a08c58 100644 +--- a/fs/overlayfs/super.c ++++ b/fs/overlayfs/super.c +@@ -273,10 +273,57 @@ static void ovl_dentry_release(struct dentry *dentry) + } + } + ++static int ovl_dentry_revalidate(struct dentry *dentry, unsigned int flags) ++{ ++ struct ovl_entry *oe = dentry->d_fsdata; ++ unsigned int i; ++ int ret = 1; ++ ++ for (i = 0; i < oe->numlower; i++) { ++ struct dentry *d = oe->lowerstack[i].dentry; ++ ++ if (d->d_flags & DCACHE_OP_REVALIDATE) { ++ ret = d->d_op->d_revalidate(d, flags); ++ if (ret < 0) ++ return ret; ++ if (!ret) { ++ if (!(flags & LOOKUP_RCU)) ++ d_invalidate(d); ++ return -ESTALE; ++ } ++ } ++ } ++ return 1; ++} ++ ++static int ovl_dentry_weak_revalidate(struct dentry *dentry, unsigned int flags) ++{ ++ struct ovl_entry *oe = dentry->d_fsdata; ++ unsigned int i; ++ int ret = 1; ++ ++ for (i = 0; i < oe->numlower; i++) { ++ struct dentry *d = oe->lowerstack[i].dentry; ++ ++ if (d->d_flags & DCACHE_OP_WEAK_REVALIDATE) { ++ ret = d->d_op->d_weak_revalidate(d, flags); ++ if (ret <= 0) ++ break; ++ } ++ } ++ return ret; ++} ++ + static const struct dentry_operations ovl_dentry_operations = { + .d_release = ovl_dentry_release, + }; + ++static const struct dentry_operations ovl_reval_dentry_operations = { ++ .d_release = ovl_dentry_release, ++ .d_revalidate = ovl_dentry_revalidate, ++ .d_weak_revalidate = ovl_dentry_weak_revalidate, ++}; ++ + static struct ovl_entry *ovl_alloc_entry(unsigned int numlower) + { + size_t size = offsetof(struct ovl_entry, lowerstack[numlower]); +@@ -288,6 +335,20 @@ static struct ovl_entry *ovl_alloc_entry(unsigned int numlower) + return oe; + } + ++static bool ovl_dentry_remote(struct dentry *dentry) ++{ ++ return dentry->d_flags & ++ (DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE); ++} ++ ++static bool ovl_dentry_weird(struct dentry *dentry) ++{ ++ return dentry->d_flags & (DCACHE_NEED_AUTOMOUNT | ++ DCACHE_MANAGE_TRANSIT | ++ DCACHE_OP_HASH | ++ DCACHE_OP_COMPARE); ++} ++ + static inline struct dentry *ovl_lookup_real(struct dentry *dir, + struct qstr *name) + { +@@ -303,9 +364,9 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir, + } else if (!dentry->d_inode) { + dput(dentry); + dentry = NULL; +- } else if (dentry->d_flags & DCACHE_MANAGED_DENTRY) { ++ } else if (ovl_dentry_weird(dentry)) { + dput(dentry); +- /* Don't support traversing automounts */ ++ /* Don't support traversing automounts and other weirdness */ + dentry = ERR_PTR(-EREMOTE); + } + return dentry; +@@ -354,6 +415,11 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, + goto out; + + if (this) { ++ if (unlikely(ovl_dentry_remote(this))) { ++ dput(this); ++ err = -EREMOTE; ++ goto out; ++ } + if (ovl_is_whiteout(this)) { + dput(this); + this = NULL; +@@ -698,25 +764,6 @@ static void ovl_unescape(char *s) + } + } + +-static bool ovl_is_allowed_fs_type(struct dentry *root) +-{ +- const struct dentry_operations *dop = root->d_op; +- +- /* +- * We don't support: +- * - autofs +- * - filesystems with revalidate (FIXME for lower layer) +- * - filesystems with case insensitive names +- */ +- if (dop && +- (dop->d_manage || +- dop->d_revalidate || dop->d_weak_revalidate || +- dop->d_compare || dop->d_hash)) { +- return false; +- } +- return true; +-} +- + static int ovl_mount_dir_noesc(const char *name, struct path *path) + { + int err = -EINVAL; +@@ -731,7 +778,7 @@ static int ovl_mount_dir_noesc(const char *name, struct path *path) + goto out; + } + err = -EINVAL; +- if (!ovl_is_allowed_fs_type(path->dentry)) { ++ if (ovl_dentry_weird(path->dentry)) { + pr_err("overlayfs: filesystem on '%s' not supported\n", name); + goto out_put; + } +@@ -755,13 +802,21 @@ static int ovl_mount_dir(const char *name, struct path *path) + if (tmp) { + ovl_unescape(tmp); + err = ovl_mount_dir_noesc(tmp, path); ++ ++ if (!err) ++ if (ovl_dentry_remote(path->dentry)) { ++ pr_err("overlayfs: filesystem on '%s' not supported as upperdir\n", ++ tmp); ++ path_put(path); ++ err = -EINVAL; ++ } + kfree(tmp); + } + return err; + } + + static int ovl_lower_dir(const char *name, struct path *path, long *namelen, +- int *stack_depth) ++ int *stack_depth, bool *remote) + { + int err; + struct kstatfs statfs; +@@ -778,6 +833,9 @@ static int ovl_lower_dir(const char *name, struct path *path, long *namelen, + *namelen = max(*namelen, statfs.f_namelen); + *stack_depth = max(*stack_depth, path->mnt->mnt_sb->s_stack_depth); + ++ if (ovl_dentry_remote(path->dentry)) ++ *remote = true; ++ + return 0; + + out_put: +@@ -831,6 +889,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) + unsigned int numlower; + unsigned int stacklen = 0; + unsigned int i; ++ bool remote = false; + int err; + + err = -ENOMEM; +@@ -904,7 +963,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) + lower = lowertmp; + for (numlower = 0; numlower < stacklen; numlower++) { + err = ovl_lower_dir(lower, &stack[numlower], +- &ufs->lower_namelen, &sb->s_stack_depth); ++ &ufs->lower_namelen, &sb->s_stack_depth, ++ &remote); + if (err) + goto out_put_lowerpath; + +@@ -962,7 +1022,10 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) + if (!ufs->upper_mnt) + sb->s_flags |= MS_RDONLY; + +- sb->s_d_op = &ovl_dentry_operations; ++ if (remote) ++ sb->s_d_op = &ovl_reval_dentry_operations; ++ else ++ sb->s_d_op = &ovl_dentry_operations; + + err = -ENOMEM; + oe = ovl_alloc_entry(numlower); diff --git a/debian/patches/series b/debian/patches/series index 756d4fa37..98e0e4a72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -97,3 +97,6 @@ features/all/grsecurity/grsecurity-kconfig.patch #features/all/grsecurity/grsecurity-kbuild.patch features/all/grsecurity/grkernsec_perf_harden.patch bugfix/all/virtio-net-drop-netif_f_fraglist.patch +bugfix/all/-ovl-don-t-traverse-automount-points.patch +bugfix/all/ovl-allow-distributed-fs-as-lower-layer.patch +bugfix/all/fix-a-braino-in-ovl_d_select_inode.patch From eca2a3e0eb899bcb7a4afea6d0a9e8fe184521ab Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 12 Aug 2015 16:07:19 +0200 Subject: [PATCH 11/16] Improve changelog for stable updates 4.1.4, 4.1.5 Delete entries for commits that are unimportant or previously cherry- picked. Add architecture qualifications, regression versions and one bug number. --- debian/changelog | 294 ++++++++++++++--------------------------------- 1 file changed, 87 insertions(+), 207 deletions(-) diff --git a/debian/changelog b/debian/changelog index e108ba183..435d09fd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,327 +2,207 @@ linux (4.1.5-1) UNRELEASED; urgency=medium * New upstream stable update: https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 - - [armhf] pinctrl: mvebu: armada-370: fix spi0 pin description - - [armhf] pinctrl: mvebu: armada-xp: remove non-existing NAND pins - - [armhf] pinctrl: mvebu: armada-xp: remove non-existing VDD cpu_pd - functions - - [armhf] pinctrl: mvebu: armada-xp: fix functions of MPP48 - - Bluetooth: Fix race condition with user channel and setup stage - - Bluetooth: btusb: Fix memory leak in Intel setup routine - - Bluetooth: btusb: Fix secure send command length alignment on Intel 8260 - - Bluetooth: btusb: Correct typo in Roper Class 1 Bluetooth Dongle - Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on Apple - - ath9k: fix DMA stop sequence for AR9003+ + (regression in 4.1) - ath9k_htc: memory corruption calling set_bit() - - rtlwifi: Remove the clear interrupt routine from all drivers - ieee802154: Fix sockaddr_ieee802154 implicit padding information leak. - staging: vt6656: check ieee80211_bss_conf bssid not NULL - staging: vt6655: check ieee80211_bss_conf bssid not NULL - staging: vt6655: device_rx_srv check sk_buff is NULL - staging: rtl8712: prevent buffer overrun in recvbuf2recvframe - - staging: comedi: cb_pcimdas: fix handlers for DI and DO subdevices - - hid-sensor: Fix suspend/resume delay + - hid-sensor: Fix suspend/resume delay (regression in 4.0) - ext4: fix race between truncate and __ext4_journalled_writepage() - ext4: call sync_blockdev() before invalidate_bdev() in put_super() - ext4: don't retry file block mapping on bigalloc fs with non-extent file - - ext4: set lazytime on remount if MS_LAZYTIME is set by mount - ext4: fix fencepost error in lazytime optimization - - bufferhead: Add _gfp version for sb_getblk() - ext4: avoid deadlocks in the writeback path by using sb_getblk_gfp - ext4: fix reservation release on invalidatepage for delalloc fs - ext4: be more strict when migrating to non-extent based file - ext4: correctly migrate a file with a hole at the beginning - - ext4: replace open coded nofail allocation in ext4_free_blocks() - jbd2: use GFP_NOFS in jbd2_cleanup_journal_tail() - jbd2: fix ocfs2 corrupt when updating journal superblock fails - - NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer - - NFC: st21nfcb: Do not remove header once the payload is sent - - NFC: st21nfcb: remove st21nfcb_nci_i2c_disable - [armhf] rtc: snvs: fix wakealarm by call enable_irq_wake earlier + (regression in 3.19) - i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer() - - i2c: use parent adapter quirks in mux + (regression in 4.1) + - i2c: use parent adapter quirks in mux (regression in 4.1) - vb2: Don't WARN when v4l2_buffer.bytesused is 0 for multiplanar buffers + (regression in 4.1) - media: Fix regression in some more dib0700 based devices - - rc-core: fix dib0700 scancode generation for RC5 - - cx18: add missing caps for the PCM video device + (regression in 3.17) + - rc-core: fix dib0700 scancode generation for RC5 (regression in 3.17) - cx24117: fix a buffer overflow when checking userspace params - af9013: Don't accept invalid bandwidth - - saa7164: fix querycap warning - s5h1420: fix a buffer overflow when checking userspace params - cx24116: fix a buffer overflow when checking userspace params - - [armhf] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency, again - - libata: Do not blacklist Micron M500DC - - libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for HP 250GB SATA disk - VB0250EAVER - - libata: increase the timeout when setting transfer mode - libata: Fall back to unqueued READ LOG EXT if the DMA variant fails + (regression in 4.1) - libata: Expose TRIM capability in sysfs - libata: add ATA_HORKAGE_NOTRIM - libata: add ATA_HORKAGE_MAX_SEC_1024 to revert back to previous - max_sectors limit - - libata: Do not blacklist M510DC + max_sectors limit (regression in 3.19) - libata: force disable trim for SuperSSpeed S238 - - [armhf] usb: dwc3: gadget: return error if command sent to DGCMD register - fails - - [armhf] usb: dwc3: gadget: return error if command sent to DEPCMD - register fails - [armhf] usb: dwc3: gadget: don't clear EP_BUSY too early - - [armhf] usb: dwc3: Reset the transfer resource index on SET_INTERFACE - - usb: core: Fix USB 3.0 devices lost in NOTATTACHED state after a hub port - reset + (regression in 3.15) - USB: devio: fix a condition in async_completed() - [armhf] phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in - probe function. - - [armhf] usb: phy: mxs: suspend to RAM causes NULL pointer dereference - - usb: gadget: composite: Fix NULL pointer dereference + probe function. (regression in 3.17) + - usb: gadget: composite: Fix NULL pointer dereference (regression in 4.1) - usb: gadget: f_fs: do not set cancel function on synchronous {read,write} - - usb: gadget: mv_udc_core: fix phy_regs I/O memory leak - - usb: f_mass_storage: limit number of reported LUNs - - [armhf] usb: musb: host: rely on port_mode to call musb_start() - - USB: cp210x: add ID for Aruba Networks controllers - - USB: option: add 2020:4000 ID - - USB: serial: Destroy serial_minors IDR on module exit + (regression in 4.0) - USB: OHCI: Fix race between ED unlink and URB submission - - usb: core: lpm: set lpm_capable for root hub device + (regression in 3.17) + - usb: core: lpm: set lpm_capable for root hub device (regression in 3.15) - usb: xhci: Bugfix for NULL pointer deference in xhci_endpoint_init() function - dm cache: fix race when issuing a POLICY_REPLACE operation - - dm stats: fix divide by zero if 'number_of_areas' arg is zero - - dm space map metadata: fix occasional leak of a metadata block on resize - dm btree remove: fix bug in redistribute3 - - dm thin: allocate the cell_sort_array dynamically - - dm btree: silence lockdep lock inversion in dm_btree_del() - - mmc: block: Add missing mmc_blk_put() in power_ro_lock_show() - - block: loop: convert to per-device workqueue - - block: loop: avoiding too many pending per work I/O - - block: Do a full clone when splitting discard bios - - drm/vgem: Set unique to "vgem" + - block: loop: convert to per-device workqueue (regression in 4.0) + - block: loop: avoiding too many pending per work I/O (regression in 4.0) + - block: Do a full clone when splitting discard bios (Closes: #793326) + (regression in 3.14) - [armhf] drm/tegra: dpaux: Fix transfers larger than 4 bytes + (regression in 3.15) - drm/qxl: Do not cause spice-server to clean our objects - - drm/qxl: Do not leak memory if qxl_release_list_add fails - drm/atomic: fix out of bounds read in for_each_*_in_state helpers + (regression in 4.1) - drm/radeon: take the mode_config mutex when dealing with hpds (v2) - - drm/radeon: clean up radeon_audio_enable - [x86] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path - - [x86] drm/i915: Fix IPS related flicker - - [x86] drm/i915: fix backlight after resume on 855gm - - [x86] drm/i915: Declare the swizzling unknown for L-shaped configurations + (regression in 4.1) + - [x86] drm/i915: fix backlight after resume on 855gm (regression in 3.19) - [x86] drm/i915: Snapshot seqno of most recently submitted request. - - [x86] drm/i915: Forward all core DRM ioctls to core compat handling - - [x86] Revert "drm/i915: Declare the swizzling unknown for L-shaped - configurations" - - [x86] drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls - - drm/radeon: compute ring fix hibernation (CI GPU family) v2. - - drm/radeon: SDMA fix hibernation (CI GPU family). - - Revert "drm/radeon: dont switch vt on suspend" - - drm/radeon: only check the sink type on DP connectors - - drm/radeon: fix HDP flushing - - drm/radeon: Handle irqs only based on irq ring, not irq status regs. - - drm/radeon: Clean up reference counting and pinning of the cursor BOs + (regression in 4.0) + - Revert "drm/radeon: dont switch vt on suspend" (regression in 4.1) - drm/radeon: unpin cursor BOs on suspend and pin them again on resume (v2) - - drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL - - drm/radeon: add a dpm quirk for Sapphire Radeon R9 270X 2GB GDDR5 + (regression in 4.1) - drm/radeon: fix user ptr race condition - drm/radeon/ci: silence a harmless PCC warning - drm: add a check for x/y in drm_mode_setcrtc - - drm: Provide compat ioctl for addfb2.1 - - drm: Stop resetting connector state to unknown + - drm: Stop resetting connector state to unknown (regression in 4.1) - libata: Fix regression when the NCQ Send and Receive log page is absent - xfs: fix remote symlinks on V5/CRC filesystems - xfs: don't truncate attribute extents if no extents exist - - w1_therm reference count family data - - tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add() - - vTPM: set virtual device before passing to ibmvtpm_reset_crq - - tpm: Fix initialization of the cdev + (regression in 4.1) + - tpm: Fix initialization of the cdev (regression in 4.0) - tpm, tpm_crb: fail when TPM2 ACPI table contents look corrupted - - KEYS: fix "ca_keys=" partial key matching - - KEYS: ensure we free the assoc array edit if edit is valid - - tracing/filter: Do not WARN on operand count going below zero - - tracing/filter: Do not allow infix to exceed end of string - - tracing: Fix typo from "static inlin" to "static inline" - - tracing: Have branch tracer use recursive field of task struct - - tracing: Fix sample output of dynamic arrays + (regression in 4.1) - [armel,armhf] dmaengine: mv_xor: bug fix for racing condition in descriptors cleanup - - md: clear mddev->private when it has been freed. - - md: unlock mddev_lock on an error path. - - md: Skip cluster setup for dm-raid + - md: clear mddev->private when it has been freed. (regression in 4.0) + - md: unlock mddev_lock on an error path. (regression in 4.0) + - md: Skip cluster setup for dm-raid (regression in 4.1) - Btrfs: don't invalidate root dentry when subvolume deletion fails - - md: fix a build warning + (regression in 3.18) - Btrfs: use kmem_cache_free when freeing entry in inode cache - - Btrfs: fix race between caching kthread and returning inode to inode cache + - Btrfs: fix race between caching kthread and returning inode to inode + cache (regression in 3.15) - Btrfs: fix fsync data loss after append write - - Btrfs: fix memory leak in the extent_same ioctl - Btrfs: fix list transaction->pending_ordered corruption + (regression in 3.19) - Btrfs: fix file corruption after cloning inline extents - - selinux: don't waste ebitmap space when importing NetLabel categories - selinux: fix mprotect PROT_EXEC regression caused by mm change - - fuse: initialize fc->release before calling it - - crush: fix a bug in tree bucket decode - - ACPI / resources: free memory on error in add_region_before() + (regression in 4.1) + - ceph/crush: fix a bug in tree bucket decode - ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage - - ACPI / LPSS: Fix up acpi_lpss_create_device() - - ACPICA: Tables: Enable both 32-bit and 64-bit FACS - - ACPICA: Tables: Fix an issue that FACS initialization is performed twice + (regression in 4.1) + - ACPI / LPSS: Fix up acpi_lpss_create_device() (regression in 4.0) + - ACPICA: Tables: Enable both 32-bit and 64-bit FACS (regression in 3.14) - ACPICA: Tables: Enable default 64-bit FADT addresses favor - ACPI / PCI: Fix regressions caused by resource_size_t overflow with - 32-bit kernel - - [armhf] serial: samsung: only use earlycon for console - - mmc: card: Fixup request missing in mmc_blk_issue_rw_rq - - mmc: sdhci: Restore behavior while creating OCR mask - - PM / clk: Fix clock error check in __pm_clk_add() - - RDMA/ocrdma: fix double free on pd - - tty: remove platform_sysrq_reset_seq - - mm/hugetlb: introduce minimum hugepage order + 32-bit kernel (regression in 4.0) + - mmc: sdhci: Restore behavior while creating OCR mask (regression in 3.17) + - PM / clk: Fix clock error check in __pm_clk_add() (regression in 3.19) + - RDMA/ocrdma: fix double free on pd (regression in 4.0) + - mm/hugetlb: introduce minimum hugepage order (regression in 3.12) - PM / sleep: Increase default DPM watchdog timeout to 60 + (regression in 3.13) - firmware: dmi_scan: Only honor end-of-table for 64-bit tables - - __bitmap_parselist: fix bug in empty string handling - - security_syslog() should be called once only + (regression in 3.19) - mac80211: fix the beacon csa counter for mesh and ibss - - iwlwifi: mvm: fix ROC reference accounting + (regression in 3.17) + - iwlwifi: mvm: fix ROC reference accounting (regression in 3.17) - cfg80211: ignore netif running state when changing iftype - - mac80211: prevent possible crypto tx tailroom corruption - e1000e: Cleanup handling of VLAN_HLEN as a part of max frame size - - clocksource: exynos_mct: Avoid blocking calls in the cpu hotplug notifier - - [x86] ideapad_laptop: Lenovo G50-30 fix rfkill reports wireless blocked - - [x86] ideapad: fix software rfkill setting - - of/address: use atomic allocation in pci_register_io_range() - - [x86] dell-laptop: Fix allocating & freeing SMI buffer page - - ovl: lookup whiteouts outside iterate_dir() - - of: return NUMA_NO_NODE from fallback of_node_to_nid() - - watchdog: omap: assert the counter being stopped before reprogramming - - gpiolib: Add missing dummies for the unified device properties interface - - clk: Fix JSON output in debugfs + (regression in 3.15) + - ovl: lookup whiteouts outside iterate_dir() (regression in 4.0) - pNFS: Fix a memory leak when attempted pnfs fails - pNFS/flexfiles: Fix the reset of struct pgio_header when resending - - NFS: Fix size of NFSACL SETACL operations - nfs: fixing infinite OPEN loop in 4.0 stateid recovery - - nfs: increase size of EXCHANGE_ID name string buffer - NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes - nfs: fix potential credential leak in ff_layout_update_mirror_cred - nfs: always update creds in mirror, even when we have an already connected ds - - SUNRPC: Fix a memory leak in the backchannel code - 9p: forgetting to cancel request on interrupted zero-copy RPC - 9p: don't leave a half-initialized inode sitting around - - rbd: use GFP_NOIO in rbd_obj_request_create() - - [x86] agp/intel: Fix typo in needs_ilk_vtd_wa() - - [mips] EDAC, octeon: Fix broken build due to model helper renames - p9_client_write(): avoid double p9_free_req() - - [arm64] smp: Fix suspicious RCU usage with ipi tracepoints - [arm64] bpf: fix out-of-bounds read in bpf2a64_offset() - [arm64] bpf: fix endianness conversion bugs - [arm64] Don't report clear pmds and puds as huge - - [armel,armhf] 8393/1: smp: Fix suspicious RCU usage with ipi tracepoints - - [armel,armhf] 8397/1: fix vdsomunge not to depend on glibc specific - error.h - - hpfs: kstrdup() out of memory handling - - hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead - - Fix firmware loader uevent buffer NULL pointer dereference - mm: avoid setting up anonymous pages into file mapping - - [x86] mpx: Do not set ->vm_ops on MPX VMAs https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 - [powerpc*] powernv: Fix race in updating core_idle_state + (regression in 3.19) - Revert "Input: synaptics - allocate 3 slots to keep stability in image - sensors" + sensors" (regression in 4.1) - [hppa] Fix some PTE/TLB race conditions and optimize __flush_tlb_range based on timing results - [hppa] mm: Fix a memory leak related to pmd not attached to the pgd + (regression in 4.0) - [armel,armhf] 8404/1: dma-mapping: fix off-by-one error in bitmap size - check - - [armhf] imx6: gpc: always enable PU domain if CONFIG_PM is not set + check (regression in 3.15) - [mips*] c-r4k: Fix cache flushing for MT cores - - [mips*] Require O32 FP64 support for MIPS64 with O32 compat - - can: replace timestamp as unique skb attribute - - can: rcar_can: fix IRQ check - - can: c_can: Fix default pinmux glitch at init - - can: rcar_can: print signed IRQ # - - can: mcp251x: fix resume when device is down + - can: replace timestamp as unique skb attribute (regression in 4.1) - vfs: freeing unlinked file indefinitely delayed - - [x86] init: Clear 'init_level4_pgt' earlier - - [x86] kasan: Fix KASAN shadow region page tables - - [x86] kasan: Flush TLBs after switching CR3 - - [x86] kasan: Fix boot crash on AMD processors - - crypto: omap-des - Fix unmapping of dma channels - - [s390x] process: fix sfpc inline assembly - - [s390x] sclp: clear upper register halves in _sclp_print_early + - [armhf] crypto: omap-des - Fix unmapping of dma channels - [s390x] nmi: fix vector register corruption - [s390x] bpf: clear correct BPF accumulator register - - bio integrity: do not assume bio_integrity_pool exists if bioset exists - - dma-debug: skip debug_dma_assert_idle() when disabled - genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD - - ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4 - - ALSA: line6: Fix -EBUSY error during active monitoring - - ALSA: pcm: Fix lockdep warning with nonatomic PCM ops - - [x86] ALSA: hda - Add headset mic support for Acer Aspire V5-573G - - ALSA: hda: add new AMD PCI IDs with proper driver caps - - ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda - - [x86] ALSA: hda - Add headset mic pin quirk for a Dell device - - [x86] ALSA: hda - Apply fixup for another Toshiba Satellite S50D - - [x86] ALSA: hda - Apply a fixup to Dell Vostro 5480 - - ALSA: usb-audio: add dB range mapping for some devices - - [x86] ALSA: hda - Fix MacBook Pro 5,2 quirk - - [x86] perf: Fix static_key bug in load_mm_cr4() + - [x86] perf: Fix static_key bug in load_mm_cr4() (regression in 4.0) - Revert "dm: only run the queue on completion if congested or no requests - pending" - - [arm64] irqchip/gicv3-its: Fix mapping of LPIs to collections + pending" (regression in 4.1) - scsi: fix host max depth checking for the 'queue_depth' sysfs interface - - scsi: fix memory leak with scsi-mq - - st: null pointer dereference panic caused by use after kref_put by st_open - - drivers: clk: st: Fix flexgen lock init - - drivers: clk: st: Fix mux bit-setting for Cortex A9 clocks - - drivers: clk: st: Incorrect register offset used for lock_status - - mac80211: clear subdir_stations when removing debugfs + (regression in 3.19) + - scsi: fix memory leak with scsi-mq (regression in 3.17) - mnt: Clarify and correct the disconnect logic in umount_tree + (regressions in 4.0.2, 4.1) - mnt: In detach_mounts detach the appropriate unmounted mount - - ftrace: Fix breakage of set_ftrace_pid - - [x86] iommu/vt-d: Fix VM domain ID leak - - [armhf] mmc: omap_hsmmc: Fix DTO and DCRC handling + (regression in 4.1) + - ftrace: Fix breakage of set_ftrace_pid (regression in 3.16) + - [x86] iommu/vt-d: Fix VM domain ID leak (regression in 3.17) - mmc: sdhci check parameters before call dma_free_coherent - - mmc: sdhci-esdhc: Make 8BIT bus work - - HID: cp2112: fix to force single data-report reply + (regression in 3.16) - iwlwifi: mvm: fix antenna selection when BT is active - - iwlwifi: nvm: remove mac address byte swapping in 8000 family - - iwlwifi: pcie: prepare the device before accessing it + (regression in 3.17) - md/raid1: fix test for 'was read error from last working device'. - - [armhf] spi: imx: Fix small DMA transfers - - Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen - - blkcg: fix gendisk reference leak in blkg_conf_prep() + - [armhf] spi: imx: Fix small DMA transfers (regression in 3.18) - [armhf] regulator: s2mps11: Fix GPIO suspend enable shift wrapping bug - - ata: pmp: add quirk for Marvell 4140 SATA PMP - usb-storage: ignore ZTE MF 823 card reader in mode 0x1225 - [armhf] Revert "serial: imx: initialized DMA w/o HW flow enabled" - - serial: core: Fix crashes while echoing when closing - - xhci: Calculate old endpoints correctly on device reset - - xhci: report U3 when link is in resume state - - xhci: prevent bus_suspend if SS port resuming in phase 1 - - xhci: do not report PLC when link is in internal resume state - - mei: prevent unloading mei hw modules while the device is opened. - - [x86] mm: Add parenthesis for TLB tracepoint size calculation + (regression in 4.0) + - serial: core: Fix crashes while echoing when closing (regression in 3.19) - efi: Handle memory error structures produced based on old versions of - standard - - [arm64] efi: map the entire UEFI vendor string before reading it - - efi: Check for NULL efi kernel parameters + standard (regression in 3.13) - [x86] efi: Use all 64 bit of efi_memmap in setup_e820() - rds: rds_ib_device.refcount overflow - - n_tty: signal and flush atomically - - blk-mq: set default timeout as 30 seconds + - n_tty: signal and flush atomically (regression in 4.0) - [x86] perf/intel/cqm: Return cached counter value from IRQ context - - vhost: actually track log eventfd file + (regression in 4.1)f - NFS: Don't revalidate the mapping if both size and change attr are up to - date + date (regression in 3.16) - NFSv4: We must set NFS_OPEN_STATE flag in nfs_resync_open_stateid_locked - - NFS: Fix a memory leak in nfs_do_recoalesce - - IB/ipoib: Fix CONFIG_INFINIBAND_IPOIB_CM + (regression in 4.0) + - NFS: Fix a memory leak in nfs_do_recoalesce (regression in 4.0) - iscsi-target: Fix use-after-free during TPG session shutdown - - iscsi-target: Fix iscsit_start_kthreads failure OOPs + - iscsi-target: Fix iscsit_start_kthreads failure OOPs (regression in 4.0) - iscsi-target: Fix iser explicit logout TX kthread leak - - [x86] intel_pstate: Add get_scaling cpu_defaults param to Knights Landing + (regression in 4.0) - qla2xxx: Fix hardware lock/unlock issue causing kernel panic. - - qla2xxx: release request queue reservation. - - qla2xxx: Remove msleep in qlt_send_term_exchange - - qla2xxx: fix command initialization in target mode. - - qla2xxx: kill sessions/log out initiator on RSCN and port down events + (regression in 3.18) + - qla2xxx: release request queue reservation. (regression in 3.18) + - qla2xxx: Remove msleep in qlt_send_term_exchange (regression in 3.18) + - qla2xxx: fix command initialization in target mode. (regression in 3.18) + - qla2xxx: kill sessions/log out initiator on RSCN and port down efvents + (regression in 3.18) - drm/nouveau/fbcon/nv11-: correctly account for ring space usage - drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads - drm/nouveau: hold mutex when calling nouveau_abi16_fini() From b13fc71d7effb8e9c51aaf2735c247c00a925473 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 12 Aug 2015 17:34:12 +0200 Subject: [PATCH 12/16] perf: Fix double-free of the AUX buffer --- debian/changelog | 1 + ...rf-fix-double-free-of-the-aux-buffer.patch | 44 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+) create mode 100644 debian/patches/bugfix/all/perf-fix-double-free-of-the-aux-buffer.patch diff --git a/debian/changelog b/debian/changelog index 435d09fd2..56c4fdcc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -226,6 +226,7 @@ linux (4.1.5-1) UNRELEASED; urgency=medium * Bump ABI to 2 * virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156) * ovl: Add support for NFS as lower filesystem (Closes: #786925) + * perf: Fix double-free of the AUX buffer -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/patches/bugfix/all/perf-fix-double-free-of-the-aux-buffer.patch b/debian/patches/bugfix/all/perf-fix-double-free-of-the-aux-buffer.patch new file mode 100644 index 000000000..32125aea6 --- /dev/null +++ b/debian/patches/bugfix/all/perf-fix-double-free-of-the-aux-buffer.patch @@ -0,0 +1,44 @@ +From: Ben Hutchings +Date: Mon, 27 Jul 2015 00:31:08 +0100 +Subject: perf: Fix double-free of the AUX buffer +Origin: https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit?id=ee9397a6fb9bc4e52677f5e33eed4abee0f515e6 + +If rb->aux_refcount is decremented to zero before rb->refcount, +__rb_free_aux() may be called twice resulting in a double free of +rb->aux_pages. Fix this by adding a check to __rb_free_aux(). + +Signed-off-by: Ben Hutchings +Signed-off-by: Peter Zijlstra (Intel) +Cc: Alexander Shishkin +Cc: Arnaldo Carvalho de Melo +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Cc: stable@vger.kernel.org +Fixes: 57ffc5ca679f ("perf: Fix AUX buffer refcounting") +Link: http://lkml.kernel.org/r/1437953468.12842.17.camel@decadent.org.uk +Signed-off-by: Ingo Molnar +--- + kernel/events/ring_buffer.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/kernel/events/ring_buffer.c ++++ b/kernel/events/ring_buffer.c +@@ -547,11 +547,13 @@ static void __rb_free_aux(struct ring_bu + rb->aux_priv = NULL; + } + +- for (pg = 0; pg < rb->aux_nr_pages; pg++) +- rb_free_aux_page(rb, pg); ++ if (rb->aux_nr_pages) { ++ for (pg = 0; pg < rb->aux_nr_pages; pg++) ++ rb_free_aux_page(rb, pg); + +- kfree(rb->aux_pages); +- rb->aux_nr_pages = 0; ++ kfree(rb->aux_pages); ++ rb->aux_nr_pages = 0; ++ } + } + + void rb_free_aux(struct ring_buffer *rb) diff --git a/debian/patches/series b/debian/patches/series index 98e0e4a72..1f216234d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -100,3 +100,4 @@ bugfix/all/virtio-net-drop-netif_f_fraglist.patch bugfix/all/-ovl-don-t-traverse-automount-points.patch bugfix/all/ovl-allow-distributed-fs-as-lower-layer.patch bugfix/all/fix-a-braino-in-ovl_d_select_inode.patch +bugfix/all/perf-fix-double-free-of-the-aux-buffer.patch From 3bb9b71582f72bb67f8b799393894d01b6feff16 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 12 Aug 2015 18:02:17 +0200 Subject: [PATCH 13/16] linux-source: Fix compression of the source tarball (Closes: #795199) When we introduced the find | sort | xargs tar pipeline to make the tarball reproducible, I was concerned that there could be so many arguments that xargs would call tar more than once. I therefore changed the tar -c option to -r so that it would append rather than overwriting in this case. However, the -a option seems to have no effect when -r is used, so the tarball is no longer compressed. Instead of using xargs, use tar's -T option and change the -r back to -c. --- debian/changelog | 1 + debian/rules.real | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 56c4fdcc1..b5b331d09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -227,6 +227,7 @@ linux (4.1.5-1) UNRELEASED; urgency=medium * virtio-net: drop NETIF_F_FRAGLIST (CVE-2015-5156) * ovl: Add support for NFS as lower filesystem (Closes: #786925) * perf: Fix double-free of the AUX buffer + * linux-source: Fix compression of the source tarball (Closes: #795199) -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/rules.real b/debian/rules.real index 6f90f758c..f16cd09ef 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -91,7 +91,7 @@ $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.xz: $(STAMPS_DIR)/source xargs -0r touch --no-dereference --date='$(SOURCE_DATE)' cd '$(BUILD_DIR)'; find 'linux-source-$(UPSTREAMVERSION)' -print0 | \ LC_ALL=C sort -z | \ - xargs -0 tar --no-recursion -raf 'linux-source-$(UPSTREAMVERSION).tar.xz' + tar --no-recursion --null -T - -caf 'linux-source-$(UPSTREAMVERSION).tar.xz' rm -rf '$(DIR)' $(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.xz: $(STAMPS_DIR)/source_none $(STAMPS_DIR)/source_% From 3d5d7d8cf6582510e374d0f05610f45d98b4d13a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 15 Aug 2015 12:51:18 +0200 Subject: [PATCH 14/16] udeb: Add newly enabled drivers --- debian/changelog | 5 +++++ debian/installer/i386/modules/i386/input-modules | 3 +++ debian/installer/modules/input-modules | 1 + debian/installer/modules/mmc-modules | 1 + debian/installer/modules/scsi-extra-modules | 1 + 5 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index b5b331d09..0b0730c35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -228,6 +228,11 @@ linux (4.1.5-1) UNRELEASED; urgency=medium * ovl: Add support for NFS as lower filesystem (Closes: #786925) * perf: Fix double-free of the AUX buffer * linux-source: Fix compression of the source tarball (Closes: #795199) + * udeb: Add newly enabled drivers: + - [i386] Add gpio_keys_polled, leds-gpio to input-modules + - Add virtio-input to input-modules + - Add toshsd to mmc-modules + - Add wd719x to scsi-extra-modules -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/installer/i386/modules/i386/input-modules b/debian/installer/i386/modules/i386/input-modules index 5ecb595a4..b12d1f5c7 100644 --- a/debian/installer/i386/modules/i386/input-modules +++ b/debian/installer/i386/modules/i386/input-modules @@ -1 +1,4 @@ #include +# Needed on some Geode LX boards - Alix2/3/6, Soekris net5501, Traverse GEOS +gpio_keys_polled +leds-gpio diff --git a/debian/installer/modules/input-modules b/debian/installer/modules/input-modules index f228dee18..55c440b2c 100644 --- a/debian/installer/modules/input-modules +++ b/debian/installer/modules/input-modules @@ -29,3 +29,4 @@ hid-topseed ? synaptics_usb ? wistron_btns ? i2c-hid ? +virtio-input ? diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules index 5bf6e6202..ce8b1764f 100644 --- a/debian/installer/modules/mmc-modules +++ b/debian/installer/modules/mmc-modules @@ -6,3 +6,4 @@ ricoh_mmc ? tifm_sd ? dw_mmc ? dw_mmc_pltfm ? +toshsd ? diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules index 6d50549df..94470c63b 100644 --- a/debian/installer/modules/scsi-extra-modules +++ b/debian/installer/modules/scsi-extra-modules @@ -45,3 +45,4 @@ sym53c416 ? ufshcd ? ufshcd-pci ? vmw_pvscsi ? +wd719x ? From 4d2f1174365115de43531bbb0b3a3bf8eda7e4f5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 15 Aug 2015 21:57:44 +0200 Subject: [PATCH 15/16] udeb: Move eeprom_93cx6 to core-modules; make scsi-extra-modules depend on it Previously it was in nic-wireless-modules as several wireless drivers depend on it, but now wd719x in scsi-extra-modules does as well. --- debian/changelog | 1 + debian/installer/modules/core-modules | 1 + debian/installer/package-list | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0b0730c35..a97e244e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -233,6 +233,7 @@ linux (4.1.5-1) UNRELEASED; urgency=medium - Add virtio-input to input-modules - Add toshsd to mmc-modules - Add wd719x to scsi-extra-modules + - Move eeprom_93cx6 to core-modules; make scsi-extra-modules depend on it -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 diff --git a/debian/installer/modules/core-modules b/debian/installer/modules/core-modules index cd5cdfce8..996b4c9be 100644 --- a/debian/installer/modules/core-modules +++ b/debian/installer/modules/core-modules @@ -1,3 +1,4 @@ bitrev ? +eeprom_93cx6 ? led-class ? mbcache diff --git a/debian/installer/package-list b/debian/installer/package-list index 462566901..39eff0827 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -86,7 +86,7 @@ Description: Very common SCSI drivers This package contains very common SCSI drivers for the kernel. Package: scsi-extra-modules -Depends: scsi-modules, scsi-core-modules +Depends: scsi-modules, scsi-core-modules, core-modules Priority: standard Description: Uncommon SCSI drivers This package contains uncommon SCSI drivers for the kernel. From 1243269850a36d2d7b71de048d18fc23fadf0a0a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 15 Aug 2015 23:37:31 +0200 Subject: [PATCH 16/16] Prepare to release linux (4.1.5-1). --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a97e244e5..e0068c793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (4.1.5-1) UNRELEASED; urgency=medium +linux (4.1.5-1) unstable; urgency=medium * New upstream stable update: https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 @@ -235,7 +235,7 @@ linux (4.1.5-1) UNRELEASED; urgency=medium - Add wd719x to scsi-extra-modules - Move eeprom_93cx6 to core-modules; make scsi-extra-modules depend on it - -- Ian Campbell Tue, 04 Aug 2015 19:31:45 +0100 + -- Ben Hutchings Sat, 15 Aug 2015 23:37:20 +0200 linux (4.1.3-1) unstable; urgency=medium