Re: linux-next: manual merge of the net-next tree with the arm-soc tree