kernel: bump 5.18 to 5.18.15 (coolsnowwolf#9859)

aakkll · web-flow · commit d8e34160b84a · 2022-07-30T10:17:58.000+08:00
Signed-off-by: aakkll &lt;94471752+aakkll@users.noreply.github.com&gt;
diff --git a/include/kernel-5.18 b/include/kernel-5.18
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.18 = .14
-LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
+LINUX_VERSION-5.18 = .15
+LINUX_KERNEL_HASH-5.18.15 = 69804febdc388a69dfb64493b7b58d402853de3a14144ea8db7fd67c30dcbe3c
diff --git a/target/linux/generic/hack-5.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-5.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  #include <linux/crc32.h>
  #include <linux/if_vlan.h>
  #include <linux/uaccess.h>
-@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
+@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
  	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
  }
  
@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  static void r8152b_init(struct r8152 *tp)
  {
  	u32 ocp_data;
-@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
+@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
  	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
  	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
  	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  }
  
  static void r8153_init(struct r8152 *tp)
-@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
  		tp->coalesce = COALESCE_SLOW;
  		break;
  	}
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  }
  
  static void r8153b_init(struct r8152 *tp)
-@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
+@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
  	rtl_tally_reset(tp);
  
  	tp->coalesce = 15000;	/* 15 us */

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>`
`22`	`22`	`#include <linux/crc32.h>`
`23`	`23`	`#include <linux/if_vlan.h>`
`24`	`24`	`#include <linux/uaccess.h>`
`25`		`-@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152`
	`25`	`+@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152`
`26`	`26`	`ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);`
`27`	`27`	`}`
`28`	`28`
`@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>`
`45`	`45`	`static void r8152b_init(struct r8152 *tp)`
`46`	`46`	`{`
`47`	`47`	`u32 ocp_data;`
`48`		`-@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp`
	`48`	`+@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp`
`49`	`49`	`ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);`
`50`	`50`	`ocp_data &= ~(RX_AGG_DISABLE \| RX_ZERO_EN);`
`51`	`51`	`ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);`
`@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`static void r8153_init(struct r8152 *tp)`
`57`		`-@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)`
	`57`	`+@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)`
`58`	`58`	`tp->coalesce = COALESCE_SLOW;`
`59`	`59`	`break;`
`60`	`60`	`}`
`@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`static void r8153b_init(struct r8152 *tp)`
`66`		`-@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp`
	`66`	`+@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp`
`67`	`67`	`rtl_tally_reset(tp);`
`68`	`68`
`69`	`69`	`tp->coalesce = 15000; /* 15 us */`