From patchwork Thu May 9 01:53: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: 13659355 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 C347413D280; Thu, 9 May 2024 01:53:14 +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=1715219603; cv=none; b=a2K3b9DcAHaM5+lAo6VhbwNV6JpQajzG4Lex2WGhYr0UDBYxY3GWO5Fs4sEEwyFUqLYCiW5Rgnk9lSQJvNMMkIg3BUmXt/29QzBzxPV6ZZ6iFmHZA33bxQpx5/YwJiCi/PcX3aGnHwmnxVKjtDP34Bik96EzD1G5r+Or80iDG+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715219603; c=relaxed/simple; bh=nhF5Rqpf1Sh/E7F/InVEqc1GzOa/hK+3b/qJDEK0PdM=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=Cloz6ZkoIM4JUlK658Q7vWDyU4iwHXIOcs1MNFg1RdcB0wCgSO0zSuyuq96egOw2J1bHuqelmdWhWAHeMh1o6w5HpW6SbYC76jn1WaXfW383/LaHb5zJNLhIeaIaHTdtxAduR2lLyt1wyr8yN2a+ujm2J0cPkeZdUrT+RR03YUc= 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=GpYwT3ly; 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="GpYwT3ly" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1715219592; bh=WpdW4zqAGBKvnQv0jKzuhtnmm8jG3qKhG4SNIVAsBt4=; h=Date:From:To:Cc:Subject:From; b=GpYwT3lyREGArozTLTrWqQSSnAQQMhHVI6/9zkqD5S4MCB/UDXvcKRxBFKdNiSXtR YWOYU3nPg+rtTWsOsXILkTBQQeIXLm9h7IfpwEdu8PI0Gq7B/xdmu7D9GpkCyJdrCa tQjFoJ6KJTKcpupzgeSvRj44xrjTLbsCer/CzLXi4DqZpmpdTfqZYeBEJD758ZXazc WnXoXJ5OV34fXQ8w1iyxodyyZA8VV2n8UJui4E9GB9cPh+KKBZ5GSZVfvmrQMTWlEj ZKtTrYPYLY311CcTvOD/v8LZMgDGNt7VW7EohpCmIXjqBMq9W1OokHmBKkJtK5gp60 WFaQbHKq6Bzuw== 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) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4VZZm72g4Nz4x30; Thu, 9 May 2024 11:53:10 +1000 (AEST) Date: Thu, 9 May 2024 11:53:07 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Christoph Hellwig Cc: Alexander Lobakin , Tony Nguyen , Networking , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the dma-mapping tree Message-ID: <20240509115307.71ae8787@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/core/page_pool.c between commit: 4321de4497b2 ("page_pool: check for DMA sync shortcut earlier") from the dma-mapping tree and commit: ef9226cd56b7 ("page_pool: constify some read-only function arguments") 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/core/page_pool.c index 4f9d1bd7f4d1,8bcc7014a61a..000000000000 --- a/net/core/page_pool.c