)]}' { "log": [ { "commit": "aa6afca5bcaba8101f3ea09d5c3e4100b2b9f0e5", "tree": "d8a6fec9d15cbaf37513a18666f5611aa7cb7a83", "parents": [ "887df07891de0435c25cffb92268fea2c621f99c" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Wed Nov 02 13:38:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "proc: fix races against execve() of /proc/PID/fd**\n\nfd* files are restricted to the task\u0027s owner, and other users may not get\ndirect access to them. But one may open any of these files and run any\nsetuid program, keeping opened file descriptors. As there are permission\nchecks on open(), but not on readdir() and read(), operations on the kept\nfile descriptors will not be checked. It makes it possible to violate\nprocfs permission model.\n\nReading fdinfo/* may disclosure current fds\u0027 position and flags, reading\ndirectory contents of fdinfo/ and fd/ may disclosure the number of opened\nfiles by the target task. This information is not sensible per se, but it\ncan reveal some private information (like length of a password stored in a\nfile) under certain conditions.\n\nUsed existing (un)lock_trace functions to check for ptrace_may_access(),\nbut instead of using EPERM return code from it use EACCES to be consistent\nwith existing proc_pid_follow_link()/proc_pid_readlink() return code. If\nthey differ, attacker can guess what fds exist by analyzing stat() return\ncode. Patched handlers: stat() for fd/*, stat() and read() for fdindo/*,\nreaddir() and lookup() for fd/ and fdinfo/.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@gmail.com\u003e\nCc: \u003cstable@kernel.org\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": "887df07891de0435c25cffb92268fea2c621f99c", "tree": "75773637a771f05f1aab438b7f609b2c00bb62c4", "parents": [ "89e8a244b97e48f1f30e898b6f32acca477f2a13" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@openvz.org", "time": "Wed Nov 02 13:38:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "procfs: report EISDIR when reading sysctl dirs in proc\n\nOn reading sysctl dirs we should return -EISDIR instead of -EINVAL.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "89e8a244b97e48f1f30e898b6f32acca477f2a13", "tree": "01d55ac07b57d8afaecd1a6871c5b5d6a7151586", "parents": [ "61600f578fbd2e8ad0c90bddb9c729e7628d3813" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Nov 02 13:38:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "cpusets: avoid looping when storing to mems_allowed if one node remains set\n\n{get,put}_mems_allowed() exist so that general kernel code may locklessly\naccess a task\u0027s set of allowable nodes without having the chance that a\nconcurrent write will cause the nodemask to be empty on configurations\nwhere MAX_NUMNODES \u003e BITS_PER_LONG.\n\nThis could incur a significant delay, however, especially in low memory\nconditions because the page allocator is blocking and reclaim requires\nget_mems_allowed() itself. It is not atypical to see writes to\ncpuset.mems take over 2 seconds to complete, for example. In low memory\nconditions, this is problematic because it\u0027s one of the most imporant\ntimes to change cpuset.mems in the first place!\n\nThe only way a task\u0027s set of allowable nodes may change is through cpusets\nby writing to cpuset.mems and when attaching a task to a generic code is\nnot reading the nodemask with get_mems_allowed() at the same time, and\nthen clearing all the old nodes. This prevents the possibility that a\nreader will see an empty nodemask at the same time the writer is storing a\nnew nodemask.\n\nIf at least one node remains unchanged, though, it\u0027s possible to simply\nset all new nodes and then clear all the old nodes. Changing a task\u0027s\nnodemask is protected by cgroup_mutex so it\u0027s guaranteed that two threads\nare not changing the same task\u0027s nodemask at the same time, so the\nnodemask is guaranteed to be stored before another thread changes it and\ndetermines whether a node remains set or not.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "61600f578fbd2e8ad0c90bddb9c729e7628d3813", "tree": "25842f7e2ee743c66e30df1de3cb666d48bbd063", "parents": [ "4799401fef9d5951b2da384c5eb08034c48e08a0" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Wed Nov 02 13:38:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "mm/page_cgroup.c: quiet sparse noise\n\nwarning: symbol \u0027swap_cgroup_ctrl\u0027 was not declared. Should it be static?\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@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": "4799401fef9d5951b2da384c5eb08034c48e08a0", "tree": "94f9113c6870f46811aaa0f08cdb3ca2beba1e9c", "parents": [ "a61ed3cec51cfd4877855c24890ab8d3e2b143e3" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Nov 02 13:38:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "memcg: Fix race condition in memcg_check_events() with this_cpu usage\n\nVarious code in memcontrol.c () calls this_cpu_read() on the calculations\nto be done from two different percpu variables, or does an open-coded\nread-modify-write on a single percpu variable.\n\nDisable preemption throughout these operations so that the writes go to\nthe correct palces.\n\n[hannes@cmpxchg.org: added this_cpu to __this_cpu conversion]\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a61ed3cec51cfd4877855c24890ab8d3e2b143e3", "tree": "3ffb850513b202c8eb0ac09ad6d307719bd39856", "parents": [ "9b272977e3b99a8699361d214b51f98c8a9e0e7b" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Wed Nov 02 13:38:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "memcg: close race between charge and putback\n\nThere is a potential race between a thread charging a page and another\nthread putting it back to the LRU list:\n\n charge: putback:\n SetPageCgroupUsed SetPageLRU\n PageLRU \u0026\u0026 add to memcg LRU PageCgroupUsed \u0026\u0026 add to memcg LRU\n\nThe order of setting one flag and checking the other is crucial, otherwise\nthe charge may observe !PageLRU while the putback observes !PageCgroupUsed\nand the page is not linked to the memcg LRU at all.\n\nGlobal memory pressure may fix this by trying to isolate and putback the\npage for reclaim, where that putback would link it to the memcg LRU again.\n Without that, the memory cgroup is undeletable due to a charge whose\nphysical page can not be found and moved out.\n\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9b272977e3b99a8699361d214b51f98c8a9e0e7b", "tree": "2113cee95a42ea893aa6eddb01b14e563153fabb", "parents": [ "0a619e58703b86d53d07e938eade9a91a4a863c6" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Wed Nov 02 13:38:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "memcg: skip scanning active lists based on individual size\n\nReclaim decides to skip scanning an active list when the corresponding\ninactive list is above a certain size in comparison to leave the assumed\nworking set alone while there are still enough reclaim candidates around.\n\nThe memcg implementation of comparing those lists instead reports whether\nthe whole memcg is low on the requested type of inactive pages,\nconsidering all nodes and zones.\n\nThis can lead to an oversized active list not being scanned because of the\nstate of the other lists in the memcg, as well as an active list being\nscanned while its corresponding inactive list has enough pages.\n\nNot only is this wrong, it\u0027s also a scalability hazard, because the global\nmemory state over all nodes and zones has to be gathered for each memcg\nand zone scanned.\n\nMake these calculations purely based on the size of the two LRU lists\nthat are actually affected by the outcome of the decision.\n\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReviewed-by: Ying Han \u003cyinghan@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": "0a619e58703b86d53d07e938eade9a91a4a863c6", "tree": "0579cebdbdbb90507db04b320acb4191f8a86f2e", "parents": [ "715a5ee82ab3c07430f748630044354132add5ad" ], "author": { "name": "Igor Mammedov", "email": "imammedo@redhat.com", "time": "Wed Nov 02 13:38:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:00 2011 -0700" }, "message": "memcg: do not expose uninitialized mem_cgroup_per_node to world\n\nIf somebody is touching data too early, it might be easier to diagnose a\nproblem when dereferencing NULL at mem-\u003einfo.nodeinfo[node] than trying to\nunderstand why mem_cgroup_per_zone is [un|partly]initialized.\n\nSigned-off-by: Igor Mammedov \u003cimammedo@redhat.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@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": "715a5ee82ab3c07430f748630044354132add5ad", "tree": "f77a20fbcd0e19dcb3b65f511194e01e8095bf6a", "parents": [ "c0ff4b8540a5c158b8e5bafb7d767298b67b0b92" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Nov 02 13:38:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "memcg: fix oom schedule_timeout()\n\nBefore calling schedule_timeout(), task state should be changed.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c0ff4b8540a5c158b8e5bafb7d767298b67b0b92", "tree": "a47a2bcd0b7b80056cde7ba6b1263aae78f77212", "parents": [ "ff7ee93f47151e23601856e7eb5510babf956571" ], "author": { "name": "Raghavendra K T", "email": "raghavendra.kt@linux.vnet.ibm.com", "time": "Wed Nov 02 13:38:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "memcg: rename mem variable to memcg\n\nThe memcg code sometimes uses \"struct mem_cgroup *mem\" and sometimes uses\n\"struct mem_cgroup *memcg\". Rename all mem variables to memcg in source\nfile.\n\nSigned-off-by: Raghavendra K T \u003craghavendra.kt@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ff7ee93f47151e23601856e7eb5510babf956571", "tree": "2a62777ebdec1383d3dd6098cfe8a325c99f2dde", "parents": [ "77ceab8ea590d7dc6c8f055ce43dfebd74428107" ], "author": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Wed Nov 02 13:38:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "cgroup/kmemleak: Annotate alloc_page() for cgroup allocations\n\nWhen the cgroup base was allocated with kmalloc, it was necessary to\nannotate the variable with kmemleak_not_leak(). But because it has\nrecently been changed to be allocated with alloc_page() (which skips\nkmemleak checks) causes a warning on boot up.\n\nI was triggering this output:\n\n allocated 8388608 bytes of page_cgroup\n please try \u0027cgroup_disable\u003dmemory\u0027 option if you don\u0027t want memory cgroups\n kmemleak: Trying to color unknown object at 0xf5840000 as Grey\n Pid: 0, comm: swapper Not tainted 3.0.0-test #12\n Call Trace:\n [\u003cc17e34e6\u003e] ? printk+0x1d/0x1f^M\n [\u003cc10e2941\u003e] paint_ptr+0x4f/0x78\n [\u003cc178ab57\u003e] kmemleak_not_leak+0x58/0x7d\n [\u003cc108ae9f\u003e] ? __rcu_read_unlock+0x9/0x7d\n [\u003cc1cdb462\u003e] kmemleak_init+0x19d/0x1e9\n [\u003cc1cbf771\u003e] start_kernel+0x346/0x3ec\n [\u003cc1cbf1b4\u003e] ? loglevel+0x18/0x18\n [\u003cc1cbf0aa\u003e] i386_start_kernel+0xaa/0xb0\n\nAfter a bit of debugging I tracked the object 0xf840000 (and others) down\nto the cgroup code. The change from allocating base with kmalloc to\nalloc_page() has the base not calling kmemleak_alloc() which adds the\npointer to the object_tree_root, but kmemleak_not_leak() adds it to the\ncrt_early_log[] table. On kmemleak_init(), the entry is found in the\nearly_log[] but not the object_tree_root, and this error message is\ndisplayed.\n\nIf alloc_page() fails then it defaults back to vmalloc() which still uses\nthe kmemleak_alloc() which makes us still need the kmemleak_not_leak()\ncall. The solution is to call the kmemleak_alloc() directly if the\nalloc_page() succeeds.\n\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Jonathan Nieder \u003cjrnieder@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": "77ceab8ea590d7dc6c8f055ce43dfebd74428107", "tree": "b2ef5e5baca4579565ab9bf527e965dd9b93a25a", "parents": [ "33ef6b6984403a688189317ef46bb3caab3b70e0" ], "author": { "name": "Ben Blum", "email": "bblum@andrew.cmu.edu", "time": "Wed Nov 02 13:38:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "cgroups: don\u0027t attach task to subsystem if migration failed\n\nIf a task has exited to the point it has called cgroup_exit() already,\nthen we can\u0027t migrate it to another cgroup anymore.\n\nThis can happen when we are attaching a task to a new cgroup between the\ncall to -\u003ecan_attach_task() on subsystems and the migration that is\neventually tried in cgroup_task_migrate().\n\nIn this case cgroup_task_migrate() returns -ESRCH and we don\u0027t want to\nattach the task to the subsystems because the attachment to the new cgroup\nitself failed.\n\nFix this by only calling -\u003eattach_task() on the subsystems if the cgroup\nmigration succeeded.\n\nReported-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Ben Blum \u003cbblum@andrew.cmu.edu\u003e\nAcked-by: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@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": "33ef6b6984403a688189317ef46bb3caab3b70e0", "tree": "43dff6dd0150b34ce69b1d681c92659c9b20eb5c", "parents": [ "434a964daa14b9db083ce20404a4a2add54d037a" ], "author": { "name": "Ben Blum", "email": "bblum@andrew.cmu.edu", "time": "Wed Nov 02 13:38:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "cgroups: more safe tasklist locking in cgroup_attach_proc\n\nFix unstable tasklist locking in cgroup_attach_proc.\n\nAccording to this thread - https://lkml.org/lkml/2011/7/27/243 - RCU is\nnot sufficient to guarantee the tasklist is stable w.r.t. de_thread and\nexit. Taking tasklist_lock for reading, instead of rcu_read_lock, ensures\nproper exclusion.\n\nSigned-off-by: Ben Blum \u003cbblum@andrew.cmu.edu\u003e\nAcked-by: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "434a964daa14b9db083ce20404a4a2add54d037a", "tree": "fedba22e5bc94798d96a6b895f3129043b807a15", "parents": [ "3069083cc8def2ffad8520f0f24c6f95f140aac5" ], "author": { "name": "Phillip Lougher", "email": "plougher@redhat.com", "time": "Wed Nov 02 13:38:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "hfs: fix hfs_find_init() sb-\u003eext_tree NULL ptr oops\n\nClement Lecigne reports a filesystem which causes a kernel oops in\nhfs_find_init() trying to dereference sb-\u003eext_tree which is NULL.\n\nThis proves to be because the filesystem has a corrupted MDB extent\nrecord, where the extents file does not fit into the first three extents\nin the file record (the first blocks).\n\nIn hfs_get_block() when looking up the blocks for the extent file\n(HFS_EXT_CNID), it fails the first blocks special case, and falls\nthrough to the extent code (which ultimately calls hfs_find_init())\nwhich is in the process of being initialised.\n\nHfs avoids this scenario by always having the extents b-tree fitting\ninto the first blocks (the extents B-tree can\u0027t have overflow extents).\n\nThe fix is to check at mount time that the B-tree fits into first\nblocks, i.e. fail if HFS_I(inode)-\u003ealloc_blocks \u003e\u003d\nHFS_I(inode)-\u003efirst_blocks\n\nNote, the existing commit 47f365eb57573 (\"hfs: fix oops on mount with\ncorrupted btree extent records\") becomes subsumed into this as a special\ncase, but only for the extents B-tree (HFS_EXT_CNID), it is perfectly\nacceptable for the catalog B-Tree file to grow beyond three extents,\nwith the remaining extent descriptors in the extents overfow.\n\nThis fixes CVE-2011-2203\n\nReported-by: Clement LECIGNE \u003cclement.lecigne@netasq.com\u003e\nSigned-off-by: Phillip Lougher \u003cplougher@redhat.com\u003e\nCc: Jeff Mahoney \u003cjeffm@suse.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3069083cc8def2ffad8520f0f24c6f95f140aac5", "tree": "226fddfdb3ad4f170809fd44f167a02a360f2ea2", "parents": [ "b6eb48d02dc73d19bebc396a9e92dd64a65d3199" ], "author": { "name": "Namjae Jeon", "email": "linkinjeon@gmail.com", "time": "Wed Nov 02 13:38:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "isofs: add readpages support\n\nUse mpage_readpages() instead of multiple calls to isofs_readpage() to\nreduce the CPU utilization and make performance higher.\n\nSigned-off-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b6eb48d02dc73d19bebc396a9e92dd64a65d3199", "tree": "69f397ed75788d24a10a828d466f85dd897a82ed", "parents": [ "db5cf8d1ac4ac3fa06d89345154ce20068aeb097" ], "author": { "name": "Sami Kerola", "email": "kerolasa@iki.fi", "time": "Wed Nov 02 13:37:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:59 2011 -0700" }, "message": "minix: describe usage of different magic numbers\n\nOne can get this information from minix/inode.c, but adding the\nexplanations at the definition sites is more appropriate.\n\nSigned-off-by: Sami Kerola \u003ckerolasa@iki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "db5cf8d1ac4ac3fa06d89345154ce20068aeb097", "tree": "005495c7dc31ab072226b076c44083a1b08da8d9", "parents": [ "43fcb81550f7a16be192b19c77a379c9b27b1585" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Nov 02 13:37:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text\n\nThe driver is added using platform_driver_probe(), so the callbacks can be\ndiscarded more aggessively.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "43fcb81550f7a16be192b19c77a379c9b27b1585", "tree": "b90b46aeb521d7151d55674c29efde57ebb6f174", "parents": [ "6d03d06db8881f4f9da87d5c77234b98c40a30e9" ], "author": { "name": "David Anders", "email": "danders.dev@gmail.com", "time": "Wed Nov 02 13:37:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "rtc: add initial support for mcp7941x parts\n\nAdd initial support for the microchip mcp7941x series of real time clocks.\n\nThe mcp7941x series is generally compatible with the ds1307 and ds1337 rtc\ndevices from dallas semiconductor. minor differences include a backup\nbattery enable bit, and the polarity of the oscillator enable bit.\n\nSigned-off-by: David Anders \u003cdanders.dev@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6d03d06db8881f4f9da87d5c77234b98c40a30e9", "tree": "11af7b954ec046f5de4a72cce2935a1e1aea06dc", "parents": [ "f919b9235f930e649b374a50009c6c268bd9a073" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Wed Nov 02 13:37:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "drivers/rtc/class.c: convert idr to ida and use ida_simple_get()\n\nThis is the one use of an ida that doesn\u0027t retry on receiving -EAGAIN.\nI\u0027m assuming do so will cause no harm and may help on a rare occasion.\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f919b9235f930e649b374a50009c6c268bd9a073", "tree": "e6e58d209b82add156f53649a78b34f8cdc08222", "parents": [ "0620d9193cb976ba635d56a6cfd11cb81616d02b" ], "author": { "name": "Neil Armstrong", "email": "narmstrong@neotion.com", "time": "Wed Nov 02 13:37:47 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "init/do_mounts_rd.c: fix ramdisk identification for padded cramfs\n\nWhen a cramfs ramdisk padded with 512 bytes is given to the kernel, the\ncurrent identify_ramdisk_image function fails to identify it.\n\nTested with a padded cramfs image on an ARM based board.\n\nSigned-off-by: Neil Armstrong \u003cnarmstrong@neotion.com\u003e\nCc: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Davidlohr Bueso \u003cdave@gnu.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0620d9193cb976ba635d56a6cfd11cb81616d02b", "tree": "15e68387600a6604c1ac682c0df2c8ab56b0697a", "parents": [ "a3defbe5c337dbc6da911f8cc49ae3cc3b49b453" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Nov 02 13:37:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "ramfs: remove module leftovers\n\nSince ramfs is hard-selected to \"y\", the module leftovers make no sense.\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@gmail.com\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: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a3defbe5c337dbc6da911f8cc49ae3cc3b49b453", "tree": "0971645887ef2848ad4f7bc86d2204aacb748de9", "parents": [ "b35a35b556f5e6b7993ad0baf20173e75c09ce8c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Nov 02 13:37:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "binfmt_elf: fix PIE execution with randomization disabled\n\nThe case of address space randomization being disabled in runtime through\nrandomize_va_space sysctl is not treated properly in load_elf_binary(),\nresulting in SIGKILL coming at exec() time for certain PIE-linked binaries\nin case the randomization has been disabled at runtime prior to calling\nexec().\n\nHandle the randomize_va_space \u003d\u003d 0 case the same way as if we were not\nsupporting .text randomization at all.\n\nBased on original patch by H.J. Lu and Josh Boyer.\n\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: H.J. Lu \u003chongjiu.lu@intel.com\u003e\nCc: \u003cstable@kernel.org\u003e\nTested-by: Josh Boyer \u003cjwboyer@redhat.com\u003e\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\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": "b35a35b556f5e6b7993ad0baf20173e75c09ce8c", "tree": "85ea46dde6e97d4c73b724698fd65a403529953e", "parents": [ "e0d85a366c2300efd230ef82a9b22110b0658331" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "thp: share get_huge_page_tail()\n\nThis avoids duplicating the function in every arch gup_fast.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: David 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": "e0d85a366c2300efd230ef82a9b22110b0658331", "tree": "4965cd894ac64947afc7fbb7f5a0303c99e76b28", "parents": [ "0693bc9ce2cc4f6a1b9c3c05790fc149a74c0b87" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "sparc: gup_pte_range() support THP based tail recounting\n\nUp to this point the code assumed old refcounting for hugepages (pre-thp).\n This updates the code directly to the thp mapcount tail page refcounting.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: David 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": "0693bc9ce2cc4f6a1b9c3c05790fc149a74c0b87", "tree": "d1d04584ca8d22546fa6c375d455d04506e8162f", "parents": [ "220a2eb228d032acde60e9fd044ca802706ff583" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "s390: gup_huge_pmd() return 0 if pte changes\n\ns390 didn\u0027t return 0 in that case, if it\u0027s rolling back the *nr pointer it\nshould also return zero to avoid adding pages to the array at the wrong\noffset.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: David 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": "220a2eb228d032acde60e9fd044ca802706ff583", "tree": "a764d37aace07cf5a9fa2c1e5b7f81662dfee7ae", "parents": [ "cf592bf768c4fa40282b8fce58a80820065de2cb" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "s390: gup_huge_pmd() support THP tail recounting\n\nUp to this point the code assumed old refcounting for hugepages (pre-thp).\nThis updates the code directly to the thp mapcount tail page refcounting.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: David 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": "cf592bf768c4fa40282b8fce58a80820065de2cb", "tree": "e1095e7c1f62666d5702be2e4fe569209a226798", "parents": [ "3526741f0964c88bc2ce511e1078359052bf225b" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:57 2011 -0700" }, "message": "powerpc: gup_huge_pmd() return 0 if pte changes\n\npowerpc didn\u0027t return 0 in that case, if it\u0027s rolling back the *nr pointer\nit should also return zero to avoid adding pages to the array at the wrong\noffset.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: David 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": "3526741f0964c88bc2ce511e1078359052bf225b", "tree": "d651d4826523ffeebc92e7863a918de955c15840", "parents": [ "8596468487e2062cae2aad56e973784e03959245" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:57 2011 -0700" }, "message": "powerpc: gup_hugepte() support THP based tail recounting\n\nUp to this point the code assumed old refcounting for hugepages (pre-thp).\nThis updates the code directly to the thp mapcount tail page refcounting.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8596468487e2062cae2aad56e973784e03959245", "tree": "259696a6595fbd3ea56a987a5947217475542744", "parents": [ "405e44f2e312dd5dd63e5a9f459bffcbcd4368ef" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:57 2011 -0700" }, "message": "powerpc: gup_hugepte() avoid freeing the head page too many times\n\nWe only taken \"refs\" pins on the head page not \"*nr\" pins.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "405e44f2e312dd5dd63e5a9f459bffcbcd4368ef", "tree": "eccfd96b3f25ad8c3d283c17938f4ec9a1a1c3fb", "parents": [ "2839bdc1bfc0af76a2f0f11eca011590520a04fa" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:57 2011 -0700" }, "message": "powerpc: get_hugepte() don\u0027t put_page() the wrong page\n\n\"page\" may have changed to point to the next hugepage after the loop\ncompleted, The references have been taken on the head page, so the\nput_page must happen there too.\n\nThis is a longstanding issue pre-thp inclusion.\n\nIt\u0027s totally unclear how these page_cache_add_speculative and\npte_val(pte) !\u003d pte_val(*ptep) checks are necessary across all the\npowerpc gup_fast code, when x86 doesn\u0027t need any of that: there\u0027s no way\nthe page can be freed with irq disabled so we\u0027re guaranteed the\natomic_inc will happen on a page with page_count \u003e 0 (so not needing the\nspeculative check).\n\nThe pte check is also meaningless on x86: no need to rollback on x86 if\nthe pte changed, because the pte can still change a CPU tick after the\ncheck succeeded and it won\u0027t be rolled back in that case. The important\nthing is we got a reference on a valid page that was mapped there a CPU\ntick ago. So not knowing the soft tlb refill code of ppc64 in great\ndetail I\u0027m not removing the \"speculative\" page_count increase and the\npte checks across all the code, but unless there\u0027s a strong reason for\nit they should be later cleaned up too.\n\nIf a pte can change from huge to non-huge (like it could happen with\nTHP) passing a pte_t *ptep to gup_hugepte() would also require to repeat\nthe is_hugepd in gup_hugepte(), but that shouldn\u0027t happen with hugetlbfs\nonly so I\u0027m not altering that.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2839bdc1bfc0af76a2f0f11eca011590520a04fa", "tree": "8dddcc4c964e50cb5067bfd23f3fb660400dbc2b", "parents": [ "70b50f94f1644e2aa7cb374819cfd93f3c28d725" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:57 2011 -0700" }, "message": "powerpc: remove superfluous PageTail checks on the pte gup_fast\n\nThis part of gup_fast doesn\u0027t seem capable of handling hugetlbfs ptes,\nthose should be handled by gup_hugepd only, so these checks are\nsuperfluous.\n\nPlus if this wasn\u0027t a noop, it would have oopsed because, the insistence\nof using the speculative refcounting would trigger a VM_BUG_ON if a tail\npage was encountered in the page_cache_get_speculative().\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "70b50f94f1644e2aa7cb374819cfd93f3c28d725", "tree": "79198cd9a92600140827a670d1ed5eefdcd23d79", "parents": [ "994c0e992522c123298b4a91b72f5e67ba2d1123" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:36:59 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:57 2011 -0700" }, "message": "mm: thp: tail page refcounting fix\n\nMichel while working on the working set estimation code, noticed that\ncalling get_page_unless_zero() on a random pfn_to_page(random_pfn)\nwasn\u0027t safe, if the pfn ended up being a tail page of a transparent\nhugepage under splitting by __split_huge_page_refcount().\n\nHe then found the problem could also theoretically materialize with\npage_cache_get_speculative() during the speculative radix tree lookups\nthat uses get_page_unless_zero() in SMP if the radix tree page is freed\nand reallocated and get_user_pages is called on it before\npage_cache_get_speculative has a chance to call get_page_unless_zero().\n\nSo the best way to fix the problem is to keep page_tail-\u003e_count zero at\nall times. This will guarantee that get_page_unless_zero() can never\nsucceed on any tail page. page_tail-\u003e_mapcount is guaranteed zero and\nis unused for all tail pages of a compound page, so we can simply\naccount the tail page references there and transfer them to\ntail_page-\u003e_count in __split_huge_page_refcount() (in addition to the\nhead_page-\u003e_mapcount).\n\nWhile debugging this s/_count/_mapcount/ change I also noticed get_page is\ncalled by direct-io.c on pages returned by get_user_pages. That wasn\u0027t\nentirely safe because the two atomic_inc in get_page weren\u0027t atomic. As\nopposed to other get_user_page users like secondary-MMU page fault to\nestablish the shadow pagetables would never call any superflous get_page\nafter get_user_page returns. It\u0027s safer to make get_page universally safe\nfor tail pages and to use get_page_foll() within follow_page (inside\nget_user_pages()). get_page_foll() is safe to do the refcounting for tail\npages without taking any locks because it is run within PT lock protected\ncritical sections (PT lock for pte and page_table_lock for\npmd_trans_huge).\n\nThe standard get_page() as invoked by direct-io instead will now take\nthe compound_lock but still only for tail pages. The direct-io paths\nare usually I/O bound and the compound_lock is per THP so very\nfinegrined, so there\u0027s no risk of scalability issues with it. A simple\ndirect-io benchmarks with all lockdep prove locking and spinlock\ndebugging infrastructure enabled shows identical performance and no\noverhead. So it\u0027s worth it. Ideally direct-io should stop calling\nget_page() on pages returned by get_user_pages(). The spinlock in\nget_page() is already optimized away for no-THP builds but doing\nget_page() on tail pages returned by GUP is generally a rare operation\nand usually only run in I/O paths.\n\nThis new refcounting on page_tail-\u003e_mapcount in addition to avoiding new\nRCU critical sections will also allow the working set estimation code to\nwork without any further complexity associated to the tail page\nrefcounting with THP.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReported-by: Michel Lespinasse \u003cwalken@google.com\u003e\nReviewed-by: Michel Lespinasse \u003cwalken@google.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: \u003cstable@kernel.org\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": "994c0e992522c123298b4a91b72f5e67ba2d1123", "tree": "411952f844b8e1d5ef2854e44df793529078d3eb", "parents": [ "367069f16e32e188d4687fe2c3e30f2ca583836f", "abc3f126ac736280c68db6472eb0040ddf6e1b1f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:08:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:08:03 2011 -0700" }, "message": "Merge branch \u0027next/soc\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/soc\u0027 of git://git.linaro.org/people/arnd/arm-soc: (21 commits)\n MAINTAINERS: add ARM/FREESCALE IMX6 entry\n arm/imx: merge i.MX3 and i.MX6\n arm/imx6q: add suspend/resume support\n arm/imx6q: add device tree machine support\n arm/imx6q: add smp and cpu hotplug support\n arm/imx6q: add core drivers clock, gpc, mmdc and src\n arm/imx: add gic_handle_irq function\n arm/imx6q: add core definitions and low-level debug uart\n arm/imx6q: add device tree source\n ARM: highbank: add suspend support\n ARM: highbank: Add cpu hotplug support\n ARM: highbank: add SMP support\n MAINTAINERS: add Calxeda Highbank ARM platform\n ARM: add Highbank core platform support\n ARM: highbank: add devicetree source\n ARM: l2x0: add empty l2x0_of_init\n picoxcell: add a definition of VMALLOC_END\n picoxcell: remove custom ioremap implementation\n picoxcell: add the DTS for the PC7302 board\n picoxcell: add the DTS for pc3x2 and pc3x3 devices\n ...\n\nFix up trivial conflicts in arch/arm/Kconfig, and some more header file\nconflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge\nby Arnd).\n" }, { "commit": "367069f16e32e188d4687fe2c3e30f2ca583836f", "tree": "977f87038b75e53af9d132cba2f7a2aecb2fa005", "parents": [ "81a3c10ce8a7fd5bf9a06bfc38bd417512911831", "c72dbae971400e466ad9ff16c920cd6d9d8c55a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:02:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:02:35 2011 -0700" }, "message": "Merge branch \u0027next/dt\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/dt\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n ARM: gic: use module.h instead of export.h\n ARM: gic: fix irq_alloc_descs handling for sparse irq\n ARM: gic: add OF based initialization\n ARM: gic: add irq_domain support\n irq: support domains with non-zero hwirq base\n of/irq: introduce of_irq_init\n ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support\n ARM: at91: dt: at91sam9g45 family and board device tree files\n arm/mx5: add device tree support for imx51 babbage\n arm/mx5: add device tree support for imx53 boards\n ARM: msm: Add devicetree support for msm8660-surf\n msm_serial: Add devicetree support\n msm_serial: Use relative resources for iomem\n\nFix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}\n" }, { "commit": "81a3c10ce8a7fd5bf9a06bfc38bd417512911831", "tree": "12ceac10fae8c4b2dc17b362672a5db305a8d960", "parents": [ "6585dea1f99cc2265582ff2e4cc1727062136e92", "df80442d1ee2902c2e39f90f18160f2e08d14c06" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:58:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:58:25 2011 -0700" }, "message": "Merge branch \u0027next/cleanup2\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cleanup2\u0027 of git://git.linaro.org/people/arnd/arm-soc: (31 commits)\n ARM: OMAP: Warn if omap_ioremap is called before SoC detection\n ARM: OMAP: Move set_globals initialization to happen in init_early\n ARM: OMAP: Map SRAM later on with ioremap_exec()\n ARM: OMAP: Remove calls to SRAM allocations for framebuffer\n ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done\n ARM: OMAP1: Use generic map_io, init_early and init_irq\n arm/dts: OMAP3+: Add mpu, dsp and iva nodes\n arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver\n ARM: OMAP2+: l3-noc: Add support for device-tree\n ARM: OMAP2+: board-generic: Add i2c static init\n ARM: OMAP2+: board-generic: Add DT support to generic board\n arm/dts: Add support for OMAP3 Beagle board\n arm/dts: Add initial device tree support for OMAP3 SoC\n arm/dts: Add support for OMAP4 SDP board\n arm/dts: Add support for OMAP4 PandaBoard\n arm/dts: Add initial device tree support for OMAP4 SoC\n ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node\n ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration\n of: Add helpers to get one string in multiple strings property\n ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures\n ...\n\nFix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c\n" }, { "commit": "6585dea1f99cc2265582ff2e4cc1727062136e92", "tree": "57378ccfe0f9fde73081e1f9355d05dd4131e178", "parents": [ "16ee792e45cf0c97ce061fce03c36cab5551ec72", "97c24c1aa403e0d4ef7c1958db8459e488862b46" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:34:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:34:22 2011 -0700" }, "message": "Merge branch \u0027next/cross-platform\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cross-platform\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n arm/imx: use Kconfig choice for low-level debug UART selection\n ARM: realview: use Kconfig choice for debug UART selection\n ARM: plat-samsung: use Kconfig choice for debug UART selection\n ARM: versatile: convert logical CPU numbers to physical numbers\n ARM: ux500: convert logical CPU numbers to physical numbers\n ARM: shmobile: convert logical CPU numbers to physical numbers\n ARM: msm: convert logical CPU numbers to physical numbers\n ARM: exynos4: convert logical CPU numbers to physical numbers\n\nFix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of\nARM_KPROBES_TEST option) in arch/arm/Kconfig.debug\n" }, { "commit": "16ee792e45cf0c97ce061fce03c36cab5551ec72", "tree": "dc68af705fbac4b5d71325aa972730199bb187dd", "parents": [ "f906fb1d70e016726fccfb0d978c5d425503db9d", "efa62e1355f0495f37f1296754b8880947c8da72" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:31:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:31:25 2011 -0700" }, "message": "Merge branch \u0027next/devel\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/devel\u0027 of git://git.linaro.org/people/arnd/arm-soc: (50 commits)\n ARM: tegra: update defconfig\n arm/tegra: Harmony: Configure PMC for low-level interrupts\n arm/tegra: device tree support for ventana board\n arm/tegra: add support for ventana pinmuxing\n arm/tegra: prepare Seaboard pinmux code for derived boards\n arm/tegra: pinmux: ioremap registers\n gpio/tegra: Convert to a platform device\n arm/tegra: Convert pinmux driver to a platform device\n arm/dt: Tegra: Add pinmux node to tegra20.dtsi\n arm/tegra: Prep boards for gpio/pinmux conversion to pdevs\n ARM: mx5: fix clock usage for suspend\n ARM i.MX entry-macro.S: remove now unused code\n ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER\n ARM i.MX tzic: add handle_irq function\n ARM i.MX avic: add handle_irq function\n ARM: mx25: Add the missing IIM base definition\n ARM i.MX avic: convert to use generic irq chip\n mx31moboard: Add poweroff support\n ARM: mach-qong: Add watchdog support\n ARM: davinci: AM18x: Add wl1271/wlan support\n ...\n\nFix up conflicts in:\n\tarch/arm/mach-at91/at91sam9g45.c\n\tarch/arm/mach-mx5/devices-imx53.h\n\tarch/arm/plat-mxc/include/mach/memory.h\n" }, { "commit": "f906fb1d70e016726fccfb0d978c5d425503db9d", "tree": "b2bac5fbe7d2eb81dd7fe6cc88e27dddd0189c84", "parents": [ "510597e26e2a072e2d46ea5bc57feaf385e37f70", "a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:25:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:25:36 2011 -0700" }, "message": "Merge branch \u0027next/board\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/board\u0027 of git://git.linaro.org/people/arnd/arm-soc: (34 commits)\n ep93xx: add support Vision EP9307 SoM\n ARM: mxs: Add initial support for DENX MX28\n ARM: EXYNOS4: Add support SMDK4412 Board\n ARM: EXYNOS4: Add MCT support for EXYNOS4412\n ARM: EXYNOS4: Add functions for gic interrupt handling\n ARM: EXYNOS4: Add support clock for EXYNOS4412\n ARM: EXYNOS4: Add support new EXYNOS4412 SoC\n ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212\n ARM: EXYNOS4: Add support PPI in external GIC\n ARM: EXYNOS4: convert boot_params to atag_offset\n ixp4xx: support omicron ixp425 based boards\n ARM: EXYNOS4: Add support SMDK4212 Board\n ARM: EXYNOS4: Add support PM for EXYNOS4212\n ARM: EXYNOS4: Add support clock for EXYNOS4212\n ARM: EXYNOS4: Add support new EXYNOS4212 SoC\n at91: USB-A9G20 C01 \u0026 C11 board support\n at91: merge board USB-A9260 and USB-A9263 together\n at91: add support for RSIs EWS board\n ARM: SAMSUNG: Fix mask value for S5P64X0 CPU IDs\n ARM: SAMSUNG: Fix mask for S3C64xx CPU IDs\n ...\n" }, { "commit": "510597e26e2a072e2d46ea5bc57feaf385e37f70", "tree": "5ffe90e6569481506b06fb6d6a409655fac4f7f6", "parents": [ "cd9a0b6bd67ec372b0ef3cb2abe26974f888b956", "4702abd3f9728893ad5b0f4389e1902588510459" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:24:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:24:30 2011 -0700" }, "message": "Merge branch \u0027next/deletion\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/deletion\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n ARM: mach-nuc93x: delete\n\nFix up trivial delete/edit conflicts in\n\tarch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}\n" }, { "commit": "cd9a0b6bd67ec372b0ef3cb2abe26974f888b956", "tree": "ffec66aa48f95b2b764f9e84fbafc519cce5000e", "parents": [ "ac5761a650d22dd7dfad4d417463a0981d2da0a4", "090ad104c5c59c7952d4b8d4cfb60559b38eb3e0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:22:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:22:01 2011 -0700" }, "message": "Merge branch \u0027next/pm\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/pm\u0027 of git://git.linaro.org/people/arnd/arm-soc: (66 commits)\n ARM: CSR: PM: use outer_resume to resume L2 cache\n ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII\n ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM\u003dn\n ARM: CSR: PM: add sleep entry for SiRFprimaII\n ARM: CSR: PM: save/restore irq status in suspend cycle\n ARM: CSR: PM: save/restore timer status in suspend cycle\n OMAP4: PM: TWL6030: add cmd register\n OMAP4: PM: TWL6030: fix ON/RET/OFF voltages\n OMAP4: PM: TWL6030: address 0V conversions\n OMAP4: PM: TWL6030: fix uv to voltage for \u003e0x39\n OMAP4: PM: TWL6030: fix voltage conversion formula\n omap: voltage: add a stub header file for external/regulator use\n OMAP2+: VC: more registers are per-channel starting with OMAP5\n OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale\n OMAP3+: voltage: rename omap_voltage_get_nom_volt -\u003e voltdm_get_voltage\n OMAP3+: voltdm: final removal of omap_vdd_info\n OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain\n OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix\n OMAP3+: VP: combine setting init voltage into common function\n OMAP3+: VP: remove unused omap_vp_get_curr_volt()\n ...\n\nFix up trivial conflict in arch/arm/mach-prima2/l2x0.c (code removal vs\nedit)\n" }, { "commit": "ac5761a650d22dd7dfad4d417463a0981d2da0a4", "tree": "c01a46a889dde74fbbb05d3b2da22387bb4875c6", "parents": [ "25498e5b3df931a3d52a6e0642ae242e4ee19488", "eed1e576507b52e03e549e0c9e0c747978122403" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:18:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:18:05 2011 -0700" }, "message": "Merge branch \u0027next/timer\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/timer\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n clocksource: fixup ux500 build problems\n ARM: omap: use __devexit_p in dmtimer driver\n ARM: ux500: Reprogram timers upon resume\n ARM: plat-nomadik: timer: Export reset functions\n ARM: plat-nomadik: timer: Add support for periodic timers\n ARM: ux500: Move timer code to separate file\n ARM: ux500: add support for clocksource DBX500 PRCMU\n clocksource: add DBX500 PRCMU Timer support\n ARM: plat-nomadik: MTU sched_clock as an option\n ARM: OMAP: dmtimer: add error handling to export APIs\n ARM: OMAP: dmtimer: low-power mode support\n ARM: OMAP: dmtimer: skip reserved timers\n ARM: OMAP: dmtimer: pm_runtime support\n ARM: OMAP: dmtimer: switch-over to platform device driver\n ARM: OMAP: dmtimer: platform driver\n ARM: OMAP2+: dmtimer: convert to platform devices\n ARM: OMAP1: dmtimer: conversion to platform devices\n ARM: OMAP2+: dmtimer: add device names to flck nodes\n ARM: OMAP: Add support for dmtimer v2 ip\n" }, { "commit": "25498e5b3df931a3d52a6e0642ae242e4ee19488", "tree": "5a627d71015fde644d8c61a04f7718c2f0a748db", "parents": [ "952414505f55afe5cd6dc004765076aa22b3ed7e", "995a0605a6665858d73f9e80053414909be33f27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:16:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:16:43 2011 -0700" }, "message": "Merge branch \u0027next/driver\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/driver\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n hw_random: add driver for atmel true hardware random number generator\n ARM: at91: at91sam9g45: add trng clock and platform device\n MX53 Enable the AHCI SATA on MX53 SMD board\n MX53 Enable the AHCI SATA on MX53 LOCO board\n MX53 Enable the AHCI SATA on MX53 ARD board\n AHCI Add the AHCI SATA feature on the MX53 platforms\n Fix pata imx resource\n ARM: imx: Define functions for registering PATA\n ARM: imx: Add PATA clock support\n ARM: imx: Add PATA resources for other i.MX processors\n imx: efika: Enable pata.\n imx51: add pata clock\n imx51: add pata device\n\nFix up trivial conflict (new selects next to each other from separate\nbranches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig\n" }, { "commit": "952414505f55afe5cd6dc004765076aa22b3ed7e", "tree": "eba11ed702ae02fea7f1a0d422346454fc98296f", "parents": [ "68e24ba70465b82ad24e0774ceab5360180d4627", "3e965b176341b78620f7404fd8b7f9a0d061f8a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:11:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:11:00 2011 -0700" }, "message": "Merge branch \u0027next/cleanup\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cleanup\u0027 of git://git.linaro.org/people/arnd/arm-soc: (125 commits)\n ARM: mach-mxs: fix machines\u0027 initializers order\n mmc: mxcmmc: explicitly includes mach/hardware.h\n arm/imx: explicitly includes mach/hardware.h in pm-imx27.c\n arm/imx: remove mx27_setup_weimcs() from mx27.h\n arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c\n arm/imx: remove mx31_setup_weimcs() from mx31.h\n ARM: tegra: devices.c should include devices.h\n ARM: tegra: cpu-tegra: unexport two functions\n ARM: tegra: cpu-tegra: sparse type fix\n ARM: tegra: dma: staticify some tables and functions\n ARM: tegra: tegra2_clocks: don\u0027t export some tables\n ARM: tegra: tegra_powergate_is_powered should be static\n ARM: tegra: tegra_rtc_read_ms should be static\n ARM: tegra: tegra_init_cache should be static\n ARM: tegra: pcie: 0 -\u003e NULL changes\n ARM: tegra: pcie: include board.h\n ARM: tegra: pcie: don\u0027t cast __iomem pointers\n ARM: tegra: tegra2_clocks: 0 -\u003e NULL changes\n ARM: tegra: tegra2_clocks: don\u0027t cast __iomem pointers\n ARM: tegra: timer: don\u0027t cast __iomem pointers\n ...\n\nFix up trivial conflicts in\n arch/arm/mach-omap2/Makefile,\n arch/arm/mach-u300/{Makefile.boot,core.c}\n arch/arm/plat-{mxc,omap}/devices.c\n" }, { "commit": "68e24ba70465b82ad24e0774ceab5360180d4627", "tree": "5d2b8e22e556360f353b2d1c73a19aaf6c5becd9", "parents": [ "b4beb4bf9934d151bf4581a54ae028927374cb2a", "5725aeae5ff2e39f3815bbef788ee326c9afea2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 19:55:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 19:55:06 2011 -0700" }, "message": "Merge branch \u0027next/fixes\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/fixes\u0027 of git://git.linaro.org/people/arnd/arm-soc: (28 commits)\n ARM: pxa/cm-x300: properly set bt_reset pin\n ARM: mmp: rename SHEEVAD to GPLUGD\n ARM: imx: Fix typo \u0027MACH_MX31_3DS_MXC_NAND_USE_BBT\u0027\n ARM: i.MX28: shift frac value in _CLK_SET_RATE\n plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that\u0027s desired\n ARM: mx5: fix clock usage for suspend\n ARM: pxa: use correct __iomem annotations\n ARM: pxa: sharpsl pm needs SPI\n ARM: pxa: centro and treo680 need palm27x\n ARM: pxa: make pxafb_smart_*() empty when not enabled\n ARM: pxa: select POWER_SUPPLY on raumfeld\n ARM: pxa: pxa95x is incompatible with earlier pxa\n ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ\n ARM: pxa: pxa95x/saarb depends on pxa3xx code\n ARM: pxa: allow selecting just one of TREO680/CENTRO\n ARM: pxa: export symbols from pxa3xx-ulpi\n ARM: pxa: make zylonite_pxa*_init declaration match code\n ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available\n ARM: at91: add defconfig for at91sam9g45 family\n ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig\n ...\n" }, { "commit": "abc3f126ac736280c68db6472eb0040ddf6e1b1f", "tree": "4e3333cde6da6c49dcd81920410bf5a33055f03a", "parents": [ "b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea", "8bcb97659656042f3132b2814b19709856aa1335" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:55 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:55 2011 +0100" }, "message": "Merge branch \u0027imx/imx6q\u0027 into next/soc\n\nConflicts:\n\tDocumentation/devicetree/bindings/arm/fsl.txt\n\tarch/arm/Kconfig\n\tarch/arm/Kconfig.debug\n\tarch/arm/plat-mxc/include/mach/common.h\n" }, { "commit": "b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea", "tree": "5e57a2fdc5fa05155d7d8214ad054b16f6b1c3d8", "parents": [ "884897e6a10a86de0e611a76f4bf3fd0068a672c", "76780127914d5dc69a458eda5e471e65a5fd3dc9" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:17 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:17 2011 +0100" }, "message": "Merge branch \u0027picoxcell/soc\u0027 into next/soc\n" }, { "commit": "884897e6a10a86de0e611a76f4bf3fd0068a672c", "tree": "019689fb9d129404af1efba4df10975bc9e0a57a", "parents": [ "c72dbae971400e466ad9ff16c920cd6d9d8c55a1", "8b61f37440388ebbd2a894178fe098f2e70ab392" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:10 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:10 2011 +0100" }, "message": "Merge branch \u0027highbank/soc\u0027 into next/soc\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/gpio.h\n\tarch/arm/mach-omap2/board-generic.c\n\tarch/arm/plat-mxc/include/mach/gpio.h\n" }, { "commit": "b4beb4bf9934d151bf4581a54ae028927374cb2a", "tree": "28475f62b18784e1d10b05e901799d02c054587f", "parents": [ "f3c3f0670501fee130f22193369249deea8cc630", "3945fe9314af718946f71185901c28dd349469c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:07:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:07:19 2011 -0700" }, "message": "Merge branch \u0027for-linus/i2c-3.2\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/i2c-3.2\u0027 of git://git.fluff.org/bjdooks/linux: (47 commits)\n i2c-s3c2410: Add device tree support\n i2c-s3c2410: Keep a copy of platform data and use it\n i2c-nomadik: cosmetic coding style corrections\n i2c-au1550: dev_pm_ops conversion\n i2c-au1550: increase timeout waiting for master done\n i2c-au1550: remove unused ack_timeout\n i2c-au1550: remove usage of volatile keyword\n i2c-tegra: __iomem annotation fix\n i2c-eg20t: Add initialize processing in case i2c-error occurs\n i2c-eg20t: Fix flag setting issue\n i2c-eg20t: add stop sequence in case wait-event timeout occurs\n i2c-eg20t: Separate error processing\n i2c-eg20t: Fix 10bit access issue\n i2c-eg20t: Modify returned value s32 to long\n i2c-eg20t: Fix bus-idle waiting issue\n i2c-designware: Fix PCI core warning on suspend/resume\n i2c-designware: Add runtime power management support\n i2c-designware: Add support for Designware core behind PCI devices.\n i2c-designware: Push all register reads/writes into the core code.\n i2c-designware: Support multiple cores using same ISR\n ...\n" }, { "commit": "f3c3f0670501fee130f22193369249deea8cc630", "tree": "27ae58e4f338d571be93a7557ae7de48de10a947", "parents": [ "c18ae42aa5b3473c00f51b6937d0c00bdb6ce2d2", "0151546fb34e92494acd65ed84a603c2a4a90168" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:06:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:06:20 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://opensource.wolfsonmicro.com/regulator\n\n* \u0027for-linus\u0027 of git://opensource.wolfsonmicro.com/regulator: (22 commits)\n regulator: Constify constraints name\n regulator: Fix possible nullpointer dereference in regulator_enable()\n regulator: gpio-regulator add dependency on GENERIC_GPIO\n regulator: Add module.h include to gpio-regulator\n regulator: Add driver for gpio-controlled regulators\n regulator: remove duplicate REG_CTRL2 defines in tps65023\n regulator: Clarify documentation for regulator-regulator supplies\n regulator: Fix some bitrot in the machine driver documentation\n regulator: tps65023: Added support for the similiar TPS65020 chip\n regulator: tps65023: Setting correct core regulator for tps65021\n regulator: tps65023: Set missing bit for update core-voltage\n regulator: tps65023: Fixes i2c configuration issues\n regulator: Add debugfs file showing the supply map table\n regulator: tps6586x: add SMx slew rate setting\n regulator: tps65023: Fixes i2c configuration issues\n regulator: tps6507x: Remove num_voltages array\n regulator: max8952: removed unused mutex.\n regulator: fix regulator/consumer.h kernel-doc warning\n regulator: Ensure enough enable time for max8649\n regulator: 88pm8607: Fix off-by-one value range checking in the case of no id is matched\n ...\n" }, { "commit": "c18ae42aa5b3473c00f51b6937d0c00bdb6ce2d2", "tree": "327ca3f9c0a7eae6031eb1b610d48efa0940db87", "parents": [ "1c398651518c7e25a9fb3f08b456c73d5ca22469", "a572e688cf5d99d2382016c7241ec37b523b0137" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:02:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:02:38 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:\n firewire: ohci: fix isochronous DMA synchronization\n firewire: ohci: work around selfID junk due to wrong gap count\n firewire: net: Use posted writes\n firewire: use clamp and min3 macros\n firewire: ohci: optimize TSB41BA3D detection\n firewire: ohci: TSB41BA3D support tweaks\n firewire: ohci: Add support for TSB41BA3D phy\n firewire: ohci: Move code from the bus reset tasklet into a workqueue\n firewire: sbp2: fold two functions into one\n firewire: sbp2: move some code to more sensible places\n firewire: sbp2: remove obsolete reference counting\n" }, { "commit": "1c398651518c7e25a9fb3f08b456c73d5ca22469", "tree": "116ad4df5c8faa5f8e0d7982c479bf08ea01f2ec", "parents": [ "f470f8d4e702593ee1d0852871ad80373bce707b", "b238b8fa93353ab50c9a2b1e2fa47a0ab01c37cd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:52:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:52:29 2011 -0700" }, "message": "Merge branch \u0027pstore\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\n* \u0027pstore\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n pstore: make pstore write function return normal success/fail value\n pstore: change mutex locking to spin_locks\n pstore: defer inserting OOPS entries into pstore\n" }, { "commit": "f470f8d4e702593ee1d0852871ad80373bce707b", "tree": "85a67e65c5e5b9777639bd8f4c763a4cf8787e0e", "parents": [ "dc47d3810cdcb4f32bfa31d50f26af97aced0638", "504255f8d0480cf293962adf4bc3aecac645ae71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:51:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:51:38 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (62 commits)\n mlx4_core: Deprecate log_num_vlan module param\n IB/mlx4: Don\u0027t set VLAN in IBoE WQEs\u0027 control segment\n IB/mlx4: Enable 4K mtu for IBoE\n RDMA/cxgb4: Mark QP in error before disabling the queue in firmware\n RDMA/cxgb4: Serialize calls to CQ\u0027s comp_handler\n RDMA/cxgb3: Serialize calls to CQ\u0027s comp_handler\n IB/qib: Fix issue with link states and QSFP cables\n IB/mlx4: Configure extended active speeds\n mlx4_core: Add extended port capabilities support\n IB/qib: Hold links until tuning data is available\n IB/qib: Clean up checkpatch issue\n IB/qib: Remove s_lock around header validation\n IB/qib: Precompute timeout jiffies to optimize latency\n IB/qib: Use RCU for qpn lookup\n IB/qib: Eliminate divide/mod in converting idx to egr buf pointer\n IB/qib: Decode path MTU optimization\n IB/qib: Optimize RC/UC code by IB operation\n IPoIB: Use the right function to do DMA unmap pages\n RDMA/cxgb4: Use correct QID in insert_recv_cqe()\n RDMA/cxgb4: Make sure flush CQ entries are collected on connection close\n ...\n" }, { "commit": "504255f8d0480cf293962adf4bc3aecac645ae71", "tree": "5ae8663d2bc2eb9e796bfb689f3e462a14742e06", "parents": [ "2be6053318aa4f2787b7bc5cf5160017d7d1586b", "615eb715ae10cbaa8079ab8cacf8f4596be4087a", "f7cc25d018f1e9af6767ee7774bbe83452e9fdf4", "d32ae393dbf0daf778f9e33b0bc6591cd102391e", "a5e12dff757b562bbecd6a2359fdc4c43d4d97de", "3e60a77ea218d1915bdc9127f88ab866fd2ac643", "787adb9d6ad9afb498a1580a7d8ad05f779c488a", "caf6e3f221ddc12ccabd1cd0ba149561db0090d4", "cb29688aaa4caa4d54df2976118fe99a839bb433", "0f0bee8bbc2b3e49baa703118041f99db9ef41a1", "16d99812d58b8af2df29cd337a74cd965b53da04", "42849b2697c36abdafa6aef64186b15055392046" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 01 09:37:08 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 01 09:37:08 2011 -0700" }, "message": "Merge branches \u0027amso1100\u0027, \u0027cma\u0027, \u0027cxgb3\u0027, \u0027cxgb4\u0027, \u0027fdr\u0027, \u0027ipath\u0027, \u0027ipoib\u0027, \u0027misc\u0027, \u0027mlx4\u0027, \u0027misc\u0027, \u0027nes\u0027, \u0027qib\u0027 and \u0027xrc\u0027 into for-next\n" }, { "commit": "dc47d3810cdcb4f32bfa31d50f26af97aced0638", "tree": "f1574adeaae857d935ad9c2e08a19727e54ef14a", "parents": [ "f6d90b4f9ce018bff429d6e01ee672de712b8641", "5db017aa2809c49ca0a43b0f3ed1267e6be60883" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 09:24:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 09:24:41 2011 -0700" }, "message": "Merge git://github.com/herbertx/crypto\n\n* git://github.com/herbertx/crypto: (48 commits)\n crypto: user - Depend on NET instead of selecting it\n crypto: user - Add dependency on NET\n crypto: talitos - handle descriptor not found in error path\n crypto: user - Initialise match in crypto_alg_match\n crypto: testmgr - add twofish tests\n crypto: testmgr - add blowfish test-vectors\n crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT\n crypto: twofish-x86_64-3way - fix ctr blocksize to 1\n crypto: blowfish-x86_64 - fix ctr blocksize to 1\n crypto: whirlpool - count rounds from 0\n crypto: Add userspace report for compress type algorithms\n crypto: Add userspace report for cipher type algorithms\n crypto: Add userspace report for rng type algorithms\n crypto: Add userspace report for pcompress type algorithms\n crypto: Add userspace report for nivaead type algorithms\n crypto: Add userspace report for aead type algorithms\n crypto: Add userspace report for givcipher type algorithms\n crypto: Add userspace report for ablkcipher type algorithms\n crypto: Add userspace report for blkcipher type algorithms\n crypto: Add userspace report for ahash type algorithms\n ...\n" }, { "commit": "f6d90b4f9ce018bff429d6e01ee672de712b8641", "tree": "3fe57c005cece1d734ebb2b5dd23876fa3eb644e", "parents": [ "c87d5d594736dd8b56df67e31846c7d7b8c41a8f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Tue Nov 01 07:06:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 09:16:14 2011 -0700" }, "message": "sysfs: Make sysfs_rename safe with sysfs_dirents in rbtrees.\n\nIn sysfs_rename we need to remove the optimization of not calling\nsysfs_unlink_sibling and sysfs_link_sibling if the renamed parent\ndirectory is not changing. This optimization is no longer valid now\nthat sysfs dirents are stored in an rbtree sorted by name.\n\nMove the assignment of s_ns before the call of sysfs_link_sibling. With\nno sysfs_dirent fields changing after the call of sysfs_link_sibling\nthis allows sysfs_link_sibling to take any of the directory entries into\naccount when it builds the rbtrees, and s_ns looks like a prime canidate\nto be used in the rbtree in the future.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c72dbae971400e466ad9ff16c920cd6d9d8c55a1", "tree": "7a0ebba8b14d889a8b42edfa1272be222b908a82", "parents": [ "7e1efcf5d2039fb7a91e21df32f4175dbca4d61c", "b4cbb8a4e602ea77b0525d06eff89c6a6070dab3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 17:12:22 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 17:12:22 2011 +0100" }, "message": "Merge branch \u0027imx/devel\u0027 into next/dt\n\nThe board changes in the imx/devel branch conflict with other changes in\nthe device imx/dt branch.\n\nConflicts:\n\tarch/arm/mach-mx5/board-mx53_loco.c\n\tarch/arm/mach-mx5/board-mx53_smd.c\n\tarch/arm/plat-mxc/include/mach/common.h\n\tarch/arm/plat-mxc/include/mach/memory.h\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c87d5d594736dd8b56df67e31846c7d7b8c41a8f", "tree": "a4496b74b932e55b544d040af2668e68abcb1e56", "parents": [ "094803e0aab3fe75bbf8202a8f4b5280eaade375", "4e29198e1cd7728c30c96a8483a6068c71b34e4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:48:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:48:13 2011 -0700" }, "message": "Merge Qualcom Hexagon architecture\n\nThis is the fifth version of the patchset (with one tiny whitespace fix)\nto the Linux kernel to support the Qualcomm Hexagon architecture.\n\nBetween now and the next pull requests, Richard Kuo should have his key\nsigned, etc., and should be back on kernel.org. In the meantime, this\ngot merged as a emailed patch-series.\n\n* Hexagon: (36 commits)\n Add extra arch overrides to asm-generic/checksum.h\n Hexagon: Add self to MAINTAINERS\n Hexagon: Add basic stacktrace functionality for Hexagon architecture.\n Hexagon: Add configuration and makefiles for the Hexagon architecture.\n Hexagon: Comet platform support\n Hexagon: kgdb support files\n Hexagon: Add page-fault support.\n Hexagon: Add page table header files \u0026 etc.\n Hexagon: Add ioremap support\n Hexagon: Provide DMA implementation\n Hexagon: Implement basic TLB management routines for Hexagon.\n Hexagon: Implement basic cache-flush support\n Hexagon: Provide basic implementation and/or stubs for I/O routines.\n Hexagon: Add user access functions\n Hexagon: Add locking types and functions\n Hexagon: Add SMP support\n Hexagon: Provide basic debugging and system trap support.\n Hexagon: Add ptrace support\n Hexagon: Add time and timer functions\n Hexagon: Add interrupts\n ...\n" }, { "commit": "4e29198e1cd7728c30c96a8483a6068c71b34e4e", "tree": "780c0bb634c2161a89616eeb84d140d6ec641d3d", "parents": [ "4f4567cf4ff586e318aa1bc586a69570d64b162a" ], "author": { "name": "Linas Vepstas", "email": "linas@codeaurora.org", "time": "Mon Oct 31 18:56:59 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:21 2011 -0700" }, "message": "Add extra arch overrides to asm-generic/checksum.h\n\nThere are plausible reasons for architectures to provide their own\nversions of csum_partial_copy_nocheck and csum_tcpudp_magic.\nBy protecting these, the architecture can still re-use the\nasm-generic checksum.h, instead of copying it.\n\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4f4567cf4ff586e318aa1bc586a69570d64b162a", "tree": "6f508d53cf2de693506d2a9532c44ed8bec28bd1", "parents": [ "74d04d6ffd39274457eafa15022ab717e40cbc63" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:56:38 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:21 2011 -0700" }, "message": "Hexagon: Add self to MAINTAINERS\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "74d04d6ffd39274457eafa15022ab717e40cbc63", "tree": "f700ed0d1a1581bf3943d449307c1f796794b269", "parents": [ "e95bf452a9e22bd1c9ae23fea041989e0603c39d" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:56:19 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:21 2011 -0700" }, "message": "Hexagon: Add basic stacktrace functionality for Hexagon architecture.\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e95bf452a9e22bd1c9ae23fea041989e0603c39d", "tree": "fd18331fe343605c4d751237d191bdd258cd721c", "parents": [ "60e13231561b3a4c5269bfa1ef6c0569ad6f28ec" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:55:58 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:21 2011 -0700" }, "message": "Hexagon: Add configuration and makefiles for the Hexagon architecture.\n\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "60e13231561b3a4c5269bfa1ef6c0569ad6f28ec", "tree": "b190d63176258ab6055ab5ca0e11f324d4fe6f30", "parents": [ "0d71e8791f22f6b45c4fc56e7de64f83d7ed0ac7" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:55:25 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:21 2011 -0700" }, "message": "Hexagon: Comet platform support\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d71e8791f22f6b45c4fc56e7de64f83d7ed0ac7", "tree": "dbed9857d637d29c54ff5d7d5c8ce07705e569d7", "parents": [ "499236d9db5a349eeab2e9f2791e2d69c2e4ed53" ], "author": { "name": "Linas Vepstas", "email": "linas@codeaurora.org", "time": "Mon Oct 31 18:54:43 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:21 2011 -0700" }, "message": "Hexagon: kgdb support files\n\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "499236d9db5a349eeab2e9f2791e2d69c2e4ed53", "tree": "54520c8e5aa0558a78554127fe5dd4096e5b3558", "parents": [ "a7e79840991eac8da36f437c653ee4b8cfbdafdc" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:54:08 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Add page-fault support.\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a7e79840991eac8da36f437c653ee4b8cfbdafdc", "tree": "a673266d06a67c7f4f32b0e048848e752b6bb441", "parents": [ "b7f3785fbb3df3307290d4c236ffaa7ad172b6ed" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:53:38 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Add page table header files \u0026 etc.\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b7f3785fbb3df3307290d4c236ffaa7ad172b6ed", "tree": "7e6ff43046c437b1b280f5160b19bb63a8779c48", "parents": [ "65c3d7c525414d672c849d8696d6b8a3ebbae059" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:52:53 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Add ioremap support\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "65c3d7c525414d672c849d8696d6b8a3ebbae059", "tree": "7d55319ff4ff54c398aa1e1c6ee9c494ec898e8d", "parents": [ "5df87c1556515dfae504da342990821f407a8c99" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:52:22 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Provide DMA implementation\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5df87c1556515dfae504da342990821f407a8c99", "tree": "9cd922340f301d0ab18cf3280b5c1c9f2df5e4cb", "parents": [ "2d3cbc780437ae4e81f09d0efdd6769852bce5f5" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:52:00 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Implement basic TLB management routines for Hexagon.\n\nMostly all stubs, as the TLB is managed by the hypervisor.\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2d3cbc780437ae4e81f09d0efdd6769852bce5f5", "tree": "a38fc87be4886292edb863afc682c761c6ee0669", "parents": [ "013bf24c38293ca1142823d3c67a4aa4d90c6e66" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:50:51 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Implement basic cache-flush support\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "013bf24c38293ca1142823d3c67a4aa4d90c6e66", "tree": "fbae4d8bb2900a5dbcdec456eec85b31d169eb66", "parents": [ "7567746e1c0d66ac0ef8a9d8816ca694462c7370" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:48:50 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Provide basic implementation and/or stubs for I/O routines.\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7567746e1c0d66ac0ef8a9d8816ca694462c7370", "tree": "5812837c9a8024091e253496cbdbbe888c0f7ab9", "parents": [ "dd472da380c3819740d740cfd70b7f8e700e834b" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:48:07 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Add user access functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dd472da380c3819740d740cfd70b7f8e700e834b", "tree": "8d6dd638268cd46dae5fb8bf1c18f47f13db3031", "parents": [ "43afdf508386342d714f6911c1976f934b520cb0" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:47:33 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Add locking types and functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "43afdf508386342d714f6911c1976f934b520cb0", "tree": "de4acc7cca0990d28be24fa4f6779ef4e31945e5", "parents": [ "cf9750bae262dba73a6abaecd2ec3731ba7aef9c" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:46:34 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:20 2011 -0700" }, "message": "Hexagon: Add SMP support\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nReviewed-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cf9750bae262dba73a6abaecd2ec3731ba7aef9c", "tree": "6ea792d9508260a7f88b8c4dbceddaed224fe0d4", "parents": [ "39e89c9fc518215b3ae0f2c8523b7ce0e5ba9225" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:44:34 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Provide basic debugging and system trap support.\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "39e89c9fc518215b3ae0f2c8523b7ce0e5ba9225", "tree": "2a3d7a348c5fac49faec0681a3fc7f5aa3141383", "parents": [ "71e4a47f32f4e1e8ca7384433c2b9fcf478b963f" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:43:44 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Add ptrace support\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "71e4a47f32f4e1e8ca7384433c2b9fcf478b963f", "tree": "3e88b306ed224034e6d4d0f37c3acf905b3672f9", "parents": [ "2ac211bc423a0e62fe3ca3d78954de3174ae41f2" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:43:24 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Add time and timer functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ac211bc423a0e62fe3ca3d78954de3174ae41f2", "tree": "590c1226cf8cf1243ee5ff0c2640a348417288d1", "parents": [ "e03167b26b7fcffea11e82f5672472a23a88ffbc" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:42:51 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Add interrupts\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nReviewed-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e03167b26b7fcffea11e82f5672472a23a88ffbc", "tree": "fe0e156ad25c26944ae338447f7eb04fb16fc0ea", "parents": [ "4b30f9652ef0080ca351109220ca5bd617749365" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:42:28 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Add startup code\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4b30f9652ef0080ca351109220ca5bd617749365", "tree": "ee3c334468d61ff2778b65ae7a9f16df328dc98e", "parents": [ "cd5b61d6f4f07038677e4771972f401f7ace3f9b" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:41:49 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Add init_task and process functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd5b61d6f4f07038677e4771972f401f7ace3f9b", "tree": "5b8b8790d6efcc972e45596c2c0125cce84bd1e6", "parents": [ "98fb103694b4de1b24794211405b9e0c469ca816" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:41:21 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Add signal functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "98fb103694b4de1b24794211405b9e0c469ca816", "tree": "c64f11b42efd9e56964e0bfa2fe2afc0ddbb369b", "parents": [ "b39e293e1ded23f8ec086d5aeeb41a5ecc846aa6" ], "author": { "name": "Linas Vepstas", "email": "linas@codeaurora.org", "time": "Mon Oct 31 18:40:46 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Support dynamic module loading.\n\nModules should be compiled as ordinary .o\u0027s; shared objects are not\nsupported.\n\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b39e293e1ded23f8ec086d5aeeb41a5ecc846aa6", "tree": "d5d62e3f7dd0fa1baa782f1a76e747a32fb827c6", "parents": [ "e49ee2906c94cd6a339b2012c23e39d1a39f79e3" ], "author": { "name": "Linas Vepstas", "email": "linas@codeaurora.org", "time": "Mon Oct 31 18:40:19 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Export ksyms defined in assembly files.\n\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e49ee2906c94cd6a339b2012c23e39d1a39f79e3", "tree": "7680d806aa375de5a54e1ee72541bdff7c4201c6", "parents": [ "c150290df4f97d202d0913ff9cb0898032a803d7" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:39:14 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:19 2011 -0700" }, "message": "Hexagon: Add hypervisor interface\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c150290df4f97d202d0913ff9cb0898032a803d7", "tree": "8cc890ea53af56abd61a82cafa272185fcd9aa54", "parents": [ "075a46a049d4ec16925139d69b4473499fd14122" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:38:38 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add memcpy and memset accelerated functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "075a46a049d4ec16925139d69b4473499fd14122", "tree": "6e0f63f9e9e3f9fd22aa4db8fd843fda81a6691b", "parents": [ "b7840983e841e2870ff69f8e410e349c6b819b9f" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:38:04 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add checksum functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b7840983e841e2870ff69f8e410e349c6b819b9f", "tree": "633f9c518607190aab95f55960e3ea2d5ee0d584", "parents": [ "52f710249e2ec20f2d03fc31b7fb281126507097" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:37:20 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add delay functions\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "52f710249e2ec20f2d03fc31b7fb281126507097", "tree": "1871e9e03ddeb130af82d795d1961ef10e29d4fe", "parents": [ "99a70aa051d2aef6a91761c2230264cfcf20ae74" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:36:46 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add threadinfo\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "99a70aa051d2aef6a91761c2230264cfcf20ae74", "tree": "3944c62bdd83d6360f8e5198296a68489526e7f4", "parents": [ "b9398a84590be3a828c168ed25bf1fd3d637988a" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:36:04 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add processor and system headers\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b9398a84590be3a828c168ed25bf1fd3d637988a", "tree": "8467675f8d6787c7036beb3ddf599249a7903658", "parents": [ "750850189b2b7e43c03f33bf5741887e8ca07d16" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:35:16 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add syscalls\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "750850189b2b7e43c03f33bf5741887e8ca07d16", "tree": "ea5b45d48d910c778e52b2ea27d93c93863480c9", "parents": [ "a86a7ce30ac04cfd6775dc9a0114d9c3924e682a" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:28:13 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add atomic ops support\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a86a7ce30ac04cfd6775dc9a0114d9c3924e682a", "tree": "284ec1a0445d54532de8e70a02184e78e436a323", "parents": [ "8feca0e182d13914a0c4505488b36459f1532cea" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:27:45 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add bitops support\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8feca0e182d13914a0c4505488b36459f1532cea", "tree": "45a926ecd75b60435019bb7a3c0da512abaa5a83", "parents": [ "cd8e65fb96f3ce8eee91c2032720f0ba143627e1" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:27:03 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Core arch-specific header files\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd8e65fb96f3ce8eee91c2032720f0ba143627e1", "tree": "9263c3c7fec63b1f9a7d163ba17b584194764303", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Richard Kuo", "email": "rkuo@codeaurora.org", "time": "Mon Oct 31 18:26:34 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 07:34:18 2011 -0700" }, "message": "Hexagon: Add generic headers\n\nSigned-off-by: Richard Kuo \u003crkuo@codeaurora.org\u003e\nSigned-off-by: Linas Vepstas \u003clinas@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "df80442d1ee2902c2e39f90f18160f2e08d14c06", "tree": "e7c2080df1a5851e0c5353c48a211d9af91aae68", "parents": [ "8aca3ab5865f8cfbde841b6daf9442cc2279ced3", "0cdc8b921d68817b687755b4f6ae20cd8ff1d026" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 13:47:27 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 13:47:27 2011 +0100" }, "message": "Merge branch \u0027depends/rmk/memory_h\u0027 into next/cleanup2\n\nTheis resolves lots of simple conflicts between the omap\ncleanup and the mach/memory.h removal series.\n\nConflicts:\n\tarch/arm/mach-imx/mach-cpuimx27.c\n\tarch/arm/mach-omap1/board-ams-delta.c\n\tarch/arm/mach-omap1/board-generic.c\n\tarch/arm/mach-omap1/board-h2.c\n\tarch/arm/mach-omap1/board-h3.c\n\tarch/arm/mach-omap1/board-nokia770.c\n\tarch/arm/mach-omap1/board-osk.c\n\tarch/arm/mach-omap1/board-palmte.c\n\tarch/arm/mach-omap1/board-palmtt.c\n\tarch/arm/mach-omap1/board-palmz71.c\n\tarch/arm/mach-omap1/board-sx1.c\n\tarch/arm/mach-omap1/board-voiceblue.c\n\tarch/arm/mach-omap1/io.c\n\tarch/arm/mach-omap2/board-generic.c\n\tarch/arm/mach-omap2/io.c\n\tarch/arm/plat-omap/io.c\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "5db017aa2809c49ca0a43b0f3ed1267e6be60883", "tree": "eafc22f9a17e32578d95cfad8642137480ca5563", "parents": [ "ea8bdfcff17599e5d80f93e2ae194fbbab7f8d5e" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Nov 01 12:12:43 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Nov 01 12:12:43 2011 +1100" }, "message": "crypto: user - Depend on NET instead of selecting it\n\nSelecting NET causes all sorts of issues, including a dependency\nloop involving bluetooth. This patch makes it a dependency instead.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "3945fe9314af718946f71185901c28dd349469c7", "tree": "cd716993a757f6bf61c48a2f88ef4c286c5fa994", "parents": [ "be4af5dfa6d976ba579bae16ff8714b755d44dad", "8abf6fbbd22bc777fd4027cbc55e99cdfb7a8324", "5a5f50802f5a31b9e15de8df40d5621af970a560", "f533c61e1921b93aa247d72d39c3fbe045340a9a" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:54:17 2011 +0000" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:54:17 2011 +0000" }, "message": "Merge branches \u0027for-32/i2c/nomadik\u0027, \u0027for-32/i2c/s3c2410-dt\u0027 and \u0027for-32/i2c/tegra-iomem\u0027 into for-linus/i2c-3.2\n" }, { "commit": "be4af5dfa6d976ba579bae16ff8714b755d44dad", "tree": "edecd9bd4757a4fe7bdf4dc13e087d6a174fdc12", "parents": [ "ce0fda16084905d035e8ceb51cf42740ad781b15", "4311051c358ad0e66b68934e7a33cf10ba533466" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:52:53 2011 +0000" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:52:53 2011 +0000" }, "message": "Merge branch \u0027for-32/i2c/irqflags\u0027 into for-linus/i2c-3.2\n\nConflicts:\n\tdrivers/i2c/busses/i2c-designware-core.c\n\nFixed up merge conflic\n" }, { "commit": "ce0fda16084905d035e8ceb51cf42740ad781b15", "tree": "dd94ce9468c16b72a9e6cf6e0ce8ac7b1d7530c9", "parents": [ "c9c7ae40660f5983854f73b6ae65f208e9a15082", "dfcd04b19d16c0016c705ed96a8b3cfa5315a2e9", "24597bf8012cf3fa5703c38e1bb13df3118d7588", "52c2843322362bfd847bdda1d3cebc751de68e5b", "46f344e2a0844d9b068bffa38cb48b52f4bd2d4a" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:50:09 2011 +0000" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:50:09 2011 +0000" }, "message": "Merge branches \u0027for-32/i2c/omap-v4\u0027, \u0027for-32/i2c/imx-dt\u0027, \u0027for-32/i2c/eg20t-v4\u0027, \u0027for-32/i2c/designware-v5\u0027 and \u0027for-32/i2c/au1550\u0027 into for-linus/i2c-3.2\n" }, { "commit": "094803e0aab3fe75bbf8202a8f4b5280eaade375", "tree": "278528ca9245a767fcfcfa97d977bd5714c082fd", "parents": [ "32087d4eeca14b82660dab288b1d659963b954bd", "d8805e633e054c816c47cb6e727c81f156d9253d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:46:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:46:07 2011 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s incoming)\n\nQuoth Andrew:\n\n - Most of MM. Still waiting for the poweroc guys to get off their\n butts and review some threaded hugepages patches.\n\n - alpha\n\n - vfs bits\n\n - drivers/misc\n\n - a few core kerenl tweaks\n\n - printk() features\n\n - MAINTAINERS updates\n\n - backlight merge\n\n - leds merge\n\n - various lib/ updates\n\n - checkpatch updates\n\n* akpm: (127 commits)\n epoll: fix spurious lockdep warnings\n checkpatch: add a --strict check for utf-8 in commit logs\n kernel.h/checkpatch: mark strict_strto\u003cfoo\u003e and simple_strto\u003cfoo\u003e as obsolete\n llist-return-whether-list-is-empty-before-adding-in-llist_add-fix\n wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack\n fat: follow rename pack_hex_byte() to hex_byte_pack()\n security: follow rename pack_hex_byte() to hex_byte_pack()\n kgdb: follow rename pack_hex_byte() to hex_byte_pack()\n lib: rename pack_hex_byte() to hex_byte_pack()\n lib/string.c: fix strim() semantics for strings that have only blanks\n lib/idr.c: fix comment for ida_get_new_above()\n lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef\n lib/bitmap.c: quiet sparse noise about address space\n lib/spinlock_debug.c: print owner on spinlock lockup\n lib/kstrtox: common code between kstrto*() and simple_strto*() functions\n drivers/leds/leds-lp5521.c: check if reset is successful\n leds: turn the blink_timer off before starting to blink\n leds: save the delay values after a successful call to blink_set()\n drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing\n drivers/leds/leds-lm3530.c: add __devexit_p where needed\n ...\n" }, { "commit": "d8805e633e054c816c47cb6e727c81f156d9253d", "tree": "8f7151e635a38593d68eae40586449627d835965", "parents": [ "15662b3e8644905032c2e26808401a487d4e90c1" ], "author": { "name": "Nelson Elhage", "email": "nelhage@nelhage.com", "time": "Mon Oct 31 17:13:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:57 2011 -0700" }, "message": "epoll: fix spurious lockdep warnings\n\nepoll can acquire recursively acquire ep-\u003emtx on multiple \"struct\neventpoll\"s at once in the case where one epoll fd is monitoring another\nepoll fd. This is perfectly OK, since we\u0027re careful about the lock\nordering, but it causes spurious lockdep warnings. Annotate the recursion\nusing mutex_lock_nested, and add a comment explaining the nesting rules\nfor good measure.\n\nRecent versions of systemd are triggering this, and it can also be\ndemonstrated with the following trivial test program:\n\n--------------------8\u003c--------------------\n\nint main(void) {\n int e1, e2;\n struct epoll_event evt \u003d {\n .events \u003d EPOLLIN\n };\n\n e1 \u003d epoll_create1(0);\n e2 \u003d epoll_create1(0);\n epoll_ctl(e1, EPOLL_CTL_ADD, e2, \u0026evt);\n return 0;\n}\n--------------------8\u003c--------------------\n\nReported-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nTested-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Nelson Elhage \u003cnelhage@nelhage.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: \u003cstable@kernel.org\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" } ], "next": "15662b3e8644905032c2e26808401a487d4e90c1" }