linux-next: manual merge of the net-next tree with the origin tree

linux-next: manual merge of the net-next tree with the origin tree

[broonie]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  tools/testing/selftests/bpf/prog_tests/sockmap_listen.c

between commit:

  989cdc373248a ("bpf: sockmap, pull socket helpers out of listen test for general use")

from the origin tree and commit:

  d61bd8c1fd02c ("selftests/bpf: add a test case for vsock sockmap")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.


diff --cc tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
index f3913ba9e899c,8f09e1ea3ba75..0000000000000
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c

linux-next: manual merge of the net-next tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

   drivers/ptp/ptp_dte.c
   drivers/ptp/ptp_ines.c

between commit:

  e70140ba0d2b1 ("Get rid of 'remove_new' relic from platform driver struct")

from the origin tree and commit:

  b32913a5609a3 ("ptp: Switch back to struct platform_driver::remove()")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

(no diff, used Linus' version)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the net-next tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

between commits:

  69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
  bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")

from the origin tree and commit:

  8a96b9144f18a ("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk()")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff -cc drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
index ac6f0581aa09a,d39f778ecd85b..0000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]