pentoo-sources: 5.12.1

sys-kernel/pentoo-sources/Manifest

@@ -4,5 +4,9 @@ DIST genpatches-5.10-29.extras.tar.xz 1772 BLAKE2B 30b3a5b57b99b046872907007fabf
 DIST genpatches-5.11-19.base.tar.xz 660328 BLAKE2B 89eea3501d394d62cb116afdd0350985403a98edf6e7a479bc67efc4888d826a4a7a46c0d28e4dda5685af4095066dad26c639b4c66265fb68cbdb2cc9d9c823 SHA512 edd96b0ae213dfe7ea6d467cf738a0a71bb032914ead77646dabe512adb9d36ea33e479e28ebc0ef3df4ea96fa1d2ee2830bacc0965559530eac9cce0ede4b93
 DIST genpatches-5.11-19.experimental.tar.xz 69212 BLAKE2B 1f26212fe547d3d6786a277952405208b8d35127ce743b3744e3642814fca9e9c2fd78cc28fe4344f64f3d686082bb963a527e4e464220c032b3a78f08629569 SHA512 8dd4958118aaf899eda4d62a9f7fa0cb95ee561348c0d784aa3d7e6b5bfcbdc97a2259b3d2f578448e32e080b6c4a5fc788e2c5570bdcd0f255e815a6215dd23
 DIST genpatches-5.11-19.extras.tar.xz 1772 BLAKE2B 4d5771f406d8df3752f7512359e4f98a2f8caa07ef230785da07ba5c4241403f940a856b7be4552ca9a48358573621b8bb8cf069077bee0282554ce60d92769f SHA512 615a895738ccdea871dc45502da6695f42d28b6619530683100994053dbc01b9f0d3fd2d550f73305cbe8e53fcf3c1265364bd17de926107a1485302f4f1d65b
+DIST genpatches-5.12-2.base.tar.xz 5712 BLAKE2B 9c7b0ba6c7b68a517c1be97f95ddbc597bb01468159cd6c6d1c2eb01c74dcc6c6356373a8f0dad482f039f2bb9bfd49fcdf8567ba2e9fddfe6e70424de1b665e SHA512 12f200cb5359866c4763803b0ebb376d8433a108a313aed3a0500e51112484df0a0980d88358f2e1ab8a5da33792b1d5e611487733a61a2defbfb74c3ab1b21b
+DIST genpatches-5.12-2.experimental.tar.xz 70040 BLAKE2B b55565f30c97fd682dc0925f11787c8cf031324c990f4dca82d54f7b2208e8f43206296ec6459e9d92afec441f3cc5d0f4e6216b086a74c88dba90f815cd9f44 SHA512 d92a5e2e94414a84eef864027052caad54efc56c3f47c50d685e8af4ec57fbd19ad5f3d8ed2be941bce8d0c5d83a217dadca7967b8c7383c53354c3198044ffd
+DIST genpatches-5.12-2.extras.tar.xz 1768 BLAKE2B 962e474d42573f952b752894e614615e7eee82b5df357c6ae0454669f989dcf93b7b74008eb659398fe9ca0f4e7ac85e235f20356d109de1ded1037346df70c1 SHA512 1110240143f4216805b91291fe88ebc413aea8a87b6985d9b00a0ab14b193ea1a1a0b4882ffc64c465acb90cfc725de15b057fcfb28b458d833ca6505cb0737f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
+DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d

sys-kernel/pentoo-sources/files/4001_cfg80211_remove_maxchannels.patch

@@ -0,0 +1,70 @@
+From d1d61db1d31cd5ef5c0420dad3e922c441cd89bc Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Thu, 6 May 2021 22:10:38 +0200
+Subject: [PATCH] cfg80211: remove CFG80211_MAX_NUM_DIFFERENT_CHANNELS
+
+We no longer need to put any limits here, hardware will and
+mac80211-hwsim can do whatever it likes. The reason we had
+this was some accounting code (still mentioned in the comment)
+but that code was deleted in commit c781944b71f8 ("cfg80211:
+Remove unused cfg80211_can_use_iftype_chan()").
+
+Change-Id: Iac4da68d54b9f1fdc18a03586bbe06aeb9515425
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+ drivers/net/wireless/mac80211_hwsim.c | 5 -----
+ include/net/cfg80211.h                | 2 --
+ net/wireless/core.c                   | 8 --------
+ 3 files changed, 15 deletions(-)
+
+diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
+index fa7d4c20dc13..8fe42114d8d6 100644
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -3791,11 +3791,6 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
+ 		return -EINVAL;
+ 	}
+ 
+-	if (param.channels > CFG80211_MAX_NUM_DIFFERENT_CHANNELS) {
+-		GENL_SET_ERR_MSG(info, "too many channels specified");
+-		return -EINVAL;
+-	}
+-
+ 	if (info->attrs[HWSIM_ATTR_NO_VIF])
+ 		param.no_vif = true;
+ 
+diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
+index 394c4269901c..473d291b9017 100644
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -1244,8 +1244,6 @@ struct cfg80211_csa_settings {
+ 	u8 count;
+ };
+ 
+-#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
+-
+ /**
+  * struct iface_combination_params - input parameters for interface combinations
+  *
+diff --git a/net/wireless/core.c b/net/wireless/core.c
+index a2785379df6e..04b8fbae3943 100644
+--- a/net/wireless/core.c
++++ b/net/wireless/core.c
+@@ -576,14 +576,6 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
+ 		if (WARN_ON(!c->num_different_channels))
+ 			return -EINVAL;
+ 
+-		/*
+-		 * Put a sane limit on maximum number of different
+-		 * channels to simplify channel accounting code.
+-		 */
+-		if (WARN_ON(c->num_different_channels >
+-				CFG80211_MAX_NUM_DIFFERENT_CHANNELS))
+-			return -EINVAL;
+-
+ 		/* DFS only works on one channel. */
+ 		if (WARN_ON(c->radar_detect_widths &&
+ 			    (c->num_different_channels > 1)))
+-- 
+2.30.2
+

sys-kernel/pentoo-sources/files/config-amd64-latest

@@ -1 +1 @@
-config-amd64-5.11.16
+config-amd64-5.12.1

sys-kernel/pentoo-sources/files/config-x86-latest

@@ -1 +1 @@
-config-x86-5.11.16
+config-x86-5.12.1

sys-kernel/pentoo-sources/pentoo-sources-5.12.1.ebuild

@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="2"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="amd64 x86"
+HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/"
+IUSE="experimental pax_kernel"
+
+DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_setup() {
+	if use pax_kernel; then
+		die "pax_kernel is no longer available, you MUST ensure the use flag is no longer set"
+	fi
+}
+
+src_unpack() {
+	#default
+	kernel-2_src_unpack
+	#penpatches
+	eapply -s "${FILESDIR}/4004_zd1211rw-inject+dbi-fix-4.7ish.patch"
+	eapply -s "${FILESDIR}/4005_ipw2200-inject-4.7ish.patch"
+	eapply -s "${FILESDIR}/4400_logo_larry_the_cow.patch"
+	#backported from 5.14 by johill for us https://p.sipsolutions.net/4856546e581cce26.txt
+	eapply -s "${FILESDIR}/4001_cfg80211_remove_maxchannels.patch"
+}
+
+src_install() {
+	kernel-2_src_install
+	insinto /usr/share/${PN}
+	if use amd64; then
+		doins "${FILESDIR}"/config-amd64-${PVR}
+	elif use x86; then
+		doins "${FILESDIR}"/config-x86-${PVR}
+	fi
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	ewarn "The official pentoo kernel config is now installed with the kernel in /usr/share/pentoo-sources"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}