Merge changes from sid up to 3.0.0-2

svn path=/dists/trunk/linux-2.6/; revision=17946
This commit is contained in:
Ben Hutchings 2011-08-17 02:40:48 +00:00
commit 7cad51c789
6 changed files with 6266 additions and 14 deletions

74
debian/changelog vendored
View File

@ -1,25 +1,77 @@
linux-2.6 (3.1.0~rc2-1~experimental.1) UNRELEASED; urgency=low
* New upstream release candidate
- perf: do not look at ./config for configuration (Closes: #632923)
(CVE-2011-2905)
[ Aurelien Jarno ]
* Add configuration files for s390x architecture.
[ Ben Hutchings ]
* linux-libc-dev: Install include/asm under arch-specific directory;
mark package as multi-arch-coinstallable (Multi-Arch: same)
* [powerpc] Use libata-based drivers for most PATA controllers
(Closes: #636854):
- Various drivers replaced as for x86 in 2.6.32-10
- pata_macio replaces ide_pmac
* aufs: Disable until it is updated for Linux 3.1
* rt: Disable until it is updated for Linux 3.1
* nfs: Enable NFSv4.1/pNFS (Closes: #627655)
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Jul 2011 23:58:10 +0200
linux-2.6 (3.0.0-2) unstable; urgency=high
[ Aurelien Jarno ]
* Add configuration files for s390x architecture.
[ Ben Hutchings ]
* linux-libc-dev: Install include/asm under arch-specific directory
(thanks to Aurelien for correcting the directory); mark package as
multi-arch-coinstallable (Multi-Arch: same)
* [powerpc] Use libata-based drivers for most PATA controllers
(Closes: #636854):
- Various drivers replaced as for x86 in 2.6.32-10
- pata_macio replaces ide_pmac
* Add stable 3.0.2, including:
- net: Cap number of elements for sendmmsg
- net: Fix security_socket_sendmsg() bypass problem
- [x86] xen: allow enable use of VGA console on dom0
- net: Compute protocol sequence numbers and fragment IDs using MD5
- cifs: cope with negative dentries in cifs_get_root
- ALSA: snd-usb: avoid dividing by zero on invalid input
- ipv6: make fragment identifications less predictable (CVE-2011-2699)
- sch_sfq: fix sfq_enqueue() (Closes: #631945)
- gre: fix improper error handling
- ecryptfs: Add mount option to check uid of device being mounted
= expect uid
- ecryptfs: Return error when lower file pointer is NULL
- ext{3,4}: Properly count journal credits for long symlinks
For the complete list of changes, see:
http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.2
* [x86] Enable RTS_PSTOR as module
[ maximilian attems ]
* Add stable 3.0.1, including:
- gro: Only reset frag0 when skb can be pulled (CVE-2011-2723)
- staging: comedi: fix infoleak to userspace (CVE-2011-2909)
- rtc: limit frequency
- CIFS: Fix oops while mounting with prefixpath
- [SCSI] fix crash in scsi_dispatch_cmd()
- tracing: Fix bug when reading system filters on module removal
- tracing: Have "enable" file use refcounts like the "filter" file
- ext4: fix i_blocks/quota accounting when extent insertion fails
- ext4: free allocated and pre-allocated blocks when check_eofblocks_fl
fails
- ext3: Fix oops in ext3_try_to_allocate_with_rsv()
- nfsd4: remember to put RW access on stateid destruction
- nfsd4: fix file leak on open_downgrade
- NFS: Fix spurious readdir cookie loop messages
- proc: fix a race in do_io_accounting()
- ipc/sem.c: fix race with concurrent semtimedop() timeouts and IPC_RMID
- [armel,armhf,hppa] dm io: flush cpu cache with vmapped io
- dm snapshot: flush disk cache when merging
For the complete list of changes, see:
http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.1
[ Jonathan Nieder ]
* perf: do not look at ./config for configuration (Closes: #632923)
(CVE-2011-2905)
[ Uwe Kleine-König ]
* [amd64] Update rt featureset to 3.0.1-rt11
-- Ben Hutchings <ben@decadent.org.uk> Tue, 16 Aug 2011 06:08:53 +0100
linux-2.6 (3.0.0-1) unstable; urgency=low
* New upstream release: http://kernelnewbies.org/Linux_3.0

View File

@ -1230,6 +1230,12 @@ CONFIG_RTL8192U=m
##
CONFIG_R8712U=m
##
## file: drivers/staging/rts_pstor/Kconfig
##
CONFIG_RTS_PSTOR=m
# RTS_PSTOR_DEBUG is not set
##
## file: drivers/staging/tm6000/Kconfig
##

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ from debian_linux.config import ConfigCoreHierarchy
from debian_linux.debian import Changelog
class Version(object):
_rules = ur"^(\d+\.\d+\.\d+)\.(\d+)$"
_rules = ur"^(\d+\.\d+)\.(\d+)$"
_re = re.compile(_rules)
def __init__(self, version):

0
debian/patches/features/all/rt/gen-patch vendored Normal file → Executable file
View File

5
debian/rules.real vendored
View File

@ -8,6 +8,7 @@
SHELL := bash -e
DEB_HOST_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
DEB_HOST_MULTIARCH:= $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_MULTIARCH)
DEB_BUILD_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
UPLOADER := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
@ -310,8 +311,8 @@ install-libc-dev_$(ARCH):
find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
# Move include/asm to arch-specific directory
mkdir -p $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include
mv $(OUT_DIR)/include/asm $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include/
mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+$(MAKE_SELF) install-base