Patrick McHardy
3b6b9fab42
netfilter: nf_conntrack_sip: pass data offset to NAT functions ...
When using TCP multiple SIP messages might be present in a single packet.
A following patch will parse them by setting the dptr to the beginning of
each message. The NAT helper needs to reload the dptr value after mangling
the packet however, so it needs to know the offset of the message to the
beginning of the packet.
Signed-off-by: Patrick McHardy <kaber@trash.net>
2010-02-11 12:23:53 +01:00
can: Proper ctrlmode handling for CAN devices
2010-01-15 01:39:17 -08:00
lib: add support for LZO-compressed kernels
2010-01-11 09:34:04 -08:00
gpio: adp5588-gpio: new driver for ADP5588 GPIO expanders
2010-01-11 09:34:07 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2009-12-09 19:52:01 -08:00
proc_fops: convert drivers/isdn/ to seq_file
2010-01-14 03:10:54 -08:00
mfd: tmio_mmc hardware abstraction for CNF area
2010-01-18 12:30:27 +01:00
Merge git://git.infradead.org/mtd-2.6
2009-12-16 10:23:43 -08:00
netfilter: nf_conntrack_sip: pass data offset to NAT functions
2010-02-11 12:23:53 +01:00
netfilter: xtables: generate initial table on-demand
2010-02-10 17:50:47 +01:00
netfilter: xtables: add struct xt_mtdtor_param::net
2010-01-18 08:25:47 +01:00
netfilter: xtables: generate initial table on-demand
2010-02-10 17:50:47 +01:00
netfilter: xtables: generate initial table on-demand
2010-02-10 17:50:47 +01:00
nfsd: move most of nfsfh.h to fs/nfsd
2009-12-15 15:01:46 -05:00
md: remove sparse warning:symbol XXX was not declared.
2009-12-14 12:49:47 +11:00
regulator: consumer.h - fix build when consumer.h is #included first.
2009-12-17 10:27:27 +00:00
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2009-12-17 15:59:05 -08:00
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
2009-12-16 10:47:44 -08:00
Fix usb_serial_probe() problem introduced by the recent kfifo changes
2009-12-23 08:53:31 -08:00
x86, ACPI: delete acpi_boot_table_init() return value
2010-01-06 16:18:15 -05:00
aio: remove unused field
2009-12-16 07:20:13 -08:00
libata: Clarify ata_set_lba_range_entries function
2009-12-03 18:01:23 -05:00
atmel-mci: change use of dma slave interface
2009-12-15 08:53:35 -08:00
backlight: Constify struct backlight_ops
2009-12-16 11:33:46 +00:00
mm: introduce coredump parameter structure
2009-12-17 15:45:31 -08:00
block: add helpers to run flush_dcache_page() against a bio and a request's pages
2009-11-26 09:16:19 +01:00
bitmap: introduce bitmap_set, bitmap_clear, bitmap_find_next_zero_area
2009-12-16 07:20:18 -08:00
block: bdev_stack_limits wrapper
2010-01-11 14:29:20 +01:00
tree-wide: fix misspelling of "definition" in comments
2009-12-04 23:41:47 +01:00
blkio: Introduce blkio controller cgroup interface
2009-12-03 19:28:51 +01:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-08 19:28:09 -08:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 15:32:03 -08:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 15:32:03 -08:00
connector: Delete buggy notification code.
2010-02-02 15:58:48 -08:00
powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
2009-12-09 17:09:36 +11:00
sched: Fix balance vs hotplug race
2009-12-06 21:10:56 +01:00
TCPCT part 1b: generate Responder Cookie secret
2009-12-02 22:07:23 -08:00
cs5535: define lxfb/gxfb MSRs in linux/cs5535.h
2009-12-15 08:53:28 -08:00
string: factorize skip_spaces and export it to be generally available
2009-12-15 08:53:32 -08:00
dm: export suspended state to targets
2009-12-10 23:52:27 +00:00
Driver core: driver_attribute parameters can often be const*
2009-12-23 11:23:43 -08:00
dm log: add flush callback fn
2009-12-10 23:52:01 +00:00
dm ioctl: retrieve status from inactive table
2009-12-10 23:52:22 +00:00
dm raid1: remove bio_endio from dm_rh_mark_nosync
2009-12-10 23:52:05 +00:00
dmaengine: clarify the meaning of the DMA_CTRL_ACK flag
2009-12-10 23:43:19 -07:00
Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-08 19:26:55 -08:00
drbd: The kernel code is now equivalent to out of tree release 8.3.7
2010-01-12 10:14:42 +01:00
drbd: Allow online resizing of DRBD devices while peer not reachable (needs to be explicitly forced)
2010-01-12 10:02:46 +01:00
dynamic_debug.h/kernel.h: Remove KBUILD_MODNAME from dynamic_pr_debug
2009-12-15 08:53:25 -08:00
efi.h: use %pUl to print UUIDs
2009-12-15 08:53:33 -08:00
[S390] rename NT_PRXSTATUS to NT_S390_HIGHREGS
2009-12-18 17:43:32 +01:00
[SCSI] enclosure: fix oops while iterating enclosure_status array
2009-12-10 08:54:14 -06:00
err.h: add helper function to simplify pointer error checking
2009-12-15 08:53:27 -08:00
tg3: Add some VPD preprocessor constants
2009-12-03 13:18:04 -08:00
ext2: Explicitly assign values to on-disk enum of filetypes
2009-12-10 15:02:51 +01:00
ext3: Unify log messages in ext3
2009-12-10 15:02:53 +01:00
ext3: Replace lock/unlock_super() with an explicit lock for resizing
2009-12-23 13:44:12 +01:00
ext3: quota macros cleanup [V2]
2009-12-23 13:33:54 +01:00
Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2009-12-10 09:34:40 -08:00
net 03/05: fib_rules: add oif classification
2009-12-03 12:14:36 -08:00
fiemap: Add new extent flag FIEMAP_EXTENT_SHARED
2009-12-17 20:55:57 -08:00
switch alloc_file() to passing struct path
2009-12-16 12:16:42 -05:00
firewire: fix use of multiple AV/C devices, allow multiple FCP listeners
2009-12-29 19:58:16 +01:00
firewire: fix use of multiple AV/C devices, allow multiple FCP listeners
2009-12-29 19:58:16 +01:00
firmware_class: make request_firmware_nowait more useful
2009-12-11 11:24:52 -08:00
Fix ACC_MODE() for real
2010-01-14 09:05:26 -05:00
VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size
2009-12-17 10:58:17 -05:00
tracing: Change event->profile_count to be int type
2009-12-13 18:37:28 +01:00
make generic_acl slightly more generic
2009-12-16 12:16:49 -05:00
genhd: overlapping variable definition
2010-01-11 14:32:44 +01:00
GFS2: Tag all metadata with jid
2009-12-03 11:58:47 +00:00
gigaset: documentation amendments
2009-12-08 20:30:41 -08:00
gpiolib: add support for changing value polarity in sysfs
2009-12-16 07:20:01 -08:00
mm: make totalhigh_pages unsigned long
2010-01-11 09:34:03 -08:00
hrtimers: Convert to raw_spinlocks
2009-12-14 23:55:34 +01:00
hugetlb: derive huge pages nodes allowed from task mempolicy
2009-12-15 08:53:12 -08:00
FRV: Fix no-hardware-breakpoint case
2009-12-14 10:10:55 -08:00
hwrng: core - Replace u32 in driver API with byte array
2009-12-01 14:47:32 +08:00
i2c: Get rid of I2C_CLIENT_MODULE_PARM
2009-12-14 21:17:29 +01:00
Input: i8042 - allow installing platform filters for incoming data
2009-12-11 23:55:42 -08:00
ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives.
2009-12-02 21:58:33 -08:00
mac80211: Account HT Control field in Data frame hdrlen according to 802.11n-2009
2010-01-22 16:11:27 -05:00
include/linux/if_ether.h: Remove unused defines MAC_BUF_SIZE and DECLARE_MAC_BUF
2009-12-08 20:42:28 -08:00
macvlan: export macvlan mode through netlink
2009-11-26 15:53:10 -08:00
net: macvtap driver
2010-02-03 20:20:33 -08:00
packet: Add GSO/csum offload support.
2010-02-04 20:24:10 -08:00
tun: export underlying socket
2010-01-15 01:43:28 -08:00
vlan: support "loose binding" to the underlying network device
2009-11-26 16:00:36 -08:00
igmp: fix ip_mc_sf_allow race [v5]
2010-02-02 07:32:29 -08:00
Untangling ima mess, part 3: kill dead code in ima
2009-12-16 12:16:47 -05:00
tcp: Generalized TTL Security Mechanism
2010-01-11 16:28:01 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-01-10 22:55:03 -08:00
PM: Add initcall_debug style timing for suspend/resume
2009-12-15 20:42:06 +01:00
Revert "task_struct: make journal_info conditional"
2009-12-17 13:23:24 -08:00
Merge commit 'v2.6.32' into next
2009-12-02 23:38:13 -08:00
block: removed unused as_io_context
2010-01-11 14:29:20 +01:00
iommu-helper: use bitmap library
2009-12-16 07:20:18 -08:00
resource: constify arg to resource_size() and resource_type()
2009-12-16 07:20:17 -08:00
ipc: HARD_MSGMAX should be higher not lower on 64bit
2009-12-16 07:20:10 -08:00
genirq: Convert irq_desc.lock to raw_spinlock
2009-12-14 23:55:33 +01:00
tty: isicom: sort out the board init logic
2009-12-11 15:18:07 -08:00
ext4, jbd2: Add barriers for file systems with exernal journals
2009-12-23 06:52:08 -05:00
sched, time: Define nsecs_to_jiffies()
2009-11-26 12:59:20 +01:00
kallsyms: remove deprecated print_fn_descriptor_symbol()
2009-12-15 08:53:26 -08:00
vhost_net: a kernel-level virtio server
2010-01-15 01:43:29 -08:00
mm: export stable page flags
2009-12-16 12:19:59 +01:00
kernel.h: add BUILD_BUG_ON_NOT_POWER_OF_2()
2010-01-16 12:15:39 -08:00
kexec: premit reduction of the reserved memory size
2009-12-16 07:20:13 -08:00
kfifo: document everywhere that size has to be power of two
2010-01-16 12:15:38 -08:00
kgdb: Fix kernel-doc format error in kgdb.h
2010-01-07 11:58:37 -06:00
kmemcheck: make bitfield annotations truly no-ops when disabled
2010-01-11 09:34:04 -08:00
kmsg_dump: fix build for CONFIG_PRINTK=n
2009-12-02 08:44:33 +00:00
fix ksm.h breakage of nommu build
2009-12-16 06:56:12 -08:00
Merge commit 'origin/master' into next
2009-12-09 17:14:38 +11:00
KVM: introduce kvm_vcpu_on_spin
2009-12-03 09:32:17 +02:00
leds: leds-lp3944.h - remove unneeded includes
2009-12-17 11:41:51 +00:00
leds: leds-pca9532.h- indent with tabs, not spaces
2009-12-17 11:33:33 +00:00
leds: Add LED class driver for regulator driven LEDs.
2009-12-17 11:27:09 +00:00
libata: retry link resume if necessary
2010-01-12 14:34:14 -05:00
lis3: selftest support
2009-12-15 08:53:36 -08:00
lib: Introduce generic list_sort function
2010-01-12 21:02:00 -08:00
llc: add support for LLC_OPT_PKTINFO
2009-12-26 20:40:34 -08:00
powerpc: allow ioremap within reserved memory regions
2009-12-12 22:24:32 -07:00
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
2009-12-16 12:36:49 -08:00
mm: Add notifier in pageblock isolation for balloon drivers
2009-12-18 14:53:36 +11:00
mm: memory_hotplug: make offline_pages() static
2009-12-15 08:53:20 -08:00
hugetlb: derive huge pages nodes allowed from task mempolicy
2009-12-15 08:53:12 -08:00
ksm: memory hotremove migration only
2009-12-15 08:53:20 -08:00
vhost_net: a kernel-level virtio server
2010-01-15 01:43:29 -08:00
nommu: fix shared mmap after truncate shrinkage problems
2010-01-16 12:15:40 -08:00
nommu: don't need get_unmapped_area() for NOMMU
2010-01-16 12:15:40 -08:00
drop explicit include of autoconf.h
2009-12-12 13:08:15 +01:00
kbuild: move bounds.h to include/generated
2009-12-12 13:08:14 +01:00
Revert "fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)"
2009-12-17 12:51:05 -08:00
module: make MODULE_SYMBOL_PREFIX into a CONFIG option
2009-12-15 16:28:26 +10:30
Fix f_flags/f_mode in case of lookup_instantiate_filp() from open(pathname, 3)
2009-12-22 12:27:34 -05:00
net: CONFIG_COMPAT redux
2010-02-03 20:32:28 -08:00
net: use helpers to access mc list V2
2010-02-04 10:22:25 -08:00
netfilter: xtables: CONFIG_COMPAT redux
2010-02-02 15:03:24 +01:00
netpoll: allow execution of multiple rx_hooks per interface
2010-01-13 20:38:26 -08:00
nfs41: RECLAIM_COMPLETE XDR functionality
2009-12-05 16:08:40 -05:00
nfs41: nfs41: fix state manager deadlock in session reset
2009-12-04 15:55:38 -05:00
Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
2009-12-16 10:43:34 -08:00
nfsd: Fix independence of a few nfsd related headers
2009-12-14 18:12:08 -05:00
cfg80211: Store IEs from both Beacon and Probe Response frames
2010-01-12 13:51:28 -05:00
hugetlb: offload per node attribute registrations
2009-12-15 08:53:13 -08:00
mm: add gfp flags for NODEMASK_ALLOC slab allocations
2009-12-15 08:53:13 -08:00
net: NETDEV_UNREGISTER_PERNET -> NETDEV_UNREGISTER_BATCH
2009-12-01 16:15:50 -08:00
hugetlb: add generic definition of NUMA_NO_NODE
2009-12-15 08:53:12 -08:00
OMAP: DSS2: omapfb driver
2009-12-09 12:12:44 +02:00
oom-kill: fix NUMA constraint check with nodemask
2009-12-16 07:19:57 -08:00
Merge branch 'for-33' of git://repo.or.cz/linux-kbuild
2009-12-17 07:23:42 -08:00
memcg: cleanup mem_cgroup_move_parent()
2009-12-16 07:20:07 -08:00
PCI/PM: Use per-device D3 delays
2010-01-04 15:41:47 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2009-12-12 14:27:24 -08:00
PCI: portdrv: remove unnecessary struct pcie_port_data
2009-12-04 15:56:19 -08:00
Merge branch 'for-linus' into for-next
2009-12-08 10:02:12 +09:00
perf: Change the is_software_event() definition
2010-01-21 13:40:40 +01:00
libphy: add phy_find_first function
2010-02-04 10:23:02 -08:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
Driver Core: Early platform driver buffer
2009-12-11 11:24:55 -08:00
plist: Make plist debugging raw_spinlock aware
2009-12-14 23:55:33 +01:00
const: constify remaining dev_pm_ops
2009-12-15 08:53:25 -08:00
PM: Add flag for devices capable of generating run-time wake-up events
2009-12-06 16:17:57 +01:00
PNP: add interface to retrieve ACPI device from a PNPACPI device
2009-12-15 17:35:26 -05:00
core, x86: make LIST_POISON less deadly
2010-01-11 09:45:37 -08:00
VFS: Add forget_all_cached_acls()
2009-12-03 11:43:23 +00:00
sched: Revert 498657a478
2009-12-02 09:55:33 +01:00
ptrace: introduce user_single_step_siginfo() helper
2009-12-16 07:20:08 -08:00
backlight: Pass device through notify callback in the pwm driver
2009-12-17 11:46:01 +00:00
quota: decouple fs reserved space from quota reservation
2009-12-23 13:33:54 +01:00
sched: Teach might_sleep() about preemptible RCU
2009-12-17 09:46:44 +01:00
sched: Teach might_sleep() about preemptible RCU
2009-12-17 09:46:44 +01:00
Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
2010-01-02 11:17:05 -08:00
resource: move kernel function inside __KERNEL__
2010-01-04 11:33:58 +01:00
ksm: rmap_walk to remove_migation_ptes
2009-12-15 08:53:20 -08:00
rtmutes: Convert rtmutex.lock to raw_spinlock
2009-12-14 23:55:33 +01:00
net: Add rtnetlink init_rcvwnd to set the TCP initial receive window
2009-12-23 14:13:30 -08:00
locking: Cleanup the name space completely
2009-12-14 23:55:33 +01:00
locking: Cleanup the name space completely
2009-12-14 23:55:33 +01:00
locking: Convert raw_rwlock to arch_rwlock
2009-12-14 23:55:32 +01:00
rwsem: fix rwsem_is_locked() bugs
2009-12-15 08:53:26 -08:00
nommu: don't need get_unmapped_area() for NOMMU
2010-01-16 12:15:40 -08:00
NOMMU: Optimise away the {dac_,}mmap_min_addr tests
2009-12-17 09:25:19 +11:00
ipc/sem.c: add a per-semaphore pending list
2009-12-16 07:20:10 -08:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
Input: serio - fix potential deadlock when unbinding drivers
2010-01-06 00:14:32 -08:00
sh: Break out SuperH PFC code
2009-11-30 12:02:53 +09:00
make generic_acl slightly more generic
2009-12-16 12:16:49 -05:00
skbuff: remove skb_dma_map/unmap
2009-12-02 19:57:15 -08:00
tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING
2009-12-11 09:17:02 +01:00
SLOW_WORK: Move slow_work's proc file to debugfs
2009-12-01 08:20:31 -08:00
tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING
2009-12-11 09:17:02 +01:00
sm501: implement acceleration features
2009-12-16 07:20:04 -08:00
sony-laptop: add AVMode key mapping
2009-12-16 22:32:29 -05:00
locking: Cleanup the name space completely
2009-12-14 23:55:33 +01:00
locking: Cleanup the name space completely
2009-12-14 23:55:33 +01:00
locking: Cleanup the name space completely
2009-12-14 23:55:33 +01:00
locking: Implement new raw_spinlock
2009-12-14 23:55:32 +01:00
locking: Convert raw_rwlock to arch_rwlock
2009-12-14 23:55:32 +01:00
locking: Convert raw_rwlock functions to arch_rwlock
2009-12-14 23:55:32 +01:00
stmmac: add the new Header file for stmmac platform data
2010-01-07 17:06:06 -08:00
lib: Introduce strnstr()
2010-01-14 22:38:09 -05:00
swap: rework map_swap_page() again
2009-12-15 08:53:16 -08:00
tracing/syscalls: Fix typo in SYSCALL_DEFINE0
2009-12-30 10:27:04 -05:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-01-10 22:55:03 -08:00
Driver core: bin_attribute parameters can often be const*
2009-12-23 11:23:43 -08:00
TCPCT part 1d: define TCP cookie option, extend existing struct's
2009-12-02 22:07:25 -08:00
gpio: add GPIO driver for the Timberdale FPGA
2009-12-16 07:20:00 -08:00
Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-08 19:30:19 -08:00
sched: Fix vmark regression on big machines
2010-01-21 13:39:03 +01:00
tracing: Add full state to trace_seq
2009-12-09 14:05:49 -05:00
ptrace: change tracehook_report_syscall_exit() to handle stepping
2009-12-16 07:20:08 -08:00
events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS()
2009-11-26 09:04:55 +01:00
tty.h: make tty_port_get() static inline
2010-01-16 12:15:38 -08:00
maccess,probe_kernel: Allow arch specific override probe_kernel_(read|write)
2010-01-07 11:58:36 -06:00
USB: Fix duplicate sysfs problem after device reset.
2010-01-20 15:24:35 -08:00
USB: usb-storage: add BAD_SENSE flag
2009-12-11 11:55:26 -08:00
usbdevfs: move compat_ioctl handling to devio.c
2009-12-10 22:55:37 +01:00
core: Fix user return notifier on fork()
2009-11-29 22:03:04 +01:00
kbuild: move utsrelease.h to include/generated
2009-12-12 13:08:15 +01:00
vhost_net: a kernel-level virtio server
2010-01-15 01:43:29 -08:00
V4L/DVB (13647): v4l: Add a 10-bit monochrome and missing 8- and 10-bit Bayer fourcc codes
2009-12-16 09:27:16 -02:00
virtio: Add ability to detach unused buffers from vrings
2010-02-02 15:55:42 -08:00
vmscan: stop kswapd waiting on congestion when the min watermark is not being met
2009-12-15 08:53:16 -08:00
vt: don't export vt_kmsg_redirect() to userspace
2009-12-17 15:45:30 -08:00
fs-writeback: Add helper function to start writeback if idle
2009-12-23 07:57:07 -05:00
sanitize xattr handler prototypes
2009-12-16 12:16:49 -05:00
xfrm: Define new XFRM netlink auth attribute with specified truncation bits
2009-11-25 15:48:37 -08:00
