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

2019-06-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm tree got a conflict in: net/ipv6/route.c between commit: b8e8a86337c2 ("net/ipv6: Fix misuse of proc_dointvec "skip_notify_on_dev_down"") from the net tree and patch: "proc/sysctl: add shared variables for range check" from the akpm tree.

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

2017-02-09 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: drivers/net/usb/sierra_net.c between commit: 5a70348e1187 ("sierra_net: Add support for IPv6 and Dual-Stack Link Sense Indications") from the net tree and patch: "lib/vsprintf.c: remove %Z support" from the akpm

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

2017-02-09 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: drivers/net/usb/sierra_net.c between commit: 5a70348e1187 ("sierra_net: Add support for IPv6 and Dual-Stack Link Sense Indications") from the net tree and patch: "lib/vsprintf.c: remove %Z support" from the akpm

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

2016-10-13 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: include/linux/mlx5/device.h between commit: b8a4ddb2e8f4 ("net/mlx5: Add MLX5_ARRAY_SET64 to fix BUILD_BUG_ON") from the net tree and patch: "include/linux/mlx5/device.h: kill BUILD_BUG_ON()s" from the akpm tree.

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

2016-10-13 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: include/linux/mlx5/device.h between commit: b8a4ddb2e8f4 ("net/mlx5: Add MLX5_ARRAY_SET64 to fix BUILD_BUG_ON") from the net tree and patch: "include/linux/mlx5/device.h: kill BUILD_BUG_ON()s" from the akpm tree.