From patchwork Fri Jan 10 00:38:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13933348 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 E216318027; Fri, 10 Jan 2025 00:39:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736469546; cv=none; b=KLnZ6Ky1n1D1IY0DVI5RBawvYhdagYL71rJZtNkdhICtYxCE7/28fnursFJ3VDZGkfNq8WIkCqjK3KWkHiSC4Z4PNP4TnnCCHyocGiCJL71oFyjScMjbs9c+T+PisTWcoOJvia6mCtk+drBOccbiOaZlYffO3jMBH7QZVEo9kQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736469546; c=relaxed/simple; bh=USLWQfxpnifDI7bI7LMEAhh96ZN3GcS886bvNQdGPG8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=lUdK1N7o3jeMydVeu+ZvyEDcGRY2PW9RxDhOm57m/G9C4MIHSqaRXTY73QjaJbga4WJTjX7gb872qx2RJuMaAcMw3BJVo/RxYSIAypMlw+kBWVnKugLhFbFBgdfHmor+5yIJuq6Za/vFmyrx4LsnDebClGgYkAYwfd8+QqJMByQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=gkHF0mEN; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="gkHF0mEN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1736469532; bh=+268IEIWqre3m/HtwdeirbBvYpoYdpacccHtch4UCkA=; h=Date:From:To:Cc:Subject:From; b=gkHF0mENxxKQkwiIZq5DYv6Sa/97n1tMXEcQmGuB5+blE+wBVwSJpYbvSf9R+wm6A 8InG54QJ1SXG6F12VNHp4bhVkJJAGlcxs5yW7oneN9/lwE9lAMoTBbVlvzIXUXrsw/ mhkx/ksuP3Yq5nhDKjwPVHiAilxig8KIGy1nOrTZ4nm6gffpP42B6e+2XK/edRoAvt 8VgXSRaNsBzkYYUtOV9HitjCK3tb0mCqcBqrWtufqHVWpUumSukH+pxduY7jQ9RLJb moQZWCesrTW1Jxkcp23PPKg2IXAn9ng7niFuUIG1wBWLIBxcLIPQ9E5BsYjxb435Be M9NXEnZab7BLg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4YTjSq4jT4z4wb5; Fri, 10 Jan 2025 11:38:51 +1100 (AEDT) Date: Fri, 10 Jan 2025 11:38:55 +1100 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Linux Kernel Mailing List , Linux Next Mailing List , Toke =?utf-8?q?H?= =?utf-8?q?=C3=B8iland-J=C3=B8rgensen?= Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20250110113855.4332724a@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/sch_cake.c between commit: 737d4d91d35b ("sched: sch_cake: add bounds checks to host bulk flow fairness counts") from the net tree and commit: a42d71e322a8 ("net_sched: sch_cake: Add drop reasons") 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/sched/sch_cake.c index 2c2e2a67f3b2,deb0925f536d..000000000000 --- a/net/sched/sch_cake.c