Commit Graph

1312 Commits

Author SHA1 Message Date
Ben Hutchings d512f3dbd1 Update and reenable aufs
Include a fix for a nasty bug in aufs/TOMOYO interaction.
(The fix is not required in squeeze.)

svn path=/dists/trunk/linux-2.6/; revision=17013
2011-03-06 23:39:03 +00:00
Ben Hutchings d4879ad696 Fix linux-tools build for i386 on an x86_64 kernel
svn path=/dists/trunk/linux-2.6/; revision=17008
2011-03-06 22:05:41 +00:00
Ben Hutchings e963d6a20b [x86] Enable VT6656, loading firmware from a separate file
svn path=/dists/trunk/linux-2.6/; revision=17000
2011-03-06 18:58:03 +00:00
Ben Hutchings d366256e94 [x86] Correct typos in label names in two asm functions (Closes: #616426)
svn path=/dists/trunk/linux-2.6/; revision=16989
2011-03-06 00:36:36 +00:00
Ben Hutchings 50642bd64f Update to 2.6.38-rc6
I never did upload 2.6.38~rc5.1~experimental.1, so reopen the
changelog entry.

Drop some patches merged upstream.

svn path=/dists/trunk/linux-2.6/; revision=16933
2011-02-22 13:19:11 +00:00
Ben Hutchings 99be663773 module,bug: Add TAINT_OOT_MODULE flag for modules that weren't built in-tree
Also decode this new flag in the bug script.

svn path=/dists/trunk/linux-2.6/; revision=16914
2011-02-19 02:38:21 +00:00
Ben Hutchings 5fa092eee4 Merge /dists/sid/linux-2.6 (2.6.37-1).
Keep ABI at 'trunk'.
Disable aufs again (but keep the patches).
Drop patches merged upstream.

svn path=/dists/trunk/linux-2.6/; revision=16904
2011-02-17 11:28:30 +00:00
Ben Hutchings 3f3fa452a5 Update to 2.6.38-rc5
Adjust/remove patches as appropriate.

svn path=/dists/trunk/linux-2.6/; revision=16898
2011-02-16 13:38:58 +00:00
Ben Hutchings 8660c76607 nbd: Remove module-level ioctl mutex mistakenly introduced in 2.6.37
svn path=/dists/sid/linux-2.6/; revision=16888
2011-02-15 03:14:52 +00:00
Ben Hutchings 9ec3ad2f30 Restrict write permissions on files in procfs/sysfs
svn path=/dists/sid/linux-2.6/; revision=16887
2011-02-15 02:51:47 +00:00
Ben Hutchings 8e9a5c1224 Add aufs2.1, marked as staging
svn path=/dists/sid/linux-2.6/; revision=16880
2011-02-12 16:57:55 +00:00
Ben Hutchings 147d769a44 Set next Debian revision to 1
svn path=/dists/sid/linux-2.6/; revision=16878
2011-02-12 16:27:26 +00:00
Ben Hutchings 0b7edf388b [sparc] Fix misaligned tracing information (Closes: #609371)
svn path=/dists/trunk/linux-2.6/; revision=16848
2011-01-24 02:12:36 +00:00
Ben Hutchings db7f6530f1 r8712u: Firmware filename is rtlwifi/rtl8712u.bin (Closes: #602450)
svn path=/dists/trunk/linux-2.6/; revision=16847
2011-01-24 01:54:24 +00:00
Ben Hutchings 3b19bfc2e8 r8169: Keep firmware in memory (Closes: #609538)
svn path=/dists/trunk/linux-2.6/; revision=16846
2011-01-24 01:34:50 +00:00
Aurelien Jarno c0b4964a04 * [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.
svn path=/dists/trunk/linux-2.6/; revision=16842
2011-01-20 09:28:20 +00:00
Ben Hutchings 9b8061b1a8 [arm] ixp4xx: Revert build fix, now applied upstream
svn path=/dists/trunk/linux-2.6/; revision=16802
2011-01-10 13:53:42 +00:00
Ben Hutchings 546c3eebcb Update to 2.6.37
svn path=/dists/trunk/linux-2.6/; revision=16775
2011-01-05 02:42:33 +00:00
Ben Hutchings e782daae45 Merge changes from sid branch
svn path=/dists/trunk/linux-2.6/; revision=16774
2011-01-05 02:35:19 +00:00
Ben Hutchings 291ea8476f [x86] Staging: Enable R8712U as module (r8712u, replacing r8192s_usb)
svn path=/dists/trunk/linux-2.6/; revision=16757
2011-01-04 00:26:32 +00:00
Ben Hutchings 22c3fd660c watchdog: Improve failure message and documentation (Closes: #608138)
svn path=/dists/trunk/linux-2.6/; revision=16754
2011-01-03 20:36:24 +00:00
Ben Hutchings 335585c492 starfire: Fix dma_addr_t size test for MIPS (fixes FTBFS)
svn path=/dists/trunk/linux-2.6/; revision=16744
2010-12-29 06:22:34 +00:00
Ben Hutchings c7714e717b Update to 2.6.37-rc8
svn path=/dists/trunk/linux-2.6/; revision=16743
2010-12-29 05:25:34 +00:00
Ben Hutchings 503d455dea i2c-i801: Include <linux/slab.h> (fixes FTBFS on alpha)
svn path=/dists/trunk/linux-2.6/; revision=16741
2010-12-28 04:21:28 +00:00
Ben Hutchings 745668d827 Update to 2.6.37-rc7
svn path=/dists/trunk/linux-2.6/; revision=16728
2010-12-22 02:13:49 +00:00
Ben Hutchings c4bd1958a9 [mips] Restore dma_cache_sync()
svn path=/dists/trunk/linux-2.6/; revision=16705
2010-12-12 14:55:10 +00:00
Ben Hutchings f315791b0f Fix patch series name; prepare to release linux-2.6 (2.6.37~rc5-1~experimental.3).
svn path=/dists/trunk/linux-2.6/; revision=16698
2010-12-11 17:59:39 +00:00
Ben Hutchings d9dae15123 Second attempt to fix FTBFS on various architectures
[alpha] Do not use -Werror for arch/alpha
[arm/ixp4xx] Rename FREQ macro to avoid collisions (v2)
drm/nouveau: Only select ACPI_VIDEO if its dependencies are met
[mips] Change mips_sc_is_activated() to do what the comment says

svn path=/dists/trunk/linux-2.6/; revision=16695
2010-12-11 06:40:13 +00:00
Ben Hutchings 7e971a68a8 Attempt to fix FTBFS on various architectures
svn path=/dists/trunk/linux-2.6/; revision=16686
2010-12-10 02:59:04 +00:00
Ben Hutchings c30dcc74f3 Update to 2.6.37-rc5
svn path=/dists/trunk/linux-2.6/; revision=16685
2010-12-09 01:58:15 +00:00
Ben Hutchings cbce0c8d34 firmware: Correct copyright information and add source for CIS files
(accidentally omitted when merging from sid branch)

svn path=/dists/trunk/linux-2.6/; revision=16670
2010-12-05 23:19:25 +00:00
Ben Hutchings 769ca9f529 DVB/V4L: Fix Kconfig select/depend conflicts
svn path=/dists/trunk/linux-2.6/; revision=16620
2010-12-04 18:11:11 +00:00
Ben Hutchings 8e3b18cd0a Replace Kconfig patch with version likely to be accepted upstream
Add verbose option (KBUILD_VERBOSE=1/V=1) to listnewconfig, rather than
adding yet more targets.  Change rules.real accordingly.

svn path=/dists/trunk/linux-2.6/; revision=16619
2010-12-04 17:17:51 +00:00
Ben Hutchings 2830fdaa56 dm: Deal with merge_bvec_fn in component devices better (Closes: #604457)
svn path=/dists/trunk/linux-2.6/; revision=16610
2010-11-29 01:39:38 +00:00
Ben Hutchings 741625c82c Update to 2.6.37-rc3
svn path=/dists/trunk/linux-2.6/; revision=16606
2010-11-28 04:14:29 +00:00
Martin Michlmayr 160388d6e0 enable sound on OpenRD Ultimate
svn path=/dists/trunk/linux-2.6/; revision=16600
2010-11-25 15:59:14 +00:00
Ben Hutchings e4482ffd21 decnet: Disable auto-loading as mitigation against local exploits
svn path=/dists/trunk/linux-2.6/; revision=16571
2010-11-20 02:31:37 +00:00
Ben Hutchings 3e286908b1 af_802154,rds: Disable auto-loading as mitigation against local exploits
svn path=/dists/trunk/linux-2.6/; revision=16567
2010-11-19 04:30:11 +00:00
Martin Michlmayr b1d1bab362 fix path
svn path=/dists/trunk/linux-2.6/; revision=16536
2010-11-08 10:40:21 +00:00
Martin Michlmayr 3432cd1608 Add ixp4xx build fix from Arnaud Patard (Closes: #602669)
svn path=/dists/trunk/linux-2.6/; revision=16535
2010-11-08 10:38:29 +00:00
Martin Michlmayr a79d62b473 better fix
svn path=/dists/trunk/linux-2.6/; revision=16490
2010-10-25 18:28:57 +00:00
Martin Michlmayr 3b55135d99 Revert "orion/kirkwood: reset PCIe unit on boot" since it breaks
the QNAP TS-209.

svn path=/dists/trunk/linux-2.6/; revision=16463
2010-10-19 18:23:47 +00:00
Ben Hutchings 0bbef7f98a Update to 2.6.36-rc8
svn path=/dists/trunk/linux-2.6/; revision=16445
2010-10-15 01:28:18 +00:00
Ben Hutchings 10ebafb301 Move last valid device ID from piix to ata_piix
piix has been kept around because it has 2 device IDs not listed in
other drivers:

PCI_DEVICE_ID_INTEL_82371FB_0 == 0x122e (PIIX function 0)
This function is the ISA bridge, not a PATA controller!

PCI_DEVICE_ID_INTEL_82801DB_1 == 0x24c1 (ICH4-L function 1)
This should be functionally identical to the ICH4's PATA
controller.

Add the latter device ID to ata_piix and disable piix (except on
alpha, which has not been converted to use libata).


svn path=/dists/trunk/linux-2.6/; revision=16427
2010-10-10 22:01:51 +00:00
Ben Hutchings 30e7656cce [x86] Skip looking for ioapic overrides when ioapics are not present (Closes: #598533)
svn path=/dists/trunk/linux-2.6/; revision=16426
2010-10-10 21:12:51 +00:00
Ben Hutchings e54cefd0de perf: Enable Perl and Python scripting
svn path=/dists/trunk/linux-2.6/; revision=16422
2010-10-10 02:36:46 +00:00
Ben Hutchings 3fd8f69aad perf: Move scripts to /usr/share/perf-core in linux-base package (Closes: #599624)
svn path=/dists/trunk/linux-2.6/; revision=16420
2010-10-10 01:48:46 +00:00
Ben Hutchings 7527d0c144 [x86] Staging: fix Makefile so brcm80211 will actually build (Closes: #599465)
svn path=/dists/trunk/linux-2.6/; revision=16412
2010-10-08 04:03:15 +00:00
Ben Hutchings bf6d43cfe5 qla4xxx: Fix build on some architectures lacking 64-bit I/O (Closes: #598503)
svn path=/dists/trunk/linux-2.6/; revision=16410
2010-10-07 02:39:06 +00:00
Ben Hutchings 1c573ade5f Update to 2.6.36-rc6
svn path=/dists/trunk/linux-2.6/; revision=16367
2010-09-29 01:54:09 +00:00
Ben Hutchings 769bfb21c3 USB: fix bug in initialization of interface minor numbers (Closes: #598207)
svn path=/dists/trunk/linux-2.6/; revision=16364
2010-09-28 01:21:38 +00:00
Ben Hutchings 826a4ea552 drm/i915: Ensure that the crtcinfo is populated during mode_fixup() (Closes: #592415)
svn path=/dists/trunk/linux-2.6/; revision=16362
2010-09-27 23:54:29 +00:00
Ben Hutchings 4374bd74e6 Fix config dependencies for VIDEO_VIVI
svn path=/dists/trunk/linux-2.6/; revision=16333
2010-09-19 01:53:29 +00:00
Ben Hutchings 5da64e6d86 [x86] Add brcm80211 driver for Broadcom 802.11n wireless network controllers
svn path=/dists/trunk/linux-2.6/; revision=16313
2010-09-19 00:31:27 +00:00
Ben Hutchings e935dba032 speakup: Update to match Debian package version 3.1.5.dfsg.1-1
svn path=/dists/trunk/linux-2.6/; revision=16309
2010-09-18 16:48:22 +00:00
Maximilian Attems 32f1dc52a9 nuke old unmerged patch.
svn path=/dists/trunk/linux-2.6/; revision=16273
2010-09-13 08:14:58 +00:00
Ben Hutchings 96fba25e4b New upstream release candidate 2.6.36-rc4
Remove patches merged upstream.
Rewrite debian/scripts-kconfig-reportoldconfig.patch
Rewrite bugfix/mips/disable-werror.patch as debian/mips-disable-werror.patch
Refresh some other patches.

svn path=/dists/trunk/linux-2.6/; revision=16272
2010-09-13 01:37:29 +00:00
Aurelien Jarno 523a495e7f * [mips] Add an octeon flavour.
svn path=/dists/trunk/linux-2.6/; revision=16244
2010-09-06 08:41:21 +00:00
Maximilian Attems 3c800e19ee add stable 2.6.35 releases
svn path=/dists/trunk/linux-2.6/; revision=16235
2010-09-05 11:53:32 +00:00
Aurelien Jarno b6c3696b72 * Fix netfilter CONFIG_COMPAT support.
svn path=/dists/trunk/linux-2.6/; revision=16211
2010-08-29 14:26:58 +00:00
Maximilian Attems 79fc48200d add missing mm lvm fixup patch
reprepare to release 2.6.35-1~experimental.2

svn path=/dists/trunk/linux-2.6/; revision=16150
2010-08-16 21:50:59 +00:00
Maximilian Attems 27de5d7e30 add linus stable bugfix directly from linux-2.6
see https://bugzilla.kernel.org/show_bug.cgi?id=16588 for details.

svn path=/dists/trunk/linux-2.6/; revision=16147
2010-08-15 10:45:43 +00:00
Maximilian Attems b007fe0480 add stable release 2.6.35.1 and 2.6.35.2
just apply fine without conflicts.

svn path=/dists/trunk/linux-2.6/; revision=16145
2010-08-14 11:27:01 +00:00
Ben Hutchings 0221b2bbc2 Update to 2.6.35
svn path=/dists/trunk/linux-2.6/; revision=16034
2010-08-02 01:30:37 +00:00
Ben Hutchings 52f56aec65 Use upstream fix for ds2782_battery
svn path=/dists/trunk/linux-2.6/; revision=16012
2010-07-23 23:51:51 +00:00
Ben Hutchings 42dbc237ff Update to 2.6.35-rc6
svn path=/dists/trunk/linux-2.6/; revision=16004
2010-07-22 23:44:31 +00:00
Ben Hutchings cc97dc48ef ds2782_battery: Fix build failure on several architectures
svn path=/dists/trunk/linux-2.6/; revision=16000
2010-07-20 00:09:39 +00:00
Ben Hutchings 9fdab640ee [!x86] Disable FB_VIA; these GPUs are only found on x86 motherboards
svn path=/dists/trunk/linux-2.6/; revision=15999
2010-07-20 00:08:12 +00:00
Ben Hutchings 3cf4012f58 viafb: Add transitive dependencies via gpiolib
Fix the FTBFS for alpha, ia64 and most mips/mipsel flavours.
Revert the explicit config change for ia64.

svn path=/dists/trunk/linux-2.6/; revision=15985
2010-07-13 23:26:01 +00:00
Ben Hutchings ef5d525c90 Update to 2.6.35-rc5; remove patches merged upstream
svn path=/dists/trunk/linux-2.6/; revision=15980
2010-07-13 00:03:21 +00:00
Ben Hutchings e4b386eff3 kbuild: Fix setlocalversion invocation when objtree != srctree
svn path=/dists/trunk/linux-2.6/; revision=15962
2010-07-07 03:12:37 +00:00
Ben Hutchings 25ca77847f Update to upstream release candidate 2.6.35-rc4
Remove patches merged upstream.

svn path=/dists/trunk/linux-2.6/; revision=15939
2010-07-05 12:01:38 +00:00
Ben Hutchings c5d4c6674e keyboard: Export k_handler again
This is needed by speakup.

svn path=/dists/trunk/linux-2.6/; revision=15938
2010-07-05 11:39:27 +00:00
Ben Hutchings 04b38ec92d Merge changes from 2.6.32-16
Add patches that were added in 2.6.32-16 and are not in 2.6.35-rc3.
Update configuration.
Update maintainer scripts and debconf templates.
Add linux-tools-<version> package.

svn path=/dists/trunk/linux-2.6/; revision=15934
2010-07-04 21:07:52 +00:00
Ben Hutchings 0c747108a8 Update to upstream release candidate 2.6.35-rc3
Refresh/remove patches as appropriate.
Add patches for SD7220 firmware in ip_qib where it moved from ipath.

svn path=/dists/trunk/linux-2.6/; revision=15933
2010-07-04 20:11:06 +00:00
Ben Hutchings c1f681847c Add r8192u_usb driver
Apply all upstream bug fixes up to 2.6.34.
Remove the firmware images.
Enable it on x86.

svn path=/dists/sid/linux-2.6/; revision=15930
2010-07-03 17:23:21 +00:00
Ben Hutchings 5e7f08b2cc rtl8192s_usb: Fix various bugs
svn path=/dists/sid/linux-2.6/; revision=15929
2010-07-03 16:38:31 +00:00
Ben Hutchings 186b3c8352 Remove patches that have been superseded without being released
svn path=/dists/sid/linux-2.6/; revision=15928
2010-07-02 22:53:36 +00:00
Ben Hutchings 20f4803487 Revert "wrong type for 'magic' argument in simple_fill_super()"
svn path=/dists/sid/linux-2.6/; revision=15925
2010-07-02 03:41:33 +00:00
Ben Hutchings 20354e8cf3 Add drm changes from stable 2.6.33.6-rc1
svn path=/dists/sid/linux-2.6/; revision=15924
2010-07-02 03:20:26 +00:00
Ben Hutchings 7b38a3c038 Add stable 2.6.32.16-rc1
ath9k has been further patched since we applied
ath9k-add-support-for-802.11n-bonded-out-AR2427.patch so we need a
separate patch to revert it.

This stable release patches option so we need a new version of
USB-option-Use-generic-USB-wwan-code.patch.

svn path=/dists/sid/linux-2.6/; revision=15923
2010-07-02 03:18:08 +00:00
Ben Hutchings 316e61ab30 ipv6: Fix a couple of bugs affecting temporary address lifetimes
svn path=/dists/sid/linux-2.6/; revision=15919
2010-07-01 00:12:25 +00:00
Ben Hutchings a0d70280e7 asix: fix setting mac address for AX88772 (Closes: #587580)
svn path=/dists/sid/linux-2.6/; revision=15915
2010-06-30 01:01:44 +00:00
Ben Hutchings 7bf3bd3d4c Revert "tpm: autoload tpm_tis based on system PnP IDs" (Closes: #584273)
svn path=/dists/sid/linux-2.6/; revision=15908
2010-06-25 01:39:51 +00:00
Ben Hutchings b0319ba2f3 3c59x: Change locking to avoid use of disable_irq() (Closes: #586967)
svn path=/dists/sid/linux-2.6/; revision=15905
2010-06-24 00:04:28 +00:00
Martin Michlmayr cb94fc59f2 update mv_cesa
svn path=/dists/sid/linux-2.6/; revision=15898
2010-06-20 13:31:03 +00:00
Martin Michlmayr 17bd267844 Add framebuffer driver for XGI chipsets.
svn path=/dists/sid/linux-2.6/; revision=15892
2010-06-19 17:49:48 +00:00
Martin Michlmayr 55bb1e0e05 m25p80: Add support for Macronix 25L8005.
svn path=/dists/sid/linux-2.6/; revision=15891
2010-06-19 10:49:23 +00:00
Ben Hutchings 39f01da488 [x86] Fix confusion between rtl8192u_usb and rtl8192s_usb drivers (Closes: #584945):
- Enable rtl8192u_usb driver
- Fix and update device ID table in rtl8192s_usb driver

svn path=/dists/trunk/linux-2.6/; revision=15882
2010-06-18 00:57:45 +00:00
Ben Hutchings b3cd196347 r8169: Fix MDIO timing (Closes: #583139)
svn path=/dists/sid/linux-2.6/; revision=15880
2010-06-16 02:04:02 +00:00
Ben Hutchings 5db6cefd82 radeon: Fix MacBook Pro connector quirk (Closes: #585943)
svn path=/dists/sid/linux-2.6/; revision=15879
2010-06-16 01:06:19 +00:00
Ben Hutchings e7ead72712 usb-serial: Add generic USB WWAN code, backported by Mark Hymers (Closes: #585661)
- option, qcserial: Use generic USB WWAN code
- qcserial: Add support for Qualcomm Gobi 2000 devices

svn path=/dists/sid/linux-2.6/; revision=15878
2010-06-15 12:45:12 +00:00
Aurelien Jarno b7402d70ac * [sh4] optimize runtime disabling of trapped I/O.
svn path=/dists/sid/linux-2.6/; revision=15877
2010-06-15 12:36:19 +00:00
Ben Hutchings 1fc793a8dd Revert "vlan/macvlan: propagate transmission state to upper layers" (Closes: #585770)
svn path=/dists/sid/linux-2.6/; revision=15869
2010-06-14 12:14:09 +00:00
Ben Hutchings 14fd830fa6 [mips] Fix boot from ATA hard drives (Closes: #584784):
- Set io_map_base for several PCI bridges lacking it
- Replace per-platform built-in IDE drivers with libata-based drivers
- Enable BLK_DEV_SD as built-in on all platforms

svn path=/dists/trunk/linux-2.6/; revision=15867
2010-06-13 22:50:51 +00:00
Ben Hutchings 5fb601373e [mips] Fix boot from ATA hard drives (Closes: #584784):
- Set io_map_base for several PCI bridges lacking it
- Replace per-platform built-in IDE drivers with libata-based drivers
- Enable BLK_DEV_SD as built-in on all platforms

svn path=/dists/sid/linux-2.6/; revision=15866
2010-06-13 22:43:01 +00:00
Martin Michlmayr a9ac79ce99 Add support for HP t5325 Thin Client
svn path=/dists/sid/linux-2.6/; revision=15865
2010-06-13 19:29:59 +00:00
Martin Michlmayr 4cb498cd81 QNAP TS-11x/TS-21x: Add MPP36 (RAM) and MPP44 (board ID).
svn path=/dists/sid/linux-2.6/; revision=15864
2010-06-13 18:36:01 +00:00
Martin Michlmayr d434d32751 Add support for OpenRD-Ultimate.
svn path=/dists/sid/linux-2.6/; revision=15863
2010-06-13 11:13:18 +00:00
Martin Michlmayr c84a319d2d ARM: update mach types.
svn path=/dists/sid/linux-2.6/; revision=15862
2010-06-13 11:11:28 +00:00