[kernel] r21839 - in dists/trunk/linux: . debian debian/config debian/config/arm64 debian/config/hppa debian/config/kernelarch-mips debian/config/kernelarch-powerpc debian/config/kernelarch-sparc debian/config/kernelarch-x86 debian/config/m68k debian/config/mips64 debian/config/mips64el debian/installer debian/installer/arm64/modules/arm64 debian/installer/armel/modules/armel-orion5x debian/installer/armhf/modules/armhf-armmp debian/installer/mips64el debian/installer/mips64el/modules debian/installer/modules debian/patches debian/patches/bugfix/all debian/patches/debian debian/patches/features/all debian/patches/features/arm debian/patches/features/arm64 debian/patches/features/powerpc debian/patches/features/x86
Ben Hutchings
benh at moszumanska.debian.org
Sat Sep 13 05:42:09 UTC 2014
Author: benh
Date: Sat Sep 13 05:42:09 2014
New Revision: 21839
Log:
Merge changes from sid up to 3.16.2-3
Drop the ABI reference files.
Added:
dists/trunk/linux/debian/patches/bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
dists/trunk/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-add-process_one_ticket-helper.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-add-process_one_ticket-helper.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch
dists/trunk/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
dists/trunk/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
dists/trunk/linux/debian/patches/features/arm64/
- copied from r21838, dists/sid/linux/debian/patches/features/arm64/
dists/trunk/linux/debian/patches/features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch
dists/trunk/linux/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
- copied unchanged from r21838, dists/sid/linux/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
Deleted:
dists/trunk/linux/debian/installer/armhf/modules/armhf-armmp/efi-modules
dists/trunk/linux/debian/installer/mips64el/modules/mips64el-loongson-2e
dists/trunk/linux/debian/installer/mips64el/modules/mips64el-loongson-2f
dists/trunk/linux/debian/patches/features/all/x86-memtest-WARN-if-bad-RAM-found.patch
Modified:
dists/trunk/linux/ (props changed)
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/config/arm64/config
dists/trunk/linux/debian/config/config
dists/trunk/linux/debian/config/hppa/config
dists/trunk/linux/debian/config/kernelarch-mips/config
dists/trunk/linux/debian/config/kernelarch-powerpc/config
dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
dists/trunk/linux/debian/config/kernelarch-sparc/config
dists/trunk/linux/debian/config/kernelarch-x86/config
dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64
dists/trunk/linux/debian/config/m68k/config
dists/trunk/linux/debian/config/mips64/defines (contents, props changed)
dists/trunk/linux/debian/config/mips64el/defines (contents, props changed)
dists/trunk/linux/debian/installer/arm64/modules/arm64/nic-modules
dists/trunk/linux/debian/installer/arm64/modules/arm64/sata-modules
dists/trunk/linux/debian/installer/armel/modules/armel-orion5x/nic-modules
dists/trunk/linux/debian/installer/mips64el/kernel-versions (contents, props changed)
dists/trunk/linux/debian/installer/mips64el/modules/ (props changed)
dists/trunk/linux/debian/installer/modules/nic-wireless-modules
dists/trunk/linux/debian/installer/package-list
dists/trunk/linux/debian/patches/bugfix/all/disable-some-marvell-phys.patch
dists/trunk/linux/debian/patches/series
dists/trunk/linux/debian/rules.real
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/changelog Sat Sep 13 05:42:09 2014 (r21839)
@@ -1,3 +1,88 @@
+linux (3.16.2-3) unstable; urgency=medium
+
+ [ Ben Hutchings ]
+ * [armhf] udeb: Remove efi-modules, as EFI is not yet supported on ARM!
+ * [arm64] ata: Enable PHY_XYGENE, AHCI_XGENE as modules
+ - udeb: Add ahci_xgene to sata-modules (fixes FTBFS)
+ * [arm64] rtc: Enable RTC_DRV_XGENE as module
+ * mfd,mmc,memstick: Enable MFD_RTSX_USB, MMC_REALTEK_USB,
+ MEMSTICK_REALTEK_USB as modules (Closes: #761099)
+ * [mips64,mips64el] Properly add the 5kc-malta flavour (should fix FTBFS)
+ * batman-adv: Enable BATMAN_ADV_MCAST
+ * can: Enable CAN_GS_USB as module
+ * bluetooth: Enable BT_6LOWPAN
+ * ubi: Enable MTD_UBI_BLOCK
+ * md: Enable DM_ERA as module
+ * qlcnic: Enable QLCNIC_VXLAN
+ * net/wireless: Enable RSI_91X, RSI_USB as modules
+ - udeb: Add rsi_usb to nic-wireless-modules
+ * i2c: Enable I2C_ROBOTFUZZ_OSIF as module
+ * mfd,gpio,i2c,iio: Enable MFD_VIPERBOARD, GPIO_VIPERBOARD, I2C_VIPERBOARD,
+ VIPERBOARD_ADC as modules
+ * media/usb/gspca: Enable USB_GSPCA_DTCS033 as module
+ * media/pci/cx23885: Enable MEDIA_ALTERA_CI as module
+ * sound/usb: Enable SND_USB_HIFACE, SND_BCD2000 as modules
+ * usb/misc: Enable USB_EHSET_TEST_FIXTURE as module
+ * usb/gadget: Enable USB_NET2280 as module
+ * leds: Enable LEDS_TRIGGER_CPU as built-in and LEDS_TRIGGER_ONESHOT,
+ LEDS_TRIGGER_GPIO, LEDS_TRIGGER_TRANSIENT, LEDS_TRIGGER_CAMERA as modules
+ * uio: Enable UIO_MF624 as module
+ * iio: Enable HID_SENSOR_PROX, HID_SENSOR_DEVICE_ROTATION, HID_SENSOR_PRESS
+ as modules
+ * ecryptfs: Enable ECRYPT_FS_MESSAGING
+ * ceph: Enable CEPH_FSCACHE
+ * crypto: Enable CRYPTO_LZ4, CRYPTO_LZ4HC as modules
+ * [x86] mfd,gpio,i2c,watchdog: Enable KEMPLD_MFD, GPIO_KEMPLD, I2C_KEMPLD,
+ KEMPLD_WDT as modules
+ * [x86] staging: Enable R8723AU as module
+ * [x86] staging: Enable WIMAX_GDM72XX as modules
+ - gdmwm: Enable WIMAX_GDM72XX_USB, WIMAX_GDM72XX_USB_PM
+ * [x86] staging/media: Enable DVB_AS102, USB_MSI3101, MEDIA_TUNER_MSI001,
+ SOLO6X10 as modules
+ * [x86] dvb-usb-rtl28xxu: Enable DVB_RTL2832_SDR
+ * [x86] platform: Enable ALIENWARE_WMI, DELL_SMO8800, IBM_RTL,
+ SAMSUNG_Q10, INTEL_RST, INTEL_SMARTCONNECT (Closes: #749273), PVPANIC
+ as modules
+ * [x86] sony-laptop: Enable SONYPI_COMPAT
+ * [x86,ia64] firmware: Enable DMI_SYSFS
+ * [x86] Disable USB_SN9C102; this driver is deprecated in favour of the
+ gspca drivers
+ * [i386] usb/gadget: Enable USB_AMD5536UDC as module
+ * [i386] comedi: Enable COMEDI_AMPLC_DIO200_ISA, COMEDI_AMPLC_PC236_ISA,
+ COMEDI_AMPLC_PC263_ISA, COMEDI_DAS08_ISA, COMEDI_NI_LABPC_ISA as modules
+ * [i386] speakup: Enable SPEAKUP_SYNTH_DECPC as module
+ * [!x86] staging: Enable R8712U, R8188EU as modules (Closes: #742055, #760859)
+ * i2o: Disable I2O_EXT_ADAPTEC on 64-bit, as it assumes 32-bit virtual
+ addresses
+ * SCSI: aic94xx: Remove broken fallback for missing 'Ctrl-A' user settings
+ * udeb: Add ath6kl_sdio, libertas_cs, libertas_sdio, mwifiex_sdio,
+ r8192u_usb, r8723au, rtl8188eu, rtl818x_pci, rtl8723be, rtl8821ae,
+ spectrum_cs to nic-wireless-modules
+ * builddeb: put the dbg files into the correct directory
+ * [ppc64el] deb-pkg: Add support for powerpc little endian
+ * [armhf] deb-pkg: Add automatic support for armhf architecture
+ * debian/rules.real: Never make kernel-wedge errors non-fatal, as in
+ practice this meant we didn't see them until they appeared in unstable
+ * udeb: Fix typo in dependencies of speakup-modules (fixes FTBFS on
+ mips64el due to interaction with another bug in kernel-wedge)
+ * libceph: Apply critical fixes:
+ - set last_piece in ceph_msg_data_pages_cursor_init() correctly
+ - gracefully handle large reply messages from the mon
+ - add process_one_ticket() helper
+ - do not hard code max auth ticket len
+
+ [ Ian Campbell ]
+ * [armel/orion5x] udeb: Include mvmdio in nic-modules udeb.
+ * [arm64] Backport X-GENE Ethernet driver from v3.17-rcs
+ * [arm64] Including phy-xgene in sata-modules udeb since it is needed by
+ ahci_xgene.
+
+ [ Aurelien Jarno ]
+ * [mips64el] Drop loongson-2e and loongson-2f flavour as the minimum
+ supported ISA will be at least MIPS64.
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 13 Sep 2014 03:49:53 +0100
+
linux (3.16.2-2) unstable; urgency=medium
[ Ben Hutchings ]
Modified: dists/trunk/linux/debian/config/arm64/config
==============================================================================
--- dists/trunk/linux/debian/config/arm64/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/arm64/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -8,6 +8,16 @@
CONFIG_COMPAT=y
##
+## file: drivers/ata/Kconfig
+##
+CONFIG_AHCI_XGENE=m
+
+##
+## file: drivers/clk/Kconfig
+##
+CONFIG_COMMON_CLK_XGENE=y
+
+##
## file: drivers/input/misc/Kconfig
##
CONFIG_INPUT_MISC=y
@@ -31,6 +41,11 @@
CONFIG_NE2K_PCI=m
##
+## file: drivers/net/ethernet/apm/xgene/Kconfig
+##
+CONFIG_NET_XGENE=m
+
+##
## file: drivers/net/ethernet/realtek/Kconfig
##
CONFIG_8139CP=m
@@ -48,6 +63,11 @@
CONFIG_SMSC911X=m
##
+## file: drivers/phy/Kconfig
+##
+CONFIG_PHY_XGENE=m
+
+##
## file: drivers/power/reset/Kconfig
##
CONFIG_POWER_RESET_VEXPRESS=y
@@ -57,6 +77,7 @@
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_DRV_PL031=m
+CONFIG_RTC_DRV_XGENE=m
##
## file: drivers/tty/serial/Kconfig
Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -115,6 +115,8 @@
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -136,6 +138,7 @@
##
CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
# CONFIG_ACPI_BGRT is not set
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
##
## file: drivers/ata/Kconfig
@@ -143,6 +146,8 @@
CONFIG_ATA=m
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
+#. TODO: Enable at next ABI bump
+# CONFIG_SATA_ZPODD is not set
CONFIG_SATA_PMP=y
CONFIG_SATA_AHCI=m
# CONFIG_SATA_AHCI_PLATFORM is not set
@@ -282,6 +287,7 @@
CONFIG_VIRTIO_BLK=m
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_RSXX is not set
##
## file: drivers/block/drbd/Kconfig
@@ -349,6 +355,12 @@
CONFIG_IPWIRELESS=m
##
+## file: drivers/clk/Kconfig
+##
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+
+##
## file: drivers/connector/Kconfig
##
CONFIG_CONNECTOR=y
@@ -400,8 +412,17 @@
# CONFIG_DMATEST is not set
##
+## file: drivers/dma/dw/Kconfig
+##
+# CONFIG_DW_DMAC_CORE is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+
+##
## file: drivers/edac/Kconfig
##
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_MCE_INJ is not set
CONFIG_EDAC_I82975X=m
CONFIG_EDAC_I3200=m
CONFIG_EDAC_X38=m
@@ -424,6 +445,11 @@
CONFIG_FIREWIRE_NOSY=m
##
+## file: drivers/firmware/Kconfig
+##
+CONFIG_DMI_SYSFS=y
+
+##
## file: drivers/firmware/efi/Kconfig
##
CONFIG_EFI_VARS=m
@@ -460,6 +486,7 @@
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MC33880 is not set
# CONFIG_GPIO_74X164 is not set
+CONFIG_GPIO_VIPERBOARD=m
##
## file: drivers/gpu/drm/Kconfig
@@ -474,6 +501,11 @@
# CONFIG_DRM_AST is not set
##
+## file: drivers/gpu/drm/bridge/Kconfig
+##
+# CONFIG_DRM_PTN3460 is not set
+
+##
## file: drivers/gpu/drm/cirrus/Kconfig
##
CONFIG_DRM_CIRRUS_QEMU=m
@@ -731,8 +763,10 @@
CONFIG_I2C_SIMTEC=m
# CONFIG_I2C_XILINX is not set
CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
CONFIG_I2C_TAOS_EVM=m
CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
##
## file: drivers/i2c/muxes/Kconfig
@@ -775,9 +809,11 @@
##
## file: drivers/iio/accel/Kconfig
##
+# CONFIG_BMA180 is not set
CONFIG_HID_SENSOR_ACCEL_3D=m
# CONFIG_IIO_ST_ACCEL_3AXIS is not set
# CONFIG_KXSD9 is not set
+# CONFIG_MMA8452 is not set
##
## file: drivers/iio/adc/Kconfig
@@ -788,8 +824,14 @@
# CONFIG_AD7791 is not set
# CONFIG_AD7793 is not set
# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD799X is not set
# CONFIG_MAX1363 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_NAU7802 is not set
# CONFIG_TI_ADC081C is not set
+CONFIG_VIPERBOARD_ADC=m
##
## file: drivers/iio/amplifiers/Kconfig
@@ -811,6 +853,7 @@
# CONFIG_AD5755 is not set
# CONFIG_AD5764 is not set
# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
# CONFIG_MAX517 is not set
# CONFIG_MCP4725 is not set
@@ -824,7 +867,9 @@
## file: drivers/iio/gyro/Kconfig
##
# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
# CONFIG_ADXRS450 is not set
CONFIG_HID_SENSOR_GYRO_3D=m
# CONFIG_IIO_ST_GYRO_3AXIS is not set
@@ -834,6 +879,7 @@
## file: drivers/iio/humidity/Kconfig
##
# CONFIG_DHT11 is not set
+# CONFIG_SI7005 is not set
##
## file: drivers/iio/imu/Kconfig
@@ -855,6 +901,8 @@
# CONFIG_CM36651 is not set
# CONFIG_GP2AP020A00F is not set
CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+# CONFIG_LTR501 is not set
# CONFIG_TCS3472 is not set
# CONFIG_SENSORS_TSL2563 is not set
# CONFIG_TSL4531 is not set
@@ -872,16 +920,25 @@
## file: drivers/iio/orientation/Kconfig
##
CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
##
## file: drivers/iio/pressure/Kconfig
##
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_MPL115 is not set
# CONFIG_MPL3115 is not set
# CONFIG_IIO_ST_PRESS is not set
##
+## file: drivers/iio/proximity/Kconfig
+##
+# CONFIG_AS3935 is not set
+
+##
## file: drivers/iio/temperature/Kconfig
##
+# CONFIG_MLX90614 is not set
# CONFIG_TMP006 is not set
##
@@ -1053,6 +1110,7 @@
# CONFIG_KEYBOARD_MCS is not set
# CONFIG_KEYBOARD_MPR121 is not set
CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
CONFIG_KEYBOARD_STOWAWAY=m
##
@@ -1063,6 +1121,7 @@
# CONFIG_INPUT_MMA8450 is not set
# CONFIG_INPUT_MPU3050 is not set
# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -1243,11 +1302,18 @@
##
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3642 is not set
CONFIG_LEDS_NET48XX=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_WM831X_STATUS=m
CONFIG_LEDS_WM8350=m
CONFIG_LEDS_DAC124S085=m
@@ -1257,15 +1323,34 @@
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_BLINKM is not set
##
## file: drivers/leds/trigger/Kconfig
##
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+
+##
+## file: drivers/mailbox/Kconfig
+##
+# CONFIG_MAILBOX is not set
+
+##
+## file: drivers/mcb/Kconfig
+##
+# CONFIG_MCB is not set
##
## file: drivers/md/Kconfig
@@ -1287,6 +1372,7 @@
CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=y
CONFIG_DM_CACHE_CLEANER=y
+CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_RAID=m
@@ -1483,6 +1569,7 @@
## file: drivers/media/pci/cx23885/Kconfig
##
CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
##
## file: drivers/media/pci/cx25821/Kconfig
@@ -1655,6 +1742,7 @@
CONFIG_IR_SONY_DECODER=m
CONFIG_IR_RC5_SZ_DECODER=m
CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_RC_DEVICES=y
CONFIG_RC_ATI_REMOTE=m
@@ -1670,6 +1758,11 @@
# CONFIG_IR_GPIO_CIR is not set
##
+## file: drivers/media/rc/img-ir/Kconfig
+##
+# CONFIG_IR_IMG is not set
+
+##
## file: drivers/media/rc/keymaps/Kconfig
##
CONFIG_RC_MAP=m
@@ -1776,6 +1869,7 @@
CONFIG_USB_GSPCA_BENQ=m
CONFIG_USB_GSPCA_CONEX=m
CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
CONFIG_USB_GSPCA_ETOMS=m
CONFIG_USB_GSPCA_FINEPIX=m
CONFIG_USB_GSPCA_JEILINJ=m
@@ -1940,6 +2034,7 @@
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m
CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
##
## file: drivers/message/fusion/Kconfig
@@ -1966,13 +2061,17 @@
## file: drivers/mfd/Kconfig
##
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_MC13XXX_SPI is not set
# CONFIG_MFD_MC13XXX_I2C is not set
# CONFIG_HTC_PASIC3 is not set
CONFIG_LPC_SCH=m
# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_PCF50633 is not set
CONFIG_PCF50633_ADC=m
@@ -1980,6 +2079,7 @@
# CONFIG_UCB1400_CORE is not set
# CONFIG_MFD_RDC321X is not set
CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_RTSX_USB=m
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_ABX500_CORE is not set
@@ -1993,6 +2093,7 @@
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65218 is not set
# CONFIG_MFD_TPS65912 is not set
# CONFIG_MFD_TPS65912_I2C is not set
# CONFIG_MFD_TPS65912_SPI is not set
@@ -2095,6 +2196,11 @@
# CONFIG_MMC_TEST is not set
##
+## file: drivers/mmc/core/Kconfig
+##
+# CONFIG_MMC_CLKGATE is not set
+
+##
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_SDHCI=m
@@ -2109,7 +2215,9 @@
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
##
## file: drivers/mtd/Kconfig
@@ -2185,6 +2293,7 @@
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_BLOCK=y
##
## file: drivers/net/Kconfig
@@ -2268,6 +2377,7 @@
##
CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
CONFIG_CAN_KVASER_USB=m
CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_8DEV_USB=m
@@ -2401,6 +2511,7 @@
## file: drivers/net/ethernet/emulex/benet/Kconfig
##
CONFIG_BE2NET=m
+CONFIG_BE2NET_VXLAN=y
##
## file: drivers/net/ethernet/i825xx/Kconfig
@@ -2454,6 +2565,7 @@
##
CONFIG_MLX4_EN=m
CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
CONFIG_MLX4_DEBUG=y
##
@@ -2513,6 +2625,8 @@
CONFIG_QLCNIC=m
CONFIG_QLCNIC_SRIOV=y
CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_VXLAN=y
+CONFIG_QLCNIC_HWMON=y
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
@@ -2534,6 +2648,11 @@
# CONFIG_SH_ETH is not set
##
+## file: drivers/net/ethernet/samsung/Kconfig
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+
+##
## file: drivers/net/ethernet/seeq/Kconfig
##
# CONFIG_NET_VENDOR_SEEQ is not set
@@ -2665,6 +2784,7 @@
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
# CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCM7XXX_PHY is not set
CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
@@ -2927,6 +3047,7 @@
CONFIG_IWLWIFI=m
CONFIG_IWLDVM=m
CONFIG_IWLMVM=m
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
# CONFIG_IWLWIFI_DEBUG is not set
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
@@ -2960,6 +3081,14 @@
# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
##
+## file: drivers/net/wireless/rsi/Kconfig
+##
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+
+##
## file: drivers/net/wireless/rt2x00/Kconfig
##
CONFIG_RT2X00=m
@@ -3016,6 +3145,7 @@
## file: drivers/nfc/Kconfig
##
CONFIG_NFC_PN533=m
+# CONFIG_NFC_TRF7970A is not set
CONFIG_NFC_SIM=m
CONFIG_NFC_PORT100=m
@@ -3087,6 +3217,14 @@
# CONFIG_TWL4030_USB is not set
# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_SAMSUNG_USB2 is not set
+
+##
+## file: drivers/pinctrl/Kconfig
+##
+# CONFIG_PINMUX is not set
+# CONFIG_PINCONF is not set
+# CONFIG_DEBUG_PINCTRL is not set
##
## file: drivers/platform/x86/Kconfig
@@ -3189,6 +3327,7 @@
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_CLASS=y
+CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
@@ -3200,12 +3339,15 @@
# CONFIG_RTC_DRV_DS1307 is not set
# CONFIG_RTC_DRV_DS1374 is not set
# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
# CONFIG_RTC_DRV_MAX6900 is not set
# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_ISL12022 is not set
# CONFIG_RTC_DRV_ISL12057 is not set
# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_M41T80 is not set
@@ -3215,14 +3357,21 @@
# CONFIG_RTC_DRV_FM3130 is not set
# CONFIG_RTC_DRV_RX8581 is not set
# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_M41T93 is not set
# CONFIG_RTC_DRV_M41T94 is not set
# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
# CONFIG_RTC_DRV_DS1390 is not set
# CONFIG_RTC_DRV_MAX6902 is not set
# CONFIG_RTC_DRV_R9701 is not set
# CONFIG_RTC_DRV_RS5C348 is not set
# CONFIG_RTC_DRV_DS3234 is not set
# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
CONFIG_RTC_DRV_CMOS=m
# CONFIG_RTC_DRV_DS1286 is not set
# CONFIG_RTC_DRV_DS1511 is not set
@@ -3236,10 +3385,14 @@
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
CONFIG_RTC_DRV_WM831X=m
CONFIG_RTC_DRV_WM8350=m
CONFIG_RTC_DRV_PCF50633=m
CONFIG_RTC_DRV_AB3100=m
+# CONFIG_RTC_DRV_MOXART is not set
+# CONFIG_RTC_DRV_XGENE is not set
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
##
## file: drivers/scsi/Kconfig
@@ -3457,6 +3610,11 @@
# CONFIG_SPI_TLE62X0 is not set
##
+## file: drivers/spmi/Kconfig
+##
+# CONFIG_SPMI is not set
+
+##
## file: drivers/ssb/Kconfig
##
CONFIG_SSB=m
@@ -3470,21 +3628,51 @@
CONFIG_STAGING=y
##
+## file: drivers/staging/bcm/Kconfig
+##
+# CONFIG_BCM_WIMAX is not set
+
+##
## file: drivers/staging/android/Kconfig
##
# CONFIG_ANDROID is not set
##
+## file: drivers/staging/ced1401/Kconfig
+##
+# CONFIG_CED1401 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/cxt1e1/Kconfig
+##
+# CONFIG_CXT1E1 is not set
+
+##
## file: drivers/staging/crystalhd/Kconfig
##
# CONFIG_CRYSTALHD is not set
##
+## file: drivers/staging/dgap/Kconfig
+##
+# CONFIG_DGAP is not set
+
+##
+## file: drivers/staging/dgnc/Kconfig
+##
+# CONFIG_DGNC is not set
+
+##
## file: drivers/staging/et131x/Kconfig
##
# CONFIG_ET131X is not set
@@ -3495,11 +3683,36 @@
# CONFIG_TRANZPORT is not set
##
+## file: drivers/staging/ft1000/Kconfig
+##
+# CONFIG_FT1000 is not set
+
+##
+## file: drivers/staging/gdm72xx/Kconfig
+##
+# CONFIG_WIMAX_GDM72XX is not set
+
+##
+## file: drivers/staging/gdm724x/Kconfig
+##
+# CONFIG_LTE_GDM724X is not set
+
+##
+## file: drivers/staging/gs_fpgaboot/Kconfig
+##
+# CONFIG_GS_FPGABOOT is not set
+
+##
## file: drivers/staging/line6/Kconfig
##
# CONFIG_LINE6_USB is not set
##
+## file: drivers/staging/lirc/Kconfig
+##
+# CONFIG_LIRC_STAGING is not set
+
+##
## file: drivers/staging/lustre/lustre/Kconfig
##
# CONFIG_LUSTRE_FS is not set
@@ -3510,19 +3723,14 @@
# CONFIG_STAGING_MEDIA is not set
##
-## file: drivers/staging/media/bcm2048/Kconfig
-##
-# CONFIG_I2C_BCM2048 is not set
-
-##
-## file: drivers/staging/media/omap24xx/Kconfig
+## file: drivers/staging/mt29f_spinand/Kconfig
##
-# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_MTD_SPINAND_MT29F is not set
##
-## file: drivers/staging/media/sn9c102/Kconfig
+## file: drivers/staging/ozwpan/Kconfig
##
-CONFIG_USB_SN9C102=m
+# CONFIG_USB_WPAN_HCD is not set
##
## file: drivers/staging/panel/Kconfig
@@ -3537,7 +3745,9 @@
##
## file: drivers/staging/rtl8188eu/Kconfig
##
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
##
## file: drivers/staging/rtl8192e/Kconfig
@@ -3557,7 +3767,12 @@
##
## file: drivers/staging/rtl8712/Kconfig
##
-# CONFIG_R8712U is not set
+CONFIG_R8712U=m
+
+##
+## file: drivers/staging/rtl8723au/Kconfig
+##
+# CONFIG_R8723AU is not set
##
## file: drivers/staging/rtl8821ae/Kconfig
@@ -3590,6 +3805,11 @@
# CONFIG_SLICOSS is not set
##
+## file: drivers/staging/sm7xxfb/Kconfig
+##
+# CONFIG_FB_SM7XX is not set
+
+##
## file: drivers/staging/speakup/Kconfig
##
CONFIG_SPEAKUP=m
@@ -3609,6 +3829,11 @@
CONFIG_SPEAKUP_SYNTH_DUMMY=m
##
+## file: drivers/staging/ste_rmi4/Kconfig
+##
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+
+##
## file: drivers/staging/usbip/Kconfig
##
# CONFIG_USBIP_CORE is not set
@@ -3634,6 +3859,16 @@
# CONFIG_PRISM2_USB is not set
##
+## file: drivers/staging/xgifb/Kconfig
+##
+# CONFIG_FB_XGI is not set
+
+##
+## file: drivers/staging/xillybus/Kconfig
+##
+# CONFIG_XILLYBUS is not set
+
+##
## file: drivers/target/Kconfig
##
CONFIG_TARGET_CORE=m
@@ -3705,6 +3940,7 @@
# CONFIG_SERIAL_MAX310X is not set
CONFIG_SERIAL_MFD_HSU=m
# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
@@ -3740,6 +3976,7 @@
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
+CONFIG_UIO_MF624=m
##
## file: drivers/usb/Kconfig
@@ -3773,9 +4010,16 @@
CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_OTG_FSM is not set
##
+## file: drivers/usb/dwc2/Kconfig
+##
+# CONFIG_USB_DWC2 is not set
+
+##
## file: drivers/usb/dwc3/Kconfig
##
# CONFIG_USB_DWC3 is not set
@@ -3784,7 +4028,21 @@
## file: drivers/usb/gadget/Kconfig
##
# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
# CONFIG_USB_GR_UDC is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+CONFIG_USB_NET2280=m
+# CONFIG_USB_GOKU is not set
##
## file: drivers/usb/host/Kconfig
@@ -3799,6 +4057,8 @@
# 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
+# CONFIG_USB_MAX3421_HCD is not set
CONFIG_USB_OHCI_HCD_PCI=y
# CONFIG_USB_OHCI_HCD_PLATFORM is not set
CONFIG_USB_U132_HCD=m
@@ -3807,6 +4067,7 @@
CONFIG_USB_HWA_HCD=m
# CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
##
## file: drivers/usb/image/Kconfig
@@ -3834,8 +4095,10 @@
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
+# CONFIG_USB_HSIC_USB3503 is not set
##
## file: drivers/usb/misc/sisusbvga/Kconfig
@@ -3985,6 +4248,13 @@
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
CONFIG_BACKLIGHT_WM831X=m
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
##
## file: drivers/video/console/Kconfig
@@ -4052,6 +4322,7 @@
##
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
+# CONFIG_VIRTIO_MMIO is not set
##
## file: drivers/vme/Kconfig
@@ -4098,6 +4369,7 @@
CONFIG_SOFT_WATCHDOG=m
CONFIG_WM831X_WATCHDOG=m
CONFIG_WM8350_WATCHDOG=m
+# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_DW_WATCHDOG is not set
CONFIG_SBC_FITPC2_WATCHDOG=m
CONFIG_ITCO_WDT=m
@@ -4227,6 +4499,7 @@
## file: fs/ceph/Kconfig
##
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CEPH_FS_POSIX_ACL=y
##
@@ -4271,6 +4544,7 @@
## file: fs/ecryptfs/Kconfig
##
CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
##
## file: fs/efivarfs/Kconfig
@@ -4450,6 +4724,7 @@
CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -4840,6 +5115,8 @@
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
CONFIG_FTRACE_SYSCALLS=y
+#. TODO: Enable at next ABI bump
+# CONFIG_TRACER_SNAPSHOT is not set
## choice: Branch Profiling
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -4852,6 +5129,7 @@
CONFIG_DYNAMIC_FTRACE=y
# CONFIG_FUNCTION_PROFILER is not set
# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
# CONFIG_RING_BUFFER_BENCHMARK is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -4922,9 +5200,11 @@
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_CREDENTIALS is not set
@@ -4953,6 +5233,7 @@
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_TEST_MODULE is not set
# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
##
## file: lib/fonts/Kconfig
@@ -5057,12 +5338,14 @@
CONFIG_BATMAN_ADV_BLA=y
CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
# CONFIG_BATMAN_ADV_DEBUG is not set
##
## file: net/bluetooth/Kconfig
##
CONFIG_BT=m
+CONFIG_BT_6LOWPAN=y
##
## file: net/bluetooth/bnep/Kconfig
@@ -5823,6 +6106,7 @@
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
# CONFIG_SND_RTCTIMER is not set
CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
@@ -5936,6 +6220,8 @@
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_USB_US122L=m
CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
##
## file: usr/Kconfig
Modified: dists/trunk/linux/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux/debian/config/hppa/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/hppa/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -569,6 +569,7 @@
##
## file: init/Kconfig
##
+CONFIG_SGETMASK_SYSCALL=y
CONFIG_SYSFS_SYSCALL=y
##
Modified: dists/trunk/linux/debian/config/kernelarch-mips/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-mips/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/kernelarch-mips/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -34,5 +34,6 @@
##
## file: init/Kconfig
##
+CONFIG_SGETMASK_SYSCALL=y
CONFIG_SYSFS_SYSCALL=y
Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -849,6 +849,11 @@
CONFIG_USBPCWATCHDOG=m
##
+## file: init/Kconfig
+##
+CONFIG_SGETMASK_SYSCALL=y
+
+##
## file: lib/Kconfig.debug
##
# CONFIG_DEBUG_STACK_USAGE is not set
Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64 Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64 Sat Sep 13 05:42:09 2014 (r21839)
@@ -25,6 +25,7 @@
CONFIG_PPC64=y
# CONFIG_TUNE_CELL is not set
CONFIG_ALTIVEC=y
+CONFIG_VSX=y
CONFIG_SMP=y
##
Modified: dists/trunk/linux/debian/config/kernelarch-sparc/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-sparc/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/kernelarch-sparc/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -536,6 +536,7 @@
##
## file: init/Kconfig
##
+CONFIG_SGETMASK_SYSCALL=y
CONFIG_SYSFS_SYSCALL=y
##
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -317,6 +317,7 @@
# CONFIG_IPMI_PANIC_EVENT is not set
CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_SI=m
+# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
CONFIG_IPMI_WATCHDOG=m
CONFIG_IPMI_POWEROFF=m
@@ -434,6 +435,7 @@
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_INTEL_MID is not set
CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_KEMPLD=m
##
## file: drivers/gpu/drm/Kconfig
@@ -589,6 +591,7 @@
#. Sony Vaio Duo 13".
CONFIG_I2C_DESIGNWARE_PLATFORM=m
CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_KEMPLD=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PCA_ISA=m
@@ -755,6 +758,7 @@
## file: drivers/mfd/Kconfig
##
CONFIG_LPC_ICH=m
+CONFIG_MFD_KEMPLD=m
##
## file: drivers/misc/Kconfig
@@ -769,6 +773,7 @@
##
CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
+# CONFIG_INTEL_MEI_TXE is not set
##
## file: drivers/misc/vmw_vmci/Kconfig
@@ -894,6 +899,7 @@
##
## file: drivers/net/ethernet/Kconfig
##
+# CONFIG_CX_ECAT is not set
CONFIG_FEALNX=m
##
@@ -920,6 +926,11 @@
CONFIG_ADAPTEC_STARFIRE=m
##
+## file: drivers/net/ethernet/altera/Kconfig
+##
+# CONFIG_ALTERA_TSE is not set
+
+##
## file: drivers/net/ethernet/amd/Kconfig
##
CONFIG_NET_VENDOR_AMD=y
@@ -1155,10 +1166,12 @@
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
CONFIG_ASUS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_SMO8800=m
CONFIG_FUJITSU_LAPTOP=m
CONFIG_FUJITSU_TABLET=m
CONFIG_AMILO_RFKILL=m
@@ -1169,6 +1182,7 @@
CONFIG_PANASONIC_LAPTOP=m
CONFIG_COMPAL_LAPTOP=m
CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
CONFIG_IDEAPAD_LAPTOP=m
CONFIG_THINKPAD_ACPI=m
CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
@@ -1190,9 +1204,14 @@
CONFIG_TOSHIBA_BT_RFKILL=m
CONFIG_ACPI_CMPC=m
CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_PVPANIC=m
##
## file: drivers/pnp/Kconfig
@@ -1375,6 +1394,16 @@
CONFIG_ET131X=m
##
+## file: drivers/staging/gdm72xx/Kconfig
+##
+CONFIG_WIMAX_GDM72XX=m
+# CONFIG_WIMAX_GDM72XX_QOS is not set
+# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
+CONFIG_WIMAX_GDM72XX_USB=y
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+
+##
## file: drivers/staging/iio/light/Kconfig
##
#. Samsung Series 5 550, Chromebook Pixel
@@ -1392,6 +1421,7 @@
## file: drivers/staging/lustre/lnet/Kconfig
##
CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
# CONFIG_LNET_SELFTEST is not set
CONFIG_LNET_XPRT_IB=m
@@ -1399,6 +1429,7 @@
## file: drivers/staging/lustre/lustre/Kconfig
##
CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
CONFIG_LUSTRE_LLITE_LLOOP=m
@@ -1408,6 +1439,16 @@
CONFIG_STAGING_MEDIA=y
##
+## file: drivers/staging/media/as102/Kconfig
+##
+CONFIG_DVB_AS102=m
+
+##
+## file: drivers/staging/media/bcm2048/Kconfig
+##
+# CONFIG_I2C_BCM2048 is not set
+
+##
## file: drivers/staging/media/go7007/Kconfig
##
# CONFIG_VIDEO_GO7007 is not set
@@ -1426,11 +1467,30 @@
CONFIG_LIRC_ZILOG=m
##
-## file: drivers/staging/rtl8188eu/Kconfig
+## file: drivers/staging/media/msi3101/Kconfig
+##
+CONFIG_USB_MSI3101=m
+CONFIG_MEDIA_TUNER_MSI001=m
+
+##
+## file: drivers/staging/media/omap24xx/Kconfig
+##
+# CONFIG_VIDEO_TCM825X is not set
+
+##
+## file: drivers/staging/media/rtl2832u_sdr/Kconfig
+##
+CONFIG_DVB_RTL2832_SDR=m
+
+##
+## file: drivers/staging/media/sn9c102/Kconfig
+##
+# CONFIG_USB_SN9C102 is not set
+
+##
+## file: drivers/staging/media/solo6x10/Kconfig
##
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_88EU_P2P=y
+CONFIG_SOLO6X10=m
##
## file: drivers/staging/rtl8192e/Kconfig
@@ -1456,9 +1516,11 @@
CONFIG_RTL8192U=m
##
-## file: drivers/staging/rtl8712/Kconfig
+## file: drivers/staging/rtl8723au/Kconfig
##
-CONFIG_R8712U=m
+CONFIG_R8723AU=m
+CONFIG_8723AU_AP_MODE=y
+CONFIG_8723AU_BT_COEXIST=y
##
## file: drivers/staging/rtl8821ae/Kconfig
@@ -1556,6 +1618,7 @@
# CONFIG_USB_OHCI_HCD_SSB is not set
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
CONFIG_USB_SL811_CS=m
##
@@ -1648,6 +1711,7 @@
CONFIG_IT8712F_WDT=m
CONFIG_HP_WATCHDOG=m
CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
CONFIG_SC1200_WDT=m
CONFIG_NV_TCO=m
CONFIG_60XX_WDT=m
@@ -1683,6 +1747,7 @@
## choice: Cputime accounting
# CONFIG_IRQ_TIME_ACCOUNTING is not set
## end choice
+CONFIG_SGETMASK_SYSCALL=y
CONFIG_SYSFS_SYSCALL=y
##
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32 Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32 Sat Sep 13 05:42:09 2014 (r21839)
@@ -405,10 +405,14 @@
CONFIG_COMEDI_PCL816=m
CONFIG_COMEDI_PCL818=m
CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
CONFIG_COMEDI_RTI800=m
CONFIG_COMEDI_RTI802=m
CONFIG_COMEDI_DAC02=m
CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
CONFIG_COMEDI_DAS16=m
CONFIG_COMEDI_DAS800=m
CONFIG_COMEDI_DAS1800=m
@@ -430,6 +434,7 @@
CONFIG_COMEDI_NI_AT_AO=m
CONFIG_COMEDI_NI_ATMIO=m
CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
CONFIG_COMEDI_PCMAD=m
CONFIG_COMEDI_PCMDA12=m
CONFIG_COMEDI_PCMMIO=m
@@ -444,6 +449,11 @@
CONFIG_FB_OLPC_DCON_1_5=y
##
+## file: drivers/staging/speakup/Kconfig
+##
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+
+##
## file: drivers/tty/Kconfig
##
# CONFIG_ISI is not set
@@ -459,6 +469,11 @@
CONFIG_SERIAL_8250_EXAR_ST16C554=m
##
+## file: drivers/usb/gadget/Kconfig
+##
+CONFIG_USB_AMD5536UDC=m
+
+##
## file: drivers/video/console/Kconfig
##
CONFIG_MDA_CONSOLE=m
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64 Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64 Sat Sep 13 05:42:09 2014 (r21839)
@@ -8,6 +8,7 @@
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
# CONFIG_MAXSMP is not set
CONFIG_NR_CPUS=512
+CONFIG_X86_16BIT=y
CONFIG_DIRECT_GBPAGES=y
CONFIG_NUMA=y
CONFIG_AMD_NUMA=y
Modified: dists/trunk/linux/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux/debian/config/m68k/config Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/m68k/config Sat Sep 13 05:42:09 2014 (r21839)
@@ -729,6 +729,7 @@
CONFIG_LOG_BUF_SHIFT=16
# CONFIG_SCHED_AUTOGROUP is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SGETMASK_SYSCALL=y
CONFIG_SYSFS_SYSCALL=y
CONFIG_COMPAT_BRK=y
# CONFIG_MODULE_SIG is not set
Modified: dists/trunk/linux/debian/config/mips64/defines
==============================================================================
--- dists/trunk/linux/debian/config/mips64/defines Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/mips64/defines Sat Sep 13 05:42:09 2014 (r21839)
@@ -1,6 +1,7 @@
[base]
flavours:
sb1-bcm91250a
+ 5kc-malta
octeon
kernel-arch: mips
Modified: dists/trunk/linux/debian/config/mips64el/defines
==============================================================================
--- dists/trunk/linux/debian/config/mips64el/defines Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/config/mips64el/defines Sat Sep 13 05:42:09 2014 (r21839)
@@ -1,8 +1,7 @@
[base]
flavours:
sb1-bcm91250a
- loongson-2e
- loongson-2f
+ 5kc-malta
loongson-3
octeon
kernel-arch: mips
@@ -27,21 +26,6 @@
[5kc-malta_image]
configs: kernelarch-mips/config.5kc-malta
-[loongson-2e_description]
-hardware: Loongson 2E
-hardware-long: Lemote Loongson 2E systems
-
-[loongson-2e_image]
-configs: kernelarch-mips/config.loongson-2e
-
-[loongson-2f_description]
-hardware: Loongson 2F
-hardware-long: Lemote Loongson 2F systems
-
-[loongson-2f_image]
-recommends: libc6-loongson2f
-configs: kernelarch-mips/config.loongson-2f
-
[loongson-3_description]
hardware: Loongson 3A/3B
hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)
Modified: dists/trunk/linux/debian/installer/arm64/modules/arm64/nic-modules
==============================================================================
--- dists/trunk/linux/debian/installer/arm64/modules/arm64/nic-modules Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/installer/arm64/modules/arm64/nic-modules Sat Sep 13 05:42:09 2014 (r21839)
@@ -1,3 +1,4 @@
smc91x
smsc911x
xen-netfront
+xgene-enet
Modified: dists/trunk/linux/debian/installer/arm64/modules/arm64/sata-modules
==============================================================================
--- dists/trunk/linux/debian/installer/arm64/modules/arm64/sata-modules Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/installer/arm64/modules/arm64/sata-modules Sat Sep 13 05:42:09 2014 (r21839)
@@ -1 +1,3 @@
#include <sata-modules>
+ahci_xgene
+phy-xgene
Modified: dists/trunk/linux/debian/installer/armel/modules/armel-orion5x/nic-modules
==============================================================================
--- dists/trunk/linux/debian/installer/armel/modules/armel-orion5x/nic-modules Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/installer/armel/modules/armel-orion5x/nic-modules Sat Sep 13 05:42:09 2014 (r21839)
@@ -1,2 +1,3 @@
inet_lro
mv643xx_eth
+mvmdio
Modified: dists/trunk/linux/debian/installer/mips64el/kernel-versions
==============================================================================
--- dists/trunk/linux/debian/installer/mips64el/kernel-versions Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/installer/mips64el/kernel-versions Sat Sep 13 05:42:09 2014 (r21839)
@@ -1,7 +1,5 @@
# arch version flavour installedname suffix build-depends
mips64el - sb1-bcm91250a - y -
mips64el - 5kc-malta - y -
-mips64el - loongson-2e - y -
-mips64el - loongson-2f - y -
mips64el - loongson-3 - y -
mips64el - octeon - y -
Modified: dists/trunk/linux/debian/installer/modules/nic-wireless-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/nic-wireless-modules Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/installer/modules/nic-wireless-modules Sat Sep 13 05:42:09 2014 (r21839)
@@ -2,6 +2,7 @@
ar5523 ?
at76c50x-usb ?
ath5k ?
+ath6kl_sdio ?
ath6kl_usb ?
ath9k ?
ath9k_htc ?
@@ -22,8 +23,11 @@
iwldvm ?
iwlmvm ?
iwlwifi ?
+libertas_cs ?
+libertas_sdio ?
libertas_tf_usb ?
mwifiex_pcie ?
+mwifiex_sdio ?
mwifiex_usb ?
mwl8k ?
orinoco ?
@@ -37,7 +41,10 @@
prism54 ?
r8187se ?
r8192e_pci ?
+r8192u_usb ?
r8712u ?
+r8723au ?
+rsi_usb ?
rt2400pci ?
rt2500pci ?
rt2500usb ?
@@ -47,11 +54,16 @@
rt73usb ?
rtl8180 ?
rtl8188ee ?
+rtl8188eu ?
+rtl818x_pci ?
rtl8192ce ?
rtl8192cu ?
rtl8192de ?
rtl8192se ?
rtl8723ae ?
+rtl8723be ?
+rtl8821ae ?
+spectrum_cs ?
usb8xxx ?
vt6656_stage ?
wavelan ?
Modified: dists/trunk/linux/debian/installer/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/package-list Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/installer/package-list Sat Sep 13 05:42:09 2014 (r21839)
@@ -334,7 +334,7 @@
This package contains squashfs modules.
Package: speakup-modules
-Depends: kernel-image!
+Depends: kernel-image
Priority: extra
Description: speakup modules
This package contains speakup modules.
Copied: dists/trunk/linux/debian/patches/bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch (from r21838, dists/sid/linux/debian/patches/bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch)
@@ -0,0 +1,57 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 08 Jun 2014 23:37:44 +0100
+Subject: [SCSI] aic94xx: Remove broken fallback for missing 'Ctrl-A' user settings
+Forwarded: http://mid.gmane.org/1402267064.23860.42.camel@deadeye.wl.decadent.org.uk
+
+asd_process_ctrl_a_user() attempts to find user settings in flash, and
+if they are missing it prepares a substitute structure containing
+default values for PHY settings. But having done so, it will still
+try to read user settings - from some random address in flash, as the
+local variable 'offs' has not been initialised.
+
+Since asd_common_setup() already sets default PHY settings, there
+seems to be no need to repeat them here, and we can just return 0.
+
+Compile-tested only.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/scsi/aic94xx/aic94xx_sds.c | 18 ++----------------
+ 1 file changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c
+index edb43fd..f5d51d2 100644
+--- a/drivers/scsi/aic94xx/aic94xx_sds.c
++++ b/drivers/scsi/aic94xx/aic94xx_sds.c
+@@ -981,29 +981,15 @@ static int asd_process_ctrla_phy_settings(struct asd_ha_struct *asd_ha,
+ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha,
+ struct asd_flash_dir *flash_dir)
+ {
+- int err, i;
++ int err;
+ u32 offs, size;
+ struct asd_ll_el *el;
+ struct asd_ctrla_phy_settings *ps;
+- struct asd_ctrla_phy_settings dflt_ps;
+
+ err = asd_find_flash_de(flash_dir, FLASH_DE_CTRL_A_USER, &offs, &size);
+ if (err) {
+ ASD_DPRINTK("couldn't find CTRL-A user settings section\n");
+- ASD_DPRINTK("Creating default CTRL-A user settings section\n");
+-
+- dflt_ps.id0 = 'h';
+- dflt_ps.num_phys = 8;
+- for (i =0; i < ASD_MAX_PHYS; i++) {
+- memcpy(dflt_ps.phy_ent[i].sas_addr,
+- asd_ha->hw_prof.sas_addr, SAS_ADDR_SIZE);
+- dflt_ps.phy_ent[i].sas_link_rates = 0x98;
+- dflt_ps.phy_ent[i].flags = 0x0;
+- dflt_ps.phy_ent[i].sata_link_rates = 0x0;
+- }
+-
+- size = sizeof(struct asd_ctrla_phy_settings);
+- ps = &dflt_ps;
++ return 0;
+ }
+
+ if (size == 0)
Copied: dists/trunk/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch (from r21838, dists/sid/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch)
@@ -0,0 +1,52 @@
+From: Michal Marek <mmarek at suse.cz>
+Date: Fri, 22 Aug 2014 15:51:03 +0200
+Subject: builddeb: put the dbg files into the correct directory
+Origin: https://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git//commit?id=2d0871396995139b37f9ceb153c8b07589148343
+
+Since the conversion of objtree to use relative pathnames (commit
+7e1c04779e, "kbuild: Use relative path for $(objtree)"), the debug
+info files have been ending up in /debian/dbgtmp/ in the regular
+linux-image package instead of the debug files package. Fix up the
+paths so that the debug files end up in the -dbg package.
+
+This is based on a similar patch by Darrick.
+
+Reported-and-tested-by: "Darrick J. Wong" <darrick.wong at oracle.com>
+Signed-off-by: Michal Marek <mmarek at suse.cz>
+---
+ scripts/package/builddeb | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 35d5a58..7c0e6e4 100644
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -152,18 +152,16 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ rmdir "$tmpdir/lib/modules/$version"
+ fi
+ if [ -n "$BUILD_DEBUG" ] ; then
+- (
+- cd $tmpdir
+- for module in $(find lib/modules/ -name *.ko); do
+- mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
+- # only keep debug symbols in the debug file
+- $OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
+- # strip original module from debug symbols
+- $OBJCOPY --strip-debug $module
+- # then add a link to those
+- $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
+- done
+- )
++ for module in $(find $tmpdir/lib/modules/ -name *.ko -printf '%P\n'); do
++ module=lib/modules/$module
++ mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
++ # only keep debug symbols in the debug file
++ $OBJCOPY --only-keep-debug $tmpdir/$module $dbg_dir/usr/lib/debug/$module
++ # strip original module from debug symbols
++ $OBJCOPY --strip-debug $tmpdir/$module
++ # then add a link to those
++ $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $tmpdir/$module
++ done
+ fi
+ fi
+
Modified: dists/trunk/linux/debian/patches/bugfix/all/disable-some-marvell-phys.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/disable-some-marvell-phys.patch Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/patches/bugfix/all/disable-some-marvell-phys.patch Sat Sep 13 05:42:09 2014 (r21839)
@@ -1,9 +1,7 @@
From: Ian Campbell <ijc at hellion.org.uk>
Subject: phy/marvell: disable 4-port phys
Date: Wed, 20 Nov 2013 08:30:14 +0000
-Forwarded: no
-
-See 723177 for more details. Briefly:
+Bug-Debian: https://bugs.debian.org/723177
The Marvell PHY was originally disabled because it can cause networking
failures on some systems. According to Lennert Buytenhek this is because some
@@ -12,9 +10,38 @@
penultimate position of the model name) until they can be audited for
correctness.
+[bwh: Also #if-out the init functions for these PHYs to avoid
+ compiler warnings]
+
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
-@@ -975,6 +975,7 @@ static struct phy_driver marvell_drivers
+@@ -591,6 +591,7 @@ static int m88e1118_config_init(struct p
+ return phy_write(phydev, MII_BMCR, BMCR_RESET);
+ }
+
++#if 0
+ static int m88e1149_config_init(struct phy_device *phydev)
+ {
+ int err;
+@@ -616,7 +617,9 @@ static int m88e1149_config_init(struct p
+
+ return phy_write(phydev, MII_BMCR, BMCR_RESET);
+ }
++#endif
+
++#if 0
+ static int m88e1145_config_init(struct phy_device *phydev)
+ {
+ int err;
+@@ -682,6 +685,7 @@ static int m88e1145_config_init(struct p
+
+ return 0;
+ }
++#endif
+
+ /* marvell_read_status
+ *
+@@ -975,6 +979,7 @@ static struct phy_driver marvell_drivers
.suspend = &genphy_suspend,
.driver = { .owner = THIS_MODULE },
},
@@ -22,7 +49,7 @@
{
.phy_id = MARVELL_PHY_ID_88E1145,
.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -990,6 +991,8 @@ static struct phy_driver marvell_drivers
+@@ -990,6 +995,8 @@ static struct phy_driver marvell_drivers
.suspend = &genphy_suspend,
.driver = { .owner = THIS_MODULE },
},
@@ -31,7 +58,7 @@
{
.phy_id = MARVELL_PHY_ID_88E1149R,
.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -1005,6 +1008,8 @@ static struct phy_driver marvell_drivers
+@@ -1005,6 +1012,8 @@ static struct phy_driver marvell_drivers
.suspend = &genphy_suspend,
.driver = { .owner = THIS_MODULE },
},
@@ -40,7 +67,7 @@
{
.phy_id = MARVELL_PHY_ID_88E1240,
.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -1020,6 +1025,7 @@ static struct phy_driver marvell_drivers
+@@ -1020,6 +1029,7 @@ static struct phy_driver marvell_drivers
.suspend = &genphy_suspend,
.driver = { .owner = THIS_MODULE },
},
@@ -48,7 +75,7 @@
{
.phy_id = MARVELL_PHY_ID_88E1116R,
.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -1073,9 +1079,9 @@ static struct mdio_device_id __maybe_unu
+@@ -1073,9 +1083,9 @@ static struct mdio_device_id __maybe_unu
{ MARVELL_PHY_ID_88E1111, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E1118, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E1121R, MARVELL_PHY_ID_MASK },
Copied: dists/trunk/linux/debian/patches/bugfix/all/libceph-add-process_one_ticket-helper.patch (from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-add-process_one_ticket-helper.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/libceph-add-process_one_ticket-helper.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-add-process_one_ticket-helper.patch)
@@ -0,0 +1,275 @@
+From: Ilya Dryomov <ilya.dryomov at inktank.com>
+Date: Mon, 8 Sep 2014 17:25:34 +0400
+Subject: libceph: add process_one_ticket() helper
+Origin: https://git.kernel.org/linus/597cda357716a3cf8d994cb11927af917c8d71fa
+
+Add a helper for processing individual cephx auth tickets. Needed for
+the next commit, which deals with allocating ticket buffers. (Most of
+the diff here is whitespace - view with git diff -b).
+
+Cc: stable at vger.kernel.org
+Signed-off-by: Ilya Dryomov <ilya.dryomov at inktank.com>
+Reviewed-by: Sage Weil <sage at redhat.com>
+---
+ net/ceph/auth_x.c | 228 +++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 124 insertions(+), 104 deletions(-)
+
+diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
+index 96238ba..0eb146d 100644
+--- a/net/ceph/auth_x.c
++++ b/net/ceph/auth_x.c
+@@ -129,17 +129,131 @@ static void remove_ticket_handler(struct ceph_auth_client *ac,
+ kfree(th);
+ }
+
++static int process_one_ticket(struct ceph_auth_client *ac,
++ struct ceph_crypto_key *secret,
++ void **p, void *end,
++ void *dbuf, void *ticket_buf)
++{
++ struct ceph_x_info *xi = ac->private;
++ int type;
++ u8 tkt_struct_v, blob_struct_v;
++ struct ceph_x_ticket_handler *th;
++ void *dp, *dend;
++ int dlen;
++ char is_enc;
++ struct timespec validity;
++ struct ceph_crypto_key old_key;
++ void *tp, *tpend;
++ struct ceph_timespec new_validity;
++ struct ceph_crypto_key new_session_key;
++ struct ceph_buffer *new_ticket_blob;
++ unsigned long new_expires, new_renew_after;
++ u64 new_secret_id;
++ int ret;
++
++ ceph_decode_need(p, end, sizeof(u32) + 1, bad);
++
++ type = ceph_decode_32(p);
++ dout(" ticket type %d %s\n", type, ceph_entity_type_name(type));
++
++ tkt_struct_v = ceph_decode_8(p);
++ if (tkt_struct_v != 1)
++ goto bad;
++
++ th = get_ticket_handler(ac, type);
++ if (IS_ERR(th)) {
++ ret = PTR_ERR(th);
++ goto out;
++ }
++
++ /* blob for me */
++ dlen = ceph_x_decrypt(secret, p, end, dbuf,
++ TEMP_TICKET_BUF_LEN);
++ if (dlen <= 0) {
++ ret = dlen;
++ goto out;
++ }
++ dout(" decrypted %d bytes\n", dlen);
++ dp = dbuf;
++ dend = dp + dlen;
++
++ tkt_struct_v = ceph_decode_8(&dp);
++ if (tkt_struct_v != 1)
++ goto bad;
++
++ memcpy(&old_key, &th->session_key, sizeof(old_key));
++ ret = ceph_crypto_key_decode(&new_session_key, &dp, dend);
++ if (ret)
++ goto out;
++
++ ceph_decode_copy(&dp, &new_validity, sizeof(new_validity));
++ ceph_decode_timespec(&validity, &new_validity);
++ new_expires = get_seconds() + validity.tv_sec;
++ new_renew_after = new_expires - (validity.tv_sec / 4);
++ dout(" expires=%lu renew_after=%lu\n", new_expires,
++ new_renew_after);
++
++ /* ticket blob for service */
++ ceph_decode_8_safe(p, end, is_enc, bad);
++ tp = ticket_buf;
++ if (is_enc) {
++ /* encrypted */
++ dout(" encrypted ticket\n");
++ dlen = ceph_x_decrypt(&old_key, p, end, ticket_buf,
++ TEMP_TICKET_BUF_LEN);
++ if (dlen < 0) {
++ ret = dlen;
++ goto out;
++ }
++ dlen = ceph_decode_32(&tp);
++ } else {
++ /* unencrypted */
++ ceph_decode_32_safe(p, end, dlen, bad);
++ ceph_decode_need(p, end, dlen, bad);
++ ceph_decode_copy(p, ticket_buf, dlen);
++ }
++ tpend = tp + dlen;
++ dout(" ticket blob is %d bytes\n", dlen);
++ ceph_decode_need(&tp, tpend, 1 + sizeof(u64), bad);
++ blob_struct_v = ceph_decode_8(&tp);
++ new_secret_id = ceph_decode_64(&tp);
++ ret = ceph_decode_buffer(&new_ticket_blob, &tp, tpend);
++ if (ret)
++ goto out;
++
++ /* all is well, update our ticket */
++ ceph_crypto_key_destroy(&th->session_key);
++ if (th->ticket_blob)
++ ceph_buffer_put(th->ticket_blob);
++ th->session_key = new_session_key;
++ th->ticket_blob = new_ticket_blob;
++ th->validity = new_validity;
++ th->secret_id = new_secret_id;
++ th->expires = new_expires;
++ th->renew_after = new_renew_after;
++ dout(" got ticket service %d (%s) secret_id %lld len %d\n",
++ type, ceph_entity_type_name(type), th->secret_id,
++ (int)th->ticket_blob->vec.iov_len);
++ xi->have_keys |= th->service;
++
++out:
++ return ret;
++
++bad:
++ ret = -EINVAL;
++ goto out;
++}
++
+ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,
+ struct ceph_crypto_key *secret,
+ void *buf, void *end)
+ {
+- struct ceph_x_info *xi = ac->private;
+- int num;
+ void *p = buf;
+- int ret;
+ char *dbuf;
+ char *ticket_buf;
+ u8 reply_struct_v;
++ u32 num;
++ int ret;
+
+ dbuf = kmalloc(TEMP_TICKET_BUF_LEN, GFP_NOFS);
+ if (!dbuf)
+@@ -150,112 +264,18 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,
+ if (!ticket_buf)
+ goto out_dbuf;
+
+- ceph_decode_need(&p, end, 1 + sizeof(u32), bad);
+- reply_struct_v = ceph_decode_8(&p);
++ ceph_decode_8_safe(&p, end, reply_struct_v, bad);
+ if (reply_struct_v != 1)
+- goto bad;
+- num = ceph_decode_32(&p);
+- dout("%d tickets\n", num);
+- while (num--) {
+- int type;
+- u8 tkt_struct_v, blob_struct_v;
+- struct ceph_x_ticket_handler *th;
+- void *dp, *dend;
+- int dlen;
+- char is_enc;
+- struct timespec validity;
+- struct ceph_crypto_key old_key;
+- void *tp, *tpend;
+- struct ceph_timespec new_validity;
+- struct ceph_crypto_key new_session_key;
+- struct ceph_buffer *new_ticket_blob;
+- unsigned long new_expires, new_renew_after;
+- u64 new_secret_id;
+-
+- ceph_decode_need(&p, end, sizeof(u32) + 1, bad);
+-
+- type = ceph_decode_32(&p);
+- dout(" ticket type %d %s\n", type, ceph_entity_type_name(type));
+-
+- tkt_struct_v = ceph_decode_8(&p);
+- if (tkt_struct_v != 1)
+- goto bad;
+-
+- th = get_ticket_handler(ac, type);
+- if (IS_ERR(th)) {
+- ret = PTR_ERR(th);
+- goto out;
+- }
+-
+- /* blob for me */
+- dlen = ceph_x_decrypt(secret, &p, end, dbuf,
+- TEMP_TICKET_BUF_LEN);
+- if (dlen <= 0) {
+- ret = dlen;
+- goto out;
+- }
+- dout(" decrypted %d bytes\n", dlen);
+- dend = dbuf + dlen;
+- dp = dbuf;
+-
+- tkt_struct_v = ceph_decode_8(&dp);
+- if (tkt_struct_v != 1)
+- goto bad;
++ return -EINVAL;
+
+- memcpy(&old_key, &th->session_key, sizeof(old_key));
+- ret = ceph_crypto_key_decode(&new_session_key, &dp, dend);
+- if (ret)
+- goto out;
++ ceph_decode_32_safe(&p, end, num, bad);
++ dout("%d tickets\n", num);
+
+- ceph_decode_copy(&dp, &new_validity, sizeof(new_validity));
+- ceph_decode_timespec(&validity, &new_validity);
+- new_expires = get_seconds() + validity.tv_sec;
+- new_renew_after = new_expires - (validity.tv_sec / 4);
+- dout(" expires=%lu renew_after=%lu\n", new_expires,
+- new_renew_after);
+-
+- /* ticket blob for service */
+- ceph_decode_8_safe(&p, end, is_enc, bad);
+- tp = ticket_buf;
+- if (is_enc) {
+- /* encrypted */
+- dout(" encrypted ticket\n");
+- dlen = ceph_x_decrypt(&old_key, &p, end, ticket_buf,
+- TEMP_TICKET_BUF_LEN);
+- if (dlen < 0) {
+- ret = dlen;
+- goto out;
+- }
+- dlen = ceph_decode_32(&tp);
+- } else {
+- /* unencrypted */
+- ceph_decode_32_safe(&p, end, dlen, bad);
+- ceph_decode_need(&p, end, dlen, bad);
+- ceph_decode_copy(&p, ticket_buf, dlen);
+- }
+- tpend = tp + dlen;
+- dout(" ticket blob is %d bytes\n", dlen);
+- ceph_decode_need(&tp, tpend, 1 + sizeof(u64), bad);
+- blob_struct_v = ceph_decode_8(&tp);
+- new_secret_id = ceph_decode_64(&tp);
+- ret = ceph_decode_buffer(&new_ticket_blob, &tp, tpend);
++ while (num--) {
++ ret = process_one_ticket(ac, secret, &p, end,
++ dbuf, ticket_buf);
+ if (ret)
+ goto out;
+-
+- /* all is well, update our ticket */
+- ceph_crypto_key_destroy(&th->session_key);
+- if (th->ticket_blob)
+- ceph_buffer_put(th->ticket_blob);
+- th->session_key = new_session_key;
+- th->ticket_blob = new_ticket_blob;
+- th->validity = new_validity;
+- th->secret_id = new_secret_id;
+- th->expires = new_expires;
+- th->renew_after = new_renew_after;
+- dout(" got ticket service %d (%s) secret_id %lld len %d\n",
+- type, ceph_entity_type_name(type), th->secret_id,
+- (int)th->ticket_blob->vec.iov_len);
+- xi->have_keys |= th->service;
+ }
+
+ ret = 0;
Copied: dists/trunk/linux/debian/patches/bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch (from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch)
@@ -0,0 +1,195 @@
+From: Ilya Dryomov <ilya.dryomov at inktank.com>
+Date: Tue, 9 Sep 2014 19:39:15 +0400
+Subject: libceph: do not hard code max auth ticket len
+Origin: https://git.kernel.org/linus/c27a3e4d667fdcad3db7b104f75659478e0c68d8
+
+We hard code cephx auth ticket buffer size to 256 bytes. This isn't
+enough for any moderate setups and, in case tickets themselves are not
+encrypted, leads to buffer overflows (ceph_x_decrypt() errors out, but
+ceph_decode_copy() doesn't - it's just a memcpy() wrapper). Since the
+buffer is allocated dynamically anyway, allocated it a bit later, at
+the point where we know how much is going to be needed.
+
+Fixes: http://tracker.ceph.com/issues/8979
+
+Cc: stable at vger.kernel.org
+Signed-off-by: Ilya Dryomov <ilya.dryomov at inktank.com>
+Reviewed-by: Sage Weil <sage at redhat.com>
+---
+ net/ceph/auth_x.c | 64 +++++++++++++++++++++++++------------------------------
+ 1 file changed, 29 insertions(+), 35 deletions(-)
+
+diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
+index 0eb146d..de6662b 100644
+--- a/net/ceph/auth_x.c
++++ b/net/ceph/auth_x.c
+@@ -13,8 +13,6 @@
+ #include "auth_x.h"
+ #include "auth_x_protocol.h"
+
+-#define TEMP_TICKET_BUF_LEN 256
+-
+ static void ceph_x_validate_tickets(struct ceph_auth_client *ac, int *pneed);
+
+ static int ceph_x_is_authenticated(struct ceph_auth_client *ac)
+@@ -64,7 +62,7 @@ static int ceph_x_encrypt(struct ceph_crypto_key *secret,
+ }
+
+ static int ceph_x_decrypt(struct ceph_crypto_key *secret,
+- void **p, void *end, void *obuf, size_t olen)
++ void **p, void *end, void **obuf, size_t olen)
+ {
+ struct ceph_x_encrypt_header head;
+ size_t head_len = sizeof(head);
+@@ -75,8 +73,14 @@ static int ceph_x_decrypt(struct ceph_crypto_key *secret,
+ return -EINVAL;
+
+ dout("ceph_x_decrypt len %d\n", len);
+- ret = ceph_decrypt2(secret, &head, &head_len, obuf, &olen,
+- *p, len);
++ if (*obuf == NULL) {
++ *obuf = kmalloc(len, GFP_NOFS);
++ if (!*obuf)
++ return -ENOMEM;
++ olen = len;
++ }
++
++ ret = ceph_decrypt2(secret, &head, &head_len, *obuf, &olen, *p, len);
+ if (ret)
+ return ret;
+ if (head.struct_v != 1 || le64_to_cpu(head.magic) != CEPHX_ENC_MAGIC)
+@@ -131,18 +135,19 @@ static void remove_ticket_handler(struct ceph_auth_client *ac,
+
+ static int process_one_ticket(struct ceph_auth_client *ac,
+ struct ceph_crypto_key *secret,
+- void **p, void *end,
+- void *dbuf, void *ticket_buf)
++ void **p, void *end)
+ {
+ struct ceph_x_info *xi = ac->private;
+ int type;
+ u8 tkt_struct_v, blob_struct_v;
+ struct ceph_x_ticket_handler *th;
++ void *dbuf = NULL;
+ void *dp, *dend;
+ int dlen;
+ char is_enc;
+ struct timespec validity;
+ struct ceph_crypto_key old_key;
++ void *ticket_buf = NULL;
+ void *tp, *tpend;
+ struct ceph_timespec new_validity;
+ struct ceph_crypto_key new_session_key;
+@@ -167,8 +172,7 @@ static int process_one_ticket(struct ceph_auth_client *ac,
+ }
+
+ /* blob for me */
+- dlen = ceph_x_decrypt(secret, p, end, dbuf,
+- TEMP_TICKET_BUF_LEN);
++ dlen = ceph_x_decrypt(secret, p, end, &dbuf, 0);
+ if (dlen <= 0) {
+ ret = dlen;
+ goto out;
+@@ -195,20 +199,25 @@ static int process_one_ticket(struct ceph_auth_client *ac,
+
+ /* ticket blob for service */
+ ceph_decode_8_safe(p, end, is_enc, bad);
+- tp = ticket_buf;
+ if (is_enc) {
+ /* encrypted */
+ dout(" encrypted ticket\n");
+- dlen = ceph_x_decrypt(&old_key, p, end, ticket_buf,
+- TEMP_TICKET_BUF_LEN);
++ dlen = ceph_x_decrypt(&old_key, p, end, &ticket_buf, 0);
+ if (dlen < 0) {
+ ret = dlen;
+ goto out;
+ }
++ tp = ticket_buf;
+ dlen = ceph_decode_32(&tp);
+ } else {
+ /* unencrypted */
+ ceph_decode_32_safe(p, end, dlen, bad);
++ ticket_buf = kmalloc(dlen, GFP_NOFS);
++ if (!ticket_buf) {
++ ret = -ENOMEM;
++ goto out;
++ }
++ tp = ticket_buf;
+ ceph_decode_need(p, end, dlen, bad);
+ ceph_decode_copy(p, ticket_buf, dlen);
+ }
+@@ -237,6 +246,8 @@ static int process_one_ticket(struct ceph_auth_client *ac,
+ xi->have_keys |= th->service;
+
+ out:
++ kfree(ticket_buf);
++ kfree(dbuf);
+ return ret;
+
+ bad:
+@@ -249,21 +260,10 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,
+ void *buf, void *end)
+ {
+ void *p = buf;
+- char *dbuf;
+- char *ticket_buf;
+ u8 reply_struct_v;
+ u32 num;
+ int ret;
+
+- dbuf = kmalloc(TEMP_TICKET_BUF_LEN, GFP_NOFS);
+- if (!dbuf)
+- return -ENOMEM;
+-
+- ret = -ENOMEM;
+- ticket_buf = kmalloc(TEMP_TICKET_BUF_LEN, GFP_NOFS);
+- if (!ticket_buf)
+- goto out_dbuf;
+-
+ ceph_decode_8_safe(&p, end, reply_struct_v, bad);
+ if (reply_struct_v != 1)
+ return -EINVAL;
+@@ -272,22 +272,15 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,
+ dout("%d tickets\n", num);
+
+ while (num--) {
+- ret = process_one_ticket(ac, secret, &p, end,
+- dbuf, ticket_buf);
++ ret = process_one_ticket(ac, secret, &p, end);
+ if (ret)
+- goto out;
++ return ret;
+ }
+
+- ret = 0;
+-out:
+- kfree(ticket_buf);
+-out_dbuf:
+- kfree(dbuf);
+- return ret;
++ return 0;
+
+ bad:
+- ret = -EINVAL;
+- goto out;
++ return -EINVAL;
+ }
+
+ static int ceph_x_build_authorizer(struct ceph_auth_client *ac,
+@@ -603,13 +596,14 @@ static int ceph_x_verify_authorizer_reply(struct ceph_auth_client *ac,
+ struct ceph_x_ticket_handler *th;
+ int ret = 0;
+ struct ceph_x_authorize_reply reply;
++ void *preply = &reply;
+ void *p = au->reply_buf;
+ void *end = p + sizeof(au->reply_buf);
+
+ th = get_ticket_handler(ac, au->service);
+ if (IS_ERR(th))
+ return PTR_ERR(th);
+- ret = ceph_x_decrypt(&th->session_key, &p, end, &reply, sizeof(reply));
++ ret = ceph_x_decrypt(&th->session_key, &p, end, &preply, sizeof(reply));
+ if (ret < 0)
+ return ret;
+ if (ret != sizeof(reply))
Copied: dists/trunk/linux/debian/patches/bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch (from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch)
@@ -0,0 +1,36 @@
+From: Sage Weil <sage at redhat.com>
+Date: Mon, 4 Aug 2014 07:01:54 -0700
+Subject: libceph: gracefully handle large reply messages from the mon
+Origin: https://git.kernel.org/linus/73c3d4812b4c755efeca0140f606f83772a39ce4
+
+We preallocate a few of the message types we get back from the mon. If we
+get a larger message than we are expecting, fall back to trying to allocate
+a new one instead of blindly using the one we have.
+
+CC: stable at vger.kernel.org
+Signed-off-by: Sage Weil <sage at redhat.com>
+Reviewed-by: Ilya Dryomov <ilya.dryomov at inktank.com>
+---
+ net/ceph/mon_client.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
+index 067d3af..61fcfc3 100644
+--- a/net/ceph/mon_client.c
++++ b/net/ceph/mon_client.c
+@@ -1181,7 +1181,15 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con,
+ if (!m) {
+ pr_info("alloc_msg unknown type %d\n", type);
+ *skip = 1;
++ } else if (front_len > m->front_alloc_len) {
++ pr_warning("mon_alloc_msg front %d > prealloc %d (%u#%llu)\n",
++ front_len, m->front_alloc_len,
++ (unsigned int)con->peer_name.type,
++ le64_to_cpu(con->peer_name.num));
++ ceph_msg_put(m);
++ m = ceph_msg_new(type, front_len, GFP_NOFS, false);
+ }
++
+ return m;
+ }
+
Copied: dists/trunk/linux/debian/patches/bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch (from r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch)
@@ -0,0 +1,50 @@
+From: Ilya Dryomov <ilya.dryomov at inktank.com>
+Date: Fri, 8 Aug 2014 12:43:39 +0400
+Subject: libceph: set last_piece in ceph_msg_data_pages_cursor_init()
+ correctly
+Origin: https://git.kernel.org/linus/5f740d7e1531099b888410e6bab13f68da9b1a4d
+
+Determining ->last_piece based on the value of ->page_offset + length
+is incorrect because length here is the length of the entire message.
+->last_piece set to false even if page array data item length is <=
+PAGE_SIZE, which results in invalid length passed to
+ceph_tcp_{send,recv}page() and causes various asserts to fire.
+
+ # cat pages-cursor-init.sh
+ #!/bin/bash
+ rbd create --size 10 --image-format 2 foo
+ FOO_DEV=$(rbd map foo)
+ dd if=/dev/urandom of=$FOO_DEV bs=1M &>/dev/null
+ rbd snap create foo at snap
+ rbd snap protect foo at snap
+ rbd clone foo at snap bar
+ # rbd_resize calls librbd rbd_resize(), size is in bytes
+ ./rbd_resize bar $(((4 << 20) + 512))
+ rbd resize --size 10 bar
+ BAR_DEV=$(rbd map bar)
+ # trigger a 512-byte copyup -- 512-byte page array data item
+ dd if=/dev/urandom of=$BAR_DEV bs=1M count=1 seek=5
+
+The problem exists only in ceph_msg_data_pages_cursor_init(),
+ceph_msg_data_pages_advance() does the right thing. The size_t cast is
+unnecessary.
+
+Cc: stable at vger.kernel.org # 3.10+
+Signed-off-by: Ilya Dryomov <ilya.dryomov at inktank.com>
+Reviewed-by: Sage Weil <sage at redhat.com>
+Reviewed-by: Alex Elder <elder at linaro.org>
+---
+ net/ceph/messenger.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/ceph/messenger.c
++++ b/net/ceph/messenger.c
+@@ -900,7 +900,7 @@ static void ceph_msg_data_pages_cursor_i
+ BUG_ON(page_count > (int)USHRT_MAX);
+ cursor->page_count = (unsigned short)page_count;
+ BUG_ON(length > SIZE_MAX - cursor->page_offset);
+- cursor->last_piece = (size_t)cursor->page_offset + length <= PAGE_SIZE;
++ cursor->last_piece = cursor->page_offset + cursor->resid <= PAGE_SIZE;
+ }
+
+ static struct page *
Copied: dists/trunk/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch (from r21838, dists/sid/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch)
@@ -0,0 +1,26 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 12 Sep 2014 13:24:26 +0100
+Subject: i2o: Disable I2O_EXT_ADAPTEC on 64-bit
+
+The code it enables works uses 32-bit numbers for userland virtual
+addresses:
+
+In file included from /tmp/buildd/linux-3.16.2/drivers/message/i2o/config-osm.c:39:0:
+/tmp/buildd/linux-3.16.2/drivers/message/i2o/i2o_config.c: In function 'i2o_cfg_passthru':
+/tmp/buildd/linux-3.16.2/drivers/message/i2o/i2o_config.c:893:19: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
+ (p->virt, (void __user *)sg[i].addr_bus,
+ ^
+/tmp/buildd/linux-3.16.2/drivers/message/i2o/i2o_config.c:953:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
+ ((void __user *)sg[j].addr_bus, sg_list[j].virt,
+ ^
+
+--- a/drivers/message/i2o/Kconfig
++++ b/drivers/message/i2o/Kconfig
+@@ -37,6 +37,7 @@ config I2O_LCT_NOTIFY_ON_CHANGES
+
+ config I2O_EXT_ADAPTEC
+ bool "Enable Adaptec extensions"
++ depends on !64BIT || BROKEN
+ default y
+ ---help---
+ Say Y for support of raidutils for Adaptec I2O controllers. You also
Copied: dists/trunk/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch (from r21838, dists/sid/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch)
@@ -0,0 +1,44 @@
+Subject: deb-pkg: Add automatic support for armhf architecture
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 09 Jun 2014 01:21:34 +0100
+Forwarded: http://mid.gmane.org/1402273294.23860.59.camel@deadeye.wl.decadent.org.uk
+
+The Debian armhf architecture uses the ARM EABI hard-float variant,
+whereas armel uses the soft-float variant. Although the kernel
+doesn't use FP itself, CONFIG_VFP must be enabled to support
+hard-float userland and will probably be disabled when supporting a
+soft-float userland. So set the architecture to armhf by default when
+CONFIG_AEABI and CONFIG_VFP are both enabled.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+v2: rebased
+
+After discussion with Hector, we agreed this would be a worthwhile
+change. Hector may later improve this by using gcc specs.
+
+Ben.
+
+ scripts/package/builddeb | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -45,7 +45,16 @@ create_package() {
+ arm64)
+ debarch=arm64 ;;
+ arm*)
+- debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
++ if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
++ if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
++ debarch=armhf
++ else
++ debarch=armel
++ fi
++ else
++ debarch=arm
++ fi
++ ;;
+ *)
+ echo "" >&2
+ echo "** ** ** WARNING ** ** **" >&2
Copied: dists/trunk/linux/debian/patches/features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch (from r21838, dists/sid/linux/debian/patches/features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch)
@@ -0,0 +1,25 @@
+From: Michael Neuling <mikey at neuling.org>
+Subject: deb-pkg: Add support for powerpc little endian
+Origin: http://marc.info/?l=linux-kernel&m=140989493729069&w=2
+
+The Debian powerpc little endian architecture is called ppc64le. This
+is the default architecture used by Ubuntu for powerpc.
+
+The below checks the kernel config to see if we are compiling little
+endian and sets the Debian arch appropriately.
+
+Signed-off-by: Michael Neuling <mikey at neuling.org>
+
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 35d5a58..6f4a1af 100644
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -37,7 +37,7 @@ create_package() {
+ s390*)
+ debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
+ ppc*)
+- debarch=powerpc ;;
++ debarch=$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo ppc64el || echo powerpc) ;;
+ parisc*)
+ debarch=hppa ;;
+ mips*)
Copied: dists/trunk/linux/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch (from r21838, dists/sid/linux/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch Sat Sep 13 05:42:09 2014 (r21839, copy of r21838, dists/sid/linux/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch)
@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 5 Dec 2011 04:00:58 +0000
+Subject: x86: memtest: WARN if bad RAM found
+Bug-Debian: https://bugs.debian.org/613321
+Forwarded: http://thread.gmane.org/gmane.linux.kernel/1286471
+
+Since this is not a particularly thorough test, if we find any bad
+bits of RAM then there is a fair chance that there are other bad bits
+we fail to detect.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/x86/mm/memtest.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c
+index 92faf3a..ac6bdaa 100644
+--- a/arch/x86/mm/memtest.c
++++ b/arch/x86/mm/memtest.c
+@@ -30,6 +30,8 @@ static u64 patterns[] __initdata = {
+
+ static void __init reserve_bad_mem(u64 pattern, u64 start_bad, u64 end_bad)
+ {
++ WARN_ONCE(1, "Bad RAM detected. Use memtest86+ to perform a thorough test\n"
++ "and the memmap= parameter to reserve the bad areas.");
+ printk(KERN_INFO " %016llx bad mem addr %010llx - %010llx reserved\n",
+ (unsigned long long) pattern,
+ (unsigned long long) start_bad,
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/patches/series Sat Sep 13 05:42:09 2014 (r21839)
@@ -92,6 +92,15 @@
features/powerpc/KVM-Move-irq-notifier-implementation-into-eventfd.c.patch
features/powerpc/KVM-Give-IRQFD-its-own-separate-enabling-Kconfig-opt.patch
features/powerpc/KVM-PPC-Enable-IRQFD-support-for-the-XICS-interrupt-.patch
+features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.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/drivers-net-Add-APM-X-Gene-SoC-ethernet-driver-suppo.patch
+features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch
+features/arm64/net-xgene-Check-negative-return-value-of-xgene_enet_.patch
+features/arm64/net-xgene-fix-possible-NULL-dereference-in-xgene_ene.patch
+features/arm64/dts-Add-bindings-for-APM-X-Gene-SoC-ethernet-driver.patch
# Miscellaneous bug fixes
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
@@ -103,10 +112,15 @@
bugfix/all/mnt-Correct-permission-checks-in-do_remount.patch
bugfix/all/mnt-Change-the-default-remount-atime-from-relatime-t.patch
bugfix/all/mnt-Add-tests-for-unprivileged-remount-cases-that-ha.patch
+debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
+bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
+bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch
+bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch
+bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch
+bugfix/all/libceph-add-process_one_ticket-helper.patch
+bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch
# Miscellaneous features
-features/all/x86-memtest-WARN-if-bad-RAM-found.patch
features/all/efi-autoload-efivars.patch
-features/x86/x86-make-x32-syscall-support-conditional.patch
features/all/virtio-scsi-Implement-change_queue_depth-for-virtscs.patch
debian/revert-staging-sm7xxfb-remove-driver.patch
Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real Sat Sep 13 05:26:09 2014 (r21838)
+++ dists/trunk/linux/debian/rules.real Sat Sep 13 05:42:09 2014 (r21839)
@@ -32,10 +32,6 @@
export DH_OPTIONS
export DEB_HOST_ARCH DEB_HOST_GNU_TYPE DEB_BUILD_ARCH
-ifneq (,$(filter experimental UNRELEASED,$(DISTRIBUTION)))
- export KW_CHECK_NONFATAL = y
-endif
-
include debian/rules.defs
stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
More information about the Kernel-svn-changes
mailing list