From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DACF3128CC; Tue, 5 May 2026 09:54:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777974852; cv=none; b=NCpGLtWmdQDYLoezGzsrRGqCPFx9qHExN6t37uyGLW4rHC899hh1g4c5L/jjV6ajAfxKJ3ITE52AiLpQb6wz0wn4hHmd9ARDq3rtVDLbNDyG9ZE0ZkB9Ry4atKYF6Kx3xBk9lqFveOigIIJiL9OjCKmXIWsCSVmJuD8OfJA92B4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777974852; c=relaxed/simple; bh=ljBg5MPuzVyhYDJtkIW+tx52g+ttq1kXUhKBBbphMW8=; h=From:Date:Message-ID:To:Cc:Cc:Cc:Cc:Subject; b=qJpmGKQtagDqdijHDvsxi+jBitZdM3+YFDslPAL2F/1XHrDlRAyAxvw/60F9NGZ5slmHraIPncovARF+Ov1NwOWvsIAKu6rotFt4n5kok7GJTckf3P912PIk4VrtBGO6xfMhJmlHySlis7BMRE9uYk5sq2NyDWUXUEE2L7Cl6bs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CDLH58H/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CDLH58H/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF9B1C2BCB4; Tue, 5 May 2026 09:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777974852; bh=ljBg5MPuzVyhYDJtkIW+tx52g+ttq1kXUhKBBbphMW8=; h=From:Date:To:Cc:Cc:Cc:Cc:Subject:From; b=CDLH58H/dwJlBnW/gD4Z2epohc1F2gPiFE8RU93n0+1VxPOkjNQD6BDYi32MrMrj7 gNbjFW0CjP77jN0za26N3QD17l9oX2xB4RbTMaGy4JH8q2ZjlGodnyTSqfQ6Q8n7Ag qNxB6DHJs49ToB8I5TZMRC3WkNc9um0eTMo7kPUtRHFfAmMabPJtjuQM/AMbyMAYoa JgQxb7QVLGYoaMJN/R8GRu8D/kJ1d05hmmpjm2NhiJAfGKLUEywKJv/GyVO35E04PD w2xDSaAoLEAhO447Wa6j8r3c00nx9/NtOm29Vg1t1C8NRhEg83/Gf0dcZfnQ/fXZmk t+Twv5sfHlc1g== From: Thierry Reding Date: Tue, 05 May 2026 11:54:09 +0200 Message-ID: > To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Eric Dumazet Cc: Linux Kernel Mailing List Cc: Linux Next Mailing List Cc: Ujjal Roy Subject: linux-next: manual merge of the net-next tree with the net/main tree Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/igmp.c between commit: c6bebaa744f7 ("ipv4: igmp: annotate data-races in igmp_heard_query()") from the net/main tree and commit: 726fa7da2d8c ("ipv4: igmp: get rid of IGMPV3_{QQIC,MRC} and simplify calculation") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc net/ipv4/igmp.c index a9ad39064f3b,d7eff36d98c3..27d120183779 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@@ -1028,10 -1015,9 +1028,10 @@@ static bool igmp_heard_query(struct in_ * received value was zero, use the default or statically * configured value. */ - in_dev->mr_qrv = ih3->qrv ?: READ_ONCE(net->ipv4.sysctl_igmp_qrv); - in_dev->mr_qi = igmpv3_qqi(ih3) * HZ ? : IGMP_QUERY_INTERVAL; - + WRITE_ONCE(in_dev->mr_qrv, + ih3->qrv ?: READ_ONCE(net->ipv4.sysctl_igmp_qrv)); - mr_qi = IGMPV3_QQIC(ih3->qqic)*HZ ?: IGMP_QUERY_INTERVAL; ++ mr_qi = igmpv3_qqi(ih3) * HZ ? : IGMP_QUERY_INTERVAL; + WRITE_ONCE(in_dev->mr_qi, mr_qi); /* RFC3376, 8.3. Query Response Interval: * The number of seconds represented by the [Query Response * Interval] must be less than the [Query Interval].