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

From: Stephen Rothwell
Date: Thu Oct 13 2016 - 22:13:00 EST

Hi Andrew,

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


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.

I fixed it up (I just dropped the akpm tree patch for today) 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.

Stephen Rothwell