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

backport: avoid duplicate definition of spi_get_chipselect() with Linux 6.3 #131

Merged
merged 5 commits into from
Jul 15, 2024

Conversation

pcolberg
Copy link
Contributor

spi_get_chipselect() was introduced in commit 303feb3cc06a ("spi: Add APIs in spi core to set/get spi->chip_select and spi->cs_gpiod").

…ux 6.3

spi_get_chipselect() was introduced in commit 303feb3cc06a ("spi: Add
APIs in spi core to set/get spi->chip_select and spi->cs_gpiod").

Signed-off-by: Peter Colberg <peter.colberg@intel.com>
…ux 6.1.71

spi_get_chipselect() was backported in commit 025cf65f68d4 ("spi: Add
APIs in spi core to set/get spi->chip_select and spi->cs_gpiod").

Signed-off-by: Peter Colberg <peter.colberg@intel.com>
@pcolberg pcolberg self-assigned this Jul 15, 2024
Signed-off-by: Peter Colberg <peter.colberg@intel.com>
Debian kernels contain relatively few patches on top of upstream and
closely track Linux long-term stable releases as part of Debian stable
security updates and point releases.
@pcolberg pcolberg force-pushed the pcolberg/spi_get_chipselect branch from 39ec8da to 39f593f Compare July 15, 2024 18:53
Comment on lines +14 to +16
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && \
(LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 71) || \
LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This expression can be simplified since there is only one mainline release ≥6.2 and <6.3, but is kept this way as a template for handling LTS kernels in other cases.

Build modules with latest kernels, e.g., as part of security updates.

The minutes are more or less chosen at random, with sufficient wait
time between building the containers followed by building the modules
using the new containers. The hour falls into the middle of a workday
such that a potential breakage does not need to be addressed as the
first task of the day, but may still be resolved until end of the day.

Signed-off-by: Peter Colberg <peter.colberg@intel.com>
@pcolberg pcolberg force-pushed the pcolberg/spi_get_chipselect branch from f508a5c to 2822a68 Compare July 15, 2024 19:18
@pcolberg pcolberg merged commit fd998a7 into intel/fpga-ofs-dev-6.6-lts Jul 15, 2024
32 checks passed
@pcolberg pcolberg deleted the pcolberg/spi_get_chipselect branch July 15, 2024 20:15
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

Successfully merging this pull request may close these issues.

2 participants