1. 24 Jan, 2018 13 commits
  2. 21 Jan, 2018 25 commits
  3. 20 Jan, 2018 2 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8565d26b
      David S. Miller authored
      The BPF verifier conflict was some minor contextual issue.
      
      The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
      tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
      net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
      ptr_ring.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8565d26b
    • Alexei Starovoitov's avatar
      Merge branch 'bpf-misc-improvements' · 1391040b
      Alexei Starovoitov authored
      Daniel Borkmann says:
      
      ====================
      This series adds various misc improvements to BPF: detection
      of BPF helper definition misconfiguration for mem/size argument
      pairs, csum_diff helper also for XDP, various test cases,
      removal of the recently added pure_initcall(), restriction
      of the jit sysctls to cap_sys_admin for initns, a minor size
      improvement for x86 jit in alu ops, output of complexity limit
      to verifier log and last but not least having the event output
      more flexible with moving to const_size_or_zero type.
      
      Thanks!
      ====================
      Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
      1391040b