mbox series

[bug#66751,0/7] linux-libre kernel updates (2023-10-25)

Message ID 20231025221136.12525-1-w@wmeyer.eu
Headers show
Series linux-libre kernel updates (2023-10-25) | expand

Message

Wilko Meyer Oct. 25, 2023, 10:11 p.m. UTC 
Hi Leo,

We had seven kernel releases yesterday, so I bumped each package to the
latest minor version.

Wilko Meyer (7):
  gnu: linux-libre 6.5: Update to 6.5.9.
  gnu: linux-libre 6.1: Update to 6.1.60.
  gnu: linux-libre 5.15: Update to 5.15.137.
  gnu: linux-libre 5.10: Update to 5.10.199.
  gnu: linux-libre 5.4: Update to 5.4.259.
  gnu: linux-libre 4.19: Update to 4.19.297.
  gnu: linux-libre 4.14: Update to 4.14.328.

 gnu/packages/linux.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Comments

Wilko Meyer Oct. 26, 2023, 3:06 p.m. UTC | #1 
Hi Leo,

I noticed that our QA warns that a patch from this patch-series can't be
applied to master:

Applying: gnu: linux-libre 6.5: Update to 6.5.9.
Using index info to reconstruct a base tree...
M	gnu/packages/linux.scm
Falling back to patching base and 3-way merge...
Auto-merging gnu/packages/linux.scm
CONFLICT (content): Merge conflict in gnu/packages/linux.scm
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gnu: linux-libre 6.5: Update to 6.5.9.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

but applying it to the kernel-updates branch works fine:

(~/devel/guix) λ git am ../1 
Applying: gnu: linux-libre 6.5: Update to 6.5.9.
(~/devel/guix) λ git branch --show-current
kernel-updates

which is because the changes from https://issues.guix.gnu.org/66645
aren't on master yet as the QA over there still seems to be
outstanding/not running and this patch series for some kernel versions
diffs against the changes from #66645.

We should probably apply this patch series to kernel-updates as well and
see what QA says after it ran (I don't know too much about how our QA
and CI jobs for the kernel-updates branch work, maybe we have to
schedule/trigger them manually somehow?). WDYT?
Leo Famulari Oct. 27, 2023, 4:15 a.m. UTC | #2 
On Thu, Oct 26, 2023 at 12:11:26AM +0200, Wilko Meyer wrote:
> Hi Leo,
> 
> We had seven kernel releases yesterday, so I bumped each package to the
> latest minor version.

Thanks! I saw it failed to apply on qa.guix.gnu.org, so I applied the
patches locally, rebased on current master branch, and sent a v2 patch
series, as well as pushing to a 'kernel-updates' branch.

https://qa.guix.gnu.org/issue/66751