From ba8a8dcf45455676fcb47c4796f7ca39ef3b1c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Sun, 30 Apr 2006 14:15:23 +0000 Subject: [PATCH] Update trunk to 2.6.17-rc3. Clean up and merge series files. Swich from HZ_1000 to HZ_250 svn path=/dists/trunk/linux-2.6/; revision=6499 --- debian/arch/alpha/config | 3 - debian/arch/amd64/config | 14 +-- debian/arch/amd64/config.amd64-k8 | 1 + debian/arch/amd64/config.amd64-k8-smp | 6 ++ debian/arch/amd64/config.em64t-p4-smp | 3 + debian/arch/amd64/defines | 6 +- debian/arch/config | 99 +++++++++++++++++++ debian/arch/hppa/config | 6 -- debian/arch/i386/config | 5 - debian/arch/ia64/config | 4 - debian/arch/powerpc/config | 5 - debian/arch/sparc/config | 3 - debian/changelog | 9 +- debian/patches/series/1-extra | 7 -- debian/patches/series/10 | 3 - debian/patches/series/11-extra | 1 - debian/patches/series/3-extra | 1 - debian/patches/series/4 | 2 - debian/patches/series/5-extra | 1 - debian/patches/series/6 | 1 - debian/patches/series/7 | 4 - debian/patches/series/7-extra | 1 - debian/patches/series/8 | 3 - debian/patches/series/9 | 2 - debian/patches/series/9-extra | 1 - debian/patches/series/{1 => 99experimental.1} | 14 +-- debian/patches/series/99experimental.1-extra | 24 +++++ 27 files changed, 157 insertions(+), 72 deletions(-) delete mode 100644 debian/patches/series/1-extra delete mode 100644 debian/patches/series/10 delete mode 100644 debian/patches/series/11-extra delete mode 100644 debian/patches/series/3-extra delete mode 100644 debian/patches/series/4 delete mode 100644 debian/patches/series/5-extra delete mode 100644 debian/patches/series/6 delete mode 100644 debian/patches/series/7 delete mode 100644 debian/patches/series/7-extra delete mode 100644 debian/patches/series/8 delete mode 100644 debian/patches/series/9 delete mode 100644 debian/patches/series/9-extra rename debian/patches/series/{1 => 99experimental.1} (68%) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 80755c15a..8cd1cc1bc 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -1491,10 +1491,7 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_WBSD=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_DEBUG=y -CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_EXT2_FS=y CONFIG_JBD=m CONFIG_FS_MBCACHE=y diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 11993410a..af162f855 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -1398,9 +1398,7 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_WBSD=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_EDD=m CONFIG_JBD=m CONFIG_XFS_RT=y @@ -1499,16 +1497,12 @@ CONFIG_CRC32=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y -CONFIG_PHYSICAL_START=0x100000 CONFIG_KEXEC=y CONFIG_CRYPTO_AES_X86_64=m -# CONFIG_HZ_250 is not set # CONFIG_HZ_100 is not set CONFIG_ACPI_HOTKEY=m # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set CONFIG_JFFS2_FS_WRITEBUFFER=y -CONFIG_HZ_1000=y -CONFIG_HZ=1000 CONFIG_FB_VESA=y CONFIG_HPET_EMULATE_RTC=y CONFIG_FB_CFB_IMAGEBLIT=y @@ -1546,4 +1540,12 @@ CONFIG_EDAC_POLL=y CONFIG_EDAC_I82860=m CONFIG_EDAC_E752X=m CONFIG_EDAC_R82600=m +CONFIG_SERIAL_8250_PCI=y +# CONFIG_ACPI_IBM_DOCK is not set +CONFIG_SERIAL_8250_PNP=y +CONFIG_REORDER=y +CONFIG_AGP_VIA=m +CONFIG_PHYSICAL_START=0x200000 CONFIG_HOTPLUG_CPU=y +CONFIG_X86_INTERNODE_CACHE_BYTES=128 +CONFIG_ACPI_HOTPLUG_MEMORY=m diff --git a/debian/arch/amd64/config.amd64-k8 b/debian/arch/amd64/config.amd64-k8 index 11e330936..b0274d1a5 100644 --- a/debian/arch/amd64/config.amd64-k8 +++ b/debian/arch/amd64/config.amd64-k8 @@ -47,3 +47,4 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set # CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_X86_MCE_AMD=y +CONFIG_X86_INTERNODE_CACHE_BYTES=64 diff --git a/debian/arch/amd64/config.amd64-k8-smp b/debian/arch/amd64/config.amd64-k8-smp index 65f6ccc63..5bf827149 100644 --- a/debian/arch/amd64/config.amd64-k8-smp +++ b/debian/arch/amd64/config.amd64-k8-smp @@ -32,3 +32,9 @@ CONFIG_X86_MCE_AMD=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_ACPI_NUMA=y CONFIG_MIGRATION=y +CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y +CONFIG_SCHED_MC=y +CONFIG_NODES_SHIFT=6 +CONFIG_SUSPEND_SMP=y +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_X86_INTERNODE_CACHE_BYTES=64 diff --git a/debian/arch/amd64/config.em64t-p4-smp b/debian/arch/amd64/config.em64t-p4-smp index b4e2aad99..41783ef86 100644 --- a/debian/arch/amd64/config.em64t-p4-smp +++ b/debian/arch/amd64/config.em64t-p4-smp @@ -25,3 +25,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_X86_MCE_AMD is not set +CONFIG_SCHED_MC=y +CONFIG_SUSPEND_SMP=y +CONFIG_ACPI_HOTPLUG_CPU=y diff --git a/debian/arch/amd64/defines b/debian/arch/amd64/defines index 740003105..14ad74e22 100644 --- a/debian/arch/amd64/defines +++ b/debian/arch/amd64/defines @@ -8,9 +8,9 @@ flavours: kernel-arch: x86_64 kernel-header-dirs: x86_64 i386 subarches: - vserver - xen - xen-vserver +# vserver +# xen +# xen-vserver [image] conflicts: grub (<= 0.95+cvs20040624-17) diff --git a/debian/arch/config b/debian/arch/config index faa83db76..e3ee77ab1 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -812,3 +812,102 @@ CONFIG_VIDEO_CX88_VP3054=m CONFIG_NFSD_V4=y CONFIG_NFS_DIRECTIO=y CONFIG_NFS_V4=y +# CONFIG_GIGASET_UNDOCREQ is not set +CONFIG_MMC_SDHCI=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_VIDEO_SAA7127=m +# CONFIG_RELAY is not set +CONFIG_W1_MASTER_DS9490_BRIDGE=m +# CONFIG_BCM43XX_DMA_MODE is not set +CONFIG_RTC_LIB=m +CONFIG_W1_SLAVE_DS2433=m +CONFIG_GIGASET_BASE=m +CONFIG_LSF=y +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_NEW_LEDS=y +CONFIG_IP_NF_H323=m +CONFIG_RTC_DRV_M48T86=m +# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_SND_RIPTIDE=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_WM8775=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_RTC_DRV_TEST is not set +CONFIG_W1_MASTER_MATROX=m +CONFIG_IPATH_CORE=m +CONFIG_INFINIBAND_IPATH=m +CONFIG_RTC_INTF_DEV=m +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_USB_ZC0301=m +CONFIG_VIDEO_MSP3400=m +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_DRV_X1205=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_LEDS_TRIGGER_TIMER=m +# CONFIG_BCM43XX_DEBUG is not set +CONFIG_W1_MASTER_DS9490=m +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_RTC_DRV_DS1672=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_VIDEO_CX25840=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_LEDS_CLASS=m +CONFIG_VIDEO_USBVIDEO=m +# CONFIG_FB_FIRMWARE_EDID is not set +# CONFIG_USB_GADGET_AT91 is not set +CONFIG_RTC_CLASS=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_INTF_PROC=m +CONFIG_BCM43XX_DMA=y +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_GIGASET_M105=m +CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_ISDN_DRV_GIGASET=m +# CONFIG_UNWIND_INFO is not set +CONFIG_BCM43XX=m +CONFIG_USB_DABUSB=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_DVB_ZL10353=m +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +CONFIG_IP_DCCP_CCID2=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_GIGASET_DEBUG is not set +CONFIG_W1_SLAVE_SMEM=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y +CONFIG_VIDEO_CS53L32A=m +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_W1_MASTER_DS2482=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_CPIA2=m +CONFIG_BCM43XX_PIO=y +CONFIG_IP_NF_NAT_H323=m +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_WIRELESS_EXT=y +CONFIG_W1_SLAVE_THERM=m +CONFIG_LEDS_TRIGGERS=y +CONFIG_SND_ALS300=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_IP_DCCP_ACKVEC=y +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_TOUCHSCREEN=m +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_USB_TOUCHSCREEN_PANJIT=y +CONFIG_USB_TOUCHSCREEN_ITM=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_USB_TOUCHSCREEN_EGALAX=y +CONFIG_USB_TOUCHSCREEN_3M=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_HZ_250=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 9997c6ab7..2c08024d7 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -732,9 +732,7 @@ CONFIG_USB_MOUSE=m # CONFIG_MMC is not set CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_EXT2_FS=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set @@ -804,16 +802,12 @@ CONFIG_NFS_ACL_SUPPORT=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_F71805F is not set # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_1000 is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_HZ=250 CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_MEGARAID_MM=m CONFIG_PARPORT_NOT_PC=y CONFIG_MEGARAID_MAILBOX=m # CONFIG_DISCONTIGMEM_MANUAL is not set -CONFIG_SCSI_SYM53C8XX_MMIO=y CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_IPW2100 is not set diff --git a/debian/arch/i386/config b/debian/arch/i386/config index d4984cb31..d4378dd95 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -1647,9 +1647,7 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_WBSD=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_JBD=m CONFIG_XFS_RT=y CONFIG_TMPFS_XATTR=y @@ -1760,9 +1758,6 @@ CONFIG_GENERIC_IRQ_PROBE=y CONFIG_X86_BIOS_REBOOT=y CONFIG_KEXEC=y # CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 CONFIG_PHYSICAL_START=0x100000 CONFIG_HOTPLUG_CPU=y CONFIG_HPET_EMULATE_RTC=y diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 0ceeec104..611c85f4c 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -27,8 +27,6 @@ CONFIG_IA64_PAGE_SIZE_16KB=y CONFIG_PGTABLE_3=y # CONFIG_PGTABLE_4 is not set # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_1000 is not set CONFIG_NUMA=y CONFIG_VIRTUAL_MEM_MAP=y CONFIG_HOLES_IN_ZONE=y @@ -1165,9 +1163,7 @@ CONFIG_MMC=m CONFIG_MMC_BLOCK=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_SGI_IOC3=m CONFIG_JBD=m CONFIG_FS_MBCACHE=m diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 3a06057f1..59eb59f39 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -1131,9 +1131,7 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_WBSD=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set CONFIG_JBD=m CONFIG_FS_MBCACHE=m CONFIG_TMPFS_XATTR=y @@ -1215,9 +1213,6 @@ CONFIG_BOOTX_TEXT=y CONFIG_KEXEC=y CONFIG_PMAC_MEDIABAY=y # CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 CONFIG_SND_POWERMAC_AUTO_DRC=y CONFIG_USB_APPLETOUCH=m CONFIG_SOFTWARE_SUSPEND=y diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index b9cee081a..cad77deed 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -351,10 +351,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_CRC_CCITT=m CONFIG_CRC32=y -CONFIG_HZ=250 -# CONFIG_HZ_1000 is not set # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y CONFIG_SND_SUN_DBRI=m # CONFIG_SOUND_PRIME is not set # CONFIG_PPDEV is not set diff --git a/debian/changelog b/debian/changelog index 0b6d8a19e..1792af7f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ -linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low +linux-2.6 (2.6.17-rc3-99experimental.1) UNRELEASED; urgency=low - [ Bastian Blank ] - * + [ Frederik Schüler ] + * New upstream release. + * Switch HZ from 1000 to 250, following upstreams default. [ maximilian attems ] * Disable broken and known unsecure LSM modules: CONFIG_SECURITY_SECLVL, CONFIG_SECURITY_ROOTPLUG. Upstream plans to remove them for 2.6.18 - -- maximilian attems Tue, 18 Apr 2006 02:09:27 +0200 + -- Frederik Schüler Sun, 30 Apr 2006 15:54:15 +0200 linux-2.6 (2.6.16-11) UNRELEASED; urgency=low diff --git a/debian/patches/series/1-extra b/debian/patches/series/1-extra deleted file mode 100644 index a6048204e..000000000 --- a/debian/patches/series/1-extra +++ /dev/null @@ -1,7 +0,0 @@ -+ maclist.patch arm armeb -+ arm-nslu2-maclist.patch arm armeb -+ vserver-version.patch *_vserver *_xen-vserver -+ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver -+ vserver-xen-clash.patch *_xen-vserver -+ mips-tulip.patch mipsel -+ mips-tulip_dc21143.patch mipsel diff --git a/debian/patches/series/10 b/debian/patches/series/10 deleted file mode 100644 index 656a136e7..000000000 --- a/debian/patches/series/10 +++ /dev/null @@ -1,3 +0,0 @@ -+ alpha-build-fix.patch -+ 2.6.16.10 -+ 2.6.16.11 diff --git a/debian/patches/series/11-extra b/debian/patches/series/11-extra deleted file mode 100644 index 74a272487..000000000 --- a/debian/patches/series/11-extra +++ /dev/null @@ -1 +0,0 @@ -+ vserver-vs2.0.2-rc18-update.patch *_vserver diff --git a/debian/patches/series/3-extra b/debian/patches/series/3-extra deleted file mode 100644 index 466fd7294..000000000 --- a/debian/patches/series/3-extra +++ /dev/null @@ -1 +0,0 @@ -+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver diff --git a/debian/patches/series/4 b/debian/patches/series/4 deleted file mode 100644 index dc52e44c7..000000000 --- a/debian/patches/series/4 +++ /dev/null @@ -1,2 +0,0 @@ -+ 2.6.16.1 -+ mips-sb1-duart-tts.patch diff --git a/debian/patches/series/5-extra b/debian/patches/series/5-extra deleted file mode 100644 index 77e16abab..000000000 --- a/debian/patches/series/5-extra +++ /dev/null @@ -1 +0,0 @@ -+ vserver-vs2.0.2-rc15-update.patch *_vserver diff --git a/debian/patches/series/6 b/debian/patches/series/6 deleted file mode 100644 index c5667a7c9..000000000 --- a/debian/patches/series/6 +++ /dev/null @@ -1 +0,0 @@ -+ 2.6.16.2 diff --git a/debian/patches/series/7 b/debian/patches/series/7 deleted file mode 100644 index ee82a76a5..000000000 --- a/debian/patches/series/7 +++ /dev/null @@ -1,4 +0,0 @@ -+ 2.6.16.3 -+ 2.6.16.4 -+ powerpc-mkvmlinuz-support-2.patch -+ 2.6.16.5 diff --git a/debian/patches/series/7-extra b/debian/patches/series/7-extra deleted file mode 100644 index 9dfd712f5..000000000 --- a/debian/patches/series/7-extra +++ /dev/null @@ -1 +0,0 @@ -+ m68k-2.6.16.patch m68k diff --git a/debian/patches/series/8 b/debian/patches/series/8 deleted file mode 100644 index 1a661e288..000000000 --- a/debian/patches/series/8 +++ /dev/null @@ -1,3 +0,0 @@ -+ include-linux-seccomp-abifix.patch -+ 2.6.16.6 -+ 2.6.16.7 diff --git a/debian/patches/series/9 b/debian/patches/series/9 deleted file mode 100644 index 7e4a5a59c..000000000 --- a/debian/patches/series/9 +++ /dev/null @@ -1,2 +0,0 @@ -+ 2.6.16.8 -+ 2.6.16.9 diff --git a/debian/patches/series/9-extra b/debian/patches/series/9-extra deleted file mode 100644 index 51e64a1f8..000000000 --- a/debian/patches/series/9-extra +++ /dev/null @@ -1 +0,0 @@ -+ vserver-vs2.0.2-rc17-update.patch *_vserver diff --git a/debian/patches/series/1 b/debian/patches/series/99experimental.1 similarity index 68% rename from debian/patches/series/1 rename to debian/patches/series/99experimental.1 index bcdab29d0..ca11d55ab 100644 --- a/debian/patches/series/1 +++ b/debian/patches/series/99experimental.1 @@ -1,6 +1,6 @@ + buslogic-pci-id-table.patch + fbdev-radeon-noaccel.patch -+ fs-asfs-2.patch +#FIXME + fs-asfs-2.patch + modular-ide-pnp.patch + version.patch # @@ -11,15 +11,17 @@ + powerpc-mv643xx-hotplug-support.patch + sparc64-hme-lockup.patch + sparc64-atyfb-xl-gr.patch -+ mips-makefile.patch -+ mips-arch-makefile.patch +#FIXME + mips-makefile.patch +#FIXME + mips-arch-makefile.patch + mips-gettimeofday.patch + mips-ide-scan.patch -+ mips-sb1-probe-ide.patch -+ mips-sb1-eth-1480.patch +#FIXME + mips-sb1-probe-ide.patch +#FIXME + mips-sb1-eth-1480.patch + mips-sb1-eth-napi.patch + mips-sb1-duart.patch + video-vino-64-bit-fix-kernel.diff + s390-drivers-ccw-uevent-modalias.patch + s390-drivers-ccw-uevent-cleanup.patch -+ scripts-newmake.patch +#FIXME + scripts-newmake.patch ++ mips-sb1-duart-tts.patch +#FIXME + powerpc-mkvmlinuz-support-2.patch diff --git a/debian/patches/series/99experimental.1-extra b/debian/patches/series/99experimental.1-extra index b6d0d8ba5..e2f337b0e 100644 --- a/debian/patches/series/99experimental.1-extra +++ b/debian/patches/series/99experimental.1-extra @@ -1,2 +1,26 @@ + xen-tree-merge-22448.patch *_xen *_xen-vserver + xen-tls.patch *_xen *_xen-vserver ++ maclist.patch arm armeb ++ arm-nslu2-maclist.patch arm armeb ++ vserver-version.patch *_vserver *_xen-vserver ++ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver ++ vserver-xen-clash.patch *_xen-vserver ++ mips-tulip.patch mipsel ++ mips-tulip_dc21143.patch mipsel ++ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver ++ vserver-vs2.0.2-rc15-update.patch *_vserver ++ xen-tree-merge-22448.patch *_xen *_xen-vserver ++ xen-tls.patch *_xen *_xen-vserver ++ arm-nslu2-maclist.patch arm armeb ++ maclist.patch arm armeb ++ mips-tulip.patch mipsel ++ mips-tulip_dc21143.patch mipsel ++ vserver-version.patch *_vserver *_xen-vserver ++ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver ++ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver ++ vserver-vs2.0.2-rc15-update.patch *_vserver ++ vserver-vs2.0.2-rc17-update.patch *_vserver ++ vserver-vs2.0.2-rc18-update.patch *_vserver ++ vserver-xen-clash.patch *_xen-vserver ++ xen-tls.patch *_xen *_xen-vserver ++ xen-tree-merge-22448.patch *_xen *_xen-vserver