Jozsef Kadlecsik
5416219e5c
netfilter: ipset: timeout can be modified for already added elements ...
When an element to a set with timeout added, one can change the timeout
by "readding" the element with the "-exist" flag. That means the timeout
value is reset to the specified one (or to the default from the set
specification if the "timeout n" option is not used). Example
ipset add foo 1.2.3.4 timeout 10
ipset add foo 1.2.3.4 timeout 600 -exist
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
2011-06-16 18:40:55 +02:00
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release
2011-05-29 04:38:48 -04:00
asm-generic/unistd.h: support sendmmsg syscall
2011-06-02 14:31:38 -04:00
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-05-24 12:06:40 -07:00
netfilter: ipset: timeout can be modified for already added elements
2011-06-16 18:40:55 +02:00
[media] Add missing include guard to header file
2011-05-25 21:42:30 -03:00
IPVS: remove unused init and cleanup functions.
2011-06-14 09:07:32 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-05-26 12:13:57 -07:00
[SCSI] libsas: Add option for SATA soft reset
2011-05-26 22:49:33 -05:00
Merge branch 'topic/asoc' into for-linus
2011-05-22 10:01:33 +02:00
[SCSI] target: Convert REPORT_LUNs to use int_to_scsilun
2011-05-24 13:02:42 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-06-04 23:16:00 +09:00
Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
2011-05-24 15:49:57 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem
2011-05-26 10:50:56 -07:00
5416219e5c