From patchwork Wed Aug 28 01:22:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13780272 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 9F0F5224D1; Wed, 28 Aug 2024 01:22:11 +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=1724808140; cv=none; b=UA2GQCwTn97BVa8j6XEQVon9VhXus6RRvRNy/g9KoteFUPqEBlGxCn5MQgBOPZPEDCl6LxbY542fXTTADlKrNXBcqikSDs3eYgR2vAUy+W0QmM4dVp/OjVzUKHY5S+bOjfFHtExJGcZ6qG+NYiaw1HQl3j1rFMg5wpgityi5Mjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724808140; c=relaxed/simple; bh=OT/ewFXToM+ETRFl/FZO1pomW5nvULege6FbtQqujCU=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=R2r/nA9XnKwS2j589B6McpGlC6ZTG03wzOalQN6PBEYf3NuGRXO7FOf+vUevwKpxQlEa4wV5Kp93V4tyOmnKgZ7tMcHbgE6zyd0fTV6B0TBVB4m8aeWTFJwIwmhaT55K4Sa38Qvplw0Qut8gFUQIz1mRjBxJc3LQqy0yMfBDudI= 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=iG0QkENa; 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="iG0QkENa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1724808129; bh=w0UTheu8+mOgy5zb9FccWMuqVrPi69dOGezXCZDCDzI=; h=Date:From:To:Cc:Subject:From; b=iG0QkENarXxaShkXGQey0EbkqdJgscDHrfCBdQtr7pE12jSAiZrPJxvdRgOSByoUf pGh0L9/lU2eVGj+wNoevgA3NGR1VkbmD7bq9o5SgBD8AjZy4FCS6Gk8MJUxGz7qk+o zevx0EKvuKDceLfN/C+9QMC701kvXUnvR2ePrmShf91DdGoO+f6I35ALtZ8DD1JuPv e6G0jvlFxwGxXCav+9+T2fogCN5LGQ8cNHs7WuzL1sFsklfd59PwJTVUhGFehUiBef bdmZ6Duok6EXMGEjuB6K1m6w69HAMZQAS9ab7T5HDJobNNw4994dTOP5NH3TslyLdP V05gjsLN8qWSg== 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 4Wtmq45wcGz4wd0; Wed, 28 Aug 2024 11:22:07 +1000 (AEST) Date: Wed, 28 Aug 2024 11:22:07 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Jason Xing , Networking , Linux Kernel Mailing List , Linux Next Mailing List , Xueming Feng Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20240828112207.5c199d41@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/ipv4/tcp.c between commit: bac76cf89816 ("tcp: fix forever orphan socket caused by tcp_abort") from the net tree and commit: edefba66d929 ("tcp: rstreason: introduce SK_RST_REASON_TCP_STATE for active reset") 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/tcp.c index 831a18dc7aa6,8514257f4ecd..000000000000 --- a/net/ipv4/tcp.c