From patchwork Tue Jul 2 01:33:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13718885 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 076E51C3D; Tue, 2 Jul 2024 01:33:54 +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=1719884038; cv=none; b=nOYGq/9rHpkh+8hv2ePfAuBoD6BWX/u7y5T7UacwVhqRVIBoK3fFrW8M9wnU6zmV/kqjrbBQ4tMASvrJrqykQ6Qnzf/ENREqxRWIYb1jt8DlMpyQVM2WTCIcRwEc3ATK2M8lAIWJcNkxVhuaFHT0QGx6ByfeOJ6Fd1i005k/raY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719884038; c=relaxed/simple; bh=vowYZXT65q4SoLCOan8TdxdPWMkMor5BArZ8G2yzyKg=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=ndmrcEjDsQqYLUAYNC03PmdjJGO5AzlkqQv4ikoKWtjCKkagoBTlXm9A/GFpSW0INz5FaK2lG+7wKx0AknQb4ek9k4+smia7WZdaH4L+mGrdnOcJp3vRrhOpFSHyGPf7EMhi70TD0CWzxlBYm2Lj2v9e8gLRZxG48NTvyGCa5hM= 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=OTVYjPCI; 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="OTVYjPCI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1719884032; bh=osaodmYgkIbzoCaes8lyDNDS1woeaul+AxGca1P9X2M=; h=Date:From:To:Cc:Subject:From; b=OTVYjPCIGZFqctfouYBuKFXTLa9v0Lng8eTAdrNuLU8I+nRl9n0h1/nmS+6AL11L3 l+NQKIr3OyIrjiwHA9UvGYcNXdORtgbyOZ9gzy/NNdK27vLsa4//aFGZpdVbHY/MF/ JjTr4R8sBAS+1UxV8dW6Kw60G3ynQ+4huv0VT4vkZwQGtJDN0iCL4IA3p2otCDrAjP 5tMPWs+KXtwWsEfu99Zxa/ztWVm/KMyWzXvrugv32xBAm4QFbwoQ1vCttfGUdGGoCJ AIbk5Z2ZqpqCGJwR5OP+B7TFFguI5Dd8fROC+OT0UbxkwlQ2GIF1wQROZLys1yyUwl XMoijzM0RLkTA== 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 4WClmv4nwfz4wcS; Tue, 2 Jul 2024 11:33:51 +1000 (AEST) Date: Tue, 2 Jul 2024 11:33:50 +1000 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , Palmer Dabbelt , Paul Walmsley Cc: bpf , Networking , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt , Pu Lehui , Samuel Holland Subject: linux-next: manual merge of the bpf-next tree with the risc-v tree Message-ID: <20240702113350.064e4cf2@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: arch/riscv/net/bpf_jit_comp64.c between commit: 51781ce8f448 ("riscv: Pass patch_text() the length in bytes") from the risc-v tree and commit: 9f1e16fb1fc9 ("riscv, bpf: Fix out-of-bounds issue when preparing trampoline image") 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. diff --cc arch/riscv/net/bpf_jit_comp64.c index 7a34e5b44fc4,351e1484205e..000000000000 --- a/arch/riscv/net/bpf_jit_comp64.c