diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-17 15:06:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-17 15:06:20 -0500 |
| commit | 7089fdd81493986a39c8fa5563066c8e7e8e7cad (patch) | |
| tree | c96354854768c4ad41d4851a6d1aeedabc0b3725 /drivers/gpu/drm/drm_gem_cma_helper.c | |
| parent | 37ab4fa7844a044dc21fde45e2a0fc2f3c3b6490 (diff) | |
| parent | a3adadf3018102c24754e0b53a5515c40fbaff4a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains two Netfilter fixes for your net
tree, they are:
* Fix endianness in nft_reject, the NFTA_REJECT_TYPE netlink attributes
was not converted to network byte order as needed by all nfnetlink
subsystems, from Eric Leblond.
* Restrict SYNPROXY target to INPUT and FORWARD chains, this avoid a
possible crash due to misconfigurations, from Patrick McHardy.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/drm_gem_cma_helper.c')
0 files changed, 0 insertions, 0 deletions