diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:38 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:46:06 +0000 |
commit | 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch) | |
tree | 968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/config | |
parent | Merging upstream version 5.10.216. (diff) | |
download | linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip |
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/config')
-rw-r--r-- | debian/config/config | 2 | ||||
-rw-r--r-- | debian/config/config.cloud | 1 | ||||
-rw-r--r-- | debian/config/defines | 2 | ||||
-rw-r--r-- | debian/config/m68k/config | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/debian/config/config b/debian/config/config index e6912452b..92da067db 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5185,7 +5185,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set CONFIG_MOXA_SMARTIO=m CONFIG_SYNCLINK_GT=m -CONFIG_N_GSM=m +# CONFIG_N_GSM is not set CONFIG_NOZOMI=m # CONFIG_TRACE_SINK is not set diff --git a/debian/config/config.cloud b/debian/config/config.cloud index 0a68468ae..cc6b45c82 100644 --- a/debian/config/config.cloud +++ b/debian/config/config.cloud @@ -1261,7 +1261,6 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_ISI is not set # CONFIG_N_HDLC is not set -# CONFIG_N_GSM is not set # CONFIG_NOZOMI is not set ## diff --git a/debian/config/defines b/debian/config/defines index 34f1fde2d..e3e7a3ab4 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: 28progress6u1 +abiname: 29 ignore-changes: __cpuhp_* __udp_gso_segment diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 28f0d42f4..3f4f641c9 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -540,7 +540,6 @@ CONFIG_BVME6000_SCSI=m CONFIG_VT=y CONFIG_VT_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_N_GSM is not set ## ## file: drivers/tty/serial/Kconfig |