59c69816b4
Merge from sid again (release of 3.1.6-1)
...
svn path=/dists/trunk/linux-2.6/; revision=18420
2011-12-24 11:14:29 +00:00
ad7ae07d2a
Drop one hunk of an rt patch applied separately in 3.2-rc7
...
svn path=/dists/trunk/linux-2.6/; revision=18419
2011-12-24 11:02:52 +00:00
cb4f2d3ab2
Put some Hyper-V config options under drivers/hv/Kconfig for 3.2
...
svn path=/dists/trunk/linux-2.6/; revision=18418
2011-12-24 10:57:51 +00:00
e0da08a8cb
Restore aufs fix dropped in last merge from sid
...
svn path=/dists/trunk/linux-2.6/; revision=18417
2011-12-24 10:55:56 +00:00
d1023ad845
Include Arnaud's ARM setup fix in upstream changes
...
svn path=/dists/trunk/linux-2.6/; revision=18416
2011-12-24 10:44:24 +00:00
d859d1ee3f
Update to 3.2-rc7
...
svn path=/dists/trunk/linux-2.6/; revision=18415
2011-12-24 10:41:53 +00:00
72fb377acc
Merge /dists/sid/linux-2.6 (3.1.6-1).
...
svn path=/dists/trunk/linux-2.6/; revision=18414
2011-12-23 18:56:37 +00:00
2d81d517cc
Add bug closure for including isci in installer
...
svn path=/dists/sid/linux-2.6/; revision=18406
2011-12-22 01:04:50 +00:00
558aeb7c38
* debian/changelog: Update.
...
* debian/rules.real: Use xz compression for image packages.
svn path=/dists/trunk/linux-2.6/; revision=18405
2011-12-22 00:13:50 +00:00
55a911975f
* debian/changelog: Set version to 3.1.6-1.
...
* debian/patches: Remove merged patches.
svn path=/dists/sid/linux-2.6/; revision=18404
2011-12-22 00:05:05 +00:00
6d1ffd1fd5
[x86] Include isci in installer
...
svn path=/dists/sid/linux-2.6/; revision=18402
2011-12-21 03:37:24 +00:00
b2a5a30054
[x86] et131x: Include driver in installer ( Closes : #651440 )
...
(cherry-picked from trunk)
svn path=/dists/sid/linux-2.6/; revision=18401
2011-12-21 03:35:31 +00:00
d0690e27cb
udeb: Provide the default configuration for kernel-wedge
...
The default (arch-independent) configuration was previously provided
by the kernel-wedge package, but we want to be able to update it
without changing that in future. Copy the configuration files from
kernel-wedge 2.82 (except loop-aes-modules which is now unused).
Depend on kernel-wedge 2.83, which adds this feature.
(cherry-picked from trunk)
svn path=/dists/sid/linux-2.6/; revision=18400
2011-12-21 03:16:29 +00:00
196197c044
Remove build-dependencies for perf, which we no longer build
...
perf is now built from the linux-tools source package. Remove
libelf-dev, libdw-dev, binutils-dev, asciidoc, libperl-dev,
python-dev, libnewt-dev which were only used for that. Move
xmlto to Build-Depends-Indep since all documentation is now in
arch:all packages again.
(cherry-picked from trunk)
svn path=/dists/sid/linux-2.6/; revision=18399
2011-12-21 03:13:26 +00:00
a4d8f9927f
* debian/changelog: Update to 3.2~rc6-1~experimental.1.
...
* debian/patches: Remove merged patch.
svn path=/dists/trunk/linux-2.6/; revision=18398
2011-12-19 12:05:26 +00:00
9c0dcfd33f
security: Enable APPARMOR ( Closes : #598408 )
...
svn path=/dists/trunk/linux-2.6/; revision=18395
2011-12-18 18:32:54 +00:00
cd6d040363
Do not enable HYPERV_BLOCK; the driver is due to be removed
...
The functionality of the Hyper-V block driver (hv_blkvsc) is being
merged into the general storage driver (hv_storvsc) in 3.2. Don't
enable the former for just one kernel version.
svn path=/dists/sid/linux-2.6/; revision=18391
2011-12-16 03:36:57 +00:00
64378c34a9
cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler ( Closes : #650119 )
...
svn path=/dists/sid/linux-2.6/; revision=18390
2011-12-16 03:22:27 +00:00
fd6ad13765
[amd64] bump rt feature set to 3.2-rc5-rt8
...
svn path=/dists/trunk/linux-2.6/; revision=18389
2011-12-15 14:24:33 +00:00
00a06bd668
[x86] Enable HYPERV etc. as modules ( Closes : #652014 )
...
svn path=/dists/sid/linux-2.6/; revision=18388
2011-12-14 06:54:52 +00:00
5a10510a41
Improve description of arm_dma_zone_size fix and add bug number
...
svn path=/dists/sid/linux-2.6/; revision=18387
2011-12-14 06:45:49 +00:00
93a7026d1b
[arm] setup: initialize arm_dma_zone_size earlier ( Closes : #651215 )
...
svn path=/dists/trunk/linux-2.6/; revision=18386
2011-12-14 02:20:40 +00:00
356ae72a44
Add arm_dma_zone_size fix as it should fix #651215
...
svn path=/dists/sid/linux-2.6/; revision=18385
2011-12-13 08:15:07 +00:00
76b84abd2b
staging: r8712u: Add new USB ID ( Closes : #651622 )
...
svn path=/dists/sid/linux-2.6/; revision=18383
2011-12-13 05:52:42 +00:00
4d39b92352
Prepare to release linux-2.6 (3.1.5-1).
...
svn path=/dists/sid/linux-2.6/; revision=18380
2011-12-11 17:20:45 +00:00
b9fdb45a49
Revert r18378 "[x86] Fix issues in KVM nVMX implementation by backporting..."
...
These changes must wait until after 3.1.5-1.
svn path=/dists/sid/linux-2.6/; revision=18379
2011-12-11 17:19:48 +00:00
9dc3d8bdf6
* [x86] Fix issues in KVM nVMX implementation by backporting changes
...
from 3.2.
svn path=/dists/sid/linux-2.6/; revision=18378
2011-12-11 16:53:04 +00:00
88a1c0f2df
Note another upstream fix in 3.2-rc5 ( #651382 )
...
svn path=/dists/trunk/linux-2.6/; revision=18377
2011-12-10 19:27:16 +00:00
d0342754d6
Note upstream fixes in 3.2-rc5
...
svn path=/dists/trunk/linux-2.6/; revision=18376
2011-12-10 19:25:32 +00:00
2968ad5228
Refresh rt patch series for 3.2-rc5
...
svn path=/dists/trunk/linux-2.6/; revision=18374
2011-12-10 14:46:00 +00:00
3c2b560acc
Update to 3.2-rc5
...
svn path=/dists/trunk/linux-2.6/; revision=18373
2011-12-10 14:13:58 +00:00
d61e2efe8f
Deal with ABI changes in 3.1.5
...
struct clocksource changed but clocksource functions shouldn't be used
by OOT modules; ignore the change.
struct inet_peer changed; although it shouldn't be used by OOT modules
it does affect symbol versions for many of the networking core
functions. Since the structure is only allocated in one place so we
can safely extend it instead of adding the new member in the middle.
svn path=/dists/sid/linux-2.6/; revision=18372
2011-12-10 05:02:34 +00:00
c3f6828cdb
Add ABI definition for 3.1.0-1
...
The MIPS definitions are from 3.1.1-1 and the others from 3.1.4-1.
Ignore changes that were made between these two releases in the nfs
and rt2x00 modules.
svn path=/dists/sid/linux-2.6/; revision=18371
2011-12-10 04:19:10 +00:00
625c22fa59
Change abiupdate.py to use the new kernel ABI version definition
...
svn path=/dists/sid/linux-2.6/; revision=18370
2011-12-10 04:12:40 +00:00
0c328410c2
Update to 3.1.5
...
svn path=/dists/sid/linux-2.6/; revision=18367
2011-12-10 00:46:27 +00:00
081ea2a37a
Fix naming of patch series for rt featureset
...
svn path=/dists/trunk/linux-2.6/; revision=18366
2011-12-09 00:41:11 +00:00
ae54f841ff
[x86] et131x: Include driver in installer ( Closes : #651440 )
...
svn path=/dists/trunk/linux-2.6/; revision=18365
2011-12-09 00:38:41 +00:00
61b0fbb477
don't modify debian revisions that are already released
...
svn path=/dists/trunk/linux-2.6/; revision=18363
2011-12-07 08:57:22 +00:00
b2f1f81a01
[amd64] bump rt patch set to 3.2-rc4-rt6
...
svn path=/dists/trunk/linux-2.6/; revision=18362
2011-12-07 08:48:41 +00:00
24bb899b45
[x86] Enable drivers for EG20T and some other Atom companion chips
...
Enable GPIO_PCH, GPIO_ML_IOH, I2C_EG20T, PCH_CAN, PCH_DMA, PCH_GBE,
PCH_PHUB, SERIAL_PCH_UART, SPI_TOPCLIFF_PCH, USB_GADGET, USB_EG20T as
modules
svn path=/dists/sid/linux-2.6/; revision=18359
2011-12-06 06:21:18 +00:00
c35b492ed9
[powerpc] pasemi_mac: Fix building as module
...
svn path=/dists/trunk/linux-2.6/; revision=18357
2011-12-06 04:32:08 +00:00
893f0879fa
brcmsmac: Fix I/O functions for MIPS and for big-endian architectures
...
svn path=/dists/sid/linux-2.6/; revision=18356
2011-12-05 16:05:06 +00:00
619c99e343
[x86] Enable MEMTEST ( Closes : #613321 , #646361 )
...
If bad RAM is detected, WARN and recommend a more thorough test
svn path=/dists/sid/linux-2.6/; revision=18354
2011-12-05 06:04:56 +00:00
8971affbe1
USB: EHCI: fix HUB TT scheduling issue with iso transfer ( Closes : #651015 )
...
svn path=/dists/sid/linux-2.6/; revision=18353
2011-12-05 01:46:49 +00:00
b6177993e9
Add debian/installer/package-list to debian/control source files
...
svn path=/dists/trunk/linux-2.6/; revision=18352
2011-12-05 01:42:04 +00:00
759fef5768
Add Bastian's name above his change
...
svn path=/dists/sid/linux-2.6/; revision=18351
2011-12-05 01:39:00 +00:00
45978965e6
Prepare to release linux-2.6 (3.2~rc4-1~experimental.1).
...
svn path=/dists/trunk/linux-2.6/; revision=18349
2011-12-04 06:00:40 +00:00
52e9bc93f2
udeb: Adjust configuration for some modules renamed in 3.2
...
- iwlagn is renamed to iwlwifi
- blowfish is renamed to blowfish_generic
svn path=/dists/trunk/linux-2.6/; revision=18348
2011-12-04 06:00:15 +00:00
cc4b96aba3
udeb: Provide the default configuration for kernel-wedge
...
The default (arch-independent) configuration was previously provided
by the kernel-wedge package, but we want to be able to update it
without changing that in future. Copy the configuration files from
kernel-wedge 2.82 (except loop-aes-modules which is now unused).
Depend on kernel-wedge 2.83, which adds this feature.
svn path=/dists/trunk/linux-2.6/; revision=18347
2011-12-04 05:58:44 +00:00
77c86295ed
Backport fix for nullpointer dereference on regulator core. Thanks Arnaud Patard.
...
svn path=/dists/sid/linux-2.6/; revision=18346
2011-12-04 00:33:57 +00:00
Ben Hutchings
Bastian Blank
Uwe Kleine-König
Arnaud Patard
Aurelien Jarno
Hector Oron