From: David S. Miller <davem@davemloft.net>
Date: Fri, 20 Jul 2012 18:07:37 +0000 (-0700)
Subject: Merge branch 'team_multiq'
X-Git-Tag: firefly_0821_release~3680^2~2381^2~48
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=aac3942cedc339b1e7b6bad28f3abe4ceb15bcc3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'team_multiq'

Jiri Pirko says:

====================
This patchset represents the way I walked when I was adding multiqueue
support for team driver.

Jiri Pirko (6):
  net: honour netif_set_real_num_tx_queues() retval
  rtnl: allow to specify different num for rx and tx queue count
  rtnl: allow to specify number of rx and tx queues on device creation
  net: rename bond_queue_mapping to slave_dev_queue_mapping
  bond_sysfs: use ream_num_tx_queues rather than params.tx_queue
  team: add multiqueue support
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

aac3942cedc339b1e7b6bad28f3abe4ceb15bcc3