On Tue, 14 Aug 2012, viresh kumar wrote: > On Mon, Aug 13, 2012 at 8:43 PM, tip-bot for Thomas Gleixner > <tglx@xxxxxxxxxxxxx> wrote: > > Commit-ID: bcd951cf10f24e341defcd002c15a1f4eea13ddb > > Gitweb: http://git.kernel.org/tip/bcd951cf10f24e341defcd002c15a1f4eea13ddb > > Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > AuthorDate: Mon, 16 Jul 2012 10:42:38 +0000 > > Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > CommitDate: Mon, 13 Aug 2012 17:01:07 +0200 > > > > watchdog: Use hotplug thread infrastructure > > Hi Thomas, > > I am maintaining http://git.linaro.org/gitweb?p=arm/big.LITTLE/mp.git;a=summary > linaro tree for big.LITTLE MP work. I had a branch > per-cpu-thread-hotplug-v3-fixed > with your stuff in it + Paul's fix. > > I was rebasing it over 3.6-rc1 and got conflicts, actually a routine is added in > kernel/watchdog.c file, which uses functions removed in your patch: > > > commit 45226e944ce071d0231949f2fea90969437cd2dc > Author: Sameer Nanda <snanda@xxxxxxxxxxxx> > Date: Mon Jul 30 14:40:00 2012 -0700 > > NMI watchdog: fix for lockup detector breakage on resume This patch got reverted in mainline. See commit commit 300d3739 (Revert "NMI watchdog: fix for lockup detector breakage on resume") So nothing to fix there. Thanks, tglx -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|