[arch-commits] CVS update of unstable/kernels/kernel26mm (3 files)

Tom Killian tom at archlinux.org
Thu Aug 23 03:56:21 EDT 2007


    Date: Thursday, August 23, 2007 @ 03:56:21
  Author: tom
    Path: /home/cvs-unstable/unstable/kernels/kernel26mm

   Added: rt2x00mac.c.patch (1.1)
Modified: PKGBUILD (1.14 -> 1.15) config (1.8 -> 1.9)

upgpkg: kernel26mm 2.6.23.rc3.mm1-1


-------------------+
 PKGBUILD          |   27 ++++++------------
 config            |   75 +++++++++++++++++++++++++++++-----------------------
 rt2x00mac.c.patch |   16 +++++++++++
 3 files changed, 68 insertions(+), 50 deletions(-)


Index: unstable/kernels/kernel26mm/PKGBUILD
diff -u unstable/kernels/kernel26mm/PKGBUILD:1.14 unstable/kernels/kernel26mm/PKGBUILD:1.15
--- unstable/kernels/kernel26mm/PKGBUILD:1.14	Mon Aug 20 20:37:09 2007
+++ unstable/kernels/kernel26mm/PKGBUILD	Thu Aug 23 03:56:21 2007
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD,v 1.14 2007/08/21 00:37:09 travis Exp $ 
+# $Id: PKGBUILD,v 1.15 2007/08/23 07:56:21 tom Exp $ 
 # Maintainer: Tom Killian <tom at archlinux.org>
 
 pkgname=kernel26mm
 _basekernel=2.6.22
-_basepatch=2.6.23-rc2
-_mmver=${_basepatch}-mm2
+_basepatch=2.6.23-rc3
+_mmver=${_basepatch}-mm1
 pkgver=${_mmver//-/.}
 pkgrel=1
 pkgdesc="The Linux Kernel and modules, Andrew Morton's -mm tree"
 arch=(i686 x86_64)
 url="http://www.kernel.org"
-license=('GPL2')
 backup=(etc/mkinitcpio.d/kernel26mm-fallback.conf \
         etc/mkinitcpio.d/kernel26mm.preset)
 depends=('module-init-tools' 'mkinitcpio>=0.5.15')
@@ -20,6 +19,7 @@
         http://www2.kernel.org/pub/linux/kernel/v2.6/testing/patch-${_basepatch}.bz2
         http://www2.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${_basepatch}/${_mmver}/${_mmver}.bz2
         http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v0.8.4-2.6.21.patch
+        rt2x00mac.c.patch
         config
         config.x86_64
         logo_linux_clut224.ppm
@@ -36,6 +36,7 @@
 
   patch -Np1 -i ../patch-${_basepatch} || return 1
   patch -Np1 -i ../${_mmver} || return 1
+  patch -Np0 -i ../rt2x00mac.c.patch || return 1
   # add acpi custom dsdt patch
   patch -Np1 -i ../acpi-dsdt-initrd-v0.8.4-2.6.21.patch || return 1
 
@@ -147,24 +148,14 @@
   echo -e "# NEVER EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/kernel26mm.kver || return 1
 }
 md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
-         '198586543f1a2e922b2b662d94375026'
-         'e1197eb59f1515f4c6936f7a000072b5'
+         '736ea68a03158c24e55aa95e0ab15ceb'
+         '39620cfd47f58be6dacdf2544220643c'
          '493137566bc397ec762c86e64bd96849'
-         'a3e7b77193eec50154acc91e4b361453'
+	 '528e99845cd243572c8db344cea75e9e'
+         '20aa8c7ea97f6fc420ec88f2e79ecaa4'
          '3f3666305b45b5fde82bb67b320f0840'
          '5a62bcc7e96601052c7405459b483826'
          'ed6b42fea2f5d27f7eb920746ccc1ebb'
          'a995ec849ea43d3c89d607bbdd1e7d09'
          '8c579c72a4f7187de6b496aec88250ed'
          '55f6c2c0131cdbafc388ad1d9a3a37c3')
-sha1sums=('39401f195a618f397312d6d84ff9aebe28d99381'
-          '4c0d2dbbb1c664cfbd38e97b76bc9441038be488'
-          '9b842beac903f053deffed3f7b17c4eca618904b'
-          '4b53606e3530e2c45315f805b1ae9501a708c3f6'
-          'e6a7a1e57babc917bbd5222204e02d5698d9a232'
-          'e3154aad68461e0f1ea223e46020cf0b26ea80ba'
-          '00fd30a35cb6caceaa05f8d096c63de9c055e3f1'
-          '4031cbccc4860360e059c6091f74fa9da20bc5e7'
-          '4d18688f816d1230c774023d6415f13ad32baccf'
-          'e87ec108adfa2b15c5d1b11339e4e0f197b41639'
-          '648a5ff063cb6bf93bfdd4fb9d7bfd3f57934768')
Index: unstable/kernels/kernel26mm/config
diff -u unstable/kernels/kernel26mm/config:1.8 unstable/kernels/kernel26mm/config:1.9
--- unstable/kernels/kernel26mm/config:1.8	Sat Aug 11 18:18:19 2007
+++ unstable/kernels/kernel26mm/config	Thu Aug 23 03:56:21 2007
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23
-# Sat Aug 11 00:26:33 2007
+# Wed Aug 22 16:41:18 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -9,7 +9,6 @@
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_NONIRQ_WAKEUP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -41,7 +40,8 @@
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 CONFIG_USER_NS=y
-# CONFIG_AUDIT is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
@@ -219,6 +219,7 @@
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
@@ -359,7 +360,6 @@
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_PCIEAER=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -853,7 +853,6 @@
 CONFIG_WIRELESS_EXT=y
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_LEDS is not set
-CONFIG_MAC80211_HT=y
 # CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
@@ -980,8 +979,6 @@
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_RZ1000=m
 CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_BLK_DEV_AEC62XX=m
 CONFIG_BLK_DEV_ALI15X3=m
 # CONFIG_WDC_ALI15X3 is not set
@@ -1360,6 +1357,8 @@
 # CONFIG_ADAPTEC_STARFIRE_NAPI is not set
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_B44=m
+CONFIG_B44_PCI=y
 CONFIG_FORCEDETH=m
 # CONFIG_FORCEDETH_NAPI is not set
 CONFIG_CS89x0=m
@@ -1418,7 +1417,6 @@
 CONFIG_CHELSIO_T3=m
 CONFIG_IXGB=m
 # CONFIG_IXGB_NAPI is not set
-# CONFIG_IXGBE is not set
 CONFIG_S2IO=m
 # CONFIG_S2IO_NAPI is not set
 CONFIG_MYRI10GE=m
@@ -1490,18 +1488,31 @@
 CONFIG_IWLWIFI_SENSITIVITY=y
 CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
 CONFIG_IWLWIFI_QOS=y
-CONFIG_IWLWIFI_HT=y
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
+CONFIG_ATH5K=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
+# CONFIG_B43 is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_DMA_AND_PIO_MODE is not set
+# CONFIG_B43_DMA_MODE is not set
+# CONFIG_B43_PIO_MODE is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211 is not set
 # CONFIG_ZD1211RW_MAC80211_DEBUG is not set
 
 #
@@ -1588,7 +1599,6 @@
 # CONFIG_NET_FC is not set
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
@@ -1912,7 +1922,6 @@
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
@@ -2020,7 +2029,7 @@
 #
 CONFIG_SENSORS_DS1337=m
 CONFIG_SENSORS_DS1374=m
-CONFIG_SENSORS_DS1682=m
+CONFIG_DS1682=m
 CONFIG_SENSORS_EEPROM=m
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCA9539=m
@@ -2131,15 +2140,19 @@
 CONFIG_SENSORS_HDAPS=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_WATCHDOG is not set
 
 #
 # Sonics Silicon Backplane
 #
+CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
+CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_PCMCIAHOST=y
-# CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 
 #
@@ -2735,6 +2748,7 @@
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_ICE1712=m
@@ -3108,22 +3122,6 @@
 #
 # on-CPU RTC drivers
 #
-
-#
-# DMA Engine support
-#
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
@@ -3425,6 +3423,7 @@
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FRAME_POINTER is not set
+# CONFIG_UNWIND_INFO is not set
 # CONFIG_PROFILE_LIKELY is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
@@ -3432,7 +3431,6 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_WANT_EXTRA_DEBUG_INFORMATION is not set
-# CONFIG_UNWIND_INFO is not set
 # CONFIG_KGDB is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -3450,9 +3448,19 @@
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 CONFIG_SECURITY=y
-# CONFIG_SECURITY_NETWORK is not set
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 CONFIG_SECURITY_FILE_CAPABILITIES=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -3494,6 +3502,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
@@ -3515,6 +3524,7 @@
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=m
@@ -3527,6 +3537,7 @@
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
Index: unstable/kernels/kernel26mm/rt2x00mac.c.patch
diff -u /dev/null unstable/kernels/kernel26mm/rt2x00mac.c.patch:1.1
--- /dev/null	Thu Aug 23 03:56:21 2007
+++ unstable/kernels/kernel26mm/rt2x00mac.c.patch	Thu Aug 23 03:56:21 2007
@@ -0,0 +1,16 @@
+--- drivers/net/wireless/rt2x00mac.c.orig	2007-08-22 14:23:25.000000000 +0100
++++ drivers/net/wireless/rt2x00mac.c	2007-08-22 14:24:30.000000000 +0100
+@@ -56,11 +56,11 @@
+ 	skb_put(skb, size);
+ 
+ 	if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+-		ieee80211_ctstoself_get(rt2x00dev->hw, rt2x00dev->interface.id,
++		ieee80211_ctstoself_get(rt2x00dev->hw,
+ 					frag_skb->data, frag_skb->len, control,
+ 					(struct ieee80211_cts *)(skb->data));
+ 	else
+-		ieee80211_rts_get(rt2x00dev->hw, rt2x00dev->interface.id,
++		ieee80211_rts_get(rt2x00dev->hw,
+ 				  frag_skb->data, frag_skb->len, control,
+ 				  (struct ieee80211_rts *)(skb->data));
+ 




More information about the arch-commits mailing list