linux-kernel - linux-next: manual merge of the akpm tree with the v4l-dvb 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20150620234910.0f543ee6@canb.auug.org.au>
Date:	Sat, 20 Jun 2015 23:49:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hans Verkuil <hans.verkuil@...co.com>, Jan Kara <jack@...e.cz>
Subject: linux-next: manual merge of the akpm tree with the v4l-dvb tree

Hi Andrew,

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

  drivers/media/v4l2-core/videobuf2-dma-sg.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_dma_sg_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@...b.auug.org.au

Content of type "application/pgp-signature" skipped