Hi all,

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

  tools/testing/selftests/drivers/net/hw/ncdevmem.c

between commit:

  97c4e094a4b2 ("tests/ncdevmem: Fix double-free of queue array")

from the net tree and commit:

  2f1a805f32ba ("selftests: ncdevmem: Implement devmem TCP TX")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/drivers/net/hw/ncdevmem.c
index 9d48004ff1a1,f801a1b3545f..000000000000
--- a/tools/testing/selftests/drivers/net/hw/ncdevmem.c
+++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c
@@@ -431,23 -507,7 +507,23 @@@ static int parse_address(const char *st
  	return 0;
  }
  
 +static struct netdev_queue_id *create_queues(void)
 +{
 +	struct netdev_queue_id *queues;
 +	size_t i = 0;
 +
 +	queues = calloc(num_queues, sizeof(*queues));
 +	for (i = 0; i < num_queues; i++) {
 +		queues[i]._present.type = 1;
 +		queues[i]._present.id = 1;
 +		queues[i].type = NETDEV_QUEUE_TYPE_RX;
 +		queues[i].id = start_queue + i;
 +	}
 +
 +	return queues;
 +}
 +
- int do_server(struct memory_buffer *mem)
+ static int do_server(struct memory_buffer *mem)
  {
  	char ctrl_data[sizeof(int) * 20000];
  	struct netdev_queue_id *queues;