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@xxxxxxxxxxxxxxxx
diff --cc MAINTAINERS
index 10390ced5206,6d2c52ea407d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8685,11 -8542,11 +8661,6 @@@ M: Marek Belisko <marek.belisko@gmail.c
S: Odd Fixes
F: drivers/staging/ft1000/
- STAGING - FRONTIER TRANZPORT AND ALPHATRACK
- M: David Täht <d@xxxxxxxxxxxx>
- S: Odd Fixes
- F: drivers/staging/frontier/
-STAGING - GO7007 MPEG CODEC
-M: Hans Verkuil <hans.verkuil@xxxxxxxxx>
-S: Maintained
-F: drivers/staging/media/go7007/
--
STAGING - INDUSTRIAL IO
M: Jonathan Cameron <jic23@xxxxxxxxxx>
L: linux-iio@xxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature
