diff --git a/Makefile.rhelver b/Makefile.rhelver index 57bfe96c5..70acfeb2a 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 = 7 +RHEL_RELEASE = 6 # # RHEL_REBASE_NUM diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora index e970310a8..ce8e7df49 100644 --- a/filter-aarch64.sh.fedora +++ b/filter-aarch64.sh.fedora @@ -9,6 +9,8 @@ # modifications to the overrides below. If something should be removed across # all arches, remove it in the default instead of per-arch. +overrides="aux-bridge aux-hpd-bridge cec" + driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio w1" ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell micrel myricom neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom" diff --git a/filter-modules.sh.fedora b/filter-modules.sh.fedora index 2e7b79eba..e480bf4bc 100755 --- a/filter-modules.sh.fedora +++ b/filter-modules.sh.fedora @@ -45,7 +45,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dsa ieee802154 l2t drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod intel-m10-bmc-hwmon intel_rapl_tpmi pds_vdpa hp-wmi-sensors pds-vfio-pci gpio-ljca spi-ljca i2c-ljca" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod intel-m10-bmc-hwmon intel_rapl_tpmi pds_vdpa hp-wmi-sensors pds-vfio-pci gpio-ljca spi-ljca i2c-ljca dell-smm-hwmon" # Grab the arch-specific filter list overrides source ./filter-$2.sh diff --git a/filter-ppc64le.sh.fedora b/filter-ppc64le.sh.fedora index 5794edd7c..6e4a99997 100644 --- a/filter-ppc64le.sh.fedora +++ b/filter-ppc64le.sh.fedora @@ -11,4 +11,4 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio w1" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa pds-vfio-pci" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa pds-vfio-pci nb7vpq904m" diff --git a/kernel.changelog b/kernel.changelog index 6ff3e7013..276fbd4ea 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,3 @@ -* Sat Jan 13 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.7] -- Add python3-pyyaml to buildreqs for kernel-docs (Justin M. Forbes) -Resolves: - * Sat Jan 13 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.6] - Linux v6.8.0-0.rc0.052d534373b7 Resolves: diff --git a/kernel.spec b/kernel.spec index 02b0ba32a..1dd05a09e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc0.20240113git052d534373b7.7 +%define pkgrelease 0.rc0.20240113git052d534373b7.6 %define kversion 6 %define tarfile_release 6.7-9928-g052d534373b7 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240113git052d534373b7.7%{?buildid}%{?dist} +%define specrelease 0.rc0.20240113git052d534373b7.6%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -3767,8 +3767,12 @@ fi\ # # %changelog -* Sat Jan 13 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.7] +* Mon Jan 15 2024 Justin M. Forbes [6.8.0-0.rc0.20240113git052d534373b7.6] - Add python3-pyyaml to buildreqs for kernel-docs (Justin M. Forbes) +- Add nb7vpq904m to singlemods for ppc64le (Thorsten Leemhuis) +- include drm bridge helpers in kernel-core package (Thorsten Leemhuis) +- Add dell-smm-hwmon to singlemods (Thorsten Leemhuis) +- Add drm_gem_shmem_test to mod-internal.list (Thorsten Leemhuis) * Sat Jan 13 2024 Fedora Kernel Team [6.8.0-0.rc0.052d534373b7.6] - Linux v6.8.0-0.rc0.052d534373b7 diff --git a/mod-internal.list b/mod-internal.list index a63d55f1a..364e652e8 100644 --- a/mod-internal.list +++ b/mod-internal.list @@ -18,6 +18,7 @@ drm_exec_test drm_format_helper_test drm_format_test drm_framebuffer_test +drm_gem_shmem_test drm_kunit_helpers drm_managed_test drm_mm_test diff --git a/sources b/sources index c69c51420..1a762833d 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 SHA512 (linux-6.7-9928-g052d534373b7.tar.xz) = fc10310bde268106082b9df5d4a62551ebea52329cf3528be94304d5588a1935b7322137f14709ccb6423eddb834bc6d27deee5939abc6eee3ccb539a7a7ef34 -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = cd08d54bf085f90d320225f1d0adf83521cc6aa9a34ccf89bfd654c99a3b7f1f5c57c5653c9349e91210f2b6847cecff2be2304e19b58645da9f64824452da50 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = fcb94d02d9e15d656bca5e026ac2aab6afe862c2e9cd822f497a821057d168df03e5e88dcf3c1af24da768dd246c8c54329f91fbe71859d4ccb263b76e00db51 +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 5205b256423e0576a838691cab79c936be064c32055356127e394429348ff674fafb493b02bfd27854fa545ee0529a9a67ea4349649c9db527f5a406ac295026 +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = eef613b5d60f8e86d35efd6a39bcd9bc4d393daf8ff76fae91de66849e9906725cabd044e8fc43044a67d84c2d8bdfa2f1e9c2b51974554fc91b76e741411d78