forked from openwrt/openwrt
-
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.
Removed because they are upstream: generic/backport-5.15/777-netfilter-xtables-fix-typo-causing-some-targets-to-not-load-on-IPv6.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=90baa455aa7e099152898cfa5eb3928d6152da12 Link: openwrt#16882 Signed-off-by: Hauke Mehrtens <[email protected]>
- Loading branch information
Showing
12 changed files
with
16 additions
and
59 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-5.15 = .169 | ||
LINUX_KERNEL_HASH-5.15.169 = e618c6d845fd1bc89477508e8d084bbe791fc88bf7623adee2deb6ecb2275370 | ||
LINUX_VERSION-5.15 = .170 | ||
LINUX_KERNEL_HASH-5.15.170 = fd596545a3d6d93196db3fa29e4926e60900b9c05b3b9ccdee9e35d8e376e7a9 |
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 |
---|---|---|
|
@@ -54,7 +54,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
erst_base = xhci_read_64(xhci, &ir->ir_set->erst_base); | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1679,8 +1679,9 @@ struct urb_priv { | ||
@@ -1423,8 +1423,9 @@ struct urb_priv { | ||
* Each segment table entry is 4*32bits long. 1K seems like an ok size: | ||
* (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, | ||
* meaning 64 ring segments. | ||
|
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 |
---|---|---|
|
@@ -54,7 +54,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
addr = xhci_trb_virt_to_dma(new_seg, new_deq); | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1920,6 +1920,7 @@ struct xhci_hcd { | ||
@@ -1664,6 +1664,7 @@ struct xhci_hcd { | ||
#define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ||
#define XHCI_WRITE_64_HI_LO BIT_ULL(47) | ||
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48) | ||
|
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 |
---|---|---|
|
@@ -210,7 +210,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
*/ | ||
while (xhci_handle_event(xhci, ir) > 0) { | ||
- if (event_loop++ < TRBS_PER_SEGMENT / 2) | ||
+ if (event_loop++ < xhci->event_ring->trbs_per_seg / 2) | ||
+ if (event_loop++ < ir->event_ring->trbs_per_seg / 2) | ||
continue; | ||
xhci_update_erst_dequeue(xhci, ir, event_ring_deq); | ||
event_ring_deq = ir->event_ring->dequeue; | ||
|
@@ -248,7 +248,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
* when the cycle bit is set to 1. | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1641,6 +1641,7 @@ struct xhci_ring { | ||
@@ -1385,6 +1385,7 @@ struct xhci_ring { | ||
unsigned int num_trbs_free; | ||
unsigned int num_trbs_free_temp; | ||
unsigned int bounce_buf_len; | ||
|
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 |
---|---|---|
|
@@ -63,7 +63,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1922,6 +1922,7 @@ struct xhci_hcd { | ||
@@ -1666,6 +1666,7 @@ struct xhci_hcd { | ||
#define XHCI_WRITE_64_HI_LO BIT_ULL(47) | ||
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48) | ||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(49) | ||
|
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 |
---|---|---|
|
@@ -86,7 +86,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
first_trb = false; | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1923,6 +1923,7 @@ struct xhci_hcd { | ||
@@ -1667,6 +1667,7 @@ struct xhci_hcd { | ||
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48) | ||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(49) | ||
#define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(50) | ||
|
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
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 |
---|---|---|
|
@@ -149,15 +149,15 @@ Signed-off-by: Andrew Morton <[email protected]> | |
|
||
--- a/fs/exec.c | ||
+++ b/fs/exec.c | ||
@@ -1015,6 +1015,7 @@ static int exec_mmap(struct mm_struct *m | ||
@@ -1012,6 +1012,7 @@ static int exec_mmap(struct mm_struct *m | ||
active_mm = tsk->active_mm; | ||
tsk->active_mm = mm; | ||
tsk->mm = mm; | ||
+ lru_gen_add_mm(mm); | ||
/* | ||
* This prevents preemption while active_mm is being loaded and | ||
* it and mm are being updated, which could cause problems for | ||
@@ -1030,6 +1031,7 @@ static int exec_mmap(struct mm_struct *m | ||
@@ -1027,6 +1028,7 @@ static int exec_mmap(struct mm_struct *m | ||
tsk->mm->vmacache_seqnum = 0; | ||
vmacache_flush(tsk); | ||
task_unlock(tsk); | ||
|
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 |
---|---|---|
|
@@ -31,15 +31,15 @@ Signed-off-by: Andrew Morton <[email protected]> | |
|
||
--- a/fs/exec.c | ||
+++ b/fs/exec.c | ||
@@ -1015,7 +1015,6 @@ static int exec_mmap(struct mm_struct *m | ||
@@ -1012,7 +1012,6 @@ static int exec_mmap(struct mm_struct *m | ||
active_mm = tsk->active_mm; | ||
tsk->active_mm = mm; | ||
tsk->mm = mm; | ||
- lru_gen_add_mm(mm); | ||
/* | ||
* This prevents preemption while active_mm is being loaded and | ||
* it and mm are being updated, which could cause problems for | ||
@@ -1030,6 +1029,7 @@ static int exec_mmap(struct mm_struct *m | ||
@@ -1027,6 +1026,7 @@ static int exec_mmap(struct mm_struct *m | ||
local_irq_enable(); | ||
tsk->mm->vmacache_seqnum = 0; | ||
vmacache_flush(tsk); | ||
|
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 |
---|---|---|
|
@@ -877,7 +877,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS); | ||
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | ||
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | ||
@@ -1659,7 +1659,7 @@ static void axienet_validate(struct phyl | ||
@@ -1661,7 +1661,7 @@ static void axienet_validate(struct phyl | ||
netdev_warn(ndev, "Cannot use PHY mode %s, supported: %s\n", | ||
phy_modes(state->interface), | ||
phy_modes(lp->phy_mode)); | ||
|
@@ -886,7 +886,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
return; | ||
} | ||
} | ||
@@ -1692,10 +1692,8 @@ static void axienet_validate(struct phyl | ||
@@ -1694,10 +1694,8 @@ static void axienet_validate(struct phyl | ||
break; | ||
} | ||
|
||
|
43 changes: 0 additions & 43 deletions
43
...ckport-5.15/777-netfilter-xtables-fix-typo-causing-some-targets-to-not-load-on-IPv6.patch
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <[email protected]> | |
|
||
--- a/drivers/tty/serial/serial_core.c | ||
+++ b/drivers/tty/serial/serial_core.c | ||
@@ -393,6 +393,9 @@ uart_get_baud_rate(struct uart_port *por | ||
@@ -395,6 +395,9 @@ uart_get_baud_rate(struct uart_port *por | ||
break; | ||
} | ||
|
||
|