* linux-next: manual merge of the tip tree with the v4l-dvb-next tree
@ 2022-11-28 1:07 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2022-11-28 1:07 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Mauro Carvalho Chehab
Cc: Dave Hansen, Hans de Goede, Kirill A. Shutemov,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
between commit:
f5cb5adaa8ec ("media: atomisp: Drop userptr support from hmm")
from the v4l-dvb-next tree and commit:
062c9b2996e9 ("mm: Pass down mm_struct to untagged_addr()")
from the tip tree.
I fixed it up (the fomer removed the line updated by the latter) 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:[~2022-11-28 1:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-28 1:07 linux-next: manual merge of the tip tree with the v4l-dvb-next 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).