| 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
| ||
|
Message-ID: <20140801162142.24086152@canb.auug.org.au>
Date: Fri, 1 Aug 2014 16:21:42 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>,
Mauro Carvalho Chehab <mchehab@...radead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Joe Perches <joe@...ches.com>,
Kristina Martšenko
<kristina.martsenko@...il.com>
Subject: linux-next: manual merge of the staging tree with the tree
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
MAINTAINERS between commit 7eea35fe3df8 ("[media] MAINTAINERS: Update
go7007 pattern") from the v4l-dvb tree and commit 0d317b91d6d8
("staging: frontier: remove driver") from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc MAINTAINERS
index 10390ced5206,6d2c52ea407d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8685,11 -8542,11 +8661,6 @@@ M: Marek Belisko <marek.belisko@...il.c
S: Odd Fixes
F: drivers/staging/ft1000/
- STAGING - FRONTIER TRANZPORT AND ALPHATRACK
- M: David Täht <d@...libre.com>
- S: Odd Fixes
- F: drivers/staging/frontier/
-STAGING - GO7007 MPEG CODEC
-M: Hans Verkuil <hans.verkuil@...co.com>
-S: Maintained
-F: drivers/staging/media/go7007/
--
STAGING - INDUSTRIAL IO
M: Jonathan Cameron <jic23@...nel.org>
L: linux-iio@...r.kernel.org
Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)
Powered by blists - more mailing lists