[kernel] r22745 - in dists/jessie-security/linux: . debian debian/bin debian/config debian/config/arm64 debian/config/armhf debian/installer/armhf/modules/armhf-armmp debian/lib/python/debian_linux debian/patches debian/patches/bugfix/all debian/patches/bugfix/arm debian/patches/bugfix/x86 debian/patches/features/all debian/patches/features/all/e1000e debian/patches/features/all/musb debian/patches/features/all/psmouse debian/patches/features/arm64 debian/patches/features/x86
Ben Hutchings
benh at moszumanska.debian.org
Sun Jun 14 21:48:31 UTC 2015
Author: benh
Date: Sun Jun 14 21:48:30 2015
New Revision: 22745
Log:
Merge changes from jessie up to 3.16.7-ckt11-1
Added:
dists/jessie-security/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
dists/jessie-security/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
dists/jessie-security/linux/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch
dists/jessie-security/linux/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch
dists/jessie-security/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
dists/jessie-security/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch
dists/jessie-security/linux/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch
dists/jessie-security/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch
dists/jessie-security/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch
dists/jessie-security/linux/debian/patches/bugfix/arm/ARM-dts-imx53-correct-clock-names-of-SATA-node.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/arm/ARM-dts-imx53-correct-clock-names-of-SATA-node.patch
dists/jessie-security/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch
dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch
dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch
dists/jessie-security/linux/debian/patches/features/all/e1000e/
- copied from r22689, dists/jessie/linux/debian/patches/features/all/e1000e/
dists/jessie-security/linux/debian/patches/features/all/musb/
- copied from r22689, dists/jessie/linux/debian/patches/features/all/musb/
dists/jessie-security/linux/debian/patches/features/all/power-reset-Add-generic-SYSCON-register-mapped-reset.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/features/all/power-reset-Add-generic-SYSCON-register-mapped-reset.patch
dists/jessie-security/linux/debian/patches/features/all/power-reset-adjust-priority-of-simple-syscon-reboot-.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/features/all/power-reset-adjust-priority-of-simple-syscon-reboot-.patch
dists/jessie-security/linux/debian/patches/features/all/power-reset-corrections-for-simple-syscon-reboot-dri.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/features/all/power-reset-corrections-for-simple-syscon-reboot-dri.patch
dists/jessie-security/linux/debian/patches/features/all/syscon-reboot-Backport-to-pre-register_restart_handl.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/features/all/syscon-reboot-Backport-to-pre-register_restart_handl.patch
dists/jessie-security/linux/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch
dists/jessie-security/linux/debian/patches/features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch
dists/jessie-security/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch
- copied unchanged from r22689, dists/jessie/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch
Deleted:
dists/jessie-security/linux/debian/patches/bugfix/all/btrfs-make-xattr-replace-operations-atomic.patch
dists/jessie-security/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch
dists/jessie-security/linux/debian/patches/bugfix/all/ext4-allocate-entire-range-in-zero-range.patch
dists/jessie-security/linux/debian/patches/bugfix/all/ext4-fix-accidental-flag-aliasing-in-ext4_map_blocks.patch
dists/jessie-security/linux/debian/patches/bugfix/all/ext4-fix-zero_range-bug-hidden-by-flag-aliasing.patch
dists/jessie-security/linux/debian/patches/bugfix/all/fs-take-i_mutex-during-prepare_binprm-for-set-ug-id-.patch
dists/jessie-security/linux/debian/patches/bugfix/all/ib-core-prevent-integer-overflow-in-ib_umem_get.patch
dists/jessie-security/linux/debian/patches/bugfix/all/ipv6-don-t-reduce-hop-limit-for-an-interface.patch
dists/jessie-security/linux/debian/patches/bugfix/all/tcp-fix-crash-in-tcp-fast-open.patch
dists/jessie-security/linux/debian/patches/bugfix/arm/omap-musb-choice.patch
dists/jessie-security/linux/debian/patches/bugfix/x86/crypto-aesni-fix-memory-usage-in-GCM-decryption.patch
dists/jessie-security/linux/debian/patches/bugfix/x86/x86-microcode-intel-guard-against-stack-overflow-in-.patch
dists/jessie-security/linux/debian/patches/features/all/psmouse/input-psmouse-add-psmouse_matches_pnp_id-helper-func.patch
Modified:
dists/jessie-security/linux/ (props changed)
dists/jessie-security/linux/debian/bin/gencontrol.py
dists/jessie-security/linux/debian/changelog
dists/jessie-security/linux/debian/config/arm64/config
dists/jessie-security/linux/debian/config/armhf/config.armmp
dists/jessie-security/linux/debian/config/defines
dists/jessie-security/linux/debian/installer/armhf/modules/armhf-armmp/usb-modules
dists/jessie-security/linux/debian/lib/python/debian_linux/debian.py
dists/jessie-security/linux/debian/patches/series
Modified: dists/jessie-security/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/jessie-security/linux/debian/bin/gencontrol.py Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/bin/gencontrol.py Sun Jun 14 21:48:30 2015 (r22745)
@@ -490,6 +490,10 @@
if distribution in ('experimental', ):
if not version.linux_revision_experimental:
raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
+ if distribution.endswith('-security') or distribution.endswith('-lts'):
+ if (not version.linux_revision_security or
+ version.linux_revision_backports):
+ raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
if distribution.endswith('-backports'):
if not version.linux_revision_backports:
raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
Modified: dists/jessie-security/linux/debian/changelog
==============================================================================
--- dists/jessie-security/linux/debian/changelog Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/changelog Sun Jun 14 21:48:30 2015 (r22745)
@@ -1,3 +1,189 @@
+linux (3.16.7-ckt11-1) jessie; urgency=medium
+
+ * New upstream stable update:
+ http://kernel.ubuntu.com/stable/ChangeLog-3.16.7-ckt10
+ - fuse: notify: don't move pages
+ - fuse: set stolen page uptodate
+ - dm thin: fix to consistently zero-fill reads to unprovisioned blocks
+ - dm: hold suspend_lock while suspending device during device deletion
+ - dm snapshot: suspend origin when doing exception handover
+ - dm snapshot: suspend merging snapshot when doing exception handover
+ - dm io: deal with wandering queue limits when handling REQ_DISCARD and
+ REQ_WRITE_SAME
+ - [armhf] crypto: arm/aes update NEON AES module to latest OpenSSL version
+ (regression in 3.13)
+ - mac80211: drop unencrypted frames in mesh fwding
+ - mac80211: disable u-APSD queues by default
+ - virtio_console: init work unconditionally
+ - regmap: regcache-rbtree: Fix present bitmap resize (regression in 3.12)
+ - Input: synaptics - fix middle button on Lenovo 2015 products
+ - Input: synaptics - handle spurious release of trackstick buttons
+ - [x86] asm/entry/32: Fix user_mode() misuses
+ - [x86] fpu: Avoid math_state_restore() without used_math() in
+ __restore_xstate_sig()
+ - [x86] fpu: Drop_fpu() should not assume that tsk equals current
+ - mac80211: count interfaces correctly for combination checks
+ (regression in 3.16)
+ - nl80211: ignore HT/VHT capabilities without QoS/WMM
+ - pagemap: do not leak physical addresses to non-privileged userspace
+ (mitigation of the DRAM 'rowhammer' defect)
+ - iscsi-target: Avoid early conn_logout_comp for iser connections
+ - tcm_qla2xxx: Fix incorrect use of __transport_register_session
+ - [arm64] Honor __GFP_ZERO in dma allocations
+ - xfrm: release dst_orig in case of error in xfrm_lookup()
+ (regression in 3.16.6)
+ - [powerpc*] smp: Wait until secondaries are active & online
+ (regression in 3.15)
+ - [powerpc*] iommu: Remove IOMMU device references via bus notifier
+ (regression in 3.14)
+ - [powerpcspe] mpc85xx: Add ranges to etsec2 nodes
+ (regression in 3.16.7-ckt3)
+ - IB/core: Avoid leakage from kernel to user space
+ - timers/tick/broadcast-hrtimer: Fix suspicious RCU usage in idle loop
+ - [x86] KVM: nVMX: mask unrestricted_guest if disabled on L0
+ - [ppc64el] pseries: Little endian fixes for post mobility device tree
+ update
+ - block: Fix bug in blk_rq_merge_ok (regression in 3.16)
+ - sched: Fix RLIMIT_RTTIME when PI-boosting to RT
+ - mm: fix anon_vma->degree underflow in anon_vma endless growing prevention
+ (regression in 3.16.7-ckt5)
+ - hfsplus: fix B-tree corruption after insertion at position 0
+ - iio: fix drivers that check buffer->scan_mask
+ - iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo
+ - cifs: smb2_clone_range() - exit on unhandled error
+ - cifs: fix use-after-free bug in find_writable_file
+ - xen/balloon: before adding hotplugged memory, set frames to invalid
+ (regression in 3.16)
+ - iio: adc: vf610: use ADC clock within specification
+ - dmaengine: edma: fix memory leak when terminating running transfers
+ - dmaengine: omap-dma: Fix memory leak when terminating running transfer
+ - mac80211: fix RX A-MPDU session reorder timer deletion
+ - net: use for_each_netdev_safe() in rtnl_group_changelink()
+ - net/mlx4_en: Call register_netdevice in the proper location
+ (regression in 3.14)
+ - NFS: fix BUG() crash in notify_change() with patch to chown_common()
+ http://kernel.ubuntu.com/stable/ChangeLog-3.16.7-ckt11
+ - n_tty: Fix read buffer overwrite when no newline
+ - [x86] KVM: Fix lost interrupt on irr_pending race (regression in 3.16.2)
+ - tcp: prevent fetching dst twice in early demux code
+ - ipv6: protect skb->sk accesses from recursive dereference inside the stack
+ - bonding: Bonding Overriding Configuration logic restored.
+ (regression in 3.14)
+ - ioctx_alloc(): fix vma (and file) leak on failure
+ - [x86] drm/i915/vlv: remove wait for previous GFX clk disable request
+ (regression in 3.16)
+ - SCSI: Defer processing of REQ_PREEMPT requests for blocked devices
+ - ocfs2: _really_ sync the right range (regression in 3.14)
+ - iscsi target: fix oops when adding reject pdu
+ - ext4: fix indirect punch hole corruption
+ - ip_forward: Drop frames with attached skb->sk
+ - ppp: call skb_checksum_complete_unset in ppp_receive_frame
+ - tcp: fix possible deadlock in tcp_send_fin() (regression in 3.16.7-ckt9)
+ - tcp: avoid looping in tcp_send_fin()
+ - [x86] Drivers: hv: vmbus: Fix a bug in the error path in vmbus_open()
+ - [s390x] KVM: fix handling of write errors in the tpi handler
+ - [s390x] KVM: reinjection of irqs can fail in the tpi handler
+ - [x86] compal-laptop: correct invalid hwmon name (regression in 3.14)
+ - [x86] compal-laptop: Fix leaking hwmon device
+ - [x86] compal-laptop: Check return value of power_supply_register
+ (regression in 3.14)
+ - [x86] sched/idle: Restore mwait_idle() to fix boot hangs, to improve power
+ savings and to improve performance
+ - usb: phy: Find the right match in devm_usb_phy_match
+ - [x86] kvm: Revert "remove sched notifier for cross-cpu migrations"
+ (regression in 3.12)
+ - [mips*el/loongson-3] Add IRQF_NO_SUSPEND to Cascade irqaction
+ (regression in 3.16.7-ckt7)
+ - ring-buffer: Replace this_cpu_*() with __this_cpu_*()
+ - UBI: account for bitflips in both the VID header and data
+ - UBI: fix out of bounds write
+ - UBI: fix check for "too many bytes"
+ - Btrfs: fix log tree corruption when fs mounted with -o discard
+ - btrfs: don't accept bare namespace as a valid xattr
+ - [armel,armhf] 8320/1: fix integer overflow in ELF_ET_DYN_BASE
+ - [mips*] Hibernate: flush TLB entries earlier
+ - ext4: make fsync to sync parent dir in no-journal for real this time
+ - iser-target: Fix session hang in case of an rdma read DIF error
+ - iser-target: Fix possible deadlock in RDMA_CM connection error
+ - [x86] vdso: fix pvclock races with task migration (Closes: #784960)
+ - md/raid0: fix bug with chunksize not a power of 2.
+ - ALSA: emu10k1: don't deadlock in proc-functions
+ - [s390x] hibernate: fix save and restore of kernel text section
+ - Btrfs: fix inode eviction infinite loop after extent_same ioctl
+ - Btrfs: fix inode eviction infinite loop after cloning into it
+ - [powerpc/powerpc64,ppc64*] perf: Cap 64bit userspace backtraces to
+ PERF_MAX_STACK_DEPTH (Closes: #784278)
+ - target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling
+ - fs/binfmt_elf.c: fix bug in loading of PIE binaries
+ - IB/core: disallow registering 0-sized memory region
+ - IB/core: don't disallow registering region starting at 0x0
+ - target/file: Fix SG table for prot_buf initialization
+ - ptrace: fix race between ptrace_resume() and wait_task_stopped()
+ - nfs: fix high load average due to callback thread sleeping
+ (regression in 3.16.7-ckt8)
+ - [x86] drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
+ (regression in 3.16)
+ - ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
+ (regression in 3.14)
+ - vfs: RCU pathwalk breakage when running into a symlink overmounting
+ something
+ - drivers/of: Add empty ranges quirk for PA-Semi (regression in 3.16.7-ckt3)
+ - [x86] apple-gmux: lock iGP IO to protect from vgaarb changes
+ (regression in 3.16.5)
+ - lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR
+ - [arm64] head.S: ensure visibility of page tables (regression in 3.15)
+ - [armhf] crypto: omap-aes - Fix support for unequal lengths
+ - [armhf] fix broken hibernation (regression in 3.16)
+ - jhash: Update jhash_[321]words functions to use correct initval
+ - vti6: fix uninit when using x-netns
+ - [powerpc*] cell: Fix cell iommu after it_page_shift changes
+ (regression in 3.14)
+ - KVM: use slowpath for cross page cached accesses
+ - IB/iser: Fix wrong calculation of protection buffer length
+ - [i386/686-pae] mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT
+ enabled for 32Bit architectures
+ - skbuff: Do not scrub skb mark within the same name space
+ (regression in 3.12)
+ - memstick: mspro_block: add missing curly braces
+ - ipv4: Missing sk_nulls_node_init() in ping_unhash(). (CVE-2015-3636)
+
+ [ Ben Hutchings ]
+ * debian.py,gencontrol.py: Fix the version sanity checks for backports
+ and security/LTS uploads
+ * Fix error messages at boot on systems without an RTC (Closes: #784146):
+ - [armhf] mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
+ - rtc: hctosys: do not treat lack of RTC device as error
+ - rtc: hctosys: use function name in the error log
+ * [x86] Input: synaptics: Fix routing of trackpoint buttons on Lenovo
+ 2015 models (Closes: #780862)
+ * [x86] thinkpad_acpi: support new BIOS version string pattern
+ (Closes: #780467)
+ * ext4: fix data corruption caused by unwritten and delayed extents
+ (Closes: #785672)
+ * ext4: move check under lock scope to close a race.
+ * libata: Update Crucial/Micron blacklist
+ * libata: Blacklist queued TRIM on Samsung SSD 850 Pro (Closes: #784152)
+ * [x86] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
+ (Closes: #786551)
+ * [arm64] USB: Add support for XHCI on APM Mustang (Closes: #785707)
+ - Enable USB_XHCI_HCD as module, and USB_XHCI_PLATFORM
+ - Make xhci platform driver use 64 bit or 32 bit DMA
+ - Add support for ACPI identification to xhci-platform
+ * md/raid0: fix restore to sector variable in raid0_make_request
+ (regression in 3.16.7-ckt11)
+ * cdc_ncm: Fix tx_bytes statistics (regression in 3.16.7-ckt11)
+ * [x86] e1000e: Add support for Sunrise Point (i219) (Closes: #784546)
+ * [armhf] musb: Backport upstream changes to support multiplatform
+ configuration properly (Closes: #773400)
+
+ [ Ian Campbell ]
+ * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)
+ * [armhf] Add ehci-orion module to usb-modules udeb. (Closes: #783324)
+ * [armhf] dts: imx53: correct clock-names of SATA node (Closes: #784344)
+ * [armhf+arm64] Enabled generic SYSCON regmap reset driver
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 24 May 2015 18:46:08 +0100
+
linux (3.16.7-ckt9-3~deb8u1) jessie-security; urgency=high
[ Ben Hutchings ]
Modified: dists/jessie-security/linux/debian/config/arm64/config
==============================================================================
--- dists/jessie-security/linux/debian/config/arm64/config Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/config/arm64/config Sun Jun 14 21:48:30 2015 (r22745)
@@ -82,6 +82,7 @@
##
## file: drivers/power/reset/Kconfig
##
+CONFIG_POWER_RESET_SYSCON=y
CONFIG_POWER_RESET_VEXPRESS=y
CONFIG_POWER_RESET_XGENE=y
@@ -120,6 +121,8 @@
CONFIG_USB_EHCI_HCD_PLATFORM=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PLATFORM=y
##
## file: drivers/virtio/Kconfig
Modified: dists/jessie-security/linux/debian/config/armhf/config.armmp
==============================================================================
--- dists/jessie-security/linux/debian/config/armhf/config.armmp Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/config/armhf/config.armmp Sun Jun 14 21:48:30 2015 (r22745)
@@ -612,6 +612,7 @@
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_SYSCON=y
##
## file: drivers/pwm/Kconfig
@@ -660,6 +661,7 @@
CONFIG_RTC_DRV_MXC=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_RTC_DRV_PALMAS=y
+CONFIG_RTC_DRV_PCF8523=y
##
## file: drivers/scsi/Kconfig
Modified: dists/jessie-security/linux/debian/config/defines
==============================================================================
--- dists/jessie-security/linux/debian/config/defines Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/config/defines Sun Jun 14 21:48:30 2015 (r22745)
@@ -3,8 +3,14 @@
ignore-changes:
# Should not be used from OOT
module:arch/x86/kvm/kvm
+ module:drivers/md/dm-snapshot
module:drivers/mtd/spi-nor/spi-nor
- module:drivers/net/wireless/iwlwifi/iwlwifi
+ module:drivers/net/ethernet/broadcom/bnx2x/bnx2x
+ module:drivers/net/wireless/**
+ module:drivers/scsi/qla2xxx/qla2xxx
+ module:drivers/target/iscsi/iscsi_target_mod
+ module:drivers/target/target_core_mod
+ module:drivers/usb/musb/*
module:sound/i2c/other/snd-ak4113
module:sound/i2c/other/snd-ak4114
azx_alloc_cmd_io
@@ -12,6 +18,8 @@
azx_get_response
azx_init_cmd_io
azx_send_cmd
+ cpuidle_*
+ musb_*
# Apparently not used OOT
__add_pages
__remove_pages
Modified: dists/jessie-security/linux/debian/installer/armhf/modules/armhf-armmp/usb-modules
==============================================================================
--- dists/jessie-security/linux/debian/installer/armhf/modules/armhf-armmp/usb-modules Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/installer/armhf/modules/armhf-armmp/usb-modules Sun Jun 14 21:48:30 2015 (r22745)
@@ -6,6 +6,7 @@
ohci-omap3
ehci-exynos
ehci-omap
+ehci-orion
phy-exynos-usb2
phy-omap-usb2
ci_hdrc_imx
Modified: dists/jessie-security/linux/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/jessie-security/linux/debian/lib/python/debian_linux/debian.py Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/lib/python/debian_linux/debian.py Sun Jun 14 21:48:30 2015 (r22745)
@@ -139,14 +139,17 @@
~exp\d+
)
|
+ (?P<revision_security>
+ [~+]deb\d+u\d+
+ )?
(?P<revision_backports>
- ~bpo\d\d\+\d+
- )
+ ~bpo\d+\+\d+
+ )?
|
(?P<revision_other>
[^-]+
)
-)?
+)
$
"""
_version_linux_re = re.compile(_version_linux_rules, re.X)
@@ -167,6 +170,7 @@
self.linux_upstream_full = self.linux_upstream + d['update']
self.linux_dfsg = d['dfsg']
self.linux_revision_experimental = match.group('revision_experimental') and True
+ self.linux_revision_security = match.group('revision_security') and True
self.linux_revision_backports = match.group('revision_backports') and True
self.linux_revision_other = match.group('revision_other') and True
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch)
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn at mork.no>
+Date: Fri, 22 May 2015 13:15:22 +0200
+Subject: cdc_ncm: Fix tx_bytes statistics
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Origin: https://git.kernel.org/linus/44f6731d8b68fa02f5ed65eaceac41f8c3c9279e
+
+The tx_curr_frame_payload field is u32. When we try to calculate a
+small negative delta based on it, we end up with a positive integer
+close to 2^32 instead. So the tx_bytes pointer increases by about
+2^32 for every transmitted frame.
+
+Fix by calculating the delta as a signed long.
+
+Cc: Ben Hutchings <ben.hutchings at codethink.co.uk>
+Reported-by: Florian Bruhin <me at the-compiler.org>
+Fixes: 7a1e890e2168 ("usbnet: Fix tx_bytes statistic running backward in cdc_ncm")
+Signed-off-by: Bjørn Mork <bjorn at mork.no>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/usb/cdc_ncm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
+index c3e4da9..8067b8f 100644
+--- a/drivers/net/usb/cdc_ncm.c
++++ b/drivers/net/usb/cdc_ncm.c
+@@ -1182,7 +1182,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
+ * payload data instead.
+ */
+ usbnet_set_skb_tx_stats(skb_out, n,
+- ctx->tx_curr_frame_payload - skb_out->len);
++ (long)ctx->tx_curr_frame_payload - skb_out->len);
+
+ return skb_out;
+
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch)
@@ -0,0 +1,54 @@
+From: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
+Date: Fri, 17 Apr 2015 15:04:48 -0400
+Subject: config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
+Origin: https://git.kernel.org/linus/a6dfa128ce5c414ab46b1d690f7a1b8decb8526d
+Bug-Debian: https://bugs.debian.org/786551
+
+A huge amount of NIC drivers use the DMA API, however if
+compiled under 32-bit an very important part of the DMA API can
+be ommitted leading to the drivers not working at all
+(especially if used with 'swiotlb=force iommu=soft').
+
+As Prashant Sreedharan explains it: "the driver [tg3] uses
+DEFINE_DMA_UNMAP_ADDR(), dma_unmap_addr_set() to keep a copy of
+the dma "mapping" and dma_unmap_addr() to get the "mapping"
+value. On most of the platforms this is a no-op, but ... with
+"iommu=soft and swiotlb=force" this house keeping is required,
+... otherwise we pass 0 while calling pci_unmap_/pci_dma_sync_
+instead of the DMA address."
+
+As such enable this even when using 32-bit kernels.
+
+Reported-by: Ian Jackson <Ian.Jackson at eu.citrix.com>
+Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
+Acked-by: David S. Miller <davem at davemloft.net>
+Acked-by: Prashant Sreedharan <prashant at broadcom.com>
+Cc: Borislav Petkov <bp at alien8.de>
+Cc: H. Peter Anvin <hpa at zytor.com>
+Cc: Linus Torvalds <torvalds at linux-foundation.org>
+Cc: Michael Chan <mchan at broadcom.com>
+Cc: Thomas Gleixner <tglx at linutronix.de>
+Cc: boris.ostrovsky at oracle.com
+Cc: cascardo at linux.vnet.ibm.com
+Cc: david.vrabel at citrix.com
+Cc: sanjeevb at broadcom.com
+Cc: siva.kallam at broadcom.com
+Cc: vyasevich at gmail.com
+Cc: xen-devel at lists.xensource.com
+Link: http://lkml.kernel.org/r/20150417190448.GA9462@l.oracle.com
+Signed-off-by: Ingo Molnar <mingo at kernel.org>
+---
+ arch/x86/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -164,7 +164,7 @@ config SBUS
+
+ config NEED_DMA_MAP_STATE
+ def_bool y
+- depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG
++ depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB
+
+ config NEED_SG_DMA_LENGTH
+ def_bool y
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch)
@@ -0,0 +1,86 @@
+From: Lukas Czerner <lczerner at redhat.com>
+Date: Sat, 2 May 2015 21:36:55 -0400
+Subject: ext4: fix data corruption caused by unwritten and delayed extents
+Origin: https://git.kernel.org/linus/d2dc317d564a46dfc683978a2e5a4f91434e9711
+Bug-Debian: https://bugs.debian.org/785672
+
+Currently it is possible to lose whole file system block worth of data
+when we hit the specific interaction with unwritten and delayed extents
+in status extent tree.
+
+The problem is that when we insert delayed extent into extent status
+tree the only way to get rid of it is when we write out delayed buffer.
+However there is a limitation in the extent status tree implementation
+so that when inserting unwritten extent should there be even a single
+delayed block the whole unwritten extent would be marked as delayed.
+
+At this point, there is no way to get rid of the delayed extents,
+because there are no delayed buffers to write out. So when a we write
+into said unwritten extent we will convert it to written, but it still
+remains delayed.
+
+When we try to write into that block later ext4_da_map_blocks() will set
+the buffer new and delayed and map it to invalid block which causes
+the rest of the block to be zeroed loosing already written data.
+
+For now we can fix this by simply not allowing to set delayed status on
+written extent in the extent status tree. Also add WARN_ON() to make
+sure that we notice if this happens in the future.
+
+This problem can be easily reproduced by running the following xfs_io.
+
+xfs_io -f -c "pwrite -S 0xaa 4096 2048" \
+ -c "falloc 0 131072" \
+ -c "pwrite -S 0xbb 65536 2048" \
+ -c "fsync" /mnt/test/fff
+
+echo 3 > /proc/sys/vm/drop_caches
+xfs_io -c "pwrite -S 0xdd 67584 2048" /mnt/test/fff
+
+This can be theoretically also reproduced by at random by running fsx,
+but it's not very reliable, though on machines with bigger page size
+(like ppc) this can be seen more often (especially xfstest generic/127)
+
+Signed-off-by: Lukas Czerner <lczerner at redhat.com>
+Signed-off-by: Theodore Ts'o <tytso at mit.edu>
+Cc: stable at vger.kernel.org
+---
+ fs/ext4/extents_status.c | 8 ++++++++
+ fs/ext4/inode.c | 2 ++
+ 2 files changed, 10 insertions(+)
+
+--- a/fs/ext4/extents_status.c
++++ b/fs/ext4/extents_status.c
+@@ -662,6 +662,14 @@ int ext4_es_insert_extent(struct inode *
+
+ BUG_ON(end < lblk);
+
++ if ((status & EXTENT_STATUS_DELAYED) &&
++ (status & EXTENT_STATUS_WRITTEN)) {
++ ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as "
++ " delayed and written which can potentially "
++ " cause data loss.\n", lblk, len);
++ WARN_ON(1);
++ }
++
+ newes.es_lblk = lblk;
+ newes.es_len = len;
+ ext4_es_store_pblock_status(&newes, pblk, status);
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -577,6 +577,7 @@ int ext4_map_blocks(handle_t *handle, st
+ status = map->m_flags & EXT4_MAP_UNWRITTEN ?
+ EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;
+ if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) &&
++ !(status & EXTENT_STATUS_WRITTEN) &&
+ ext4_find_delalloc_range(inode, map->m_lblk,
+ map->m_lblk + map->m_len - 1))
+ status |= EXTENT_STATUS_DELAYED;
+@@ -691,6 +692,7 @@ found:
+ status = map->m_flags & EXT4_MAP_UNWRITTEN ?
+ EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;
+ if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) &&
++ !(status & EXTENT_STATUS_WRITTEN) &&
+ ext4_find_delalloc_range(inode, map->m_lblk,
+ map->m_lblk + map->m_len - 1))
+ status |= EXTENT_STATUS_DELAYED;
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch)
@@ -0,0 +1,48 @@
+From: Davide Italiano <dccitaliano at gmail.com>
+Date: Sat, 2 May 2015 23:21:15 -0400
+Subject: ext4: move check under lock scope to close a race.
+Origin: https://git.kernel.org/linus/280227a75b56ab5d35854f3a77ef74a7ad56a203
+
+fallocate() checks that the file is extent-based and returns
+EOPNOTSUPP in case is not. Other tasks can convert from and to
+indirect and extent so it's safe to check only after grabbing
+the inode mutex.
+
+Signed-off-by: Davide Italiano <dccitaliano at gmail.com>
+Signed-off-by: Theodore Ts'o <tytso at mit.edu>
+Cc: stable at vger.kernel.org
+---
+ fs/ext4/extents.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+--- a/fs/ext4/extents.c
++++ b/fs/ext4/extents.c
+@@ -4933,13 +4933,6 @@ long ext4_fallocate(struct file *file, i
+ if (ret)
+ return ret;
+
+- /*
+- * currently supporting (pre)allocate mode for extent-based
+- * files _only_
+- */
+- if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
+- return -EOPNOTSUPP;
+-
+ if (mode & FALLOC_FL_COLLAPSE_RANGE)
+ return ext4_collapse_range(inode, offset, len);
+
+@@ -4961,6 +4954,14 @@ long ext4_fallocate(struct file *file, i
+
+ mutex_lock(&inode->i_mutex);
+
++ /*
++ * We only support preallocation for extent-based files only
++ */
++ if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
++ ret = -EOPNOTSUPP;
++ goto out;
++ }
++
+ if (!(mode & FALLOC_FL_KEEP_SIZE) &&
+ offset + len > i_size_read(inode)) {
+ new_size = offset + len;
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch)
@@ -0,0 +1,27 @@
+From: "Martin K. Petersen" <martin.petersen at oracle.com>
+Date: Fri, 27 Mar 2015 15:17:21 -0400
+Subject: libata: Blacklist queued TRIM on Samsung SSD 850 Pro
+Origin: https://git.kernel.org/linus/6fc4d97a4987c5d247655a157a9377996626221a
+
+Blacklist queued TRIM on this drive for now.
+
+Reported-by: Stefan Keller <linux-list at zahlenfresser.de>
+Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
+CC: stable at vger.kernel.org
+Signed-off-by: Tejun Heo <tj at kernel.org>
+[bwh: Backported to 3.16: adjust context and drop ZERO_AFTER_TRIM flag]
+Signed-off-by; Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/ata/libata-core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -4229,6 +4229,7 @@ static const struct ata_blacklist_entry
+ { "Micron_M5[15]0*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM, },
+ { "Crucial_CT*M550*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM, },
+ { "Crucial_CT*MX100*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM, },
++ { "Samsung SSD 850 PRO*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },
+
+ /*
+ * Some WD SATA-I drives spin up and down erratically when the link
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch)
@@ -0,0 +1,37 @@
+From: "Martin K. Petersen" <martin.petersen at oracle.com>
+Date: Fri, 27 Mar 2015 15:17:20 -0400
+Subject: libata: Update Crucial/Micron blacklist
+Origin: https://git.kernel.org/linus/ff7f53fb82a7801a778e5902bdbbc5e195ab0de0
+
+Micron has released an updated firmware (MU02) for M510/M550/MX100
+drives to fix the issues with queued TRIM. Queued TRIM remains broken on
+M500 but is working fine on later drives such as M600 and MX200.
+
+Tweak our blacklist to reflect the above.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=71371
+Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Tejun Heo <tj at kernel.org>
+[bwh: Backported to 3.16: adjust context and drop ZERO_AFTER_TRIM flags]
+Signed-off-by; Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/ata/libata-core.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -4225,9 +4225,10 @@ static const struct ata_blacklist_entry
+
+ /* devices that don't properly handle queued TRIM commands */
+ { "Micron_M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },
+- { "Crucial_CT???M500SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },
+- { "Micron_M550*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },
+- { "Crucial_CT*M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },
++ { "Crucial_CT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },
++ { "Micron_M5[15]0*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM, },
++ { "Crucial_CT*M550*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM, },
++ { "Crucial_CT*MX100*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM, },
+
+ /*
+ * Some WD SATA-I drives spin up and down erratically when the link
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch)
@@ -0,0 +1,46 @@
+From: Eric Work <work.eric at gmail.com>
+Date: Mon, 18 May 2015 23:26:23 -0700
+Subject: md/raid0: fix restore to sector variable in raid0_make_request
+Origin: http://git.neil.brown.name/?p=md.git;a=commitdiff;h=a81157768a00e8cf8a7b43b5ea5cac931262374f
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=98501
+Bug-Debian: https://bugs.debian.org/786372
+
+The variable "sector" in "raid0_make_request()" was improperly updated
+by a call to "sector_div()" which modifies its first argument in place.
+Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable
+after the call for later re-use. Unfortunetly the restore was done after
+the referenced variable "bio" was advanced. This lead to the original
+value and the restored value being different. Here we move this line to
+the proper place.
+
+One observed side effect of this bug was discarding a file though
+unlinking would cause an unrelated file's contents to be discarded.
+
+Signed-off-by: NeilBrown <neilb at suse.de>
+Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.")
+Cc: stable at vger.kernel.org (any that received above backport)
+URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501
+---
+ drivers/md/raid0.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/md/raid0.c
++++ b/drivers/md/raid0.c
+@@ -531,6 +531,9 @@ static void raid0_make_request(struct md
+ ? (sector & (chunk_sects-1))
+ : sector_div(sector, chunk_sects));
+
++ /* Restore due to sector_div */
++ sector = bio->bi_iter.bi_sector;
++
+ if (sectors < bio_sectors(bio)) {
+ split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);
+ bio_chain(split, bio);
+@@ -538,7 +541,6 @@ static void raid0_make_request(struct md
+ split = bio;
+ }
+
+- sector = bio->bi_iter.bi_sector;
+ zone = find_zone(mddev->private, §or);
+ tmp_dev = map_sector(mddev, zone, sector, §or);
+ split->bi_bdev = tmp_dev->bdev;
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch)
@@ -0,0 +1,37 @@
+From: Floris Bos <bos at je-eigen-domein.nl>
+Date: Thu, 16 Apr 2015 12:45:12 -0700
+Subject: rtc: hctosys: do not treat lack of RTC device as error
+Origin: https://git.kernel.org/linus/aed98b9a1be6fcf1685dfd37f0a3e78e92a21f7d
+Bug-Debian: https://bugs.debian.org/784146
+
+When using device trees on the ARM platform, it is not certain at compile
+time whether or not the system will have a RTC.
+
+If one enables CONFIG_HCTOSYS just in case the system booted has a RTC,
+and it turns out not to be, this will result in a big fat "unable to open
+rtc device" error being printed to console, even when "quiet" is set in
+the kernel cmdline.
+
+Fix this by outputting the message with loglevel info instead.
+
+Signed-off-by: Floris Bos <bos at je-eigen-domein.nl>
+Cc: Alessandro Zummo <a.zummo at towertech.it>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ drivers/rtc/hctosys.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
+index 6c719f2..fb4251d 100644
+--- a/drivers/rtc/hctosys.c
++++ b/drivers/rtc/hctosys.c
+@@ -32,7 +32,7 @@ static int __init rtc_hctosys(void)
+ struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+
+ if (rtc == NULL) {
+- pr_err("%s: unable to open rtc device (%s)\n",
++ pr_info("%s: unable to open rtc device (%s)\n",
+ __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
+ goto err_open;
+ }
Copied: dists/jessie-security/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch)
@@ -0,0 +1,30 @@
+From: Aaro Koskinen <aaro.koskinen at iki.fi>
+Date: Thu, 16 Apr 2015 12:45:54 -0700
+Subject: rtc: hctosys: use function name in the error log
+Origin: https://git.kernel.org/linus/521fca18e828cddc94535a1ea5ac33460f1de679
+Bug-Debian: https://bugs.debian.org/784146
+
+Use function name in the error log instead of __FILE__.
+
+Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
+Cc: Alexandre Belloni <alexandre.belloni at free-electrons.com>
+Cc: Alessandro Zummo <a.zummo at towertech.it>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ drivers/rtc/hctosys.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
+index fb4251d..91fb5f3 100644
+--- a/drivers/rtc/hctosys.c
++++ b/drivers/rtc/hctosys.c
+@@ -33,7 +33,7 @@ static int __init rtc_hctosys(void)
+
+ if (rtc == NULL) {
+ pr_info("%s: unable to open rtc device (%s)\n",
+- __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
++ __func__, CONFIG_RTC_HCTOSYS_DEVICE);
+ goto err_open;
+ }
+
Copied: dists/jessie-security/linux/debian/patches/bugfix/arm/ARM-dts-imx53-correct-clock-names-of-SATA-node.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/arm/ARM-dts-imx53-correct-clock-names-of-SATA-node.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/arm/ARM-dts-imx53-correct-clock-names-of-SATA-node.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/arm/ARM-dts-imx53-correct-clock-names-of-SATA-node.patch)
@@ -0,0 +1,32 @@
+From 025781539a3ccf867c1e0f2fc63f61cc8c7c5415 Mon Sep 17 00:00:00 2001
+From: Shawn Guo <shawn.guo at freescale.com>
+Date: Tue, 8 Jul 2014 16:14:47 +0800
+Subject: [PATCH] ARM: dts: imx53: correct clock-names of SATA node
+Origin: http://git.kernel.org/linus/025781539a3ccf867c1e0f2fc63f61cc8c7c5415
+
+Per the binding doc imx-sata.txt, the first entry of clock-names should
+be "sata" than anything else. Correct it for imx53 SATA node.
+
+It works for now only because SATA driver gets clock by index so far.
+
+Signed-off-by: Shawn Guo <shawn.guo at freescale.com>
+---
+ arch/arm/boot/dts/imx53.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
+index 5fe8509..64fa27b 100644
+--- a/arch/arm/boot/dts/imx53.dtsi
++++ b/arch/arm/boot/dts/imx53.dtsi
+@@ -108,7 +108,7 @@
+ clocks = <&clks IMX5_CLK_SATA_GATE>,
+ <&clks IMX5_CLK_SATA_REF>,
+ <&clks IMX5_CLK_AHB>;
+- clock-names = "sata_gate", "sata_ref", "ahb";
++ clock-names = "sata", "sata_ref", "ahb";
+ status = "disabled";
+ };
+
+--
+2.1.4
+
Copied: dists/jessie-security/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch)
@@ -0,0 +1,32 @@
+From: Gregory CLEMENT <gregory.clement at free-electrons.com>
+Date: Tue, 14 Apr 2015 11:50:13 +0200
+Subject: ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
+Origin: https://git.kernel.org/linus/750e30d4076ae5e02ad13a376e96c95a2627742c
+Bug-Debian: https://bugs.debian.org/784146
+
+There is no crystal connected to the internal RTC on the Open Block
+AX3. So let's disable it in order to prevent the kernel probing the
+driver uselessly. Eventually this patches removes the following
+warning message from the boot log:
+"rtc-mv d0010300.rtc: internal RTC not ticking"
+
+Acked-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+Cc: <stable at vger.kernel.org> # v3.8 +
+---
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
++++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+@@ -71,6 +71,10 @@
+ };
+
+ internal-regs {
++ rtc at 10300 {
++ /* No crystal connected to the internal RTC */
++ status = "disabled";
++ };
+ serial at 12000 {
+ status = "okay";
+ };
Copied: dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch)
@@ -0,0 +1,146 @@
+From: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Date: Sun, 8 Mar 2015 22:35:41 -0700
+Subject: Input: synaptics - re-route tracksticks buttons on the Lenovo 2015
+ series
+Origin: https://git.kernel.org/linus/cdd9dc195916ef5644cfac079094c3c1d1616e4c
+Bug-Debian: https://bugs.debian.org/780862
+
+The 2015 series of the Lenovo thinkpads added back the hardware buttons on
+top of the touchpad for the trackstick.
+
+Unfortunately, they are wired to the touchpad, and not the trackstick.
+Thus, they are seen as extra buttons from the kernel point of view.
+
+This leads to a problem in user space because extra buttons on synaptics
+devices used to be used as scroll up/down buttons. So in the end, the
+experience for the user is scroll events for buttons left and right when
+using the trackstick. Yay!
+
+Fortunately, the firmware advertises such behavior in the extended
+capability $10, and so we can re-route the buttons through the pass-through
+interface.
+
+Hallelujah-expressed-by: Peter Hutterer <peter.hutterer at who-t.net>
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Acked-by: Hans de Goede <hdegoede at redhat.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
+---
+ drivers/input/mouse/synaptics.c | 47 +++++++++++++++++++++++++++++++----------
+ drivers/input/mouse/synaptics.h | 5 +++++
+ 2 files changed, 41 insertions(+), 11 deletions(-)
+
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -577,18 +577,22 @@ static int synaptics_is_pt_packet(unsign
+ return (buf[0] & 0xFC) == 0x84 && (buf[3] & 0xCC) == 0xC4;
+ }
+
+-static void synaptics_pass_pt_packet(struct serio *ptport, unsigned char *packet)
++static void synaptics_pass_pt_packet(struct psmouse *psmouse,
++ struct serio *ptport,
++ unsigned char *packet)
+ {
++ struct synaptics_data *priv = psmouse->private;
+ struct psmouse *child = serio_get_drvdata(ptport);
+
+ if (child && child->state == PSMOUSE_ACTIVATED) {
+- serio_interrupt(ptport, packet[1], 0);
++ serio_interrupt(ptport, packet[1] | priv->pt_buttons, 0);
+ serio_interrupt(ptport, packet[4], 0);
+ serio_interrupt(ptport, packet[5], 0);
+ if (child->pktsize == 4)
+ serio_interrupt(ptport, packet[2], 0);
+- } else
++ } else {
+ serio_interrupt(ptport, packet[1], 0);
++ }
+ }
+
+ static void synaptics_pt_activate(struct psmouse *psmouse)
+@@ -845,6 +849,7 @@ static void synaptics_report_ext_buttons
+ struct input_dev *dev = psmouse->dev;
+ struct synaptics_data *priv = psmouse->private;
+ int ext_bits = (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
++ char buf[6] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+ int i;
+
+ if (!SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))
+@@ -855,12 +860,30 @@ static void synaptics_report_ext_buttons
+ !((psmouse->packet[0] ^ psmouse->packet[3]) & 0x02))
+ return;
+
+- for (i = 0; i < ext_bits; i++) {
+- input_report_key(dev, BTN_0 + 2 * i,
+- hw->ext_buttons & (1 << i));
+- input_report_key(dev, BTN_1 + 2 * i,
+- hw->ext_buttons & (1 << (i + ext_bits)));
++ if (!SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10)) {
++ for (i = 0; i < ext_bits; i++) {
++ input_report_key(dev, BTN_0 + 2 * i,
++ hw->ext_buttons & (1 << i));
++ input_report_key(dev, BTN_1 + 2 * i,
++ hw->ext_buttons & (1 << (i + ext_bits)));
++ }
++ return;
+ }
++
++ /*
++ * This generation of touchpads has the trackstick buttons
++ * physically wired to the touchpad. Re-route them through
++ * the pass-through interface.
++ */
++ if (!priv->pt_port)
++ return;
++
++ /* The trackstick expects at most 3 buttons */
++ priv->pt_buttons = SYN_CAP_EXT_BUTTON_STICK_L(hw->ext_buttons) |
++ SYN_CAP_EXT_BUTTON_STICK_R(hw->ext_buttons) << 1 |
++ SYN_CAP_EXT_BUTTON_STICK_M(hw->ext_buttons) << 2;
++
++ synaptics_pass_pt_packet(psmouse, priv->pt_port, buf);
+ }
+
+ static void synaptics_report_buttons(struct psmouse *psmouse,
+@@ -1416,7 +1439,8 @@ static psmouse_ret_t synaptics_process_b
+ if (SYN_CAP_PASS_THROUGH(priv->capabilities) &&
+ synaptics_is_pt_packet(psmouse->packet)) {
+ if (priv->pt_port)
+- synaptics_pass_pt_packet(priv->pt_port, psmouse->packet);
++ synaptics_pass_pt_packet(psmouse, priv->pt_port,
++ psmouse->packet);
+ } else
+ synaptics_process_packet(psmouse);
+
+@@ -1510,8 +1534,9 @@ static void set_input_params(struct psmo
+ __set_bit(BTN_BACK, dev->keybit);
+ }
+
+- for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
+- __set_bit(BTN_0 + i, dev->keybit);
++ if (!SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10))
++ for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
++ __set_bit(BTN_0 + i, dev->keybit);
+
+ __clear_bit(EV_REL, dev->evbit);
+ __clear_bit(REL_X, dev->relbit);
+--- a/drivers/input/mouse/synaptics.h
++++ b/drivers/input/mouse/synaptics.h
+@@ -111,6 +111,10 @@
+ #define SYN_CAP_EXT_BUTTONS_STICK(ex10) ((ex10) & 0x010000)
+ #define SYN_CAP_SECUREPAD(ex10) ((ex10) & 0x020000)
+
++#define SYN_CAP_EXT_BUTTON_STICK_L(eb) (!!((eb) & 0x01))
++#define SYN_CAP_EXT_BUTTON_STICK_M(eb) (!!((eb) & 0x02))
++#define SYN_CAP_EXT_BUTTON_STICK_R(eb) (!!((eb) & 0x04))
++
+ /* synaptics modes query bits */
+ #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7))
+ #define SYN_MODE_RATE(m) ((m) & (1 << 6))
+@@ -192,6 +196,7 @@ struct synaptics_data {
+ bool disable_gesture; /* disable gestures */
+
+ struct serio *pt_port; /* Pass-through serio port */
++ unsigned char pt_buttons; /* Pass-through buttons */
+
+ struct synaptics_mt_state mt_state; /* Current mt finger state */
+ bool mt_state_lost; /* mt_state may be incorrect */
Copied: dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch)
@@ -0,0 +1,40 @@
+From: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Date: Sun, 8 Mar 2015 22:34:50 -0700
+Subject: Input: synaptics - remove TOPBUTTONPAD property for Lenovos 2015
+Origin: https://git.kernel.org/linus/3adde1f59195df2965f632e22b31f97fb371612f
+Bug-Debian: https://bugs.debian.org/780862
+
+The 2015 series of the Lenovo thinkpads added back the hardware buttons on
+top of the touchpad for the trackstick.
+
+Unfortunately, Lenovo used the PNPIDs that are supposed to be "5 buttons"
+touchpads, so the new laptops also have the INPUT_PROP_TOPBUTTONPAD. Yay!
+
+Instead of manually removing each of the new ones, or hoping that we know
+all the current ones, we can consider that the PNPIDs list that were given
+contains touchpads that have the trackstick buttons, either physically
+wired to them, or emulated with the top software button property.
+
+Thanks to the extra buttons capability in query $10, we can reliably detect
+the physical buttons from the software ones, and so we can remove the
+TOPBUTTONPAD property even if it was declared as such.
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Acked-by: Hans de Goede <hdegoede at redhat.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
+---
+ drivers/input/mouse/synaptics.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -1519,7 +1519,8 @@ static void set_input_params(struct psmo
+
+ if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+ __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
+- if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
++ if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids) &&
++ !SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10))
+ __set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
+ /* Clickpads report only left button */
+ __clear_bit(BTN_RIGHT, dev->keybit);
Copied: dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch (from r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch)
@@ -0,0 +1,119 @@
+From: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Date: Sun, 8 Mar 2015 22:34:03 -0700
+Subject: Input: synaptics - retrieve the extended capabilities in query $10
+Origin: https://git.kernel.org/linus/06aa374bc70468b517dd36b95c48c8f391c08a27
+Bug-Debian: https://bugs.debian.org/780862
+
+Newer Synaptics touchpads need to get information from the query $10.
+Retrieve it if available.
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Acked-by: Hans de Goede <hdegoede at redhat.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
+---
+ drivers/input/mouse/synaptics.c | 23 ++++++++++++++++++++---
+ drivers/input/mouse/synaptics.h | 23 +++++++++++++++++++++++
+ 2 files changed, 43 insertions(+), 3 deletions(-)
+
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -239,11 +239,24 @@ static int synaptics_model_id(struct psm
+ return 0;
+ }
+
++static int synaptics_more_extended_queries(struct psmouse *psmouse)
++{
++ struct synaptics_data *priv = psmouse->private;
++ unsigned char buf[3];
++
++ if (synaptics_send_cmd(psmouse, SYN_QUE_MEXT_CAPAB_10, buf))
++ return -1;
++
++ priv->ext_cap_10 = (buf[0]<<16) | (buf[1]<<8) | buf[2];
++
++ return 0;
++}
++
+ /*
+- * Read the board id from the touchpad
++ * Read the board id and the "More Extended Queries" from the touchpad
+ * The board id is encoded in the "QUERY MODES" response
+ */
+-static int synaptics_board_id(struct psmouse *psmouse)
++static int synaptics_query_modes(struct psmouse *psmouse)
+ {
+ struct synaptics_data *priv = psmouse->private;
+ unsigned char bid[3];
+@@ -255,6 +268,10 @@ static int synaptics_board_id(struct psm
+ if (synaptics_send_cmd(psmouse, SYN_QUE_MODES, bid))
+ return -1;
+ priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1];
++
++ if (SYN_MEXT_CAP_BIT(bid[0]))
++ return synaptics_more_extended_queries(psmouse);
++
+ return 0;
+ }
+
+@@ -444,7 +461,7 @@ static int synaptics_query_hardware(stru
+ return -1;
+ if (synaptics_firmware_id(psmouse))
+ return -1;
+- if (synaptics_board_id(psmouse))
++ if (synaptics_query_modes(psmouse))
+ return -1;
+ if (synaptics_capability(psmouse))
+ return -1;
+--- a/drivers/input/mouse/synaptics.h
++++ b/drivers/input/mouse/synaptics.h
+@@ -22,6 +22,7 @@
+ #define SYN_QUE_EXT_CAPAB_0C 0x0c
+ #define SYN_QUE_EXT_MAX_COORDS 0x0d
+ #define SYN_QUE_EXT_MIN_COORDS 0x0f
++#define SYN_QUE_MEXT_CAPAB_10 0x10
+
+ /* synatics modes */
+ #define SYN_BIT_ABSOLUTE_MODE (1 << 7)
+@@ -53,6 +54,7 @@
+ #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20)
+ #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12)
+ #define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16)
++#define SYN_MEXT_CAP_BIT(m) ((m) & (1 << 1))
+
+ /*
+ * The following describes response for the 0x0c query.
+@@ -89,6 +91,26 @@
+ #define SYN_CAP_REDUCED_FILTERING(ex0c) ((ex0c) & 0x000400)
+ #define SYN_CAP_IMAGE_SENSOR(ex0c) ((ex0c) & 0x000800)
+
++/*
++ * The following descibes response for the 0x10 query.
++ *
++ * byte mask name meaning
++ * ---- ---- ------- ------------
++ * 1 0x01 ext buttons are stick buttons exported in the extended
++ * capability are actually meant to be used
++ * by the tracktick (pass-through).
++ * 1 0x02 SecurePad the touchpad is a SecurePad, so it
++ * contains a built-in fingerprint reader.
++ * 1 0xe0 more ext count how many more extented queries are
++ * available after this one.
++ * 2 0xff SecurePad width the width of the SecurePad fingerprint
++ * reader.
++ * 3 0xff SecurePad height the height of the SecurePad fingerprint
++ * reader.
++ */
++#define SYN_CAP_EXT_BUTTONS_STICK(ex10) ((ex10) & 0x010000)
++#define SYN_CAP_SECUREPAD(ex10) ((ex10) & 0x020000)
++
+ /* synaptics modes query bits */
+ #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7))
+ #define SYN_MODE_RATE(m) ((m) & (1 << 6))
+@@ -156,6 +178,7 @@ struct synaptics_data {
+ unsigned long int capabilities; /* Capabilities */
+ unsigned long int ext_cap; /* Extended Capabilities */
+ unsigned long int ext_cap_0c; /* Ext Caps from 0x0c query */
++ unsigned long int ext_cap_10; /* Ext Caps from 0x10 query */
+ unsigned long int identity; /* Identification */
+ unsigned int x_res, y_res; /* X/Y resolution in units/mm */
+ unsigned int x_max, y_max; /* Max coordinates (from FW) */
Copied: dists/jessie-security/linux/debian/patches/features/all/power-reset-Add-generic-SYSCON-register-mapped-reset.patch (from r22689, dists/jessie/linux/debian/patches/features/all/power-reset-Add-generic-SYSCON-register-mapped-reset.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/features/all/power-reset-Add-generic-SYSCON-register-mapped-reset.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/features/all/power-reset-Add-generic-SYSCON-register-mapped-reset.patch)
@@ -0,0 +1,144 @@
+From 5d58fd8107e08a0a4e626a8ea45215bf83b7e60d Mon Sep 17 00:00:00 2001
+From: Feng Kan <fkan at apm.com>
+Date: Tue, 30 Sep 2014 16:25:03 -0700
+Subject: [PATCH 1/3] power: reset: Add generic SYSCON register mapped reset
+Origin: https://git.kernel.org/linus/09fb07bcaf529a21612fbebd1297d8c5dd1abf1b
+
+Add a generic SYSCON register mapped reset mechanism.
+
+Signed-off-by: Feng Kan <fkan at apm.com>
+Signed-off-by: Sebastian Reichel <sre at kernel.org>
+---
+ drivers/power/reset/Kconfig | 5 ++
+ drivers/power/reset/Makefile | 1 +
+ drivers/power/reset/syscon-reboot.c | 96 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 102 insertions(+)
+ create mode 100644 drivers/power/reset/syscon-reboot.c
+
+diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
+index bdcf517..fd5f9e5 100644
+--- a/drivers/power/reset/Kconfig
++++ b/drivers/power/reset/Kconfig
+@@ -80,3 +80,8 @@ config POWER_RESET_KEYSTONE
+ help
+ Reboot support for the KEYSTONE SoCs.
+
++config POWER_RESET_SYSCON
++ bool "Generic SYSCON regmap reset driver"
++ depends on POWER_RESET && MFD_SYSCON && OF
++ help
++ Reboot support for generic SYSCON mapped register reset.
+diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
+index dde2e8b..b1b5ab3 100644
+--- a/drivers/power/reset/Makefile
++++ b/drivers/power/reset/Makefile
+@@ -8,3 +8,4 @@ obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o
+ obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o
+ obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o
+ obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o
++obj-$(CONFIG_POWER_RESET_SYSCON) += syscon-reboot.o
+diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c
+new file mode 100644
+index 0000000..948e0ee
+--- /dev/null
++++ b/drivers/power/reset/syscon-reboot.c
+@@ -0,0 +1,96 @@
++/*
++ * Generic Syscon Reboot Driver
++ *
++ * Copyright (c) 2013, Applied Micro Circuits Corporation
++ * Author: Feng Kan <fkan at apm.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ */
++#include <linux/io.h>
++#include <linux/of_device.h>
++#include <linux/of_address.h>
++#include <linux/platform_device.h>
++#include <linux/notifier.h>
++#include <linux/mfd/syscon.h>
++#include <linux/regmap.h>
++#include <linux/reboot.h>
++
++struct syscon_reboot_context {
++ struct regmap *map;
++ u32 offset;
++ u32 mask;
++ struct notifier_block restart_handler;
++};
++
++static struct syscon_reboot_context *syscon_reboot_ctx;
++
++static int syscon_restart_handle(struct notifier_block *this,
++ unsigned long mode, void *cmd)
++{
++ struct syscon_reboot_context *ctx = syscon_reboot_ctx;
++ unsigned long timeout;
++
++ /* Issue the reboot */
++ if (ctx->map)
++ regmap_write(ctx->map, ctx->offset, ctx->mask);
++
++ timeout = jiffies + HZ;
++ while (time_before(jiffies, timeout))
++ cpu_relax();
++
++ pr_emerg("Unable to restart system\n");
++ return NOTIFY_DONE;
++}
++
++static int syscon_reboot_probe(struct platform_device *pdev)
++{
++ struct syscon_reboot_context *ctx;
++ struct device *dev = &pdev->dev;
++ int err;
++
++ ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
++ if (!ctx)
++ return -ENOMEM;
++
++ ctx->map = syscon_regmap_lookup_by_phandle(dev->of_node, "regmap");
++ if (IS_ERR(ctx->map))
++ return PTR_ERR(ctx->map);
++
++ if (of_property_read_u32(pdev->dev.of_node, "offset", &ctx->offset))
++ return -EINVAL;
++
++ if (of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask))
++ return -EINVAL;
++
++ ctx->restart_handler.notifier_call = syscon_restart_handle;
++ ctx->restart_handler.priority = 128;
++ err = register_restart_handler(&ctx->restart_handler);
++ if (err)
++ dev_err(dev, "can't register restart notifier (err=%d)\n", err);
++
++ syscon_reboot_ctx = ctx;
++
++ return 0;
++}
++
++static struct of_device_id syscon_reboot_of_match[] = {
++ { .compatible = "syscon-reboot" },
++ {}
++};
++
++static struct platform_driver syscon_reboot_driver = {
++ .probe = syscon_reboot_probe,
++ .driver = {
++ .name = "syscon-reboot",
++ .of_match_table = syscon_reboot_of_match,
++ },
++};
++module_platform_driver(syscon_reboot_driver);
+--
+2.1.4
+
Copied: dists/jessie-security/linux/debian/patches/features/all/power-reset-adjust-priority-of-simple-syscon-reboot-.patch (from r22689, dists/jessie/linux/debian/patches/features/all/power-reset-adjust-priority-of-simple-syscon-reboot-.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/features/all/power-reset-adjust-priority-of-simple-syscon-reboot-.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/features/all/power-reset-adjust-priority-of-simple-syscon-reboot-.patch)
@@ -0,0 +1,38 @@
+From daa276e1bf9d01d013579ac20b999d8aee11966a Mon Sep 17 00:00:00 2001
+From: Stefan Agner <stefan at agner.ch>
+Date: Tue, 2 Dec 2014 18:11:58 +0100
+Subject: [PATCH 3/3] power: reset: adjust priority of simple syscon reboot
+ driver
+Origin: https://git.kernel.org/linus/b81180b3fd4814af0459a5b6aeb1ee188fea98dc
+
+Currently, all restart handler use the priority 128, including
+watchdogs. Probably most SoC have a watchdog, and some of them
+register it also as a restart handler. But if a SoC specifies
+a dedicated reboot capability using this syscon driver, this is
+usually the preferred reboot method. Hence, raise the priority
+of this driver to 192.
+
+Signed-off-by: Stefan Agner <stefan at agner.ch>
+Reviewed-by: Guenter Roeck <linux at roeck-us.net>
+Acked-by: Mark Rutland <mark.rutland at arm.com>
+Signed-off-by: Sebastian Reichel <sre at kernel.org>
+---
+ drivers/power/reset/syscon-reboot.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c
+index 815b901..c4049f4 100644
+--- a/drivers/power/reset/syscon-reboot.c
++++ b/drivers/power/reset/syscon-reboot.c
+@@ -68,7 +68,7 @@ static int syscon_reboot_probe(struct platform_device *pdev)
+ return -EINVAL;
+
+ ctx->restart_handler.notifier_call = syscon_restart_handle;
+- ctx->restart_handler.priority = 128;
++ ctx->restart_handler.priority = 192;
+ err = register_restart_handler(&ctx->restart_handler);
+ if (err)
+ dev_err(dev, "can't register restart notifier (err=%d)\n", err);
+--
+2.1.4
+
Copied: dists/jessie-security/linux/debian/patches/features/all/power-reset-corrections-for-simple-syscon-reboot-dri.patch (from r22689, dists/jessie/linux/debian/patches/features/all/power-reset-corrections-for-simple-syscon-reboot-dri.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/features/all/power-reset-corrections-for-simple-syscon-reboot-dri.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/features/all/power-reset-corrections-for-simple-syscon-reboot-dri.patch)
@@ -0,0 +1,98 @@
+From 3510002127a93666f07b575e29e871430b431c2a Mon Sep 17 00:00:00 2001
+From: Feng Kan <fkan at apm.com>
+Date: Thu, 2 Oct 2014 11:24:15 -0700
+Subject: [PATCH 2/3] power: reset: corrections for simple syscon reboot driver
+Origin: https://git.kernel.org/linus/afaebbdbd48ada5ead707d6a90ce4b604e1d77d4
+
+This patch is to fix some bugs in reboot driver. Which includes auto selection
+of the MFD_SYSCON for the driver, use of container to locate restart handler,
+correction of the count down failure timer and ordering of the header file.
+
+Signed-off-by: Feng Kan <fkan at apm.com>
+Reviewed-by: Guenter Roeck <linux at roeck-us.net>
+[ sre: return err instead of 0 in syscon_reboot_probe() ]
+Signed-off-by: Sebastian Reichel <sre at kernel.org>
+
+---
+ drivers/power/reset/Kconfig | 3 ++-
+ drivers/power/reset/syscon-reboot.c | 27 +++++++++++----------------
+ 2 files changed, 13 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
+index fd5f9e5..4044bd1 100644
+--- a/drivers/power/reset/Kconfig
++++ b/drivers/power/reset/Kconfig
+@@ -82,6 +82,7 @@ config POWER_RESET_KEYSTONE
+
+ config POWER_RESET_SYSCON
+ bool "Generic SYSCON regmap reset driver"
+- depends on POWER_RESET && MFD_SYSCON && OF
++ depends on POWER_RESET && OF
++ select MFD_SYSCON
+ help
+ Reboot support for generic SYSCON mapped register reset.
+diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c
+index 948e0ee..815b901 100644
+--- a/drivers/power/reset/syscon-reboot.c
++++ b/drivers/power/reset/syscon-reboot.c
+@@ -14,14 +14,15 @@
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
++#include <linux/delay.h>
+ #include <linux/io.h>
+-#include <linux/of_device.h>
+-#include <linux/of_address.h>
+-#include <linux/platform_device.h>
+ #include <linux/notifier.h>
+ #include <linux/mfd/syscon.h>
+-#include <linux/regmap.h>
++#include <linux/of_address.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
+ #include <linux/reboot.h>
++#include <linux/regmap.h>
+
+ struct syscon_reboot_context {
+ struct regmap *map;
+@@ -30,21 +31,17 @@ struct syscon_reboot_context {
+ struct notifier_block restart_handler;
+ };
+
+-static struct syscon_reboot_context *syscon_reboot_ctx;
+-
+ static int syscon_restart_handle(struct notifier_block *this,
+ unsigned long mode, void *cmd)
+ {
+- struct syscon_reboot_context *ctx = syscon_reboot_ctx;
+- unsigned long timeout;
++ struct syscon_reboot_context *ctx =
++ container_of(this, struct syscon_reboot_context,
++ restart_handler);
+
+ /* Issue the reboot */
+- if (ctx->map)
+- regmap_write(ctx->map, ctx->offset, ctx->mask);
++ regmap_write(ctx->map, ctx->offset, ctx->mask);
+
+- timeout = jiffies + HZ;
+- while (time_before(jiffies, timeout))
+- cpu_relax();
++ mdelay(1000);
+
+ pr_emerg("Unable to restart system\n");
+ return NOTIFY_DONE;
+@@ -76,9 +73,7 @@ static int syscon_reboot_probe(struct platform_device *pdev)
+ if (err)
+ dev_err(dev, "can't register restart notifier (err=%d)\n", err);
+
+- syscon_reboot_ctx = ctx;
+-
+- return 0;
++ return err;
+ }
+
+ static struct of_device_id syscon_reboot_of_match[] = {
+--
+2.1.4
+
Copied: dists/jessie-security/linux/debian/patches/features/all/syscon-reboot-Backport-to-pre-register_restart_handl.patch (from r22689, dists/jessie/linux/debian/patches/features/all/syscon-reboot-Backport-to-pre-register_restart_handl.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/features/all/syscon-reboot-Backport-to-pre-register_restart_handl.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/features/all/syscon-reboot-Backport-to-pre-register_restart_handl.patch)
@@ -0,0 +1,94 @@
+From 12ff863361eb5607e02fe38123867cdc1ad048be Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ijc at debian.org>
+Date: Sun, 24 May 2015 12:53:19 +0100
+Subject: [PATCH] syscon-reboot: Backport to pre-register_restart_handler
+ kernels
+Forwarded: not-needed
+
+Signed-off-by: Ian Campbell <ijc at debian.org:>
+---
+ drivers/power/reset/Kconfig | 1 +
+ drivers/power/reset/syscon-reboot.c | 27 ++++++++++++---------------
+ 2 files changed, 13 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
+index 4044bd1..1b55a79 100644
+--- a/drivers/power/reset/Kconfig
++++ b/drivers/power/reset/Kconfig
+@@ -83,6 +83,7 @@ config POWER_RESET_KEYSTONE
+ config POWER_RESET_SYSCON
+ bool "Generic SYSCON regmap reset driver"
+ depends on POWER_RESET && OF
++ depends on ARM || ARM64
+ select MFD_SYSCON
+ help
+ Reboot support for generic SYSCON mapped register reset.
+diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c
+index c4049f4..fd4e00b 100644
+--- a/drivers/power/reset/syscon-reboot.c
++++ b/drivers/power/reset/syscon-reboot.c
+@@ -23,35 +23,33 @@
+ #include <linux/platform_device.h>
+ #include <linux/reboot.h>
+ #include <linux/regmap.h>
++#include <asm/system_misc.h>
+
+ struct syscon_reboot_context {
++ struct platform_device *pdev;
+ struct regmap *map;
+ u32 offset;
+ u32 mask;
+- struct notifier_block restart_handler;
+ };
+
+-static int syscon_restart_handle(struct notifier_block *this,
+- unsigned long mode, void *cmd)
++static struct syscon_reboot_context *syscon_reboot_context;
++
++static void syscon_restart(enum reboot_mode reboot_mode, const char *cmd)
+ {
+- struct syscon_reboot_context *ctx =
+- container_of(this, struct syscon_reboot_context,
+- restart_handler);
++ struct syscon_reboot_context *ctx = syscon_reboot_context;
+
+ /* Issue the reboot */
+ regmap_write(ctx->map, ctx->offset, ctx->mask);
+
+ mdelay(1000);
+
+- pr_emerg("Unable to restart system\n");
+- return NOTIFY_DONE;
++ dev_emerg(&ctx->pdev->dev, "Unable to restart system\n");
+ }
+
+ static int syscon_reboot_probe(struct platform_device *pdev)
+ {
+ struct syscon_reboot_context *ctx;
+ struct device *dev = &pdev->dev;
+- int err;
+
+ ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+ if (!ctx)
+@@ -67,13 +65,12 @@ static int syscon_reboot_probe(struct platform_device *pdev)
+ if (of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask))
+ return -EINVAL;
+
+- ctx->restart_handler.notifier_call = syscon_restart_handle;
+- ctx->restart_handler.priority = 192;
+- err = register_restart_handler(&ctx->restart_handler);
+- if (err)
+- dev_err(dev, "can't register restart notifier (err=%d)\n", err);
++ ctx->pdev = pdev;
++
++ syscon_reboot_context = ctx;
++ arm_pm_restart = syscon_restart;
+
+- return err;
++ return 0;
+ }
+
+ static struct of_device_id syscon_reboot_of_match[] = {
+--
+2.1.4
+
Copied: dists/jessie-security/linux/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch (from r22689, dists/jessie/linux/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch)
@@ -0,0 +1,81 @@
+From: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+Subject: [PATCH v3 2/2] [usb] dd support for ACPI identification to xhci-platform
+Date: Tue, 25 Nov 2014 15:19:26 -0600
+Origin: http://permalink.gmane.org/gmane.linux.usb.general/118784
+Bug-Debian: https://bugs.debian.org/785707
+
+Provide the methods to let ACPI identify the need to use
+xhci-platform. Change the Kconfig files so the
+xhci-plat.o file is selectable during kernel config.
+
+This has been tested on an ARM64 machine with platform XHCI, an
+x86_64 machine with XHCI, and an x86_64 machine without XHCI.
+There were no regressions or error messages on the machines
+without platform XHCI.
+
+Signed-off-by: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+[bwh: Backported to 3.16: adjust context]
+---
+Changes from v2
+ Replaced tristate with a boolean as the driver doesn't
+ compile as a module
+ Correct --help-- to ---help---
+Changes from v1
+ Renamed from "add support for APM X-Gene to xhci-platform"
+ Removed changes to arm64/Kconfig
+ Made CONFIG_USB_XHCI_PLATFORM a user selectable config option
+
+ drivers/usb/host/Kconfig | 7 ++++++-
+ drivers/usb/host/xhci-plat.c | 11 +++++++++++
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -27,7 +27,12 @@ config USB_XHCI_HCD
+ if USB_XHCI_HCD
+
+ config USB_XHCI_PLATFORM
+- tristate
++ boolean "xHCI platform driver support"
++ ---help---
++ Say 'Y' to enable the support for the xHCI host controller
++ as a platform device. Many ARM SoCs provide USB this way.
++
++ If unsure, say 'Y'.
+
+ config USB_XHCI_MVEBU
+ tristate "xHCI support for Marvell Armada 375/38x"
+--- a/drivers/usb/host/xhci-plat.c
++++ b/drivers/usb/host/xhci-plat.c
+@@ -17,6 +17,7 @@
+ #include <linux/of.h>
+ #include <linux/platform_device.h>
+ #include <linux/slab.h>
++#include <linux/acpi.h>
+
+ #include "xhci.h"
+ #include "xhci-mvebu.h"
+@@ -283,6 +284,15 @@ static const struct of_device_id usb_xhc
+ MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
+ #endif
+
++#ifdef CONFIG_ACPI
++static const struct acpi_device_id usb_xhci_acpi_match[] = {
++ { "PNP0D10", },
++ { "PNP0D15", },
++ { }
++};
++MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match);
++#endif
++
+ static struct platform_driver usb_xhci_driver = {
+ .probe = xhci_plat_probe,
+ .remove = xhci_plat_remove,
+@@ -290,6 +300,7 @@ static struct platform_driver usb_xhci_d
+ .name = "xhci-hcd",
+ .pm = DEV_PM_OPS,
+ .of_match_table = of_match_ptr(usb_xhci_of_match),
++ .acpi_match_table = ACPI_PTR(usb_xhci_acpi_match),
+ },
+ };
+ MODULE_ALIAS("platform:xhci-hcd");
Copied: dists/jessie-security/linux/debian/patches/features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch (from r22689, dists/jessie/linux/debian/patches/features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch)
@@ -0,0 +1,48 @@
+From: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+Subject: [PATCH v3 1/2] make xhci platform driver use 64 bit or 32 bit DMA
+Date: Tue, 25 Nov 2014 15:19:25 -0600
+Origin: http://permalink.gmane.org/gmane.linux.usb.general/118786
+Bug-Debian: https://bugs.debian.org/785707
+
+The xhci platform driver needs to work on systems that either only
+support 64-bit DMA or only support 32-bit DMA. Attempt to set a
+coherent dma mask for 64-bit DMA, and attempt again with 32-bit
+DMA if that fails.
+
+Signed-off-by: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+Tested-by: Mark Salter <msalter-H+wXaHxf7aLQT0dZR+AlfA at public.gmane.org>
+---
+Changes from v2:
+ None
+Changes from v1:
+ Consolidated to use dma_set_mask_and_coherent
+ Got rid of the check against sizeof(dma_addr_t)
+
+ drivers/usb/host/xhci-plat.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/usb/host/xhci-plat.c
++++ b/drivers/usb/host/xhci-plat.c
+@@ -115,14 +115,14 @@ static int xhci_plat_probe(struct platfo
+ if (!res)
+ return -ENODEV;
+
+- /* Initialize dma_mask and coherent_dma_mask to 32-bits */
+- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+- if (ret)
+- return ret;
+- if (!pdev->dev.dma_mask)
+- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+- else
+- dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++ /* Try setting the coherent_dma_mask to 64 bits, then try 32 bits */
++ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
++ if (ret) {
++ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
++ if (ret)
++ return ret;
++ }
++
+
+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+ if (!hcd)
Copied: dists/jessie-security/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch (from r22689, dists/jessie/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch Sun Jun 14 21:48:30 2015 (r22745, copy of r22689, dists/jessie/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch)
@@ -0,0 +1,56 @@
+From: Adam Lee <adam.lee at canonical.com>
+Date: Wed, 11 Feb 2015 13:43:10 +0800
+Subject: thinkpad_acpi: support new BIOS version string pattern
+Origin: https://git.kernel.org/linus/1b0eb5bc241354aa854671fdf02132d2d1452bdf
+Bug-Debian: https://bugs.debian.org/780467
+
+Latest ThinkPad models use a new string pattern of BIOS version,
+thinkpad_acpi won't be loaded automatically without this fix.
+
+Signed-off-by: Adam Lee <adam.lee at canonical.com>
+
+Intentatation cleanup.
+
+Signed-off-by: Darren Hart <dvhart at linux.intel.com>
+[bwh: Backported to 3.16: adjust context]
+---
+ drivers/platform/x86/thinkpad_acpi.c | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+--- a/drivers/platform/x86/thinkpad_acpi.c
++++ b/drivers/platform/x86/thinkpad_acpi.c
+@@ -8793,17 +8793,31 @@ static bool __pure __init tpacpi_is_fw_d
+ return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z');
+ }
+
+-/* Most models: xxyTkkWW (#.##c); Ancient 570/600 and -SL lacks (#.##c) */
+ static bool __pure __init tpacpi_is_valid_fw_id(const char* const s,
+ const char t)
+ {
+- return s && strlen(s) >= 8 &&
++ /*
++ * Most models: xxyTkkWW (#.##c)
++ * Ancient 570/600 and -SL lacks (#.##c)
++ */
++ if (s && strlen(s) >= 8 &&
+ tpacpi_is_fw_digit(s[0]) &&
+ tpacpi_is_fw_digit(s[1]) &&
+ s[2] == t &&
+ (s[3] == 'T' || s[3] == 'N') &&
+ tpacpi_is_fw_digit(s[4]) &&
+- tpacpi_is_fw_digit(s[5]);
++ tpacpi_is_fw_digit(s[5]))
++ return true;
++
++ /* New models: xxxyTkkW (#.##c); T550 and some others */
++ return s && strlen(s) >= 8 &&
++ tpacpi_is_fw_digit(s[0]) &&
++ tpacpi_is_fw_digit(s[1]) &&
++ tpacpi_is_fw_digit(s[2]) &&
++ s[3] == t &&
++ (s[4] == 'T' || s[4] == 'N') &&
++ tpacpi_is_fw_digit(s[5]) &&
++ tpacpi_is_fw_digit(s[6]);
+ }
+
+ /* returns 0 - probe ok, or < 0 - probe error.
Modified: dists/jessie-security/linux/debian/patches/series
==============================================================================
--- dists/jessie-security/linux/debian/patches/series Sun Jun 14 19:52:59 2015 (r22744)
+++ dists/jessie-security/linux/debian/patches/series Sun Jun 14 21:48:30 2015 (r22745)
@@ -47,8 +47,23 @@
bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
debian/qxl-disable-modeset-by-default.patch
+# Introduce READ_ONCE and WRITE_ONCE; replace misuse of ACCESS_ONCE.
+# Needed for backports of other fixes.
+bugfix/all/access_once/0001-kernel-Provide-READ_ONCE-and-ASSIGN_ONCE.patch
+bugfix/all/access_once/0002-mm-replace-ACCESS_ONCE-with-READ_ONCE-or-barriers.patch
+bugfix/all/access_once/0003-x86-spinlock-Replace-ACCESS_ONCE-with-READ_ONCE.patch
+bugfix/all/access_once/0004-x86-gup-Replace-ACCESS_ONCE-with-READ_ONCE.patch
+bugfix/all/access_once/0005-mips-gup-Replace-ACCESS_ONCE-with-READ_ONCE.patch
+bugfix/all/access_once/0006-arm64-spinlock-Replace-ACCESS_ONCE-READ_ONCE.patch
+bugfix/all/access_once/0007-arm-spinlock-Replace-ACCESS_ONCE-with-READ_ONCE.patch
+bugfix/all/access_once/0008-powerpc-gup-Replace-ACCESS_ONCE-with-READ_ONCE.patch
+bugfix/all/access_once/0009-ppc-kvm-Replace-ACCESS_ONCE-with-READ_ONCE.patch
+bugfix/all/access_once/0010-ppc-hugetlbfs-Replace-ACCESS_ONCE-with-READ_ONCE.patch
+bugfix/all/access_once/0011-kernel-tighten-rules-for-ACCESS-ONCE.patch
+bugfix/all/access_once/0012-next-sh-Fix-compile-error.patch
+bugfix/all/access_once/0013-kernel-Change-ASSIGN_ONCE-val-x-to-WRITE_ONCE-x-val.patch
+
# Arch bug fixes
-bugfix/arm/omap-musb-choice.patch
bugfix/mips/disable-advansys.patch
bugfix/arm/ixp4xx_iobe.patch
bugfix/m68k/ethernat-kconfig.patch
@@ -63,9 +78,13 @@
bugfix/x86/acpi-video-disable-native-backlight-on-samsung-series-9.patch
bugfix/x86/drm-i915-quietly-reject-attempts-to-create-non-pagealigned-stolen-objects.patch
bugfix/arm/mvebu-do-not-register-custom-DMA-operations-when-coherency-is-disabled.patch
-bugfix/x86/x86-microcode-intel-guard-against-stack-overflow-in-.patch
bugfix/x86/drm-i915-add-limited-color-range-readout-for-hdmi-dp.patch
bugfix/x86/powercap-rapl-change-domain-detection-message.patch
+bugfix/arm/ARM-dts-imx53-correct-clock-names-of-SATA-node.patch
+bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
+bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch
+bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch
+bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch
# Arch features
features/mips/MIPS-Support-hard-limit-of-cpu-count-nr_cpu_ids.patch
@@ -152,6 +171,9 @@
features/arm64/dtb-Add-10GbE-node-to-APM-X-Gene-SoC-device-tree.patch
features/arm64/dtb-Add-SGMII-based-1GbE-node-to-APM-X-Gene-SoC-devi.patch
features/arm64/dtb-xgene-fix-Backward-compatibility-with-older-firm.patch
+features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch
+features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch
+features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch
# Miscellaneous bug fixes
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
@@ -185,15 +207,18 @@
bugfix/all/xen-balloon-Don-t-continue-ballooning-when-BP_ECANCE.patch
bugfix/all/vfs-read-file_handle-only-once-in-handle_to_path.patch
bugfix/all/keys-request_key-should-reget-expired-keys-rather-th.patch
-bugfix/all/ib-core-prevent-integer-overflow-in-ib_umem_get.patch
-bugfix/all/btrfs-make-xattr-replace-operations-atomic.patch
-bugfix/all/ext4-fix-zero_range-bug-hidden-by-flag-aliasing.patch
-bugfix/all/ext4-fix-accidental-flag-aliasing-in-ext4_map_blocks.patch
-bugfix/all/ext4-allocate-entire-range-in-zero-range.patch
-bugfix/all/ipv6-don-t-reduce-hop-limit-for-an-interface.patch
bugfix/all/hid-thingm-fix-workqueue-race-on-remove.patch
debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch
bugfix/all/xen-netfront-release-per-queue-Tx-and-Rx-resource-wh.patch
+bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch
+bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch
+bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch
+bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch
+bugfix/all/libata-update-crucial-micron-blacklist.patch
+bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
+bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
+bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch
+bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
# memfd_create() & kdbus backport
features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch
@@ -236,6 +261,10 @@
features/all/simplefb-Fix-build-errors-when-CONFIG_COMMON_CLK-is-.patch
features/all/simplefb-Fix-build-failure-on-Sparc.patch
features/all/fbcon-Change-fbcon_init-from-module_init-to-fs_initc.patch
+features/all/power-reset-Add-generic-SYSCON-register-mapped-reset.patch
+features/all/power-reset-corrections-for-simple-syscon-reboot-dri.patch
+features/all/power-reset-adjust-priority-of-simple-syscon-reboot-.patch
+features/all/syscon-reboot-Backport-to-pre-register_restart_handl.patch
# Update r8723au to 3.17
features/all/r8723au/0001-staging-rtl8723au-rtw_get_wps_ie23a-Remove-unused-de.patch
@@ -552,7 +581,6 @@
# Add FocalTech support to psmouse
features/all/psmouse/input-i8042-also-set-the-firmware-id-for-muxed-ports.patch
-features/all/psmouse/input-psmouse-add-psmouse_matches_pnp_id-helper-func.patch
features/all/psmouse/input-psmouse-add-support-for-detecting-focaltech-ps.patch
features/all/psmouse/input-psmouse-support-for-the-focaltech-ps-2-protoco.patch
features/all/psmouse/input-psmouse-remove-hardcoded-touchpad-size-from-th.patch
@@ -560,6 +588,23 @@
features/all/psmouse/input-psmouse-disable-changing-resolution-rate-scale.patch
features/all/psmouse/input-psmouse-disable-palm-detection-in-the-focaltec.patch
+# Add i219 support to e1000e
+features/all/e1000e/0001-e1000e-initial-support-for-i219.patch
+features/all/e1000e/0002-e1000e-fix-obscure-comments.patch
+features/all/e1000e/0003-e1000e-remove-calls-to-ioremap-unmap-for-nvm-addr.patch
+features/all/e1000e/0004-e1000e-nvm-write-protect-access-removed-from-spt-hw.patch
+
+# Make musb multiplatform compatible
+features/all/musb/0001-usb-musb-add-function-pointers-for-io-access-functio.patch
+features/all/musb/0002-usb-musb-populate-new-io-functions-for-tusb6010.patch
+features/all/musb/0003-usb-musb-populate-new-io-functions-for-blackfin.patch
+features/all/musb/0004-usb-musb-change-to-use-new-io-access.patch
+features/all/musb/0005-usb-musb-change-end-point-selection-to-use-new-io-ac.patch
+features/all/musb/0006-usb-musb-pass-fifo_mode-in-platform-data.patch
+features/all/musb/0007-usb-musb-allow-multiple-glue-layers-to-be-built-in.patch
+features/all/musb/0008-usb-musb-use-is_enabled-for-tusb6010.patch
+features/all/musb/0009-usb-musb-fix-order-of-conditions-for-assigning-end-p.patch
+
# Fix ABI changes
debian/of-fix-abi-changes.patch
debian/iovec-fix-abi-change-in-3.16.7-ckt1.patch
@@ -577,26 +622,3 @@
debian/tcp-fix-abi-change-in-3.16.7-ckt7.patch
debian/usb-avoid-abi-change-in-3.16.7-ckt8.patch
debian/procfs-avoid-abi-change-in-3.16.7-ckt8.patch
-
-bugfix/all/btrfs-simplify-insert_orphan_item.patch
-
-bugfix/x86/crypto-aesni-fix-memory-usage-in-GCM-decryption.patch
-bugfix/all/tcp-fix-crash-in-tcp-fast-open.patch
-
-# Introduce READ_ONCE and WRITE_ONCE; replace misuse of ACCESS_ONCE.
-# Needed for backports of other fixes.
-bugfix/all/access_once/0001-kernel-Provide-READ_ONCE-and-ASSIGN_ONCE.patch
-bugfix/all/access_once/0002-mm-replace-ACCESS_ONCE-with-READ_ONCE-or-barriers.patch
-bugfix/all/access_once/0003-x86-spinlock-Replace-ACCESS_ONCE-with-READ_ONCE.patch
-bugfix/all/access_once/0004-x86-gup-Replace-ACCESS_ONCE-with-READ_ONCE.patch
-bugfix/all/access_once/0005-mips-gup-Replace-ACCESS_ONCE-with-READ_ONCE.patch
-bugfix/all/access_once/0006-arm64-spinlock-Replace-ACCESS_ONCE-READ_ONCE.patch
-bugfix/all/access_once/0007-arm-spinlock-Replace-ACCESS_ONCE-with-READ_ONCE.patch
-bugfix/all/access_once/0008-powerpc-gup-Replace-ACCESS_ONCE-with-READ_ONCE.patch
-bugfix/all/access_once/0009-ppc-kvm-Replace-ACCESS_ONCE-with-READ_ONCE.patch
-bugfix/all/access_once/0010-ppc-hugetlbfs-Replace-ACCESS_ONCE-with-READ_ONCE.patch
-bugfix/all/access_once/0011-kernel-tighten-rules-for-ACCESS-ONCE.patch
-bugfix/all/access_once/0012-next-sh-Fix-compile-error.patch
-bugfix/all/access_once/0013-kernel-Change-ASSIGN_ONCE-val-x-to-WRITE_ONCE-x-val.patch
-
-bugfix/all/fs-take-i_mutex-during-prepare_binprm-for-set-ug-id-.patch
More information about the Kernel-svn-changes
mailing list