[linux] 01/01: Merge tag 'debian/4.3.3-3'
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sat Jan 2 19:19:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit e2abaa403e4c8e9939b65d00dd50458c13aa7694
Merge: 5342a1a 2f8b046
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sat Jan 2 19:18:05 2016 +0000
Merge tag 'debian/4.3.3-3'
Drop the ABI reference and ignored symbols.
Drop most of the patches, as they're already upstream.
debian/bin/gencontrol.py | 21 ++--
debian/changelog | 32 ++++++
debian/config/kernelarch-powerpc/config-arch-64 | 5 +
debian/config/kernelarch-x86/config | 1 +
.../armhf/modules/armhf-armmp/core-modules | 29 ++++++
.../armhf/modules/armhf-armmp/sata-modules | 2 +
.../armhf/modules/armhf-armmp/usb-modules | 17 +++-
.../keys-fix-race-between-read-and-revoke.patch | 110 +++++++++++++++++++++
...e-wrt-a-process-requires-mapped-uids-gids.patch | 104 +++++++++++++++++++
...-t-finish-a-td-if-we-get-a-short-transfer.patch | 36 +++++++
.../crypto-sun4i-ss-add-missing-statesize.patch | 40 ++++++++
debian/patches/series | 6 ++
debian/rules.real | 3 +-
13 files changed, 393 insertions(+), 13 deletions(-)
diff --cc debian/changelog
index 2bd9282,c2b7be2..cff2c69
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,85 -1,35 +1,117 @@@
+linux (4.4~rc7-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * [rt] Update to 4.4-rc6-rt1 and re-enable
+ * [rt] Fix build error in kernel/time/hrtimer.c
+ * [armhf] Add support for BCM2836 and Raspberry Pi 2:
+ - pwm: bcm2835: Calculate scaler in ->config()
+ - pwm: bcm2835: Prevent division by zero
+ - drm: Create a driver hook for allocating GEM object structs
+ - drm/vc4: Add a BO cache
+ - drm/vc4: Add create and map BO ioctls
+ - drm/vc4: Add an API for creating GPU shaders in GEM BOs
+ - drm/vc4: Fix a typo in a V3D debug register
+ - drm/vc4: Bind and initialize the V3D engine
+ - drm/vc4: Add support for drawing 3D frames
+ - drm/vc4: Add support for async pageflips
+ - drm/vc4: Add an interface for capturing the GPU state after a hang
+ - drm/vc4: copy_to_user() returns the number of bytes remaining
+ - drm/vc4: allocate enough memory in vc4_save_hang_state()
+ - drm/vc4: fix an error code
+ - bcm2835: Add a compat string for bcm2836 machine probe
+ - bcm2835: Add Kconfig support for bcm2836
+ - bcm2835: Define two new packets from the latest firmware
+ - bcm2835: add rpi power domain driver
+ - bcm2835: Split the DT for peripherals from the DT for the CPU
+ - bcm2835: Move the CPU/peripheral include out of common RPi DT
+ - bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B
+ - bcm2835: Add the auxiliary clocks to the device tree
+ - Enable ARCH_BCM, ARCH_BCM2835, DMA_BCM2835, BCM2835_MBOX,
+ RASPBERRYPI_FIRMWARE, RASPBERRYPI_POWER
+ - Enable DRM_VC4, I2C_BCM2835, MMC_SDHCI_BCM2835, PWM_BCM2835, SPI_BCM2835,
+ SPI_BCM2835AUX, USB_DWC2, BCM2835_WDT, SND_BCM2835_SOC_I2S as modules
+ - udeb: Add sdhci-bcm2835 to mmc-modules, dwc2 to usb-modules
+ * [armhf] Enable INPUT_AXP20X_PEK, CAN_SUN4I, SND_SUN4I_CODEC as modules
+ (Closes: #808623)
+
+ [ Ian Campbell ]
+ * [armel/kirkwood] Updates/clarifications to kernel size limitations from
+ Martin Michlmayr. (Closes: #809528)
+ * [armhf] Enable support for Rockchip devices. (Closes: #809083)
+ * [armhf] Enable basic support for DRA7XX systems, such as Beagle-x15.
+ (Closes: #807624)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Thu, 24 Dec 2015 21:28:51 +0000
+
+linux (4.4~rc6-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+ - include/linux/mmdebug.h: should include linux/bug.h
+ (fixes FTBFS on arm64)
+
+ [ Ben Hutchings ]
+ * [sparc64] udeb: Replace mpt2sas with mpt3sas in scsi-common-modules
+ (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 21 Dec 2015 17:30:10 +0000
+
+linux (4.4~rc5-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * [arm64] Drop now-redundant patches for X-Gene (fixes FTBFS)
+ * [s390x] udeb: Add crc-modules package (fixes FTBFS)
+ * cirrus,mgag200: Drop patches for compatibility with wheezy userland
+
+ -- Ben Hutchings <ben at decadent.org.uk> Wed, 16 Dec 2015 17:16:09 +0000
+
+linux (4.4~rc4-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * aufs: Update support patches to aufs4.x-rcN-20151123
+ * udeb: Make md-modules depend on crc-modules (Closes: #807661)
+ * [armel/kirkwood,armhf] crypto: Enable CRYPTO_DEV_MARVELL_CESA as module
+ (Closes: #807634)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 13 Dec 2015 16:25:45 +0000
+
+ linux (4.3.3-3) unstable; urgency=medium
+
+ [ Ben Hutchings ]
+ * [ppc64*] drm: Enable DRM_AST as module (Closes: #808338)
+ * block: ensure to split after potentially bouncing a bio (Closes: #809082)
+ * pptp: verify sockaddr_len in pptp_bind() and pptp_connect() (CVE-2015-8569)
+ * bluetooth: Validate socket address length in sco_sock_bind() (CVE-2015-8575)
+ * [xen] Fix race conditions in back-end drivers (CVE-2015-8550, XSA-155)
+ * [xen] pciback: Fix state validation in MSI control operations
+ (CVE-2015-8551, CVE-2015-8852, XSA-157)
+ * ptrace: being capable wrt a process requires mapped uids/gids
+ (CVE-2015-8709)
+ * KEYS: Fix race between read and revoke (CVE-2015-7550)
+ * [armhf] udeb: Add modular clock, GPIO, PCIe PHY and regulator drivers to
+ core-modules (Closes: #809521)
+ * [armhf] udeb: Add more USB PHY drivers to usb-modules
+ * drm/nouveau/pmu: do not assume a PMU is present (Closes: #809481)
+ * [x86] drm/i915: Don't compare has_drrs strictly in pipe config
+ (Closes: #808720)
+ * [armhf] crypto: sun4i-ss - add missing statesize (Closes: #808625)
+ * Revert "xhci: don't finish a TD if we get a short transfer event mid TD"
+ (Closes: #808602, #808953, regression in 4.3-rc7)
+ * [x86] pinctrl: Enable PINCTRL_CHERRYVIEW (Closes: #808044)
+ * [s390x] udeb: Add crc-modules package (Closes: #808051)
+
+ [ Salvatore Bonaccorso ]
+ * ovl: fix permission checking for setattr (CVE-2015-8660)
+ * [x86] kvm: Reload pit counters for all channels when restoring state
+ (CVE-2015-7513)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 02 Jan 2016 16:45:46 +0000
+
linux (4.3.3-2) unstable; urgency=medium
* [armhf,sparc64] Force ZONE_DMA to be enabled, reversing ABI change in
diff --cc debian/installer/armhf/modules/armhf-armmp/usb-modules
index e3cc5ea,0be12dd..c04d788
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@@ -8,8 -8,18 +8,19 @@@ ehci-exyno
ehci-omap
ehci-orion
ehci-tegra
- phy-exynos-usb2
- phy-omap-usb2
ci_hdrc_imx
- phy-mxs-usb
+dwc2
+
+ # USB PHYs
+ phy-am335x ?
+ phy-am335x-control ?
+ phy-exynos-usb2
+ phy-exynos5-usbdrd ?
+ phy-generic ?
+ phy-mxs-usb
+ phy-omap-usb2
+ phy-sun4i-usb ?
+ phy-sun9i-usb ?
+ phy-tegra-usb ?
+ phy-twl4030-usb ?
+ phy-twl6030-usb ?
diff --cc debian/patches/bugfix/all/revert-xhci-don-t-finish-a-td-if-we-get-a-short-transfer.patch
index 0000000,7d79460..4390571
mode 000000,100644..100644
--- a/debian/patches/bugfix/all/revert-xhci-don-t-finish-a-td-if-we-get-a-short-transfer.patch
+++ b/debian/patches/bugfix/all/revert-xhci-don-t-finish-a-td-if-we-get-a-short-transfer.patch
@@@ -1,0 -1,37 +1,36 @@@
+ From: Ben Hutchings <ben at decadent.org.uk>
+ Date: Sat, 02 Jan 2016 03:03:27 +0000
+ Subject: Revert "xhci: don't finish a TD if we get a short transfer event mid TD"
+ Bug-Debian: https://bugs.debian.org/808602
+ Bug-Debian: https://bugs.debian.org/808953
+
-This reverts commit dbd81f75b991c972970764ba75287cbbc8f066be, which
-was commit e210c422b6fdd2dc123bedc588f399aefd8bf9de upstream. It
++This reverts commit e210c422b6fdd2dc123bedc588f399aefd8bf9de. It
+ caused serious regressions as referenced above.
+
+ ---
+ --- a/drivers/usb/host/xhci-ring.c
+ +++ b/drivers/usb/host/xhci-ring.c
-@@ -2191,10 +2191,6 @@ static int process_bulk_intr_td(struct x
++@@ -2192,10 +2192,6 @@ static int process_bulk_intr_td(struct x
+ }
+ /* Fast path - was this the last TRB in the TD for this URB? */
+ } else if (event_trb == td->last_trb) {
+ - if (td->urb_length_set && trb_comp_code == COMP_SHORT_TX)
+ - return finish_td(xhci, td, event_trb, event, ep,
+ - status, false);
+ -
+ if (EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)) != 0) {
+ td->urb->actual_length =
+ td->urb->transfer_buffer_length -
-@@ -2246,12 +2242,6 @@ static int process_bulk_intr_td(struct x
++@@ -2247,12 +2243,6 @@ static int process_bulk_intr_td(struct x
+ td->urb->actual_length +=
+ TRB_LEN(le32_to_cpu(cur_trb->generic.field[2])) -
+ EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
+ -
+ - if (trb_comp_code == COMP_SHORT_TX) {
+ - xhci_dbg(xhci, "mid bulk/intr SP, wait for last TRB event\n");
+ - td->urb_length_set = true;
+ - return 0;
+ - }
+ }
+
+ return finish_td(xhci, td, event_trb, event, ep, status, false);
diff --cc debian/patches/series
index d5d1e0e,b504771..6af7287
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -64,31 -87,49 +64,37 @@@ features/all/grsecurity/grsecurity-kcon
#features/all/grsecurity/grsecurity-kbuild.patch
features/all/grsecurity/grkernsec_perf_harden.patch
-# Self-test bug fixes
-bugfix/all/selftests-add-missing-include-directives.patch
-bugfix/all/selftests-memfd-stop-unnecessary-rebuilds.patch
-bugfix/all/selftests-kprobe-choose-an-always-defined-function-t.patch
-bugfix/all/selftests-make-scripts-executable.patch
-bugfix/all/selftests-vm-try-harder-to-allocate-huge-pages.patch
-bugfix/all/selftests-breakpoints-actually-build-it.patch
-
-# ABI maintenance
-debian/armhf-sparc64-force-zone_dma-to-be-enabled.patch
-
-# Security fixes
-bugfix/all/media-media-vivid-osd-fix-info-leak-in-ioctl.patch
-bugfix/x86/kvm-svm-unconditionally-intercept-DB.patch
-bugfix/x86/kvm-x86-rename-update_db_bp_intercept-to-update_bp_i.patch
bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
bugfix/all/media-usbvision-fix-crash-on-detecting-device-with-i.patch
-bugfix/all/isdn_ppp-add-checks-for-allocation-failure-in-isdn_p.patch
-bugfix/all/ppp-slip-validate-vj-compression-slot-parameters-com.patch
-bugfix/all/net-add-validation-for-the-socket-syscall-protocol.patch
-bugfix/all/revert-vrf-fix-double-free-and-memory-corruption-on-.patch
-bugfix/all/vrf-fix-double-free-and-memory-corruption-on-registe.patch
-bugfix/all/tipc-fix-kfree_skb-of-uninitialised-pointer.patch
-bugfix/all/ovl-fix-permission-checking-for-setattr.patch
-bugfix/all/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch
-bugfix/all/bluetooth-validate-socket-address-length-in-sco_sock.patch
-bugfix/all/xen-add-ring_copy_request.patch
-bugfix/all/xen-netback-don-t-use-last-request-to-determine-mini.patch
-bugfix/all/xen-netback-use-ring_copy_request-throughout.patch
-bugfix/all/xen-blkback-only-read-request-operation-from-shared-.patch
-bugfix/all/xen-blkback-read-from-indirect-descriptors-only-once.patch
-bugfix/all/xen-scsiback-safely-copy-requests.patch
-bugfix/all/xen-pciback-save-xen_pci_op-commands-before-processi.patch
-bugfix/all/xen-pciback-return-error-on-xen_pci_op_enable_msi-wh.patch
-bugfix/all/xen-pciback-return-error-on-xen_pci_op_enable_msix-w.patch
-bugfix/all/xen-pciback-do-not-install-an-irq-handler-for-msi-in.patch
-bugfix/all/xen-pciback-for-xen_pci_op_disable_msi-x-only-disabl.patch
-bugfix/all/xen-pciback-don-t-allow-msi-x-ops-if-pci_command_mem.patch
+bugfix/x86/drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch
+features/arm/rpi/pwm-bcm2835-calculate-scaler-in-config.patch
+features/arm/rpi/pwm-bcm2835-prevent-division-by-zero.patch
+features/arm/rpi/pwm-bcm2835-fix-email-address-specification.patch
+features/arm/rpi/drm-create-a-driver-hook-for-allocating-gem-object-s.patch
+features/arm/rpi/drm-vc4-add-a-bo-cache.patch
+features/arm/rpi/drm-vc4-add-create-and-map-bo-ioctls.patch
+features/arm/rpi/drm-vc4-add-an-api-for-creating-gpu-shaders-in-gem-b.patch
+features/arm/rpi/drm-vc4-fix-a-typo-in-a-v3d-debug-register.patch
+features/arm/rpi/drm-vc4-bind-and-initialize-the-v3d-engine.patch
+features/arm/rpi/drm-vc4-add-support-for-drawing-3d-frames.patch
+features/arm/rpi/drm-vc4-add-support-for-async-pageflips.patch
+features/arm/rpi/drm-vc4-add-an-interface-for-capturing-the-gpu-state.patch
+features/arm/rpi/drm-vc4-copy_to_user-returns-the-number-of-bytes-rem.patch
+features/arm/rpi/drm-vc4-allocate-enough-memory-in-vc4_save_hang_stat.patch
+features/arm/rpi/drm-vc4-fix-an-error-code.patch
+features/arm/rpi/dt-bindings-add-root-properties-for-raspberry-pi-2.patch
+features/arm/rpi/arm-bcm2835-add-a-compat-string-for-bcm2836-machine-.patch
+features/arm/rpi/arm-bcm2835-add-kconfig-support-for-bcm2836.patch
+features/arm/rpi/arm-bcm2835-define-two-new-packets-from-the-latest-f.patch
+features/arm/rpi/dt-bindings-add-rpi-power-domain-driver-bindings.patch
+features/arm/rpi/arm-bcm2835-add-rpi-power-domain-driver.patch
+features/arm/rpi/arm-bcm2835-split-the-dt-for-peripherals-from-the-dt.patch
+features/arm/rpi/arm-bcm2835-move-the-cpu-peripheral-include-out-of-c.patch
+features/arm/rpi/arm-bcm2835-add-devicetree-for-bcm2836-and-raspberry.patch
+features/arm/rpi/arm-bcm2835-add-the-auxiliary-clocks-to-the-device-t.patch
++
++# Security fixes
+ bugfix/all/ptrace-being-capable-wrt-a-process-requires-mapped-uids-gids.patch
-debian/ptrace-fix-abi-change-for-priv-esc-fix.patch
+ bugfix/all/keys-fix-race-between-read-and-revoke.patch
-bugfix/x86/KVM-x86-Reload-pit-counters-for-all-channels-when-re.patch
-bugfix/all/drm-nouveau-pmu-do-not-assume-a-pmu-is-present.patch
-bugfix/x86/drm-i915-don-t-compare-has_drrs-strictly-in-pipe-con.patch
+ bugfix/arm/crypto-sun4i-ss-add-missing-statesize.patch
+ bugfix/all/revert-xhci-don-t-finish-a-td-if-we-get-a-short-transfer.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list