Merge tag 'v5.15.64' into rpi-5.15.y
authorDom Cobley <popcornmix@gmail.com>
Mon, 5 Sep 2022 11:46:18 +0000 (12:46 +0100)
committerDom Cobley <popcornmix@gmail.com>
Mon, 5 Sep 2022 11:46:18 +0000 (12:46 +0100)
This is the 5.15.64 stable release

1  2 
drivers/net/usb/smsc95xx.c
kernel/cgroup/cgroup.c

  #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;
Simple merge