Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kernel: bump 5.10 to 5.10.142 #10084

Merged
merged 4 commits into from
Sep 11, 2022
Merged

kernel: bump 5.10 to 5.10.142 #10084

merged 4 commits into from
Sep 11, 2022

Conversation

Beginner-Go
Copy link
Contributor

No description provided.

@graysky2 @Beginner-Go
kernel: bump 5.10 to 5.10.139
47f59db 
All patches automatically rebased.

Signed-off-by: John Audia <[email protected]>
@graysky2 @Beginner-Go
kernel: bump 5.10 to 5.10.141
a7d4062 
All patches automatically rebased.

Signed-off-by: John Audia <[email protected]>
@graysky2 @Beginner-Go
kernel: bump 5.10 to 5.10.142
d6e8fd1 
All patches automatically rebased.

Signed-off-by: John Audia <[email protected]>
@1054009064
Copy link
Contributor 

Applying /home/test/lede/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch using plaintext:
patching file include/linux/if_bridge.h
patching file include/linux/skbuff.h
patching file include/linux/timer.h
patching file include/net/netfilter/nf_conntrack_ecache.h
patching file net/bridge/br_if.c
patching file net/core/dev.c
Hunk #1 succeeded at 3651 (offset 4 lines).
Hunk #2 succeeded at 5213 (offset 5 lines).
Hunk #3 FAILED at 5261.
Hunk #4 succeeded at 5305 (offset 5 lines).
1 out of 4 hunks FAILED -- saving rejects to file net/core/dev.c.rej
patching file net/Kconfig
patching file net/netfilter/nf_conntrack_proto_tcp.c
patching file net/netfilter/nf_conntrack_ecache.c
Patch failed!  Please fix /home/test/lede/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch!

@misaka36
Copy link
Contributor

misaka36 commented Sep 11, 2022 •
edited
Loading

target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch把net_timestamp_check(!netdev_tstamp_prequeue, skb);替换为net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);

@misaka36
Copy link
Contributor

去看一下k5.10的diff吧 这个补丁需要refresh

@Beginner-Go
kernel: refresh 5.10 patches
7a30505 
Manual rebase:
  target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

Build system: x86_64
Build-tested: x86_64
Run-tested: x86_64

Signed-off-by: Beginner-Go <[email protected]>
@coolsnowwolf coolsnowwolf merged commit 931b793 into coolsnowwolf:master Sep 11, 2022
@Beginner-Go Beginner-Go deleted the k5.10 branch September 11, 2022 18:47
github-actions bot added a commit to HongJie-Master/lede that referenced this pull request Sep 11, 2022
@github-actions
[bot] AutoMerging: merge all upstream's changes:
f280907 
* https://github.com/coolsnowwolf/lede:
  kernel: netfilter: Add nf_tproxy_ipv{4,6} and nf_socket_ipv{4,6}
  kernel: bump 5.10 to 5.10.142 (coolsnowwolf#10084)
  dnsmasq: add patch for DHCPv6 to honor IPv6 address on MAC address
github-actions bot added a commit to aiastia-bak/lede that referenced this pull request Sep 11, 2022
@github-actions
[bot] AutoMerging: merge all upstream's changes:
6c17624 
* https://github.com/coolsnowwolf/lede:
  kernel: netfilter: Add nf_tproxy_ipv{4,6} and nf_socket_ipv{4,6}
  kernel: bump 5.10 to 5.10.142 (coolsnowwolf#10084)
  dnsmasq: add patch for DHCPv6 to honor IPv6 address on MAC address
  toolchain: Use GCC 8 by default for mips target
  ntfs3-mount: drop ntfs3-oot
  fs: port ntfs3 from kernel 5.19 to 5.10
  fs: port ntfs3 from kernel 5.19 to 5.4
github-actions bot added a commit to Kin-Chi/lede that referenced this pull request Sep 11, 2022
@github-actions
[bot] AutoMerging: merge all upstream's changes:
830b482 
* https://github.com/coolsnowwolf/lede:
  kernel: netfilter: Add nf_tproxy_ipv{4,6} and nf_socket_ipv{4,6}
  kernel: bump 5.10 to 5.10.142 (coolsnowwolf#10084)
  dnsmasq: add patch for DHCPv6 to honor IPv6 address on MAC address
  toolchain: Use GCC 8 by default for mips target
  ntfs3-mount: drop ntfs3-oot
  fs: port ntfs3 from kernel 5.19 to 5.10
  fs: port ntfs3 from kernel 5.19 to 5.4
github-actions bot added a commit to mengniu8/lede that referenced this pull request Sep 11, 2022
@github-actions
[bot] AutoMerging: merge all upstream's changes:
0591733 
* https://github.com/coolsnowwolf/lede:
  kernel: netfilter: Add nf_tproxy_ipv{4,6} and nf_socket_ipv{4,6}
  kernel: bump 5.10 to 5.10.142 (coolsnowwolf#10084)
  dnsmasq: add patch for DHCPv6 to honor IPv6 address on MAC address
  toolchain: Use GCC 8 by default for mips target
  ntfs3-mount: drop ntfs3-oot
  fs: port ntfs3 from kernel 5.19 to 5.10
github-actions bot added a commit to KiteMoon/ledeToHome that referenced this pull request Sep 11, 2022
@github-actions
[bot] AutoMerging: merge all upstream's changes:
11f2293 
* https://github.com/coolsnowwolf/lede:
  kernel: netfilter: Add nf_tproxy_ipv{4,6} and nf_socket_ipv{4,6}
  kernel: bump 5.10 to 5.10.142 (coolsnowwolf#10084)
  dnsmasq: add patch for DHCPv6 to honor IPv6 address on MAC address
  toolchain: Use GCC 8 by default for mips target
github-actions bot pushed a commit to zesming/lede that referenced this pull request Sep 12, 2022
@zesming
[bot] AutoMerging: merge all upstream's changes:
b6ec654 
* https://github.com/coolsnowwolf/lede:
  ipq60xx: fix kernel 5.15 dts support
  ipq60xx: add Qihoo 360v6 AX1800 support
  qca-ssdk: Support ipq60xx target
  ath11k: enable ipq60xx target dependency
  kernel: netfilter: Add nf_tproxy_ipv{4,6} and nf_socket_ipv{4,6}
  kernel: bump 5.10 to 5.10.142 (coolsnowwolf#10084)
  dnsmasq: add patch for DHCPv6 to honor IPv6 address on MAC address
  toolchain: Use GCC 8 by default for mips target
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Beginner-Go @1054009064 @misaka36 @coolsnowwolf @graysky2