forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kernel: bump 6.1 to 6.1.62 (coolsnowwolf#11656)
Signed-off-by: aakkll <[email protected]>
- Loading branch information
Showing
3 changed files
with
9 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.1 = .61 | ||
LINUX_KERNEL_HASH-6.1.61 = ad2c9d12fc36e2dde4796a3eec8f4ddca2e278098f4e555b6e6f5f03ef6964ce | ||
LINUX_VERSION-6.1 = .62 | ||
LINUX_KERNEL_HASH-6.1.62 = b9fd616facd6becfceef88b9be718d0f16625cab3fe81d11384802a7091e85ec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]> | |
#include <linux/crc32.h> | ||
#include <linux/if_vlan.h> | ||
#include <linux/uaccess.h> | ||
@@ -6896,6 +6897,22 @@ static void rtl_tally_reset(struct r8152 | ||
@@ -6903,6 +6904,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 <[email protected]> | |
static void r8152b_init(struct r8152 *tp) | ||
{ | ||
u32 ocp_data; | ||
@@ -6937,6 +6954,8 @@ static void r8152b_init(struct r8152 *tp | ||
@@ -6944,6 +6961,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 <[email protected]> | |
} | ||
|
||
static void r8153_init(struct r8152 *tp) | ||
@@ -7077,6 +7096,8 @@ static void r8153_init(struct r8152 *tp) | ||
@@ -7084,6 +7103,8 @@ static void r8153_init(struct r8152 *tp) | ||
tp->coalesce = COALESCE_SLOW; | ||
break; | ||
} | ||
|
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]> | |
} | ||
|
||
static void r8153b_init(struct r8152 *tp) | ||
@@ -7159,6 +7180,8 @@ static void r8153b_init(struct r8152 *tp | ||
@@ -7166,6 +7187,8 @@ static void r8153b_init(struct r8152 *tp | ||
rtl_tally_reset(tp); | ||
|
||
tp->coalesce = 15000; /* 15 us */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <[email protected]> | |
/* | ||
* The Mellanox Tavor device gives false positive parity errors. Disable | ||
* parity error reporting. | ||
@@ -3388,6 +3389,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I | ||
@@ -3390,6 +3391,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I | ||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); | ||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); | ||
|
||
|
@@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <[email protected]> | |
/* | ||
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. | ||
* To work around this, query the size it should be configured to by the | ||
@@ -3413,6 +3416,8 @@ static void quirk_intel_ntb(struct pci_d | ||
@@ -3415,6 +3418,8 @@ static void quirk_intel_ntb(struct pci_d | ||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); | ||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); | ||
|
||
|
@@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <[email protected]> | |
/* | ||
* Some BIOS implementations leave the Intel GPU interrupts enabled, even | ||
* though no one is handling them (e.g., if the i915 driver is never | ||
@@ -3451,6 +3456,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN | ||
@@ -3453,6 +3458,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN | ||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); | ||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); | ||
|
||
|