From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Gregory Haskins <gregory.haskins@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Bruno Randolf <br1@einfach•org>,
"John W. Linville" <linville@tuxdriver•com>
Subject: linux-next: manual merge of the alacrity tree with the wireless tree
Date: Fri, 19 Nov 2010 11:59:14 +1100 [thread overview]
Message-ID: <20101119115914.4501da3f.sfr@canb.auug.org.au> (raw)
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@canb•auug.org.au
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
reply other threads:[~2010-11-19 0:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101119115914.4501da3f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=br1@einfach$(echo .)org \
--cc=gregory.haskins@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox