[linux] 01/01: Merge tag 'debian/4.3.3-4'

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 567f9b5f9fc7f32478573c70bf713a49bb98eb88
Merge: 4689e64 bbfa584
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jan 3 02:02:22 2016 +0000

    Merge tag 'debian/4.3.3-4'

 debian/changelog                                        | 7 +++++++
 debian/installer/armhf/modules/armhf-armmp/core-modules | 2 +-
 debian/installer/armhf/modules/armhf-armmp/mmc-modules  | 1 -
 debian/installer/armhf/modules/armhf-armmp/usb-modules  | 3 +--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index cff2c69,72fedfb..722402a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,85 -1,10 +1,92 @@@
 +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-4) unstable; urgency=medium
+ 
+   * [armhf] udeb: Remove pbias-regulator module from mmc-modules as it's now
+     in core-modules (fixes FTBFS)
+ 
+  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 03 Jan 2016 01:50:52 +0000
+ 
  linux (4.3.3-3) unstable; urgency=medium
  
    [ Ben Hutchings ]
diff --cc debian/installer/armhf/modules/armhf-armmp/mmc-modules
index 7d020cd,4ea063f..287ff3f
--- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
@@@ -5,5 -5,3 +5,4 @@@ mmc
  omap_hsmmc
  sunxi-mmc
  dw_mmc-exynos
- pbias-regulator
 +sdhci-bcm2835

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git