From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hans Verkuil <hans.verkuil@cisco.com>, Jan Kara <jack@suse.cz>
Subject: linux-next: manual merge of the akpm tree with the v4l-dvb tree
Date: Sat, 20 Jun 2015 23:56:56 +1000 [thread overview]
Message-ID: <20150620235656.2d79c10e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/media/v4l2-core/videobuf2-vmalloc.c
between commit:
511a1b8a4c81 ("[media] Revert "[media] vb2: Push mmap_sem down to memops"")
from the v4l-dvb tree and patch:
"media: vb2: Convert vb2_vmalloc_get_userptr() to use frame vector"
from the akpm tree.
I fixed it up (I just used the akpm tree version) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-20 13:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-20 13:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-20 14:05 linux-next: manual merge of the akpm tree with the v4l-dvb tree Stephen Rothwell
2015-06-20 13:49 Stephen Rothwell
2011-11-09 2:53 Stephen Rothwell
2011-11-09 9:38 ` Mauro Carvalho Chehab
2011-11-09 9:54 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150620235656.2d79c10e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=hans.verkuil@cisco.com \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox