summaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter/ip_conntrack_sip.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-07-07 10:59:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-07-07 10:59:38 -0700
commit5a4bd506ddad75f1f2711cfbcf7551a5504e3f1e (patch)
treefcc2d795dab31d5f840dfd818bdddce9ef5ee51d /net/ipv4/netfilter/ip_conntrack_sip.c
parentc6653f49e4fd3b0d52c12a1fc814d6c5b234ea15 (diff)
parent10f84de27bd05bd2648512975d085dbe0a1e71c3 (diff)
downloadlinux-master.tar.gz
linux-master.tar.bz2
linux-master.zip
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linuxHEADmaster
Pull clk fixes from Stephen Boyd: "A set of clk fixes for the Qualcomm, Mediatek, and Allwinner drivers: - Fix the Qualcomm Stromer Plus PLL set_rate() clk_op to explicitly set the alpha enable bit and not set bits that don't exist - Mark Qualcomm IPQ9574 crypto clks as voted to avoid stuck clk warnings - Fix the parent of some PLLs on Qualcomm sm6530 so their rate is correct - Fix the min/max rate clamping logic in the Allwinner driver that got broken in v6.9 - Limit runtime PM enabling in the Mediatek driver to only mt8183-mfgcfg so that system wide resume doesn't break on other Mediatek SoCs" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: mediatek: mt8183: Only enable runtime PM on mt8183-mfgcfg clk: sunxi-ng: common: Don't call hw_to_ccu_common on hw without common clk: qcom: gcc-ipq9574: Add BRANCH_HALT_VOTED flag clk: qcom: apss-ipq-pll: remove 'config_ctl_hi_val' from Stromer pll configs clk: qcom: clk-alpha-pll: set ALPHA_EN bit for Stromer Plus PLLs clk: qcom: gcc-sm6350: Fix gpll6* & gpll7 parents
Diffstat (limited to 'net/ipv4/netfilter/ip_conntrack_sip.c')
0 files changed, 0 insertions, 0 deletions