<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/" xmlns:taxo="http://purl.org/rss/1.0/modules/taxonomy/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:syn="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/">
  <channel rdf:about="http://blog.gmane.org/gmane.linux.kernel.next">
    <title>gmane.linux.kernel.next</title>
    <link>http://blog.gmane.org/gmane.linux.kernel.next</link>
    <description/>
    <syn:updatePeriod>hourly</syn:updatePeriod>
    <syn:updateFrequency>1</syn:updateFrequency>
    <syn:updateBase>1901-01-01T00:00+00:00</syn:updateBase>
    <items>
      <rdf:Seq>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22662"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22661"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22659"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22650"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22649"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22644"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22625"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22621"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22618"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22615"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22614"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22612"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22611"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22609"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22607"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22606"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22601"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22588"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22586"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.linux.kernel.next/22585"/>
      </rdf:Seq>
    </items>
    <image rdf:resource="http://gmane.org/img/gmane-25t.png"/>
    <textinput rdf:resource=""/>
  </channel>
  <image rdf:about="http://gmane.org/img/gmane-25t.png">
    <title>Gmane</title>
    <url>http://gmane.org/img/gmane-25t.png</url>
    <link>http://gmane.org</link>
  </image>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22662">
    <title>linux-next: no tree today</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22662</link>
    <description>&lt;pre&gt;Sorry about that.  The next tree will probably be Monday (my time).

&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-25T05:45:48</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22661">
    <title>linux-next: usual request</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22661</link>
    <description>&lt;pre&gt;Hi all,

Please do not add anything to your linux-next included trees that is
intended for v3.6 until after v3.5-rc1 is released.

&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-24T22:20:43</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22659">
    <title>[PATCH] hwmon/sch56xx: Depend on watchdog for watchdog core functions</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22659</link>
    <description>&lt;pre&gt;Since the watchdog code in sch56xx-common now uses the watchdog core, the
Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG
being set.

Signed-off-by: Hans de Goede &amp;lt;hdegoede&amp;lt; at &amp;gt;redhat.com&amp;gt;
---
 drivers/hwmon/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 8deedc1..3d16d66 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1036,7 +1036,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; config SENSORS_SCH56XX_COMMON
 
 config SENSORS_SCH5627
 tristate "SMSC SCH5627"
-depends on !PPC
+depends on !PPC &amp;amp;&amp;amp; WATCHDOG
 select SENSORS_SCH56XX_COMMON
 help
   If you say yes here you get support for the hardware monitoring
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1048,7 +1048,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; config SENSORS_SCH5627
 
 config SENSORS_SCH5636
 tristate "SMSC SCH5636"
-depends on !PPC
+depends on !PPC &amp;amp;&amp;amp; WATCHDOG
 select SENSORS_SCH56XX_COMMON
 help
   SMSC SCH5636 Super I/O chips include an embedded microcontroller for
&lt;/pre&gt;</description>
    <dc:creator>Hans de Goede</dc:creator>
    <dc:date>2012-05-24T20:18:58</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22650">
    <title>linux-next: Tree for May 24</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22650</link>
    <description>&lt;pre&gt;Hi all,

Changes since 20120523:

With the merge window open, conflicts are moving from tree to tree.

The i386 defconfig build is still broken.

The sound-current tree lost its conflicts.

The hexagon tree lost its conflict.

The target-merge tree lost its conflicts.

The crypto tree lost its conflicts.

The cgroup tree lost its conflict.

The mfd tree lost its build failure.

The watchdog tree lost its build failure.

The trivial tree lost its conflicts.

The tip tree lost a few conflicts.

The percpu tree lots its conflict.

The arm-soc tree lost several conflicts.

The signal tree gained conflicts against the tip tree and Linus' tree.

The akpm tree lost several patches to the signal tree.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 190 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-24T06:49:15</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22649">
    <title>linux-next: manual merge of the signal tree with Linus' tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22649</link>
    <description>&lt;pre&gt;Hi Al,

Today's linux-next merge of the signal tree got a conflict in
kernel/irq/manage.c between commit f5d89470f91f ("genirq: Be more
informative on irq type mismatch") from Linus' tree and commit
501a0effacfa ("genirq: reimplement exit_irq_thread() hook via
task_work_add()") from the signal tree.

The latter removed the code modified by the former, so I did that.
&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-24T05:54:53</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22644">
    <title>"blackfin: twi: move twi bit mask macro to twi head file"</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22644</link>
    <description>&lt;pre&gt;Hi all,

This commit:

------
commit c55c89e939f2a0a83d5c61462be554d5d2408178
Author: Sonic Zhang &amp;lt;sonic.zhang&amp;lt; at &amp;gt;analog.com&amp;gt;
Date:   Thu Nov 24 17:40:07 2011 +0800

    blackfin: twi: move twi bit mask macro to twi head file
    
    Signed-off-by: Sonic Zhang &amp;lt;sonic.zhang&amp;lt; at &amp;gt;analog.com&amp;gt;
    Signed-off-by: Bob Liu &amp;lt;lliubbo&amp;lt; at &amp;gt;gmail.com&amp;gt;
------

seems to break linux-next builds, such as this:

http://kisskb.ellerman.id.au/kisskb/buildresult/6353497/

Please have a look, thanks.
Paul.
&lt;/pre&gt;</description>
    <dc:creator>Paul Gortmaker</dc:creator>
    <dc:date>2012-05-24T00:59:40</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22625">
    <title>linux-next: Tree for May 23</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22625</link>
    <description>&lt;pre&gt;Hi all,

Changes since 20120522:

New tree: signal

With the merge window open, conflicts are moving from tree to tree.

The i386 defconfig build is still broken.

The nfs tree lost its conflict.

The rr tree gained a conflict against Linus' tree.

The mmc tree lost its conflict.

The mfd tree gained a conflict against Linus' tree and still has its build
failure so I used the version from next-20120511.

The security tree lost its conflicts.

The watchdog tree lost its conflict but gained a build failure for which
I applied a patch.

The trivial tree lost a conflict.

The edac tree lost its conflict.

The tip tree lost a conflict.

The usb tree lost its conflicts.

The staging tree lost its conflicts.

The char-misc tree lost its conflict.

The arm-soc tree lost lots of conflicts.

The signal tree gained a conflict against the tip tree.

The akpm tree lost several patches to the new signal tree.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 189 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-23T07:07:40</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22621">
    <title>linux-next: manual merge of the signal tree with the tip tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22621</link>
    <description>&lt;pre&gt;Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/um/Kconfig.common between commit 875c9d09b5a6 ("um: Use generic time
config") from the tip tree and commit 985a94a96d29 ("um: Remove
CONFIG_IRQ_RELEASE_METHOD") from the signal tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-23T06:02:33</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22618">
    <title>signal.git</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22618</link>
    <description>&lt;pre&gt;Sorry for not having done that earlier; the tree is at
git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal #for-next.
No non-trivial conflicts with akpm-base - only arch/*/Kconfig ones
coming from mainline.  A _lot_ of duplicates with akpm - 20 commits
from Matt and Oleg are all cherry-picked from there.

I've included the recent uml.git pull request in there -
it's not in -next (and probably ought to be) and this time it
has a lot to do with the stuff being dealt with here.

I hope to get task_work_add() series through that tree,
once all prereqs are there; I'll send heads-up before doing that,
since those patches are currently in akpm's patchset (and unfortunately
they do need a bunch of commits not in there to get them working on
all architectures - some of those prereqs are in this branch, some
will need to be moved to it from signal.git#master)
&lt;/pre&gt;</description>
    <dc:creator>Al Viro</dc:creator>
    <dc:date>2012-05-23T05:22:35</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22615">
    <title>linux-next: manual merge of the mfd tree with Linus' tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22615</link>
    <description>&lt;pre&gt;Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Makefile between commits dece3709b71a ("mfd/db5500-prcmu:
delete DB5500 PRCMU support") and 72fb92200d6c ("mfd/ab5500: delete
AB5500 support") from Linus' tree and commit d28f1db8187d ("mfd: Remove
confusing ab8500-i2c file and merge into ab8500-core") from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary.
&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-23T03:01:54</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22614">
    <title>linux-next: bad merge in the block tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22614</link>
    <description>&lt;pre&gt;Hi Jens,

Commit 21731057017b ("Merge branch 'for-3.5/drivers' into for-next") has
left a conflict marker in Documentation/feature-removal-schedule.txt ...

&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-23T02:35:07</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22612">
    <title>[PATCH] x86: auto poll/interrupt mode switch for CMC to stop CMC storm</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22612</link>
    <description>&lt;pre&gt;This idea is inspired from IA64 implementation. It is like
NAPI for network stack. When CMCI is too many to handle,
this interrupt can be disabled and then poll mode will take
over the events handle. When no more events happen in the
system, CMC interrupt can be enabled automatically.

Signed-off-by: Chen Gong &amp;lt;gong.chen&amp;lt; at &amp;gt;linux.intel.com&amp;gt;
---
 arch/x86/kernel/cpu/mcheck/mce.c |   83 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index d086a09..6334f0d 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -92,6 +92,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; static char*mce_helper_argv[2] = { mce_helper, NULL };
 
 static DECLARE_WAIT_QUEUE_HEAD(mce_chrdev_wait);
 
+static DEFINE_PER_CPU(struct timer_list, mce_timer);
 static DEFINE_PER_CPU(struct mce, mces_seen);
 static intcpu_missing;
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -100,8 +101,28 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
 [0 ... BITS_TO_LONGS(MAX_NR_BANKS)-1] = ~0UL
 };
 
+#define CMC_POLL_INTERVAL(1 * 30)
+#define CMC_STORM5
+static DEFINE_PER_CPU(int, cmci_storm_warning);
+static DEFINE_PER_CPU(unsigned long, first_cmci_jiffie);
+static DEFINE_SPINLOCK(cmc_poll_lock);
+
+/*
+ * This variable tells whether we are in cmci-storm-happened mode.
+ * Start with this in the wrong state so we won't play w/ timers
+ * before the system is ready.
+ */
+static int cmci_storm_detected = 1;
+
 static DEFINE_PER_CPU(struct work_struct, mce_work);
 
+static void mce_disable_cmci(void *data);
+static void mce_enable_ce(void *all);
+static void cmc_disable_keventd(struct work_struct *dummy);
+static void cmc_enable_keventd(struct work_struct *dummy);
+
+static DECLARE_WORK(cmc_disable_work, cmc_disable_keventd);
+static DECLARE_WORK(cmc_enable_work, cmc_enable_keventd);
 /*
  * CPU/chipset specific EDAC code can register a notifier call here to print
  * MCE errors in a human-readable form.
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -582,6 +603,37 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
 {
 struct mce m;
 int i;
+unsigned long flag;
+
+spin_lock_irqsave(&amp;amp;cmc_poll_lock, flag);
+if (cmci_storm_detected == 0) {
+unsigned long now = jiffies;
+int *count = &amp;amp;__get_cpu_var(cmci_storm_warning);
+unsigned long *history = &amp;amp;__get_cpu_var(first_cmci_jiffie);
+
+if (time_before_eq(now, *history + HZ))
+(*count)++;
+else {
+*count = 0;
+*history = now;
+}
+
+if (*count &amp;gt;= CMC_STORM) {
+cmci_storm_detected = 1;
+/* If we're being hit with CMC interrupts, we won't
+ * ever execute the schedule_work() below.  Need to
+ * disable CMC interrupts on this processor now.
+ */
+mce_disable_cmci(NULL);
+if (!work_pending(&amp;amp;cmc_disable_work))
+schedule_work(&amp;amp;cmc_disable_work);
+spin_unlock_irqrestore(&amp;amp;cmc_poll_lock, flag);
+printk(KERN_WARNING "WARNING: Switching to polling "\
+"CMC handler; error records may be lost\n");
+goto out;
+}
+}
+spin_unlock_irqrestore(&amp;amp;cmc_poll_lock, flag);
 
 percpu_inc(mce_poll_count);
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -628,6 +680,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
 mce_wrmsrl(MSR_IA32_MCx_STATUS(i), 0);
 }
 
+out:
 /*
  * Don't clear MCG_STATUS here because it's only defined for
  * exceptions.
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1199,6 +1252,20 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; static void mce_process_work(struct work_struct *dummy)
 memory_failure(pfn, MCE_VECTOR, 0);
 }
 
+static void cmc_disable_keventd(struct work_struct *dummy)
+{
+struct timer_list *t = __this_cpu_ptr(&amp;amp;mce_timer);
+
+on_each_cpu(mce_disable_cmci, NULL, 0);
+mod_timer(t, jiffies + CMC_POLL_INTERVAL * HZ);
+}
+
+static void cmc_enable_keventd(struct work_struct *dummy)
+{
+/* don't re-initiate timer */
+on_each_cpu(mce_enable_ce, NULL, 0);
+}
+
 #ifdef CONFIG_X86_MCE_INTEL
 /***
  * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1232,12 +1299,12 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; void mce_log_therm_throt_event(__u64 status)
 static int check_interval = 5 * 60; /* 5 minutes */
 
 static DEFINE_PER_CPU(int, mce_next_interval); /* in jiffies */
-static DEFINE_PER_CPU(struct timer_list, mce_timer);
 
 static void mce_start_timer(unsigned long data)
 {
 struct timer_list *t = &amp;amp;per_cpu(mce_timer, data);
 int *n;
+unsigned long flags;
 
 WARN_ON(smp_processor_id() != data);
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1253,8 +1320,19 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; static void mce_start_timer(unsigned long data)
 n = &amp;amp;__get_cpu_var(mce_next_interval);
 if (mce_notify_irq())
 *n = max(*n/2, HZ/100);
-else
+else {
 *n = min(*n*2, (int)round_jiffies_relative(check_interval*HZ));
+/* if no CMC event, switch out of polling mode */
+spin_lock_irqsave(&amp;amp;cmc_poll_lock, flags);
+if (cmci_storm_detected == 1) {
+printk(KERN_WARNING "Returning to interrupt driven "\
+"CMC handler\n");
+if (!work_pending(&amp;amp;cmc_enable_work))
+schedule_work(&amp;amp;cmc_enable_work);
+cmci_storm_detected = 0;
+}
+spin_unlock_irqrestore(&amp;amp;cmc_poll_lock, flags);
+}
 
 t-&amp;gt;expires = jiffies + *n;
 add_timer_on(t, smp_processor_id());
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1547,6 +1625,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt; void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
 __mcheck_cpu_init_generic();
 __mcheck_cpu_init_vendor(c);
 __mcheck_cpu_init_timer();
+cmci_storm_detected = 0;
 INIT_WORK(&amp;amp;__get_cpu_var(mce_work), mce_process_work);
 init_irq_work(&amp;amp;__get_cpu_var(mce_irq_work), &amp;amp;mce_irq_work_cb);
 }
&lt;/pre&gt;</description>
    <dc:creator>Chen Gong</dc:creator>
    <dc:date>2012-05-23T02:30:25</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22611">
    <title>linux-next: manual merge of the rr tree with Linus' tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22611</link>
    <description>&lt;pre&gt;Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
Documentation/virtual/virtio-spec.txt between commit 33950c6e2269
("virtio: update documentation to v0.9.5 of spec") from Linus' tree and
commit e26259736de5 ("virtio: update documentation to v0.9.4 of spec")
from the rr tree.

I just used the version from Linus' tree.
&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-23T02:15:18</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22609">
    <title>linux-next: triage for May 22, 2012</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22609</link>
    <description>&lt;pre&gt;With the merge window open, it is as good a time as any to catch up on
the failures in linux-next.  Please have a look to see if any of these
build failures might be related to your commits.

---------------------

New breakage since last report:

ARM:netx_defconfig (mach-netx/fb.c: redefinition of 'clk_disable')

ARM:u8500_defconfig (No rule to make `arch/arm/mach-ux500/pins.o')

ARM:imx_v4_v5_defconfig (video/mx2_camera.c: 'pixfmt' undeclared)

ARM:tegra_defconfig  (tegra-smmu.c: implicit decl 'of_get_dma_window')

blackfin: (implicit declaration of function 'UART_PUT_CLK')

ia64: (kernel/sched/numa.c: initializer element is not constant)

sh4: (kernel/process.c:23: implicit decl of function 'unlazy_fpu')


Randconfig fails that may or may not be new (by their very nature):
i386: include/asm/uaccess_32.h: call to 'copy_from_user_overflow'
declared with attribute error: copy_from_user() buffer size
is not provably correct [fs/binfmt_misc.o] Error 1


Builds that are fixed since last report:
ARM:badge4_defconfig,jornada720_defconfig,neponset_defconfig,cm_x2xx_defconfig 
arch/arm/common/dmabounce.c: 'generic_dma_map_sg' undeclared

ARM:integrator_defconfig "implicit decl of function 'pci_std_swizzle'

ARM:at91x40_defconfig 
arch/arm/mm/dma-mapping.c: 'pgprot_kernel' undeclared

ARM:mv78xx0_defconfig
mach-mv78xx0/pcie.c:256:29: error: 'bus' undeclared

ARM:xcep_defconfig,marzen_defconfig
fs/inode.c:1777:6: error: redefinition of 'inode_dio_wait'

frv: static declaration of 'alloc_task_struct_node' follows non-static

----------------------

Note1: The randconfig fails are only listed once and not tracked
in the below listing.

Note2: Build fails that are perpetual and/or unlikely to ever
get fixed are not tracked here.

Note3: Issues that Stephen finds and reverts/avoids before kicking
off the all-arch/all-config builds are also not tracked here.

Note4: I'm also not tracking the kallsyms extra pass on ARM on
a per board basis anymore.  It has nothing to do with the board.
Why? See:  http://marc.info/?l=linux-next&amp;amp;m=133267456809502

----------------------

Latest results at:
http://kisskb.ellerman.id.au/linux-next

Failures as of this report:
===========================

AM33:asb2303_defconfig,asb2364_defconfig
when:Mar 15
why:cc1: error: unrecognized command line option '-mmem-funcs'
status:Possible fix from TonyB sent for review.
fix:http://marc.info/?l=linux-kernel&amp;amp;m=133185020313818&amp;amp;w=2
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------

ARM:imx_v4_v5_defconfig:
when:May 21
why:video/mx2_camera.c: 'pixfmt' undeclared
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6342390/

ARM:u8500_defconfig
when:May sometime
why:No rule to make `arch/arm/mach-ux500/pins.o'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6348609/

ARM:at91x40_defconfig 
when:May10
why:arch/arm/mm/dma-mapping.c: 'pgprot_kernel' undeclared
status:bisected and reported (see linux-next mail)
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6291233/

ARM:mv78xx0_defconfig
when:May 4
why:mach-mv78xx0/pcie.c:256:29: error: 'bus' undeclared
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6243629/

ARM:bcmring_defconfig
when:Apr 20ish
why:usr/include/asm/kvm_para.h:1: included file 'asm-generic/kvm_para.h' is not exported
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6228994/

ARM:ezx_defconfig
when:Apr 19 (possibly earlier?)
why:ezx-pcap.c: implicit declaration of function 'irq_to_gpio'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6131924/

ARM:netx_defconfig
when:May sometime
why:arch/arm/mach-netx/fb.c: redefinition of 'clk_disable'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6348432/

ARM:netx_defconfig,pnx4008_defconfig 
when:Mar 14
why:net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref:https://lkml.org/lkml/2012/3/13/670

ARM:ixp4xx_defconfig
when:Oct 26
why:gpio.h: implicit declaration of function '__gpio_get_value'
status:fixed (Imre Kaloz) - but possibly needs rework?
fix:https://lkml.org/lkml/2012/2/8/288
ref:https://lkml.org/lkml/2012/2/8/287

ARM:raumfeld_defconfig
when:Nov 23
why:eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status:perhaps broken since 2010?  See ref below.
ref:http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618

----------------

AVR32:allnoconfig
when:May 26 2010, 20:49
why:at32_map_usart: undefined reference to `atmel_default_console_device'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6248032/
---------------
blackfin:
when:May 21
why:implicit declaration of function 'UART_PUT_CLK'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6342312/

blackfin: 50% of builds
when:Mar 31
why:"Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
status:unknown, binutils issue?
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/

blackfin:SMP
whenMay 1
why:kernel/smp.c:724: undefined reference to `smp_call_function_many'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6228892/
---------------

cris:etrax-100lx_defconfig
when:May 7
why:drivers/tty/serial/crisv10.c: macro "wait_event_interruptible_tty" requires 3 args,  only 2 given
why:drivers/tty/serial/crisv10.c: 'wait_event_interruptible_tty' undecl

cris:allyesconfig,allmodconfig
when:Apr 3
why:too many to list here
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------

ia64: defconfig
when:
why:kernel/sched/numa.c:21: initializer element is not constant
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6342563/
----------------

i386:allmodconfig
when:May11
why:input/misc/twl6040-vibra.c: implicit decl 'of_property_read_u32
status:reported on linux-next ; needs a Kbuild arch dependency

i386:allnoconfig
when:May11
why:perf_event_amd.c:(.text+0xc0b0): undefined reference to `get_ibs_caps'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6291419/
----------------

h8300:defconfig
when:Mar 15
why:time.c: implicit declaration of function 'get_irq_regs'
why:also seems gcc suffers an ICE
status:ICE bug lodged with gcc folks (TonyB)
ref:http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------

m32r:m32700ut.smp_defconfig
when:Mar 15
why:No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------

mips:allmodconfig
when:Apr 17
why:sound/oss/soundcard.c: 'MAX_DMA_CHANNELS' undeclared
status: one of many fixes mips needs...
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6091660/
----------------

parisc:defconfig
when:Apr 20
why:file 'asm-generic/kvm_para.h' is not exported
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6137786/

parisc:allmodconfig
when:?
why:include/linux/log2.h: implicit declaration of function 'fls'
status:reported by PaulG, WIP by David Howells 
ref:http://www.spinics.net/lists/linux-parisc/msg04100.html
ref:https://lkml.org/lkml/2012/2/29/409
ref:https://lkml.org/lkml/2012/3/6/228

parisc64:a500_defconfig 
when:?
why:include/linux/log2.h: implicit declaration of function 'fls'
status:reported by PaulG, WIP by David Howells 
ref:https://lkml.org/lkml/2012/2/29/409
ref:https://lkml.org/lkml/2012/3/6/228
------------------

powerpc:allmodconfig
when:May 11
why:ERROR: ".of_mdio_find_bus" [phy/mdio-mux.ko] undefined!
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6291463/

------------------

sh4:allnoconfig
when:May 22
why:kernel/process.c:23: implicit decl of function 'unlazy_fpu'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6342503/

sh4:edosk7705_defconfig
when:May 9
why:kernel/printk.c:1423: 'LOG_LINE_MAX' undeclared 
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6276831/
------------------

sparc:defconfig
when:May 22
why:sparc/kernel/time_32.c: inval use undef type 'struct clock_event_device'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6243021/

sparc[64]:allyesconfig,allmodconfig
when:Apr 18
why:usr/include/asm/kvm_para.h: included file 'asm-generic/kvm_para.h' is not exported
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6243021/

sparc:allnoconfig
when:May 22
why:arch/sparc/kernel/time_32.c: invalid use of undef 'struct clock_event_device'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6348424/
------------------

tile:defconfig
when:May 22
why:include/asm-generic/unistd.h:695: 'compat_sys_ms_mbind' undeclared here
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6348989/
------------------

xtensa:defconfig
when:Apr 20
why:undefined reference to `_sdata'
ref:http://kisskb.ellerman.id.au/kisskb/buildresult/6228970/
&lt;/pre&gt;</description>
    <dc:creator>Paul Gortmaker</dc:creator>
    <dc:date>2012-05-23T01:04:57</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22607">
    <title>Bad ux500 merge fix leads to linux-next failure</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22607</link>
    <description>&lt;pre&gt;Hi Olof,

This change:

-                                  id.o usb.o timer.o
+                                  id.o pins.o usb.o timer.o

breaks the u8500_defconfig as follows:

make[2]: *** No rule to make target `arch/arm/mach-ux500/pins.o', needed
by `arch/arm/mach-ux500/built-in.o'.  Stop.
make[1]: *** [arch/arm/mach-ux500/] Error 2
make: *** [sub-make] Error 2

A bisect shows the following:
  
cda6f4d8cae969e08e6662573b538db73191873b is the first bad commit
commit cda6f4d8cae969e08e6662573b538db73191873b
Author: Olof Johansson &amp;lt;olof&amp;lt; at &amp;gt;lixom.net&amp;gt;
Date:   Wed May 16 14:47:24 2012 -0700

    ARM: ux500: fix mismerge in for-next

    Signed-off-by: Olof Johansson &amp;lt;olof&amp;lt; at &amp;gt;lixom.net&amp;gt;

:040000 040000 abc42227f7daa6a7ff6153e0908add25ffb38a54
45d2618822e6075aea188089191791091c2e5c38 M      arch
bisect run success

The linux-next fail is here:
http://kisskb.ellerman.id.au/kisskb/buildresult/6348609/

Can you have a look please?

Thanks,
Paul.
&lt;/pre&gt;</description>
    <dc:creator>Paul Gortmaker</dc:creator>
    <dc:date>2012-05-23T00:03:46</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22606">
    <title>"clk: add non CONFIG_HAVE_CLK routines" commit</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22606</link>
    <description>&lt;pre&gt;Hi Viresh,

The above listed commit, in linux-next as:

commit ebbf0cb5d39cc3e22ef4c425475e76b7f45027de

    "clk: add non CONFIG_HAVE_CLK routines"

shows up as failures in the netx_defconfig, since there
are duplicate stub functions between your changes and the
file below:

  arch/arm/mach-netx/fb.c:72:6: error: redefinition of 'clk_disable'
  include/linux/clk.h:299:51: note: previous definition of 'clk_disable' was here
  arch/arm/mach-netx/fb.c:76:5: error: redefinition of 'clk_set_rate'
  include/linux/clk.h:306:50: note: previous definition of 'clk_set_rate' was here
  arch/arm/mach-netx/fb.c:81:5: error: redefinition of 'clk_enable'
  include/linux/clk.h:294:50: note: previous definition of 'clk_enable' was here
  arch/arm/mach-netx/fb.c:86:13: error: redefinition of 'clk_get'
  include/linux/clk.h:280:58: note: previous definition of 'clk_get' was here
  arch/arm/mach-netx/fb.c:91:6: error: redefinition of 'clk_put'
  include/linux/clk.h:290:51: note: previous definition of 'clk_put' was here
  make[2]: *** [arch/arm/mach-netx/fb.o] Error 1

Can you have a look please, and delete the overlap?

Thanks,
Paul.
&lt;/pre&gt;</description>
    <dc:creator>Paul Gortmaker</dc:creator>
    <dc:date>2012-05-22T23:46:22</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22601">
    <title>linux-next: bad commit in the cgroup tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22601</link>
    <description>&lt;pre&gt;Hi Tejun,

The top commit of the cgroup tree (e4968362bd46 "WIP") should not be in
linux-next.  In fact it looks like you committed your quilt series by
accident.

I will use the cgroup tree from next-20120522 for today.

&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-22T22:34:37</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22588">
    <title>linux-next: Tree for May 2</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22588</link>
    <description>&lt;pre&gt;Hi all,

Changes since 201205018:

With the merge window open, conflicts are moving from tree to tree.

The i386 defconfig build is still broken and now the sparc32 defconfig is
broken as well.

The ceph tree gained a conflict against Linus' tree.

The nfs tree gained a conflict against Linus' tree.

The infiniband tree lost its build failure.

The net-next tree lost its conflicts.

The mfd tree gained conflicts against Linus' tree and still has its build
failure so I used the version from next-20120511.

The trivial tree gained conflicts against Linus' tree and the mips tree.

The tip tree gained a conflict against Linus' tree.  I also added a patch
for a PowerPC boot problem.

The kvm-ppc tree lost its conflict.

The usb tree lost its build failure.

The userns tree gained a conflict against Linus' tree.

The akpm tree lost a conflict.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 189 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-22T08:30:37</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22586">
    <title>linux-next: build failure after merge of the final tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22586</link>
    <description>&lt;pre&gt;Hi all,

After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:

arch/sparc/kernel/time_32.c: In function 'timer_interrupt':
arch/sparc/kernel/time_32.c:105:3: error: invalid use of undefined type 'struct clock_event_device'
arch/sparc/kernel/time_32.c: At top level:
arch/sparc/kernel/time_32.c:111:17: error: 'enum clock_event_mode' declared inside parameter list [-Werror]
arch/sparc/kernel/time_32.c:111:17: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]
arch/sparc/kernel/time_32.c:110:53: error: parameter 1 ('mode') has incomplete type
arch/sparc/kernel/time_32.c:110:13: error: function declaration isn't a prototype [-Werror=strict-prototypes]
arch/sparc/kernel/time_32.c: In function 'timer_ce_set_mode':
arch/sparc/kernel/time_32.c:114:8: error: 'CLOCK_EVT_MODE_PERIODIC' undeclared (first use in this function)
arch/sparc/kernel/time_32.c:114:8: note: each undeclared identifier is reported only once for each function it appears in
arch/sparc/kernel/time_32.c:115:8: error: 'CLOCK_EVT_MODE_RESUME' undeclared (first use in this function)
arch/sparc/kernel/time_32.c:118:8: error: 'CLOCK_EVT_MODE_SHUTDOWN' undeclared (first use in this function)
arch/sparc/kernel/time_32.c: In function 'setup_timer_ce':
arch/sparc/kernel/time_32.c:133:4: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:134:4: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:135:4: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:135:17: error: 'CLOCK_EVT_FEAT_PERIODIC' undeclared (first use in this function)
arch/sparc/kernel/time_32.c:136:4: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:137:4: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:138:4: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:139:4: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:139:2: error: implicit declaration of function 'div_sc' [-Werror=implicit-function-declaration]
arch/sparc/kernel/time_32.c:140:26: error: dereferencing pointer to incomplete type
arch/sparc/kernel/time_32.c:141:2: error: implicit declaration of function 'clockevents_register_device' [-Werror=implicit-function-declaration]

I have no idea what caused this, I did not get this yesterday.  I have
left this build broken for today.
&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-22T08:20:10</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22585">
    <title>linux-next: manual merge of the userns tree with Linus' tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22585</link>
    <description>&lt;pre&gt;Hi Eric,

Today's linux-next merge of the userns tree got a conflict in fs/stat.c
between commit a52dd971f947 ("vfs: de-crapify "cp_new_stat()" function")
from Linus' tree and commit a7c1938e22c0 ("userns: Convert stat to return
values mapped from kuids and kgids") from the userns tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-22T07:44:26</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.linux.kernel.next/22584">
    <title>linux-next: manual merge of the tip tree with Linus' tree</title>
    <link>http://comments.gmane.org/gmane.linux.kernel.next/22584</link>
    <description>&lt;pre&gt;Hi all,

Today's linux-next merge of the tip tree got a conflict in mm/memory.c
between commit 4f74d2c8e827 ("vm: remove 'nr_accounted' calculations from
the unmap_vmas() interfaces") from Linus' tree and commit cbc91f71b51b
("uprobes/core: Decrement uprobe count before the pages are unmapped")
from the tip tree.

Following discussion between Linus and Andred, I fixed it up as below for
now.
&lt;/pre&gt;</description>
    <dc:creator>Stephen Rothwell</dc:creator>
    <dc:date>2012-05-22T05:44:11</dc:date>
  </item>
  <textinput rdf:about="http://search.gmane.org/?group=$group=gmane.linux.kernel.next">
    <title>Search Engine</title>
    <description>Search the mailing list at Gmane</description>
    <name>query</name>
    <link>http://search.gmane.org/?group=$group=gmane.linux.kernel.next</link>
  </textinput>
</rdf:RDF>

