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.

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

bore 5.7.3 needs to be rebased for kernel 6.6.62 #53

Open
ghibo opened this issue Nov 20, 2024 · 6 comments
Open

bore 5.7.3 needs to be rebased for kernel 6.6.62 #53

ghibo opened this issue Nov 20, 2024 · 6 comments

Comments

@ghibo
Copy link

ghibo commented Nov 20, 2024

It seems that with kernel 6.6.62 the 0001-linux6.6.57-bore5.7.3.patch patchset doesn't apply smootly (e.g. with patch -F0) anymore, and need to be rebased.

@ghibo ghibo changed the title bore 5,7.3 needs to be rebased for kernel 6.6.62 bore 5.7.3 needs to be rebased for kernel 6.6.62 Nov 20, 2024
@1Naim
Copy link

1Naim commented Nov 21, 2024

It applies fine. Use patch -p1 instead.

@ghibo
Copy link
Author

ghibo commented Nov 21, 2024

It fails with --fuzz=0 (or -F0, which is used for "exact matching" of a patch). Try this for instance:

wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.62.tar.xz
wget https://raw.githubusercontent.com/firelzrd/bore-scheduler/refs/heads/main/patches/stable/linux-6.6-bore/0001-linux6.6.57-bore5.7.3.patch
tar -xf linux-6.6.62.tar.xz
patch -F0 -p1 -d ./linux-6.6.62 < 0001-linux6.6.57-bore5.7.3.patch

and you get:

patching file include/linux/sched.h
patching file include/linux/sched/bore.h
patching file init/Kconfig
patching file kernel/Kconfig.hz
patching file kernel/fork.c
Hunk #1 FAILED at 100.
Hunk #2 succeeded at 2471 (offset 3 lines).
1 out of 2 hunks FAILED -- saving rejects to file kernel/fork.c.rej
patching file kernel/sched/Makefile
patching file kernel/sched/bore.c
patching file kernel/sched/core.c
patching file kernel/sched/debug.c
patching file kernel/sched/fair.c
patching file kernel/sched/features.h
patching file kernel/sched/sched.h

That's because of recent code change in kernel/fork.c in 6.6.62.

@firelzrd
Copy link
Owner

It fails with --fuzz=0 (or -F0, which is used for "exact matching" of a patch). Try this for instance:

You should get rid of the -F0 option and it should apply with no problem.

$ patch -p1 < 0001-linux6.6.57-bore5.7.3.patch 
checking file include/linux/sched.h
checking file include/linux/sched/bore.h
checking file init/Kconfig
checking file kernel/Kconfig.hz
checking file kernel/fork.c
Hunk #1 succeeded at 101 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 2477 (offset 3 lines).
checking file kernel/sched/Makefile
checking file kernel/sched/bore.c
checking file kernel/sched/core.c
checking file kernel/sched/debug.c
checking file kernel/sched/fair.c
checking file kernel/sched/features.h
checking file kernel/sched/sched.h

@ghibo
Copy link
Author

ghibo commented Nov 21, 2024

It fails with --fuzz=0 (or -F0, which is used for "exact matching" of a patch). Try this for instance:

You should get rid of the -F0 option and it should apply with no problem.

$ patch -p1 < 0001-linux6.6.57-bore5.7.3.patch 
checking file include/linux/sched.h
checking file include/linux/sched/bore.h
checking file init/Kconfig
checking file kernel/Kconfig.hz
checking file kernel/fork.c
Hunk #1 succeeded at 101 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 2477 (offset 3 lines).
checking file kernel/sched/Makefile
checking file kernel/sched/bore.c
checking file kernel/sched/core.c
checking file kernel/sched/debug.c
checking file kernel/sched/fair.c
checking file kernel/sched/features.h
checking file kernel/sched/sched.h

I know, but usually packaging systems, like rpm, use by default --fuzz=0 for any patch, because patches requiring a different fuzz are usually considered malformed patches or unsafe patches (think for instance security patches), that's why I reported.

@firelzrd
Copy link
Owner

I know, but usually packaging systems, like rpm, use by default --fuzz=0 for any patch, because patches requiring a different fuzz are usually considered malformed patches or unsafe patches (think for instance security patches), that's why I reported.

The current patch for Linux 6.6 is for the 6.6.57 vanilla source.
Sorry but I do not release BORE with every single new Linux release.
If you want a patch that exactly matches any arbitrary version of Linux, please consider to rebuild a patch for your specific version of Linux from your own source tree, using git diff or diff -uprN.

@firelzrd
Copy link
Owner

firelzrd commented Nov 24, 2024

For your convenience, here's a patch, tailored for Linux 6.6.63 (the current latest). I hope it helps.
0001-linux6.6.63-bore5.7.3.patch.txt

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants