linux-sg2042/include/linux/qed
David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Two minor conflicts:

1) net/ipv4/route.c, adding a new local variable while
   moving another local variable and removing it's
   initial assignment.

2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
   One pretty prints the port mode differently, whilst another
   changes the driver to try and obtain the port mode from
   the port node rather than the switch node.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-09-22 16:45:34 -07:00
..
common_hsi.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
eth_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
fcoe_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
iscsi_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
iwarp_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
qed_chain.h qed: introduce qed_chain_get_elem_used{,u32}() 2020-07-22 18:19:03 -07:00
qed_eth_if.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
qed_fcoe_if.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
qed_if.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-22 16:45:34 -07:00
qed_iov_if.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
qed_iscsi_if.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
qed_ll2_if.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
qed_rdma_if.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
qede_rdma.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
rdma_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
roce_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
storage_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00
tcp_common.h net: qed: update copyright years 2020-06-30 15:51:40 -07:00