)]}' { "log": [ { "commit": "028ee4be34a09a6d48bdf30ab991ae933a7bc036", "tree": "455783226ceb65aee100f86afed529d4bbde1c8b", "parents": [ "b3f7f573a20081910e34e99cbc91831f4f02f1ff" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu Jan 12 17:20:55 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:13 2012 -0800" }, "message": "c/r: prctl: add PR_SET_MM codes to set up mm_struct entries\n\nWhen we restore a task we need to set up text, data and data heap sizes\nfrom userspace to the values a task had at checkpoint time. This patch\nadds auxilary prctl codes for that.\n\nWhile most of them have a statistical nature (their values are involved\ninto calculation of /proc/\u003cpid\u003e/statm output) the start_brk and brk values\nare used to compute an allowed size of program data segment expansion.\nWhich means an arbitrary changes of this values might be dangerous\noperation. So to restrict access the following requirements applied to\nprctl calls:\n\n - The process has to have CAP_SYS_ADMIN capability granted.\n - For all opcodes except start_brk/brk members an appropriate\n VMA area must exist and should fit certain VMA flags,\n such as:\n - code segment must be executable but not writable;\n - data segment must not be executable.\n\nstart_brk/brk values must not intersect with data segment and must not\nexceed RLIMIT_DATA resource limit.\n\nStill the main guard is CAP_SYS_ADMIN capability check.\n\nNote the kernel should be compiled with CONFIG_CHECKPOINT_RESTORE support\notherwise these prctl calls will return -EINVAL.\n\n[akpm@linux-foundation.org: cache current-\u003emm in a local, saving 200 bytes text]\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Andrew Vagin \u003cavagin@openvz.org\u003e\nCc: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6e6f0a1f0fa6bba1493c296eb30d1e176e1f8530", "tree": "c1bbacbc93e5b6f7759d509d7cf6207ad5b3ee65", "parents": [ "b8f566b04d3cddd192cfd2418ae6d54ac6353792" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Thu Jan 12 17:20:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "panic: don\u0027t print redundant backtraces on oops\n\nWhen an oops causes a panic and panic prints another backtrace it\u0027s pretty\ncommon to have the original oops data be scrolled away on a 80x50 screen.\n\nThe second backtrace is quite redundant and not needed anyways.\n\nSo don\u0027t print the panic backtrace when oops_in_progress is true.\n\n[akpm@linux-foundation.org: add comment]\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b8f566b04d3cddd192cfd2418ae6d54ac6353792", "tree": "32a5bf86548cd43feff4822d800b6a99e157b5d7", "parents": [ "f5138e42211d4e8bfbd6ac5b3816348da1533433" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Jan 12 17:20:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "sysctl: add the kernel.ns_last_pid control\n\nThe sysctl works on the current task\u0027s pid namespace, getting and setting\nits last_pid field.\n\nWriting is allowed for CAP_SYS_ADMIN-capable tasks thus making it possible\nto create a task with desired pid value. This ability is required badly\nfor the checkpoint/restore in userspace.\n\nThis approach suits all the parties for now.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "93e13a360ba331915220f82f6e9543df961ffa1f", "tree": "470c120ee5d3de69f46e62ec85452bee14e8d67c", "parents": [ "bec013c40bc89671d8d457944fdf7d2b8e79d651" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Thu Jan 12 17:20:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kdump: fix crash_kexec()/smp_send_stop() race in panic()\n\nWhen two CPUs call panic at the same time there is a possible race\ncondition that can stop kdump. The first CPU calls crash_kexec() and the\nsecond CPU calls smp_send_stop() in panic() before crash_kexec() finished\non the first CPU. So the second CPU stops the first CPU and therefore\nkdump fails:\n\n1st CPU:\n panic()-\u003ecrash_kexec()-\u003emutex_trylock(\u0026kexec_mutex)-\u003e do kdump\n\n2nd CPU:\n panic()-\u003ecrash_kexec()-\u003ekexec_mutex already held by 1st CPU\n -\u003esmp_send_stop()-\u003e stop 1st CPU (stop kdump)\n\nThis patch fixes the problem by introducing a spinlock in panic that\nallows only one CPU to process crash_kexec() and the subsequent panic\ncode.\n\nAll other CPUs call the weak function panic_smp_self_stop() that stops the\nCPU itself. This function can be overloaded by architecture code. For\nexample \"tile\" can use their lower-power \"nap\" instruction for that.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bec013c40bc89671d8d457944fdf7d2b8e79d651", "tree": "f48220571120805a319f0df876c1cc465586978e", "parents": [ "6480e5a0923756b500634d9777ec4189492fbbfe" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Thu Jan 12 17:20:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kdump: crashk_res init check for /sys/kernel/kexec_crash_size\n\nCurrently it is possible to set the crash_size via the sysfs\n/sys/kernel/kexec_crash_size even if no crash kernel memory has been\ndefined with the \"crashkernel\" parameter. In this case \"crashk_res\" is\nnot initialized and crashk_res.start \u003d crashk_res.end \u003d 0. Unfortunately\nresource_size(\u0026crashk_res) returns 1 in this case. This breaks the s390\nimplementation of crash_(un)map_reserved_pages().\n\nTo fix the problem the correct \"old_size\" is now calculated in\ncrash_shrink_memory(). \"old_size is set to \"0\" if crashk_res is not\ninitialized. With this change crash_shrink_memory() will do nothing, when\n\"crashk_res\" is not initialized. It will return \"0\" for \"echo 0 \u003e\n/sys/kernel/kexec_crash_size\" and -EINVAL for \"echo [not zero] \u003e\n/sys/kernel/kexec_crash_size\".\n\nIn addition to that this patch also simplifies the \"ret \u003d -EINVAL\" vs.\n\"ret \u003d 0\" logic as suggested by Simon Horman.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nReviewed-by: Dave Young \u003cdyoung@redhat.com\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nReviewed-by: Simon Horman \u003chorms@verge.net.au\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6480e5a0923756b500634d9777ec4189492fbbfe", "tree": "0b1d26ce39f9b7cd28a9e82627ee837734f7c3ab", "parents": [ "a3dd3323058d281abd584b15ad4c5b65064d7a61" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Thu Jan 12 17:20:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kdump: add missing RAM resource in crash_shrink_memory()\n\nWhen shrinking crashkernel memory using /sys/kernel/kexec_crash_size for\nthe newly added memory no RAM resource is created at the moment.\n\nExample:\n\n $ cat /proc/iomem\n 00000000-bfffffff : System RAM\n 00000000-005b7ac3 : Kernel code\n 005b7ac4-009743bf : Kernel data\n 009bb000-00a85c33 : Kernel bss\n c0000000-cfffffff : Crash kernel\n d0000000-ffffffff : System RAM\n\n $ echo 0 \u003e /sys/kernel/kexec_crash_size\n $ cat /proc/iomem\n 00000000-bfffffff : System RAM\n 00000000-005b7ac3 : Kernel code\n 005b7ac4-009743bf : Kernel data\n 009bb000-00a85c33 : Kernel bss\n \u003c\u003c-- here is System RAM missing\n d0000000-ffffffff : System RAM\n\nOne result of this bug is that the memory chunk can never be set offline\nusing memory hotplug. With this patch I insert a new \"System RAM\"\nresource for the released memory. Then the upper example looks like the\nfollowing:\n\n $ echo 0 \u003e /sys/kernel/kexec_crash_size\n $ cat /proc/iomem\n 00000000-bfffffff : System RAM\n 00000000-005b7ac3 : Kernel code\n 005b7ac4-009743bf : Kernel data\n 009bb000-00a85c33 : Kernel bss\n c0000000-cfffffff : System RAM \u003c\u003c-- new rescoure\n d0000000-ffffffff : System RAM\n\nAnd now I can set chunk c0000000-cfffffff offline.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a3dd3323058d281abd584b15ad4c5b65064d7a61", "tree": "98c65337f9960db2d0ca55687314bb821f3e7c1f", "parents": [ "9512938b885304f72c847379611d6018064af840" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 12 17:20:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kexec: remove KMSG_DUMP_KEXEC\n\nKMSG_DUMP_KEXEC is useless because we already save kernel messages inside\n/proc/vmcore, and it is unsafe to allow modules to do other stuffs in a\ncrash dump scenario.\n\n[akpm@linux-foundation.org: fix powerpc build]\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nReported-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9402c95f34a66e81eba473a2f7267bbae5a1dee2", "tree": "c46628e702d625a737fedbd9de88138a94c93d1f", "parents": [ "80bf007f20b16272f210e0803f739f5606cff59d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jan 12 17:17:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:03 2012 -0800" }, "message": "treewide: remove useless NORET_TYPE macro and uses\n\nIt\u0027s a very old and now unused prototype marking so just delete it.\n\nNeaten panic pointer argument style to keep checkpatch quiet.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "efeb156e7275c5b6c6e0f96aceb3c6abf98fc392", "tree": "651970d08c18d8934bcdcc7f01d3c9876fc2ef6a", "parents": [ "a2ef990ab5a6705a356d146dd773a3b359787497" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Jan 12 17:17:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:02 2012 -0800" }, "message": "kprobes: silence DEBUG_STRICT_USER_COPY_CHECKS\u003dy warning\n\nEnabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:\n\n In file included from arch/x86/include/asm/uaccess.h:573,\n from kernel/kprobes.c:55:\n In function \u0027copy_from_user\u0027,\n inlined from \u0027write_enabled_file_bool\u0027 at\n kernel/kprobes.c:2191:\n arch/x86/include/asm/uaccess_64.h:65:\n warning: call to \u0027copy_from_user_overflow\u0027 declared with attribute warning: copy_from_user() buffer size is not provably correct\n\npresumably due to buf_size being signed causing GCC to fail to see that\nbuf_size can\u0027t become negative.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Anil S Keshavamurthy \u003canil.s.keshavamurthy@intel.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b8bf17d311c875de02550d5ce2af66588734159a", "tree": "82d829df77f3eb506d10928fd633a8a6e5685082", "parents": [ "9fc5c3e3237e02a94f41cd1d2b4291593d29791d", "bced76aeaca03b45e3b4bdb868cada328e497847" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 22:52:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 22:52:48 2012 -0800" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched: Fix lockup by limiting load-balance retries on lock-break\n sched: Fix CONFIG_CGROUP_SCHED dependency\n sched: Remove empty #ifdefs\n" }, { "commit": "541048a1d31399ccdda27346a37eae4a2ad55186", "tree": "e2a820ee478b18d4214347631b94b9a9b2d8562b", "parents": [ "bcede2f64a3b5cb50c0bdec1553ab480fd75d659", "e58d429209105e698e9d0357481d62b37fe9a7dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:04 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:04 2012 -0800" }, "message": "Merge branch \u0027x86-debug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-debug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, reboot: Fix typo in nmi reboot path\n x86, NMI: Add to_cpumask() to silence compile warning\n x86, NMI: NMI selftest depends on the local apic\n x86: Add stack top margin for stack overflow checking\n x86, NMI: NMI-selftest should handle the UP case properly\n x86: Fix the 32-bit stackoverflow-debug build\n x86, NMI: Add knob to disable using NMI IPIs to stop cpus\n x86, NMI: Add NMI IPI selftest\n x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus\n x86: Clean up the range of stack overflow checking\n x86: Panic on detection of stack overflow\n x86: Check stack overflow in detail\n" }, { "commit": "bced76aeaca03b45e3b4bdb868cada328e497847", "tree": "e2965b6cfecdc257a01b89ec6780b8de3b2e6d39", "parents": [ "6db9dc150eabce7053c8df2a2146aa0d6748ec42" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Jan 11 13:11:12 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 11 17:15:12 2012 +0100" }, "message": "sched: Fix lockup by limiting load-balance retries on lock-break\n\nEric and David reported dead machines and traced it to commit\na195f004 (\"sched: Fix load-balance lock-breaking\"), it turns out\nthere\u0027s still a scenario where we can end up re-trying forever.\n\nSince there is no strict forward progress guarantee in the\nload-balance iteration we can get stuck re-retrying the same\ntask-set over and over.\n\nCreating a forward progress guarantee with the existing\nstructure is somewhat non-trivial, for now simply terminate the\nretry loop after a few tries.\n\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nReported-by: David Ahern \u003cdsahern@gmail.com\u003e\n[ logic cleanup as suggested by Eric ]\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/1326297936.2442.157.camel@twins\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "001a541ea9163ace5e8243ee0e907ad80a4c0ec2", "tree": "a76225046369c440de93739add9823f5ea060245", "parents": [ "40ba587923ae67090d9f141c1d3c951be5c1420e", "bc31b86a5923fad5f3fbb6192f767f410241ba27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:59:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:59:59 2012 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: move MIN_WRITEBACK_PAGES to fs-writeback.c\n writeback: balanced_rate cannot exceed write bandwidth\n writeback: do strict bdi dirty_exceeded\n writeback: avoid tiny dirty poll intervals\n writeback: max, min and target dirty pause time\n writeback: dirty ratelimit - think time compensation\n btrfs: fix dirtied pages accounting on sub-page writes\n writeback: fix dirtied pages accounting on redirty\n writeback: fix dirtied pages accounting on sub-page writes\n writeback: charge leaked page dirties to active tasks\n writeback: Include all dirty inodes in background writeback\n" }, { "commit": "40ba587923ae67090d9f141c1d3c951be5c1420e", "tree": "342a72fc0ee13a0d2496ef970b64dfeadf1355d2", "parents": [ "54c2c5761febcca46c8037d3a81612991e6c209a", "6b550f9495947fc279d12c38feaf98500e8d0646" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb\")\n\nAndrew elucidates:\n - First installmeant of MM. We have a HUGE number of MM patches this\n time. It\u0027s crazy.\n - MAINTAINERS updates\n - backlight updates\n - leds\n - checkpatch updates\n - misc ELF stuff\n - rtc updates\n - reiserfs\n - procfs\n - some misc other bits\n\n* akpm: (124 commits)\n user namespace: make signal.c respect user namespaces\n workqueue: make alloc_workqueue() take printf fmt and args for name\n procfs: add hidepid\u003d and gid\u003d mount options\n procfs: parse mount options\n procfs: introduce the /proc/\u003cpid\u003e/map_files/ directory\n procfs: make proc_get_link to use dentry instead of inode\n signal: add block_sigmask() for adding sigmask to current-\u003eblocked\n sparc: make SA_NOMASK a synonym of SA_NODEFER\n reiserfs: don\u0027t lock root inode searching\n reiserfs: don\u0027t lock journal_init()\n reiserfs: delay reiserfs lock until journal initialization\n reiserfs: delete comments referring to the BKL\n drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range\n drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030\n drivers/rtc/: remove redundant spi driver bus initialization\n drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static\n drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static\n rtc: convert drivers/rtc/* to use module_platform_driver()\n drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()\n drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler\n ...\n" }, { "commit": "6b550f9495947fc279d12c38feaf98500e8d0646", "tree": "ab018bd7e2f8c2c594252f35ffa7c413f86519cf", "parents": [ "b196be89cdc14a88cc637cdad845a75c5886c82d" ], "author": { "name": "Serge E. Hallyn", "email": "serge@hallyn.com", "time": "Tue Jan 10 15:11:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "user namespace: make signal.c respect user namespaces\n\nipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient\u0027s\nuser namespace. (new, thanks Oleg)\n\n__send_signal: convert current\u0027s uid to the recipient\u0027s user namespace\nfor any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks\nagain :)\n\ndo_notify_parent and do_notify_parent_cldstop: map task\u0027s uid to parent\u0027s\nuser namespace\n\nptrace_signal maps parent\u0027s uid into current\u0027s user namespace before\nincluding in signal to current. IIUC Oleg has argued that this shouldn\u0027t\nmatter as the debugger will play with it, but it seems like not converting\nthe value currently being set is misleading.\n\nChangelog:\nSep 20: Inspired by Oleg\u0027s suggestion, define map_cred_ns() helper to\n\tsimplify callers and help make clear what we are translating\n (which uid into which namespace). Passing the target task would\n\tmake callers even easier to read, but we pass in user_ns because\n\tcurrent_user_ns() !\u003d task_cred_xxx(current, user_ns).\nSep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock\n\tin ptrace_signal().\nSep 23: In send_signal(), detect when (user) signal is coming from an\n\tancestor or unrelated user namespace. Pass that on to __send_signal,\n\twhich sets si_uid to 0 or overflowuid if needed.\nOct 12: Base on Oleg\u0027s fixup_uid() patch. On top of that, handle all\n\tSI_FROMKERNEL cases at callers, because we can\u0027t assume sender is\n\tcurrent in those cases.\nNov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid\nNov 10: (akpm) make the !CONFIG_USER_NS case clearer\n\nSigned-off-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nFrom: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSubject: __send_signal: pass q-\u003einfo, not info, to userns_fixup_signal_uid (v2)\n\nEric Biederman pointed out that passing info is a bug and could lead to a\nNULL pointer deref to boot.\n\nA collection of signal, securebits, filecaps, cap_bounds, and a few other\nltp tests passed with this kernel.\n\nChangelog:\n Nov 18: previous patch missed a leading \u0027\u0026\u0027\n\nSigned-off-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nFrom: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSubject: ipc/mqueue: lock() \u003d\u003e unlock() typo\n\nThere was a double lock typo introduced in b085f4bd6b21 \"user namespace:\nmake signal.c respect user namespaces\"\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nAcked-by: Serge Hallyn \u003cserge@hallyn.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b196be89cdc14a88cc637cdad845a75c5886c82d", "tree": "195816e6ab82362969409b3317d223421502224a", "parents": [ "0499680a42141d86417a8fbaa8c8db806bea1201" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 10 15:11:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "workqueue: make alloc_workqueue() take printf fmt and args for name\n\nalloc_workqueue() currently expects the passed in @name pointer to remain\naccessible. This is inconvenient and a bit silly given that the whole wq\nis being dynamically allocated. This patch updates alloc_workqueue() and\nfriends to take printf format string instead of opaque string and matching\nvarargs at the end. The name is allocated together with the wq and\nformatted.\n\nalloc_ordered_workqueue() is converted to a macro to unify varargs\nhandling with alloc_workqueue(), and, while at it, add comment to\nalloc_workqueue().\n\nNone of the current in-kernel users pass in string with \u0027%\u0027 as constant\nname and this change shouldn\u0027t cause any problem.\n\n[akpm@linux-foundation.org: use __printf]\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSuggested-by: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5e6292c0f28f03dfdb8ea3d685f0b838a23bfba4", "tree": "8684833680054ab48f9da2bbc36c93e3d00a3391", "parents": [ "f350b1778f1b7713ef54fbc7e079e09e2fe098b9" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Tue Jan 10 15:11:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "signal: add block_sigmask() for adding sigmask to current-\u003eblocked\n\nAbstract the code sequence for adding a signal handler\u0027s sa_mask to\ncurrent-\u003eblocked because the sequence is identical for all architectures.\nFurthermore, in the past some architectures actually got this code wrong,\nso introduce a wrapper that all architectures can use.\n\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "43d2b113241d6797b890318767e0af78e313414b", "tree": "6f25647f2660f8fca63cc8355b70ad643993dab8", "parents": [ "6bd4837de96e7d9f9bf33e59117c24fc230862ac" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Jan 10 15:08:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:44 2012 -0800" }, "message": "tracepoint: add tracepoints for debugging oom_score_adj\n\noom_score_adj is used for guarding processes from OOM-Killer. One of\nproblem is that it\u0027s inherited at fork(). When a daemon set oom_score_adj\nand make children, it\u0027s hard to know where the value is set.\n\nThis patch adds some tracepoints useful for debugging. This patch adds\n3 trace points.\n - creating new task\n - renaming a task (exec)\n - set oom_score_adj\n\nTo debug, users need to enable some trace pointer. Maybe filtering is useful as\n\n# EVENT\u003d/sys/kernel/debug/tracing/events/task/\n# echo \"oom_score_adj !\u003d 0\" \u003e $EVENT/task_newtask/filter\n# echo \"oom_score_adj !\u003d 0\" \u003e $EVENT/task_rename/filter\n# echo 1 \u003e $EVENT/enable\n# EVENT\u003d/sys/kernel/debug/tracing/events/oom/\n# echo 1 \u003e $EVENT/enable\n\noutput will be like this.\n# grep oom /sys/kernel/debug/tracing/trace\nbash-7699 [007] d..3 5140.744510: oom_score_adj_update: pid\u003d7699 comm\u003dbash oom_score_adj\u003d-1000\nbash-7699 [007] ...1 5151.818022: task_newtask: pid\u003d7729 comm\u003dbash clone_flags\u003d1200011 oom_score_adj\u003d-1000\nls-7729 [003] ...2 5151.818504: task_rename: pid\u003d7729 oldcomm\u003dbash newcomm\u003dls oom_score_adj\u003d-1000\nbash-7699 [002] ...1 5175.701468: task_newtask: pid\u003d7730 comm\u003dbash clone_flags\u003d1200011 oom_score_adj\u003d-1000\ngrep-7730 [007] ...2 5175.701993: task_rename: pid\u003d7730 oldcomm\u003dbash newcomm\u003dgrep oom_score_adj\u003d-1000\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c6968e73b90c2a2fb9a32d4bad249f8f70f70125", "tree": "67ec90fc8e187fcf316298dd9d514bbbbbc8f187", "parents": [ "c0a32fc5a2e470d0b02597b23ad79a317735253e" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Tue Jan 10 15:07:31 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:42 2012 -0800" }, "message": "PM/Hibernate: do not count debug pages as savable\n\nWhen debugging with CONFIG_DEBUG_PAGEALLOC and debug_guardpage_minorder \u003e\n0, we have lot of free pages that are not marked so. Snapshot code\naccount them as savable, what cause hibernate memory preallocation\nfailure.\n\nIt is pretty hard to make hibernate allocation succeed with\ndebug_guardpage_minorder\u003d1. This change at least make it possible when\nsystem has relatively big amount of RAM.\n\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3dcf6c1b6b29f327ec24a1986aaa8eba399b463f", "tree": "51e8d0659aa3e4aa50ac94cf13051fef135bda19", "parents": [ "e4e11180dfa545233e5145919b75b7fac88638df", "da69dee073a27ee2d4e50c9b19e9faf8776857eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "message": "Merge branch \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (74 commits)\n KVM: PPC: Whitespace fix for kvm.h\n KVM: Fix whitespace in kvm_para.h\n KVM: PPC: annotate kvm_rma_init as __init\n KVM: x86 emulator: implement RDPMC (0F 33)\n KVM: x86 emulator: fix RDPMC privilege check\n KVM: Expose the architectural performance monitoring CPUID leaf\n KVM: VMX: Intercept RDPMC\n KVM: SVM: Intercept RDPMC\n KVM: Add generic RDPMC support\n KVM: Expose a version 2 architectural PMU to a guests\n KVM: Expose kvm_lapic_local_deliver()\n KVM: x86 emulator: Use opcode::execute for Group 9 instruction\n KVM: x86 emulator: Use opcode::execute for Group 4/5 instructions\n KVM: x86 emulator: Use opcode::execute for Group 1A instruction\n KVM: ensure that debugfs entries have been created\n KVM: drop bsp_vcpu pointer from kvm struct\n KVM: x86: Consolidate PIT legacy test\n KVM: x86: Do not rely on implicit inclusions\n KVM: Make KVM_INTEL depend on CPU_SUP_INTEL\n KVM: Use memdup_user instead of kmalloc/copy_from_user\n ...\n" }, { "commit": "9b9fb610f6800e0db46cccd8618dd7e609c9bb5a", "tree": "9cd1157b35c144fc274f1deb14a88a2da3c5ce05", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913" ], "author": { "name": "Hiroshi Shimamoto", "email": "h-shimamoto@ct.jp.nec.com", "time": "Tue Jan 10 09:24:05 2012 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 10 09:57:41 2012 +0100" }, "message": "sched: Remove empty #ifdefs\n\nSigned-off-by: Hiroshi Shimamoto \u003ch-shimamoto@ct.jp.nec.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/4F0B8525.8070901@ct.jp.nec.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "tree": "8f38957c01b18edddd44d49ecc3beeac08a20b4e", "parents": [ "ac69e0928054ff29a5049902fb477f9c7605c773", "0d19ea866562e46989412a0676412fa0983c9ce7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n cgroup: fix to allow mounting a hierarchy by name\n cgroup: move assignement out of condition in cgroup_attach_proc()\n cgroup: Remove task_lock() from cgroup_post_fork()\n cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n cgroup: remove redundant get/put of task struct\n cgroup: remove redundant get/put of old css_set from migrate\n cgroup: Remove unnecessary task_lock before fetching css_set on migration\n cgroup: Drop task_lock(parent) on cgroup_fork()\n cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n resource cgroups: remove bogus cast\n cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n cgroup, cpuset: don\u0027t use ss-\u003epre_attach()\n cgroup: don\u0027t use subsys-\u003ecan_attach_task() or -\u003eattach_task()\n cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n cgroup: improve old cgroup handling in cgroup_attach_proc()\n cgroup: always lock threadgroup during migration\n threadgroup: extend threadgroup_lock() to cover exit and exec\n threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n ...\n\nFix up conflict in kernel/cgroup.c due to commit e0197aae59e5: \"cgroups:\nfix a css_set not found bug in cgroup_attach_proc\" that already\nmentioned that the bug is fixed (differently) in Tejun\u0027s cgroup\npatchset. This one, in other words.\n" }, { "commit": "a0e86bd4252519321b0d102dc4ed90557aa7bee9", "tree": "13c3cb632dfb85ea6b9f5c20273d793a99b20f15", "parents": [ "7dd72f5189b257f927cc3b35d98643a5c392f5c3" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Jan 08 22:44:29 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:15:21 2012 -0800" }, "message": "audit: always follow va_copy() with va_end()\n\nA call to va_copy() should always be followed by a call to va_end() in\nthe same function. In kernel/autit.c::audit_log_vformat() this is not\nalways done. This patch makes sure va_end() is always called.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "02550d61f49266930e674286379d3601006b2893", "tree": "2d30df688b7f428908028dd20e83b22bc799dee7", "parents": [ "2d51daaa615e4724f24e43fa01e705c40551080a", "c89810acbcf48c7004e912b2b4b862480b2d00e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\ndevicetree/next changes queued for v3.3 merge window\n\n* tag \u0027devicetree-for-linus-20120104\u0027 of git://git.secretlab.ca/git/linux-2.6:\n ARM: prom.h: Fix build error by removing unneeded header file\n irq: check domain hwirq range for DT translate\n dt: add empty of_get_node/of_put_node functions\n of/pdt: fix section mismatch warning\n i2c-designware: add OF binding support\n dt/i2c: Enumerate some of the known trivial i2c devices\n dt: reform for_each_property to for_each_property_of_node\n ARM/of: allow *machine_desc.dt_compat to be const\n of/base: Take NULL string into account for property with multiple strings\n OF/device-tree: Add some entries to vendor-prefixes.txt\n\nFix up trivial add-add conflicts in include/linux/of.h\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "34c80b1d93e6e20ca9dea0baf583a5b5510d92d4", "tree": "7dcbf0a4e09464247e6992c8f44fcc872867bd3a", "parents": [ "a6322de67b58a00e3a783ad9c87c2a11b2d67b47" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 21:32:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:19:54 2012 -0500" }, "message": "vfs: switch -\u003eshow_options() to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d8c9584ea2a92879f471fd3a2be3af6c534fb035", "tree": "3541b9c6228f820bdc65e4875156eb27b1c91cb1", "parents": [ "ece2ccb668046610189d88d6aaf05aeb09c988a1" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 07 18:16:57 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:16:53 2012 -0500" }, "message": "vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ece2ccb668046610189d88d6aaf05aeb09c988a1", "tree": "a0349945f7537de2aca420b47ced23b6294f8b65", "parents": [ "d10577a8d86a0c735488d66d32289a6d66bcfa20", "a218d0fdc5f9004164ff151d274487f6799907d0", "ff01bb4832651c6d25ac509a06a10fcbd75c461c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:15:54 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:15:54 2012 -0500" }, "message": "Merge branches \u0027vfsmount-guts\u0027, \u0027umode_t\u0027 and \u0027partitions\u0027 into Z\n" }, { "commit": "770e1b035dcb6ec3f8ee69dda0815dd1e220a683", "tree": "e6d36abfdb053fbc722aea8d7e946d6d1b93c7e1", "parents": [ "d3d0b024348c040f0d6851e2e59fc961677d5169", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)\n ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h\n ARM: 7269/1: mach-sa1100: fix sched_clock breakage\n ARM: 7198/1: arm/imx6: add restart support for imx6q\n ARM: restart: remove the now empty arch_reset()\n ARM: restart: remove comments about adding code to arch_reset()\n ARM: restart: lpc32xx \u0026 u300: remove unnecessary printk\n ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook\n ARM: restart: w90x900: use new restart hook\n ARM: restart: Versatile Express: use new restart hook\n ARM: restart: versatile: use new restart hook\n ARM: restart: u300: use new restart hook\n ARM: restart: tegra: use new restart hook\n ARM: restart: spear: use new restart hook\n ARM: restart: shark: use new restart hook\n ARM: restart: sa1100: use new restart hook\n ARM: 7252/1: restart: S5PV210: use new restart hook\n ARM: 7251/1: restart: S5PC100: use new restart hook\n ARM: 7250/1: restart: S5P64X0: use new restart hook\n ARM: 7266/1: restart: S3C64XX: use new restart hook\n ARM: 7265/1: restart: S3C24XX: use new restart hook\n ...\n\nFix up trivial conflict in arch/arm/mm/init.c due to removal of\nmemblock_init() clashing with the movement of the sorting of the meminfo\narray.\n" }, { "commit": "376613e81ddc68f545fd5c87ffc3ad222b7abe5f", "tree": "e1cb1cd43d05f57e4584dd5f9ce3eb965d0ddff1", "parents": [ "0db49b72bce26341274b74fd968501489a361ae3", "0518469d0a32be1e6dd8850ff274d52d72cdb52d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:57:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:57:44 2012 -0800" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, tsc: Skip TSC synchronization checks for tsc\u003dreliable\n clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz\n clocksource: cris: Convert to clocksource_register_khz\n clocksource: xtensa: Convert to clocksource_register_hz/khz\n clocksource: um: Convert to clocksource_register_hz/khz\n clocksource: parisc: Convert to clocksource_register_hz/khz\n clocksource: m86k: Convert to clocksource_register_hz/khz\n time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver\n time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver\n time: x86: Remove CLOCK_TICK_RATE from mach_timer.h\n time: x86: Remove CLOCK_TICK_RATE from tsc code\n time: Fix spelling mistakes in new comments\n time: fix bogus comment in timekeeping_get_ns_raw\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "0db49b72bce26341274b74fd968501489a361ae3", "tree": "cdb076827aefb38d719d4c42f8ef291c36072fa8", "parents": [ "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "1ac9bc6943edf7d181b4b1cc734981350d4f6bae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:33:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:44:54 2012 -0800" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)\n sched/tracing: Add a new tracepoint for sleeptime\n sched: Disable scheduler warnings during oopses\n sched: Fix cgroup movement of waking process\n sched: Fix cgroup movement of newly created process\n sched: Fix cgroup movement of forking process\n sched: Remove cfs bandwidth period check in tg_set_cfs_period()\n sched: Fix load-balance lock-breaking\n sched: Replace all_pinned with a generic flags field\n sched: Only queue remote wakeups when crossing cache boundaries\n sched: Add missing rcu_dereference() around -\u003ereal_parent usage\n [S390] fix cputime overflow in uptime_proc_show\n [S390] cputime: add sparse checking and cleanup\n sched: Mark parent and real_parent as __rcu\n sched, nohz: Fix missing RCU read lock\n sched, nohz: Set the NOHZ_BALANCE_KICK flag for idle load balancer\n sched, nohz: Fix the idle cpu check in nohz_idle_balance\n sched: Use jump_labels for sched_feat\n sched/accounting: Fix parameter passing in task_group_account_field\n sched/accounting: Fix user/system tick double accounting\n sched/accounting: Re-use scheduler statistics for the root cgroup\n ...\n\nFix up conflicts in\n - arch/ia64/include/asm/cputime.h, include/asm-generic/cputime.h\n\tusecs_to_cputime64() vs the sparse cleanups\n - kernel/sched/fair.c, kernel/time/tick-sched.c\n\tscheduler changes in multiple branches\n" }, { "commit": "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "tree": "502a8f9499bc1b4cb3300d666dab2d01a1921224", "parents": [ "423d091dfe58d3109d84c408810a7cfa82f6f184", "9e183426bfb52bb44bf3c443d6587e4d02478603" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)\n perf kvm: Fix copy \u0026 paste error in description\n perf script: Kill script_spec__delete\n perf top: Fix a memory leak\n perf stat: Introduce get_ratio_color() helper\n perf session: Remove impossible condition check\n perf tools: Fix feature-bits rework fallout, remove unused variable\n perf script: Add generic perl handler to process events\n perf tools: Use for_each_set_bit() to iterate over feature flags\n perf tools: Unify handling of features when writing feature section\n perf report: Accept fifos as input file\n perf tools: Moving code in some files\n perf tools: Fix out-of-bound access to struct perf_session\n perf tools: Continue processing header on unknown features\n perf tools: Improve macros for struct feature_ops\n perf: builtin-record: Document and check that mmap_pages must be a power of two.\n perf: builtin-record: Provide advice if mmap\u0027ing fails with EPERM.\n perf tools: Fix truncated annotation\n perf script: look up thread using tid instead of pid\n perf tools: Look up thread names for system wide profiling\n perf tools: Fix comm for processes with named threads\n ...\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\n" }, { "commit": "1483b3823542c9721eddf09a077af1e02ac96b50", "tree": "390dcff4ddfb8634ad62c7fc9c3c9d0e802e9c1e", "parents": [ "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:01:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:01:59 2012 -0800" }, "message": "Merge branch \u0027core-printk-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-printk-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n printk, lockdep: Switch to tracked irq ops\n printk, lockdep: Remove superfluous preempt_disable()\n printk, lockdep: Disable lock debugging on zap_locks()\n" }, { "commit": "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "tree": "1ef38a6a3b39f7e539fff848975a5672acc21f44", "parents": [ "15f043a65f655eb8a3aeb831a85da66de520c80f", "45aa0663cc408617b79a2b53f0a5f50e94688a48" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "message": "Merge branch \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)\n memblock: Reimplement memblock allocation using reverse free area iterator\n memblock: Kill early_node_map[]\n score: Use HAVE_MEMBLOCK_NODE_MAP\n s390: Use HAVE_MEMBLOCK_NODE_MAP\n mips: Use HAVE_MEMBLOCK_NODE_MAP\n ia64: Use HAVE_MEMBLOCK_NODE_MAP\n SuperH: Use HAVE_MEMBLOCK_NODE_MAP\n sparc: Use HAVE_MEMBLOCK_NODE_MAP\n powerpc: Use HAVE_MEMBLOCK_NODE_MAP\n memblock: Implement memblock_add_node()\n memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users\n memblock: Track total size of regions automatically\n powerpc: Cleanup memblock usage\n memblock: Reimplement memblock_enforce_memory_limit() using __memblock_remove()\n memblock: Make memblock functions handle overflowing range @size\n memblock: Reimplement __memblock_remove() using memblock_isolate_range()\n memblock: Separate out memblock_isolate_range() from memblock_set_node()\n memblock: Kill memblock_init()\n memblock: Kill sentinel entries at the end of static region arrays\n memblock: Add __memblock_dump_all()\n ...\n" }, { "commit": "15f043a65f655eb8a3aeb831a85da66de520c80f", "tree": "00f5dbc80796a41ef60320a52faeb68aa5755830", "parents": [ "8c717b72dec32a50666175b62b41de24e4b39be7", "f07fdec50a13f134ea9608c8fb3f6408c58ef55e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:52 2012 -0800" }, "message": "Merge branch \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n lockdep/waitqueues: Add better annotation\n lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging\n lockdep: Print lock name in lockdep_init_error()\n init/main.c: Execute lockdep_init() as early as possible\n lockdep, kmemcheck: Annotate -\u003elock in lockdep_init_map()\n lockdep, rtmutex, bug: Show taint flags on error\n lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep\n lockdep: Always try to set -\u003eclass_cache in register_lock_class() lockdep_init_map()\n" }, { "commit": "8c717b72dec32a50666175b62b41de24e4b39be7", "tree": "e2b4335496cbddb5cded7b1bfd7579ee33f60505", "parents": [ "07d106d0a33d6063d2061305903deb02489eba20", "dc4218bd0fe499fce2896f88101ea42dac1f60fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "message": "Merge branch \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n timer: Use debugobjects to catch deletion of uninitialized timers\n timer: Setup uninitialized timer with a stub callback\n debugobjects: Extend to assert that an object is initialized\n debugobjects: Be smarter about static objects\n" }, { "commit": "0d19ea866562e46989412a0676412fa0983c9ce7", "tree": "335439bc9d13da86a7b6955907a92ddab03ceb57", "parents": [ "305f3c8b20ba1ca94829329acdbf22e689304dba" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Tue Dec 27 14:25:55 2011 +0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jan 05 09:59:46 2012 -0800" }, "message": "cgroup: fix to allow mounting a hierarchy by name\n\nIf we mount a hierarchy with a specified name, the name is unique,\nand we can use it to mount the hierarchy without specifying its\nset of subsystem names. This feature is documented is\nDocumentation/cgroups/cgroups.txt section 2.3\n\nHere\u0027s an example:\n\n\t# mount -t cgroup -o cpuset,name\u003dmyhier xxx /cgroup1\n\t# mount -t cgroup -o name\u003dmyhier xxx /cgroup2\n\nBut it was broken by commit 32a8cf235e2f192eb002755076994525cdbaa35a\n(cgroup: make the mount options parsing more accurate)\n\nThis fixes the regression.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "2e0e943436912ffe0848ece58167edfe754edb96", "tree": "b91919095c74742fa06e2105db6d859bee39b2b4", "parents": [ "a32737e1ca650504f172292dd344eb64c02311f3", "ef3a0bf5bfadbace156fa2a3b9c753df2de41df2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/setup.c\n\tarch/arm/mach-shmobile/board-kota2.c\n" }, { "commit": "c233523b3d392e530033a7587d7970dc62a02361", "tree": "dc7df403ebc50de7c745c1904f093897c234cf18", "parents": [ "9ec23949a2d1cb2574c5ec927ccab6dc5685e5f9", "c336078bf65c4d38caa9a4b8b7b7261c778e622c" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Jan 05 00:06:24 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Jan 05 00:06:24 2012 +0100" }, "message": "Merge branch \u0027pm-sleep\u0027 into pm-for-linus\n\n* pm-sleep:\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n" }, { "commit": "c336078bf65c4d38caa9a4b8b7b7261c778e622c", "tree": "607e18f9f5e60ad370e7c0ed7c13c665af04b7e8", "parents": [ "90363ddf0a1a4dccfbb8d0c10b8f488bc7fa69f8" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Tue Dec 27 22:54:52 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Jan 05 00:05:55 2012 +0100" }, "message": "PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n\nThis allows uswsusp built for i386 to run on an x86_64 kernel (tested\nwith Debian package version 1.0+20110509-2).\n\nReferences: http://bugs.debian.org/502816\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "8a88951b5878dc475dcd841cefc767e36397d14e", "tree": "c31fd8cdfa08dce4768f42e556d97929deac2343", "parents": [ "50b8d257486a45cba7b65ca978986ed216bbcc10" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jan 04 17:29:20 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 04 15:01:59 2012 -0800" }, "message": "ptrace: ensure JOBCTL_STOP_SIGMASK is not zero after detach\n\nThis is the temporary simple fix for 3.2, we need more changes in this\narea.\n\n1. do_signal_stop() assumes that the running untraced thread in the\n stopped thread group is not possible. This was our goal but it is\n not yet achieved: a stopped-but-resumed tracee can clone the running\n thread which can initiate another group-stop.\n\n Remove WARN_ON_ONCE(!current-\u003eptrace).\n\n2. A new thread always starts with -\u003ejobctl \u003d 0. If it is auto-attached\n and this group is stopped, __ptrace_unlink() sets JOBCTL_STOP_PENDING\n but JOBCTL_STOP_SIGMASK part is zero, this triggers WANR_ON(!signr)\n in do_jobctl_trap() if another debugger attaches.\n\n Change __ptrace_unlink() to set the artificial SIGSTOP for report.\n\n Alternatively we could change ptrace_init_task() to copy signr from\n current, but this means we can copy it for no reason and hide the\n possible similar problems.\n\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[3.1]\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "50b8d257486a45cba7b65ca978986ed216bbcc10", "tree": "0bcbb7eefaaf3da47a23c259e91baf414319ff96", "parents": [ "8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jan 04 17:29:02 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 04 15:01:59 2012 -0800" }, "message": "ptrace: partially fix the do_wait(WEXITED) vs EXIT_DEAD-\u003eEXIT_ZOMBIE race\n\nTest-case:\n\n\tint main(void)\n\t{\n\t\tint pid, status;\n\n\t\tpid \u003d fork();\n\t\tif (!pid) {\n\t\t\tfor (;;) {\n\t\t\t\tif (!fork())\n\t\t\t\t\treturn 0;\n\t\t\t\tif (waitpid(-1, \u0026status, 0) \u003c 0) {\n\t\t\t\t\tprintf(\"ERR!! wait: %m\\n\");\n\t\t\t\t\treturn 0;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tassert(ptrace(PTRACE_ATTACH, pid, 0,0) \u003d\u003d 0);\n\t\tassert(waitpid(-1, NULL, 0) \u003d\u003d pid);\n\n\t\tassert(ptrace(PTRACE_SETOPTIONS, pid, 0,\n\t\t\t\t\tPTRACE_O_TRACEFORK) \u003d\u003d 0);\n\n\t\tdo {\n\t\t\tptrace(PTRACE_CONT, pid, 0, 0);\n\t\t\tpid \u003d waitpid(-1, NULL, 0);\n\t\t} while (pid \u003e 0);\n\n\t\treturn 1;\n\t}\n\nIt fails because -\u003ereal_parent sees its child in EXIT_DEAD state\nwhile the tracer is going to change the state back to EXIT_ZOMBIE\nin wait_task_zombie().\n\nThe offending commit is 823b018e which moved the EXIT_DEAD check,\nbut in fact we should not blame it. The original code was not\ncorrect as well because it didn\u0027t take ptrace_reparented() into\naccount and because we can\u0027t really trust -\u003eptrace.\n\nThis patch adds the additional check to close this particular\nrace but it doesn\u0027t solve the whole problem. We simply can\u0027t\nrely on -\u003eptrace in this case, it can be cleared if the tracer\nis multithreaded by the exiting -\u003eparent.\n\nI think we should kill EXIT_DEAD altogether, we should always\nremove the soon-to-be-reaped child from -\u003echildren or at least\nwe should never do the DEAD-\u003eZOMBIE transition. But this is too\ncomplex for 3.2.\n\nReported-and-tested-by: Denys Vlasenko \u003cvda.linux@googlemail.com\u003e\nTested-by: Lukasz Michalik \u003clmi@ift.uni.wroc.pl\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[3.0+]\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "305f3c8b20ba1ca94829329acdbf22e689304dba", "tree": "fdf794766dfba0393324f3c79a6f642dda328042", "parents": [ "7e3aa30ac8c904a706518b725c451bb486daaae9" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Jan 04 10:24:29 2012 +0300" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 04 07:37:48 2012 -0800" }, "message": "cgroup: move assignement out of condition in cgroup_attach_proc()\n\nGcc complains about this: \"kernel/cgroup.c:2179:4: warning: suggest\nparentheses around assignment used as truth value [-Wparentheses]\"\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "93d3a10ef4fdfd4b6d1a3f09b645cd08f74a8115", "tree": "1768645382e04c139aee8283da06238e2073dea4", "parents": [ "2570ebbd1f1ce1ef31f568b0660354fc59424be2" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 27 14:04:25 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:17 2012 -0500" }, "message": "auditsc: propage umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "2570ebbd1f1ce1ef31f568b0660354fc59424be2", "tree": "79031afa99b298b8520dc85bffbb42ed7ebb6f59", "parents": [ "0583fcc96bb117763c0fa74c123573c0112dec65" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 27 14:03:22 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:17 2012 -0500" }, "message": "switch kern_ipc_perm to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "df0a42837b86567a130c44515ab620d23e7f182b", "tree": "1ea38c71503fddfbeb353b05a6bd85d383b161fd", "parents": [ "5706b27deae29ceee26d0c20112f087a9b841575" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 05:26:10 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:16 2012 -0500" }, "message": "switch mq_open() to umode_t\n" }, { "commit": "36fcb589e752fa9c71f8a447db94126d102fd937", "tree": "3ab8ff6c99e7f16915e48742d6c212a0cc7e2646", "parents": [ "dba19c6064766730dd64757a010ec3aec503ecdb" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 03:47:31 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:12 2012 -0500" }, "message": "sysctl: use umode_t for table permissions\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a5e7ed3287e45f2eafbcf9e7e6fdc5a0191acf40", "tree": "4bc526f45eb2e9ab01beca0207f8633a19b963b8", "parents": [ "f9ec80061af2116e9b6298a6334a6f288d7ea878" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 01:55:55 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:03 2012 -0500" }, "message": "cgroup: propagate mode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f4ae40a6a50a98ac23d4b285f739455e926a473e", "tree": "c84d7393700bd85e5285a194f8c22d4d00e36b28", "parents": [ "48176a973d65572e61d0ce95495e5072887e6fb6" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 24 04:33:43 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:56 2012 -0500" }, "message": "switch debugfs to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "18bb1db3e7607e4a997d50991a6f9fa5b0f8722c", "tree": "4ee4e584bc9a67f3ec14ce159d2d7d4a27e68d4a", "parents": [ "8208a22bb8bd3c52ef634b4ff194f14892ab1713" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 01:41:39 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:53 2012 -0500" }, "message": "switch vfs_mkdir() and -\u003emkdir() to umode_t\n\nvfs_mkdir() gets int, but immediately drops everything that might not\nfit into umode_t and that\u0027s the only caller of -\u003emkdir()...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ff01bb4832651c6d25ac509a06a10fcbd75c461c", "tree": "bbfdebd317db97d346df78293566f36e883b1be9", "parents": [ "94ea4158f1733e3b10cef067d535f504866e0c41" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Sep 16 02:31:11 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:07 2012 -0500" }, "message": "fs: move code out of buffer.c\n\nMove invalidate_bdev, block_sync_page into fs/block_dev.c. Export\nkill_bdev as well, so brd doesn\u0027t have to open code it. Reduce\nbuffer_head.h requirement accordingly.\n\nRemoved a rather large comment from invalidate_bdev, as it looked a bit\nobsolete to bother moving. The small comment replacing it says enough.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "32dc730860155b235f13e0cd3fe58b263279baf9", "tree": "9595ab7e5bf116e059daa5cc38d9dfc4af100e87", "parents": [ "84b92d39f98f669a3073168f88692782aec525a8" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 20:08:42 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:52:41 2012 -0500" }, "message": "get rid of timer in kern/acct.c\n\n... and clean it up a bit, while we are at it\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f9fab10bbd768b0e5254e53a4a8477a94bfc4b96", "tree": "7f4efb5c46582765c12249f652a8975a1956f781", "parents": [ "30e053248da178cf6154bb7e950dc8713567e3fa" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Tue Jan 03 14:41:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 03 16:14:32 2012 -0800" }, "message": "hung_task: fix false positive during vfork\n\nvfork parent uninterruptibly and unkillably waits for its child to\nexec/exit. This wait is of unbounded length. Ignore such waits\nin the hung_task detector.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nLKML-Reference: \u003c1325344394.28904.43.camel@lappy\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d36b691077dc59c74efec0d54ed21b86f7a2a21a", "tree": "4f4a82eab16f403f531a860a428ebbec4c0d0db3", "parents": [ "92f1b8518708c085ed7d07d8e7ed36411c92fa4f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 29 17:09:01 2011 -0500" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jan 02 13:04:55 2012 +0100" }, "message": "misc latin1 to utf8 conversions\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e6780f7243eddb133cc20ec37fa69317c218b709", "tree": "81e427161f0604a8935180f8c454593142c0f272", "parents": [ "06867fbb8abc936192195e5dcc4b63e12cc78f72" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Sat Dec 31 11:44:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 31 11:48:28 2011 -0800" }, "message": "futex: Fix uninterruptible loop due to gate_area\n\nIt was found (by Sasha) that if you use a futex located in the gate\narea we get stuck in an uninterruptible infinite loop, much like the\nZERO_PAGE issue.\n\nWhile looking at this problem, PeterZ realized you\u0027ll get into similar\ntrouble when hitting any install_special_pages() mapping. And are there\nstill drivers setting up their own special mmaps without page-\u003emapping,\nand without special VM or pte flags to make get_user_pages fail?\n\nIn most cases, if page-\u003emapping is NULL, we do not need to retry at all:\nLinus points out that even /proc/sys/vm/drop_caches poses no problem,\nbecause it ends up using remove_mapping(), which takes care not to\ninterfere when the page reference count is raised.\n\nBut there is still one case which does need a retry: if memory pressure\ncalled shmem_writepage in between get_user_pages_fast dropping page\ntable lock and our acquiring page lock, then the page gets switched from\nfilecache to swapcache (and -\u003emapping set to NULL) whatever the refcount.\nFault it back in to get the page-\u003emapping needed for key-\u003eshared.inode.\n\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b87487ac5008072f138953b07505a7e3493327f", "tree": "b70e9422c1abe7ce0e771a52202572dbb0ee25aa", "parents": [ "995b4103a78b9bef0ff834f9ecac42b2b56e01a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 30 13:24:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 30 13:24:40 2011 -0800" }, "message": "Revert \"clockevents: Set noop handler in clockevents_exchange_device()\"\n\nThis reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.\n\nIt results in resume problems for various people. See for example\n\n http://thread.gmane.org/gmane.linux.kernel/1233033\n http://thread.gmane.org/gmane.linux.kernel/1233389\n http://thread.gmane.org/gmane.linux.kernel/1233159\n http://thread.gmane.org/gmane.linux.kernel/1227868/focus\u003d1230877\n\nand the fedora and ubuntu bug reports\n\n https://bugzilla.redhat.com/show_bug.cgi?id\u003d767248\n https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569\n\nwhich got bisected down to the stable version of this commit.\n\nReported-by: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nReported-by: Phil Miller \u003cmille121@illinois.edu\u003e\nReported-by: Philip Langdale \u003cphilipl@overt.org\u003e\nReported-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: stable@kernel.org # for stable kernels that applied the original\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "93797d87d63d36404907640e4e20bb976bff4744", "tree": "b77b8c98e7fe64b05eada97ba8c0418ac2115c64", "parents": [ "3ecdd0515287afbcde352077d59e4028dcfbb685" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Mon Dec 12 09:59:14 2011 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Wed Dec 28 08:26:06 2011 -0600" }, "message": "irq: check domain hwirq range for DT translate\n\nA DT node may have more than 1 domain associated with it, so make sure\nthe hwirq number is within range when doing DT translation.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "7e3aa30ac8c904a706518b725c451bb486daaae9", "tree": "1a6ad0678271d1cba5eba2fcafcbfa71b4e4c66d", "parents": [ "c6ca57500c23d57a4ccec9874b6a3c99c297e1b5" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Dec 23 04:25:23 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Dec 27 09:05:20 2011 -0800" }, "message": "cgroup: Remove task_lock() from cgroup_post_fork()\n\ncgroup_post_fork() is protected between threadgroup_change_begin()\nand threadgroup_change_end() against concurrent changes of the\nchild\u0027s css_set in cgroup_task_migrate(). Also the child can\u0027t\nexit and call cgroup_exit() at this stage, this means it\u0027s css_set\ncan\u0027t be changed with init_css_set concurrently.\n\nFor these reasons, we don\u0027t need to hold task_lock() on the child\nbecause it\u0027s css_set can only remain stable in this place.\n\nLet\u0027s remove the lock there.\n\nv2: Update comment to explain that we are safe against\ncgroup_exit()\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Containers \u003ccontainers@lists.linux-foundation.org\u003e\nCc: Cgroups \u003ccgroups@vger.kernel.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\n" }, { "commit": "c6ca57500c23d57a4ccec9874b6a3c99c297e1b5", "tree": "05de5a919fba42da5e537254b1d654ae1bec5b16", "parents": [ "1c6c3fad81787e8cb4c85ddfd573b0d8442fe630" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill@shutemov.name", "time": "Tue Dec 27 07:46:26 2011 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Dec 27 08:51:47 2011 -0800" }, "message": "cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "1c6c3fad81787e8cb4c85ddfd573b0d8442fe630", "tree": "12de25ab4ede17d8cd35885271064d6567c683c1", "parents": [ "892a2b90ba15cb7dbee40979f23fdb492913abf8" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill@shutemov.name", "time": "Tue Dec 27 07:46:25 2011 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Dec 27 08:51:46 2011 -0800" }, "message": "cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "9e31905f293ae84e4f120ed9e414031eaefa0bdf", "tree": "153204ff0dca820e760007bc24075ec7fb46a276", "parents": [ "ff5c2c0316ff0e3e2dba3ca14167d994453df093", "b3d9468a8bd218a695e3a0ff112cd4efd27b670a" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Dec 25 15:44:43 2011 +0200" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Tue Dec 27 11:22:24 2011 +0200" }, "message": "Merge remote-tracking branch \u0027tip/perf/core\u0027 into kvm-updates/3.3\n\n* tip/perf/core: (66 commits)\n perf, x86: Expose perf capability to other modules\n perf, x86: Implement arch event mask as quirk\n x86, perf: Disable non available architectural events\n jump_label: Provide jump_label_key initializers\n jump_label, x86: Fix section mismatch\n perf, core: Rate limit perf_sched_events jump_label patching\n perf: Fix enable_on_exec for sibling events\n perf: Remove superfluous arguments\n perf, x86: Prefer fixed-purpose counters when scheduling\n perf, x86: Fix event scheduler for constraints with overlapping counters\n perf, x86: Implement event scheduler helper functions\n perf: Avoid a useless pmu_disable() in the perf-tick\n x86/tools: Add decoded instruction dump mode\n x86: Update instruction decoder to support new AVX formats\n x86/tools: Fix insn_sanity message outputs\n x86/tools: Fix instruction decoder message output\n x86: Fix instruction decoder to handle grouped AVX instructions\n x86/tools: Fix Makefile to build all test tools\n perf test: Soft errors shouldn\u0027t stop the \"Validate PERF_RECORD_\" test\n perf test: Validate PERF_RECORD_ events and perf_sample fields\n ...\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n\n* commit \u0027b3d9468a8bd218a695e3a0ff112cd4efd27b670a\u0027: (66 commits)\n perf, x86: Expose perf capability to other modules\n perf, x86: Implement arch event mask as quirk\n x86, perf: Disable non available architectural events\n jump_label: Provide jump_label_key initializers\n jump_label, x86: Fix section mismatch\n perf, core: Rate limit perf_sched_events jump_label patching\n perf: Fix enable_on_exec for sibling events\n perf: Remove superfluous arguments\n perf, x86: Prefer fixed-purpose counters when scheduling\n perf, x86: Fix event scheduler for constraints with overlapping counters\n perf, x86: Implement event scheduler helper functions\n perf: Avoid a useless pmu_disable() in the perf-tick\n x86/tools: Add decoded instruction dump mode\n x86: Update instruction decoder to support new AVX formats\n x86/tools: Fix insn_sanity message outputs\n x86/tools: Fix instruction decoder message output\n x86: Fix instruction decoder to handle grouped AVX instructions\n x86/tools: Fix Makefile to build all test tools\n perf test: Soft errors shouldn\u0027t stop the \"Validate PERF_RECORD_\" test\n perf test: Validate PERF_RECORD_ events and perf_sample fields\n ...\n" }, { "commit": "a65cf5181aa608addcb2873c8ed90413a9f539cb", "tree": "3d2429790c26e3f38dc654afc404066254c4fed4", "parents": [ "831bf664e9c1fc08fc6b3984d00d275cac82f5e9" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@linux.vnet.ibm.com", "time": "Mon Nov 28 20:39:59 2011 +0800" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Tue Dec 27 11:22:04 2011 +0200" }, "message": "jump-label: export jump_label_inc/jump_label_dec\n\nExport these two symbols, they will be used by KVM mmu audit\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@linux.vnet.ibm.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "b7ba68c4a072c9aa8f04b8cf7838b6cd2f48d918", "tree": "cd8f8029111fc52d06060691fb0325ba2e798e94", "parents": [ "8d274ab7d3d6f23e2bc0e433c8d53acbe60a9773", "90363ddf0a1a4dccfbb8d0c10b8f488bc7fa69f8" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:42:20 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:42:20 2011 +0100" }, "message": "Merge branch \u0027pm-sleep\u0027 into pm-for-linus\n\n* pm-sleep: (51 commits)\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n PM / Sleep: Recommend [un]lock_system_sleep() over using pm_mutex directly\n PM / Sleep: Replace mutex_[un]lock(\u0026pm_mutex) with [un]lock_system_sleep()\n PM / Sleep: Make [un]lock_system_sleep() generic\n PM / Sleep: Use the freezer_count() functions in [un]lock_system_sleep() APIs\n PM / Freezer: Remove the \"userspace only\" constraint from freezer[_do_not]_count()\n PM / Hibernate: Replace unintuitive \u0027if\u0027 condition in kernel/power/user.c with \u0027else\u0027\n Freezer / sunrpc / NFS: don\u0027t allow TASK_KILLABLE sleeps to block the freezer\n PM / Sleep: Unify diagnostic messages from device suspend/resume\n ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR\n PM / Hibernate: Remove deprecated hibernation test modes\n PM / Hibernate: Thaw processes in SNAPSHOT_CREATE_IMAGE ioctl test path\n ...\n\nConflicts:\n\tkernel/kmod.c\n" }, { "commit": "3e68001bb172304615b758d671d8a890fff912d9", "tree": "02d50dfaf6de6f8edb016a8d922b40762634cc05", "parents": [ "4962516b2309d76964f9df0d33e74f43b624a42d", "d7268a31c8aabc5a29ccc7f76de84383e5f38737" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:41:23 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:41:23 2011 +0100" }, "message": "Merge branch \u0027pm-misc\u0027 into pm-for-linus\n\n* pm-misc:\n CPU: Add right qualifiers for alloc_frozen_cpus() and cpu_hotplug_pm_sync_init()\n PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback()\n" }, { "commit": "c87fb57346fc7653ace98769f148e0dcd88ac1ee", "tree": "bd4737190619d032801e0b368aeea887521521ba", "parents": [ "df0bcfe0f811a73077c06f75e440397e89ba58a4" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Wed Dec 14 23:43:16 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Dec 23 22:33:58 2011 +0000" }, "message": "ARM: 7235/1: irqdomain: export irq_domain_simple_ops for !CONFIG_OF\n\nirqdomain support is used in interrupt controller drivers that may not\nhave device tree support but only need the basic HW-\u003eLinux irq\ntranslation. Rather than having each of these implement their own IRQ\ndomain, allow them to use the simple ops.\n\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Rob Herring \u003crobherring2@gmail.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1ac9bc6943edf7d181b4b1cc734981350d4f6bae", "tree": "c7853336d693e4593488c26b8ce27ceca3803a6f", "parents": [ "664dfa65e84429d0b68694483e1de7365c7c56fb" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Wed Dec 21 16:15:40 2011 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 23 17:56:17 2011 +0100" }, "message": "sched/tracing: Add a new tracepoint for sleeptime\n\nIf CONFIG_SCHEDSTATS is defined, the kernel maintains\ninformation about how long the task was sleeping or\nin the case of iowait, blocking in the kernel before\ngetting woken up.\n\nThis will be useful for sleep time profiling.\n\nNote: this information is only provided for sched_fair.\nOther scheduling classes may choose to provide this in\nthe future.\n\nNote: the delay includes the time spent on the runqueue\nas well.\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@infradead.org\u003e\nCc: Andrew Vagin \u003cavagin@openvz.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1324512940-32060-2-git-send-email-asharma@fb.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "664dfa65e84429d0b68694483e1de7365c7c56fb", "tree": "9c3b1ae83a5a139c0420184d5eece0059c086216", "parents": [ "62af3783e4fd8ba9e28416e8e91cb3bdd9fb133e" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu Dec 22 16:39:30 2011 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 23 11:20:50 2011 +0100" }, "message": "sched: Disable scheduler warnings during oopses\n\nThe panic-on-framebuffer code seems to cause a schedule\nto occur during an oops. This causes a bunch of extra\nspew as can be seen in:\n\n https://bugzilla.redhat.com/attachment.cgi?id\u003d549230\n\nDon\u0027t do scheduler debug checks when we are oopsing already.\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nLink: http://lkml.kernel.org/r/20111222213929.GA4722@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "892a2b90ba15cb7dbee40979f23fdb492913abf8", "tree": "db1cb827649a846b84e9c5da03d2b2cf4aedc656", "parents": [ "b07ef7741122a83575499c11417e514877941e76" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Wed Dec 21 20:18:37 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 22 07:32:57 2011 -0800" }, "message": "cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n\nIn cgroup_attach_proc it is now sufficient to only check that\noldcgrp\u003d\u003dnewcgrp once. Now that we are using threadgroup_lock()\nduring the migrations, oldcgrp will not change.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: containers@lists.linux-foundation.org\nCc: cgroups@vger.kernel.org\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\n" }, { "commit": "b07ef7741122a83575499c11417e514877941e76", "tree": "ba7fa1298320cce6ffef59e7865ef4fecbd23af1", "parents": [ "026085ef5ae07c3197f2baacc091ce067b86ed11" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Wed Dec 21 20:18:36 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 22 07:32:57 2011 -0800" }, "message": "cgroup: remove redundant get/put of task struct\n\nthreadgroup_lock() guarantees that the target threadgroup will\nremain stable - no new task will be added, no new PF_EXITING\nwill be set and exec won\u0027t happen.\n\nChanges in V2:\n* https://lkml.org/lkml/2011/12/20/369 (Tejun Heo)\n * Undo incorrect removal of get/put from attach_task_by_pid()\n* Author\n * Remove a comment which is made stale by this change\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: containers@lists.linux-foundation.org\nCc: cgroups@vger.kernel.org\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\n" }, { "commit": "026085ef5ae07c3197f2baacc091ce067b86ed11", "tree": "0497b6414f79efff5b1ba855ddae70a2d850a2b4", "parents": [ "c84cdf75ccb2845f690579e838f13f7e744e3d23" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Wed Dec 21 20:18:35 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 22 07:32:57 2011 -0800" }, "message": "cgroup: remove redundant get/put of old css_set from migrate\n\nWe can now assume that the css_set reference held by the task\nwill not go away for an exiting task. PF_EXITING state can be\ntrusted throughout migration by checking it after locking\nthreadgroup.\n\nChanges in V4:\n* https://lkml.org/lkml/2011/12/20/368 (Tejun Heo)\n * Fix typo in commit message\n * Undid the rename of css_set_check_fetched\n* https://lkml.org/lkml/2011/12/20/427 (Li Zefan)\n * Fix comment in cgroup_task_migrate()\nChanges in V3:\n* https://lkml.org/lkml/2011/12/20/255 (Frederic Weisbecker)\n * Fixed to put error in retval\nChanges in V2:\n* https://lkml.org/lkml/2011/12/19/289 (Tejun Heo)\n * Updated commit message\n\n-tj: removed stale patch description about dropped function rename.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: containers@lists.linux-foundation.org\nCc: cgroups@vger.kernel.org\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\n" }, { "commit": "7239f65cf364180cdb100a4ed211b2a9f9a72119", "tree": "a23b2abe177b890303aa02c58ce964eacf2166df", "parents": [ "4a858cfc9af87cc60b3113c3b7b377a4305eac6a" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 16:12:37 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 16:12:37 2011 -0800" }, "message": "clockevents: remove sysdev.h\n\nThis isn\u0027t needed in the clockevents.c file, and the header file is\ngoing away soon, so just remove the #include\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "8a25a2fd126c621f44f3aeaef80d51f00fc11639", "tree": "41694ab1a9c82a7a02d9cd33c929fd039c98c815", "parents": [ "cb0c05c5fae12eeb7c85c205578df277bd706155" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 14:29:42 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 14:29:42 2011 -0800" }, "message": "cpu: convert \u0027cpu\u0027 and \u0027machinecheck\u0027 sysdev_class to a regular subsystem\n\nThis moves the \u0027cpu sysdev_class\u0027 over to a regular \u0027cpu\u0027 subsystem\nand converts the devices to regular devices. The sysdev drivers are\nimplemented as subsystem interfaces now.\n\nAfter all sysdev classes are ported to regular driver core entities, the\nsysdev implementation will be entirely removed from the kernel.\n\nUserspace relies on events and generic sysfs subsystem infrastructure\nfrom sysdev devices, which are made available with this conversion.\n\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nCc: Tigran Aivazian \u003ctigran@aivazian.fsnet.co.uk\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Zhang Rui \u003crui.zhang@intel.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: \"Srivatsa S. Bhat\" \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b00f4dc5ff022cb9cbaffd376d9454d7fa1e496f", "tree": "40f1b232e2f1e8ac365317a14fdcbcb331722b46", "parents": [ "1eac8111e0763853266a171ce11214da3a347a0a", "b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "message": "Merge branch \u0027master\u0027 into pm-sleep\n\n* master: (848 commits)\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n binary_sysctl(): fix memory leak\n mm/vmalloc.c: remove static declaration of va from __get_vm_area_node\n ipmi_watchdog: restore settings when BMC reset\n oom: fix integer overflow of points in oom_badness\n memcg: keep root group unchanged if creation fails\n nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()\n nilfs2: unbreak compat ioctl\n cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask\n evm: prevent racing during tfm allocation\n evm: key must be set once during initialization\n mmc: vub300: fix type of firmware_rom_wait_states module parameter\n Revert \"mmc: enable runtime PM by default\"\n mmc: sdhci: remove \"state\" argument from sdhci_suspend_host\n x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT\n IB/qib: Correct sense on freectxts increment and decrement\n RDMA/cma: Verify private data length\n cgroups: fix a css_set not found bug in cgroup_attach_proc\n oprofile: Fix uninitialized memory access when writing to writing to oprofilefs\n Revert \"xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel\"\n ...\n\nConflicts:\n\tkernel/cgroup_freezer.c\n" }, { "commit": "c84cdf75ccb2845f690579e838f13f7e744e3d23", "tree": "a94bd69e84e7996852e1973c75fe11a2b0f1a42d", "parents": [ "7e381b0eb1e1a9805c37335562e8dc02e7d7848c" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Dec 21 20:03:18 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 21 11:15:01 2011 -0800" }, "message": "cgroup: Remove unnecessary task_lock before fetching css_set on migration\n\nWhen we fetch the css_set of the tasks on cgroup migration, we don\u0027t need\nanymore to synchronize against cgroup_exit() that could swap the old one\nwith init_css_set. Now that we are using threadgroup_lock() during\nthe migrations, we don\u0027t need to worry about it anymore.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReviewed-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Containers \u003ccontainers@lists.linux-foundation.org\u003e\nCc: Cgroups \u003ccgroups@vger.kernel.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\n" }, { "commit": "7e381b0eb1e1a9805c37335562e8dc02e7d7848c", "tree": "766a7e7dad168f93a0159114795277dc22920e01", "parents": [ "29e21368b9baf9c4b25060d65062da2dda926c70" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Dec 21 20:03:19 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 21 11:15:00 2011 -0800" }, "message": "cgroup: Drop task_lock(parent) on cgroup_fork()\n\nWe don\u0027t need to hold the parent task_lock() on the\nparent in cgroup_fork() because we are already synchronized\nagainst the two places that may change the parent css_set\nconcurrently:\n\n- cgroup_exit(), but the parent obviously can\u0027t exit concurrently\n- cgroup migration: we are synchronized against threadgroup_lock()\n\nSo we can safely remove the task_lock() there.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Containers \u003ccontainers@lists.linux-foundation.org\u003e\nCc: Cgroups \u003ccgroups@vger.kernel.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\n" }, { "commit": "62af3783e4fd8ba9e28416e8e91cb3bdd9fb133e", "tree": "728bed51d0ae2725ade8046ba83794dd5f9944e4", "parents": [ "7ceff013c43c0f38f0d26c79507889c6791c0ea0" ], "author": { "name": "Daisuke Nishimura", "email": "nishimura@mxp.nes.nec.co.jp", "time": "Thu Dec 15 14:37:41 2011 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:34:52 2011 +0100" }, "message": "sched: Fix cgroup movement of waking process\n\nThere is a small race between try_to_wake_up() and sched_move_task(),\nwhich is trying to move the process being woken up.\n\n try_to_wake_up() on CPU0 sched_move_task() on CPU1\n--------------------------------+---------------------------------\n raw_spin_lock_irqsave(p-\u003epi_lock)\n task_waking_fair()\n -\u003ep.se.vruntime -\u003d cfs_rq-\u003emin_vruntime\n ttwu_queue()\n -\u003esend reschedule IPI to CPU1\n raw_spin_unlock_irqsave(p-\u003epi_lock)\n task_rq_lock()\n -\u003e tring to aquire both p-\u003epi_lock and\n rq-\u003elock with IRQ disabled\n task_move_group_fair()\n -\u003e p.se.vruntime\n -\u003d (old)cfs_rq-\u003emin_vruntime\n +\u003d (new)cfs_rq-\u003emin_vruntime\n task_rq_unlock()\n\n (via IPI)\n sched_ttwu_pending()\n raw_spin_lock(rq-\u003elock)\n ttwu_do_activate()\n ...\n enqueue_entity()\n child.se-\u003evruntime +\u003d cfs_rq-\u003emin_vruntime\n raw_spin_unlock(rq-\u003elock)\n\nAs a result, vruntime of the process becomes far bigger than min_vruntime,\nif (new)cfs_rq-\u003emin_vruntime \u003e\u003e (old)cfs_rq-\u003emin_vruntime.\n\nThis patch fixes this problem by just ignoring such process in\ntask_move_group_fair(), because the vruntime has already been normalized in\ntask_waking_fair().\n\nSigned-off-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/20111215143741.df82dd50.nishimura@mxp.nes.nec.co.jp\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7ceff013c43c0f38f0d26c79507889c6791c0ea0", "tree": "f4e164fcb0b75b3d559e644d41fd4c6c29990bef", "parents": [ "4fc420c91f53e0a9f95665c6b14a1983716081e7" ], "author": { "name": "Daisuke Nishimura", "email": "nishimura@mxp.nes.nec.co.jp", "time": "Thu Dec 15 14:36:07 2011 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:34:51 2011 +0100" }, "message": "sched: Fix cgroup movement of newly created process\n\nThere is a small race between do_fork() and sched_move_task(), which is\ntrying to move the child.\n\n do_fork() sched_move_task()\n--------------------------------+---------------------------------\n copy_process()\n sched_fork()\n task_fork_fair()\n -\u003e vruntime of the child is initialized\n based on that of the parent.\n -\u003e we can see the child in \"tasks\" file now.\n task_rq_lock()\n task_move_group_fair()\n -\u003e child.se.vruntime\n -\u003d (old)cfs_rq-\u003emin_vruntime\n +\u003d (new)cfs_rq-\u003emin_vruntime\n task_rq_unlock()\n wake_up_new_task()\n ...\n enqueue_entity()\n child.se.vruntime +\u003d cfs_rq-\u003emin_vruntime\n\nAs a result, vruntime of the child becomes far bigger than min_vruntime,\nif (new)cfs_rq-\u003emin_vruntime \u003e\u003e (old)cfs_rq-\u003emin_vruntime.\n\nThis patch fixes this problem by just ignoring such process in\ntask_move_group_fair(), because the vruntime has already been normalized in\ntask_fork_fair().\n\nSigned-off-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/20111215143607.2ee12c5d.nishimura@mxp.nes.nec.co.jp\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4fc420c91f53e0a9f95665c6b14a1983716081e7", "tree": "e6bfad34810d368ed893780b9ddc05c5dbcb6923", "parents": [ "11534ec5b6cea13ae38d31799d2a5290c5d724af" ], "author": { "name": "Daisuke Nishimura", "email": "nishimura@mxp.nes.nec.co.jp", "time": "Thu Dec 15 14:36:55 2011 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:34:49 2011 +0100" }, "message": "sched: Fix cgroup movement of forking process\n\nThere is a small race between task_fork_fair() and sched_move_task(),\nwhich is trying to move the parent.\n\n task_fork_fair() sched_move_task()\n--------------------------------+---------------------------------\n cfs_rq \u003d task_cfs_rq(current)\n -\u003e cfs_rq is the \"old\" one.\n curr \u003d cfs_rq-\u003ecurr\n -\u003e curr is set to the parent.\n task_rq_lock()\n dequeue_task()\n -\u003eparent.se.vruntime -\u003d (old)cfs_rq-\u003emin_vruntime\n enqueue_task()\n -\u003eparent.se.vruntime +\u003d (new)cfs_rq-\u003emin_vruntime\n task_rq_unlock()\n raw_spin_lock_irqsave(rq-\u003elock)\n se-\u003evruntime \u003d curr-\u003evruntime\n -\u003e vruntime of the child is set to that of the parent\n which has already been updated by sched_move_task().\n se-\u003evruntime -\u003d (old)cfs_rq-\u003emin_vruntime.\n raw_spin_unlock_irqrestore(rq-\u003elock)\n\nAs a result, vruntime of the child becomes far bigger than expected,\nif (new)cfs_rq-\u003emin_vruntime \u003e\u003e (old)cfs_rq-\u003emin_vruntime.\n\nThis patch fixes this problem by setting \"cfs_rq\" and \"curr\" after\nholding the rq-\u003elock.\n\nSigned-off-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nAcked-by: Paul Turner \u003cpjt@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/20111215143655.662676b0.nishimura@mxp.nes.nec.co.jp\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "11534ec5b6cea13ae38d31799d2a5290c5d724af", "tree": "117d554ceed6d9b9d812a943a8ff8c4f12a203e4", "parents": [ "a195f004e9496b4d99f471bb96e0a0c1af080909" ], "author": { "name": "Kamalesh Babulal", "email": "kamalesh@linux.vnet.ibm.com", "time": "Sat Dec 10 19:29:25 2011 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:34:48 2011 +0100" }, "message": "sched: Remove cfs bandwidth period check in tg_set_cfs_period()\n\nRemove cfs bandwidth period check from tg_set_cfs_period.\nInvalid bandwidth period\u0027s lower/upper limits are denoted\nby min_cfs_quota_period/max_cfs_quota_period repsectively,\nand are checked against valid period in tg_set_cfs_bandwidth().\n\nAs pjt pointed out, negative input will result in very large unsigned\nnumbers and will be caught by the max allowed period test.\n\nSigned-off-by: Kamalesh Babulal \u003ckamalesh@linux.vnet.ibm.com\u003e\nAcked-by: Paul Turner \u003cpjt@google.com\u003e\n[ammended changelog to mention negative values]\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20111210135925.GA14593@linux.vnet.ibm.com\n--\n kernel/sched/core.c | 3 ---\n 1 file changed, 3 deletions(-)\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a195f004e9496b4d99f471bb96e0a0c1af080909", "tree": "605f04617dc42458025cb4341e9e6407bed8b140", "parents": [ "5b54b56be5b540a9cb12682c4d0df5454c098a38" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Sep 22 15:30:18 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:34:47 2011 +0100" }, "message": "sched: Fix load-balance lock-breaking\n\nThe current lock break relies on contention on the rq locks, something\nwhich might never come because we\u0027ve got IRQs disabled. Or will be\nvery likely because on anything with more than 2 cpus a synchronized\nload-balance pass will very likely cause contention on the rq locks.\n\nAlso the sched_nr_migrate thing fails when it gets trapped the loops\nof either the cgroup muck in load_balance_fair() or the move_tasks()\nload condition.\n\nInstead, use the new lb_flags field to propagate break/abort\nconditions for all these loops and create a new loop outside the irq\ndisabled on the break being required.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/n/tip-tsceb6w61q0gakmsccix6xxi@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5b54b56be5b540a9cb12682c4d0df5454c098a38", "tree": "837b7084c5e2659968ea64ba2c6520ff6256567a", "parents": [ "518cd62341786aa4e3839810832af2fbc0de1ea4" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Sep 22 15:23:13 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:34:45 2011 +0100" }, "message": "sched: Replace all_pinned with a generic flags field\n\nReplace the all_pinned argument with a flags field so that we can add\nsome extra controls throughout that entire call chain.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/n/tip-33kevm71m924ok1gpxd720v3@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "518cd62341786aa4e3839810832af2fbc0de1ea4", "tree": "bd28f7fce47887e9c5d33bd772c8380255ef3065", "parents": [ "612ef28a045efadb3a98d4492ead7806a146485d" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Dec 07 15:07:31 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:34:44 2011 +0100" }, "message": "sched: Only queue remote wakeups when crossing cache boundaries\n\nMike reported a 13% drop in netperf TCP_RR performance due to the\nnew remote wakeup code. Suresh too noticed some performance issues\nwith it.\n\nReducing the IPIs to only cross cache domains solves the observed\nperformance issues.\n\nReported-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nReported-by: Mike Galbraith \u003cefault@gmx.de\u003e\nAcked-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nAcked-by: Mike Galbraith \u003cefault@gmx.de\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Dave Kleikamp \u003cdave.kleikamp@oracle.com\u003e\nLink: http://lkml.kernel.org/r/1323338531.17673.7.camel@twins\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f07fdec50a13f134ea9608c8fb3f6408c58ef55e", "tree": "4e631c518335ddc5227803517a8cd55f3c992206", "parents": [ "2d2b7749e8f9d32c16c599f85f2b1a51b76dddb7" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Dec 13 13:20:54 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:07:39 2011 +0100" }, "message": "lockdep/waitqueues: Add better annotation\n\n -\u003e #2 (\u0026tty-\u003ewrite_wait){-.-...}:\n\nis a lot more informative than:\n\n -\u003e #2 (key#19){-.....}:\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-8zpopbny51023rdb0qq67eye@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "2d2b7749e8f9d32c16c599f85f2b1a51b76dddb7", "tree": "bbad5e4c8e3baddb514c294523532671f3e1cf57", "parents": [ "9ec84acee1e221d99dc33237bff5e82839d10cc0", "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:06:32 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 21 10:06:37 2011 +0100" }, "message": "Merge commit \u0027v3.2-rc6\u0027 into core/locking\n\nMerge reason: Pick up the latest fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a4a4923919f2d43583789b1f3603f4e5600d8321", "tree": "b401e5b82050d33fc345d815d8b28ff83301534c", "parents": [ "7f3a54b8177f2e663adef2ec4b5e6ccf874f896e", "e0197aae59e55c06db172bfbe1a1cdb8c0e1cab3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:44:18 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:44:18 2011 -0800" }, "message": "Merge branch \u0027for-3.2-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.2-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroups: fix a css_set not found bug in cgroup_attach_proc\n" }, { "commit": "5fbd305dd2b661a243013cf444d2a32bfec2f701", "tree": "4e90099fef21c0ad7aec77d772b12a0b2094d64e", "parents": [ "a205b082189bf914959a667a5c83ea145bba3fb5", "b1b73d095084e754562961c443aa8f6587a55f8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:42:38 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:42:38 2011 -0800" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n time/clocksource: Fix kernel-doc warnings\n rtc: m41t80: Workaround broken alarm functionality\n rtc: Expire alarms after the time is set.\n" }, { "commit": "d87f69a16eb2cb96459117b06949a560679002e4", "tree": "bbb55b2bd2b6c9e8bd4067aa3279783cb6bd9028", "parents": [ "124ba9403318d834ef21bcd899c22c870708d2c4", "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 20:32:03 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 20:32:11 2011 +0100" }, "message": "Merge commit \u0027v3.2-rc6\u0027 into perf/core\n\nMerge reason: Update with the latest fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3d3c8f93a237b64580c5c5e138edeb1377e98230", "tree": "8c932423a1c5f80320e46dc77f29c668f196d73c", "parents": [ "0006526d78e93c3684c806bf7cf3f67dfa49c3c8" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Mon Dec 19 17:12:06 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 10:25:04 2011 -0800" }, "message": "binary_sysctl(): fix memory leak\n\nbinary_sysctl() calls sysctl_getname() which allocates from names_cache\nslab usin __getname()\n\nThe matching function to free the name is __putname(), and not putname()\nwhich should be used only to match getname() allocations.\n\nThis is because when auditing is enabled, putname() calls audit_putname\n*instead* (not in addition) to __putname(). Then, if a syscall is in\nprogress, audit_putname does not release the name - instead, it expects\nthe name to get released when the syscall completes, but that will happen\nonly if audit_getname() was called previously, i.e. if the name was\nallocated with getname() rather than the naked __getname(). So,\n__getname() followed by putname() ends up leaking memory.\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b246272ecc5ac68c743b15c9e41a2275f7ce70e2", "tree": "d32b30f02501a6978c7c2d97f7c505604f9bac28", "parents": [ "511585a28e5b5fd1cac61e601e42efc4c5dd64b5" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Mon Dec 19 17:11:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 10:25:04 2011 -0800" }, "message": "cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask\n\nKernels where MAX_NUMNODES \u003e BITS_PER_LONG may temporarily see an empty\nnodemask in a tsk\u0027s mempolicy if its previous nodemask is remapped onto a\nnew set of allowed cpuset nodes where the two nodemasks, as a result of\nthe remap, are now disjoint.\n\nc0ff7453bb5c (\"cpuset,mm: fix no node to alloc memory when changing\ncpuset\u0027s mems\") adds get_mems_allowed() to prevent the set of allowed\nnodes from changing for a thread. This causes any update to a set of\nallowed nodes to stall until put_mems_allowed() is called.\n\nThis stall is unncessary, however, if at least one node remains unchanged\nin the update to the set of allowed nodes. This was addressed by\n89e8a244b97e (\"cpusets: avoid looping when storing to mems_allowed if one\nnode remains set\"), but it\u0027s still possible that an empty nodemask may be\nread from a mempolicy because the old nodemask may be remapped to the new\nnodemask during rebind. To prevent this, only avoid the stall if there is\nno mempolicy for the thread being changed.\n\nThis is a temporary solution until all reads from mempolicy nodemasks can\nbe guaranteed to not be empty without the get_mems_allowed()\nsynchronization.\n\nAlso moves the check for nodemask intersection inside task_lock() so that\ntsk-\u003emems_allowed cannot change. This ensures that nothing can set this\ntsk\u0027s mems_allowed out from under us and also protects tsk-\u003emempolicy.\n\nReported-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "45aa0663cc408617b79a2b53f0a5f50e94688a48", "tree": "0a53931c317c3c72a3555bd2fbb70a881ee870f2", "parents": [ "511585a28e5b5fd1cac61e601e42efc4c5dd64b5", "7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:14:26 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:14:26 2011 +0100" }, "message": "Merge branch \u0027memblock-kill-early_node_map\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock\n" }, { "commit": "612ef28a045efadb3a98d4492ead7806a146485d", "tree": "05621c87b37e91c27b06d450d76adffe97ce9666", "parents": [ "c3e0ef9a298e028a82ada28101ccd5cf64d209ee", "07cde2608a3b5c66515363f1b53623b1536b9785" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon Dec 19 19:23:15 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon Dec 19 19:23:15 2011 +0100" }, "message": "Merge branch \u0027sched/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip\n\nConflicts:\n\tdrivers/cpufreq/cpufreq_conservative.c\n\tdrivers/cpufreq/cpufreq_ondemand.c\n\tdrivers/macintosh/rack-meter.c\n\tfs/proc/stat.c\n\tfs/proc/uptime.c\n\tkernel/sched/core.c\n" }, { "commit": "29e21368b9baf9c4b25060d65062da2dda926c70", "tree": "eb0d51c03f63b78317dbe329245ce7e40cb2261d", "parents": [ "52dcf8a1f8ac09b6ea21266ebdc4db6d52eea1fc" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Thu Dec 15 14:21:26 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 19 09:14:30 2011 -0800" }, "message": "cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n\nWe already have a reference to all elements in newcg_list.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: containers@lists.linux-foundation.org\nCc: cgroups@vger.kernel.org\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\n" }, { "commit": "e0197aae59e55c06db172bfbe1a1cdb8c0e1cab3", "tree": "c3b36f2adc445893166bc5caddb3d26c05611a9a", "parents": [ "390f998509bf049019df0b078c0a6606e0d57fb4" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Thu Dec 15 11:36:43 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 19 09:09:09 2011 -0800" }, "message": "cgroups: fix a css_set not found bug in cgroup_attach_proc\n\nThere is a BUG when migrating a PF_EXITING proc. Since css_set_prefetch()\nis not called for the PF_EXITING case, find_existing_css_set() will return\nNULL inside cgroup_task_migrate() causing a BUG.\n\nThis bug is easy to reproduce. Create a zombie and echo its pid to\ncgroup.procs.\n\n$ cat zombie.c\n\\#include \u003cunistd.h\u003e\n\nint main()\n{\n if (fork())\n pause();\n return 0;\n}\n$\n\nWe are hitting this bug pretty regularly on ChromeOS.\n\nThis bug is already fixed by Tejun Heo\u0027s cgroup patchset which is\ntargetted for the next merge window:\n\nhttps://lkml.org/lkml/2011/11/1/356\n\nI\u0027ve create a smaller patch here which just fixes this bug so that a\nfix can be merged into the current release and stable.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nDownstream-Bug-Report: http://crosbug.com/23953\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: containers@lists.linux-foundation.org\nCc: cgroups@vger.kernel.org\nCc: stable@kernel.org\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Olof Johansson \u003colofj@chromium.org\u003e\n" }, { "commit": "b1b73d095084e754562961c443aa8f6587a55f8e", "tree": "f2927ab364b329175442b6abece86cba3528f969", "parents": [ "c3b79770e51ab1fd4201f3b54edf30113b9ce74f" ], "author": { "name": "Kusanagi Kouichi", "email": "slash@ac.auone-net.jp", "time": "Mon Dec 19 18:13:19 2011 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 19 11:41:40 2011 +0100" }, "message": "time/clocksource: Fix kernel-doc warnings\n\nFix various KernelDoc build warnings.\n\nSigned-off-by: Kusanagi Kouichi \u003cslash@ac.auone-net.jp\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLink: http://lkml.kernel.org/r/20111219091320.0D5AF6FC03D@msa105.auone-net.jp\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "83712358ba0a1497ce59a4f84ce4dd0f803fe6fc", "tree": "d17ab27a7bff50616e3b63ad137c004d9ccfbcb0", "parents": [ "32c7f202a4801252a0f3578807b75a961f792870" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Sat Jun 11 19:25:42 2011 -0600" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Sun Dec 18 14:20:27 2011 +0800" }, "message": "writeback: dirty ratelimit - think time compensation\n\nCompensate the task\u0027s think time when computing the final pause time,\nso that -\u003edirty_ratelimit can be executed accurately.\n\n think time :\u003d time spend outside of balance_dirty_pages()\n\nIn the rare case that the task slept longer than the 200ms period time\n(result in negative pause time), the sleep time will be compensated in\nthe following periods, too, if it\u0027s less than 1 second.\n\nAccumulated errors are carefully avoided as long as the max pause area\nis not hitted.\n\nPseudo code:\n\n period \u003d pages_dirtied / task_ratelimit;\n think \u003d jiffies - dirty_paused_when;\n pause \u003d period - think;\n\n1) normal case: period \u003e think\n\n pause \u003d period - think\n dirty_paused_when \u003d jiffies + pause\n nr_dirtied \u003d 0\n\n period time\n |\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003e|\n think time pause time\n |\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003e|\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003e|\n ------|----------------|---------------|------------------------\n dirty_paused_when jiffies\n\n2) no pause case: period \u003c\u003d think\n\n don\u0027t pause; reduce future pause time by:\n dirty_paused_when +\u003d period\n nr_dirtied \u003d 0\n\n period time\n |\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003e|\n think time\n |\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003e|\n ------|--------------------------------+-------------------|----\n dirty_paused_when jiffies\n\nAcked-by: Jan Kara \u003cjack@suse.cz\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" } ], "next": "54848d73f9f254631303d6eab9b976855988b266" }