| 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: <20110927162631.417358545666d197ab9df323@canb.auug.org.au>
Date: Tue, 27 Sep 2011 16:26:31 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@...driver.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Patrick Boettcher <Patrick.Boettcher@...com.fr>,
Mauro Carvalho Chehab <mchehab@...radead.org>
Subject: linux-next: manual merge of the moduleh tree with the v4l-dvb tree
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/media/dvb/frontends/dibx000_common.c between commit 79fcce3230b1
("[media] DiBcom: protect the I2C bufer access") from the v4l-dvb tree
and commit 32ee0bf69471 ("drivers/media: Add module.h to all files using
it implicitly") from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/media/dvb/frontends/dibx000_common.c
index 774d507,977211f..0000000
--- a/drivers/media/dvb/frontends/dibx000_common.c
+++ b/drivers/media/dvb/frontends/dibx000_common.c
@@@ -1,5 -1,5 +1,6 @@@
#include <linux/i2c.h>
+#include <linux/mutex.h>
+ #include <linux/module.h>
#include "dibx000_common.h"
--
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/
Powered by blists - more mailing lists