)]}' { "log": [ { "commit": "321e68b095addc473ca52ced9acfa59be88f76e6", "tree": "43fed76c347373b651692b275f4152dcaf72eb21", "parents": [ "84c15027a7f2fbd7f1180d7cbb60e41abbbaedd2" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Fri Jun 03 16:58:47 2011 +0200" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 14 22:48:47 2011 -0400" }, "message": "tracing, function_graph: Remove dependency of abstime and duration fields on latency\n\nThe display of absolute time and duration fields is based on the\nlatency field. This was added during the irqsoff/wakeup tracers\ngraph support changes.\n\nIt\u0027s causing confusion in what fields will be displayed for the\nfunction_graph tracer itself. So I\u0027m removing this depency, and\nadding absolute time and duration fields to the preemptirqsoff\npreemptoff irqsoff wakeup tracers.\n\nWith following commands:\n\t# echo function_graph \u003e ./current_tracer\n\t# cat trace\n\nThis is what it looked like before:\n# tracer: function_graph\n#\n# TIME CPU DURATION FUNCTION CALLS\n# | | | | | | | |\n 0) 0.068 us | } /* page_add_file_rmap */\n 0) | _raw_spin_unlock() {\n...\n\nThis is what it looks like now:\n# tracer: function_graph\n#\n# CPU DURATION FUNCTION CALLS\n# | | | | | | |\n 0) 0.068 us | } /* add_preempt_count */\n 0) 0.993 us | } /* vfsmount_lock_local_lock */\n...\n\nFor preemptirqsoff preemptoff irqsoff wakeup tracers,\nthis is what it looked like before:\nSNIP\n# _-----\u003d\u003e irqs-off\n# / _----\u003d\u003e need-resched\n# | / _---\u003d\u003e hardirq/softirq\n# || / _--\u003d\u003e preempt-depth\n# ||| / _-\u003d\u003e lock-depth\n# |||| /\n# CPU TASK/PID ||||| DURATION FUNCTION CALLS\n# | | | ||||| | | | | | |\n 1) \u003cidle\u003e-0 | d..1 0.000 us | acpi_idle_enter_simple();\n...\n\nThis is what it looks like now:\nSNIP\n#\n# _-----\u003d\u003e irqs-off\n# / _----\u003d\u003e need-resched\n# | / _---\u003d\u003e hardirq/softirq\n# || / _--\u003d\u003e preempt-depth\n# ||| /\n# TIME CPU TASK/PID |||| DURATION FUNCTION CALLS\n# | | | | |||| | | | | | |\n 19.847735 | 1) \u003cidle\u003e-0 | d..1 0.000 us | acpi_idle_enter_simple();\n...\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nLink: http://lkml.kernel.org/r/1307113131-10045-2-git-send-email-jolsa@redhat.com\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "84c15027a7f2fbd7f1180d7cbb60e41abbbaedd2", "tree": "178205c66fe01998b9eb72a3fca17dd72682f032", "parents": [ "bd38c0e6f98326132a691d73b2056b426423c638" ], "author": { "name": "Paul McQuade", "email": "tungstentide@gmail.com", "time": "Tue May 31 20:51:55 2011 +0100" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 14 22:48:46 2011 -0400" }, "message": "async: Fixed an include coding style issue\n\nAdded \u003clinux/atomic.h\u003e,\u003clinux/ktime.h\u003e and Removed \u003casm/atomic.h\u003e.\nAdded KERN_DEBUG to printk() functions.\n\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nSigned-off-by: Paul McQuade \u003ctungstentide@gmail.com\u003e\nLink: http://lkml.kernel.org/r/4DE596B4.7030904@gmail.com\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "bd38c0e6f98326132a691d73b2056b426423c638", "tree": "4e7f9a0efcfdb23e564db51da275fd9234ffa84f", "parents": [ "cf30cf67d6c7592c670ec946d89fc15ee0deb0eb" ], "author": { "name": "Paul McQuade", "email": "tungstentide@gmail.com", "time": "Tue May 31 20:51:55 2011 +0100" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 14 22:48:45 2011 -0400" }, "message": "ftrace: Fixed an include coding style issue\n\nRemoved \u003casm/ftrace.h\u003e because \u003clinux/ftrace.h\u003e was already declared.\nBraces of struct\u0027s coding style fixed.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Paul McQuade \u003ctungstentide@gmail.com\u003e\nLink: http://lkml.kernel.org/r/4DE59711.3090900@gmail.com\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "cf30cf67d6c7592c670ec946d89fc15ee0deb0eb", "tree": "f86ca612b255ee8570e2fd6198e066ea8cf33fe0", "parents": [ "4f271a2a60c748599b30bb4dafff30d770439b96" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Jun 14 22:44:07 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 14 22:48:45 2011 -0400" }, "message": "tracing: Add disable_on_free option\n\nAdd a trace option to disable tracing on free. When this option is\nset, a write into the free_buffer file will not only shrink the\nring buffer down to zero, but it will also disable tracing.\n\nCc: Vaibhav Nagarnaik \u003cvnagarnaik@google.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "4f271a2a60c748599b30bb4dafff30d770439b96", "tree": "4b6aa671e0fbe3e81a423a551ce5aa1032725e2b", "parents": [ "7ea5906405a1f3fc1c0033dfd7e02f2cfd1de5e5" ], "author": { "name": "Vaibhav Nagarnaik", "email": "vnagarnaik@google.com", "time": "Mon Jun 13 17:51:57 2011 -0700" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 14 22:48:37 2011 -0400" }, "message": "tracing: Add a proc file to stop tracing and free buffer\n\nThe proc file entry buffer_size_kb is used to set the size of tracing\nbuffer. The memory to expand the buffer size is kernel memory. Consider\na use case where tracing is handled by a user space utility, which acts\nas a gate keeper for tracing requests. In an OOM condition, tracing is\nconsidered a low priority task and if the utility gets killed the ring\nbuffer memory cannot be released back to the kernel.\n\nThis patch adds a proc file called \"free_buffer\" whose purpose is to\nstop tracing and free up the ring buffer when it is closed.\n\nThe user space process can then set the desired size in buffer_size_kb\nfile and open the fd to the \"free_buffer\" file. Under OOM condition, if\nthe process gets killed, the kernel closes the file descriptor. The\nrelease handler stops the tracing and releases the kernel memory\nautomatically.\n\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Michael Rubin \u003cmrubin@google.com\u003e\nCc: David Sharp \u003cdhsharp@google.com\u003e\nSigned-off-by: Vaibhav Nagarnaik \u003cvnagarnaik@google.com\u003e\nLink: http://lkml.kernel.org/r/1308012717-11148-1-git-send-email-vnagarnaik@google.com\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "7ea5906405a1f3fc1c0033dfd7e02f2cfd1de5e5", "tree": "f75e962db25ccd3efa81e1fc69ce3e60d228c7a6", "parents": [ "e7e2ee89a9dbf48d70a922d5625cd7320a27cbff" ], "author": { "name": "Vaibhav Nagarnaik", "email": "vnagarnaik@google.com", "time": "Tue May 03 17:56:42 2011 -0700" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 14 22:04:39 2011 -0400" }, "message": "tracing: Use NUMA allocation for per-cpu ring buffer pages\n\nThe tracing ring buffer is a group of per-cpu ring buffers where\nallocation and logging is done on a per-cpu basis. The events that are\ngenerated on a particular CPU are logged in the corresponding buffer.\nThis is to provide wait-free writes between CPUs and good NUMA node\nlocality while accessing the ring buffer.\n\nHowever, the allocation routines consider NUMA locality only for buffer\npage metadata and not for the actual buffer page. This causes the pages\nto be allocated on the NUMA node local to the CPU where the allocation\nroutine is running at the time.\n\nThis patch fixes the problem by using a NUMA node specific allocation\nroutine so that the pages are allocated from a NUMA node local to the\nlogging CPU.\n\nI tested with the getuid_microbench from autotest. It is a simple binary\nthat calls getuid() in a loop and measures the average time for the\nsyscall to complete. The following command was used to test:\n$ getuid_microbench 1000000\n\nCompared the numbers found on kernel with and without this patch and\nfound that logging latency decreases by 30-50 ns/call.\ntracing with non-NUMA allocation - 569 ns/call\ntracing with NUMA allocation - 512 ns/call\n\nSigned-off-by: Vaibhav Nagarnaik \u003cvnagarnaik@google.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Michael Rubin \u003cmrubin@google.com\u003e\nCc: David Sharp \u003cdhsharp@google.com\u003e\nLink: http://lkml.kernel.org/r/1304470602-20366-1-git-send-email-vnagarnaik@google.com\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "e7e2ee89a9dbf48d70a922d5625cd7320a27cbff", "tree": "58a5d3387c7b0bf9a4f434867234c0771c22addb", "parents": [ "b58f6b0dd3d677338b9065388cc2cc942b86338e" ], "author": { "name": "Vaibhav Nagarnaik", "email": "vnagarnaik@google.com", "time": "Tue May 10 13:27:21 2011 -0700" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 14 21:59:41 2011 -0400" }, "message": "tracing: Schedule a delayed work to call wakeup()\n\nIn using syscall tracing by concurrent processes, the wakeup() that is\ncalled in the event commit function causes contention on the spin lock\nof the waitqueue. I enabled sys_enter_getuid and sys_exit_getuid\ntracepoints, and by running getuid_microbench from autotest in parallel\nI found that the contention causes exponential latency increase in the\ntracing path.\n\nThe autotest binary getuid_microbench calls getuid() in a tight loop for\nthe given number of iterations and measures the average time required to\ncomplete a single invocation of syscall.\n\nThe patch schedules a delayed work after 2 ms once an event commit calls\nto wake up the trace wait_queue. This removes the delay caused by\ncontention on spin lock in wakeup() and amortizes the wakeup() calls\nscheduled over the 2 ms period.\n\nIn the following example, the script enables the sys_enter_getuid and\nsys_exit_getuid tracepoints and runs the getuid_microbench in parallel\nwith the given number of processes. The output clearly shows the latency\nincrease caused by contentions.\n\n$ ~/getuid.sh 1\n1000000 calls in 0.720974253 s (720.974253 ns/call)\n\n$ ~/getuid.sh 2\n1000000 calls in 1.166457554 s (1166.457554 ns/call)\n1000000 calls in 1.168933765 s (1168.933765 ns/call)\n\n$ ~/getuid.sh 3\n1000000 calls in 1.783827516 s (1783.827516 ns/call)\n1000000 calls in 1.795553270 s (1795.553270 ns/call)\n1000000 calls in 1.796493376 s (1796.493376 ns/call)\n\n$ ~/getuid.sh 4\n1000000 calls in 4.483041796 s (4483.041796 ns/call)\n1000000 calls in 4.484165388 s (4484.165388 ns/call)\n1000000 calls in 4.484850762 s (4484.850762 ns/call)\n1000000 calls in 4.485643576 s (4485.643576 ns/call)\n\n$ ~/getuid.sh 5\n1000000 calls in 6.497521653 s (6497.521653 ns/call)\n1000000 calls in 6.502000236 s (6502.000236 ns/call)\n1000000 calls in 6.501709115 s (6501.709115 ns/call)\n1000000 calls in 6.502124100 s (6502.124100 ns/call)\n1000000 calls in 6.502936358 s (6502.936358 ns/call)\n\nAfter the patch, the latencies scale better.\n1000000 calls in 0.728720455 s (728.720455 ns/call)\n\n1000000 calls in 0.842782857 s (842.782857 ns/call)\n1000000 calls in 0.883803135 s (883.803135 ns/call)\n\n1000000 calls in 0.902077764 s (902.077764 ns/call)\n1000000 calls in 0.902838202 s (902.838202 ns/call)\n1000000 calls in 0.908896885 s (908.896885 ns/call)\n\n1000000 calls in 0.932523515 s (932.523515 ns/call)\n1000000 calls in 0.958009672 s (958.009672 ns/call)\n1000000 calls in 0.986188020 s (986.188020 ns/call)\n1000000 calls in 0.989771102 s (989.771102 ns/call)\n\n1000000 calls in 0.933518391 s (933.518391 ns/call)\n1000000 calls in 0.958897947 s (958.897947 ns/call)\n1000000 calls in 1.031038897 s (1031.038897 ns/call)\n1000000 calls in 1.089516025 s (1089.516025 ns/call)\n1000000 calls in 1.141998347 s (1141.998347 ns/call)\n\nSigned-off-by: Vaibhav Nagarnaik \u003cvnagarnaik@google.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Michael Rubin \u003cmrubin@google.com\u003e\nCc: David Sharp \u003cdhsharp@google.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/1305059241-7629-1-git-send-email-vnagarnaik@google.com\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "b58f6b0dd3d677338b9065388cc2cc942b86338e", "tree": "1c10cd87480b3c05b100fb4d85afaecfe2dd5b1b", "parents": [ "3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Tue Jun 07 00:23:28 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jun 07 13:02:41 2011 +0200" }, "message": "perf, core: Fix initial task_ctx/event installation\n\nA lost Quilt refresh of 2c29ef0fef8 (perf: Simplify and fix\n__perf_install_in_context()) is causing grief and lockups,\nreported by Jiri Olsa.\n\nWhen installing an event in a task context, there\u0027s a number of\nissues:\n\n - there might not be an existing task context, in which case\n we should install the now current context;\n\n - there might already be a context, not the current one, in\n which case we should de-schedule the old and install the new;\n\nthese cases were dealt with in the lost refresh, however there is one\nfurther case that was found in testing:\n\n - there might already be a context, the current one, in which\n case we should still de-schedule, and should take care\n to re-install it (note that task_ctx_sched_out() clears\n cpuctx-\u003etask_ctx).\n\nReported-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1307399008.2497.971.camel@laptop\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4", "tree": "58fbef582846fef0e777b1a552aca12e21a071b1", "parents": [ "aef29bf20bd79c73992ab23d5067e9f0448b466e", "aa4a221875873d2a1f9656cb7fd7e545e952b4fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jun 04 12:28:05 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jun 04 12:28:05 2011 +0200" }, "message": "Merge branch \u0027perf/urgent\u0027 into perf/core\n\nConflicts:\n\ttools/perf/util/python.c\n\nMerge reason: resolve the conflict with perf/urgent.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "aa4a221875873d2a1f9656cb7fd7e545e952b4fa", "tree": "44f66345c06c94cfc95d17b337d45e09917e475d", "parents": [ "710054ba25c0d1f8f41c22ce13ba336503fb5318" ], "author": { "name": "Vince Weaver", "email": "vweaver1@eecs.utk.edu", "time": "Fri Jun 03 17:54:40 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jun 04 12:22:04 2011 +0200" }, "message": "perf: Comment /proc/sys/kernel/perf_event_paranoid to be part of user ABI\n\nTurns out that distro packages use this file as an indicator of\nthe perf event subsystem - this is easier to check for from scripts\nthan the existence of the system call.\n\nThis is easy enough to keep around for the kernel, so add a\ncomment to make sure it stays so.\n\nSigned-off-by: Vince Weaver \u003cvweaver1@eecs.utk.edu\u003e\nCc: David Ahern \u003cdsahern@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: paulus@samba.org\nCc: acme@redhat.com\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/alpine.DEB.2.00.1106031751170.29381@cl320.eecs.utk.edu\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "710054ba25c0d1f8f41c22ce13ba336503fb5318", "tree": "f9b09b722bf511841539173d946f90a20fc2e59a", "parents": [ "74c355fbdfedd3820046dba4f537876cea54c207", "b273fa9716aa1564bee88ceee62f9042981cdc81" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jun 04 12:13:06 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jun 04 12:13:06 2011 +0200" }, "message": "Merge branch \u0027perf/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent\n" }, { "commit": "b273fa9716aa1564bee88ceee62f9042981cdc81", "tree": "06535a98fdf11d5a680d22a91b3013b412ca56f1", "parents": [ "56722381b8506733852c44dacf6d7bc5f90aedaf" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Mar 31 18:27:42 2011 +0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Jun 03 10:09:22 2011 -0300" }, "message": "perf python: Fix argument name list of read_on_cpu()\n\nMandatory arguments need to be present in the argument name list, as\nwell as optional arguments, otherwise python barfs:\n\n\t# ./python/twatch.py\n\tTraceback (most recent call last):\n\t File \"./python/twatch.py\", line 41, in \u003cmodule\u003e\n\t main()\n\t File \"./python/twatch.py\", line 32, in main\n\t event \u003d evlist.read_on_cpu(cpu)\n\tRuntimeError: more argument specifiers than keyword list entries\n\nHence, add cpu to the name list.\n\nCc: David Ahern \u003cdaahern@cisco.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nCc: Tom Zanussi \u003ctzanussi@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1301588863-20210-1-git-send-email-fweisbec@gmail.com\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "56722381b8506733852c44dacf6d7bc5f90aedaf", "tree": "867f605305c4e4fa94cea3eacaeb7e1b9ba62bdc", "parents": [ "9c850d6c4b95bb07fb066eb7f43dd4e3b4842b85" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 11:04:54 2011 -0300" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Jun 03 10:07:52 2011 -0300" }, "message": "perf evlist: Don\u0027t die if sample_{id_all|type} is invalid\n\nFixes two more cases where the python binding would not load:\n\n. Not finding die(), which it shouldn\u0027t anyway, not good to just stop the\n world because some particular perf.data file is invalid, just propagate\n the error to the caller.\n\n. Not finding perf_sample_size: fix it by moving it from event.c to evsel,\n where it belongs, as most cases are moving to operate on an evsel object.o\n\nOne of the fixed problems:\n\n[root@emilia ~]# python\n\u003e\u003e\u003e import perf\nTraceback (most recent call last):\n File \"\u003cstdin\u003e\", line 1, in \u003cmodule\u003e\nImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: perf_sample_size\n\u003e\u003e\u003e\n[root@emilia ~]#\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nLink: http://lkml.kernel.org/n/tip-1hkj7b2cvgbfnoizsekjb6c9@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "9c850d6c4b95bb07fb066eb7f43dd4e3b4842b85", "tree": "5f6429b7558b215593f274b061c2979196df877a", "parents": [ "d21cc9f67d689effbfd24bac878bc2c057de8c46" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 10:55:10 2011 -0300" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Jun 03 10:07:01 2011 -0300" }, "message": "perf python: Use exception to propagate errors\n\nWe were using pr_debug to tell the user about not being able to parse a sample\nwhere we should really use the python way of reporting errors: exceptions.\n\nFixes this problem:\n\n[root@emilia ~]# python\n\u003e\u003e\u003e import perf\nTraceback (most recent call last):\n File \"\u003cstdin\u003e\", line 1, in \u003cmodule\u003e\nImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: eprintf\n\u003e\u003e\u003e\n[root@emilia ~]\n\nAs we want to keep the objects linked in the python binding (and in the future\nin a shared library) minimal.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nLink: http://lkml.kernel.org/n/tip-m9dba9kaluas0kq8r58z191c@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "d21cc9f67d689effbfd24bac878bc2c057de8c46", "tree": "24b0f76ac764ca708923045dbe617875a9a09ea2", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 10:39:43 2011 -0300" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Jun 03 10:05:23 2011 -0300" }, "message": "perf evlist: Remove dependency on debug routines\n\nSo far we avoided having to link debug.o in the python binding, keep it\nthat way by not using ui__warning() in evlist.c.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nLink: http://lkml.kernel.org/n/tip-4wtew8hd3g7ejnlehtspys2t@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "aef29bf20bd79c73992ab23d5067e9f0448b466e", "tree": "3eaab6efdc123e13e688a8150c8b57e128982da4", "parents": [ "27eb4a1e4a56afacb0540c24084b9e0342f9956b", "7cec0922389e080d11ec43dd23aa778e136bd1e1" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 03 10:43:03 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 03 10:43:03 2011 +0200" }, "message": "Merge branch \u0027perf/core\u0027 of ssh://k/pub/scm/linux/kernel/git/acme/linux into perf/core\n" }, { "commit": "27eb4a1e4a56afacb0540c24084b9e0342f9956b", "tree": "85bd26c6d7cdee8ee4c2d69d195f3e2bdbbc54fe", "parents": [ "64ce312618ef0e11d88def80effcefd1b59fdb1e", "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 03 10:41:03 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 03 10:41:08 2011 +0200" }, "message": "Merge commit \u0027v3.0-rc1\u0027 into perf/core\n\nMerge reason: merge in the latest fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7cec0922389e080d11ec43dd23aa778e136bd1e1", "tree": "0d772b32f38b4ef16e4256711e947b38baa2c2f9", "parents": [ "610723f24eeb842025178a6722fa9108c4e157b6" ], "author": { "name": "David Ahern", "email": "dsahern@gmail.com", "time": "Mon May 30 13:08:23 2011 -0600" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 13:31:01 2011 -0300" }, "message": "perf script: Add printing of sample address\n\nResolve to a function or variable if possible and if the sym option is\nenabled.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/1306782503-22002-1-git-send-email-dsahern@gmail.com\nSigned-off-by: David Ahern \u003cdsahern@gmail.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "610723f24eeb842025178a6722fa9108c4e157b6", "tree": "e184c3b2242ba9b9da065221d4673603dd9d8e86", "parents": [ "787bef174f055343c69a9639e6e05a564980ed4c" ], "author": { "name": "David Ahern", "email": "dsahern@gmail.com", "time": "Fri May 27 14:28:44 2011 -0600" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 13:29:14 2011 -0300" }, "message": "perf script: Make printing of dso a separate field option\n\nThe \u0027sym\u0027 option displays both the function name and the DSO it comes\nfrom. Split the display of the dso into a separate option. This allows\ndisplay of the ip address and symbol without the dso, thus shortening\nline lengths - and decluttering the output a bit.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/1306528124-25861-3-git-send-email-dsahern@gmail.com\nSigned-off-by: David Ahern \u003cdsahern@gmail.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "787bef174f055343c69a9639e6e05a564980ed4c", "tree": "d37e4fae03454e74684798bc112ba161786f978a", "parents": [ "2cee77c4505fc581f41b44e18ffc0953b67a414c" ], "author": { "name": "David Ahern", "email": "dsahern@gmail.com", "time": "Fri May 27 14:28:43 2011 -0600" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 13:28:34 2011 -0300" }, "message": "perf script: \"sym\" field really means show IP data\n\nCurrently the \"sym\" output field is used to dump instruction pointers\nand callchain stack. Sample addresses can also be converted to symbols,\nso the meaning of \"sym\" needs to be fixed. This patch adds an \"ip\"\noption and if it is selected the user can also opt to dump symbols for\nthem. If the user opts to dump IP without syms only the address is\nshown.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/1306528124-25861-2-git-send-email-dsahern@gmail.com\nSigned-off-by: David Ahern \u003cdsahern@gmail.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "2cee77c4505fc581f41b44e18ffc0953b67a414c", "tree": "12777ada659829082c27a1da31a295387355fd4b", "parents": [ "64348153c63b8c1f99f19f14a9c3cbd5df70c9d3" ], "author": { "name": "David Ahern", "email": "dsahern@gmail.com", "time": "Mon May 30 08:55:59 2011 -0600" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 13:26:15 2011 -0300" }, "message": "perf stat: clarify unsupported events from uncounted events\n\nperf stat continues running even if the event list contains counters\nthat are not supported. The resulting output then contains \u003cnot counted\u003e\nfor those events which gets confusing as to which events are supported,\nbut not counted and which are not supported.\n\nBefore:\n\nperf stat -ddd -- sleep 1\n\n Performance counter stats for \u0027sleep 1\u0027:\n\n 0.571283 task-clock # 0.001 CPUs utilized\n 1 context-switches # 0.002 M/sec\n 0 CPU-migrations # 0.000 M/sec\n 157 page-faults # 0.275 M/sec\n 1,037,707 cycles # 1.816 GHz\n \u003cnot counted\u003e stalled-cycles-frontend\n \u003cnot counted\u003e stalled-cycles-backend\n 654,499 instructions # 0.63 insns per cycle\n 136,129 branches # 238.286 M/sec\n \u003cnot counted\u003e branch-misses\n \u003cnot counted\u003e L1-dcache-loads\n \u003cnot counted\u003e L1-dcache-load-misses\n \u003cnot counted\u003e LLC-loads\n \u003cnot counted\u003e LLC-load-misses\n \u003cnot counted\u003e L1-icache-loads\n \u003cnot counted\u003e L1-icache-load-misses\n \u003cnot counted\u003e dTLB-loads\n \u003cnot counted\u003e dTLB-load-misses\n \u003cnot counted\u003e iTLB-loads\n \u003cnot counted\u003e iTLB-load-misses\n \u003cnot counted\u003e L1-dcache-prefetches\n \u003cnot counted\u003e L1-dcache-prefetch-misses\n\n 1.001004836 seconds time elapsed\n\nAfter:\n\nperf stat -ddd -- sleep 1\n\n Performance counter stats for \u0027sleep 1\u0027:\n\n 1.350326 task-clock # 0.001 CPUs utilized\n 2 context-switches # 0.001 M/sec\n 0 CPU-migrations # 0.000 M/sec\n 157 page-faults # 0.116 M/sec\n 11,986 cycles # 0.009 GHz\n \u003cnot supported\u003e stalled-cycles-frontend\n \u003cnot supported\u003e stalled-cycles-backend\n 496,986 instructions # 41.46 insns per cycle\n 138,065 branches # 102.246 M/sec\n 7,245 branch-misses # 5.25% of all branches\n \u003cnot counted\u003e L1-dcache-loads\n \u003cnot counted\u003e L1-dcache-load-misses\n \u003cnot counted\u003e LLC-loads\n \u003cnot counted\u003e LLC-load-misses\n \u003cnot counted\u003e L1-icache-loads\n \u003cnot counted\u003e L1-icache-load-misses\n \u003cnot counted\u003e dTLB-loads\n \u003cnot counted\u003e dTLB-load-misses\n \u003cnot counted\u003e iTLB-loads\n \u003cnot counted\u003e iTLB-load-misses\n \u003cnot counted\u003e L1-dcache-prefetches\n \u003cnot supported\u003e L1-dcache-prefetch-misses\n\n 1.002397333 seconds time elapsed\n\nv1-\u003ev2:\nchanged supported type from int to bool\n\nv2-\u003ev3\nfixed vertical alignment of new struct element\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/1306767359-13221-1-git-send-email-dsahern@gmail.com\nSigned-off-by: David Ahern \u003cdsahern@gmail.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "64348153c63b8c1f99f19f14a9c3cbd5df70c9d3", "tree": "c1bee41565096fb2adce58125a9c936a26fa6fe4", "parents": [ "e95cc02880947e9f77540b03e166470e8ac14cbc" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Mar 31 18:27:43 2011 +0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 13:21:26 2011 -0300" }, "message": "perf python: Cleanup useless double NULL termination in method arg names\n\nThe list of methods argument names only needs to be NULL terminated\nonce. Remove the second ones.\n\nCc: David Ahern \u003cdaahern@cisco.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nCc: Tom Zanussi \u003ctzanussi@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1301588863-20210-2-git-send-email-fweisbec@gmail.com\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "e95cc02880947e9f77540b03e166470e8ac14cbc", "tree": "500dca257ad17c606e96bd28d3f0d2aaedff9996", "parents": [ "c2a70653af45c9cbb0cab900e8931b062e57b1ae" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Mar 31 18:27:42 2011 +0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 13:21:07 2011 -0300" }, "message": "perf python: Fix argument name list of read_on_cpu()\n\nMandatory arguments need to be present in the argument name list, as\nwell as optional arguments, otherwise python barfs:\n\n\t# ./python/twatch.py\n\tTraceback (most recent call last):\n\t File \"./python/twatch.py\", line 41, in \u003cmodule\u003e\n\t main()\n\t File \"./python/twatch.py\", line 32, in main\n\t event \u003d evlist.read_on_cpu(cpu)\n\tRuntimeError: more argument specifiers than keyword list entries\n\nHence, add cpu to the name list.\n\nCc: David Ahern \u003cdaahern@cisco.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nCc: Tom Zanussi \u003ctzanussi@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1301588863-20210-1-git-send-email-fweisbec@gmail.com\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "c2a70653af45c9cbb0cab900e8931b062e57b1ae", "tree": "e7b1b10cc71c5cccd3d3b7d20cb8001ec313fbff", "parents": [ "5c6970af2f4be4e04b06fe78214f6809777a8354" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 11:04:54 2011 -0300" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 11:04:54 2011 -0300" }, "message": "perf evlist: Don\u0027t die if sample_{id_all|type} is invalid\n\nFixes two more cases where the python binding would not load:\n\n. Not finding die(), which it shouldn\u0027t anyway, not good to just stop the\n world because some particular perf.data file is invalid, just propagate\n the error to the caller.\n\n. Not finding perf_sample_size: fix it by moving it from event.c to evsel,\n where it belongs, as most cases are moving to operate on an evsel object.o\n\nOne of the fixed problems:\n\n[root@emilia ~]# python\n\u003e\u003e\u003e import perf\nTraceback (most recent call last):\n File \"\u003cstdin\u003e\", line 1, in \u003cmodule\u003e\nImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: perf_sample_size\n\u003e\u003e\u003e\n[root@emilia ~]#\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nLink: http://lkml.kernel.org/n/tip-1hkj7b2cvgbfnoizsekjb6c9@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "5c6970af2f4be4e04b06fe78214f6809777a8354", "tree": "ec39ed480a4d8a15fe261d6a37edf894fb2fa936", "parents": [ "bccdaba044a445eb2c391295587aa47977994777" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 10:55:10 2011 -0300" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 10:55:10 2011 -0300" }, "message": "perf python: Use exception to propagate errors\n\nWe were using pr_debug to tell the user about not being able to parse a sample\nwhere we should really use the python way of reporting errors: exceptions.\n\nFixes this problem:\n\n[root@emilia ~]# python\n\u003e\u003e\u003e import perf\nTraceback (most recent call last):\n File \"\u003cstdin\u003e\", line 1, in \u003cmodule\u003e\nImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: eprintf\n\u003e\u003e\u003e\n[root@emilia ~]\n\nAs we want to keep the objects linked in the python binding (and in the future\nin a shared library) minimal.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nLink: http://lkml.kernel.org/n/tip-m9dba9kaluas0kq8r58z191c@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "bccdaba044a445eb2c391295587aa47977994777", "tree": "d06ca43b4150fbc7bbd6e3116d0a0b44ff64de1c", "parents": [ "64ce312618ef0e11d88def80effcefd1b59fdb1e" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 10:39:43 2011 -0300" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jun 02 10:41:41 2011 -0300" }, "message": "perf evlist: Remove dependency on debug routines\n\nSo far we avoided having to link debug.o in the python binding, keep it\nthat way by not using ui__warning() in evlist.c.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nLink: http://lkml.kernel.org/n/tip-4wtew8hd3g7ejnlehtspys2t@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c", "tree": "7318c8602f61c2052df308920bd681539f760555", "parents": [ "f0f52a9463839c52a63c05d6e7d4a330d94a9794" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 06:11:24 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 06:11:24 2011 +0900" }, "message": "Revert \"mm: fail GFP_DMA allocations when ZONE_DMA is not configured\"\n\nThis reverts commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac.\n\nAs rmk says:\n \"Commit a197b59ae6e8 (mm: fail GFP_DMA allocations when ZONE_DMA is not\n configured) is causing regressions on ARM with various drivers which\n use GFP_DMA.\n\n The behaviour up until now has been to silently ignore that flag when\n CONFIG_ZONE_DMA is not enabled, and to allocate from the normal zone.\n However, as a result of the above commit, such allocations now fail\n which causes drivers to fail. These are regressions compared to the\n previous kernel version.\"\n\nso just revert it.\n\nRequested-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f0f52a9463839c52a63c05d6e7d4a330d94a9794", "tree": "d964f65aa37dd46b457bc615f2f37e75390c6df8", "parents": [ "0f48f2600911d5de6393829e4a9986d4075558b3", "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6:\n intel-iommu: Fix off-by-one in RMRR setup\n intel-iommu: Add domain check in domain_remove_one_dev_info\n intel-iommu: Remove Host Bridge devices from identity mapping\n intel-iommu: Use coherent DMA mask when requested\n intel-iommu: Dont cache iova above 32bit\n intel-iommu: Speed up processing of the identity_mapping function\n intel-iommu: Check for identity mapping candidate using system dma mask\n intel-iommu: Only unlink device domains from iommu\n intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n intel-iommu: Flush unmaps at domain_exit\n intel-iommu: Remove obsolete comment from detect_intel_iommu\n intel-iommu: fix VT-d PMR disable for TXT on S3 resume\n" }, { "commit": "0f48f2600911d5de6393829e4a9986d4075558b3", "tree": "39745ab1858bb308f3b101f5ae555f08485bb7ea", "parents": [ "3f303103b884ca577908d3e5c0650ad12e40c586" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "message": "block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal\n\nJens\u0027 back-merge commit 698567f3fa79 (\"Merge commit \u0027v2.6.39\u0027 into\nfor-2.6.40/core\") was incorrectly done, and re-introduced the\nDISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits\n\n - 9fd097b14918 (\"block: unexport DISK_EVENT_MEDIA_CHANGE for\n legacy/fringe drivers\")\n\n - 7eec77a1816a (\"ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd\n and ide-cd\")\n\nbecause of conflicts with the \"g-\u003eflags\" updates near-by by commit\nd4dc210f69bc (\"block: don\u0027t block events on excl write for non-optical\ndevices\")\n\nAs a result, we re-introduced the hanging behavior due to infinite disk\nmedia change reports.\n\nTssk, tssk, people! Don\u0027t do back-merges at all, and *definitely* don\u0027t\ndo them to hide merge conflicts from me - especially as I\u0027m likely\nbetter at merging them than you are, since I do so many merges.\n\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3f303103b884ca577908d3e5c0650ad12e40c586", "tree": "021b8baeba20df329b60798ad4fb55f280b0cbda", "parents": [ "5c6cce92bc8aee751aafe82c5d9caf7553226a3d", "63da029015b5255915cd6d61f19ffc276ad4635d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 21:47:39 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 21:47:39 2011 +0900" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6:\n mtd: fix physmap.h warnings\n" }, { "commit": "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a", "tree": "2c7ed5f263440c6a7302c19a31827488eade9ea5", "parents": [ "8519dc4401ddf8a5399f979870bbeeadbc111186" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 31 00:22:52 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:48:21 2011 +0100" }, "message": "intel-iommu: Fix off-by-one in RMRR setup\n\nWe were mapping an extra byte (and hence usually an extra page):\niommu_prepare_identity_map() expects to be given an \u0027end\u0027 argument which\nis the last byte to be mapped; not the first byte *not* to be mapped.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8519dc4401ddf8a5399f979870bbeeadbc111186", "tree": "a1eb0bc0fa29b955a757a1e1c1c76f569e6be4ee", "parents": [ "825507d6d059f1cbe2503e0e5a3926225b983aec" ], "author": { "name": "Mike Habeck", "email": "habeck@sgi.com", "time": "Sat May 28 13:15:07 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:48 2011 +0100" }, "message": "intel-iommu: Add domain check in domain_remove_one_dev_info\n\nThe comment in domain_remove_one_dev_info() states \"No need to compare\nPCI domain; it has to be the same\". But for the si_domain that isn\u0027t\ngoing to be true, as it consists of all the PCI devices that are\nidentity mapped thus multiple PCI domains can be in si_domain. The\ncode needs to validate the PCI domain too.\n\nSigned-off-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "825507d6d059f1cbe2503e0e5a3926225b983aec", "tree": "8f191cb5c4704a4710c7b89b81d9629206714d3b", "parents": [ "c681d0ba1252954208220ad32248a3e8e2fc98e4" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:06 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:46 2011 +0100" }, "message": "intel-iommu: Remove Host Bridge devices from identity mapping\n\nWhen using the 1:1 (identity) PCI DMA remapping, PCI Host Bridge devices\nthat do not use the IOMMU causes a kernel panic. Fix that by not\ninserting those devices into the si_domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "c681d0ba1252954208220ad32248a3e8e2fc98e4", "tree": "fe74fdee4fa76e743aa0e8d2d22f958b1a1c710e", "parents": [ "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:05 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:45 2011 +0100" }, "message": "intel-iommu: Use coherent DMA mask when requested\n\nThe __intel_map_single function is not honoring the passed in DMA mask.\nThis results in not using the coherent DMA mask when called from\nintel_alloc_coherent().\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb", "tree": "c06f2bcc3b5aa5d0cb0869815e6247afc736ea7a", "parents": [ "cb452a4040bb051d92e85d6e7eb60c11734c1781" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:04 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:40 2011 +0100" }, "message": "intel-iommu: Dont cache iova above 32bit\n\nMike Travis and Mike Habeck reported an issue where iova allocation\nwould return a range that was larger than a device\u0027s dma mask.\n\nhttps://lkml.org/lkml/2011/3/29/423\n\nThe dmar initialization code will reserve all PCI MMIO regions and copy\nthose reservations into a domain specific iova tree. It is possible for\none of those regions to be above the dma mask of a device. It is typical\nto allocate iovas with a 32bit mask (despite device\u0027s dma mask possibly\nbeing larger) and cache the result until it exhausts the lower 32bit\naddress space. Freeing the iova range that is \u003e\u003d the last iova in the\nlower 32bit range when there is still an iova above the 32bit range will\ncorrupt the cached iova by pointing it to a region that is above 32bit.\nIf that region is also larger than the device\u0027s dma mask, a subsequent\nallocation will return an unusable iova and cause dma failure.\n\nSimply don\u0027t cache an iova that is above the 32bit caching boundary.\n\nReported-by: Mike Travis \u003ctravis@sgi.com\u003e\nReported-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nAcked-by: Mike Travis \u003ctravis@sgi.com\u003e\nTested-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "cb452a4040bb051d92e85d6e7eb60c11734c1781", "tree": "ef19298ec70274c9c199fa74a4f08e77cc69080b", "parents": [ "8fcc5372fbac085199d84a880503ed67aba3fe49" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:03 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:36 2011 +0100" }, "message": "intel-iommu: Speed up processing of the identity_mapping function\n\nWhen there are a large count of PCI devices, and the pass through\noption for iommu is set, much time is spent in the identity_mapping\nfunction hunting though the iommu domains to check if a specific\ndevice is \"identity mapped\".\n\nSpeed up the function by checking the cached info to see if\nit\u0027s mapped to the static identity domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8fcc5372fbac085199d84a880503ed67aba3fe49", "tree": "aab84e5ac18fa8028efa49e2cc47a5b97d873916", "parents": [ "9b4554b21ed07e8556405510638171f0c787742a" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:02 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:34 2011 +0100" }, "message": "intel-iommu: Check for identity mapping candidate using system dma mask\n\nThe identity mapping code appears to make the assumption that if the\ndevices dma_mask is greater than 32bits the device can use identity\nmapping. But that is not true: take the case where we have a 40bit\ndevice in a 44bit architecture. The device can potentially receive a\nphysical address that it will truncate and cause incorrect addresses\nto be used.\n\nInstead check to see if the device\u0027s dma_mask is large enough\nto address the system\u0027s dma_mask.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9b4554b21ed07e8556405510638171f0c787742a", "tree": "384c8517f6aee9a09a43ac55c7d0cbadc3d2ee23", "parents": [ "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue May 24 12:19:04 2011 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:29 2011 +0100" }, "message": "intel-iommu: Only unlink device domains from iommu\n\nCommit a97590e5 added unlinking domains from iommus to reciprocate the\niommu from domains unlinking that was already done. We actually want\nto only do this for device domains and never for the static\nidentity map domain or VM domains. The SI domain is special and\nnever freed, while VM domain-\u003eid lives in their own special address\nspace, separate from iommu-\u003edomain_ids.\n\nIn the current code, a VM can get domain-\u003eid zero, then mark that\ndomain unused when unbound from pci-stub. This leads to DMAR\nwrite faults when the device is re-bound to the host driver.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d", "tree": "cb685e370cc1cb2dec39b29500bdd22fd1814596", "parents": [ "7b668357810ecb5fdda4418689d50f5d95aea6a8" ], "author": { "name": "Youquan Song", "email": "youquan.song@intel.com", "time": "Wed May 25 19:13:49 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:26:35 2011 +0100" }, "message": "intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n\nThere are no externally-visible changes with this. In the loop in the\ninternal __domain_mapping() function, we simply detect if we are mapping:\n - size \u003e\u003d 2MiB, and\n - virtual address aligned to 2MiB, and\n - physical address aligned to 2MiB, and\n - on hardware that supports superpages.\n\n(and likewise for larger superpages).\n\nWe automatically use a superpage for such mappings. We never have to\nworry about *breaking* superpages, since we trust that we will always\n*unmap* the same range that was mapped. So all we need to do is ensure\nthat dma_pte_clear_range() will also cope with superpages.\n\nAdjust pfn_to_dma_pte() to take a superpage \u0027level\u0027 as an argument, so\nit can return a PTE at the appropriate level rather than always\nextending the page tables all the way down to level 1. Again, this is\nsimplified by the fact that we should never encounter existing small\npages when we\u0027re creating a mapping; any old mapping that used the same\nvirtual range will have been entirely removed and its obsolete page\ntables freed.\n\nProvide an \u0027intel_iommu\u003dsp_off\u0027 argument on the command line as a\nchicken bit. Not that it should ever be required.\n\n\u003d\u003d\n\nThe original commit seen in the iommu-2.6.git was Youquan\u0027s\nimplementation (and completion) of my own half-baked code which I\u0027d\ntyped into an email. Followed by half a dozen subsequent \u0027fixes\u0027.\n\nI\u0027ve taken the unusual step of rewriting history and collapsing the\noriginal commits in order to keep the main history simpler, and make\nlife easier for the people who are going to have to backport this to\nolder kernels. And also so I can give it a more coherent commit comment\nwhich (hopefully) gives a better explanation of what\u0027s going on.\n\nThe original sequence of commits leading to identical code was:\n\nYouquan Song (3):\n intel-iommu: super page support\n intel-iommu: Fix superpage alignment calculation error\n intel-iommu: Fix superpage level calculation error in dma_pfn_level_pte()\n\nDavid Woodhouse (4):\n intel-iommu: Precalculate superpage support for dmar_domain\n intel-iommu: Fix hardware_largepage_caps()\n intel-iommu: Fix inappropriate use of superpages in __domain_mapping()\n intel-iommu: Fix phys_pfn in __domain_mapping for sglist pages\n\nSigned-off-by: Youquan Song \u003cyouquan.song@intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "63da029015b5255915cd6d61f19ffc276ad4635d", "tree": "77e1110712e7adff87fcfc0db80310ff736a285f", "parents": [ "29a6ccca3869bbe33879dae0cd7df2a1559eff54" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon May 23 11:37:09 2011 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 11:36:49 2011 +0100" }, "message": "mtd: fix physmap.h warnings\n\nFix build warnings in physmap.h:\n\ninclude/linux/mtd/physmap.h:25: warning: \u0027struct platform_device\u0027 declared inside parameter list\ninclude/linux/mtd/physmap.h:25: warning: its scope is only this definition or declaration, which is probably not what you want\ninclude/linux/mtd/physmap.h:26: warning: \u0027struct platform_device\u0027 declared inside parameter list\ninclude/linux/mtd/physmap.h:27: warning: \u0027struct platform_device\u0027 declared inside parameter list\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "5c6cce92bc8aee751aafe82c5d9caf7553226a3d", "tree": "d46ddaa86089148e39ba91ddf58430bb1d235748", "parents": [ "603d04b2010976a52f62b7633f9999d104046900", "a5b2c5b2ad5853591a6cac6134cd0f599a720865" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 16:35:37 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 16:35:37 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n AppArmor: fix oops in apparmor_setprocattr\n" }, { "commit": "603d04b2010976a52f62b7633f9999d104046900", "tree": "884a5db96f4254cda481423fcaa18bae7e2a4c67", "parents": [ "e12ca23d41bd157354a5d1aadff30211a410c53a" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Sat May 28 10:04:25 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 16:35:01 2011 +0900" }, "message": "kgdbts: only use new asm-generic/ptrace.h api when needed\n\nThe new instruction_pointer_set helper is defined for people who have\nconverted to asm-generic/ptrace.h, so don\u0027t use it generally unless\nthe arch needs it (in which case it has been converted). This should\nfix building of kgdb tests for arches not yet converted.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a5b2c5b2ad5853591a6cac6134cd0f599a720865", "tree": "e49bdfe8a1bdcc1a15219d1d940a1776bb79446a", "parents": [ "e12ca23d41bd157354a5d1aadff30211a410c53a" ], "author": { "name": "Kees Cook", "email": "kees.cook@canonical.com", "time": "Tue May 31 11:31:41 2011 -0700" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 01 13:07:03 2011 +1000" }, "message": "AppArmor: fix oops in apparmor_setprocattr\n\nWhen invalid parameters are passed to apparmor_setprocattr a NULL deref\noops occurs when it tries to record an audit message. This is because\nit is passing NULL for the profile parameter for aa_audit. But aa_audit\nnow requires that the profile passed is not NULL.\n\nFix this by passing the current profile on the task that is trying to\nsetprocattr.\n\nSigned-off-by: Kees Cook \u003ckees@ubuntu.com\u003e\nSigned-off-by: John Johansen \u003cjohn.johansen@canonical.com\u003e\nCc: stable@kernel.org\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "e12ca23d41bd157354a5d1aadff30211a410c53a", "tree": "e195ce5b9cf9d83fdef9fa5c8bcef132b9ade567", "parents": [ "850761b2b13aec5d4f9935199e917f9a4ae00cce", "7a66f784375c5922315bbe879b789ee50b924d26" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 06:45:08 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 06:45:08 2011 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n virtio_net: delay TX callbacks\n virtio: add api for delayed callbacks\n virtio_test: support event index\n vhost: support event index\n virtio_ring: support event idx feature\n virtio ring: inline function to check for events\n virtio: event index interface\n virtio: add full three-clause BSD text to headers.\n virtio balloon: kill tell-host-first logic\n virtio console: don\u0027t manually set or finalize VIRTIO_CONSOLE_F_MULTIPORT.\n drivers, block: virtio_blk: Replace cryptic number with the macro\n virtio_blk: allow re-reading config space at runtime\n lguest: remove support for VIRTIO_F_NOTIFY_ON_EMPTY.\n lguest: fix up compilation after move\n lguest: fix timer interrupt setup\n" }, { "commit": "850761b2b13aec5d4f9935199e917f9a4ae00cce", "tree": "0b45332cc3f1c7eda037c0e60d4a4415754c6c31", "parents": [ "af0d6a0a3a30946f7df69c764791f1b0643f7cd6", "83caba8436b28bd9081013fd840424983127d4ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 06:44:10 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 06:44:10 2011 +0900" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] wire up sendmmsg() syscall for Itanium\n" }, { "commit": "83caba8436b28bd9081013fd840424983127d4ca", "tree": "da15a602e99fec3eac04508e36799a98a6c0b666", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 31 10:09:24 2011 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 31 10:09:24 2011 -0700" }, "message": "[IA64] wire up sendmmsg() syscall for Itanium\n\nAdd entries in unistd.h and entry.S to make this new syscall visible.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "af0d6a0a3a30946f7df69c764791f1b0643f7cd6", "tree": "ccf9310a7d8ab00d7677d06d5f2bde48368a43ac", "parents": [ "07ef3c3b44896bc0432a901fe6ae0d0deaca47ce", "4f3c125c7420c85eaff627145557e392a871922d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 02:07:22 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 02:07:22 2011 +0900" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Fix mwait_play_dead() faulting on mwait-incapable cpus\n x86 idle: Fix mwait deprecation warning message\n\nEvil merge to remove extra quote noticed by Joe Perches\n" }, { "commit": "07ef3c3b44896bc0432a901fe6ae0d0deaca47ce", "tree": "f64cd7fd442e00e0664f63153a5d704936972875", "parents": [ "643d2d7992f4ce4f983d455b579f77b1e9c0af0c", "d72bce0e67e8afc6eb959f656013cbb577426f1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 02:03:22 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 02:03:22 2011 +0900" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rcu: Cure load woes\n" }, { "commit": "74c355fbdfedd3820046dba4f537876cea54c207", "tree": "3a07851e63f5eb9a233286c6683f7e8c7d9d61a2", "parents": [ "89e1be50c68eb5e58b873dce87bbac627ee18d1f" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon May 30 16:48:06 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 31 14:20:25 2011 +0200" }, "message": "perf, cgroups: Fix up for new API\n\nBen changed the cgroup API in commit f780bdb7c1c (cgroups: add\nper-thread subsystem callbacks) in an incompatible way, but\nforgot to convert the perf cgroup bits.\n\nAvoid compile warnings and runtime splats and convert perf too ;-)\n\nAcked-by: Ben Blum \u003cbblum@andrew.cmu.edu\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1306767651.1200.2990.camel@twins\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "643d2d7992f4ce4f983d455b579f77b1e9c0af0c", "tree": "ebd1421f10881ba0da431a3c05fc0f31feb15176", "parents": [ "89c122236e60747f920008c9cf4e9cbde3333e50", "89e1be50c68eb5e58b873dce87bbac627ee18d1f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 31 20:32:54 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 31 20:32:54 2011 +0900" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.o\n" }, { "commit": "89c122236e60747f920008c9cf4e9cbde3333e50", "tree": "f43cf6740b16385a37045473127dc96ae26a6120", "parents": [ "339dedf709e21d5718d6596750166f70e8bed40a", "c7427d23f7ed695ac226dbe3a84d7f19091d34ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 31 20:30:59 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 31 20:30:59 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n autofs4: bogus dentry_unhash() added in -\u003eunlink()\n vfs: shrink_dcache_parent before rmdir, dir rename\n" }, { "commit": "339dedf709e21d5718d6596750166f70e8bed40a", "tree": "f4fab2933bd90211d3f62141f068b90060cd90f0", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue May 31 18:01:23 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 31 20:30:20 2011 +0900" }, "message": "powerpc/pmac: Don\u0027t register pmac PIC syscore ops when HW not present\n\nThe Apple custom PIC only exist in some earlier machine models,\nanything with an MPIC will crash on suspend if we register those\nsyscore ops unconditionally.\n\nThis is a regression caused by commit f5a592f7d74e (\"PM / PowerPC: Use\nstruct syscore_ops instead of sysdevs for PM\")\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d72bce0e67e8afc6eb959f656013cbb577426f1e", "tree": "9c93d4df9aa895d6f2f555e0cf50e7ae5ebaded4", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Mon May 30 13:34:51 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 31 10:01:48 2011 +0200" }, "message": "rcu: Cure load woes\n\nCommit cc3ce5176d83 (rcu: Start RCU kthreads in TASK_INTERRUPTIBLE\nstate) fudges a sleeping task\u0027 state, resulting in the scheduler seeing\na TASK_UNINTERRUPTIBLE task going to sleep, but a TASK_INTERRUPTIBLE\ntask waking up. The result is unbalanced load calculation.\n\nThe problem that patch tried to address is that the RCU threads could\nstay in UNINTERRUPTIBLE state for quite a while and triggering the hung\ntask detector due to on-demand wake-ups.\n\nCure the problem differently by always giving the tasks at least one\nwake-up once the CPU is fully up and running, this will kick them out of\nthe initial UNINTERRUPTIBLE state and into the regular INTERRUPTIBLE\nwait state.\n\n[ The alternative would be teaching kthread_create() to start threads as\n INTERRUPTIBLE but that needs a tad more thought. ]\n\nReported-by: Damien Wyart \u003cdamien.wyart@free.fr\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nLink: http://lkml.kernel.org/r/1306755291.1200.2872.camel@twins\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4f3c125c7420c85eaff627145557e392a871922d", "tree": "d8e664f6e30e034bd81a595f09f1a33618da9cbb", "parents": [ "598e887d8b01655780c81cc86a9e7820ed091580" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Mon May 30 08:23:57 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 30 14:37:54 2011 +0200" }, "message": "x86: Fix mwait_play_dead() faulting on mwait-incapable cpus\n\nA logic error in mwait_play_dead() causes the kernel to use\nmwait even on cpus which don\u0027t support it, such as KVM virtual\ncpus.\n\nIntroduced by:\n\n 349c004e3d31: x86: A fast way to check capabilities of the current cpu\n\nFixes: https://bugzilla.kernel.org/show_bug.cgi?id\u003d36222\nReported-by: Török Edwin \u003cedwintorok@gmail.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1306758237-9327-1-git-send-email-avi@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "598e887d8b01655780c81cc86a9e7820ed091580", "tree": "e4b310f5c6b3c882f86ae4174fd08dfe6803c317", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Borislav Petkov", "email": "bp@alien8.de", "time": "Mon May 30 11:38:06 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 30 13:02:04 2011 +0200" }, "message": "x86 idle: Fix mwait deprecation warning message\n\nFix:\n\n arch/x86/kernel/process.c:645:1: warning: unknown escape sequence \u0027\\i\u0027\n\ndue to missing escape backslash, introduced by this commit:\n\n 5d4c47e0195b: x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n\nSigned-off-by: Borislav Petkov \u003cbp@alien8.de\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/1306748286-24701-1-git-send-email-bp@alien8.de\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c7427d23f7ed695ac226dbe3a84d7f19091d34ce", "tree": "dcd94331ca00aebe203710be18c1171c7f935ec3", "parents": [ "3cebde2413ba42504cf2c10ec1d47582912435cd" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 30 01:50:53 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 30 01:50:53 2011 -0400" }, "message": "autofs4: bogus dentry_unhash() added in -\u003eunlink()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "3cebde2413ba42504cf2c10ec1d47582912435cd", "tree": "296302cd2f065c125b1c932caa3bd836720c7efe", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Sun May 29 21:20:59 2011 -0700" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 30 01:48:27 2011 -0400" }, "message": "vfs: shrink_dcache_parent before rmdir, dir rename\n\nThe dentry_unhash push-down series missed that shink_dcache_parent needs to\nbe called prior to rmdir or dir rename to clear DCACHE_REFERENCED and\nallow efficient dentry reclaim.\n\nReported-by: Dave Chinner \u003cdavid@fromorbit.com\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7a66f784375c5922315bbe879b789ee50b924d26", "tree": "66585f94de392dedff6bf5f5d057490e68b1cfa7", "parents": [ "7ab358c23cbf15cea08129cd722d1ce77433a94d" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:11:23 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:16 2011 +0930" }, "message": "virtio_net: delay TX callbacks\n\nAsk for delayed callbacks on TX ring full, to give the\nother side more of a chance to make progress.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7ab358c23cbf15cea08129cd722d1ce77433a94d", "tree": "713d38823efda30222230314bcae26b919782f16", "parents": [ "4423fe40b03f32b11e72ecfa03077e702e55d5a9" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:11:14 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:16 2011 +0930" }, "message": "virtio: add api for delayed callbacks\n\nAdd an API that tells the other side that callbacks\nshould be delayed until a lot of work has been done.\nImplement using the new event_idx feature.\n\nNote: it might seem advantageous to let the drivers\nask for a callback after a specific capacity has\nbeen reached. However, as a single head can\nfree many entries in the descriptor table,\nwe don\u0027t really have a clue about capacity\nuntil get_buf is called. The API is the simplest\nto implement at the moment, we\u0027ll see what kind of\nhints drivers can pass when there\u0027s more than one\nuser of the feature.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "4423fe40b03f32b11e72ecfa03077e702e55d5a9", "tree": "88c59c0b04cd8c960944504e2ff081be48996316", "parents": [ "8ea8cf89e19aeb596b818ee5f2bec8a8b0586b60" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:11:05 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:15 2011 +0930" }, "message": "virtio_test: support event index\n\nAdd ability to test the new event idx feature,\nenable by default.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "8ea8cf89e19aeb596b818ee5f2bec8a8b0586b60", "tree": "3303edab83f45265f2e9d05a5ef59f67e758b5f7", "parents": [ "a5c262c5fd83ece01bd649fb08416c501d4c59d7" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:10:54 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:15 2011 +0930" }, "message": "vhost: support event index\n\nSupport the new event index feature. When acked,\nutilize it to reduce the # of interrupts sent to the guest.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a5c262c5fd83ece01bd649fb08416c501d4c59d7", "tree": "295ddc61d59236b6521f5587e2e78ccb8da5d97a", "parents": [ "bf7035bf20563a6cadcb9e870406e7b21daf5e30" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:10:44 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:15 2011 +0930" }, "message": "virtio_ring: support event idx feature\n\nSupport for the new event idx feature:\n1. When enabling interrupts, publish the current avail index\n value to the host to get interrupts on the next update.\n2. Use the new avail_event feature to reduce the number\n of exits from the guest.\n\nSimple test with the simulator:\n\n[virtio]# time ./virtio_test\nspurious wakeus: 0x7\n\nreal 0m0.169s\nuser 0m0.140s\nsys 0m0.019s\n[virtio]# time ./virtio_test --no-event-idx\nspurious wakeus: 0x11\n\nreal 0m0.649s\nuser 0m0.295s\nsys 0m0.335s\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bf7035bf20563a6cadcb9e870406e7b21daf5e30", "tree": "19eda109916e7ba9e4c531602b6efb5d1ef33c2a", "parents": [ "770b31a85e000b0194974922f238a30ade4246b6" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:10:27 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:14 2011 +0930" }, "message": "virtio ring: inline function to check for events\n\nWith the new used_event and avail_event and features, both\nhost and guest need similar logic to check whether events are\nenabled, so it helps to put the common code in the header.\n\nNote that Xen has similar logic for notification hold-off\nin include/xen/interface/io/ring.h with req_event and req_prod\ncorresponding to event_idx + 1 and new_idx respectively.\n+1 comes from the fact that req_event and req_prod in Xen start at 1,\nwhile event index in virtio starts at 0.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "770b31a85e000b0194974922f238a30ade4246b6", "tree": "eed81e23f3116858b49af76bcc5831c38662de96", "parents": [ "a1b383870a28cfbd1657d4922c0fafc634a62ebd" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:10:17 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:14 2011 +0930" }, "message": "virtio: event index interface\n\nDefine a new feature bit for the guest and host to utilize\nan event index (like Xen) instead if a flag bit to enable/disable\ninterrupts and kicks.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a1b383870a28cfbd1657d4922c0fafc634a62ebd", "tree": "9dfc36730a0b50650e3a1d3deaad6813bf350708", "parents": [ "bf50e69f63d21091e525185c3ae761412be0ba72" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:14 2011 +0930" }, "message": "virtio: add full three-clause BSD text to headers.\n\nIt\u0027s unclear to me if it\u0027s important, but it\u0027s obviously causing my\ntechnical colleages some headaches and I\u0027d hate such imprecision to\nslow virtio adoption.\n\nI\u0027ve emailed this to all non-trivial contributors for approval, too.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Ryan Harper \u003cryanh@us.ibm.com\u003e\nAcked-by: Anthony Liguori \u003caliguori@us.ibm.com\u003e\nAcked-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\nAcked-by: john cooper \u003cjohn.cooper@redhat.com\u003e\nAcked-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nAcked-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nAcked-by: Fernando Luis Vazquez Cao \u003cfernando@oss.ntt.co.jp\u003e\n" }, { "commit": "bf50e69f63d21091e525185c3ae761412be0ba72", "tree": "fc88d1e774ae03e680b2fddc265404ee628b8545", "parents": [ "177dbd95637a52b9118aca757d5856ec3995d3e7" ], "author": { "name": "Dave Hansen", "email": "dave@linux.vnet.ibm.com", "time": "Thu Apr 07 10:43:25 2011 -0700" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "virtio balloon: kill tell-host-first logic\n\nThe virtio balloon driver has a VIRTIO_BALLOON_F_MUST_TELL_HOST\nfeature bit. Whenever the bit is set, the guest kernel must\nalways tell the host before we free pages back to the allocator.\nWithout this feature, we might free a page (and have another\nuser touch it) while the hypervisor is unprepared for it.\n\nBut, if the bit is _not_ set, we are under no obligation to\nreverse the order; we\u0027re under no obligation to do _anything_.\nAs of now, qemu-kvm defines the bit, but doesn\u0027t set it.\n\nThis patch makes the \"tell host first\" logic the only case. This\nshould make everybody happy, and reduce the amount of untested or\nuntestable code in the kernel.\n\nThis _also_ means that we don\u0027t have to preserve a pfn list\nafter the pages are freed, which should let us get rid of some\ntemporary storage (vb-\u003epfns) eventually.\n\nSigned-off-by: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "177dbd95637a52b9118aca757d5856ec3995d3e7", "tree": "11731b46424543051298d515d8e33d0ae23977c4", "parents": [ "6917f83ffe5e6b6414ccc845263b792ed201c0f1" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "virtio console: don\u0027t manually set or finalize VIRTIO_CONSOLE_F_MULTIPORT.\n\nThat\u0027s already been done by the virtio infrastructure before the probe\nfunction is called.\n\nReported-by: alexey.kardashevskiy@au1.ibm.com\nAcked-by: Amit Shah \u003camit.shah@redhat.com\u003e\nTested-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6917f83ffe5e6b6414ccc845263b792ed201c0f1", "tree": "e90ecfcad36fc10e679ae0b6d2a7e5e725b58d1e", "parents": [ "7a7c924cf03da2a76ea4dc0aac1a788cf95a9c29" ], "author": { "name": "Liu Yuan", "email": "tailai.ly@taobao.com", "time": "Sun Apr 24 02:49:26 2011 +0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "drivers, block: virtio_blk: Replace cryptic number with the macro\n\nIt is easier to figure out the context by reading SCSI_SENSE_BUFFERSIZE\ninstead of plain \u002796\u0027.\n\nSigned-off-by: Liu Yuan \u003ctailai.ly@taobao.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7a7c924cf03da2a76ea4dc0aac1a788cf95a9c29", "tree": "717aba1aab456d252c684abf256afa8e92b7dd96", "parents": [ "990c91f0af46c57f0291060d928c7ab82f9d5667" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Feb 01 21:43:48 2011 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "virtio_blk: allow re-reading config space at runtime\n\nWire up the virtio_driver config_changed method to get notified about\nconfig changes raised by the host. For now we just re-read the device\nsize to support online resizing of devices, but once we add more\nattributes that might be changeable they could be added as well.\n\nNote that the config_changed method is called from irq context, so\nwe\u0027ll have to use the workqueue infrastructure to provide us a proper\nuser context for our changes.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "990c91f0af46c57f0291060d928c7ab82f9d5667", "tree": "72a347b09509e3658b12d4e013f072bf2b771299", "parents": [ "bc805a03c26e1e25171bc627c6264553d27f746c" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:12 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:12 2011 +0930" }, "message": "lguest: remove support for VIRTIO_F_NOTIFY_ON_EMPTY.\n\nNo virtio device does this any more, so no need to clutter lguest with it.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bc805a03c26e1e25171bc627c6264553d27f746c", "tree": "2700f17b81a74376d6f03a0d60083ec387cbbcc4", "parents": [ "15517f7c213442e4d8a098cf0732b237f764c576" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:11 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:12 2011 +0930" }, "message": "lguest: fix up compilation after move\n\ned16648eb5b86917f0b90bdcdbc857202da72f90 \"Move kvm, uml, and lguest\nsubdirectories\" broke the lguest example launcher.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "15517f7c213442e4d8a098cf0732b237f764c576", "tree": "bfa7539e4d98b0c73063156e218e7916a7112d49", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:08 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:10 2011 +0930" }, "message": "lguest: fix timer interrupt setup\n\nWithout an IRQ chip set, we now get a WARN_ON and no timer interrupt. This\nprevents booting.\n\nFortunately, the fix is a one-liner: set up the timer IRQ like everything\nelse.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: stable@kernel.org # .39.x\n" }, { "commit": "55922c9d1b84b89cb946c777fddccb3247e7df2c", "tree": "800ce0df1466f8ff7b32d2602c6152a07486ef64", "parents": [ "bd1bfe40ac6bdf9593da29b822bc301b77a97d6a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 17:43:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 17:43:36 2011 -0700" }, "message": "Linux 3.0-rc1\n\n.. except there are various scripts that really know that there are\nthree numbers, so it calls itself \"3.0.0-rc1\".\n\nHopefully by the time the final 3.0 is out, we\u0027ll have that extra zero\nall figured out.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bd1bfe40ac6bdf9593da29b822bc301b77a97d6a", "tree": "332328b76dc4a3d51419c1d1cb23f50eb6c034c8", "parents": [ "cd1acdf1723d71b28175f95b04305f1cc74ce363", "3063287053bca5207e121c567b95b2b6f0bdc2c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:13:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:13:25 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:\n eCryptfs: Remove ecryptfs_header_cache_2\n eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()\n eCryptfs: Return useful code from contains_ecryptfs_marker\n eCryptfs: Fix new inode race condition\n eCryptfs: Cleanup inode initialization code\n eCryptfs: Consolidate inode functions into inode.c\n" }, { "commit": "cd1acdf1723d71b28175f95b04305f1cc74ce363", "tree": "7ab58883eccd314be3d8efafd59a124d4ffbb861", "parents": [ "fac04863cef53a69830590b2e1c54345068a9747", "9342077011d54f42fa1b88b7bc1f7008dcf5fff9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:10:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:10:13 2011 -0700" }, "message": "Merge branch \u0027pnfs-submit\u0027 of git://git.open-osd.org/linux-open-osd\n\n* \u0027pnfs-submit\u0027 of git://git.open-osd.org/linux-open-osd: (32 commits)\n pnfs-obj: pg_test check for max_io_size\n NFSv4.1: define nfs_generic_pg_test\n NFSv4.1: use pnfs_generic_pg_test directly by layout driver\n NFSv4.1: change pg_test return type to bool\n NFSv4.1: unify pnfs_pageio_init functions\n pnfs-obj: objlayout_encode_layoutcommit implementation\n pnfs: encode_layoutcommit\n pnfs-obj: report errors and .encode_layoutreturn Implementation.\n pnfs: encode_layoutreturn\n pnfs: layoutret_on_setattr\n pnfs: layoutreturn\n pnfs-obj: osd raid engine read/write implementation\n pnfs: support for non-rpc layout drivers\n pnfs-obj: define per-inode private structure\n pnfs: alloc and free layout_hdr layoutdriver methods\n pnfs-obj: objio_osd device information retrieval and caching\n pnfs-obj: decode layout, alloc/free lseg\n pnfs-obj: pnfs_osd XDR client implementation\n pnfs-obj: pnfs_osd XDR definitions\n pnfs-obj: objlayoutdriver module skeleton\n ...\n" }, { "commit": "fac04863cef53a69830590b2e1c54345068a9747", "tree": "59b9161b442ccd340324a8b42cdace84206014bb", "parents": [ "2ba781ced93922e249dee2ac0751faccb4fb0656" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:06:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:06:42 2011 -0700" }, "message": "arm gpio drivers: make them \u0027depends on ARM\u0027\n\nWe had a few drivers move from arch/arm into drivers/gpio, but they\ndon\u0027t actually compile without the ARM platform headers etc. As a\nresult they were messing up allyesconfig on x86.\n\nMake them depend on ARM.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3063287053bca5207e121c567b95b2b6f0bdc2c8", "tree": "404c92175f536d20576254a43a7a93b3b02343f2", "parents": [ "778aeb42a708d2a57e491d2cbb5a1e74f61270b9" ], "author": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Tue May 24 05:11:12 2011 -0500" }, "committer": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Sun May 29 14:24:25 2011 -0500" }, "message": "eCryptfs: Remove ecryptfs_header_cache_2\n\nNow that ecryptfs_lookup_interpose() is no longer using\necryptfs_header_cache_2 to read in metadata, the kmem_cache can be\nremoved and the ecryptfs_header_cache_1 kmem_cache can be renamed to\necryptfs_header_cache.\n\nSigned-off-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\n" }, { "commit": "778aeb42a708d2a57e491d2cbb5a1e74f61270b9", "tree": "6651d8a2356b9075e6978285cbcfa7aab16e9b7a", "parents": [ "7a86617e553f47761b10f57de472d7262562b7de" ], "author": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Tue May 24 04:56:23 2011 -0500" }, "committer": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Sun May 29 14:24:24 2011 -0500" }, "message": "eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()\n\necryptfs_lookup_interpose() has turned into spaghetti code over the\nyears. This is an effort to clean it up.\n\n - Shorten overly descriptive variable names such as ecryptfs_dentry\n - Simplify gotos and error paths\n - Create helper function for reading plaintext i_size from metadata\n\nIt also includes an optimization when reading i_size from the metadata.\nA complete page-sized kmem_cache_alloc() was being done to read in 16\nbytes of metadata. The buffer for that is now statically declared.\n\nSigned-off-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\n" }, { "commit": "7a86617e553f47761b10f57de472d7262562b7de", "tree": "63ae402692eae9b062b3423b6d081ebe9a192d36", "parents": [ "3b06b3ebf44170c90c893c6c80916db6e922b9f2" ], "author": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Mon May 02 00:39:54 2011 -0500" }, "committer": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Sun May 29 14:24:24 2011 -0500" }, "message": "eCryptfs: Return useful code from contains_ecryptfs_marker\n\nInstead of having the calling functions translate the true/false return\ncode to either 0 or -EINVAL, have contains_ecryptfs_marker() return 0 or\n-EINVAL so that the calling functions can just reuse the return code.\n\nAlso, rename the function to ecryptfs_validate_marker() to avoid callers\nmistakenly thinking that it returns true/false codes.\n\nSigned-off-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\n" }, { "commit": "3b06b3ebf44170c90c893c6c80916db6e922b9f2", "tree": "1da70b311ad7ec7615f3d44ae269ca56a458fc2d", "parents": [ "5ccf92037c7c6e6f28175fd245284923f939259f" ], "author": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Tue May 24 03:49:02 2011 -0500" }, "committer": { "name": "Tyler Hicks", "email": "tyhicks@linux.vnet.ibm.com", "time": "Sun May 29 14:23:39 2011 -0500" }, "message": "eCryptfs: Fix new inode race condition\n\nOnly unlock and d_add() new inodes after the plaintext inode size has\nbeen read from the lower filesystem. This fixes a race condition that\nwas sometimes seen during a multi-job kernel build in an eCryptfs mount.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d36002\n\nSigned-off-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\nReported-by: David \u003cdavid@unsolicited.net\u003e\nTested-by: David \u003cdavid@unsolicited.net\u003e\n" }, { "commit": "2ba781ced93922e249dee2ac0751faccb4fb0656", "tree": "8b62346278b60d1bc9765dc6691f07219a27d894", "parents": [ "6345d24daf0c1fffe6642081d783cdf653ebaa5c", "437cb0dbd104a1564e0e78f0d486b97677f80909" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:44:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:44:33 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (43 commits)\n acer-wmi: support integer return type from WMI methods\n msi-laptop: fix section mismatch in reference from the function load_scm_model_init\n acer-wmi: support to set communication device state by new wmid method\n acer-wmi: allow 64-bits return buffer from WMI methods\n acer-wmi: check the existence of internal 3G device when set capability\n platform/x86:delete two unused variables\n support wlan hotkey on Acer Travelmate 5735Z\n platform-x86: intel_mid_thermal: Fix memory leak\n platform/x86: Fix Makefile for intel_mid_powerbtn\n platform/x86: Simplify intel_mid_powerbtn\n acer-wmi: Delete out-of-date documentation\n acerhdf: Clean up includes\n acerhdf: Drop pointless dependency on THERMAL_HWMON\n acer-wmi: Update MAINTAINERS\n wmi: Orphan ACPI-WMI driver\n tc1100-wmi: Orphan driver\n acer-wmi: does not allow negative number set to initial device state\n platform/oaktrail: ACPI EC Extra driver for Oaktrail\n thinkpad_acpi: Convert printks to pr_\u003clevel\u003e\n thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning\n ...\n" }, { "commit": "6345d24daf0c1fffe6642081d783cdf653ebaa5c", "tree": "415a253621279111bd481d48cbb86174c70b952a", "parents": [ "cab0d85c8dfcad4d799f9c294571440c6f1db091" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:32:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:32:28 2011 -0700" }, "message": "mm: Fix boot crash in mm_alloc()\n\nThomas Gleixner reports that we now have a boot crash triggered by\nCONFIG_CPUMASK_OFFSTACK\u003dy:\n\n BUG: unable to handle kernel NULL pointer dereference at (null)\n IP: [\u003cc11ae035\u003e] find_next_bit+0x55/0xb0\n Call Trace:\n [\u003cc11addda\u003e] cpumask_any_but+0x2a/0x70\n [\u003cc102396b\u003e] flush_tlb_mm+0x2b/0x80\n [\u003cc1022705\u003e] pud_populate+0x35/0x50\n [\u003cc10227ba\u003e] pgd_alloc+0x9a/0xf0\n [\u003cc103a3fc\u003e] mm_init+0xec/0x120\n [\u003cc103a7a3\u003e] mm_alloc+0x53/0xd0\n\nwhich was introduced by commit de03c72cfce5 (\"mm: convert\nmm-\u003ecpu_vm_cpumask into cpumask_var_t\"), and is due to wrong ordering of\nmm_init() vs mm_init_cpumask\n\nThomas wrote a patch to just fix the ordering of initialization, but I\nhate the new double allocation in the fork path, so I ended up instead\ndoing some more radical surgery to clean it all up.\n\nReported-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cab0d85c8dfcad4d799f9c294571440c6f1db091", "tree": "ba7b348832673f6c7433b9d7481bfcd415f7a7b5", "parents": [ "57ed609d4b64139b4d2cf5f3b4880a573a7905d2", "3c5cffb66d8ea94832650fcb55194715b0229088" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:30:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:30:20 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] mm: fix mmu_gather rework\n [S390] mm: fix storage key handling\n" }, { "commit": "57ed609d4b64139b4d2cf5f3b4880a573a7905d2", "tree": "d824e1ebd33b28c4ccc53e9074064db479b17dc7", "parents": [ "a74d70b63f1a0230831bcca3145d85ae016f9d4c", "f133ecca9cbb31b5e6e9bda27cbe3034fbf656df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:29:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:29:28 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: more /proc and /sys file support\n" }, { "commit": "437cb0dbd104a1564e0e78f0d486b97677f80909", "tree": "e066b3d65eb965ca68ecc8ef14581f2450ad3a61", "parents": [ "139f37f5e14cd883eee2a8a36289f544b5390a44", "987dfbaa65b2c3568b85e29d2598da08a011ee09" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Sun May 29 14:27:13 2011 -0400" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Sun May 29 14:27:13 2011 -0400" }, "message": "Merge branch \u0027x86-platform-next\u0027 into x86-platform\n" }, { "commit": "a74d70b63f1a0230831bcca3145d85ae016f9d4c", "tree": "24392a2843b19e81a1a38d88b34e772bd688502b", "parents": [ "b11b06d90a41766c2d31f0acb8a87aa0f2a7188f", "c47d832bc0155153920e507f075647519bad09a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:21:12 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:21:12 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux: (22 commits)\n nfsd: make local functions static\n NFSD: Remove unused variable from nfsd4_decode_bind_conn_to_session()\n NFSD: Check status from nfsd4_map_bcts_dir()\n NFSD: Remove setting unused variable in nfsd_vfs_read()\n nfsd41: error out on repeated RECLAIM_COMPLETE\n nfsd41: compare request\u0027s opcnt with session\u0027s maxops at nfsd4_sequence\n nfsd v4.1 lOCKT clientid field must be ignored\n nfsd41: add flag checking for create_session\n nfsd41: make sure nfs server process OPEN with EXCLUSIVE4_1 correctly\n nfsd4: fix wrongsec handling for PUTFH + op cases\n nfsd4: make fh_verify responsibility of nfsd_lookup_dentry caller\n nfsd4: introduce OPDESC helper\n nfsd4: allow fh_verify caller to skip pseudoflavor checks\n nfsd: distinguish functions of NFSD_MAY_* flags\n svcrpc: complete svsk processing on cb receive failure\n svcrpc: take advantage of tcp autotuning\n SUNRPC: Don\u0027t wait for full record to receive tcp data\n svcrpc: copy cb reply instead of pages\n svcrpc: close connection if client sends short packet\n svcrpc: note network-order types in svc_process_calldir\n ...\n" }, { "commit": "b11b06d90a41766c2d31f0acb8a87aa0f2a7188f", "tree": "be326cde997bcc38b2a9e0a6d6bc7d7ee7b4cbed", "parents": [ "f1d1c9fa8f360990e263bdcb73e35ab6fbdc41fe", "fa34ce73072f90ecd90dcc43f29d82e70e5f8676" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:20:48 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:20:48 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:\n dm kcopyd: return client directly and not through a pointer\n dm kcopyd: reserve fewer pages\n dm io: use fixed initial mempool size\n dm kcopyd: alloc pages from the main page allocator\n dm kcopyd: add gfp parm to alloc_pl\n dm kcopyd: remove superfluous page allocation spinlock\n dm kcopyd: preallocate sub jobs to avoid deadlock\n dm kcopyd: avoid pointless job splitting\n dm mpath: do not fail paths after integrity errors\n dm table: reject devices without request fns\n dm table: allow targets to support discards internally\n" }, { "commit": "f1d1c9fa8f360990e263bdcb73e35ab6fbdc41fe", "tree": "91468535e200f890fd532d5cbb50df59035278e0", "parents": [ "2ff55e98d6e662a4887d2c688a4ab2ae510a97df", "176e21ee2ec89cae8d45cf1a850ea45a45428fb8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:20:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:20:02 2011 -0700" }, "message": "Merge branch \u0027nfs-for-2.6.40\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.40\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n SUNRPC: Support for RPC over AF_LOCAL transports\n SUNRPC: Remove obsolete comment\n SUNRPC: Use AF_LOCAL for rpcbind upcalls\n SUNRPC: Clean up use of curly braces in switch cases\n NFS: Revert NFSROOT default mount options\n SUNRPC: Rename xs_encode_tcp_fragment_header()\n nfs,rcu: convert call_rcu(nfs_free_delegation_callback) to kfree_rcu()\n nfs41: Correct offset for LAYOUTCOMMIT\n NFS: nfs_update_inode: print current and new inode size in debug output\n NFSv4.1: Fix the handling of NFS4ERR_SEQ_MISORDERED errors\n NFSv4: Handle expired stateids when the lease is still valid\n SUNRPC: Deal with the lack of a SYN_SENT sk-\u003esk_state_change callback...\n" }, { "commit": "2ff55e98d6e662a4887d2c688a4ab2ae510a97df", "tree": "fcf2ede834a2b61b00cbe7c38fdd34fbf8b2e7b5", "parents": [ "daa94222b638bfe34f745d0982de7a165ce7f67c", "d5b72ce15ea99a0b8f0d1973074c584daf92d70e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:45 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:\n Squashfs: Fix sanity check patches on big-endian systems\n" }, { "commit": "daa94222b638bfe34f745d0982de7a165ce7f67c", "tree": "2157ed94339d46f7a2da22e22648a70319e8fdd0", "parents": [ "f310642123e0d32d919c60ca3fab5acd130c4ba3", "751516f0a9bad32544f40f471037c0e45fb639c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI EC: remove redundant code\n ACPI: Add D3 cold state\n ACPI: processor: fix processor_physically_present in UP kernel\n ACPI: Split out custom_method functionality into an own driver\n ACPI: Cleanup custom_method debug stuff\n ACPI EC: enable MSI workaround for Quanta laptops\n ACPICA: Update to version 20110413\n ACPICA: Execute an orphan _REG method under the EC device\n ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place\n ACPICA: Update internal address SpaceID for DataTable regions\n ACPICA: Add more methods eligible for NULL package element removal\n ACPICA: Split all internal Global Lock functions to new file - evglock\n ACPI: EC: add another DMI check for ASUS hardware\n ACPI EC: remove dead code\n ACPICA: Fix code divergence of global lock handling\n ACPICA: Use acpi_os_create_lock interface\n ACPI: osl, add acpi_os_create_lock interface\n ACPI:Fix goto flows in thermal-sys\n" }, { "commit": "f310642123e0d32d919c60ca3fab5acd130c4ba3", "tree": "f3844152e2e8c0fdd01621a400f84c8a159252a0", "parents": [ "ef1d57599dc904fdb31b8e9b5336350d21a1fde1", "5d4c47e0195b989f284907358bd5c268a44b91c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "message": "Merge branch \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6\n\n* \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:\n x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n x86 idle: deprecate \"no-hlt\" cmdline param\n x86 idle APM: deprecate CONFIG_APM_CPU_IDLE\n x86 idle floppy: deprecate disable_hlt()\n x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it\n x86 idle: clarify AMD erratum 400 workaround\n idle governor: Avoid lock acquisition to read pm_qos before entering idle\n cpuidle: menu: fixed wrapping timers at 4.294 seconds\n" }, { "commit": "ef1d57599dc904fdb31b8e9b5336350d21a1fde1", "tree": "4e3f7d49c5a8c27efd5a1009131f4b3f87eff503", "parents": [ "bc658c96037fc87463f0703ad2ea7c895344cb7e" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Sun May 29 13:46:08 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:17:34 2011 -0700" }, "message": "cifs/ubifs: Fix shrinker API change fallout\n\nCommit 1495f230fa77 (\"vmscan: change shrinker API by passing\nshrink_control struct\") changed the API of -\u003eshrink(), but missed ubifs\nand cifs instances.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9342077011d54f42fa1b88b7bc1f7008dcf5fff9", "tree": "88ef803dae5672d8bb40a563a6d2d301ae2e782f", "parents": [ "5b36c7dc41d87d39e779a84fdc2b44b39bba32ca" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Wed May 25 21:25:29 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 21:03:08 2011 +0300" }, "message": "pnfs-obj: pg_test check for max_io_size\n\nImplement pg_test vector to test for max IO sizes. We calculate\na max_io_size member only once, and cache it in lseg so to not\ndo so on every page insert.\n\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\n[simplify logic]\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" }, { "commit": "5b36c7dc41d87d39e779a84fdc2b44b39bba32ca", "tree": "4b83c833021014fd51fcffbff88eea8069cd9cff", "parents": [ "89a58e32d9105c01022a757fb32ddc3b51bf0025" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 11:45:39 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 21:02:42 2011 +0300" }, "message": "NFSv4.1: define nfs_generic_pg_test\n\nBy default, unless pnfs is used coalesce pages until pg_bsize\n(rsize or wsize) is reached.\n\npnfs layout drivers define their own pg_test methods that use\npnfs_generic_pg_test and need to define their own I/O size\nlimits (e.g. based on the file stripe size).\n\n[Move a check from nfs_pageio_do_add_request to nfs_generic_pg_test]\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" }, { "commit": "89a58e32d9105c01022a757fb32ddc3b51bf0025", "tree": "fd04ff022a084339868e81fc9a4679667c2b70bd", "parents": [ "18ad0a9f2ccd260d37dd6bc5fa04c7819def4c84" ], "author": { "name": "Benny Halevy", "email": "bhalevy@panasas.com", "time": "Wed May 25 20:54:40 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 20:56:55 2011 +0300" }, "message": "NFSv4.1: use pnfs_generic_pg_test directly by layout driver\n\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" }, { "commit": "18ad0a9f2ccd260d37dd6bc5fa04c7819def4c84", "tree": "a0936cf11e81969c0f84716ab958cd4728c87f54", "parents": [ "dfed206b8857d41a91ebba030f99e30017a44dda" ], "author": { "name": "Benny Halevy", "email": "bhalevy@panasas.com", "time": "Wed May 25 21:03:56 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 20:56:54 2011 +0300" }, "message": "NFSv4.1: change pg_test return type to bool\n\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" }, { "commit": "dfed206b8857d41a91ebba030f99e30017a44dda", "tree": "ac4c161b548e872e92da36499a2e8c28f5a34aeb", "parents": [ "a0fe8bf427f4987d7b82678292ca03cfd7331467" ], "author": { "name": "Benny Halevy", "email": "bhalevy@panasas.com", "time": "Wed May 25 20:25:22 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 20:56:43 2011 +0300" }, "message": "NFSv4.1: unify pnfs_pageio_init functions\n\nUse common code for pnfs_pageio_init_{read,write} and use\na common generic pg_test function.\n\nNote that this function always assumes the the layout driver\u0027s\npg_test method is implemented.\n\n[Fix BUG]\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" }, { "commit": "a0fe8bf427f4987d7b82678292ca03cfd7331467", "tree": "d995bd164b03dde89da24af979931c2490fe9414", "parents": [ "ac7db7264ac3314cae09893bc838fcb7e83267a4" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 22 19:54:13 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 20:55:00 2011 +0300" }, "message": "pnfs-obj: objlayout_encode_layoutcommit implementation\n\n* Define API for io-engines to report delta_space_used in IOs\n* Encode the osd-layout specific information of the layoutcommit\n XDR buffer.\n\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" }, { "commit": "ac7db7264ac3314cae09893bc838fcb7e83267a4", "tree": "7586470df26218daa8d771760615ae0d76e6788a", "parents": [ "adb58535e604a564495a7d50dfb0afa0ddc21bcb" ], "author": { "name": "Benny Halevy", "email": "bhalevy@panasas.com", "time": "Sun May 22 19:53:48 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 20:55:00 2011 +0300" }, "message": "pnfs: encode_layoutcommit\n\nAdd a layout driver method to encode the layout type specific\nopaque part of layout commit in-line in the xdr stream.\n\nCurrently, the pnfs-objects layout driver uses it to encode metadata hints\nto the MDS and the blocks layout driver to commit provisionally allocated\nextents to the file.\n\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" }, { "commit": "adb58535e604a564495a7d50dfb0afa0ddc21bcb", "tree": "54af4fe9569650342e61dbb314334e3617c48dc2", "parents": [ "04a555498e03b3804e2dec916a4669f5f560e503" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Thu May 26 21:49:46 2011 +0300" }, "committer": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Sun May 29 20:54:45 2011 +0300" }, "message": "pnfs-obj: report errors and .encode_layoutreturn Implementation.\n\nAn io_state pre-allocates an error information structure for each\npossible osd-device that might error during IO. When IO is done if all\nwas well the io_state is freed. (as today). If the I/O has ended with an\nerror, the io_state is queued on a per-layout err_list. When eventually\nencode_layoutreturn() is called, each error is properly encoded on the\nXDR buffer and only then the io_state is removed from err_list and\nde-allocated.\n\nIt is up to the io_engine to fill in the segment that fault and the type\nof osd_error that occurred. By calling objlayout_io_set_result() for\neach failing device.\n\nIn objio_osd:\n* Allocate io-error descriptors space as part of io_state\n* Use generic objlayout error reporting at end of io.\n\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\n" } ], "next": "04a555498e03b3804e2dec916a4669f5f560e503" }