[packages/kernel/LINUX_4_4] Up to cip80 kernel (+ revert of two wrongly backported patches)
arekm
arekm at pld-linux.org
Wed Oct 18 13:52:44 CEST 2023
commit eae57a8e13001f276d7317a50d6e29f69c0b5547
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Oct 18 13:52:17 2023 +0200
Up to cip80 kernel (+ revert of two wrongly backported patches)
kernel-aufs4.patch | 2 +-
kernel-imq.patch | 2 +-
kernel-multiarch.config | 21 ++++++++++++++++++---
kernel-small_fixes.patch | 23 +++++++++++++++++++++++
kernel-vserver-2.3.patch | 6 +++---
kernel.spec | 19 +++++++++++--------
6 files changed, 57 insertions(+), 16 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0e4f9c6b..2f5092ae 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -18,7 +18,7 @@
%bcond_without source # don't build kernel-source package
%bcond_without doc # don't build kernel-doc package
%bcond_without pcmcia # don't build pcmcia
-%bcond_without firmware # don't build firmware into main package
+%bcond_with firmware # don't build firmware into main package
%bcond_with verbose # verbose build (V=1)
@@ -70,9 +70,10 @@
%define have_pcmcia 0
%endif
-%define rel 1
+%define rel 2
%define basever 4.4
%define postver .302
+%define cipver cip80
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -120,9 +121,11 @@ Release: %{rel}
Epoch: 3
License: GPL v2
Group: Base/Kernel
-Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
-%if "%{postver}" != ".0"
+# Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
+# https://wiki.linuxfoundation.org/civilinfrastructureplatform/start
+Source0: https://www.kernel.org/pub/linux/kernel/projects/cip/4.4/linux-cip-%{basever}%{postver}-%{cipver}.tar.xz
+# Source0-md5: bc45ba3bcbe51588bd96e1270c16bf43
+%if 0 && "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
# Patch0-md5: 4aa4dc0f2534cf9dd0c964e0b692fe8b
%endif
@@ -355,7 +358,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%endif
%define topdir %{_builddir}/%{name}-%{version}
-%define srcdir %{topdir}/linux-%{basever}
+%define srcdir %{topdir}/linux-cip-%{basever}%{postver}-%{cipver}
%define objdir %{topdir}/%{targetobj}
%define targetobj %{_target_base_arch}-gcc-%(%{__cc} -dumpversion)
@@ -646,9 +649,9 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
%setup -qc
ln -s %{SOURCE7} kernel-module-build.pl
ln -s %{SOURCE10} Makefile
-cd linux-%{basever}
+cd linux-cip-%{basever}%{postver}-%{cipver}
-%if "%{postver}" != ".0"
+%if 0 && "%{postver}" != ".0"
%patch0 -p1
%endif
diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index 66ac583d..8b18b400 100644
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -35769,7 +35769,7 @@ diff -urNp -x '*.orig' linux-4.4/security/security.c linux-4.4/security/security
{
@@ -795,6 +804,7 @@ int security_mmap_file(struct file *file
return ret;
- return ima_file_mmap(file, prot);
+ return ima_file_mmap(file, prot, prot_adj, flags);
}
+EXPORT_SYMBOL(security_mmap_file);
diff --git a/kernel-imq.patch b/kernel-imq.patch
index c15e8160..de06db54 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1208,7 +1208,7 @@ diff -urNp -x '*.orig' linux-4.4/include/net/netfilter/nf_queue.h linux-4.4/incl
+void nf_unregister_queue_imq_handler(void);
+#endif
- void nf_queue_entry_get_refs(struct nf_queue_entry *entry);
+ bool nf_queue_entry_get_refs(struct nf_queue_entry *entry);
void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
diff -urNp -x '*.orig' linux-4.4/include/net/pkt_sched.h linux-4.4/include/net/pkt_sched.h
--- linux-4.4/include/net/pkt_sched.h 2016-01-11 00:01:32.000000000 +0100
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 35e895a5..1d9407aa 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -476,6 +476,7 @@ BCMA_DEBUG all=n
BLK_DEV all=y
BLK_DEV_NULL_BLK all=m
BLK_DEV_FD all=m sparc=y
+BLK_DEV_FD_RAWCMD all=n
MAC_FLOPPY ppc=m
PARIDE all=m
#- file drivers/block/paride/Kconfig goes here
@@ -949,6 +950,7 @@ EFI_VARS_PSTORE all=m
EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
EFI_RUNTIME_MAP all=y
EFI_FAKE_MEMMAP all=n
+EFI_CAPSULE_LOADER all=m
#-
#- *** FILE: drivers/firmware/google/Kconfig ***
@@ -980,6 +982,7 @@ DEBUG_GPIO all=n
GPIO_SYSFS all=y
GPIO_AMDPT all=m
GPIO_DWAPB all=m
+GPIO_EXAR all=m
GPIO_GENERIC_PLATFORM all=m
GPIO_ICH all=m
GPIO_LYNXPOINT all=y
@@ -1719,6 +1722,7 @@ NAU7802 all=m
QCOM_SPMI_IADC all=m
QCOM_SPMI_VADC all=m
TI_ADC081C all=m
+TI_ADC108S102 all=m
TI_ADC128S052 all=m
TI_AM335X_ADC all=m
VIPERBOARD_ADC all=m
@@ -5966,6 +5970,7 @@ RTC_DRV_ISL12057 all=m
RTC_DRV_X1205 all=m
RTC_DRV_PCF2127 all=m
RTC_DRV_PCF8523 all=m
+RTC_DRV_PCF85363 all=m
RTC_DRV_PCF8563 all=m
RTC_DRV_PCF85063 all=m
RTC_DRV_PCF8583 all=m sparc=n
@@ -7159,6 +7164,7 @@ SERIAL_8250_DEPRECATED_OPTIONS all=y
SERIAL_8250_PNP all=y
SERIAL_8250_CONSOLE all=y
SERIAL_8250_PCI all=y
+SERIAL_8250_EXAR all=y
SERIAL_8250_CS all=m
SERIAL_8250_NR_UARTS all=8
SERIAL_8250_RUNTIME_UARTS all=4
@@ -7748,8 +7754,6 @@ BACKLIGHT_BD6107 all=m
#- *** FILE: drivers/video/console/Kconfig ***
#-
VGA_CONSOLE all=y
-VGACON_SOFT_SCROLLBACK all=n ia64=y
-VGACON_SOFT_SCROLLBACK_SIZE ia64=64
MDA_CONSOLE alpha=m i386=m
DUMMY_CONSOLE all=y
DUMMY_CONSOLE_COLUMNS all=80
@@ -7997,6 +8001,7 @@ W1_SLAVE_BQ27000 all=m
WATCHDOG all=y
WATCHDOG_CORE all=y
WATCHDOG_NOWAYOUT all=n
+WATCHDOG_HANDLE_BOOT_ENABLED all=y
#- Watchdog Device Drivers
SOFT_WATCHDOG all=m
DA9052_WATCHDOG all=m
@@ -8812,6 +8817,7 @@ BPF_SYSCALL all=y
BPF_JIT_ALWAYS_ON all=y
SHMEM all=y
AIO all=y
+BPF_UNPRIV_DEFAULT_OFF all=y
USERFAULTFD all=y
PCI_QUIRKS all=y
EMBEDDED all=n
@@ -9093,6 +9099,7 @@ TEST_UDELAY all=m
TEST_STATIC_KEYS all=m
#- file samples/Kconfig goes here
#- file lib/Kconfig.kgdb goes here
+#- file lib/Kconfig.ubsan goes here
#-
#- *** FILE: lib/Kconfig.kasan ***
@@ -9117,6 +9124,11 @@ KDB_CONTINUE_CATASTROPHIC all=0
#-
KMEMCHECK all=n
+#-
+#- *** FILE: lib/Kconfig.ubsan ***
+#-
+UBSAN all=n
+
#-
#- *** FILE: lib/fonts/Kconfig ***
#-
@@ -9186,7 +9198,8 @@ IDLE_PAGE_TRACKING all=y
#-
PAGE_EXTENSION all=n
DEBUG_PAGEALLOC all=n
-PAGE_POISONING sparc=n ia64=n alpha=n
+PAGE_POISONING all=n
+PAGE_POISONING_ZERO all=n
#-
#- *** FILE: net/6lowpan/Kconfig ***
@@ -10894,6 +10907,8 @@ USB_DWC3_DEBUG all=n
USB_FUSBH200_HCD all=m
USB_RIO500 all=m
USB_WPAN_HCD all=m
+VGACON_SOFT_SCROLLBACK all=n ia64=y
+VGACON_SOFT_SCROLLBACK_SIZE ia64=64
VIDEO_BTCX all=m sparc=
VIDEO_BWQCAM all=m
VIDEO_CQCAM all=m
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 15cbe05b..8e5f6b25 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -51,3 +51,26 @@ diff -urNp -x '*.orig' linux-4.4/scripts/mod/modpost.c linux-4.4/scripts/mod/mod
if (IS_ERR(data->edev)) {
dev_err(&pdev->dev, "failed to allocate extcon device\n");
return -ENOMEM;
+--- b/include/net/neighbour.h
++++ a/include/net/neighbour.h
+@@ -276,5 +276,10 @@
+
+
++static inline bool neigh_key_eq16(const struct neighbour *n, const void *pkey)
++{
++ return *(const u16 *)n->primary_key == *(const u16 *)pkey;
++}
++
+ static inline bool neigh_key_eq32(const struct neighbour *n, const void *pkey)
+ {
+ return *(const u32 *)n->primary_key == *(const u32 *)pkey;
+--- b/drivers/staging/rdma/hfi1/chip.c
++++ a/drivers/staging/rdma/hfi1/chip.c
+@@ -7962,7 +7962,6 @@
+
+ if (dd->synth_stats_timer.data)
+ del_timer_sync(&dd->synth_stats_timer);
+- cancel_work_sync(&dd->update_cntr_work);
+ dd->synth_stats_timer.data = 0;
+ ppd = (struct hfi1_pportdata *)(dd + 1);
+ for (i = 0; i < dd->num_pports; i++, ppd++) {
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 28a71f96..407b207a 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1142,9 +1142,9 @@ diff -urNp -x '*.orig' linux-4.4/drivers/md/dm-ioctl.c linux-4.4/drivers/md/dm-i
--- linux-4.4/drivers/md/dm-ioctl.c 2021-02-24 16:56:10.939059645 +0100
+++ linux-4.4/drivers/md/dm-ioctl.c 2021-02-24 16:56:24.546154835 +0100
@@ -16,6 +16,7 @@
- #include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
#include <linux/compat.h>
+ #include <linux/nospec.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
@@ -23268,7 +23268,7 @@ diff -urNp -x '*.orig' linux-4.4/net/core/sock.c linux-4.4/net/core/sock.c
+
#ifdef CONFIG_NET_RX_BUSY_POLL
sk->sk_napi_id = 0;
- sk->sk_ll_usec = sysctl_net_busy_read;
+ sk->sk_ll_usec = READ_ONCE(sysctl_net_busy_read);
diff -urNp -x '*.orig' linux-4.4/net/ipv4/af_inet.c linux-4.4/net/ipv4/af_inet.c
--- linux-4.4/net/ipv4/af_inet.c 2021-02-24 16:56:12.069095231 +0100
+++ linux-4.4/net/ipv4/af_inet.c 2021-02-24 16:56:24.622823916 +0100
@@ -24408,7 +24408,7 @@ diff -urNp -x '*.orig' linux-4.4/net/ipv6/udp.c linux-4.4/net/ipv6/udp.c
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@@ -76,32 +77,60 @@ static u32 udp6_ehashfn(const struct net
- udp_ipv6_hash_secret + net_hash_mix(net));
+ udp6_ehash_secret + net_hash_mix(net));
}
-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/eae57a8e13001f276d7317a50d6e29f69c0b5547
More information about the pld-cvs-commit
mailing list