Skip to content

[pull] master from coolsnowwolf:master - #1129

Open
pull[bot] wants to merge 1066 commits into
Lienol:masterfrom
coolsnowwolf:master
Open

[pull] master from coolsnowwolf:master#1129
pull[bot] wants to merge 1066 commits into
Lienol:masterfrom
coolsnowwolf:master

Conversation

@pull

@pull pull Bot commented Sep 15, 2024

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Sep 16, 2024
@aiamadeus
aiamadeus force-pushed the master branch 2 times, most recently from ad43ee0 to fac34a2 Compare September 30, 2024 02:38
@coolsnowwolf
coolsnowwolf force-pushed the master branch 3 times, most recently from 66e03f1 to 2d1c8ab Compare October 22, 2024 12:15
@aiamadeus
aiamadeus force-pushed the master branch 3 times, most recently from 6269d0f to 9f65b6f Compare October 22, 2024 15:30
@aiamadeus
aiamadeus force-pushed the master branch 3 times, most recently from df90cc1 to 19649ea Compare November 7, 2024 13:42
@aiamadeus
aiamadeus force-pushed the master branch 2 times, most recently from 8fcfe76 to af207e5 Compare November 22, 2024 05:01
@coolsnowwolf
coolsnowwolf force-pushed the master branch 6 times, most recently from a253e36 to 003a084 Compare December 2, 2024 15:32
@aiamadeus
aiamadeus force-pushed the master branch 2 times, most recently from 8cf7400 to 2778ccf Compare December 6, 2024 03:43
@aiamadeus
aiamadeus force-pushed the master branch 2 times, most recently from ed01360 to d6c6378 Compare December 20, 2024 08:02
namiltd and others added 30 commits June 29, 2026 20:00
Kernel since version 6.16 defines `SOCKWQ_ASYNC_NOSPACE` and
SOCKWQ_ASYNC_WAITDATA` in the socket_flags enum, which causes
redefinition errors when compiling the backport package.
Since kernel 6.12 also has them defined, the test and definition
of these constants have been completely abandoned. Thanks to this,
there are no compilation errors on either kernel 6.12 or 6.18.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Signed-off-by: Robert Marko <robimarko@gmail.com>
sync xt_FLOWOFFLOAD code with latest version of nft_flow_offload

Fixes: #9349
Fixes: #9597
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Add a pending patch to fix the WED flow timeout.

OpenWrt has recently migrated many platforms to kernel 6.18. On the
MediaTek platform, which supports hardware network offloading, WiFi
connections accelerated via the WED path were observed to drop after
roughly 300 seconds.

Signed-off-by: Qingfang Deng <dqfext@gmail.com>
Signed-off-by: Robert Marko <robimarko@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Manually rebased:
generic/pending-6.12/610-netfilter_match_bypass_default_checks.patch
bcm27xx/patches-6.12/950-0501-gpiolib-Override-gpiochip-numbers-with-DT-aliases.patch
bcm27xx/patches-6.12/950-0777-drm-v3d-Remove-v3d-cpu_job.patch

Removed upstreamed:
bcm27xx/patches-6.12/950-0859-drm-v3d-Set-job-pointer-to-NULL-when-the-job-s-fence.patch

All other patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Release 2.11 has been quite a few new features
and fixes since the 2.10 release. Fixes: #14096

Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
Signed-off-by: Robert Marko <robimarko@gmail.com>
In tree ksmbd is available with 5.15 and is better updated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
68f382690bfa statefiles: escape client hostnames in the lease state file

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Switch the qualcommbe target to use kernel 6.18 and drop 6.12.

Kernel 6.18 for qualcommbe resolves some issues regarding
PCS support and reduces maintenance load maintaining two
kernel branches.

Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me>
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
The upgrade to 2.5.0 accidentally dropped the CPP defines, so the
precompiled-active-filter option has been missing and the demand dialing
option in uci has been broken since then. Add the missing defines.

Fixes: 9cecf2b ("ppp: update to 2.5.0")
Signed-off-by: Qingfang Deng <dqfext@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Upstream moved the airoha ethernet driver into its own folder, so the
patches predating the move were retargeted to drivers/net/ethernet/airoha.

Manually rebased:
airoha/patches-6.12/016-v6.13-net-airoha-Fix-EGRESS_RATE_METER_EN_MASK-definition.patch
airoha/patches-6.12/031-02-v6.13-net-airoha-Simplify-Tx-napi-logic.patch
airoha/patches-6.12/036-v6.13-net-airoha-Fix-typo-in-REG_CDM2_FWD_CFG-configuratio.patch
airoha/patches-6.12/038-01-v6.14-net-airoha-Enable-Tx-drop-capability-for-each-Tx-DMA.patch
airoha/patches-6.12/038-04-v6.14-net-airoha-Add-sched-HTB-offload-support.patch
airoha/patches-6.12/039-v6.14-net-airoha-Enforce-ETS-Qdisc-priomap.patch
airoha/patches-6.12/046-v6.15-net-airoha-Fix-TSO-support-for-header-cloned-skbs.patch
airoha/patches-6.12/047-v6.13-net-airoha-Reset-BQL-stopping-the-netdevice.patch
bcm27xx/patches-6.12/950-0006-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
bcm27xx/patches-6.12/950-0333-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm27xx/patches-6.12/950-0334-usb-xhci-add-VLI_SS_BULK_OUT_BUG-quirk.patch
bcm27xx/patches-6.12/950-0335-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch

Removed upstreamed:
airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch
generic/backport-6.12/620-v6.15-ppp-use-IFF_NO_QUEUE-in-virtual-interfaces.patch

All other patches automatically rebased.
Added 100-gcc15-fix.patch which drops __DATE__/__TIME__ usage and provides
a stable fallback ("unknown"). This fixes build failures with GCC 15 and
-Werror=date-time in kernel builds.

Signed-off-by: John Audia <therealgraysky@proton.me>
[Removed "Replace printk with pr_* macros" patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.