Hi Gregory,
Today's linux-next merge of the alacrity tree got a conflict in
lib/Kconfig between commit c5485a7e7569ab32eea240c850198519e2a765ef
("lib: Add generic exponentially weighted moving average (EWMA)
function") from the wireless tree and commit
86613d42e6440339e9653a35d69ee5d6db361069 ("shm-signal: shared-memory
signals") from the alacrity tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
I do need to ask if the commits in the alacrity tree are going to be
merged upstream. The tree has not been updated since May ...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc lib/Kconfig
index 3116aa6,af12831..0000000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -210,7 -210,25 +210,28 @@@ config GENERIC_ATOMIC6
config LRU_CACHE
tristate
+config AVERAGE
+ bool
+
+ config SHM_SIGNAL
+ tristate "SHM Signal - Generic shared-memory signaling mechanism"
+ default n
+ help
+ Provides a shared-memory based signaling mechanism to indicate
+ memory-dirty notifications between two end-points.
+
+ If unsure, say N
+
+ config IOQ
+ tristate "IO-Queue library - Generic shared-memory queue"
+ select SHM_SIGNAL
+ default n
+ help
+ IOQ is a generic shared-memory-queue mechanism that happens to be
+ friendly to virtualization boundaries. It can be used in a variety
+ of ways, though its intended purpose is to become a low-level
+ communication path for paravirtualized drivers.
+
+ If unsure, say N
+
endmenu
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
