From patchwork Tue Mar 11 01:04:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 14010894 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 0FC6B8821; Tue, 11 Mar 2025 01:04:24 +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=1741655068; cv=none; b=LLqKMhCVYsmX54kqANqifO3UQnWgO+uJnrR5GDKy046+SJrwL8+wvE0Sz1yn5NrO52PwMNmToVAAk8LKieKGTkT6ib9vfTG13WkHNcXOT/ppl/NbmgQLIfu/S90Xb2XuAKXBPOfgG/qelaAQ8mo86MgspY5Xu+iUMYeWCYgrHY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741655068; c=relaxed/simple; bh=WN5aRO51rgkoecwp/I5S3MO/oSkd8e+OEIbfwtXNJvI=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=KK9GGpSUTe/nheNpOExZPQMz+4sNcwVf3gD5/8fjLlU11UzjykmLD8zmdG4NPkwZTTtA1k2wSU3v/1OIVuBn0tz4liHojf/G66QgTQD90EZch0Lnlgiu+fJILnDLDv1R3+HRw9lCRH7H5qTrNjeI1iCxflV5MXFsm5w3bm49+gs= 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=e+QjfMHc; 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="e+QjfMHc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1741655063; bh=0D/euKKF0UPH3RqK0kJcXY+4ZkJS4h6U/TzArE7xHZc=; h=Date:From:To:Cc:Subject:From; b=e+QjfMHckv1dwYrvqAbgpCVlev7dSi5H3uCSy76pnOoCtGe+UsMO1LVHo01mKMy47 DLLtnsd3VWT52fPb/r9N5ocb24XioH3RfhOBD4uo4LFIIcR5GyJIMVD/0jZjbZEBa4 VNO5Vd+g0wz1GCsBIeWuEBxVYKt8F9gRVj9ICAj5Hvl7VBkFdmsn39TdWWdTiDoh+X RcPbES1S2ipTYF6JQD6fPMyMP9wwPMsOi269nG3b230hhaJwBwDl/9+t7bVIUDm7aA 6k1gmjjhki8cM7U0AzTegLu+Z6l9kL2CfNBSRtIjZFMTLPMv7JCalnKC+U9j/b/W/H Aoq/TcmLToiYg== 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 4ZBbBb0RgBz4wcw; Tue, 11 Mar 2025 12:04:22 +1100 (AEDT) Date: Tue, 11 Mar 2025 12:04:22 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , Andrew Morton Cc: bpf , Networking , Linux Kernel Mailing List , Linux Next Mailing List , Luiz Capitulino Subject: linux-next: manual merge of the bpf-next tree with the mm tree Message-ID: <20250311120422.1d9a8f80@canb.auug.org.au> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: mm/page_owner.c between commit: a5bc091881fd ("mm: page_owner: use new iteration API") from the mm-unstable branch of the mm tree and commit: 8c57b687e833 ("mm, bpf: Introduce free_pages_nolock()") from the bpf-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. Reviewed-by: Luiz Capitulino diff --cc mm/page_owner.c index 849d4a471b6c,90e31d0e3ed7..000000000000 --- a/mm/page_owner.c