From patchwork Fri Oct 11 01:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13831755 X-Patchwork-Delegate: johannes@sipsolutions.net 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 9F3D1BE4A; Fri, 11 Oct 2024 01:10:18 +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=1728609021; cv=none; b=a0H+kr+98d4WoDF3aYkfsrzZPqHkrAgXE5GN9ZBM7JE01PTtulNXBtArQFqK1CTfBLoJZZkCA/3MS2eFJgwyzc/xOiy3NWa9B+7kDf3Iv8fYvotZ710muJrZu97aIDuQhZ48tHDfZDO/VZG/g9t29JVlvvWt/VOY2H0h8jPfbTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728609021; c=relaxed/simple; bh=AWbKCh81ztMi1RBcHBDGmYNoDL8AC12zvijs3iAuyR8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=Yu3WJePS0sYX2BAx5mijh6aazLihnStGdGDUJhXKWav8FLZF20d5RDQ4u/METa4tcrSkFVAjUuwFw6JlxOUFG9qppEcR4rn1MVg3VlvUymfWmkmXZ6YfVCwa9GpIMWw/8sK4teD/6eV/ohB4BxI0Cacn3E4VUTrz86uTs3unWb8= 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=GRwRdAtn; 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="GRwRdAtn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1728609016; bh=vh/yYFUJJ/LUk4IlqTluOf25oGKEQmdsGuHGh5VentA=; h=Date:From:To:Cc:Subject:From; b=GRwRdAtn2irwdDstdRSkJK7tdwD9GLOCzu8isXVoyKB+gXF/4XtYoJRrWCd4+BvM6 J58SGc1TfEo25cxnDuTiqwO7RpPLj9IWkCjqDnnx4qTNVIFYXWn/lT8CeVjavO0yuA OKY2Xx6tSJ0coRasLcfwLz0mBOuO2JQwhdGTOT4sKJv4cy+IFUbBbWR5RgxlVbhp2d KJ2CZ+lAWL7lQk0NcNCwn+kgp5Gi5NY9luKSuwyv1fFVuzX7uodqsHoHXtaeI7P4pq 9OBZ6fUcZ3PSFsZtfIYNoYQM+rSHpFHsQ6GiQICyy+TSq2MDD/dNkFn3Jsyg6jcBuE 5t1+JtMW76SIA== 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 4XPpT25fKhz4wy9; Fri, 11 Oct 2024 12:10:14 +1100 (AEDT) Date: Fri, 11 Oct 2024 12:10:14 +1100 From: Stephen Rothwell To: Kalle Valo , Johannes Berg , David Miller , Jakub Kicinski , Paolo Abeni Cc: Donald Hunter , Johannes Berg , Wireless , Networking , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the wireless-next tree with the net-next tree Message-ID: <20241011121014.674661a0@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: Documentation/networking/net_cachelines/net_device.rst between commit: 54b771e6c675 ("doc: net: Fix .rst rendering of net_cachelines pages") from the net-next tree and commit: 836265d31631 ("wifi: remove iw_public_data from struct net_device") from the wireless-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 Documentation/networking/net_cachelines/net_device.rst index 1b018ac35e9a,efea96862a76..000000000000 --- a/Documentation/networking/net_cachelines/net_device.rst