Merge changes from sid up to 3.14.13-2
svn path=/dists/trunk/linux/; revision=21638
This commit is contained in:
commit
55b65741c1
|
@ -126,6 +126,26 @@ linux (3.15~rc5-1~exp1) experimental; urgency=medium
|
|||
|
||||
-- maximilian attems <maks@debian.org> Fri, 16 May 2014 14:33:57 +0200
|
||||
|
||||
linux (3.14.13-2) unstable; urgency=medium
|
||||
|
||||
[ Aurelien Jarno ]
|
||||
* [mips64,mips64el] Really enable mips64 and mips64el architectures.
|
||||
* [mips64,mips64el] Build udebs for 5kc-malta flavour.
|
||||
* [mipsel,mips64el/loongson-3] Disable not built modules in nic-modules,
|
||||
scsi-common-modules, scsi-extra-modules, scsi-modules (fixes FTBFS).
|
||||
* Add scsi_transport_sas and scsi_transport_spi to scsi-core-modules udeb
|
||||
as optional so that these modules do not end up in two different udebs
|
||||
as dependencies. Remove them from the i386, ia64, powerpc and sparc
|
||||
definition.
|
||||
* [mipsel,mips64el/loongson-2e,2f] Enable CONFIG_RTC_DRV_CMOS as built-in.
|
||||
* [mips*] Add few new udebs and use standard udebs configuration when
|
||||
possible.
|
||||
* [s390,s390x] ptrace: fix PSW mask check (CVE-2014-3534).
|
||||
* [mipsel,mips64el/loongson-3] Enable PREEMPT instead of PREEMPT_VOLUNTARY
|
||||
as it workarounds SMP issues.
|
||||
|
||||
-- Aurelien Jarno <aurel32@debian.org> Thu, 24 Jul 2014 21:05:08 +0200
|
||||
|
||||
linux (3.14.13-1) unstable; urgency=medium
|
||||
|
||||
* New upstream stable update:
|
||||
|
|
|
@ -63,6 +63,11 @@ CONFIG_8139TOO_TUNE_TWISTER=y
|
|||
##
|
||||
# CONFIG_PCIEPORTBUS is not set
|
||||
|
||||
##
|
||||
## file: drivers/rtc/Kconfig
|
||||
##
|
||||
CONFIG_RTC_DRV_CMOS=y
|
||||
|
||||
##
|
||||
## file: drivers/scsi/Kconfig
|
||||
##
|
||||
|
|
|
@ -65,6 +65,11 @@ CONFIG_8139TOO_TUNE_TWISTER=y
|
|||
##
|
||||
# CONFIG_PCIEPORTBUS is not set
|
||||
|
||||
##
|
||||
## file: drivers/rtc/Kconfig
|
||||
##
|
||||
CONFIG_RTC_DRV_CMOS=y
|
||||
|
||||
##
|
||||
## file: drivers/scsi/Kconfig
|
||||
##
|
||||
|
|
|
@ -104,6 +104,15 @@ CONFIG_FB_RADEON=y
|
|||
##
|
||||
CONFIG_FRAMEBUFFER_CONSOLE=y
|
||||
|
||||
##
|
||||
## file: kernel/Kconfig.preempt
|
||||
##
|
||||
## choice: Preemption Model
|
||||
# CONFIG_PREEMPT_NONE is not set
|
||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||
CONFIG_PREEMPT=y
|
||||
## end choice
|
||||
|
||||
##
|
||||
## file: mm/Kconfig
|
||||
##
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
#include <scsi-core-modules>
|
||||
scsi_transport_spi
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
#include <scsi-core-modules>
|
||||
scsi_transport_spi
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <affs-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <cdrom-core-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <event-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <fat-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <hfs-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <i2c-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <jfs-modules>
|
||||
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
#include <loop-modules>
|
||||
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
#include <md-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <minix-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <mmc-core-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <mmc-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <mouse-modules>
|
|
@ -0,0 +1,4 @@
|
|||
#include <nic-modules>
|
||||
skfp -
|
||||
starfire -
|
||||
winbond-840 -
|
|
@ -0,0 +1 @@
|
|||
#include <nic-shared-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <nic-usb-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <nic-wireless-modules>
|
|
@ -0,0 +1 @@
|
|||
ntfs
|
|
@ -0,0 +1 @@
|
|||
#include <pata-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <ppp-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <qnx4-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <sata-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-common-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-core-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-extra-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <scsi-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <sound-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <usb-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <usb-serial-modules>
|
|
@ -1,2 +0,0 @@
|
|||
#include <usb-modules>
|
||||
|
|
@ -1,2 +1 @@
|
|||
#include <usb-storage-modules>
|
||||
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
#include <xfs-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <affs-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <event-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <hfs-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <lzo-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <minix-modules>
|
|
@ -0,0 +1,15 @@
|
|||
#include <nic-modules>
|
||||
8139cp -
|
||||
8139too -
|
||||
dmfe -
|
||||
e100 -
|
||||
epic100 -
|
||||
fealnx -
|
||||
natsemi -
|
||||
ne2k-pci -
|
||||
skfp -
|
||||
sundance -
|
||||
starfire -
|
||||
tulip -
|
||||
typhoon -
|
||||
winbond-840 -
|
|
@ -0,0 +1 @@
|
|||
#include <nic-usb-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <nic-wireless-modules>
|
|
@ -0,0 +1 @@
|
|||
ntfs
|
|
@ -0,0 +1 @@
|
|||
#include <pata-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <qnx4-modules>
|
|
@ -1,4 +1,2 @@
|
|||
aic79xx
|
||||
BusLogic ?
|
||||
sym53c8xx ?
|
||||
sym53c8xx_2 ?
|
||||
#include <scsi-common-modules>
|
||||
sym53c8xx -
|
||||
|
|
|
@ -1 +1 @@
|
|||
scsi_dh
|
||||
#include <scsi-core-modules>
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
#include <scsi-extra-modules>
|
||||
cciss -
|
||||
DAC960 -
|
||||
ips -
|
|
@ -1,9 +1,3 @@
|
|||
3w-9xxx
|
||||
3w-xxxx
|
||||
aacraid
|
||||
atp870u ?
|
||||
ch
|
||||
iscsi_tcp
|
||||
lpfc
|
||||
qla2xxx
|
||||
sg
|
||||
#include <scsi-modules>
|
||||
dmx3191d -
|
||||
tmscsim -
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <sound-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <usb-serial-modules>
|
|
@ -1 +0,0 @@
|
|||
#include <usb-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <virtio-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <affs-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <ata-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <cdrom-core-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <event-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <fat-modules>
|
||||
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
aty128fb
|
||||
atyfb
|
||||
radeonfb
|
||||
cfbcopyarea
|
||||
cfbfillrect
|
||||
cfbimgblt
|
||||
cyber2000fb
|
||||
kyrofb
|
||||
macmodes
|
||||
g450_pll
|
||||
matroxfb_DAC1064
|
||||
matroxfb_Ti3026
|
||||
matroxfb_accel
|
||||
matroxfb_base
|
||||
matroxfb_crtc2
|
||||
matroxfb_g450
|
||||
matroxfb_misc
|
||||
neofb
|
||||
pm2fb
|
||||
savagefb
|
||||
sisfb
|
||||
sstfb
|
||||
tdfxfb
|
||||
tridentfb
|
|
@ -0,0 +1 @@
|
|||
#include <hfs-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <i2c-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <jfs-modules>
|
||||
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
#include <loop-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <lzo-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <md-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <minix-modules>
|
|
@ -0,0 +1,11 @@
|
|||
#include <nic-modules>
|
||||
dmfe -
|
||||
epic100 -
|
||||
fealnx -
|
||||
natsemi -
|
||||
skfp -
|
||||
starfire -
|
||||
sundance -
|
||||
tulip -
|
||||
typhoon -
|
||||
winbond-840 -
|
|
@ -0,0 +1 @@
|
|||
#include <nic-usb-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <nic-wireless-modules>
|
|
@ -0,0 +1 @@
|
|||
ntfs
|
|
@ -0,0 +1 @@
|
|||
#include <pata-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <ppp-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <qnx4-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <sata-modules>
|
||||
|
||||
|
|
|
@ -1,5 +1,2 @@
|
|||
aic79xx
|
||||
BusLogic ?
|
||||
sym53c8xx
|
||||
sym53c8xx_2 ?
|
||||
|
||||
#include <scsi-common-modules>
|
||||
sym53c8xx -
|
||||
|
|
|
@ -1 +1 @@
|
|||
scsi_dh
|
||||
#include <scsi-core-modules>
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
#include <scsi-extra-modules>
|
||||
cciss -
|
||||
DAC960 -
|
||||
ips -
|
|
@ -1,15 +1 @@
|
|||
3w-9xxx
|
||||
3w-xxxx
|
||||
a100u2w
|
||||
aacraid
|
||||
atp870u ?
|
||||
ch
|
||||
dc395x
|
||||
fdomain
|
||||
iscsi_tcp
|
||||
lpfc
|
||||
qla1280
|
||||
qla2xxx
|
||||
qlogicfc ?
|
||||
sg
|
||||
tmscsim
|
||||
#include <scsi-modules>
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <sound-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <usb-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <usb-serial-modules>
|
|
@ -1,2 +0,0 @@
|
|||
#include <usb-modules>
|
||||
|
|
@ -1,2 +1 @@
|
|||
#include <usb-storage-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <virtio-modules>
|
|
@ -1,2 +1 @@
|
|||
#include <xfs-modules>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../../mips/modules/mips-4kc-malta
|
|
@ -0,0 +1 @@
|
|||
../../mips/modules/mips-4kc-malta
|
|
@ -0,0 +1 @@
|
|||
#include <affs-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <ata-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <event-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <firewire-core-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <hfs-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <minix-modules>
|
|
@ -0,0 +1 @@
|
|||
#include <nfs-modules>
|
|
@ -1,2 +1,14 @@
|
|||
8139too
|
||||
r8169
|
||||
#include <nic-modules>
|
||||
8139cp -
|
||||
dmfe -
|
||||
e100 -
|
||||
epic100 -
|
||||
fealnx -
|
||||
natsemi -
|
||||
ne2k-pci -
|
||||
skfp -
|
||||
starfire -
|
||||
sundance -
|
||||
tulip -
|
||||
typhoon -
|
||||
winbond-840 -
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
#include <nic-wireless-modules>
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue