[packages/kernel] - updated to 3.6.0 - aufs and vserver patches need updating
baggins
baggins at pld-linux.org
Fri Oct 5 20:48:32 CEST 2012
commit 93cc874fcf5060c3fe8555e0be755ea3f7f0e117
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Oct 5 20:48:07 2012 +0200
- updated to 3.6.0
- aufs and vserver patches need updating
kernel-aufs2-unionfs.patch | 10 ++--
kernel-multiarch.config | 92 +++++++++++++++++++++++++++++++++--
kernel-pom-ng-mms-conntrack-nat.patch | 36 ++------------
kernel-pom-ng-rpc.patch | 6 ++-
kernel-pom-ng-rsh.patch | 31 ++----------
kernel-unionfs.patch | 6 +--
kernel-zph.patch | 2 +-
kernel.spec | 8 +--
8 files changed, 111 insertions(+), 80 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a6f33b3..6be43b9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -89,9 +89,9 @@
%define have_pcmcia 0
%endif
-%define rel 1
-%define basever 3.5
-%define postver .5
+%define rel 0.1
+%define basever 3.6
+%define postver .0
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -131,7 +131,7 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5: 24153eaaa81dedc9481ada8cd9c3b83d
+# Source0-md5: 1a1760420eac802c541a20ab51a093d1
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
# Patch0-md5: 546c9b90bbd22ae66aec009616dfeb22
diff --git a/kernel-aufs2-unionfs.patch b/kernel-aufs2-unionfs.patch
index cd00cb3..82f7bf7 100644
--- a/kernel-aufs2-unionfs.patch
+++ b/kernel-aufs2-unionfs.patch
@@ -44,13 +44,13 @@ index eba45ea..21ed6c9 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -82,11 +82,11 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
- extern int kern_path_parent(const char *, struct nameidata *);
+ extern struct dentry *kern_path_create(int, const char *, struct path *, int);
+ extern struct dentry *user_path_create(int, const char __user *, struct path *, int);
+ extern void done_path_create(struct path *, struct dentry *);
++extern struct dentry *lookup_hash(struct nameidata *nd);
+ extern struct dentry *kern_path_locked(const char *, struct path *);
extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
const char *, unsigned int, struct path *);
-+extern struct dentry *lookup_hash(struct nameidata *nd);
-
- extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
- int (*open)(struct inode *, struct file *));
-extern struct dentry *lookup_hash(struct nameidata *nd);
extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 2736d3f..319e939 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -149,12 +149,14 @@ CRYPTO_SALSA20_X86_64 x86_64=m
CRYPTO_SEED all=m
CRYPTO_SERPENT all=m
CRYPTO_SERPENT_SSE2_X86_64 all=m
+CRYPTO_SERPENT_AVX_X86_64 all=m
CRYPTO_TEA all=m
CRYPTO_TWOFISH all=m
CRYPTO_TWOFISH_COMMON all=m
CRYPTO_TWOFISH_586 i386=m
CRYPTO_TWOFISH_X86_64 x86_64=m
CRYPTO_TWOFISH_X86_64_3WAY all=m
+CRYPTO_TWOFISH_AVX_X86_64 all=m
#- Compression
CRYPTO_DEFLATE all=m
CRYPTO_ZLIB all=m
@@ -374,6 +376,7 @@ BCMA_POSSIBLE all=y
BCMA all=m
BCMA_HOST_PCI_POSSIBLE all=y
BCMA_HOST_PCI all=y
+BCMA_DRIVER_GMAC_CMN all=y
BCMA_DEBUG all=n
#-
@@ -466,6 +469,7 @@ BT_HCIUART_H4 all=y
BT_HCIUART_BCSP all=y
BT_HCIUART_ATH3K all=y
BT_HCIUART_LL all=y
+BT_HCIUART_3WIRE all=y
BT_HCIBCM203X all=m
BT_HCIBPA10X all=m
BT_HCIBFUSB all=m
@@ -664,6 +668,7 @@ DMATEST all=n
#- *** FILE: drivers/edac/Kconfig ***
#-
EDAC all=y
+EDAC_LEGACY_SYSFS all=y
#- Reporting subsystems
EDAC_DEBUG all=n
EDAC_DECODE_MCE all=m
@@ -687,6 +692,8 @@ EDAC_I5000 i386=m x86_64=m
EDAC_I5100 i386=m x86_64=m
EDAC_I7300 all=m
EDAC_SBRIDGE all=m
+VFIO all=m
+VFIO_PCI all=m
EDAC_PASEMI ppc64=m
EDAC_CELL ppc64=m
EDAC_AMD8131 powerpc=m
@@ -706,6 +713,14 @@ EISA_NAMES alpha=y i386=y
EXTCON all=m
#- Extcon Device Drivers
EXTCON_GPIO all=m
+EXTCON_ARIZONA all=m
+
+AD7266 all=m
+ADJD_S311 all=m
+SENSORS_LM3533 all=m
+VCNL4000 all=m
+AD9523 all=m
+ADF4350 all=m
#-
#- *** FILE: drivers/firewire/Kconfig ***
@@ -752,6 +767,7 @@ GPIO_XILINX powerpc=y
GPIO_SCH all=m
GPIO_ICH all=m
GPIO_VX855 all=m
+GPIO_ARIZONA all=m
#- I2C GPIO expanders:
GPIO_MAX7300 all=m
GPIO_MAX732X all=m
@@ -767,6 +783,7 @@ GPIO_ADP5588 all=m
#- PCI GPIO expanders:
GPIO_CS5535 all=m
GPIO_BT8XX all=m
+GPIO_AMD8111 all=m
GPIO_LANGWELL all=n
GPIO_PCH all=m
GPIO_ML_IOH all=m
@@ -852,6 +869,7 @@ DRM_UDL all=m
#- *** FILE: drivers/gpu/drm/vmwgfx/Kconfig ***
#-
DRM_VMWGFX all=m
+DRM_VMWGFX_FBCON all=y
#-
#- *** FILE: drivers/gpu/stub/Kconfig ***
@@ -870,6 +888,7 @@ VGA_SWITCHEROO all=y
#-
HID all=m
HIDRAW all=y
+UHID all=m
HID_GENERIC all=m
HID_A4TECH all=m
HID_ACRUX all=m
@@ -896,6 +915,7 @@ HID_GYRATION all=m
HID_TWINHAN all=m
HID_KENSINGTON all=m
HID_LCPOWER all=m
+HID_LENOVO_TPKBD all=m
HID_LOGITECH all=m
HID_LOGITECH_DJ all=m
LOGITECH_FF all=y
@@ -999,6 +1019,7 @@ SENSORS_ASB100 all=m
SENSORS_ATXP1 all=m
SENSORS_DS620 all=m
SENSORS_DS1621 all=m
+SENSORS_DA9052_ADC all=m
SENSORS_I5K_AMB all=m
SENSORS_F71805F all=m
SENSORS_F71882FG all=m
@@ -1008,6 +1029,7 @@ SENSORS_G760A all=m
SENSORS_GL518SM all=m
SENSORS_GL520SM all=m
SENSORS_GPIO_FAN all=m
+SENSORS_HIH6130 all=m
SENSORS_CORETEMP all=m
SENSORS_IBMAEM all=m
SENSORS_IBMPEX all=m
@@ -1275,6 +1297,7 @@ I7300_IDLE x86_64=m
IEEE802154_DRIVERS all=m
IEEE802154_FAKEHARD all=m
IEEE802154_FAKELB all=m
+IEEE802154_AT86RF230 all=m
#-
#- *** FILE: drivers/iio/Kconfig ***
@@ -1611,12 +1634,14 @@ TOUCHSCREEN_WACOM_W8001 all=m
TOUCHSCREEN_WACOM_I2C all=m
TOUCHSCREEN_MAX11801 all=m
TOUCHSCREEN_MCS5000 all=m
+TOUCHSCREEN_MMS114 all=m
TOUCHSCREEN_MTOUCH all=m
TOUCHSCREEN_INEXIO all=m
TOUCHSCREEN_INTEL_MID all=m
TOUCHSCREEN_MK712 all=m sparc=n
TOUCHSCREEN_HTCPEN all=m
TOUCHSCREEN_PENMOUNT all=m
+TOUCHSCREEN_EDT_FT5X06 all=m
TOUCHSCREEN_TOUCHRIGHT all=m
TOUCHSCREEN_TOUCHWIN all=m
TOUCHSCREEN_UCB1400 all=m sparc=n
@@ -1828,10 +1853,13 @@ LEDS_LT3593 all=m
LEDS_DELL_NETBOOKS all=m
LEDS_MC13783 all=m
LEDS_TCA6507 all=m
+LEDS_LM3556 all=m
+LEDS_BLINKM all=m
LEDS_OT200 all=m
LEDS_TRIGGERS all=y
#- LED Triggers
LEDS_TRIGGER_TIMER all=m
+LEDS_TRIGGER_ONESHOT all=m
LEDS_TRIGGER_IDE_DISK all=y
LEDS_TRIGGER_HEARTBEAT all=m
LEDS_TRIGGER_BACKLIGHT all=m
@@ -1909,6 +1937,11 @@ DM_VERITY all=m
#- *** FILE: drivers/media/Kconfig ***
#-
MEDIA_SUPPORT all=m
+MEDIA_CAMERA_SUPPORT all=y
+MEDIA_ANALOG_TV_SUPPORT all=y
+MEDIA_DIGITAL_TV_SUPPORT all=y
+MEDIA_RADIO_SUPPORT all=y
+MEDIA_RC_SUPPORT all=y
#- Multimedia core support
MEDIA_CONTROLLER all=y
VIDEO_DEV all=m
@@ -2162,6 +2195,8 @@ RADIO_SI470X all=y
USB_MR800 all=m
USB_DSBR all=m
RADIO_MAXIRADIO all=m
+RADIO_SHARK all=m
+RADIO_SHARK2 all=m
I2C_SI4713 all=m
RADIO_SI4713 all=m
USB_KEENE all=m
@@ -2208,6 +2243,7 @@ IR_SONY_DECODER all=m
IR_RC5_SZ_DECODER all=m
IR_SANYO_DECODER all=m
IR_MCE_KBD_DECODER all=m
+RC_DEVICES all=y
IR_LIRC_CODEC all=m
RC_ATI_REMOTE all=m
IR_ENE all=m
@@ -2219,6 +2255,7 @@ IR_NUVOTON all=m
IR_REDRAT3 all=m
IR_STREAMZAP all=m
IR_WINBOND_CIR all=m
+IR_IGUANA all=m
RC_LOOPBACK all=m
IR_GPIO_CIR all=m
@@ -2226,6 +2263,8 @@ IR_GPIO_CIR all=m
#- *** FILE: drivers/media/rc/keymaps/Kconfig ***
#-
RC_MAP all=m
+RC_DECODERS all=y
+LIRC all=m
#-
#- *** FILE: drivers/media/video/Kconfig ***
@@ -2640,6 +2679,11 @@ MFD_STMPE all=y
STMPE_SPI all=y
PMIC_DA903X powerpc=y
MFD_DA9052_SPI all=y
+MFD_ARIZONA_I2C all=m
+MFD_ARIZONA_SPI all=m
+MFD_WM5102 all=y
+WM5102 all=y
+MFD_WM5110 all=y
MFD_WM8400 all=m
MFD_WM831X all=y
MFD_WM831X_SPI all=y
@@ -3087,6 +3131,7 @@ CAN_DEBUG_DEVICES all=n
#-
CAN_C_CAN all=m
CAN_C_CAN_PLATFORM all=m
+CAN_C_CAN_PCI all=m
#-
#- *** FILE: drivers/net/can/cc770/Kconfig ***
@@ -3752,6 +3797,7 @@ CICADA_PHY all=m
VITESSE_PHY all=m
SMSC_PHY all=m
BROADCOM_PHY all=m
+BCM87XX_PHY all=m
BCM63XX_PHY all=m
ICPLUS_PHY all=m
REALTEK_PHY all=m
@@ -3798,6 +3844,7 @@ SLIP_MODE_SLIP6 all=y
#- *** FILE: drivers/net/team/Kconfig ***
#-
NET_TEAM all=m
+NET_TEAM_MODE_BROADCAST all=m
NET_TEAM_MODE_ROUNDROBIN all=m
NET_TEAM_MODE_ACTIVEBACKUP all=m
NET_TEAM_MODE_LOADBALANCE all=m
@@ -3976,6 +4023,7 @@ CARL9170_HWRNG all=y
#-
B43 all=m
B43_BCMA all=y
+B43_BCMA_EXTRA all=y
B43_PCMCIA all=y
B43_SDIO all=y
B43_PHY_N all=y
@@ -4102,6 +4150,7 @@ RT2800PCI all=m
RT2800PCI_RT33XX all=y
RT2800PCI_RT35XX all=y
RT2800PCI_RT53XX all=y
+RT2800PCI_RT3290 all=y
RT2500USB all=m
RT73USB all=m
RT2800USB all=m
@@ -4146,6 +4195,7 @@ WL1251_SDIO all=m
#- *** FILE: drivers/net/wireless/ti/wl12xx/Kconfig ***
#-
WL12XX all=m
+WL18XX all=m
#-
#- *** FILE: drivers/net/wireless/ti/wlcore/Kconfig ***
@@ -4444,6 +4494,7 @@ REGULATOR_VIRTUAL_CONSUMER all=m
REGULATOR_USERSPACE_CONSUMER all=m
REGULATOR_GPIO all=m
REGULATOR_AD5398 all=m
+REGULATOR_ARIZONA all=m
REGULATOR_DA903X all=m
REGULATOR_DA9052 all=m
REGULATOR_MC13783 all=m
@@ -4848,6 +4899,7 @@ SPI_MPC52xx_PSC ppc=m
SPI_OC_TINY all=m
SPI_PXA2XX all=m
SPI_TOPCLIFF_PCH all=m
+SPI_XCOMM all=m
SPI_XILINX all=m
SPI_DESIGNWARE all=y
SPI_DW_PCI all=m
@@ -4943,16 +4995,17 @@ BCM_WIMAX all=m
#- *** FILE: drivers/staging/comedi/Kconfig ***
#-
COMEDI all=m ppc=n
+COMEDI_MISC_DRIVERS all=y
COMEDI_DEBUG all=n
COMEDI_DEFAULT_BUF_SIZE_KB all=2048
COMEDI_DEFAULT_BUF_MAXSIZE_KB all=20480
-COMEDI_MISC_DRIVERS all=m
COMEDI_KCOMEDILIB all=m
COMEDI_BOND all=m
COMEDI_TEST all=m
COMEDI_PARPORT all=m
COMEDI_SERIAL2002 all=m
COMEDI_SKEL all=m
+COMEDI_PCI_DRIVERS all=y
COMEDI_ISA_DRIVERS all=m
COMEDI_ACL7225B i386=m
COMEDI_PCL711 i386=m
@@ -4995,7 +5048,6 @@ COMEDI_PCMMIO i386=m
COMEDI_PCMUIO i386=m
COMEDI_MULTIQ3 i386=m
COMEDI_POC i386=m
-COMEDI_PCI_DRIVERS all=m
COMEDI_ADDI_APCI_035 all=m
COMEDI_ADDI_APCI_1032 all=m
COMEDI_ADDI_APCI_1500 all=m
@@ -5052,7 +5104,7 @@ COMEDI_RTD520 all=m
COMEDI_S526 all=m
COMEDI_S626 all=m
COMEDI_SSV_DNP all=m
-COMEDI_PCMCIA_DRIVERS all=m
+COMEDI_PCMCIA_DRIVERS all=y
COMEDI_CB_DAS16_CS all=m
COMEDI_DAS08_CS all=m
COMEDI_NI_DAQ_700_CS all=m
@@ -5060,7 +5112,7 @@ COMEDI_NI_DAQ_DIO24_CS all=m
COMEDI_NI_LABPC_CS all=m
COMEDI_NI_MIO_CS all=m
COMEDI_QUATECH_DAQP_CS all=m
-COMEDI_USB_DRIVERS all=m
+COMEDI_USB_DRIVERS all=y
COMEDI_DT9812 all=m
COMEDI_USBDUX all=m
COMEDI_USBDUXFAST all=m
@@ -5122,6 +5174,7 @@ WIMAX_GDM72XX_WIMAX2 all=y
WIMAX_GDM72XX_USB all=y
WIMAX_GDM72XX_SDIO all=n
WIMAX_GDM72XX_USB_PM all=y
+CSR_WIFI all=m
#-
#- *** FILE: drivers/staging/iio/Kconfig ***
@@ -5145,6 +5198,7 @@ IIO_SW_RING all=m
IIO_SIMPLE_DUMMY all=m
IIO_SIMPLE_DUMMY_EVENTS all=y
IIO_SIMPLE_DUMMY_BUFFER all=y
+ZSMALLOC all=m
#-
#- *** FILE: drivers/staging/iio/accel/Kconfig ***
@@ -5210,6 +5264,9 @@ AD5764 all=m
AD5791 all=m
AD5686 all=m
MAX517 all=m
+MCP4725 all=m
+
+PWM all=y
#-
#- *** FILE: drivers/staging/iio/frequency/Kconfig ***
@@ -5892,6 +5949,7 @@ USB_R8A66597_HCD all=m
USB_RENESAS_USBHS_HCD all=m
USB_WHCI_HCD all=m
USB_HWA_HCD all=m
+USB_HCD_BCMA all=m
#-
#- *** FILE: drivers/usb/image/Kconfig ***
@@ -6076,6 +6134,7 @@ UWB_I1480U all=m
#- *** FILE: drivers/vhost/Kconfig ***
#-
VHOST_NET all=m
+TCM_VHOST all=m
#-
#- *** FILE: drivers/video/Kconfig ***
@@ -6237,6 +6296,7 @@ BACKLIGHT_GENERIC all=m
BACKLIGHT_LM3533 all=m
BACKLIGHT_PROGEAR i386=m x86_64=m
BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
+BACKLIGHT_PWM all=m
BACKLIGHT_DA903X all=m
BACKLIGHT_DA9052 all=m
BACKLIGHT_APPLE all=m
@@ -6360,8 +6420,11 @@ W1_SLAVE_DS2433_CRC all=y sparc=n
W1_SLAVE_DS2760 all=m
W1_SLAVE_DS2780 all=m
W1_SLAVE_DS2781 all=m
+W1_SLAVE_DS28E04 all=m
W1_SLAVE_BQ27000 all=m
+POWER_AVS all=y
+
#-
#- *** FILE: drivers/watchdog/Kconfig ***
#-
@@ -6444,6 +6507,7 @@ XEN_GNTDEV all=m
XEN_GRANT_DEV_ALLOC all=m
XEN_PCIDEV_BACKEND all=m
XEN_ACPI_PROCESSOR all=m
+XEN_MCE_LOG all=y
#-
#- *** FILE: fs/9p/Kconfig ***
@@ -6811,6 +6875,7 @@ NFS_V2 all=y
NFS_V3 all=y
NFS_V3_ACL all=y
NFS_V4 all=y
+NFS_SWAP all=y
NFS_V4_1 all=n
NFS_FSCACHE all=y
NFS_USE_LEGACY_DNS all=n
@@ -6934,6 +6999,7 @@ PROC_SYSCTL all=y
#- *** FILE: fs/pstore/Kconfig ***
#-
PSTORE all=y
+PSTORE_CONSOLE all=y
PSTORE_RAM all=m
#-
@@ -7075,6 +7141,11 @@ CPUSETS all=y
PROC_PID_CPUSET all=n
CGROUP_CPUACCT all=y
RESOURCE_COUNTERS all=y
+MEMCG all=y
+MEMCG_SWAP all=y
+MEMCG_SWAP_ENABLED all=y
+MEMCG_KMEM all=y
+CGROUP_HUGETLB all=y
CGROUP_MEM_RES_CTLR all=y
CGROUP_MEM_RES_CTLR_SWAP all=y
CGROUP_MEM_RES_CTLR_SWAP_ENABLED all=n
@@ -7328,10 +7399,14 @@ DEBUG_BLOCK_EXT_DEVT all=n
DEBUG_FORCE_WEAK_PER_CPU all=n
DEBUG_PER_CPU_MAPS all=n
LKDTM all=m
+NOTIFIER_ERROR_INJECTION all=m
CPU_NOTIFIER_ERROR_INJECT all=m
+PM_NOTIFIER_ERROR_INJECT all=m
+MEMORY_NOTIFIER_ERROR_INJECT all=m
FAULT_INJECTION all=n
LATENCYTOP all=n
#- file mm/Kconfig.debug goes here
+DEBUG_TLBFLUSH all=n
#- file kernel/trace/Kconfig goes here
PROVIDE_OHCI1394_DMA_INIT all=n
FIREWIRE_OHCI_REMOTE_DMA all=n
@@ -7610,6 +7685,7 @@ CEPH_LIB_USE_DNS_RESOLVER all=y
#- *** FILE: net/dcb/Kconfig ***
#-
DCB all=y
+DNS_RESOLVER all=m
#-
#- *** FILE: net/dccp/Kconfig ***
@@ -7674,6 +7750,7 @@ IP_PIMSM_V1 all=y
IP_PIMSM_V2 all=y
ARPD all=n
SYN_COOKIES all=y
+NET_IPVTI all=m
INET_AH all=m
INET_ESP all=m
INET_IPCOMP all=m
@@ -7856,6 +7933,7 @@ MAC80211_RC_DEFAULT_MINSTREL all=y
MAC80211_MESH all=y
MAC80211_LEDS all=y
MAC80211_DEBUGFS all=n
+MAC80211_MESSAGE_TRACING all=n
MAC80211_DEBUG_MENU all=n
#-
@@ -7893,6 +7971,8 @@ NF_CONNTRACK_SIP all=m
NF_CONNTRACK_TFTP all=m
NF_CT_NETLINK all=m
NF_CT_NETLINK_TIMEOUT all=m
+NF_CT_NETLINK_HELPER all=m
+NETFILTER_NETLINK_QUEUE_CT all=y
NETFILTER_TPROXY all=m
NETFILTER_XTABLES all=m
#- Xtables combined modules
@@ -8127,6 +8207,8 @@ NET_EMATCH_NBYTE all=m
NET_EMATCH_U32 all=m
NET_EMATCH_META all=m
NET_EMATCH_TEXT all=m
+NET_EMATCH_CANID all=m
+NET_EMATCH_IPSET all=m
NET_CLS_ACT all=y
NET_ACT_POLICE all=m
NET_ACT_GACT all=m
@@ -8564,7 +8646,7 @@ SND_HDA_PREALLOC_SIZE all=2048
SND_HDA_HWDEP all=y
SND_HDA_RECONFIG all=y
SND_HDA_INPUT_BEEP all=y
-SND_HDA_INPUT_BEEP_MODE all=2
+SND_HDA_INPUT_BEEP_MODE all=1
SND_HDA_INPUT_JACK all=y
SND_HDA_PATCH_LOADER all=y
SND_HDA_CODEC_REALTEK all=y
diff --git a/kernel-pom-ng-mms-conntrack-nat.patch b/kernel-pom-ng-mms-conntrack-nat.patch
index 3729bf5..f147242 100644
--- a/kernel-pom-ng-mms-conntrack-nat.patch
+++ b/kernel-pom-ng-mms-conntrack-nat.patch
@@ -1,7 +1,7 @@
diff -NurpP --minimal linux-2.6.21.a/include/linux/netfilter/nf_conntrack_mms.h linux-2.6.21.b/include/linux/netfilter/nf_conntrack_mms.h
--- linux-2.6.21.a/include/linux/netfilter/nf_conntrack_mms.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.b/include/linux/netfilter/nf_conntrack_mms.h 2007-05-30 11:50:55.000000000 +0200
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,30 @@
+#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H
+/* MMS tracking. */
@@ -25,10 +25,6 @@ diff -NurpP --minimal linux-2.6.21.a/include/linux/netfilter/nf_conntrack_mms.h
+ u_int16_t port;
+};
+
-+/* This structure exists only once per master */
-+struct nf_ct_mms_master {
-+};
-+
+struct nf_conntrack_expect;
+extern unsigned int (*nf_nat_mms_hook)(struct sk_buff **pskb,
+ enum ip_conntrack_info ctinfo,
@@ -36,31 +32,10 @@ diff -NurpP --minimal linux-2.6.21.a/include/linux/netfilter/nf_conntrack_mms.h
+ struct nf_conntrack_expect *exp);
+#endif
+#endif /* _IP_CONNTRACK_MMS_H */
-diff -NurpP --minimal linux-2.6.21.a/include/net/netfilter/nf_conntrack.h linux-2.6.21.b/include/net/netfilter/nf_conntrack.h
---- linux-2.6.21.a/include/net/netfilter/nf_conntrack.h 2007-05-30 11:14:07.000000000 +0200
-+++ linux-2.6.21.b/include/net/netfilter/nf_conntrack.h 2007-05-30 11:50:55.000000000 +0200
-@@ -46,6 +46,7 @@ union nf_conntrack_expect_proto {
- #include <linux/netfilter/nf_conntrack_h323.h>
- #include <linux/netfilter/nf_conntrack_sane.h>
- #include <linux/netfilter/nf_conntrack_sip.h>
-+#include <linux/netfilter/nf_conntrack_mms.h>
-
- /* per conntrack: application helper private data */
- union nf_conntrack_help {
-@@ -69,6 +69,9 @@
- #if defined(CONFIG_NF_CONNTRACK_SIP) || defined(CONFIG_NF_CONNTRACK_SIP_MODULE)
- struct nf_ct_sip_master ct_sip_info;
- #endif
-+#if defined(CONFIG_NF_NAT_MMS) || defined(CONFIG_NF_NAT_MMS_MODULE)
-+ struct nf_ct_mms_master ct_mms_info;
-+#endif
- };
-
- #include <linux/types.h>
diff -NurpP --minimal linux-2.6.21.a/include/net/netfilter/nf_conntrack_mms.h linux-2.6.21.b/include/net/netfilter/nf_conntrack_mms.h
--- linux-2.6.21.a/include/net/netfilter/nf_conntrack_mms.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.b/include/net/netfilter/nf_conntrack_mms.h 2007-05-30 11:50:55.000000000 +0200
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,30 @@
+#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H
+/* MMS tracking. */
@@ -84,10 +59,6 @@ diff -NurpP --minimal linux-2.6.21.a/include/net/netfilter/nf_conntrack_mms.h li
+ u_int16_t port;
+};
+
-+/* This structure exists only once per master */
-+struct nf_ct_mms_master {
-+};
-+
+struct nf_conntrack_expect;
+extern unsigned int (*nf_nat_mms_hook)(struct sk_buff **pskb,
+ enum ip_conntrack_info ctinfo,
@@ -381,7 +352,7 @@ diff -NurpP --minimal linux-2.6.21.a/net/netfilter/Makefile linux-2.6.21.b/net/n
diff -NurpP --minimal linux-2.6.21.a/net/netfilter/nf_conntrack_mms.c linux-2.6.21.b/net/netfilter/nf_conntrack_mms.c
--- linux-2.6.21.a/net/netfilter/nf_conntrack_mms.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.b/net/netfilter/nf_conntrack_mms.c 2007-05-30 11:50:55.000000000 +0200
-@@ -0,0 +1,375 @@
+@@ -0,0 +1,376 @@
+/* MMS extension for IP connection tracking
+ * (C) 2002 by Filip Sneppe <filip.sneppe at cronos.be>
+ * based on ip_conntrack_ftp.c and ip_conntrack_irc.c
@@ -732,6 +703,7 @@ diff -NurpP --minimal linux-2.6.21.a/net/netfilter/nf_conntrack_mms.c linux-2.6.
+ mms[i].tuple.src.u.tcp.port = htons(ports[i]);
+ mms[i].tuple.dst.protonum = IPPROTO_TCP;
+ mms[i].me = THIS_MODULE;
++ mms[i].data_len = 0;
+ mms[i].expect_policy = &mms_exp_policy;
+ mms[i].help = help;
+
diff --git a/kernel-pom-ng-rpc.patch b/kernel-pom-ng-rpc.patch
index 3a5bc2b..59baa33 100644
--- a/kernel-pom-ng-rpc.patch
+++ b/kernel-pom-ng-rpc.patch
@@ -169,7 +169,7 @@ diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/Kconfig linux/net/ipv4/net
diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c
--- linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c 1970-01-01 01:00:00.000000000 +0100
+++ linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c 2007-08-15 03:04:53.000000000 +0200
-@@ -0,0 +1,557 @@
+@@ -0,0 +1,558 @@
+/* RPC extension for IP (TCP) connection tracking, Version 2.2
+ * (C) 2000 by Marcelo Barbosa Lima <marcelo.lima at dcc.unicamp.br>
+ * - original rpc tracking module
@@ -670,6 +670,7 @@ diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c lin
+ rpc_helpers[port].name = tmpname;
+
+ rpc_helpers[port].me = THIS_MODULE;
++ rpc_helpers[port].data_len = 0;
+ rpc_helpers[port].expect_policy = &rpc_exp_policy;
+
+ rpc_helpers[port].tuple.dst.protonum = IPPROTO_TCP;
@@ -730,7 +731,7 @@ diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ip_conntrack_rpc_tcp.c lin
diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c
--- linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c 1970-01-01 01:00:00.000000000 +0100
+++ linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c 2007-08-15 01:44:02.000000000 +0200
-@@ -0,0 +1,530 @@
+@@ -0,0 +1,531 @@
+/* RPC extension for IP (UDP) connection tracking, Version 2.2
+ * (C) 2000 by Marcelo Barbosa Lima <marcelo.lima at dcc.unicamp.br>
+ * - original rpc tracking module
@@ -1207,6 +1208,7 @@ diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ip_conntrack_rpc_udp.c lin
+ rpc_helpers[port].name = tmpname;
+
+ rpc_helpers[port].me = THIS_MODULE;
++ rpc_helpers[port].data_len = 0;
+ rpc_helpers[port].expect_policy = &rpc_exp_policy;
+
+ rpc_helpers[port].tuple.dst.protonum = IPPROTO_UDP;
diff --git a/kernel-pom-ng-rsh.patch b/kernel-pom-ng-rsh.patch
index 3478395..3dc2304 100644
--- a/kernel-pom-ng-rsh.patch
+++ b/kernel-pom-ng-rsh.patch
@@ -1,29 +1,7 @@
-diff -NurpP --minimal linux/include/net/netfilter/nf_conntrack.h linux/include/net/netfilter/nf_conntrack.h
---- linux/include/net/netfilter/nf_conntrack.h 2007-05-30 11:57:00.000000000 +0200
-+++ linux/include/net/netfilter/nf_conntrack.h 2007-05-30 11:58:41.000000000 +0200
-@@ -29,6 +29,7 @@ union nf_conntrack_expect_proto {
- };
-
- /* Add protocol helper include file here */
-+#include <linux/netfilter/nf_conntrack_rsh.h>
- #include <linux/netfilter/nf_conntrack_ftp.h>
- #include <linux/netfilter/nf_conntrack_pptp.h>
- #include <linux/netfilter/nf_conntrack_h323.h>
-@@ -73,6 +73,10 @@
- #if defined(CONFIG_NF_NAT_MMS) || defined(CONFIG_NF_NAT_MMS_MODULE)
- struct nf_ct_mms_master ct_mms_info;
- #endif
-+#if defined(CONFIG_NF_CONNTRACK_RSH) || defined(CONFIG_NF_CONNTRACK_RSH_MODULE)
-+ struct nf_ct_rsh_master ct_rsh_info;
-+#endif
-+
- };
-
- #include <linux/types.h>
diff -NurpP --minimal linux/include/linux/netfilter/nf_conntrack_rsh.h linux/include/linux/netfilter/nf_conntrack_rsh.h
--- linux/include/linux/netfilter/nf_conntrack_rsh.h 1970-01-01 01:00:00.000000000 +0100
+++ linux/include/linux/netfilter/nf_conntrack_rsh.h 2007-05-30 11:58:41.000000000 +0200
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,24 @@
+/* RSH extension for IP connection tracking, Version 1.0
+ * (C) 2002 by Ian (Larry) Latter <Ian.Latter at mq.edu.au>
+ * based on HW's ip_conntrack_irc.c
@@ -46,10 +24,6 @@ diff -NurpP --minimal linux/include/linux/netfilter/nf_conntrack_rsh.h linux/inc
+ u_int16_t port;
+};
+
-+/* This structure exists only once per master */
-+struct nf_ct_rsh_master {
-+};
-+
+#endif /* _IP_CONNTRACK_RSH_H */
+
diff -NurpP --minimal linux/net/ipv4/netfilter/Kconfig linux/net/ipv4/netfilter/Kconfig
@@ -92,7 +66,7 @@ diff -NurpP --minimal linux/net/netfilter/Makefile linux/net/netfilter/Makefile
diff -NurpP --minimal linux/net/netfilter/nf_conntrack_rsh.c linux/net/netfilter/nf_conntrack_rsh.c
--- linux/net/netfilter/nf_conntrack_rsh.c 1970-01-01 01:00:00.000000000 +0100
+++ linux/net/netfilter/nf_conntrack_rsh.c 2007-05-30 11:58:41.000000000 +0200
-@@ -0,0 +1,361 @@
+@@ -0,0 +1,362 @@
+/* RSH extension for IP connection tracking, Version 1.0
+ * (C) 2002 by Ian (Larry) Latter <Ian.Latter at mq.edu.au>
+ * based on HW's ip_conntrack_irc.c
@@ -412,6 +386,7 @@ diff -NurpP --minimal linux/net/netfilter/nf_conntrack_rsh.c linux/net/netfilter
+ rsh_helpers[port].name = tmpname;
+
+ rsh_helpers[port].me = THIS_MODULE;
++ rsh_helpers[port].data_len = 0;
+ rsh_helpers[port].expect_policy = &rsh_exp_policy;
+
+ rsh_helpers[port].tuple.dst.protonum = IPPROTO_TCP;
diff --git a/kernel-unionfs.patch b/kernel-unionfs.patch
index d82d8e0..fa43309 100644
--- a/kernel-unionfs.patch
+++ b/kernel-unionfs.patch
@@ -11310,9 +11310,9 @@ index ffc0213..99802c3 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -84,8 +84,11 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
-
- extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
- int (*open)(struct inode *, struct file *));
+ extern struct dentry *kern_path_locked(const char *, struct path *);
+ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ const char *, unsigned int, struct path *);
+extern void release_open_intent(struct nameidata *);
extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
diff --git a/kernel-zph.patch b/kernel-zph.patch
index 05c049b..e8c8363 100644
--- a/kernel-zph.patch
+++ b/kernel-zph.patch
@@ -54,9 +54,9 @@ diff -Nur linux-2.6.26.3/net/ipv4/tcp_input.c linux-2.6.26.3-zph/net/ipv4/tcp_in
struct tcp_cookie_values *cvp = tp->cookie_values;
+ struct inet_sock *inet = inet_sk(sk);
+ struct iphdr *iph = ip_hdr(skb);
+ struct tcp_fastopen_cookie foc = { .len = -1 };
int saved_clamp = tp->rx_opt.mss_clamp;
- tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0);
@@ -4973,6 +4983,15 @@
TCP_ECN_rcv_synack(tp, th);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/93cc874fcf5060c3fe8555e0be755ea3f7f0e117
More information about the pld-cvs-commit
mailing list