ctrliq · PlaidCat · Feb 13, 2026 · Feb 12, 2026 · Feb 12, 2026 · Feb 12, 2026
diff --git a/COPYING-5.14.0-611.27.1.el9_7 → COPYING-5.14.0-611.30.1.el9_7 b/COPYING-5.14.0-611.27.1.el9_7 → COPYING-5.14.0-611.30.1.el9_7
diff --git a/Documentation/driver-api/dpll.rst b/Documentation/driver-api/dpll.rst
@@ -179,7 +179,23 @@ Phase offset measurement and adjustment
 Device may provide ability to measure a phase difference between signals
 on a pin and its parent dpll device. If pin-dpll phase offset measurement
 is supported, it shall be provided with ``DPLL_A_PIN_PHASE_OFFSET``
-attribute for each parent dpll device.
+attribute for each parent dpll device. The reported phase offset may be
+computed as the average of prior values and the current measurement, using
+the following formula:
+
+.. math::
+   curr\_avg = prev\_avg * \frac{2^N-1}{2^N} + new\_val * \frac{1}{2^N}
+
+where `curr_avg` is the current reported phase offset, `prev_avg` is the
+previously reported value, `new_val` is the current measurement, and `N` is
+the averaging factor. Configured averaging factor value is provided with
+``DPLL_A_PHASE_OFFSET_AVG_FACTOR`` attribute of a device and value change can
+be requested with the same attribute with ``DPLL_CMD_DEVICE_SET`` command.
+
+  ================================== ======================================
+  ``DPLL_A_PHASE_OFFSET_AVG_FACTOR`` attr configured value of phase offset
+                                     averaging factor
+  ================================== ======================================
 
 Device may also provide ability to adjust a signal phase on a pin.
 If pin phase adjustment is supported, minimal and maximal values and
@@ -255,6 +271,31 @@ the pin.
   ``DPLL_A_PIN_ESYNC_PULSE``                pulse type of Embedded SYNC
   ========================================= =================================
 
+Reference SYNC
+==============
+
+The device may support the Reference SYNC feature, which allows the combination
+of two inputs into a input pair. In this configuration, clock signals
+from both inputs are used to synchronize the DPLL device. The higher frequency
+signal is utilized for the loop bandwidth of the DPLL, while the lower frequency
+signal is used to syntonize the output signal of the DPLL device. This feature
+enables the provision of a high-quality loop bandwidth signal from an external
+source.
+
+A capable input provides a list of inputs that can be bound with to create
+Reference SYNC. To control this feature, the user must request a desired
+state for a target pin: use ``DPLL_PIN_STATE_CONNECTED`` to enable or
+``DPLL_PIN_STATE_DISCONNECTED`` to disable the feature. An input pin can be
+bound to only one other pin at any given time.
+
+  ============================== ==========================================
+  ``DPLL_A_PIN_REFERENCE_SYNC``  nested attribute for providing info or
+                                 requesting configuration of the Reference
+                                 SYNC feature
+    ``DPLL_A_PIN_ID``            target pin id for Reference SYNC feature
+    ``DPLL_A_PIN_STATE``         state of Reference SYNC connection
+  ============================== ==========================================
+
 Configuration commands group
 ============================
 

diff --git a/Documentation/netlink/specs/dpll.yaml b/Documentation/netlink/specs/dpll.yaml
@@ -315,6 +315,10 @@ attribute-sets:
           If enabled, dpll device shall monitor and notify all currently
           available inputs for changes of their phase offset against the
           dpll device.
+      -
+        name: phase-offset-avg-factor
+        type: u32
+        doc: Averaging factor applied to calculation of reported phase offset.
   -
     name: pin
     enum-name: dpll_a_pin
@@ -428,6 +432,14 @@ attribute-sets:
         doc: |
           A ratio of high to low state of a SYNC signal pulse embedded
           into base clock frequency. Value is in percents.
+      -
+        name: reference-sync
+        type: nest
+        multi-attr: true
+        nested-attributes: reference-sync
+        doc: |
+          Capable pin provides list of pins that can be bound to create a
+          reference-sync pin pair.
       -
         name: phase-adjust-gran
         type: u32
@@ -465,6 +477,14 @@ attribute-sets:
         name: frequency-min
       -
         name: frequency-max
+  -
+    name: reference-sync
+    subset-of: pin
+    attributes:
+      -
+        name: id
+      -
+        name: state
 
 operations:
   enum-name: dpll_cmd
@@ -513,6 +533,7 @@ operations:
             - clock-id
             - type
             - phase-offset-monitor
+            - phase-offset-avg-factor
 
       dump:
         reply: *dev-attrs
@@ -530,6 +551,7 @@ operations:
           attributes:
             - id
             - phase-offset-monitor
+            - phase-offset-avg-factor
     -
       name: device-create-ntf
       doc: Notification about device appearing
@@ -589,6 +611,8 @@ operations:
         reply: &pin-attrs
           attributes:
             - id
+            - module-name
+            - clock-id
             - board-label
             - panel-label
             - package-label
@@ -606,6 +630,7 @@ operations:
             - esync-frequency
             - esync-frequency-supported
             - esync-pulse
+            - reference-sync
 
       dump:
         request:
@@ -633,6 +658,7 @@ operations:
             - parent-pin
             - phase-adjust
             - esync-frequency
+            - reference-sync
     -
       name: pin-create-ntf
       doc: Notification about pin appearing

diff --git a/Documentation/networking/bonding.rst b/Documentation/networking/bonding.rst
@@ -550,6 +550,12 @@ lacp_rate
 
 	The default is slow.
 
+broadcast_neighbor
+
+	Option specifying whether to broadcast ARP/ND packets to all
+	active slaves.  This option has no effect in modes other than
+	802.3ad mode.  The default is off (0).
+
 max_bonds
 
 	Specifies the number of bonding devices to create for this

diff --git a/Makefile.rhelver b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 7
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 611.27.1
+RHEL_RELEASE = 611.30.1
 
 #
 # ZSTREAM

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
@@ -134,7 +134,6 @@ config S390
 	select ARCH_WANT_IPC_PARSE_VERSION
 	select ARCH_WANT_KERNEL_PMD_MKWRITE
 	select ARCH_WANT_LD_ORPHAN_WARN
-	select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
 	select BUILDTIME_TABLE_SORT
 	select CLONE_BACKWARDS2
 	select DCACHE_WORD_ACCESS if !KMSAN

diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
@@ -15,6 +15,17 @@
 #include <linux/mman.h>
 #include <linux/sched/mm.h>
 #include <linux/security.h>
+#include <linux/jump_label.h>
+
+/*
+ * RHEL-only: Since the 'hugetlb_optimize_vmemmap_key' static key is part
+ * of the kABI, we need stub definitions to avoid breaking the build
+ * when CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=n.
+ */
+#ifndef CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
+DEFINE_STATIC_KEY_FALSE(hugetlb_optimize_vmemmap_key);
+EXPORT_SYMBOL(hugetlb_optimize_vmemmap_key);
+#endif
 
 /*
  * If the bit selected by single-bit bitmask "a" is set within "x", move

diff --git a/ciq/ciq_backports/kernel-5.14.0-611.30.1.el9_7/071d8012.failed b/ciq/ciq_backports/kernel-5.14.0-611.30.1.el9_7/071d8012.failed
@@ -0,0 +1,48 @@
+ipv4: use RCU protection in ip_dst_mtu_maybe_forward()
+
+jira KERNEL-619
+Rebuild_History Non-Buildable kernel-5.14.0-611.30.1.el9_7
+commit-author Eric Dumazet <edumazet@google.com>
+commit 071d8012869b6af352acca346ade13e7be90a49f
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-611.30.1.el9_7/071d8012.failed
+
+ip_dst_mtu_maybe_forward() must use RCU protection to make
+sure the net structure it reads does not disappear.
+
+Fixes: f87c10a8aa1e8 ("ipv4: introduce ip_dst_mtu_maybe_forward and protect forwarding path against pmtu spoofing")
+	Signed-off-by: Eric Dumazet <edumazet@google.com>
+	Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
+Link: https://patch.msgid.link/20250205155120.1676781-4-edumazet@google.com
+	Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+(cherry picked from commit 071d8012869b6af352acca346ade13e7be90a49f)
+	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
+
+# Conflicts:
+#	include/net/ip.h
+diff --cc include/net/ip.h
+index f98661f56cbd,ba7b43447775..000000000000
+--- a/include/net/ip.h
++++ b/include/net/ip.h
+@@@ -443,10 -470,13 +443,19 @@@ static inline bool ip_sk_ignore_df(cons
+  static inline unsigned int ip_dst_mtu_maybe_forward(const struct dst_entry *dst,
+  						    bool forwarding)
+  {
+++<<<<<<< HEAD
+ +	const struct rtable *rt = container_of(dst, struct rtable, dst);
+ +	struct net *net = dev_net(dst->dev);
+ +	unsigned int mtu;
+++=======
++ 	const struct rtable *rt = dst_rtable(dst);
++ 	unsigned int mtu, res;
++ 	struct net *net;
+++>>>>>>> 071d8012869b (ipv4: use RCU protection in ip_dst_mtu_maybe_forward())
+
++ 	rcu_read_lock();
++ 
++ 	net = dev_net_rcu(dst->dev);
+  	if (READ_ONCE(net->ipv4.sysctl_ip_fwd_use_pmtu) ||
+  	    ip_mtu_locked(dst) ||
+  	    !forwarding) {
+* Unmerged path include/net/ip.h