Skip to content

basic/linux: update kernel headers from v6.10-rc3#33034

Merged
yuwata merged 3 commits intosystemd:mainfrom
yuwata:update-kernel-headers
Jun 19, 2024
Merged

basic/linux: update kernel headers from v6.10-rc3#33034
yuwata merged 3 commits intosystemd:mainfrom
yuwata:update-kernel-headers

Conversation

@yuwata
Copy link
Copy Markdown
Member

@yuwata yuwata commented May 27, 2024

This also

  • merges basic/linux and shared/linux,
  • moves BPF_JUMP_A() to basic/missing_bpf.h,
  • copies from usrspace kernel headers directory generated by 'make headers', rather than copying from kernel tree,
  • copies const.h into our tree to reduce change in ethtool.h,
  • copies auto_fs.h into our tree to reduce change in auto_dev-ioctl.h,
  • adds an entry for bcachefs to filesystems-gperf.gperf.

@github-actions github-actions bot added btrfs build-system util-lib meson please-review PR is ready for (re-)review by a maintainer labels May 27, 2024
@github-actions
Copy link
Copy Markdown

github-actions bot commented May 27, 2024

Note

We had successfully released a new major release. We are no longer in a development freeze phase.
We will try our best to get back to your PR as soon as possible. Thank you for your patience.

@yuwata yuwata force-pushed the update-kernel-headers branch from 77bc1e7 to df954a6 Compare May 27, 2024 07:55
@YHNdnzj YHNdnzj added the ci-fails/needs-rework 🔥 Please rework this, the CI noticed an issue with the PR label May 27, 2024
@yuwata yuwata marked this pull request as draft May 27, 2024 09:58
@yuwata yuwata force-pushed the update-kernel-headers branch from df954a6 to fdbb902 Compare May 27, 2024 10:02
@yuwata yuwata removed the please-review PR is ready for (re-)review by a maintainer label May 27, 2024
@yuwata yuwata force-pushed the update-kernel-headers branch from fdbb902 to 25ee482 Compare May 27, 2024 21:31
@yuwata yuwata force-pushed the update-kernel-headers branch from 25ee482 to 89b750f Compare May 28, 2024 00:48
@github-actions github-actions bot added resolve login sd-bus timedate sd-device portable Anything to do with systemd-portable and portablectl and portables nsresource mountfsd labels May 28, 2024
@yuwata yuwata force-pushed the update-kernel-headers branch from 89b750f to 1b6892f Compare May 28, 2024 01:02
@yuwata yuwata force-pushed the update-kernel-headers branch from 7b67115 to 46864d7 Compare May 28, 2024 02:29
@yuwata yuwata marked this pull request as ready for review May 28, 2024 03:35
@github-actions github-actions bot added the please-review PR is ready for (re-)review by a maintainer label May 28, 2024
__le16 other_encoding; /* spare for later use */

/* are we inline data or a real extent? */
/* are we __inline__ data or a real extent? */
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the change to the comment is intended.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and below are all intentional. Such spurious replacement is caused by build script of the kernel.
Previously, we copied kernel headers from include/uapi/linux, but now they are from usr/include/linux.
The build script of the kernel simply replace inline with __inline__, even the term is in comment.
Please report that to the kernel team.

@yuwata yuwata force-pushed the update-kernel-headers branch from 46864d7 to 5cc0bb2 Compare May 31, 2024 02:29
@yuwata yuwata added this to the v257 milestone Jun 1, 2024
@yuwata yuwata force-pushed the update-kernel-headers branch from 5cc0bb2 to 24ac89b Compare June 12, 2024 13:19
@yuwata yuwata changed the title basic/linux: update kernel headers from v6.10-rc1 basic/linux: update kernel headers from v6.10-rc3 Jun 12, 2024
#include <fcntl.h>
#include <limits.h>
#include <linux/auto_dev-ioctl.h>
#include <linux/auto_fs4.h>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, the merge of this header with auto_fs.h was done in 4.18. We currently have 4.15 as "recommended baseline", and 3.15 as "minimum baseline"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now the header auto_fs.h is imported from the latest kernel tree. Hence, it is not necessary to consider backward compatibility about the header.

@poettering
Copy link
Copy Markdown
Member

this generally looks good to me, except for the last patch, see above

@poettering poettering added good-to-merge/with-minor-suggestions and removed please-review PR is ready for (re-)review by a maintainer labels Jun 13, 2024
yuwata added 3 commits June 20, 2024 02:35
This also
- merges basic/linux and shared/linux,
- moves BPF_JUMP_A() to basic/missing_bpf.h,
- copies from usrspace kernel headers directory generated by 'make headers',
  rather than copying from kernel tree,
- copies const.h into our tree to reduce change in ethtool.h,
- copies auto_fs.h into our tree to reduce change in auto_dev-ioctl.h.
auto_fs4.h is a trivial wrapper of auto_fs.h, and it is already included
by auto_dev-ioctl.h.
@yuwata yuwata force-pushed the update-kernel-headers branch from 24ac89b to 834afa1 Compare June 19, 2024 17:35
@yuwata yuwata added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed good-to-merge/with-minor-suggestions labels Jun 19, 2024
@yuwata yuwata merged commit de732ad into systemd:main Jun 19, 2024
@yuwata yuwata deleted the update-kernel-headers branch June 19, 2024 18:53
@github-actions github-actions bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jun 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

4 participants