Backport 5.15 cleanup #10845
Open
Backport 5.15 cleanup #10845
+4,545
−875
Conversation
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
…t-am Update headers in some backport-5.15 so that all patches can be applied with git-am. This is useful when refactoring / rebasing the patches. Signed-off-by: Marek Behún <kabel@kernel.org>
Update these patches with patches that were really applied to upstream, i.e. they have different subjects, commit messages, and sometimes contents. Signed-off-by: Marek Behún <kabel@kernel.org>
…tream Remove patch 343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch with subject netfilter: nft_flow_offload: handle netdevice events from nf_flow_table It was never applied upstream and is not needed. Signed-off-by: Marek Behún <kabel@kernel.org>
Move patch 011-kbuild-export-SUBARCH.patch from backport-5.15 to hack-5.15. It was never applied in upstream. Signed-off-by: Marek Behún <kabel@kernel.org>
Rename backport-5.15 that are of the format NNN-PN-vKV-... to the format that is used by most of the patches NNN-vKV-PN-... where NNN is patch number ensuring ordering, KV is kernel version from which the patch was backported, PN is patch number if there are several patches with same NNN. Signed-off-by: Marek Behún <kabel@kernel.org>
… version Rename patches 410-mtd-next-mtd-parsers-trx-allow-to-use-on-MediaTek-MIPS-SoCs.patch 870-hwmon-next-hwmon-lm70-Add-ti-tmp125-support.patch in kernel 5.15 backports to contain kernel version. They both appeared in 5.18. Signed-off-by: Marek Behún <kabel@kernel.org>
Update patch 870-v5.18-hwmon-lm70-Add-ti-tmp125-support.patch with upstream's version. Signed-off-by: Marek Behún <kabel@kernel.org>
github-actions
bot
added
the
kernel
|
@elkablo very nice work! can you rebase this on top of master? I'm doing a similar thing for qca8k where we still use old patches that got upstream. |
hauke
reviewed
Oct 2, 2022
| Move the code that deals with device events to the core. | ||
|
|
||
| Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | ||
| --- |
hauke
reviewed
Oct 2, 2022
| @@ -24,9 +31,11 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> | |||
| Ip_u3u1u2(_nor); | |||
| Ip_u3u1u2(_or); | |||
| Ip_u2u1u3(_ori); | |||
| diff --git a/arch/mips/mm/uasm-mips.c b/arch/mips/mm/uasm-mips.c | |||
| index 7154a1d99aad..e15c6700cd08 100644 | |||
There was a problem hiding this comment.
Please refresh the patches like this: make target/linux/{clean,refresh} V=99
quilt will remove these two lines.
hauke
approved these changes
Oct 2, 2022
|
@elkablo can you rebase this and address the comments? |
fengmushu
pushed a commit
to fengmushu/openwrt
that referenced
this pull request
Nov 18, 2023
Fixed patch application failure. Fixes: 89200af ("bump qca-ssdk nss-dp and ssdk-shell, Add tplink-tl-er2260t basic support (openwrt#10777)") Fixes: openwrt#10844
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have been doing some work on backporting more network changes to 5.15.
Before that though I found that it would be great for development if all backport patches could be applied with
git amonlinux-stable. In doing so I have found several things that could also be improved.