Re: linux-next: manual merge of the ipvs-next tree with the tree

2015-12-01 Thread Pablo Neira Ayuso
On Tue, Dec 01, 2015 at 07:26:09PM +, Mark Brown wrote: > Hi Simon, > > Today's linux-next merge of the ipvs-next tree got a conflict in > between commit 264640fc2c5f4f ("ipv6: distinguish frag queues by > device for multicast and link-local packets") from the net tree and > commit 029f7f3b870

linux-next: manual merge of the ipvs-next tree with the tree

2015-12-01 Thread Mark Brown
Hi Simon, Today's linux-next merge of the ipvs-next tree got a conflict in between commit 264640fc2c5f4f ("ipv6: distinguish frag queues by device for multicast and link-local packets") from the net tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free clone operations") from