1. 11 Jun, 2020 8 commits
  2. 09 Jun, 2020 2 commits
  3. 01 Jun, 2020 1 commit
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 1806c13d
      David S. Miller authored
      xdp_umem.c had overlapping changes between the 64-bit math fix
      for the calculation of npgs and the removal of the zerocopy
      memory type which got rid of the chunk_size_nohdr member.
      
      The mlx5 Kconfig conflict is a case where we just take the
      net-next copy of the Kconfig entry dependency as it takes on
      the ESWITCH dependency by one level of indirection which is
      what the 'net' conflicting change is trying to ensure.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1806c13d
  4. 31 May, 2020 29 commits