* linux-next: manual merge of the mm tree with the v4l-dvb-next tree
@ 2023-01-27 5:26 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2023-01-27 5:26 UTC (permalink / raw)
To: Andrew Morton, Mauro Carvalho Chehab
Cc: Hans Verkuil, Linux Kernel Mailing List, Linux Next Mailing List,
Suren Baghdasaryan
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Hi all,
Today's linux-next merge of the mm tree got a conflict in:
drivers/staging/media/deprecated/meye/meye.c
between commit:
ba47652ba655 ("media: meye: remove this deprecated driver")
from the v4l-dvb-next tree and commit:
6fe0afd07701 ("mm: replace vma->vm_flags direct modifications with modifier calls")
from the mm tree.
I fixed it up (I just removed the file) 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] 2+ messages in thread
* linux-next: manual merge of the mm tree with the v4l-dvb-next tree
@ 2023-01-27 5:29 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2023-01-27 5:29 UTC (permalink / raw)
To: Andrew Morton, Mauro Carvalho Chehab
Cc: Hans Verkuil, Linux Kernel Mailing List, Linux Next Mailing List,
Suren Baghdasaryan
[-- Attachment #1: Type: text/plain, Size: 797 bytes --]
Hi all,
Today's linux-next merge of the mm tree got a conflict in:
drivers/staging/media/deprecated/stkwebcam/stk-webcam.c
between commit:
aa68bf90a628 ("media: stkwebcam: remove deprecated driver")
from the v4l-dvb-next tree and commit:
6fe0afd07701 ("mm: replace vma->vm_flags direct modifications with modifier calls")
from the mm tree.
I fixed it up (I just removed the file) 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] 2+ messages in thread
end of thread, other threads:[~2023-01-27 5:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-27 5:29 linux-next: manual merge of the mm tree with the v4l-dvb-next tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-01-27 5:26 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox