Pablo Neira Ayuso
c1ebd7dff7
netfilter: cttimeout: fix dependency with l4protocol conntrack module ...
This patch introduces nf_conntrack_l4proto_find_get() and
nf_conntrack_l4proto_put() to fix module dependencies between
timeout objects and l4-protocol conntrack modules.
Thus, we make sure that the module cannot be removed if it is
used by any of the cttimeout objects.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2012-03-23 00:52:01 +01:00
Merge 3.3-rc2 into the driver-core-next branch.
2012-02-02 11:24:44 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-05 21:16:26 -05:00
crypto: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:16 +08:00
drm/exynos: exynos_drm.h header file fixes
2012-02-15 10:29:12 +09:00
keys: add a "logon" key type
2012-01-17 22:39:40 -06:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-01-18 12:53:54 -08:00
mtd: document that MEMWRITE ioctl is NAND-specific
2012-01-09 18:18:36 +00:00
netfilter: cttimeout: fix dependency with l4protocol conntrack module
2012-03-23 00:52:01 +01:00
Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next
2012-03-19 09:50:33 -07:00
SCSI & usb-storage: add flags for VPD pages and REPORT LUNS
2012-02-08 17:36:41 -08:00
Merge branch 'fix/asoc' into for-linus
2012-01-31 15:13:14 +01:00
target: Change target_submit_cmd() to return void
2012-02-07 06:41:04 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
fbdev fixes for 3.3
2012-02-07 15:54:02 -08:00
Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block
2012-01-15 12:48:41 -08:00
c1ebd7dff7