| 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: <20110802145237.e8b90cff7f6954f6a12d8b3b@canb.auug.org.au>
Date: Tue, 2 Aug 2011 14:52:37 +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,
Tomi Valkeinen <tomi.valkeinen@...com>
Subject: linux-next: manual merge of the moduleh tree with Linus' tree
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/video/omap2/dss/rfbi.c between commit 24e6289c029b ("OMAP: DSS2:
remove extra includes from include/video/omapdss.h") from Linus' tree and
commit 06e632e042aa ("video: Add export.h for THIS_MODULE/EXPORT_SYMBOL
to drivers/video") from the moduleh tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/video/omap2/dss/rfbi.c
index 39f4c59,5dbd229..0000000
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@@ -33,8 -33,7 +33,9 @@@
#include <linux/hrtimer.h>
#include <linux/seq_file.h>
#include <linux/semaphore.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+ #include <linux/export.h>
#include <video/omapdss.h>
#include "dss.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