diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-23 22:48:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-23 22:48:50 +0200 |
| commit | be65de7174123e02477bd488db1a657caf0f9947 (patch) | |
| tree | ef3101980fef5d2f580026d96c78b40fe007b43b /fs/hugetlbfs/inode.c | |
| parent | Merge branch 'inet_csums_part3' (diff) | |
| parent | net: filter: add test case for jump with holes and ret x variants (diff) | |
| download | linux-be65de7174123e02477bd488db1a657caf0f9947.tar.xz linux-be65de7174123e02477bd488db1a657caf0f9947.zip | |
Merge branch 'filter-next'
Daniel Borkmann says:
====================
BPF updates
These were still in my queue. Please see individual patches for
details.
I have rebased these on top of current net-next with Andrew's
gcc union fixup [1] applied to avoid dealing with an unnecessary
merge conflict.
[1] http://patchwork.ozlabs.org/patch/351577/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/hugetlbfs/inode.c')
0 files changed, 0 insertions, 0 deletions