linux-kernel - linux-next: manual merge of the trivial 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: <20150818135810.2eb2dba5@canb.auug.org.au>
Date:	Tue, 18 Aug 2015 13:58:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jikos@...nel.org>,
	Mauro Carvalho Chehab <mchehab@....samsung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masahiro Yamada <yamada.masahiro@...ionext.com>,
	Jan Kara <jack@...e.cz>
Subject: linux-next: manual merge of the trivial tree with the v4l-dvb tree

Hi Jiri,

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

  drivers/media/v4l2-core/videobuf2-memops.c

between commit:

  6690c8c78c74 ("[media] media: vb2: Remove unused functions")

from the v4l-dvb tree and commit:

  e1c05067c323 ("treewide: fix typos in comment blocks")

from the trivial tree.

I fixed it up (the former removed the code modified by the latter)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/