debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Revert r7359: Always merge _all_ sensible changes since the last merge without 

breaking the state which defines the merge base.

svn path=/dists/trunk/linux-2.6/; revision=7360
This commit is contained in:
Bastian Blank 2006-09-07 09:18:17 +00:00
parent ae1d370e0d
commit c04af6a483
2 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/arch/powerpc/defines vendored
View File

@ -4,8 +4,6 @@ flavours:
powerpc-smp
powerpc-miboot
powerpc64
prep
# apus
kernel-header-dirs: powerpc ppc m68k
kernel-arch: powerpc
kpkg-subarch: ppc

38
debian/changelog vendored
View File

@ -5,10 +5,7 @@ linux-2.6 (2.6.17+2.6.18-rc6-0experimental.2) UNRELEASED; urgency=low
* arm/iop32x: Build ext2/3 as modules.
* arm/iop32x: Disable CONFIG_EMBEDDED.
[ Sven Luther ]
* [powerpc] Enabled the -prep flavour.
-- Sven Luther <sven@tael.powerlinux.fr> Thu, 7 Sep 2006 11:06:50 +0200
-- Bastian Blank <waldi@debian.org> Tue, 5 Sep 2006 11:05:54 +0200
linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low
@ -16,20 +13,7 @@ linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low
-- Bastian Blank <waldi@debian.org> Tue, 5 Sep 2006 11:05:54 +0200
linux-2.6 (2.6.17-9) UNRELEASED; urgency=low
[ dann frazier ]
* drivers-ide-pci-via82cxxx-vt8237a-id.patch,
drivers-ide-pci-via82cxxx-vt8237a-id-2.patch:
Add missing PCI ID for VT8237A chips, reported by Radek Oliwa.
[ Bastian Blank ]
* Update vserver patch to 2.0.2.
- Fix possible priviledge escalation in remount code. (CVE-2006-4243)
-- Bastian Blank <waldi@debian.org> Mon, 4 Sep 2006 18:20:24 +0200
linux-2.6 (2.6.17-8) unstable; urgency=low
linux-2.6 (2.6.17-8) UNRELEASED; urgency=low
[ Martin Michlmayr ]
* arm/ixp4xx: Enable CONFIG_W1.
@ -40,23 +24,7 @@ linux-2.6 (2.6.17-8) unstable; urgency=low
Updates to patch_sigmatel.c to add x86 mac-mini sound support
Thanks to Matt Kraai. (closes: #384972)
[ Kyle McMartin ]
* hppa: Re-enable pa8800 fixing patches from James Bottomley.
Pulled fresh from parisc-linux git tree.
* ia64: Pull in compile-failure fix from Christian Cotte-Barrot.
Pulled from linux-ia64 mailing list. Fix is correct.
* hppa/alpha/mips: Fix compile-failure due to missing arch_mmap_check. Patch sent
upstream to stable@kernel.org.
[ dann frazier ]
* sym2: only claim "Storage" class devices - the cpqarray driver should be
used for 5c1510 devices in RAID mode. (closes: #380272)
[ Bastian Blank ]
* Backport change to allow all hypercalls for xen.
-- Bastian Blank <waldi@debian.org> Thu, 31 Aug 2006 12:12:51 +0200
-- dann frazier <dannf@debian.org> Tue, 29 Aug 2006 00:06:48 -0600
linux-2.6 (2.6.17-7) unstable; urgency=low