Pablo Neira Ayuso
5097846230
netfilter: add cttimeout infrastructure for fine timeout tuning ...
This patch adds the infrastructure to add fine timeout tuning
over nfnetlink. Now you can use the NFNL_SUBSYS_CTNETLINK_TIMEOUT
subsystem to create/delete/dump timeout objects that contain some
specific timeout policy for one flow.
The follow up patches will allow you attach timeout policy object
to conntrack via the CT target and the conntrack extension
infrastructure.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2012-03-07 17:41:22 +01:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
bcma: add extra sprom check
2012-02-06 14:53:06 -05:00
can: dev: let can_get_echo_skb() return dlc of CAN frame
2012-02-03 01:21:25 +01:00
mfd: Add power off functionality to TWL
2012-01-09 00:37:40 +01:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
mfd: Store twl6040-codec mclk configuration
2012-02-03 19:03:44 +01:00
net/mlx4: fixing sparse warnings for not declared, functions
2012-03-06 15:19:18 -05:00
mmc: dw_mmc: Fix PIO mode with support of highmem
2012-02-13 20:39:05 -05:00
- Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1
2012-02-04 07:17:47 -08:00
netfilter: add cttimeout infrastructure for fine timeout tuning
2012-03-07 17:41:22 +01:00
netfilter: ebtables: fix alignment problem in ppc
2012-02-21 13:29:06 +01:00
netfilter: remove ipt_SAME.h and ipt_realm.h
2012-03-07 17:40:56 +01:00
netfilter: merge ipt_LOG and ip6_LOG into xt_LOG
2012-03-07 17:40:49 +01:00
Cleanups on various subarchitectures
2012-01-09 14:21:03 -08:00
ssb: SPROM: extract each core power info
2012-01-24 14:06:04 -05:00
Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux
2012-01-14 12:26:41 -08:00
USB: Remove duplicate USB 3.0 hub feature #defines.
2012-02-10 14:24:31 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-01-18 15:51:48 -08:00
ACPI: Export interfaces for ioremapping/iounmapping ACPI registers
2012-01-17 04:35:20 -05:00
ahci: platform support for suspend/resume
2012-01-08 19:14:59 -05:00
audit: comparison on interprocess fields
2012-01-17 16:17:03 -05:00
exec: fix use-after-free bug in setup_new_exec()
2012-02-06 15:15:20 -08:00
block: Stop using macro stubs for the bio data integrity calls
2012-01-13 08:15:33 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-02-18 15:24:05 -08:00
block: strip out locking optimization in put_io_context()
2012-02-07 07:51:30 +01:00
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
cdrom: move shared static to cdrom_device_info
2012-02-08 20:03:14 +01:00
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-01-09 12:59:24 -08:00
Fix autofs compile without CONFIG_COMPAT
2012-02-26 09:44:55 -08:00
kernel.h: add BUILD_BUG() macro
2012-01-10 16:30:42 -08:00
kernel.h: add BUILD_BUG() macro
2012-01-10 16:30:42 -08:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-01-18 15:51:48 -08:00
include/linux/crash_dump.h needs elf.h
2012-01-12 20:13:11 -08:00
vfs: move dentry_cmp from <linux/dcache.h> to fs/dcache.c
2012-03-04 15:51:42 -08:00
dccp: fix bug in sequence number validation during connection setup
2012-03-03 09:02:52 -07:00
kernel-doc: fix new warnings in device.h
2012-01-24 10:47:41 -08:00
digsig: changed type of the timestamp
2012-02-20 19:46:36 +11:00
block: don't call elevator callbacks for plug merges
2012-02-08 09:19:42 +01:00
rename dev_hw_addr_random and remove redundant second
2012-02-13 00:46:41 -05:00
ethtool, mdio, mii: Specify MDIO information fields in struct ethtool_cmd
2012-03-01 16:41:26 -05:00
epoll: limit paths
2012-01-12 20:13:04 -08:00
PM / Hibernate: Fix s2disk regression related to freezing workqueues
2012-01-29 20:35:52 +01:00
vfs: Provide function to get superblock and wait for it to thaw
2012-02-13 20:45:38 -05:00
mm: try to distribute dirty pages fairly across zones
2012-01-10 16:30:43 -08:00
GFS2: dlm based recovery coordination
2012-01-11 09:23:05 +00:00
Input: gpio_keys - fix struct device declared inside parameter list
2012-02-01 09:13:11 -08:00
Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus
2012-01-09 11:24:59 +01:00
thp: add tlb_remove_pmd_tlb_entry
2012-01-12 20:13:08 -08:00
net/hyperv: Fix the page buffer when an RNDIS message goes beyond page boundary
2012-02-02 14:35:12 -05:00
net: Add framework to allow sending packets with customized CRC.
2012-02-24 01:37:35 -08:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
team: send only changed options/ports via netlink
2012-01-24 15:51:00 -05:00
ipv4: Implement IP_UNICAST_IF socket option.
2012-02-08 15:52:45 -05:00
ipv6: Implement IPV6_UNICAST_IF socket option.
2012-02-08 15:52:45 -05:00
inet_diag: Rename inet_diag_req_compat into inet_diag_req
2012-01-11 12:56:06 -08:00
module_param: make bool parameters really bool (core code)
2012-01-13 09:32:18 +10:30
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-01-09 12:59:24 -08:00
block: strip out locking optimization in put_io_context()
2012-02-07 07:51:30 +01:00
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
2012-01-09 13:06:28 +01:00
net: implement IP_RECVTOS for IP_PKTOPTIONS
2012-02-13 00:46:41 -05:00
ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>
2012-03-04 20:41:38 -05:00
jbd: Remove j_barrier mutex
2012-01-09 13:52:09 +01:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
treewide: convert uses of ATTRIB_NORETURN to __noreturn
2012-01-12 20:13:03 -08:00
kdump: define KEXEC_NOTE_BYTES arch specific for s390x
2012-01-23 08:38:48 -08:00
KEYS: Permit key_serial() to be called with a const key pointer
2012-01-19 16:17:35 +11:00
kmsg_dump: don't run on non-error paths by default
2012-03-05 15:49:42 -08:00
Fix compile breakage with kref.h
2012-01-17 15:40:51 -08:00
leds: add driver for TCA6507 LED controller
2012-01-10 16:30:49 -08:00
include/linux/linkage.h: remove unused ATTRIB_NORET macro
2012-01-12 20:13:03 -08:00
include/linux/lp8727.h: Remove executable bit
2012-02-02 15:43:40 -08:00
mdio.h: Include linux/types.h
2012-03-03 15:04:45 -05:00
memcg: fix GPF when cgroup removal races with last exit
2012-03-05 15:49:43 -08:00
mm/mempolicy.c: mpol_equal(): use bool
2012-01-10 16:30:45 -08:00
mm: fix warnings regarding enum migrate_mode
2012-01-23 08:38:47 -08:00
mm: fix warnings regarding enum migrate_mode
2012-01-23 08:38:47 -08:00
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-01-11 19:12:10 -08:00
mm: remove del_page_from_lru, add page_off_lru
2012-01-12 20:13:10 -08:00
mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
2012-01-12 20:13:03 -08:00
mm: enum lru_list lru
2012-01-12 20:13:10 -08:00
Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
2012-01-20 17:38:58 +00:00
module: struct module_ref should contains long fields
2012-01-13 09:32:14 +10:30
module_param: check that bool parameters really are bool.
2012-01-13 09:32:28 +10:30
lib/mpi: replaced MPI_NULL with normal NULL
2012-02-02 00:23:14 +11:00
sock: Introduce the SO_PEEK_OFF sock option
2012-02-21 15:03:48 -05:00
net: Support RX-ALL feature flag.
2012-02-24 01:42:07 -08:00
net: Use bool for return value of dev_valid_name().
2012-03-06 16:12:15 -05:00
netlink: allow to pass data pointer to netlink_dump_start() callback
2012-02-26 14:10:44 -05:00
NFC: Export new attributes sensb_res and sensf_res
2012-01-24 14:21:15 -05:00
NFSv4: Fix an Oops in the NFSv4 getacl code
2012-02-03 18:50:34 -05:00
cfg80211: restructure AP/GO mode API
2012-02-22 14:51:18 -05:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
mm: more intensive memory corruption debugging
2012-01-10 16:30:42 -08:00
memcg: simplify LRU handling by new rule
2012-01-12 20:13:07 -08:00
mm: fewer underscores in ____pagevec_lru_add
2012-01-12 20:13:10 -08:00
tg3: Recode PCI MRRS adjustment as a PCI quirk
2012-03-04 20:54:01 -05:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
percpu: fix __this_cpu_{sub,inc,dec}_return() definition
2012-03-04 09:34:15 -08:00
perf: Fix broken interrupt rate throttling
2012-01-27 12:06:39 +01:00
phylib: introduce mdiobus_alloc_size()
2012-01-12 15:23:04 -08:00
procfs: add hidepid= and gid= mount options
2012-01-10 16:30:54 -08:00
net/sched: sch_plug - Queue traffic until an explicit release command
2012-02-07 12:54:56 -05:00
PM / QoS: CPU C-state breakage with PM Qos change
2012-02-04 22:23:17 +01:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
c/r: prctl: add PR_SET_MM codes to set up mm_struct entries
2012-01-12 20:13:13 -08:00
procfs: make proc_get_link to use dentry instead of inode
2012-01-10 16:30:54 -08:00
lib: proportion: lower PROP_MAX_SHIFT to 32 on 64-bit kernel
2012-02-01 16:53:46 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit
2012-01-17 16:41:31 -08:00
quota: Pass information that quota is stored in system file to userspace
2012-01-12 13:09:09 +01:00
radix_tree: remove radix_tree_indirect_to_ptr()
2012-01-12 20:13:12 -08:00
regset: Return -EFAULT, not -EIO, on host-side memory fault
2012-03-02 11:38:15 -08:00
net: introduce res_counter_charge_nofail() for socket allocations
2012-01-22 15:08:46 -05:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
vfork: kill PF_STARTING
2012-03-05 15:49:42 -08:00
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
dma: sh_dma: not all SH DMAC implementations support MEMCPY
2012-02-01 22:23:53 +05:30
net: sh_eth: change the condition of initialization
2012-02-16 17:08:09 -05:00
sh: pfc: Unlock register support
2012-01-09 09:33:57 +09:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
signal: add block_sigmask() for adding sigmask to current->blocked
2012-01-10 16:30:54 -08:00
epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()
2012-02-24 11:42:50 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-02-26 21:55:51 -05:00
tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
2012-01-09 14:19:33 -08:00
tcp: add LINUX_MIB_TCPRETRANSFAIL counter
2012-01-26 13:51:00 -05:00
PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression
2012-01-19 23:25:33 +01:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
sys_poll: fix incorrect type for 'timeout' parameter
2012-02-21 17:24:20 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-01 17:57:40 -05:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
tty: remove unused tty_driver->termios_locked
2012-01-17 10:30:38 -08:00
kernel-doc: fix new warning in usb.h
2012-01-24 12:25:14 -08:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-01-15 12:49:56 -08:00
virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff
2012-01-12 15:44:44 +10:30
virtio: harsher barriers for rpmsg.
2012-01-12 15:44:42 +10:30
workqueue: make alloc_workqueue() take printf fmt and args for name
2012-01-10 16:30:54 -08:00
Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
2012-01-10 16:59:59 -08:00
