summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config21
-rw-r--r--kernel-aarch64-fedora.config21
-rwxr-xr-xkernel.spec11
-rw-r--r--patch-6.0-redhat.patch8
-rw-r--r--sources6
6 files changed, 56 insertions, 13 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 54241a0bb..a985bc34f 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 26
+RHEL_RELEASE = 27
#
# ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 173b3fcad..84b2c7e11 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -252,8 +252,17 @@ CONFIG_ANDROID=y
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
CONFIG_APDS9960=m
+CONFIG_APPLE_ADMAC=m
+CONFIG_APPLE_AIC=y
+CONFIG_APPLE_DART=m
+CONFIG_APPLE_M1_CPU_PMU=y
+CONFIG_APPLE_MAILBOX=m
CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_APPLE_PMGR_PWRSTATE=y
# CONFIG_APPLE_PROPERTIES is not set
+CONFIG_APPLE_RTKIT=m
+CONFIG_APPLE_SART=m
+CONFIG_APPLE_WATCHDOG=m
# CONFIG_APPLICOM is not set
CONFIG_APQ_GCC_8084=y
CONFIG_APQ_MMCC_8084=m
@@ -263,7 +272,7 @@ CONFIG_AR5523=m
# CONFIG_ARCH_ACTIONS is not set
# CONFIG_ARCH_AIROHA is not set
# CONFIG_ARCH_ALPINE is not set
-# CONFIG_ARCH_APPLE is not set
+CONFIG_ARCH_APPLE=y
# CONFIG_ARCH_BCM_21664 is not set
# CONFIG_ARCH_BCM_23550 is not set
# CONFIG_ARCH_BCM_281XX is not set
@@ -301,6 +310,7 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_NPCM is not set
+CONFIG_ARCH_NR_GPIO=2048
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_QCOM=y
@@ -1163,6 +1173,7 @@ CONFIG_CNIC=m
# CONFIG_CODA_FS is not set
# CONFIG_COMEDI is not set
CONFIG_COMMAND_LINE_SIZE=4096
+CONFIG_COMMON_CLK_APPLE_NCO=m
CONFIG_COMMON_CLK_AXG_AUDIO=y
CONFIG_COMMON_CLK_AXG=y
CONFIG_COMMON_CLK_AXI_CLKGEN=m
@@ -2786,6 +2797,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD756_S4882 is not set
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
@@ -5041,9 +5053,11 @@ CONFIG_NVDIMM_PFN=y
# CONFIG_NVHE_EL2_DEBUG is not set
CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
# CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set
+CONFIG_NVME_APPLE=m
# CONFIG_NVME_AUTH is not set
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
+CONFIG_NVMEM_APPLE_EFUSES=m
# CONFIG_NVMEM_IMX_IIM is not set
CONFIG_NVMEM_IMX_OCOTP=m
CONFIG_NVMEM_IMX_OCOTP_SCU=m
@@ -5212,6 +5226,8 @@ CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
# CONFIG_PCIE_ALTERA is not set
+CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000
+CONFIG_PCIE_APPLE=y
CONFIG_PCIE_ARMADA_8K=y
CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_PERFORMANCE is not set
@@ -5374,6 +5390,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_APPLE_GPIO=m
# CONFIG_PINCTRL_APQ8064 is not set
# CONFIG_PINCTRL_APQ8084 is not set
CONFIG_PINCTRL_AS3722=y
@@ -6737,6 +6754,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
CONFIG_SERIAL_QCOM_GENI=y
# CONFIG_SERIAL_RP2 is not set
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIAL_SC16IS7XX_I2C is not set
CONFIG_SERIAL_SC16IS7XX=m
CONFIG_SERIAL_SC16IS7XX_SPI=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 5e00b1ab5..7484bf166 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -252,8 +252,17 @@ CONFIG_ANDROID=y
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
CONFIG_APDS9960=m
+CONFIG_APPLE_ADMAC=m
+CONFIG_APPLE_AIC=y
+CONFIG_APPLE_DART=m
+CONFIG_APPLE_M1_CPU_PMU=y
+CONFIG_APPLE_MAILBOX=m
CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_APPLE_PMGR_PWRSTATE=y
# CONFIG_APPLE_PROPERTIES is not set
+CONFIG_APPLE_RTKIT=m
+CONFIG_APPLE_SART=m
+CONFIG_APPLE_WATCHDOG=m
# CONFIG_APPLICOM is not set
CONFIG_APQ_GCC_8084=y
CONFIG_APQ_MMCC_8084=m
@@ -263,7 +272,7 @@ CONFIG_AR5523=m
# CONFIG_ARCH_ACTIONS is not set
# CONFIG_ARCH_AIROHA is not set
# CONFIG_ARCH_ALPINE is not set
-# CONFIG_ARCH_APPLE is not set
+CONFIG_ARCH_APPLE=y
# CONFIG_ARCH_BCM_21664 is not set
# CONFIG_ARCH_BCM_23550 is not set
# CONFIG_ARCH_BCM_281XX is not set
@@ -301,6 +310,7 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_NPCM is not set
+CONFIG_ARCH_NR_GPIO=2048
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_QCOM=y
@@ -1163,6 +1173,7 @@ CONFIG_CNIC=m
# CONFIG_CODA_FS is not set
# CONFIG_COMEDI is not set
CONFIG_COMMAND_LINE_SIZE=4096
+CONFIG_COMMON_CLK_APPLE_NCO=m
CONFIG_COMMON_CLK_AXG_AUDIO=y
CONFIG_COMMON_CLK_AXG=y
CONFIG_COMMON_CLK_AXI_CLKGEN=m
@@ -2770,6 +2781,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD756_S4882 is not set
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
@@ -5021,9 +5033,11 @@ CONFIG_NVDIMM_PFN=y
# CONFIG_NVHE_EL2_DEBUG is not set
CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
# CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set
+CONFIG_NVME_APPLE=m
# CONFIG_NVME_AUTH is not set
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
+CONFIG_NVMEM_APPLE_EFUSES=m
# CONFIG_NVMEM_IMX_IIM is not set
CONFIG_NVMEM_IMX_OCOTP=m
CONFIG_NVMEM_IMX_OCOTP_SCU=m
@@ -5191,6 +5205,8 @@ CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
# CONFIG_PCIE_ALTERA is not set
+CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000
+CONFIG_PCIE_APPLE=y
CONFIG_PCIE_ARMADA_8K=y
CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_PERFORMANCE is not set
@@ -5353,6 +5369,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_APPLE_GPIO=m
# CONFIG_PINCTRL_APQ8064 is not set
# CONFIG_PINCTRL_APQ8084 is not set
CONFIG_PINCTRL_AS3722=y
@@ -6716,6 +6733,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
CONFIG_SERIAL_QCOM_GENI=y
# CONFIG_SERIAL_RP2 is not set
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIAL_SC16IS7XX_I2C is not set
CONFIG_SERIAL_SC16IS7XX=m
CONFIG_SERIAL_SC16IS7XX_SPI=y
diff --git a/kernel.spec b/kernel.spec
index 36c1c11e0..8c0c04457 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,13 +124,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 6.0.0
%define patchversion 6.0
-%define pkgrelease 0.rc3.20220830gitdcf8e5633e2e.26
+%define pkgrelease 0.rc3.20220901gitc5e4d5e99162.27
%define kversion 6
-%define tarfile_release 6.0-rc3-7-gdcf8e5633e2e
+%define tarfile_release 6.0-rc3-31-gc5e4d5e99162
# This is needed to do merge window version magic
%define patchlevel 0
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20220830gitdcf8e5633e2e.26%{?buildid}%{?dist}
+%define specrelease 0.rc3.20220901gitc5e4d5e99162.27%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.0.0
@@ -3147,6 +3147,11 @@ fi
#
#
%changelog
+* Thu Sep 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc3.c5e4d5e99162.27]
+- redhat/Makefile: Always set UPSTREAM (Prarit Bhargava)
+- redhat/configs: aarch64: Turn on Apple Silicon configs for Fedora (Eric Curtin)
+- Linux v6.0.0-0.rc3.c5e4d5e99162
+
* Tue Aug 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc3.dcf8e5633e2e.26]
- Add cpumask_kunit to mod-internal.list (Justin M. Forbes)
- config - consolidate disabled MARCH options on s390x (Dan Horák)
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index 98bdefa2e..84949fbd0 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -1897,7 +1897,7 @@ index fe6efb24d151..85b185391da7 100644
+
#endif
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index 806448173033..353b165e6db7 100644
+index 60fff133c0b1..fa0aa514c70f 100644
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
@@ -395,6 +395,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
@@ -1910,7 +1910,7 @@ index 806448173033..353b165e6db7 100644
#ifdef CONFIG_PERF_EVENTS
LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
-index 84a0d7e02176..0270b68a9dd6 100644
+index 3aa6030302f5..23b63de268a3 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1557,6 +1557,12 @@
@@ -2528,7 +2528,7 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h
-index 1bc362cb413f..961600d0572d 100644
+index 7bd0c490703d..7779eaf1ffa1 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -475,6 +475,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
@@ -3012,7 +3012,7 @@ index 87cbdc64d272..18555cf18da7 100644
static int __init lockdown_lsm_init(void)
diff --git a/security/security.c b/security/security.c
-index 14d30fec8a00..df70ea0b84a1 100644
+index 4b95de24bc8d..10047790e96e 100644
--- a/security/security.c
+++ b/security/security.c
@@ -2623,6 +2623,12 @@ int security_locked_down(enum lockdown_reason what)
diff --git a/sources b/sources
index a99058948..a936b1f39 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0-rc3-7-gdcf8e5633e2e.tar.xz) = 629f0799167507f6e15bac0939bdf0bc22901b46117c577f939c21acbced042c4c4afb4e72278facae592691a693f2305d162bf5e1b0de4fa78d9fd3e082cb87
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 90ac73fea74324a5433e9ca341148b078d12dfeb74cfb2450013e921ea3f984a17ba323774c6e4604284da7be168feea19fd51140cdfbabfc8feae43a3920ccd
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = c4750e9f797844b9398b87bd82aec1fba09001a6f37508ed03bd61675e90c5e61a5c4a2b50a697dec50034f2b1e848e742ac09cccac1a043a2a54dd66feffa67
+SHA512 (linux-6.0-rc3-31-gc5e4d5e99162.tar.xz) = f8ef386a3129caacb4c8b72f8e223c4f9358bf5fe29fbebde35274a594cf5c3b68a60dacdcf275a88e3ca888006211e1a52d33101f192b2031b5368c7d3078a3
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 24efda87a832194bc8f7832c6462127606a60dc0b7ba260443f7da53658131d6fef177af66e9a46e95942f4e6b13545fa6641a9a127e56254dc61041dfc0ab3d
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = aa84fe7ec86c38cd54cee2da8135693304dedd0f6bc87066c44f951ddabf58f38be79a333c10d7659aad43122fb6f6d4f61ad748d14bfa479dbbe2523f3b6ee7
generated by cgit (git 2.34.1) at 2024-11-11 20:08:32 +0000