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

2018-12-10 Thread Nambiar, Amritha
On 12/9/2018 5:36 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_flower.c > > between commit: > > 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under > skip_sw") > > from the net tree and co

Re: [Intel-wired-lan] [PATCH] [v2] i40e: avoid 64-bit division where possible

2017-10-17 Thread Nambiar, Amritha
On 10/17/2017 10:33 AM, Alexander Duyck wrote: > On Tue, Oct 17, 2017 at 8:49 AM, Arnd Bergmann wrote: >> The new bandwidth calculation caused a link error on 32-bit >> architectures, like >> >> ERROR: "__aeabi_uldivmod" [drivers/net/ethernet/intel/i40e/i40e.ko] >> undefined! >> >> The problem is