release 6.12.20

debian/changelog

@@ -1,3 +1,31 @@
+linux (6.12.20-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.20
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sun, 23 Mar 2025 03:14:29 +0300
+
+linux (6.12.19-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.19
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 13 Mar 2025 20:47:49 +0300
+
+linux (6.12.18-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.18
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sat, 08 Mar 2025 06:44:24 +0300
+
+linux (6.12.17-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.17
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 27 Feb 2025 16:35:33 +0300
+
 linux (6.12.16-1) sid; urgency=medium
 
   * New upstream stable update:

debian/config/amd64/config.cloud

@@ -429,11 +429,6 @@ CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
 CONFIG_GOOGLE_VPD=m
 
-##
-## file: drivers/firmware/imx/Kconfig
-##
-# CONFIG_IMX_SCMI_MISC_DRV is not set
-
 ##
 ## file: drivers/gnss/Kconfig
 ##

debian/config/amd64/config.mobile

@@ -701,11 +701,6 @@ CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY=m
 CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=y
 # CONFIG_GOOGLE_VPD is not set
 
-##
-## file: drivers/firmware/imx/Kconfig
-##
-CONFIG_IMX_SCMI_MISC_DRV=m
-
 ##
 ## file: drivers/fsi/Kconfig
 ##
@@ -8584,6 +8579,8 @@ CONFIG_DRM_AUX_BRIDGE=m
 CONFIG_DRM_AUX_HPD_BRIDGE=m
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_BUDDY=m
+CONFIG_DRM_CLIENT_SELECTION=y
+CONFIG_DRM_CLIENT_SETUP=y
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_DP_TUNNEL=y

debian/config/amd64/config.vm

@@ -516,11 +516,6 @@ CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
 CONFIG_GOOGLE_VPD=m
 
-##
-## file: drivers/firmware/imx/Kconfig
-##
-# CONFIG_IMX_SCMI_MISC_DRV is not set
-
 ##
 ## file: drivers/gnss/Kconfig
 ##

debian/config/config

@@ -1182,11 +1182,6 @@ CONFIG_PCIE_PTM=y
 ##
 # CONFIG_CHROME_PLATFORMS is not set
 
-##
-## file: drivers/platform/cznic/Kconfig
-##
-# CONFIG_CZNIC_PLATFORMS is not set
-
 ##
 ## file: drivers/platform/mellanox/Kconfig
 ##

debian/patches/bugfix/all/drm-amdkfd-Fix-user-queue-validation-on-Gfx7-8.patch

@@ -0,0 +1,61 @@
+From: Philip Yang <Philip.Yang@amd.com>
+Date: Wed, 29 Jan 2025 12:37:30 -0500
+Subject: drm/amdkfd: Fix user queue validation on Gfx7/8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Origin: https://gitlab.freedesktop.org/drm/kernel/-/commit/e7a477735f1771b9a9346a5fbd09d7ff0641723a
+Bug-Debian: https://bugs.debian.org/1093124
+
+To workaround queue full h/w issue on Gfx7/8, when application create
+AQL queue, the ring buffer bo allocate size is queue_size/2 and
+map queue_size ring buffer to GPU in 2 pieces using 2 attachments, each
+attachment map size is queue_size/2, with same ring_bo backing memory.
+
+For Gfx7/8, user queue buffer validation should use queue_size/2 to
+verify ring_bo allocation and mapping size.
+
+Fixes: 68e599db7a54 ("drm/amdkfd: Validate user queue buffers")
+Suggested-by: Tomáš Trnka <trnka@scm.com>
+Signed-off-by: Philip Yang <Philip.Yang@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
+@@ -233,6 +233,7 @@ void kfd_queue_buffer_put(struct amdgpu_
+ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_properties *properties)
+ {
+ 	struct kfd_topology_device *topo_dev;
++	u64 expected_queue_size;
+ 	struct amdgpu_vm *vm;
+ 	u32 total_cwsr_size;
+ 	int err;
+@@ -241,6 +242,15 @@ int kfd_queue_acquire_buffers(struct kfd
+ 	if (!topo_dev)
+ 		return -EINVAL;
+ 
++	/* AQL queues on GFX7 and GFX8 appear twice their actual size */
++	if (properties->type == KFD_QUEUE_TYPE_COMPUTE &&
++	    properties->format == KFD_QUEUE_FORMAT_AQL &&
++	    topo_dev->node_props.gfx_target_version >= 70000 &&
++	    topo_dev->node_props.gfx_target_version < 90000)
++		expected_queue_size = properties->queue_size / 2;
++	else
++		expected_queue_size = properties->queue_size;
++
+ 	vm = drm_priv_to_vm(pdd->drm_priv);
+ 	err = amdgpu_bo_reserve(vm->root.bo, false);
+ 	if (err)
+@@ -255,7 +265,7 @@ int kfd_queue_acquire_buffers(struct kfd
+ 		goto out_err_unreserve;
+ 
+ 	err = kfd_queue_buffer_get(vm, (void *)properties->queue_address,
+-				   &properties->ring_bo, properties->queue_size);
++				   &properties->ring_bo, expected_queue_size);
+ 	if (err)
+ 		goto out_err_unreserve;
+ 

debian/patches/debian/gitignore.patch

@@ -1,55 +0,0 @@
-From: Ian Campbell <ijc@hellion.org.uk>
-Date: Thu, 17 Jan 2013 08:55:21 +0000
-Subject: Tweak gitignore for Debian pkg-kernel using git
-Forwarded: not-needed
-
-[bwh: Tweak further for pure git]
----
- .gitignore | 25 +++++++------------------
- 1 file changed, 7 insertions(+), 18 deletions(-)
-
---- a/.gitignore
-+++ b/.gitignore
-@@ -79,11 +79,6 @@ modules.order
- /rpmbuild/
- 
- #
--# Debian directory (make deb-pkg)
--#
--/debian/
--
--#
- # Snap directory (make snap-pkg)
- #
- /snap/
-@@ -100,19 +95,6 @@ modules.order
- /pacman/
- 
- #
--# We don't want to ignore the following even if they are dot-files
--#
--!.clang-format
--!.cocciconfig
--!.editorconfig
--!.get_maintainer.ignore
--!.gitattributes
--!.gitignore
--!.kunitconfig
--!.mailmap
--!.rustfmt.toml
--
--#
- # Generated include files
- #
- /include/config/
-@@ -177,3 +159,10 @@ sphinx_*/
- 
- # Rust analyzer configuration
- /rust-project.json
-+
-+#
-+# Debian packaging: ignore everything at the top level, since it isn't
-+# included in our repository
-+#
-+/*
-+!/debian/

debian/patches/debian/kernelvariables.patch

@@ -54,7 +54,7 @@ use of $(ARCH) needs to be moved after this.
  KCONFIG_CONFIG	?= .config
  export KCONFIG_CONFIG
  
-@@ -525,6 +495,35 @@ RUSTFLAGS_KERNEL =
+@@ -529,6 +499,35 @@ RUSTFLAGS_KERNEL =
  AFLAGS_KERNEL	=
  LDFLAGS_vmlinux =
  

debian/patches/debian/makefile-make-compiler-version-comparison-optional.patch

@@ -20,7 +20,7 @@ is non-empty.
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -1813,7 +1813,7 @@ PHONY += prepare
+@@ -1825,7 +1825,7 @@ PHONY += prepare
  # now expand this into a simple variable to reduce the cost of shell evaluations
  prepare: CC_VERSION_TEXT := $(CC_VERSION_TEXT)
  prepare:

debian/patches/features/all/security-perf-allow-further-restriction-of-perf_event_open.patch

@@ -50,7 +50,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
  /* Minimum for 512 kiB + 1 user control page */
  int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -12682,6 +12687,9 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -12691,6 +12696,9 @@ SYSCALL_DEFINE5(perf_event_open,
  	if (err)
  		return err;
  

debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch

@@ -42,7 +42,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  			Ignore sysrq setting - this boot parameter will
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -3164,6 +3164,14 @@ config COMPAT_32
+@@ -3165,6 +3165,14 @@ config COMPAT_32
  	select HAVE_UID16
  	select OLD_SIGSUSPEND3
  

debian/patches/krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch

@@ -30,7 +30,7 @@ this reverts following commit:
 
 --- a/tools/objtool/check.c
 +++ b/tools/objtool/check.c
-@@ -4926,10 +4926,14 @@ int check(struct objtool_file *file)
+@@ -4897,10 +4897,14 @@ int check(struct objtool_file *file)
  	}
  
  out:

debian/patches/misc-bbr3/0001-net-tcp_bbr-broaden-app-limited-rate-sample-detectio.patch

@@ -32,7 +32,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3961,6 +3961,7 @@ static int tcp_ack(struct sock *sk, cons
+@@ -3967,6 +3967,7 @@ static int tcp_ack(struct sock *sk, cons
  
  	prior_fack = tcp_is_sack(tp) ? tcp_highest_sack_seq(tp) : tp->snd_una;
  	rs.prior_in_flight = tcp_packets_in_flight(tp);

debian/patches/misc-bbr3/0002-net-tcp_bbr-v2-shrink-delivered_mstamp-first_tx_msta.patch

@@ -25,7 +25,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -884,6 +884,11 @@ static inline u32 tcp_stamp_us_delta(u64
+@@ -901,6 +901,11 @@ static inline u32 tcp_stamp_us_delta(u64
  	return max_t(s64, t1 - t0, 0);
  }
  
@@ -37,7 +37,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  /* provide the departure time in us unit */
  static inline u64 tcp_skb_timestamp_us(const struct sk_buff *skb)
  {
-@@ -973,9 +978,9 @@ struct tcp_skb_cb {
+@@ -990,9 +995,9 @@ struct tcp_skb_cb {
  			/* pkts S/ACKed so far upon tx of skb, incl retrans: */
  			__u32 delivered;
  			/* start of send pipeline phase */

debian/patches/misc-bbr3/0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch

@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -981,6 +981,10 @@ struct tcp_skb_cb {
+@@ -998,6 +998,10 @@ struct tcp_skb_cb {
  			u32 first_tx_mstamp;
  			/* when we reached the "delivered" count */
  			u32 delivered_mstamp;
@@ -38,7 +38,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		} tx;   /* only used for outgoing skbs */
  		union {
  			struct inet_skb_parm	h4;
-@@ -1137,6 +1141,7 @@ struct rate_sample {
+@@ -1154,6 +1158,7 @@ struct rate_sample {
  	u64  prior_mstamp; /* starting timestamp for interval */
  	u32  prior_delivered;	/* tp->delivered at "prior_mstamp" */
  	u32  prior_delivered_ce;/* tp->delivered_ce at "prior_mstamp" */
@@ -46,7 +46,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	s32  delivered;		/* number of packets delivered over interval */
  	s32  delivered_ce;	/* number of packets delivered w/ CE marks*/
  	long interval_us;	/* time for tp->delivered to incr "delivered" */
-@@ -1259,6 +1264,7 @@ static inline void tcp_ca_event(struct s
+@@ -1276,6 +1281,7 @@ static inline void tcp_ca_event(struct s
  void tcp_set_ca_state(struct sock *sk, const u8 ca_state);
  
  /* From tcp_rate.c */

debian/patches/misc-bbr3/0004-net-tcp_bbr-v2-count-packets-lost-over-TCP-rate-samp.patch

@@ -19,7 +19,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -985,6 +985,7 @@ struct tcp_skb_cb {
+@@ -1002,6 +1002,7 @@ struct tcp_skb_cb {
  #define TCPCB_IN_FLIGHT_MAX ((1U << TCPCB_IN_FLIGHT_BITS) - 1)
  			u32 in_flight:20,   /* packets in flight at transmit */
  			    unused2:12;
@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		} tx;   /* only used for outgoing skbs */
  		union {
  			struct inet_skb_parm	h4;
-@@ -1139,11 +1140,13 @@ struct ack_sample {
+@@ -1156,11 +1157,13 @@ struct ack_sample {
   */
  struct rate_sample {
  	u64  prior_mstamp; /* starting timestamp for interval */

debian/patches/misc-bbr3/0005-net-tcp_bbr-v2-export-FLAG_ECE-in-rate_sample.is_ece.patch

@@ -18,7 +18,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1158,6 +1158,7 @@ struct rate_sample {
+@@ -1175,6 +1175,7 @@ struct rate_sample {
  	bool is_app_limited;	/* is sample from packet with bubble in pipe? */
  	bool is_retrans;	/* is sample from retransmission? */
  	bool is_ack_delayed;	/* is this (likely) a delayed ACK? */
@@ -28,7 +28,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  struct tcp_congestion_ops {
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4060,6 +4060,7 @@ static int tcp_ack(struct sock *sk, cons
+@@ -4066,6 +4066,7 @@ static int tcp_ack(struct sock *sk, cons
  	delivered = tcp_newly_delivered(sk, delivered, flag);
  	lost = tp->lost - lost;			/* freshly marked lost */
  	rs.is_ack_delayed = !!(flag & FLAG_ACK_MAYBE_DELAYED);

debian/patches/misc-bbr3/0006-net-tcp_bbr-v2-introduce-ca_ops-skb_marked_lost-CC-m.patch

@@ -30,7 +30,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1185,6 +1185,9 @@ struct tcp_congestion_ops {
+@@ -1202,6 +1202,9 @@ struct tcp_congestion_ops {
  	/* override sysctl_tcp_min_tso_segs */
  	u32 (*min_tso_segs)(struct sock *sk);
  
@@ -42,7 +42,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	 */
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -1120,7 +1120,12 @@ static void tcp_verify_retransmit_hint(s
+@@ -1126,7 +1126,12 @@ static void tcp_verify_retransmit_hint(s
   */
  static void tcp_notify_skb_loss_event(struct tcp_sock *tp, const struct sk_buff *skb)
  {

debian/patches/misc-bbr3/0007-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-merge-in.patch

@@ -39,7 +39,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -1506,6 +1506,17 @@ static bool tcp_shifted_skb(struct sock
+@@ -1512,6 +1512,17 @@ static bool tcp_shifted_skb(struct sock
  	WARN_ON_ONCE(tcp_skb_pcount(skb) < pcount);
  	tcp_skb_pcount_add(skb, -pcount);
  

debian/patches/misc-bbr3/0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch

@@ -31,7 +31,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1284,6 +1284,21 @@ static inline bool tcp_skb_sent_after(u6
+@@ -1301,6 +1301,21 @@ static inline bool tcp_skb_sent_after(u6
  	return t1 > t2 || (t1 == t2 && after(seq1, seq2));
  }
  

debian/patches/misc-bbr3/0009-net-tcp-add-new-ca-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch

@@ -23,7 +23,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1120,7 +1120,11 @@ enum tcp_ca_ack_event_flags {
+@@ -1137,7 +1137,11 @@ enum tcp_ca_ack_event_flags {
  #define TCP_CONG_NON_RESTRICTED 0x1
  /* Requires ECN/ECT set on all packets */
  #define TCP_CONG_NEEDS_ECN	0x2
@@ -36,7 +36,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
  union tcp_cc_info;
  
-@@ -1252,6 +1256,14 @@ static inline char *tcp_ca_get_name_by_k
+@@ -1269,6 +1273,14 @@ static inline char *tcp_ca_get_name_by_k
  }
  #endif
  
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	const struct inet_connection_sock *icsk = inet_csk(sk);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -370,7 +370,7 @@ static void __tcp_ecn_check_ce(struct so
+@@ -376,7 +376,7 @@ static void __tcp_ecn_check_ce(struct so
  			tcp_enter_quickack_mode(sk, 2);
  		break;
  	case INET_ECN_CE:
@@ -62,7 +62,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  			tcp_ca_event(sk, CA_EVENT_ECN_IS_CE);
  
  		if (!(tp->ecn_flags & TCP_ECN_DEMAND_CWR)) {
-@@ -381,7 +381,7 @@ static void __tcp_ecn_check_ce(struct so
+@@ -387,7 +387,7 @@ static void __tcp_ecn_check_ce(struct so
  		tp->ecn_flags |= TCP_ECN_SEEN;
  		break;
  	default:

debian/patches/misc-bbr3/0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch

@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1186,8 +1186,8 @@ struct tcp_congestion_ops {
+@@ -1203,8 +1203,8 @@ struct tcp_congestion_ops {
  	/* hook for packet ack accounting (optional) */
  	void (*pkts_acked)(struct sock *sk, const struct ack_sample *sample);
  

debian/patches/misc-bbr3/0011-net-tcp-add-fast_ack_mode-1-skip-rwin-check-in-tcp_f.patch

@@ -33,7 +33,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */
 --- a/net/ipv4/tcp.c
 +++ b/net/ipv4/tcp.c
-@@ -3384,6 +3384,7 @@ int tcp_disconnect(struct sock *sk, int
+@@ -3397,6 +3397,7 @@ int tcp_disconnect(struct sock *sk, int
  	tp->rx_opt.dsack = 0;
  	tp->rx_opt.num_sacks = 0;
  	tp->rcv_ooopack = 0;
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	if (tcp_ca_needs_ecn(sk))
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -5770,13 +5770,14 @@ static void __tcp_ack_snd_check(struct s
+@@ -5776,13 +5776,14 @@ static void __tcp_ack_snd_check(struct s
  
  	    /* More than one full frame received... */
  	if (((tp->rcv_nxt - tp->rcv_wup) > inet_csk(sk)->icsk_ack.rcv_mss &&

debian/patches/misc-bbr3/0013-net-tcp_bbr-v2-inform-CC-module-of-losses-repaired-b.patch

@@ -25,7 +25,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1098,6 +1098,7 @@ enum tcp_ca_event {
+@@ -1115,6 +1115,7 @@ enum tcp_ca_event {
  	CA_EVENT_LOSS,		/* loss timeout */
  	CA_EVENT_ECN_NO_CE,	/* ECT set, but not CE marked */
  	CA_EVENT_ECN_IS_CE,	/* received CE marked IP packet */
@@ -35,7 +35,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  /* Information about inbound ACK, passed to cong_ops->in_ack_event() */
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3859,6 +3859,7 @@ static void tcp_process_tlp_ack(struct s
+@@ -3865,6 +3865,7 @@ static void tcp_process_tlp_ack(struct s
  		/* ACK advances: there was a loss, so reduce cwnd. Reset
  		 * tlp_high_seq in tcp_init_cwnd_reduction()
  		 */

debian/patches/misc-bbr3/0014-net-tcp_bbr-v2-introduce-is_acking_tlp_retrans_seq-i.patch

@@ -21,7 +21,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1162,6 +1162,7 @@ struct rate_sample {
+@@ -1179,6 +1179,7 @@ struct rate_sample {
  	u32  last_end_seq;	/* end_seq of most recently ACKed packet */
  	bool is_app_limited;	/* is sample from packet with bubble in pipe? */
  	bool is_retrans;	/* is sample from retransmission? */
@@ -31,7 +31,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  };
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3842,7 +3842,8 @@ static void tcp_replace_ts_recent(struct
+@@ -3848,7 +3848,8 @@ static void tcp_replace_ts_recent(struct
  /* This routine deals with acks during a TLP episode and ends an episode by
   * resetting tlp_high_seq. Ref: TLP algorithm in draft-ietf-tcpm-rack
   */
@@ -41,7 +41,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  {
  	struct tcp_sock *tp = tcp_sk(sk);
  
-@@ -3870,6 +3871,11 @@ static void tcp_process_tlp_ack(struct s
+@@ -3876,6 +3877,11 @@ static void tcp_process_tlp_ack(struct s
  			     FLAG_NOT_DUP | FLAG_DATA_SACKED))) {
  		/* Pure dupack: original and TLP probe arrived; no loss */
  		tp->tlp_high_seq = 0;
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	}
  }
  
-@@ -4053,7 +4059,7 @@ static int tcp_ack(struct sock *sk, cons
+@@ -4059,7 +4065,7 @@ static int tcp_ack(struct sock *sk, cons
  	tcp_rack_update_reo_wnd(sk, &rs);
  
  	if (tp->tlp_high_seq)
@@ -62,7 +62,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
  	if (tcp_ack_is_dubious(sk, flag)) {
  		if (!(flag & (FLAG_SND_UNA_ADVANCED |
-@@ -4097,7 +4103,7 @@ no_queue:
+@@ -4103,7 +4109,7 @@ no_queue:
  	tcp_ack_probe(sk);
  
  	if (tp->tlp_high_seq)

debian/patches/misc-bbr3/0015-tcp-introduce-per-route-feature-RTAX_FEATURE_ECN_LOW.patch

@@ -33,7 +33,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -375,6 +375,7 @@ static inline void tcp_dec_quickack_mode
+@@ -376,6 +376,7 @@ static inline void tcp_dec_quickack_mode
  #define	TCP_ECN_QUEUE_CWR	2
  #define	TCP_ECN_DEMAND_CWR	4
  #define	TCP_ECN_SEEN		8
@@ -41,7 +41,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
  enum tcp_tw_status {
  	TCP_TW_SUCCESS = 0,
-@@ -777,6 +778,15 @@ static inline void tcp_fast_path_check(s
+@@ -794,6 +795,15 @@ static inline void tcp_fast_path_check(s
  		tcp_fast_path_on(tp);
  }
  

debian/patches/misc-bbr3/0016-net-tcp_bbr-v3-update-TCP-bbr-congestion-control-mod.patch

@@ -153,7 +153,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  #define ICSK_TIME_RETRANS	1	/* Retransmit timer */
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -2474,7 +2474,7 @@ struct tcp_plb_state {
+@@ -2491,7 +2491,7 @@ struct tcp_plb_state {
  	u8	consec_cong_rounds:5, /* consecutive congested rounds */
  		unused:3;
  	u32	pause_until; /* jiffies32 when PLB can resume rerouting */

debian/patches/misc-bbr3/0017-net-tcp_bbr-v3-ensure-ECN-enabled-BBR-flows-set-ECT-.patch

@@ -25,7 +25,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -376,6 +376,7 @@ static inline void tcp_dec_quickack_mode
+@@ -377,6 +377,7 @@ static inline void tcp_dec_quickack_mode
  #define	TCP_ECN_DEMAND_CWR	4
  #define	TCP_ECN_SEEN		8
  #define	TCP_ECN_LOW		16

debian/patches/misc-bbr3/0018-tcp-export-TCPI_OPT_ECN_LOW-in-tcp_info-tcpi_options.patch

@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
   * Sender's congestion state indicating normal or abnormal situations
 --- a/net/ipv4/tcp.c
 +++ b/net/ipv4/tcp.c
-@@ -4111,6 +4111,8 @@ void tcp_get_info(struct sock *sk, struc
+@@ -4124,6 +4124,8 @@ void tcp_get_info(struct sock *sk, struc
  		info->tcpi_options |= TCPI_OPT_ECN;
  	if (tp->ecn_flags & TCP_ECN_SEEN)
  		info->tcpi_options |= TCPI_OPT_ECN_SEEN;

debian/patches/mixed-arch/0002-ZEN-Restore-CONFIG_OPTIMIZE_FOR_PERFORMANCE_O3.patch

@@ -13,7 +13,7 @@ dependency on CONFIG_ARC and adds RUSTFLAGS.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -813,6 +813,9 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointe
+@@ -820,6 +820,9 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointe
  ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
  KBUILD_CFLAGS += -O2
  KBUILD_RUSTFLAGS += -Copt-level=2

debian/patches/mixed-arch/0003-krd-adjust-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3.patch

@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -821,6 +821,10 @@ KBUILD_CFLAGS += -Os
+@@ -828,6 +828,10 @@ KBUILD_CFLAGS += -Os
  KBUILD_RUSTFLAGS += -Copt-level=s
  endif
  

debian/patches/mixed-arch/0006-XANMOD-kbuild-Add-GCC-SMS-based-modulo-scheduling-fl.patch

@@ -11,7 +11,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -825,6 +825,13 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
+@@ -832,6 +832,13 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
  KBUILD_CFLAGS += $(call cc-option,-fivopts)
  endif
  

debian/patches/patchset-xanmod/net/tcp/cloudflare/0001-tcp-Add-a-sysctl-to-skip-tcp-collapse-processing-whe.patch

@@ -83,7 +83,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		.maxlen		= sizeof(u8),
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -5652,6 +5652,7 @@ static bool tcp_prune_ofo_queue(struct s
+@@ -5658,6 +5658,7 @@ static bool tcp_prune_ofo_queue(struct s
  static int tcp_prune_queue(struct sock *sk, const struct sk_buff *in_skb)
  {
  	struct tcp_sock *tp = tcp_sk(sk);
@@ -91,7 +91,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
  	NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED);
  
-@@ -5663,6 +5664,39 @@ static int tcp_prune_queue(struct sock *
+@@ -5669,6 +5670,39 @@ static int tcp_prune_queue(struct sock *
  	if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf)
  		return 0;
  
@@ -131,7 +131,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	tcp_collapse_ofo_queue(sk);
  	if (!skb_queue_empty(&sk->sk_receive_queue))
  		tcp_collapse(sk, &sk->sk_receive_queue, NULL,
-@@ -5681,6 +5715,8 @@ static int tcp_prune_queue(struct sock *
+@@ -5687,6 +5721,8 @@ static int tcp_prune_queue(struct sock *
  	if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf)
  		return 0;
  

debian/patches/patchset-xanmod/xanmod/0001-kbuild-Remove-GCC-minimal-function-alignment.patch

@@ -12,7 +12,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -997,15 +997,8 @@ export CC_FLAGS_FPU
+@@ -1004,15 +1004,8 @@ export CC_FLAGS_FPU
  export CC_FLAGS_NO_FPU
  
  ifneq ($(CONFIG_FUNCTION_ALIGNMENT),0)

debian/patches/patchset-xanmod/xanmod/0006-XANMOD-block-Set-rq_affinity-to-force-complete-I-O-r.patch

@@ -11,7 +11,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/linux/blkdev.h
 +++ b/include/linux/blkdev.h
-@@ -613,7 +613,8 @@ enum {
+@@ -614,7 +614,8 @@ enum {
  	QUEUE_FLAG_MAX
  };
  

debian/patches/patchset-zen/fixes/0001-futex-improve-user-space-accesses.patch

@@ -158,5 +158,5 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 +}
 +
  extern void __futex_unqueue(struct futex_q *q);
- extern void __futex_queue(struct futex_q *q, struct futex_hash_bucket *hb);
+ extern void __futex_queue(struct futex_q *q, struct futex_hash_bucket *hb,
- extern int futex_unqueue(struct futex_q *q);
+ 				struct task_struct *task);

debian/patches/patchset-zen/sauce/0004-ZEN-Disable-stack-conservation-for-GCC.patch

@@ -15,7 +15,7 @@ Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1019,11 +1019,6 @@ KBUILD_CFLAGS	+= -fno-strict-overflow
+@@ -1026,11 +1026,6 @@ KBUILD_CFLAGS	+= -fno-strict-overflow
  # Make sure -fstack-check isn't enabled (like gentoo apparently did)
  KBUILD_CFLAGS  += -fno-stack-check
  

debian/patches/patchset-zen/sauce/0009-ZEN-drm-amdgpu-pm-Allow-override-of-min_power_limit-.patch

@@ -23,7 +23,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with
  extern int amdgpu_gtt_size;
 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
 +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-@@ -137,6 +137,7 @@ enum AMDGPU_DEBUG_MASK {
+@@ -138,6 +138,7 @@ enum AMDGPU_DEBUG_MASK {
  };
  
  unsigned int amdgpu_vram_limit = UINT_MAX;
@@ -31,7 +31,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with
  int amdgpu_vis_vram_limit;
  int amdgpu_gart_size = -1; /* auto */
  int amdgpu_gtt_size = -1; /* auto */
-@@ -261,6 +262,15 @@ struct amdgpu_watchdog_timer amdgpu_watc
+@@ -262,6 +263,15 @@ struct amdgpu_watchdog_timer amdgpu_watc
  };
  
  /**

debian/patches/patchset-zen/sauce/0010-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch

@@ -70,7 +70,7 @@ Contains:
  
  	if (unlikely(nofail)) {
  		/*
-@@ -4278,8 +4281,13 @@ restart:
+@@ -4279,8 +4282,13 @@ restart:
  			goto nopage;
  	}
  
@@ -85,7 +85,7 @@ Contains:
  
  	/*
  	 * The adjusted alloc_flags might result in immediate success, so try
-@@ -4481,9 +4489,12 @@ nopage:
+@@ -4482,9 +4490,12 @@ nopage:
  		goto retry;
  	}
  fail:

debian/patches/series

@@ -1,5 +1,3 @@
-debian/gitignore.patch
-
 # Disable features broken by exclusion of upstream files
 debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
 debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
@@ -72,6 +70,7 @@ bugfix/all/disable-some-marvell-phys.patch
 bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 bugfix/all/documentation-use-relative-source-paths-in-abi-documentation.patch
 bugfix/all/nfsd-fix-legacy-client-tracking-initialization.patch
+bugfix/all/drm-amdkfd-Fix-user-queue-validation-on-Gfx7-8.patch
 
 # Miscellaneous features
 

debian/rules.real

@@ -279,7 +279,7 @@ binary_headers: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 	cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/include $(DIR)/arch/$(KERNEL_ARCH)
 	find $(DIR) -name '*.cmd' -delete
 
-	objcopy -j .BTF -j .BTF_ids $(SOURCE_DIR)/vmlinux $(DIR)/vmlinux
+	$(CROSS_COMPILE)objcopy -j .BTF -j .BTF_ids $(SOURCE_DIR)/vmlinux $(DIR)/vmlinux
 	chmod 644 $(DIR)/vmlinux
 
 	f='$(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o' ; \

debian/templates/tools-versioned.control.in

@@ -2,7 +2,7 @@ Package: krd-linux-kbuild-@abiname@
 Meta-Rules-Target: kbuild
 Build-Profiles: <!pkg.linux.notools>
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, build-essential
+Depends: ${shlibs:Depends}, ${misc:Depends}, build-essential, pahole
 Multi-Arch: foreign
 Description: Kbuild infrastructure for KrD's Linux @abiname@
  This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.