* linux-next: manual merge of the powerpc tree with the bpf tree
@ 2024-07-17 23:48 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-07-17 23:48 UTC (permalink / raw)
To: Michael Ellerman, Daniel Borkmann, Alexei Starovoitov,
Andrii Nakryiko
Cc: Networking, Naveen N Rao, Linux Kernel Mailing List,
Linux Next Mailing List, bpf, PowerPC
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-07-17 23:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-17 23:48 linux-next: manual merge of the powerpc tree with the bpf tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).