- initial 2.6.31

Changed files:
    kernel-forcedeth-WON.patch -> 1.4
    kernel-imq.patch -> 1.4
    kernel-ipvs-nfct.patch -> 1.3
    kernel-multiarch.config -> 1.17
    kernel-routes.patch -> 1.4
    kernel-unionfs.patch -> 1.5
    kernel.spec -> 1.700

diff --git a/kernel-forcedeth-WON.patch b/kernel-forcedeth-WON.patch
index c5bb8c1b44cb3d7d2227ea83713ae0abc82d6d43..63bbf3ba908b389c34a5138e6560136037d1b059 100644 (file)
--- a/kernel-forcedeth-WON.patch
+++ b/kernel-forcedeth-WON.patch
@@ -4,12 +4,12 @@
   * Hardware access:
   */
  
--#define DEV_NEED_TIMERIRQ          0x000001  /* set the timer irq flag in the irq mask */
-+#define DEV_NEED_TIMERIRQ_ORIG     0x000001  /* set the timer irq flag in the irq mask */
-+#define DEV_NEED_TIMERIRQ          0x000000  /* work-around for Wake-On-Lan functionality */
- #define DEV_NEED_LINKTIMER         0x000002  /* poll link settings. Relies on the timer irq */
- #define DEV_HAS_LARGEDESC          0x000004  /* device supports jumbo frames and needs packet format 2 */
- #define DEV_HAS_HIGH_DMA           0x000008  /* device supports 64bit dma */
+-#define DEV_NEED_TIMERIRQ          0x0000001  /* set the timer irq flag in the irq mask */
++#define DEV_NEED_TIMERIRQ_ORIG     0x0000001  /* set the timer irq flag in the irq mask */
++#define DEV_NEED_TIMERIRQ          0x0000000  /* work-around for Wake-On-Lan functionality */
+ #define DEV_NEED_LINKTIMER         0x0000002  /* poll link settings. Relies on the timer irq */
+ #define DEV_HAS_LARGEDESC          0x0000004  /* device supports jumbo frames and needs packet format 2 */
+ #define DEV_HAS_HIGH_DMA           0x0000008  /* device supports 64bit dma */
 @@ -4342,7 +4343,7 @@
                        np->msi_flags |= 0x0001;
        }

diff --git a/kernel-imq.patch b/kernel-imq.patch
index cdf922ee7021459a272c16f39775cf3b7e4f55d6..2bc3b8293abf709370304cb8ef9b5309a8bc510b 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1035,16 +1035,16 @@ diff -uNr --exclude='*~' linux-2.6.29.1/net/core/skbuff.c linux-2.6.29.1-imq/net
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -493,6 +579,9 @@
+@@ -621,6 +621,9 @@
        new->sp                 = secpath_get(old->sp);
  #endif
        memcpy(new->cb, old->cb, sizeof(old->cb));
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +      skb_copy_stored_cb(new, old);
 +#endif
-       new->csum_start         = old->csum_start;
-       new->csum_offset        = old->csum_offset;
+       new->csum               = old->csum;
        new->local_df           = old->local_df;
+       new->pkt_type           = old->pkt_type;
 @@ -2664,6 +2753,13 @@
                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,

diff --git a/kernel-ipvs-nfct.patch b/kernel-ipvs-nfct.patch
index 60c55948cae2f0793b6b314b9243fc66752863f9..db2d915fb87ca9e3762bd815e7bcbfdba1f641d1 100644 (file)
--- a/kernel-ipvs-nfct.patch
+++ b/kernel-ipvs-nfct.patch
@@ -730,8 +730,8 @@ diff -urNp v2.6.28/linux/net/netfilter/ipvs/ip_vs_xmit.c linux/net/netfilter/ipv
 -      memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
 -
        /* drop old route */
-       dst_release(skb->dst);
-       skb->dst = &rt->u.dst;
+       skb_dst_drop(skb);
+       skb_dst_set(skb, &rt->u.dst);
  
 +      if (!ip_vs_confirm_conntrack(skb, cp, NF_INET_LOCAL_IN))
 +              goto tx_error_out;

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 6c9480c3667b2fe4d2e030e66f21cff2e19d228f..827cf2558568c0fcd7c2c83d49d7dd278fbabd33 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -9,7 +9,6 @@ DEBUG_RODATA_TEST all=n
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y
-LBD all=y
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
 #- file block/Kconfig.iosched goes here
@@ -581,8 +580,8 @@ EISA_NAMES alpha=y i386=y
 #-
 #- *** FILE: drivers/firewire/Kconfig ***
 #-
-#- A new alternative FireWire stack is available with EXPERIMENTAL=y
-#- Enable only one of the two stacks, unless you know what you are doing
+#- You can enable one or both FireWire driver stacks.
+#- See the help texts for more information.
 FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
 FIREWIRE_OHCI all=m
 FIREWIRE_SBP2 all=m
@@ -826,7 +825,6 @@ DS1682 all=m
 SENSORS_PCF8574 all=m
 PCF8575 all=m
 SENSORS_PCA9539 all=m
-SENSORS_MAX6875 all=m
 SENSORS_TSL2550 all=m
 
 #-
@@ -1073,12 +1071,12 @@ JOYSTICK_IFORCE_232 all=y
 #-
 INPUT_KEYBOARD all=y
 KEYBOARD_ATKBD all=y sparc=m sparc64=m
-KEYBOARD_SUNKBD all=m sparc=y sparc64=y
 KEYBOARD_LKKBD all=m
-KEYBOARD_XTKBD all=m
+KEYBOARD_GPIO all=m
 KEYBOARD_NEWTON all=m
 KEYBOARD_STOWAWAY all=m
-KEYBOARD_GPIO all=m
+KEYBOARD_SUNKBD all=m sparc=y sparc64=y
+KEYBOARD_XTKBD all=m
 
 #-
 #- *** FILE: drivers/input/misc/Kconfig ***
@@ -1193,6 +1191,7 @@ ISDN_I4L all=n ppc=m ppc64=m
 ISDN_CAPI all=m
 #- file drivers/isdn/capi/Kconfig goes here
 #- file drivers/isdn/hardware/Kconfig goes here
+#- file drivers/isdn/gigaset/Kconfig goes here
 
 #-
 #- *** FILE: drivers/isdn/capi/Kconfig ***
@@ -1213,7 +1212,6 @@ GIGASET_BASE ppc=m ppc64=m
 GIGASET_M105 ppc=m ppc64=m
 GIGASET_M101 ppc=m ppc64=m
 GIGASET_DEBUG ppc=n ppc64=n
-GIGASET_UNDOCREQ ppc=n ppc64=n
 
 #-
 #- *** FILE: drivers/isdn/hardware/avm/Kconfig ***
@@ -1282,7 +1280,6 @@ ISDN_DIVERSION ppc=m ppc64=m
 #- file drivers/isdn/sc/Kconfig goes here
 #- file drivers/isdn/act2000/Kconfig goes here
 #- file drivers/isdn/hysdn/Kconfig goes here
-#- file drivers/isdn/gigaset/Kconfig goes here
 
 #-
 #- *** FILE: drivers/isdn/mISDN/Kconfig ***
@@ -1306,7 +1303,6 @@ LEDS_PCA9532 all=m
 LEDS_GPIO all=m
 LEDS_GPIO_PLATFORM all=y
 LEDS_GPIO_OF ppc=y
-LEDS_LP5521 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
 LEDS_WM8350 all=m
@@ -1555,12 +1551,6 @@ DVB_DUMMY_FE all=m
 #-
 DVB_PLUTO2 all=m sparc=n
 
-#-
-#- *** FILE: drivers/media/dvb/siano/Kconfig ***
-#-
-DVB_SIANO_SMS1XXX all=m
-DVB_SIANO_SMS1XXX_SMS_IDS all=y
-
 #-
 #- *** FILE: drivers/media/dvb/ttpci/Kconfig ***
 #-
@@ -1969,6 +1959,7 @@ DELL_LAPTOP all=m
 ISL29003 all=m
 #- file drivers/misc/c2port/Kconfig goes here
 #- file drivers/misc/eeprom/Kconfig goes here
+#- file drivers/misc/cb710/Kconfig goes here
 
 #-
 #- *** FILE: drivers/misc/c2port/Kconfig ***
@@ -2192,7 +2183,6 @@ MTD_UBI_DEBUG all=n
 #- *** FILE: drivers/net/Kconfig ***
 #-
 NETDEVICES all=y
-COMPAT_NET_DEV_OPS all=y
 IFB all=m
 DUMMY all=m
 BONDING all=m
@@ -2370,6 +2360,7 @@ QLGE all=m
 #- file drivers/net/pcmcia/Kconfig goes here
 #- file drivers/net/wan/Kconfig goes here
 #- file drivers/atm/Kconfig goes here
+#- file drivers/ieee802154/Kconfig goes here
 #- file drivers/s390/net/Kconfig goes here
 ISERIES_VETH ppc64=n
 FDDI all=y
@@ -2688,9 +2679,7 @@ ADM8211 all=m
 MAC80211_HWSIM all=m
 MWL8K all=m
 #- file drivers/net/wireless/p54/Kconfig goes here
-#- file drivers/net/wireless/ath5k/Kconfig goes here
-#- file drivers/net/wireless/ath9k/Kconfig goes here
-#- file drivers/net/wireless/ar9170/Kconfig goes here
+#- file drivers/net/wireless/ath/Kconfig goes here
 #- file drivers/net/wireless/ipw2x00/Kconfig goes here
 #- file drivers/net/wireless/iwlwifi/Kconfig goes here
 #- file drivers/net/wireless/hostap/Kconfig goes here
@@ -2699,20 +2688,22 @@ MWL8K all=m
 #- file drivers/net/wireless/zd1211rw/Kconfig goes here
 #- file drivers/net/wireless/rt2x00/Kconfig goes here
 #- file drivers/net/wireless/orinoco/Kconfig goes here
+#- file drivers/net/wireless/wl12xx/Kconfig goes here
+#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
 
 #-
-#- *** FILE: drivers/net/wireless/ar9170/Kconfig ***
+#- *** FILE: drivers/net/wireless/ath/ar9170/Kconfig ***
 #-
 AR9170_USB all=m
 
 #-
-#- *** FILE: drivers/net/wireless/ath5k/Kconfig ***
+#- *** FILE: drivers/net/wireless/ath/ath5k/Kconfig ***
 #-
 ATH5K all=m
 ATH5K_DEBUG all=n
 
 #-
-#- *** FILE: drivers/net/wireless/ath9k/Kconfig ***
+#- *** FILE: drivers/net/wireless/ath/ath9k/Kconfig ***
 #-
 ATH9K all=m
 ATH9K_DEBUG all=n
@@ -2762,7 +2753,6 @@ LIBIPW_DEBUG all=n
 #-
 IWLWIFI all=m
 IWLWIFI_LEDS all=y
-IWLWIFI_RFKILL all=y
 IWLWIFI_SPECTRUM_MEASUREMENT all=y
 IWLWIFI_DEBUG all=y
 IWLAGN all=m
@@ -2875,6 +2865,7 @@ PCIEASPM all=n
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
 #-
 PCIEAER all=y
+#- file drivers/pci/pcie/aer/Kconfig.debug goes here
 
 #-
 #- *** FILE: drivers/pcmcia/Kconfig ***
@@ -2919,7 +2910,6 @@ THINKPAD_ACPI i386=m x86_64=m
 THINKPAD_ACPI_DEBUGFACILITIES all=n
 THINKPAD_ACPI_DEBUG i386=n x86_64=n
 THINKPAD_ACPI_UNSAFE_LEDS all=n
-THINKPAD_ACPI_BAY i386=y x86_64=y
 THINKPAD_ACPI_VIDEO all=y
 THINKPAD_ACPI_HOTKEY_POLL all=y
 INTEL_MENLOW all=m
@@ -3067,7 +3057,6 @@ BLK_DEV_SR_VENDOR all=y
 CHR_DEV_SG all=m
 CHR_DEV_SCH all=m
 SCSI_ENCLOSURE all=m
-#- Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 SCSI_MULTI_LUN all=y
 SCSI_CONSTANTS all=n
 SCSI_LOGGING all=y
@@ -3084,6 +3073,7 @@ SCSI_SRP_TGT_ATTRS all=y
 SCSI_LOWLEVEL all=y
 ISCSI_TCP all=m
 #- file drivers/scsi/cxgb3i/Kconfig goes here
+#- file drivers/scsi/bnx2i/Kconfig goes here
 BLK_DEV_3W_XXXX_RAID all=m
 SCSI_3W_9XXX all=m
 SCSI_7000FASST alpha=m i386=m
@@ -3096,6 +3086,7 @@ SCSI_AACRAID all=m
 SCSI_AIC7XXX_OLD all=m
 #- file drivers/scsi/aic7xxx/Kconfig.aic79xx goes here
 #- file drivers/scsi/aic94xx/Kconfig goes here
+#- file drivers/scsi/mvsas/Kconfig goes here
 SCSI_DPT_I2O all=m
 SCSI_ADVANSYS all=m
 SCSI_IN2000 alpha=m i386=m
@@ -3135,7 +3126,6 @@ SCSI_PPA all=m
 SCSI_IMM all=m
 SCSI_IZIP_EPP16 all=n
 SCSI_IZIP_SLOW_CTR all=n
-SCSI_MVSAS all=m
 SCSI_NCR53C406A alpha=m i386=m
 SCSI_NCR_D700 i386=m
 SCSI_STEX all=m sparc=n
@@ -3246,6 +3236,11 @@ SCSI_MPT2SAS all=m
 SCSI_MPT2SAS_MAX_SGE all=128
 SCSI_MPT2SAS_LOGGING all=y
 
+#-
+#- *** FILE: drivers/scsi/mvsas/Kconfig ***
+#-
+SCSI_MVSAS all=m
+
 #-
 #- *** FILE: drivers/scsi/osd/Kconfig ***
 #-
@@ -3377,6 +3372,7 @@ STAGING_EXCLUDE_BUILD all=n
 #- file drivers/staging/panel/Kconfig goes here
 #- file drivers/staging/altpciechdma/Kconfig goes here
 #- file drivers/staging/rtl8187se/Kconfig goes here
+#- file drivers/staging/rtl8192su/Kconfig goes here
 #- file drivers/staging/rspiusb/Kconfig goes here
 #- file drivers/staging/mimio/Kconfig goes here
 #- file drivers/staging/frontier/Kconfig goes here
@@ -3385,13 +3381,18 @@ STAGING_EXCLUDE_BUILD all=n
 #- file drivers/staging/dst/Kconfig goes here
 #- file drivers/staging/pohmelfs/Kconfig goes here
 #- file drivers/staging/stlc45xx/Kconfig goes here
-#- file drivers/staging/uc2322/Kconfig goes here
 #- file drivers/staging/b3dfg/Kconfig goes here
 #- file drivers/staging/phison/Kconfig goes here
 #- file drivers/staging/p9auth/Kconfig goes here
 #- file drivers/staging/heci/Kconfig goes here
 #- file drivers/staging/line6/Kconfig goes here
-#- file drivers/staging/serqt_usb/Kconfig goes here
+#- file drivers/gpu/drm/radeon/Kconfig goes here
+#- file drivers/staging/octeon/Kconfig goes here
+#- file drivers/staging/serqt_usb2/Kconfig goes here
+#- file drivers/staging/vt6655/Kconfig goes here
+#- file drivers/staging/cpc-usb/Kconfig goes here
+#- file drivers/staging/pata_rdc/Kconfig goes here
+#- file drivers/staging/udlfb/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/agnx/Kconfig ***
@@ -3560,11 +3561,6 @@ RT3070 all=m
 #-
 RTL8187SE all=m
 
-#-
-#- *** FILE: drivers/staging/serqt_usb/Kconfig ***
-#-
-USB_SERIAL_QUATECH_ESU100 all=m
-
 #-
 #- *** FILE: drivers/staging/slicoss/Kconfig ***
 #-
@@ -3580,11 +3576,6 @@ STLC45XX all=m
 #-
 SXG all=m
 
-#-
-#- *** FILE: drivers/staging/uc2322/Kconfig ***
-#-
-USB_SERIAL_ATEN2011 all=m
-
 #-
 #- *** FILE: drivers/staging/usbip/Kconfig ***
 #-
@@ -3734,9 +3725,9 @@ USB_ISP116X_HCD all=m
 USB_ISP1760_HCD all=m
 USB_OHCI_HCD all=m
 USB_OHCI_HCD_PPC_SOC ppc=y
-USB_OHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OHCI_HCD_PPC_OF_BE ppc=y ppc64=y
 USB_OHCI_HCD_PPC_OF_LE ppc=y ppc64=n
+USB_OHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OHCI_HCD_PCI ppc=y ppc64=y
 USB_OHCI_HCD_SSB all=y
 USB_OHCI_BIG_ENDIAN_DESC all=n ppc=y ppc64=y
@@ -4187,7 +4178,6 @@ WDT alpha=m i386=m
 #- PCI-based Watchdog Cards
 PCIPCWATCHDOG all=m
 WDTPCI all=m
-WDT_501_PCI all=y
 #- USB-based Watchdog Cards
 USBPCWATCHDOG all=m
 
@@ -4255,7 +4245,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
-NILFS2_FS all=m
+#- file fs/nilfs2/Kconfig goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -4547,6 +4537,11 @@ NFSD_V3 all=y
 NFSD_V3_ACL all=y
 NFSD_V4 all=y
 
+#-
+#- *** FILE: fs/nilfs2/Kconfig ***
+#-
+NILFS2_FS all=m
+
 #-
 #- *** FILE: fs/nls/Kconfig ***
 #-
@@ -4806,7 +4801,6 @@ SYSCTL_SYSCALL all=y
 KALLSYMS all=y
 KALLSYMS_ALL all=y
 KALLSYMS_EXTRA_PASS all=y
-STRIP_ASM_SYMS all=y
 HOTPLUG all=y
 PRINTK all=y
 BUG all=y
@@ -4819,6 +4813,7 @@ TIMERFD all=y
 EVENTFD all=y
 SHMEM all=y
 VM_EVENT_COUNTERS all=y
+STRIP_ASM_SYMS all=y
 COMPAT_BRK all=n
 SLAB all=n
 SLUB all=y
@@ -4865,9 +4860,6 @@ SUSPEND all=y
 SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATION all=y
 PM_STD_PARTITION all=""
-#- Image Storage (you need at least one allocator)
-#- General Options
-#- No compression support available without Cryptoapi support.
 APM_EMULATION ppc=m
 
 #-
@@ -4880,12 +4872,11 @@ HIGH_RES_TIMERS all=y alpha= ia64=
 #-
 #- *** FILE: kernel/trace/Kconfig ***
 #-
+CONTEXT_SWITCH_TRACER all=n
 FUNCTION_TRACER all=n
 IRQSOFF_TRACER all=n
 SYSPROF_TRACER all=n
 SCHED_TRACER all=n
-CONTEXT_SWITCH_TRACER all=n
-EVENT_TRACER all=n
 FTRACE_SYSCALLS all=n
 BOOT_TRACER all=n
 TRACE_BRANCH_PROFILING all=n
@@ -4988,6 +4979,7 @@ DYNAMIC_DEBUG all=n
 DMA_API_DEBUG all=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
+#- file lib/Kconfig.kmemcheck goes here
 
 #-
 #- *** FILE: lib/Kconfig.kgdb ***
@@ -5008,7 +5000,6 @@ SPLIT_PTLOCK_CPUS all=4
 MIGRATION all=y
 ZONE_DMA_FLAG all=1 sparc64=0
 NR_QUICK sparc64=1
-UNEVICTABLE_LRU all=y
 DEFAULT_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 
 #-
@@ -5066,6 +5057,7 @@ BRIDGE_NETFILTER all=y
 #- file net/econet/Kconfig goes here
 #- file net/wanrouter/Kconfig goes here
 #- file net/phonet/Kconfig goes here
+#- file net/ieee802154/Kconfig goes here
 #- file net/sched/Kconfig goes here
 #- file net/dcb/Kconfig goes here
 NET_PKTGEN all=m
@@ -5335,6 +5327,7 @@ LLC2 all=m
 #- *** FILE: net/mac80211/Kconfig ***
 #-
 MAC80211 all=m sparc=n
+#- CFG80211 needs to be enabled for MAC80211
 MAC80211_RC_MINSTREL all=y
 MAC80211_RC_DEFAULT_MINSTREL all=y
 MAC80211_MESH all=y
@@ -5507,7 +5500,6 @@ WAN_ROUTER all=m
 #-
 #- *** FILE: net/wimax/Kconfig ***
 #-
-#- WiMAX Wireless Broadband support requires CONFIG_INPUT enabled
 WIMAX all=m
 WIMAX_DEBUG_LEVEL all=8
 
@@ -5546,7 +5538,6 @@ SAMPLES all=n
 #-
 #- *** FILE: security/Kconfig ***
 #-
-#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 SECURITY all=y
@@ -5663,6 +5654,7 @@ SND_SUPPORT_OLD_API all=y
 SND_VERBOSE_PROCFS all=y
 SND_VERBOSE_PRINTK all=n
 SND_DEBUG all=n
+#- file sound/core/seq/Kconfig goes here
 
 #-
 #- *** FILE: sound/drivers/Kconfig ***
@@ -5805,6 +5797,7 @@ SND_FM801_TEA575X_BOOL all=y
 SND_FM801_TEA575X all=m
 #- file sound/pci/hda/Kconfig goes here
 SND_HDSP all=m sparc=n
+#- Don't forget to add built-in firmwares for HDSP driver
 SND_HDSPM all=m sparc=n
 SND_HIFIER all=m sparc=n
 SND_ICE1712 all=m
@@ -5877,7 +5870,9 @@ SND_SOC all=m
 #- file sound/soc/omap/Kconfig goes here
 #- file sound/soc/pxa/Kconfig goes here
 #- file sound/soc/s3c24xx/Kconfig goes here
+#- file sound/soc/s6000/Kconfig goes here
 #- file sound/soc/sh/Kconfig goes here
+#- file sound/soc/txx9/Kconfig goes here
 #- file sound/soc/codecs/Kconfig goes here
 
 #-
@@ -5924,3 +5919,21 @@ INITRAMFS_COMPRESSION_NONE all=y
 INITRAMFS_COMPRESSION_GZIP all=n
 INITRAMFS_COMPRESSION_BZIP2 all=n
 INITRAMFS_COMPRESSION_LZMA all=n
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+COMPAT_NET_DEV_OPS all=y
+DVB_SIANO_SMS1XXX all=m
+DVB_SIANO_SMS1XXX_SMS_IDS all=y
+EVENT_TRACER all=n
+GIGASET_UNDOCREQ ppc=n ppc64=n
+IWLWIFI_RFKILL all=y
+LBD all=y
+LEDS_LP5521 all=m
+SENSORS_MAX6875 all=m
+THINKPAD_ACPI_BAY i386=y x86_64=y
+UNEVICTABLE_LRU all=y
+USB_SERIAL_ATEN2011 all=m
+USB_SERIAL_QUATECH_ESU100 all=m
+WDT_501_PCI all=y

diff --git a/kernel-routes.patch b/kernel-routes.patch
index 3033271a900bd1f324887d4893af987d5e6a5052..4004a4845bad20274be778b9bfd07110d2347885 100644 (file)
--- a/kernel-routes.patch
+++ b/kernel-routes.patch
@@ -945,30 +945,29 @@ diff -urp v2.6.28/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfi
        __be32 newsrc;
  
        NF_CT_ASSERT(par->hooknum == NF_INET_POST_ROUTING);
-@@ -72,13 +72,28 @@ masquerade_tg(struct sk_buff *skb, const
+@@ -69,13 +69,27 @@ masquerade_tg(struct sk_buff *skb, const
                return NF_ACCEPT;
  
        mr = par->targinfo;
--      rt = skb->rtable;
+-      rt = skb_rtable(skb);
 -      newsrc = inet_select_addr(par->out, rt->rt_gateway, RT_SCOPE_UNIVERSE);
 -      if (!newsrc) {
 -              printk("MASQUERADE: %s ate my IP address\n", par->out->name);
 -              return NF_DROP;
-+
 +      {
 +              struct flowi fl = { .nl_u = { .ip4_u =
-+                                            { .daddr = ip_hdr(skb)->daddr,
-+                                              .tos = (RT_TOS(ip_hdr(skb)->tos) |
-+                                                      RTO_CONN),
-+                                              .gw = skb->rtable->rt_gateway,
-+                                            } },
-+                                  .mark = skb->mark,
-+                                  .oif = par->out->ifindex };
++                      { .daddr = ip_hdr(skb)->daddr,
++                              .tos = (RT_TOS(ip_hdr(skb)->tos) |
++                                              RTO_CONN),
++                              .gw = skb->rtable->rt_gateway,
++                      } },
++                                       .mark = skb->mark,
++                                       .oif = par->out->ifindex };
 +              if (ip_route_output_key(dev_net(par->out), &rt, &fl) != 0) {
 +                      /* Funky routing can do this. */
 +                      if (net_ratelimit())
 +                              printk("MASQUERADE:"
-+                                     " No route: Rusty's brain broke!\n");
++                                              " No route: Rusty's brain broke!\n");
 +                      return NF_DROP;
 +              }
        }
@@ -976,9 +975,9 @@ diff -urp v2.6.28/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfi
 +      newsrc = rt->rt_src;
 +      ip_rt_put(rt);
 +
-       write_lock_bh(&masq_lock);
        nat->masq_index = par->out->ifindex;
-       write_unlock_bh(&masq_lock);
+ 
+       /* Transfer from original range. */
 diff -urp v2.6.28/linux/net/ipv4/netfilter/nf_nat_core.c linux/net/ipv4/netfilter/nf_nat_core.c
 --- v2.6.28/linux/net/ipv4/netfilter/nf_nat_core.c     2008-12-25 10:12:25.000000000 +0200
 +++ linux/net/ipv4/netfilter/nf_nat_core.c     2009-02-06 09:43:23.000000000 +0200

diff --git a/kernel-unionfs.patch b/kernel-unionfs.patch
index 608f1f4885340107812792f818548e1e55396efc..689219120f16e215318a8da9cde03698e4fbfaaf 100644 (file)
--- a/kernel-unionfs.patch
+++ b/kernel-unionfs.patch
@@ -727,8 +727,8 @@ index 4ed0ba4..6637e35 100644
                } else
                        off = &out->f_pos;
  
--              ret = do_splice_from(pipe, out, off, len, flags);
-+              ret = vfs_splice_from(pipe, out, off, len, flags);
+-              ret = do_splice_from(ipipe, out, off, len, flags);
++              ret = vfs_splice_from(ipipe, out, off, len, flags);
  
                if (off_out && copy_to_user(off_out, off, sizeof(loff_t)))
                        ret = -EFAULT;
@@ -736,8 +736,8 @@ index 4ed0ba4..6637e35 100644
                } else
                        off = &in->f_pos;
  
--              ret = do_splice_to(in, off, pipe, len, flags);
-+              ret = vfs_splice_to(in, off, pipe, len, flags);
+-              ret = do_splice_to(in, off, opipe, len, flags);
++              ret = vfs_splice_to(in, off, opipe, len, flags);
  
                if (off_in && copy_to_user(off_in, off, sizeof(loff_t)))
                        ret = -EFAULT;

diff --git a/kernel.spec b/kernel.spec
index 44ff3baede0210e13f7b034acf1478e3e241c18a..e086b0c96c022b6f1a5b8be8589be06873ee9fcc 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -111,9 +111,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                basever         2.6.30
-%define                postver         .5
-%define                rel             0.4
+%define                basever         2.6.31
+%define                postver         %{nil}
+%define                rel             1
 
 %define                _enable_debug_packages                  0
 
@@ -154,7 +154,7 @@ Epoch:              3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
-# Source0-md5: 7a80058a6382e5108cdb5554d1609615
+# Source0-md5: 84c077a37684e4cbfa67b18154390d8a
 %if "%{postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5: 47841c7ff5c81a7b349a79f2fa8e9138