diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-12 03:27:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-12 04:13:42 +0100 |
| commit | 19d28fbd306e7ae7c1acf05c3e6968b56f0d196b (patch) | |
| tree | 0584a3a4639424733bad7714796f858aa7addee7 /Documentation/networking/index.rst | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (diff) | |
| parent | Merge tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-client (diff) | |
| download | linux-19d28fbd306e7ae7c1acf05c3e6968b56f0d196b.tar.xz linux-19d28fbd306e7ae7c1acf05c3e6968b56f0d196b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
BPF alignment tests got a conflict because the registers
are output as Rn_w instead of just Rn in net-next, and
in net a fixup for a testcase prohibits logical operations
on pointers before using them.
Also, we should attempt to patch BPF call args if JIT always on is
enabled. Instead, if we fail to JIT the subprogs we should pass
an error back up and fail immediately.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking/index.rst')
| -rw-r--r-- | Documentation/networking/index.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst index 66e620866245..7d4b15977d61 100644 --- a/Documentation/networking/index.rst +++ b/Documentation/networking/index.rst @@ -9,6 +9,7 @@ Contents: batman-adv kapi z8530book + msg_zerocopy .. only:: subproject @@ -16,4 +17,3 @@ Contents: ======= * :ref:`genindex` - |