kernel: bump to 4.4.65#1055
Closed
ldir-EDB0 wants to merge 1 commit intolede-project:masterfrom
ldir-EDB0:bump4463
Closed
kernel: bump to 4.4.65#1055ldir-EDB0 wants to merge 1 commit intolede-project:masterfrom ldir-EDB0:bump4463
ldir-EDB0 wants to merge 1 commit intolede-project:masterfrom
ldir-EDB0:bump4463
Conversation
Refresh patches on all 4.4 platforms. Compile tested all supported 4.4 platforms. Run tested ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
|
Hey Kevin, Here I am again profiting off your hard work ;-) I'm trying to apply your .65 bump to my local 17.01 branch (vanilla except for some Git status: Can you check this? The include/kernel-version.mk bit is obvious, since trunk has 4.9 in it as well, and 17.01 doesn't. But the other ones look a bit weird. |
Contributor
Author
|
On 07/05/17 20:41, Borromini wrote:
Hey Kevin,
Here I am again profiting off your hard work ;-)
I'm trying to apply your .65 bump to my local 17.01 branch (vanilla
except for some |scripts/getver.sh| changes) but it breaks on a few patches:
|code/lede/17.01$ patch -Np1 -i
../patches/main/0001-Kernel-bump-LEDE-17.01-kernel-to-4.4.65.patch
patching file include/kernel-version.mk Hunk #1 FAILED at 3. 1 out of 1
hunk FAILED -- saving rejects to file include/kernel-version.mk.rej
patching file
target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch
Reversed (or previously applied) patch detected! Skipping patch. 2 out
of 2 hunks ignored -- saving rejects to file
target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch.rej
patching file
target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch
Reversed (or previously applied) patch detected! Skipping patch. 2 out
of 2 hunks ignored -- saving rejects to file
target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch.rej
patching file
target/linux/ar71xx/patches-4.4/609-MIPS-ath79-ap136-fixes.patch
Reversed (or previously applied) patch detected! Skipping patch. 3 out
of 3 hunks ignored -- saving rejects to file
target/linux/ar71xx/patches-4.4/609-MIPS-ath79-ap136-fixes.patch.rej |
Git status:
|On branch lede-17.01-LTS Untracked files: (use "git add <file>..." to
include in what will be committed) .precheck nothing added to commit but
untracked files present (use "git add" to track) |
Can you check this?
This doesn't surprise me. At some point the kernel & patches in 17.01 &
trunk diverged and require different bumps :-(
|
|
Bummer :-( I just looked at the 525 patch and that looks too complicated for me... Guess I'll wait till someone bumps 17.01 then. Thanks for checking! |
Contributor
Author
|
On 07/05/17 20:41, Borromini wrote:
Hey Kevin,
Here I am again profiting off your hard work ;-)
I'm trying to apply your .65 bump to my local 17.01 branch (vanilla
except for some |scripts/getver.sh| changes) but it breaks on a few patches:
|code/lede/17.01$ patch -Np1 -i
../patches/main/0001-Kernel-bump-LEDE-17.01-kernel-to-4.4.65.patch
patching file include/kernel-version.mk Hunk #1 FAILED at 3. 1 out of 1
hunk FAILED -- saving rejects to file include/kernel-version.mk.rej
patching file
target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch
Reversed (or previously applied) patch detected! Skipping patch. 2 out
of 2 hunks ignored -- saving rejects to file
target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch.rej
patching file
target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch
Reversed (or previously applied) patch detected! Skipping patch. 2 out
of 2 hunks ignored -- saving rejects to file
target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch.rej
patching file
target/linux/ar71xx/patches-4.4/609-MIPS-ath79-ap136-fixes.patch
Reversed (or previously applied) patch detected! Skipping patch. 3 out
of 3 hunks ignored -- saving rejects to file
target/linux/ar71xx/patches-4.4/609-MIPS-ath79-ap136-fixes.patch.rej |
A closer look suggests you don't need any of those patches anyway...
they're all previously applied.
|
Contributor
|
Could you please bump the pull request to 4.4.67? |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Refresh patches on all 4.4 platforms.
Compile tested all supported 4.4. platforms.
Run tested ar71xx Archer C7 v2
Signed-off-by: Kevin Darbyshire-Bryant kevin@darbyshire-bryant.me.uk