From: Dom Cobley <popcornmix@gmail.com>
Date: Mon, 5 Sep 2022 11:46:18 +0000 (+0100)
Subject: Merge tag 'v5.15.64' into rpi-5.15.y
X-Git-Tag: accepted/tizen/unified/20230118.172025~433
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0dd998469638fbcb10ca379e8894e227d9a5cb22;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v5.15.64' into rpi-5.15.y

This is the 5.15.64 stable release
---

0dd998469638fbcb10ca379e8894e227d9a5cb22
diff --cc drivers/net/usb/smsc95xx.c
index cedd187,7cf9206..7b0d7dc5
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@@ -52,11 -50,7 +50,8 @@@
  #define SUSPEND_SUSPEND3		(0x08)
  #define SUSPEND_ALLMODES		(SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
  					 SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
 +#define MAC_ADDR_LEN                    (6)
  
- #define SMSC95XX_NR_IRQS		(1) /* raise to 12 for GPIOs */
- #define PHY_HWIRQ			(SMSC95XX_NR_IRQS - 1)
- 
  struct smsc95xx_priv {
  	u32 mac_cr;
  	u32 hash_hi;