linux-kernel - linux-next: manual merge of the powerpc tree with the bpf tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240718094809.204e67dc@canb.auug.org.au>
Date: Thu, 18 Jul 2024 09:48:09 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Michael Ellerman <mpe@...erman.id.au>, Daniel Borkmann
 <daniel@...earbox.net>, Alexei Starovoitov <ast@...nel.org>, Andrii
 Nakryiko <andrii@...nel.org>
Cc: Naveen N Rao <naveen@...nel.org>, bpf <bpf@...r.kernel.org>, Networking
 <netdev@...r.kernel.org>, PowerPC <linuxppc-dev@...ts.ozlabs.org>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the powerpc tree with the bpf tree

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in:

  MAINTAINERS

between commit:

  c638b130e83e ("MAINTAINERS: Update powerpc BPF JIT maintainers")

from the bpf tree and commit:

  e8061392ee09 ("MAINTAINERS: Update powerpc BPF JIT maintainers")

from the powerpc tree.

I fixed it up (I arbitrarily chose the latter version) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped