Commit graph

17295 commits

Author SHA1 Message Date
Salvatore Bonaccorso
88f4ea8f02 Prepare to release linux (6.1.159-1) 2025-12-30 23:20:29 +01:00
Salvatore Bonaccorso
c7f7d4e0f8 Merge branch '6.1-backports' into 'debian/6.1/bookworm'
cherry-pick some 6.1.y backports (hyperv-daemons)

See merge request kernel-team/linux!1763
2025-12-30 20:51:05 +01:00
Salvatore Bonaccorso
ece146bb2a Backport "hyperv-daemons: Fix and install the sample network info scripts"
This backports merge request kernel-team/linux!1573
2025-12-30 17:46:55 +01:00
Salvatore Bonaccorso
23e30b045f Merge branch '6.1-stable-updates' into 'debian/6.1/bookworm'
6.1 stable updates

See merge request kernel-team/linux!1739
2025-12-30 17:11:41 +01:00
Salvatore Bonaccorso
932a9cdfab Merge branch '6.1-backport-use-information-from-dpkg' into 'debian/6.1/bookworm'
6.1 backport: Use information from dpkg

See merge request kernel-team/linux!1761
2025-12-30 17:11:17 +01:00
Salvatore Bonaccorso
639af4cd3f Update to 6.1.159
Refresh patches for upstream changes

d/config: Update with the help of kconfigeditor2

Add CVE id references

Add Debian bug closer for #1119232

Add Debian bug closer for #1120602

Add Debian bug closer for #1106411

Add Debian bug closer for #1114557

Add Debian bug closer for #1120680

Cleanup debian/changelog file
2025-12-29 13:12:44 +01:00
Bastian Blank
e796933530 Use information from dpkg vendor.mk
(cherry picked from commit f84aa340b0)
2025-12-29 13:09:43 +01:00
Bastian Blank
a63c3823dc Use information from dpkg pkg-info.mk
(cherry picked from commit 15784b26c8)
2025-12-29 13:08:37 +01:00
Bastian Blank
308998c6ec Only include all dpkg default.mk in rules.real
(cherry picked from commit 6f4940e2e0)
2025-12-29 12:19:06 +01:00
Salvatore Bonaccorso
d492226e82 Prepare to release linux (6.1.158-1) 2025-11-09 21:02:08 +01:00
Salvatore Bonaccorso
84164a686e Merge branch '6.1-stable-updates' into 'debian/6.1/bookworm'
6.1 stable updates

See merge request kernel-team/linux!1660
2025-11-09 20:44:25 +01:00
Salvatore Bonaccorso
95245c153f Update to 6.1.158
Add CVE id references

Cleanup debian/changelog file
2025-11-09 17:18:17 +01:00
Salvatore Bonaccorso
df58dc15a8 Update to 6.1.157
Add CVE id references

Cleanup debian/changelog file
2025-11-09 17:18:16 +01:00
Salvatore Bonaccorso
3ae6e0271b Update to 6.1.156
Add CVE id references

Cleanup debian/changelog file
2025-11-09 17:18:15 +01:00
Salvatore Bonaccorso
dce4f59835 Update to 6.1.155
Add CVE id references

Cleanup debian/changelog file
2025-11-09 17:18:13 +01:00
Salvatore Bonaccorso
9d64a34e59 Update to 6.1.154
Cleanup debian/changelog file
2025-11-09 17:18:10 +01:00
Salvatore Bonaccorso
554255d05c Merge branch 'ci-update-6.1' into 'debian/6.1/bookworm'
CI: Backport source package handling changes to 6.1

See merge request kernel-team/linux!1698
2025-11-02 10:07:27 +01:00
Ben Hutchings
846475e25d Backport "CI: Fix more issues introduced by the removal of the extract-source job"
This backports merge request kernel-team/linux!1675

For debian/6.1/bookworm, keep using genorig.py to generate the orig
tarball.
2025-11-01 23:08:08 +01:00
Ben Hutchings
6105de0bfa Backport "d/salsa-ci.yml: Adjust filenames to allow source package name suffix"
This backports merge request kernel-team/linux!1663

For debian/6.1/bookworm, also update the file test before running
genorig.py.
2025-11-01 22:52:25 +01:00
Ben Hutchings
40f25f5391 d/b/genorig.py, d/rules, d/salsa-ci.yml: Put orig tarballs directly in ..
Currently orig tarball caching is broken in CI.  The fix for this on
debian/latest doesn't cleanly apply here, in part because:

- Here we use genorig.py, which puts tarballs in ../orig and
  creates symlinks to them in ..
- There we use uscan, which puts tarballs in ..

To reduce the conflicts, change genorig.py to create tarballs in ..
and change debian/rules and debian/salsa-ci.yml to work with that.

(cherry picked from commit d16220d004)
2025-11-01 22:50:59 +01:00
Salvatore Bonaccorso
faff97a598 Prepare to release linux (6.1.153-1) 2025-09-20 20:53:11 +02:00
Salvatore Bonaccorso
c97ad9b223 Merge branch '6.1-stable-updates' into 'debian/6.1/bookworm'
6.1 stable updates

See merge request kernel-team/linux!1655
2025-09-20 16:59:29 +02:00
Salvatore Bonaccorso
21a5c871c6 Update to 6.1.153
Add CVE id references

Drop patches applied upstream

Cleanup debian/changelog file
2025-09-20 10:56:16 +02:00
Salvatore Bonaccorso
a58683e619 Merge branch '6.1-cherry-pick-for-bookworm' into 'debian/6.1/bookworm'
Backport selected changes for 6.1/bookworm

See merge request kernel-team/linux!1649
2025-09-19 01:08:01 +02:00
Salvatore Bonaccorso
34e213066a Backport "Fix regression: NFS 4.2 reports "Operation Not Supported" on getxattr calls"
This backports merge request kernel-team/linux!1646

Commits:
- NFSv4: Clear the NFS_CAP_XATTR flag if not supported by the server
- NFSv4: Clear the NFS_CAP_FS_LOCATIONS flag if it is not set
- NFSv4: Don't clear capabilities that won't be reset

The change for "NFSv4: Clear NFS_CAP_OPEN_XOR and NFS_CAP_DELEGTIME if
not supported" is dropped as it does not apply to the 6.1.y series.

The bug closer for #1114898 as te regression did not hit Debian bookworm
but the change needs to be included to not introduce the regression from
6.1.149 upstream.
2025-09-18 21:09:09 +02:00
Salvatore Bonaccorso
4ed6000b33 Backport "d/salsa-ci.yml: Early move orig tarballs back where they can be cached"
This backports merge request kernel-team/linux!1645
2025-09-18 21:00:17 +02:00
Salvatore Bonaccorso
561249bf5c Merge branch '6.1-stable-updates' into 'debian/6.1/bookworm'
6.1 stable updates

See merge request kernel-team/linux!1628
2025-09-18 12:38:49 +02:00
Salvatore Bonaccorso
f46e7dc014 Update to 6.1.152 2025-09-17 15:29:14 +02:00
Salvatore Bonaccorso
ea4c353e61 Update to 6.1.150
Drop patches applied upstream

Add CVE id references

Cleanup debian/changelog file
2025-09-17 15:29:13 +02:00
Salvatore Bonaccorso
e5df4cb88d Update to 6.1.150
Cleanup debian/changelog file
2025-09-17 15:29:11 +02:00
Salvatore Bonaccorso
ee419f0f1a Update to 6.1.149
Drop patches applied upstream

Add CVE id references

Cleanup debian/changelog file
2025-09-17 15:29:08 +02:00
Salvatore Bonaccorso
e9b533e1b8 Merge branch '6.1-salsa-ci/sbuild+unshare' into 'debian/6.1/bookworm'
Backport "Merge the extract-source job into the build's job script"

See merge request kernel-team/linux!1644
2025-09-16 21:15:03 +02:00
Ben Hutchings
9794f0902c d/b/gencontrol.py: Extend the effect of $DEBIAN_KERNEL_DISABLE_INSTALLER
Now that the Salsa common pipeline builds packages under sbuild, the
variable DEBIAN_KERNEL_DISABLE_INSTALLER=true in the pipeline's
environment is filtered out of the package build environment and
gencontrol_signed.py doesn't see it (but gencontrol.py does).

This problem doesn't occur in later branches because the functionality
of gencontrol_signed.py was moved into gencontrol.py.

To fix this, change gencontrol.py to set the appropriate config field
when $DEBIAN_KERNEL_DISABLE_INSTALLER is set.  This change will be
saved in config.defines.dump and seen by gencontrol_signed.py later,
but the source config files will be unchanged.
2025-09-16 00:31:04 +02:00
Salvatore Bonaccorso
a173dbfd6e Backport "Merge the extract-source job into the build's job script"
This backports merge request kernel-team/linux!1548

Commits:
- d/salsa-ci.yml: Suppress unreleased changes and mismatching
  distribution lintian tags
- d/salsa-ci.yml: Merge the extract-source job into the build's job
  script

Adjusted for context changes in version from debian/6.1/bookworm.
2025-09-15 15:33:09 +02:00
Salvatore Bonaccorso
9bcfe8b8dd Merge branch 'revert-ecdsa-modsig' into 'debian/6.1/bookworm'
Revert to using RSA for module signatures

See merge request kernel-team/linux!1637
2025-09-13 22:08:22 +02:00
Ben Hutchings
c6c3e0dc1b Revert to using RSA for module signatures
When the kernel is in FIPS mode, ECDSA is not supported and modules
signed with ECDSA will fail to load (even if Lockdown is not active).

This was fixed in later kernel versions, but it seems safer to revert
to using RSA signatures than to backport those changes.

Closes: #1114773
2025-09-09 22:40:13 +02:00
Salvatore Bonaccorso
ef66f39eb3 Prepare to release linux (6.1.148-1) 2025-08-26 22:35:21 +02:00
Salvatore Bonaccorso
bd24651ec0 proc: fix missing pde_set_flags() for net proc files
Apply patch for a regression in 6.16.1.  This has not yet been applied
upstream but has been tested and looks OK to me.

(cherry picked from commit 8765ecb339)
[Salvatore Bonaccorso: Do not explicitly mention regression from 6.16.1]
(cherry picked from commit 62a4ef2d64)
2025-08-25 22:46:26 +02:00
Ben Hutchings
317acec3f1 Merge branch 'bookworm-sign-modules-always' into 'debian/6.1/bookworm'
Sign modules and support lockdown always

See merge request kernel-team/linux!1622
2025-08-25 22:25:32 +02:00
Salvatore Bonaccorso
03913aa332 Sign modules and support lockdown always
[Salvatore Bonaccorso: Skip changes for armel/marvell and keep
CONFIG_MODULE_SIG not set]
(cherry picked from commit 6f23f0461f)
2025-08-25 10:07:53 +02:00
Salvatore Bonaccorso
121249968a Merge branch '6.1-cherry-pick-for-bookworm' into 'debian/6.1/bookworm'
Cherry pick selected fixes and additional support for Debian bookworm

See merge request kernel-team/linux!1620
2025-08-23 15:57:58 +02:00
Salvatore Bonaccorso
8283923d9c Backport "ext4: don't try to clear the orphan_present feature block device is r/o"
This backports merge request kernel-team/linux!1618
2025-08-23 11:37:17 +02:00
Salvatore Bonaccorso
3e7410620e Backport "netlink: avoid infinite retry looping in netlink_unicast()"
This backports merge request kernel-team/linux!1611
2025-08-23 11:34:26 +02:00
Salvatore Bonaccorso
6fa3b39eb0 Backport "[amd64] udeb: kernel-image: Include SPI drivers"
This backports merge request kernel-team/linux!1607
2025-08-23 11:33:24 +02:00
Salvatore Bonaccorso
e0e0161544 Merge branch '6.1-stable-updates' into 'debian/6.1/bookworm'
6.1 stable updates

See merge request kernel-team/linux!1609
2025-08-23 11:10:31 +02:00
Salvatore Bonaccorso
b5f2191d1c Update to 6.1.148
Drop patches applied upstream

Add CVE id references

Cleanup debian/changelog file
2025-08-19 22:48:51 +02:00
Salvatore Bonaccorso
12317527da Merge branch 'mod-sign-ephemeral-6.1' into 'debian/6.1/bookworm'
Sign modules using an ephemeral key; bump ABI for every upload

See merge request kernel-team/linux!1600
2025-08-17 15:49:17 +02:00
Bastian Blank
3e2a574473 Store build time signing key encrypted
(cherry picked from commit ca3d0e60f5)
2025-08-17 14:18:00 +02:00
Ben Hutchings
f966af394d d/rules.real: Move module installation to the image build rule
Backport just enough of commit 2fb2d2b8e1 "Merge main image build
and install into one target" to be able to apply commit ca3d0e60f5
"Store build time signing key encrypted".
2025-08-17 14:18:00 +02:00
Ben Hutchings
a8db5e9fdf d/salsa-ci.yml: Ignore pycodestyle error E241
pycodestyle reports:

    debian/bin/gencontrol.py:615:29: E241 multiple spaces after ','
    debian/bin/gencontrol.py:616:29: E241 multiple spaces after ','
    debian/bin/gencontrol.py:617:27: E241 multiple spaces after ','
    debian/bin/gencontrol.py:618:28: E241 multiple spaces after ','

Using multiple spaces to align columns is perfectly valid, and flake8
(as we use in more recent branches) doesn't complain about this.  So
add this to the ignore list.
2025-08-17 14:17:58 +02:00