From: David S. Miller <davem@davemloft.net>
Date: Sun, 19 Jan 2020 21:10:04 +0000 (+0100)
Subject: Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.10.7~3383^2~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3f7e3f23a763ccaae7b52d88d2c91e66c80d406;p=platform%2Fkernel%2Flinux-rpi.git

Merge ra./pub/scm/linux/kernel/git/netdev/net
---

b3f7e3f23a763ccaae7b52d88d2c91e66c80d406
diff --cc drivers/net/phy/dp83867.c
index adda0d0,01cf713..967f57e
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@@ -93,12 -93,11 +93,13 @@@
  #define DP83867_STRAP_STS2_CLK_SKEW_NONE	BIT(2)
  
  /* PHY CTRL bits */
 -#define DP83867_PHYCR_FIFO_DEPTH_SHIFT		14
 +#define DP83867_PHYCR_TX_FIFO_DEPTH_SHIFT	14
 +#define DP83867_PHYCR_RX_FIFO_DEPTH_SHIFT	12
  #define DP83867_PHYCR_FIFO_DEPTH_MAX		0x03
 -#define DP83867_PHYCR_FIFO_DEPTH_MASK		GENMASK(15, 14)
 +#define DP83867_PHYCR_TX_FIFO_DEPTH_MASK	GENMASK(15, 14)
 +#define DP83867_PHYCR_RX_FIFO_DEPTH_MASK	GENMASK(13, 12)
  #define DP83867_PHYCR_RESERVED_MASK		BIT(11)
+ #define DP83867_PHYCR_FORCE_LINK_GOOD		BIT(10)
  
  /* RGMIIDCTL bits */
  #define DP83867_RGMII_TX_CLK_DELAY_MAX		0xf
diff --cc net/batman-adv/distributed-arp-table.c
index 906011b,ec7bf5a..3d21dd8
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@@ -287,9 -285,10 +287,10 @@@ static u32 batadv_hash_dat(const void *
  	u32 hash = 0;
  	const struct batadv_dat_entry *dat = data;
  	const unsigned char *key;
+ 	__be16 vid;
  	u32 i;
  
 -	key = (const unsigned char *)&dat->ip;
 +	key = (__force const unsigned char *)&dat->ip;
  	for (i = 0; i < sizeof(dat->ip); i++) {
  		hash += key[i];
  		hash += (hash << 10);