debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge changes from sid up to 4.0.4-1 

Excluding the ABI number bump and the PREEMPT_RT featureset.

svn path=/dists/trunk/linux/; revision=22720
This commit is contained in:
Ben Hutchings 2015-05-27 02:40:14 +00:00
parent b7833d9938 5a5ac31a93
commit cc28b6b52f
33 changed files with 434 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
debian/changelog vendored
View File

@ -14,6 +14,124 @@ linux (4.1~rc5-1~exp1) UNRELEASED; urgency=medium
-- Ben Hutchings <ben@decadent.org.uk> Mon, 11 May 2015 16:19:42 +0100
linux (4.0.4-1) unstable; urgency=medium
* New upstream stable update:
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.3
- bpf: fix 64-bit divide
- route: Use ipv4_mtu instead of raw rt_pmtu (regression in 3.19)
- cxgb4: Fix MC1 memory offset calculation (regression in 3.19)
- [mips*] Revert "MIPS: Remove race window in page fault handling"
(regression in 3.17)
- [mips*] Fix race condition in lazy cache flushing.
- [mips*/octeon] Remove udelay() causing huge IRQ latency
- [mips*] Fix cpu_has_mips_r2_exec_hazard.
- [mips*] asm: elf: Set O32 default FPU flags (regression in 4.0)
- ALSA: emux: Fix mutex deadlock in OSS emulation
- cdc-acm: prevent infinite loop when parsing CDC headers.
(regression in 4.0)
- [arm64] dma-mapping: always clear allocated buffers
- [arm64] add missing PAGE_ALIGN() to __dma_free()
- [armhf] usb: chipidea: otg: remove mutex unlock and lock while stop and
start role (regression in 3.16)
- btrfs: unlock i_mutex after attempting to delete subvolume during send
(regression in 3.16)
- [x86] ACPI / SBS: Enable battery manager when present (regression in 3.18)
- rbd: end I/O the entire obj_request on error
- ext4: fix data corruption caused by unwritten and delayed extents
(Closes: #785672)
- ext4: move check under lock scope to close a race.
- SCSI: add 1024 max sectors black list flag (regression in 3.19)
- 3w-xxxx: fix command completion race
- 3w-9xxx: fix command completion race
- 3w-sas: fix command completion race
- drm/radeon: fix lockup when BOs aren't part of the VM on release
- drm/radeon: reset BOs address after clearing it.
- drm/radeon: check new address before removing old one
- hfsplus: don't store special "osx" xattr prefix on-disk
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.4
- [x86] spinlocks: Fix regression in spinlock contention detection
(regression in 4.0)
- [x86] ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook
(regression in 3.18)
- [x86] PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on
PCI bus (regression in 4.0)
- ACPI / PNP: add two IDs to list for PNPACPI device enumeration
(regression in 3.16)
- ocfs2: dlm: fix race between purge and get lock resource
- nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
- mnt: Fix fs_fully_visible to verify the root directory is visible
- mm/memory-failure: call shake_page() when error hits thp tail page
- vfio: Fix runaway interruptible timeout (regression in 4.0)
- Revert "dm crypt: fix deadlock when async crypto algorithm returns -EBUSY"
(regression in 4.0.2)
- block: destroy bdi before blockdev is unregistered. (regression in 4.0)
- blk-mq: fix race between timeout and CPU hotplug
- blk-mq: fix CPU hotplug handling
- [armhf] dts: imx6: phyFLEX: USB VBUS control is active-high
(regression in 3.16)
- [armhf] mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
- [armhf] OMAP2+: Fix omap off idle power consumption creeping up
(regression in 3.16)
- [armel,armhf] net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K
intruction.
- drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
(regression in 3.17)
- [x86] drm/i915/dp: there is no audio on port A
- [x86] drm/amdkfd: allow unregister process with queues
- drm/radeon: disable semaphores for UVD V1 (v2)
- drm/radeon: don't setup audio on asics that don't support it
- drm/radeon: fix userptr BO unpin bug v3
- drm/radeon: make VCE handle check more strict
- drm/radeon: make UVD handle checking more strict
- drm/radeon: more strictly validate the UVD codec
- pinctrl: Don't just pretend to protect pinctrl_maps, do it for real
- mmc: card: Don't access RPMB partitions for normal read/write
[ Ben Hutchings ]
* Fix error messages at boot on systems without an RTC (Closes: #784146):
- rtc: hctosys: do not treat lack of RTC device as error
- rtc: hctosys: use function name in the error log
* [rt] Update to 4.0.4-rt1 and re-enable
* linux-image: Depend on kmod without an alternative of module-init-tools
* linux-image: Add versioned Breaks on udev (<< 208-8~) due to #752742 and
#756312
* [i386] pnp: Disable PNPBIOS_PROC_FS
* [arm64] USB: Add support for XHCI on APM Mustang (Closes: #785707)
- Change USB_XHCI_HCD to built-in and enable USB_XHCI_PLATFORM as built-in
- 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
(Closes: #786372) (regression in 4.0.2)
* [x86] e1000e: Add support for Sunrise Point (i219) (Closes: #784546)
* [x86] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
(Closes: #786551)
* cdc_ncm: Fix tx_bytes statistics (regression in 4.0)
* [armhf] USB: musb: Fix order of conditions for assigning end point
operations (regression in 3.19)
* [armel/{kirkwood,orion5x}] Disable PM again to reduce kernel image size
* [armel/kirkwood] Enable DEBUG_MVEBU_UART0_ALTERNATE, replacing
DEBUG_MVEBU_UART_ALTERNATE
* i2o: Disable I2O
* [x86] vmwgfx: Enable DRM_VMWGFX_FBCON (Closes: #714929)
* media: Enable DVB_SMIPCIE as module (Closes: #785153)
* Bump ABI to 2
* [x86] i2c: Change I2C to built-in and enable ACPI_I2C_OPREGION
(Closes: #778896)
* usb-storage: Enable USB_UAS for the third time, hoping that it's finally
robust enough (Closes: #749014)
* zram: Enable ZRAM_LZ4_COMPRESS (Closes: #770958)
* HID: Enable HID_BATTERY_STRENGTH (Closes: #783214)
* [x86] ALSA: Enable SND_SOC_INTEL_BROADWELL_MACH as module (Closes: #785422)
[ Ian Campbell ]
* [armhf+arm64] Enabled generic SYSCON regmap reset driver
* [arm64] Enable PCI support and related modules, adjusting udeb module lists
for new modules.
* [arm64] Build XHCI platform drivers as a module.
-- Ben Hutchings <ben@decadent.org.uk> Tue, 26 May 2015 02:30:06 +0100
linux (4.0.2-1) unstable; urgency=medium
* New upstream stable update:

9
debian/config/alpha/config vendored
View File

@ -392,15 +392,6 @@ CONFIG_RADIO_TRUST=m
CONFIG_RADIO_TYPHOON=m
CONFIG_RADIO_ZOLTRIX=m
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
##
## file: drivers/mmc/Kconfig
##

70
debian/config/arm64/config vendored
View File

@ -3,6 +3,7 @@
##
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_XGENE=y
CONFIG_PCI=y
CONFIG_SMP=y
CONFIG_XEN=y
CONFIG_COMPAT=y
@ -51,17 +52,65 @@ CONFIG_MMC=y
CONFIG_MMC_ARMMMCI=m
CONFIG_MMC_SPI=m
##
## file: drivers/net/ethernet/Kconfig
##
CONFIG_FEALNX=m
##
## file: drivers/net/ethernet/3com/Kconfig
##
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
##
## file: drivers/net/ethernet/8390/Kconfig
##
CONFIG_NET_VENDOR_8390=y
CONFIG_NE2K_PCI=m
##
## file: drivers/net/ethernet/adaptec/Kconfig
##
CONFIG_NET_VENDOR_ADAPTEC=y
CONFIG_ADAPTEC_STARFIRE=m
##
## file: drivers/net/ethernet/apm/xgene/Kconfig
##
CONFIG_NET_XGENE=m
##
## file: drivers/net/ethernet/dec/tulip/Kconfig
##
CONFIG_NET_TULIP=y
CONFIG_DE2104X=m
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
##
## file: drivers/net/ethernet/dlink/Kconfig
##
CONFIG_NET_VENDOR_DLINK=y
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
##
## file: drivers/net/ethernet/intel/Kconfig
##
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m
##
## file: drivers/net/ethernet/natsemi/Kconfig
##
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
##
## file: drivers/net/ethernet/realtek/Kconfig
##
@ -77,8 +126,20 @@ CONFIG_8139TOO_8129=y
##
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC91X=m
CONFIG_EPIC100=m
CONFIG_SMSC911X=m
##
## file: drivers/net/fddi/Kconfig
##
CONFIG_FDDI=y
CONFIG_SKFP=m
##
## file: drivers/pci/host/Kconfig
##
CONFIG_PCI_XGENE=y
##
## file: drivers/phy/Kconfig
##
@ -89,6 +150,7 @@ CONFIG_PHY_XGENE=m
##
CONFIG_POWER_RESET_VEXPRESS=y
CONFIG_POWER_RESET_XGENE=y
CONFIG_POWER_RESET_SYSCON=y
##
## file: drivers/rtc/Kconfig
@ -96,6 +158,11 @@ CONFIG_POWER_RESET_XGENE=y
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_XGENE=y
##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_DMX3191D=m
##
## file: drivers/tty/serial/Kconfig
##
@ -121,6 +188,9 @@ CONFIG_SERIAL_8250_DW=y
##
## file: drivers/usb/host/Kconfig
##
#. xhci-platform apparently does not build as module, so xhci_hcd can't be either
CONFIG_USB_XHCI_HCD=m
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_HCD_PLATFORM=m
CONFIG_USB_OHCI_HCD=m

2
debian/config/armel/config-reduced vendored
View File

@ -32,7 +32,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
##
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM_RUNTIME is not set
# CONFIG_PM is not set
##
## file: mm/Kconfig

2
debian/config/armel/config.kirkwood vendored
View File

@ -23,7 +23,7 @@ CONFIG_FPE_NWFPE=y
## file: arch/arm/Kconfig.debug
##
## choice: Kernel low-level debugging port
CONFIG_DEBUG_MVEBU_UART_ALTERNATE=y
CONFIG_DEBUG_MVEBU_UART0_ALTERNATE=y
## end choice
##

29
debian/config/armhf/config.armmp vendored
View File

@ -88,14 +88,12 @@ CONFIG_ARCH_TEGRA=y
# CONFIG_ARCH_TEGRA_3x_SOC is not set
# CONFIG_ARCH_TEGRA_114_SOC is not set
CONFIG_ARCH_TEGRA_124_SOC=y
CONFIG_TEGRA_AHB=y
##
## file: arch/arm/mach-vexpress/Kconfig
##
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
CONFIG_ARCH_VEXPRESS_CA9X4=y
##
## file: arch/arm/mach-vt8500/Kconfig
@ -123,6 +121,11 @@ CONFIG_OMAP_SERIAL_WAKE=y
CONFIG_OMAP_PM_NOOP=y
## end choice
##
## file: drivers/amba/Kconfig
##
CONFIG_TEGRA_AHB=y
##
## file: drivers/ata/Kconfig
##
@ -220,6 +223,14 @@ CONFIG_DRM=m
##
CONFIG_DRM_I2C_NXP_TDA998X=m
##
## file: drivers/gpu/drm/imx/Kconfig
##
CONFIG_DRM_IMX=m
CONFIG_DRM_IMX_FB_HELPER=m
CONFIG_DRM_IMX_LDB=m
CONFIG_DRM_IMX_HDMI=m
##
## file: drivers/gpu/drm/omapdrm/Kconfig
##
@ -671,6 +682,7 @@ CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_AS3722=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_RESET_RESTART=y
CONFIG_POWER_RESET_SYSCON=y
##
## file: drivers/pwm/Kconfig
@ -710,6 +722,7 @@ CONFIG_REGULATOR_VEXPRESS=m
CONFIG_RTC_DRV_AS3722=y
CONFIG_RTC_DRV_ISL12057=y
CONFIG_RTC_DRV_PALMAS=y
CONFIG_RTC_DRV_PCF8523=y
CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_S5M=y
CONFIG_RTC_DRV_DA9052=y
@ -724,7 +737,6 @@ CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_TEGRA=y
CONFIG_RTC_DRV_MXC=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_RTC_DRV_PCF8523=y
##
## file: drivers/scsi/Kconfig
@ -750,15 +762,6 @@ CONFIG_SPI_SPIDEV=y
##
CONFIG_LIS3L02DQ=m
##
## file: drivers/staging/imx-drm/Kconfig
##
CONFIG_DRM_IMX=m
CONFIG_DRM_IMX_FB_HELPER=m
CONFIG_DRM_IMX_LDB=m
CONFIG_DRM_IMX_IPUV3=m
CONFIG_DRM_IMX_HDMI=m
##
## file: drivers/thermal/Kconfig
##
@ -943,7 +946,6 @@ CONFIG_TEGRA_WATCHDOG=m
## file: kernel/power/Kconfig
##
CONFIG_SUSPEND=y
CONFIG_PM_RUNTIME=y
CONFIG_APM_EMULATION=y
##
@ -983,7 +985,6 @@ CONFIG_SND_OMAP_SOC_RX51=m
CONFIG_SND_OMAP_SOC_AM3517EVM=m
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
##

87
debian/config/config vendored
View File

@ -140,6 +140,11 @@ CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
# CONFIG_ACPI_BGRT is not set
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
##
## file: drivers/android/Kconfig
##
# CONFIG_ANDROID is not set
##
## file: drivers/ata/Kconfig
##
@ -281,7 +286,7 @@ CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_BLK_DEV_RAM_DAX is not set
CONFIG_ATA_OVER_ETH=m
CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_BLKDEV_BACKEND=m
@ -305,6 +310,7 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
## file: drivers/block/zram/Kconfig
##
CONFIG_ZRAM=m
CONFIG_ZRAM_LZ4_COMPRESS=y
# CONFIG_ZRAM_DEBUG is not set
##
@ -565,6 +571,7 @@ CONFIG_VGA_ARB=y
## file: drivers/hid/Kconfig
##
CONFIG_HID=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HIDRAW=y
CONFIG_UHID=m
CONFIG_HID_GENERIC=m
@ -1562,16 +1569,6 @@ CONFIG_VIDEO_CX25840=m
##
CONFIG_SMS_SDIO_DRV=m
##
## file: drivers/media/parport/Kconfig
##
#. Actually VIDEO_PMS is an ISA driver
CONFIG_MEDIA_PARPORT_SUPPORT=y
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
CONFIG_VIDEO_PMS=m
# CONFIG_VIDEO_W9966 is not set
##
## file: drivers/media/pci/Kconfig
##
@ -1684,6 +1681,11 @@ CONFIG_VIDEO_MXB=m
##
CONFIG_VIDEO_SAA7164=m
##
## file: drivers/media/pci/smipcie/Kconfig
##
CONFIG_DVB_SMIPCIE=m
##
## file: drivers/media/pci/solo6x10/Kconfig
##
@ -1726,7 +1728,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
# CONFIG_VIDEO_SH_VEU is not set
CONFIG_V4L_TEST_DRIVERS=y
# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
# CONFIG_VIDEO_VIM2M is not set
##
## file: drivers/media/platform/marvell-ccic/Kconfig
@ -2036,11 +2038,6 @@ CONFIG_VIDEO_STK1160_AC97=y
##
CONFIG_USB_STKWEBCAM=m
##
## file: drivers/media/usb/tlg2300/Kconfig
##
CONFIG_VIDEO_TLG2300=m
##
## file: drivers/media/usb/ttusb-budget/Kconfig
##
@ -2117,15 +2114,6 @@ CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
# CONFIG_FUSION_LOGGING is not set
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
CONFIG_I2O_EXT_ADAPTEC=y
CONFIG_I2O_EXT_ADAPTEC_DMA64=y
CONFIG_I2O_CONFIG_OLD_IOCTL=y
CONFIG_I2O_BUS=m
##
## file: drivers/mfd/Kconfig
##
@ -2846,7 +2834,6 @@ CONFIG_YAM=m
## file: drivers/net/ieee802154/Kconfig
##
CONFIG_IEEE802154_DRIVERS=m
CONFIG_IEEE802154_FAKEHARD=m
##
## file: drivers/net/irda/Kconfig
@ -3737,26 +3724,11 @@ CONFIG_SSB=m
##
CONFIG_STAGING=y
##
## file: drivers/staging/android/Kconfig
##
# CONFIG_ANDROID is not set
##
## file: drivers/staging/bcm/Kconfig
##
# CONFIG_BCM_WIMAX is not set
##
## file: drivers/staging/comedi/Kconfig
##
# CONFIG_COMEDI is not set
##
## file: drivers/staging/cptm1217/Kconfig
##
# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
##
## file: drivers/staging/dgap/Kconfig
##
@ -3787,6 +3759,11 @@ CONFIG_STAGING=y
##
# CONFIG_GS_FPGABOOT is not set
##
## file: drivers/staging/i2o/Kconfig
##
# CONFIG_I2O is not set
##
## file: drivers/staging/iio/Kconfig
##
@ -3870,11 +3847,6 @@ CONFIG_STAGING=y
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
##
## file: drivers/staging/line6/Kconfig
##
# CONFIG_LINE6_USB is not set
##
## file: drivers/staging/lustre/lustre/Kconfig
##
@ -4183,7 +4155,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_ISP1362_HCD is not set
# CONFIG_USB_FUSBH200_HCD is not set
# CONFIG_USB_FOTG210_HCD is not set
@ -4204,6 +4175,11 @@ CONFIG_USB_HWA_HCD=m
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
##
## file: drivers/usb/isp1760/Kconfig
##
# CONFIG_USB_ISP1760 is not set
##
## file: drivers/usb/misc/Kconfig
##
@ -4344,7 +4320,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
# CONFIG_USB_UAS is not set
CONFIG_USB_UAS=m
##
## file: drivers/usb/usbip/Kconfig
@ -5088,7 +5064,6 @@ CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
## choice: RCU Implementation
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
## end choice
# CONFIG_TASKS_RCU is not set
# CONFIG_RCU_USER_QS is not set
@ -5097,8 +5072,8 @@ CONFIG_RCU_FANOUT=32
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=17
# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
CONFIG_NUMA_BALANCING=y
# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@ -5106,7 +5081,6 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
CONFIG_MEMCG_DISABLED=y
CONFIG_MEMCG_SWAP=y
@ -5199,13 +5173,12 @@ CONFIG_HZ_250=y
##
## file: kernel/power/Kconfig
##
CONFIG_PM=y
CONFIG_SUSPEND=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
# CONFIG_PM_AUTOSLEEP is not set
# CONFIG_PM_WAKELOCKS is not set
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
#. Could be enabled if it becomes configurable at run-time
@ -5598,6 +5571,10 @@ CONFIG_DNS_RESOLVER=m
## file: net/ieee802154/Kconfig
##
CONFIG_IEEE802154=m
##
## file: net/ieee802154/6lowpan/Kconfig
##
CONFIG_IEEE802154_6LOWPAN=m
##
@ -6115,7 +6092,6 @@ CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
## file: net/tipc/Kconfig
##
CONFIG_TIPC=m
CONFIG_TIPC_PORTS=8191
CONFIG_TIPC_MEDIA_IB=y
##
@ -6197,7 +6173,6 @@ CONFIG_KEYS=y
# CONFIG_BIG_KEYS is not set
# CONFIG_TRUSTED_KEYS is not set
# CONFIG_ENCRYPTED_KEYS is not set
CONFIG_KEYS_DEBUG_PROC_KEYS=y
##
## file: security/selinux/Kconfig

9
debian/config/hppa/config vendored
View File

@ -152,15 +152,6 @@ CONFIG_SERIO_RAW=m
##
# CONFIG_INPUT_TOUCHSCREEN is not set
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
##
## file: drivers/mfd/Kconfig
##

1
debian/config/hppa/config.parisc vendored
View File

@ -6,7 +6,6 @@ CONFIG_PA7000=y
# CONFIG_PA8X00 is not set
## end choice
# CONFIG_SMP is not set
# CONFIG_HPUX is not set
##
## file: drivers/net/ethernet/ti/Kconfig

9
debian/config/ia64/config vendored
View File

@ -373,15 +373,6 @@ CONFIG_ISDN_DIVAS_MAINT=m
CONFIG_USB_DSBR=m
CONFIG_RADIO_MAXIRADIO=m
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
##
## file: drivers/mmc/Kconfig
##

9
debian/config/kernelarch-mips/config.4kc-malta vendored
View File

@ -159,15 +159,6 @@ CONFIG_SERIO_RAW=m
##
CONFIG_INPUT_TOUCHSCREEN=y
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
##
## file: drivers/mfd/Kconfig
##

10
debian/config/kernelarch-mips/config.5kc-malta vendored
View File

@ -14,7 +14,6 @@ CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -162,15 +161,6 @@ CONFIG_SERIO_RAW=m
##
CONFIG_INPUT_TOUCHSCREEN=y
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
##
## file: drivers/mfd/Kconfig
##

1
debian/config/kernelarch-mips/config.loongson-2e vendored
View File

@ -9,7 +9,6 @@ CONFIG_MACH_LOONGSON=y
CONFIG_64BIT=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y

12
debian/config/kernelarch-mips/config.loongson-2f vendored
View File

@ -9,7 +9,6 @@ CONFIG_MACH_LOONGSON=y
CONFIG_64BIT=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -75,6 +74,11 @@ CONFIG_RTC_DRV_CMOS=y
##
# CONFIG_SCSI_LPFC is not set
##
## file: drivers/staging/sm7xxfb/Kconfig
##
CONFIG_FB_SM7XX=y
##
## file: drivers/tty/Kconfig
##
@ -132,9 +136,3 @@ CONFIG_FB_SIS_315=y
##
CONFIG_SND_CS5535AUDIO=m
##
## file: unknown
##
#. Keep this in case it comes back
CONFIG_FB_SM7XX=y

1
debian/config/kernelarch-mips/config.loongson-3 vendored
View File

@ -10,7 +10,6 @@ CONFIG_HOTPLUG_CPU=y
CONFIG_64BIT=y
## end choice
CONFIG_SMP=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y

2
debian/config/kernelarch-mips/config.octeon vendored
View File

@ -11,7 +11,6 @@ CONFIG_64BIT=y
## end choice
CONFIG_SMP=y
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -136,7 +135,6 @@ CONFIG_USB_OCTEON_OHCI=y
##
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM_RUNTIME is not set
##
## file: mm/Kconfig

11
debian/config/kernelarch-mips/config.r4k-ip22 vendored
View File

@ -15,7 +15,6 @@ CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
## end choice
CONFIG_EISA=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -67,16 +66,6 @@ CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=y
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/media/platform/Kconfig
##
CONFIG_VIDEO_VINO=m
##
## file: drivers/net/appletalk/Kconfig
##

6
debian/config/kernelarch-mips/config.r5k-ip32 vendored
View File

@ -14,7 +14,6 @@ CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -79,11 +78,6 @@ CONFIG_SERIO_MACEPS2=y
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=y
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/media/pci/bt8xx/Kconfig
##

6
debian/config/kernelarch-mips/config.sb1-bcm91250a vendored
View File

@ -16,7 +16,6 @@ CONFIG_PAGE_SIZE_4KB=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -100,11 +99,6 @@ CONFIG_MOUSE_PS2=y
##
CONFIG_SERIO=y
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/net/appletalk/Kconfig
##

9
debian/config/kernelarch-powerpc/config vendored
View File

@ -399,15 +399,6 @@ CONFIG_PMAC_RACKMETER=m
CONFIG_USB_DSBR=m
CONFIG_RADIO_MAXIRADIO=m
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
##
## file: drivers/misc/Kconfig
##

5
debian/config/kernelarch-powerpc/config-arch-64-be vendored
View File

@ -65,10 +65,9 @@ CONFIG_I2C_PASEMI=m
##
## file: drivers/macintosh/Kconfig
##
# CONFIG_THERM_PM72 is not set
CONFIG_WINDFARM_RM31=m
CONFIG_WINDFARM_PM72=m
CONFIG_WINDFARM_PM81=m
CONFIG_WINDFARM_PM72=m
CONFIG_WINDFARM_RM31=m
CONFIG_WINDFARM_PM91=m
CONFIG_WINDFARM_PM112=m
CONFIG_WINDFARM_PM121=m

2
debian/config/kernelarch-s390/config vendored
View File

@ -5,7 +5,7 @@ CONFIG_COMPAT=y
CONFIG_SMP=y
CONFIG_NR_CPUS=32
CONFIG_HOTPLUG_CPU=y
CONFIG_SCHED_BOOK=y
CONFIG_SCHED_TOPOLOGY=y
CONFIG_MATHEMU=y
CONFIG_PACK_STACK=y
# CONFIG_CHECK_STACK is not set

10
debian/config/kernelarch-sparc/config vendored
View File

@ -219,11 +219,6 @@ CONFIG_SERIO_LIBPS2=y
##
# CONFIG_INPUT_TOUCHSCREEN is not set
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/media/pci/cx88/Kconfig
##
@ -247,11 +242,6 @@ CONFIG_SERIO_LIBPS2=y
# CONFIG_USB_DSBR is not set
# CONFIG_RADIO_MAXIRADIO is not set
##
## file: drivers/message/i2o/Kconfig
##
# CONFIG_I2O is not set
##
## file: drivers/mmc/Kconfig
##

23
debian/config/kernelarch-x86/config vendored
View File

@ -510,6 +510,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
## file: drivers/gpu/drm/vmwgfx/Kconfig
##
CONFIG_DRM_VMWGFX=m
CONFIG_DRM_VMWGFX_FBCON=y
##
## file: drivers/gpu/vga/Kconfig
@ -583,7 +584,8 @@ CONFIG_SENSORS_ACPI_POWER=m
##
## file: drivers/i2c/Kconfig
##
CONFIG_I2C=m
CONFIG_I2C=y
CONFIG_ACPI_I2C_OPREGION=y
CONFIG_I2C_CHARDEV=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
@ -786,15 +788,6 @@ CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
##
## file: drivers/message/i2o/Kconfig
##
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
##
## file: drivers/mfd/Kconfig
##
@ -1177,7 +1170,6 @@ CONFIG_NFC_PN544_MEI=m
CONFIG_HT_IRQ=y
CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_IOAPIC=y
##
## file: drivers/pci/hotplug/Kconfig
@ -1363,7 +1355,6 @@ CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_S526=m
CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
@ -1490,11 +1481,6 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
CONFIG_LIRC_ZILOG=m
##
## file: drivers/staging/media/omap24xx/Kconfig
##
# CONFIG_VIDEO_TCM825X is not set
##
## file: drivers/staging/rtl8192e/Kconfig
##
@ -1852,7 +1838,7 @@ CONFIG_IRNET=m
CONFIG_LAPB=m
##
## file: net/nfc/Kconfig
## file: net/nfc/hci/Kconfig
##
CONFIG_NFC_HCI=m
@ -1934,4 +1920,5 @@ CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m

2
debian/config/kernelarch-x86/config-arch-32 vendored
View File

@ -356,7 +356,7 @@ CONFIG_ISAPNP=y
## file: drivers/pnp/pnpbios/Kconfig
##
CONFIG_PNPBIOS=y
CONFIG_PNPBIOS_PROC_FS=y
# CONFIG_PNPBIOS_PROC_FS is not set
##
## file: drivers/scsi/Kconfig

2
debian/installer/arm64/modules/arm64/nic-modules vendored
View File

@ -1,4 +1,4 @@
#include <nic-modules>
smc91x
smsc911x
xen-netfront
xgene-enet

3
debian/installer/arm64/modules/arm64/scsi-modules vendored
View File

@ -1,2 +1 @@
sg
xen-blkfront
#include <scsi-modules>

45
debian/patches/bugfix/all/musb-musb-fix-order-of-conditions-for-assigning-end-p.patch vendored Normal file
View File

@ -0,0 +1,45 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 24 May 2015 04:21:46 +0100
Subject: USB: musb: Fix order of conditions for assigning end point operations
Forwarded: http://mid.gmane.org/1432438052.12412.98.camel@decadent.org.uk
Currently we always assign one of the two common implementations of
ep_offset and ep_select operations, overwriting any platform-specific
implementations.
Fixes: d026e9c76aac ("usb: musb: Change end point selection to use new IO access")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
drivers/usb/musb/musb_core.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2021,13 +2021,7 @@ musb_init_controller(struct device *dev,
if (musb->ops->quirks)
musb->io.quirks = musb->ops->quirks;
- /* At least tusb6010 has it's own offsets.. */
- if (musb->ops->ep_offset)
- musb->io.ep_offset = musb->ops->ep_offset;
- if (musb->ops->ep_select)
- musb->io.ep_select = musb->ops->ep_select;
-
- /* ..and some devices use indexed offset or flat offset */
+ /* Most devices use indexed offset or flat offset */
if (musb->io.quirks & MUSB_INDEXED_EP) {
musb->io.ep_offset = musb_indexed_ep_offset;
musb->io.ep_select = musb_indexed_ep_select;
@@ -2036,6 +2030,12 @@ musb_init_controller(struct device *dev,
musb->io.ep_select = musb_flat_ep_select;
}
+ /* At least tusb6010 has its own offsets */
+ if (musb->ops->ep_offset)
+ musb->io.ep_offset = musb->ops->ep_offset;
+ if (musb->ops->ep_select)
+ musb->io.ep_select = musb->ops->ep_select;
+
if (musb->ops->fifo_mode)
fifo_mode = musb->ops->fifo_mode;
else

0
debian/patches/debian/no-clean.patch vendored
View File

84
debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch vendored Normal file
View File

@ -0,0 +1,84 @@
From: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@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@public.gmane.org>
[ ijc -- allow build as a module, otherwise cannot see various core
symbols, like xhci_resume or usb_add_hcd which are in modules. xhci-hcd-plat
can be built as a module from v3.18. ]
---
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
@@ -32,7 +32,12 @@ config USB_XHCI_PCI
default y
config USB_XHCI_PLATFORM
- tristate
+ tristate "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
@@ -19,6 +19,7 @@
#include <linux/usb/phy.h>
#include <linux/slab.h>
#include <linux/usb/xhci_pdriver.h>
+#include <linux/acpi.h>
#include "xhci.h"
#include "xhci-mvebu.h"
@@ -258,6 +259,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,
@@ -265,6 +275,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");

48
debian/patches/features/arm64/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-dma.patch vendored Normal file
View File

@ -0,0 +1,48 @@
From: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@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@public.gmane.org>
Tested-by: Mark Salter <msalter-H+wXaHxf7aLQT0dZR+AlfA@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
@@ -83,14 +83,14 @@ static int xhci_plat_probe(struct platfo
if (irq < 0)
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)

3
debian/patches/series vendored
View File

@ -50,6 +50,8 @@ features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
features/x86/x86-make-x32-syscall-support-conditional.patch
features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.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
@ -62,6 +64,7 @@ bugfix/all/net-mv643xx-disable-tso-by-default.patch
bugfix/all/vfs-read-file_handle-only-once-in-handle_to_path.patch
debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch
bugfix/all/make-highlights-deterministic-in-kernel-doc.patch
bugfix/all/musb-musb-fix-order-of-conditions-for-assigning-end-p.patch
# Miscellaneous features
features/all/efi-autoload-efi-pstore.patch

4
debian/templates/control.image.type-plain.in vendored
View File

@ -1,9 +1,9 @@
Package: linux-image-@abiname@@localversion@
Provides: linux-modules-@abiname@@localversion@
Pre-Depends: debconf | debconf-2.0
Depends: kmod | module-init-tools, linux-base (>= 3~), ${misc:Depends}
Depends: kmod, linux-base (>= 3~), ${misc:Depends}
Recommends: firmware-linux-free (>= 3~), ${kernel:Recommends}
Suggests: linux-doc-@version@, debian-kernel-handbook
Breaks: at (<< 3.1.12-1+squeeze1)
Breaks: at (<< 3.1.12-1+squeeze1), udev (<< 208-8~)
Description: Linux @upstreamversion@ for @class@
The Linux kernel @upstreamversion@ and modules for use on @longclass@.