)]}' { "log": [ { "commit": "fa372aae335c6dfbe808d5a728fe10cd202dde45", "tree": "a7df295553134ab719ac4ae1680b9e1d3d593b8c", "parents": [ "e3f42609628a20da92ecbc2d81053cc82c90a071" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Nov 17 12:19:04 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:38:26 2011 -0200" }, "message": "perf report: Group options in a struct\n\nPaving the way to remove these globals when we change the perf_event_ops\nto receive as a first parameter a pointer to a perf_event_ops that will\nthen provide access to perf_report via container_of.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-2eh2vi2nb5z3tg1lvoxv09xu@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "e3f42609628a20da92ecbc2d81053cc82c90a071", "tree": "5fce687fcc9fb9b3060c5bb129936ac725da0a19", "parents": [ "246d4ce8107ea16521384c8b2a8fcff354ef2b7c" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Wed Nov 16 17:02:54 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:38:14 2011 -0200" }, "message": "perf tools: Use evsel-\u003eattr.sample_type instead of session-\u003esample_type\n\nEventually session-\u003esample_type will go away as we want to support\nmultiple sample types per session, so use it from the evsel which is a\nstep in that direction.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-0vwdpjcwbjezw459lw5n3ew1@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "246d4ce8107ea16521384c8b2a8fcff354ef2b7c", "tree": "07fbf7ad718cb25b8520d5ad28254c681459ca84", "parents": [ "10d0f086df77f3ff259b46cb501362dbaf2c7989" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Nov 11 23:10:26 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:37:58 2011 -0200" }, "message": "perf session: Remove superfluous callchain_cursor member\n\nSince we have it in evsel-\u003ehists.callchain_cursor, remove it from\nperf_session.\n\nOne more step in disentangling several places from requiring a\nperf_session pointer.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-rxr5dj3di7ckyfmnz0naku1z@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "10d0f086df77f3ff259b46cb501362dbaf2c7989", "tree": "69c8d8ccca5545c524abe0ac52a149e78fbc279f", "parents": [ "81e36bffad95e015af9741b5b1ee16afe08aab05" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Nov 11 22:45:41 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:37:43 2011 -0200" }, "message": "perf event: perf_event_ops-\u003eattr() manipulates only an evlist\n\nRemoving another case where a perf_session is required when processing\nevents.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-ug1wtjbnva4bxwknflkkrlrh@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "81e36bffad95e015af9741b5b1ee16afe08aab05", "tree": "3468b3f8e1109e8e1d89d5d910d3a533bf6da70e", "parents": [ "d04b35f8085f0d4c5c874515b8f65e7664357148" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Nov 11 22:28:50 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:37:29 2011 -0200" }, "message": "perf evlist: Introduce id_hdr_size method out of perf_session\n\nWe will need this when not using perf_session in cases like \u0027perf top\u0027\nand strace where no perf.data file is created nor consumed.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-za923wjc41q5xot5vrhuhj3j@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "d04b35f8085f0d4c5c874515b8f65e7664357148", "tree": "8115d7e30c274756097ce27742338438a14fabd5", "parents": [ "18b552350515188a732db6ccdb81e9cefb8b58c9" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Nov 11 22:17:32 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:37:11 2011 -0200" }, "message": "perf symbols: Add nr_events to symbol_conf\n\nSince symbol__alloc_hists need it, to avoid passing it around in many\nfunctions have it in the symbol_conf struct.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-cwv8ysvpywzjq4v3xtbd4zwv@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "18b552350515188a732db6ccdb81e9cefb8b58c9", "tree": "b72dd1ee805cfc7621c29f63761704b3e64dd2c2", "parents": [ "ed80f5813fd6ecc6d74250681910a4214f699d4e" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Nov 11 22:08:07 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:36:57 2011 -0200" }, "message": "perf ui progress: Fix divide by zero\n\nHappens in a perf.data file where one of the events had no samples.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-j7st3oyiotvfxqde2nc41kxb@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "ed80f5813fd6ecc6d74250681910a4214f699d4e", "tree": "83ca3cfb0742849533de1da4ad66ef4456e1ba64", "parents": [ "b424eba27160dd19577896d4520b8eebabed919f" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Nov 11 15:12:56 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:36:27 2011 -0200" }, "message": "perf record: Move \u0027group\u0027 to perf_event_ops\n\nWill be used in other tools to share the command line parsing code.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-8x0yr77r6lrd2t699s499m8n@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "b424eba27160dd19577896d4520b8eebabed919f", "tree": "f70a5cceecb05ad86b043f7b7cde6b5401af536f", "parents": [ "01c2d99bcf6fc7f6ce3fe3d0fb38b124e1f127fc" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Wed Nov 09 13:24:25 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:35:31 2011 -0200" }, "message": "perf session: Move threads to struct machine\n\nThe \u0027machine\u0027 abstraction was introduced with \u0027perf kvm\u0027 where we could\nhave samples for the host and multiple guests, but at the time we ended\nup keeping the list of all machines threads all in\nsession-\u003ehost_machine.\n\nMove the threads rb_tree to struct machine to separate the namespaces.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-mdg7sm6j3va09vtgj49gbsrp@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "01c2d99bcf6fc7f6ce3fe3d0fb38b124e1f127fc", "tree": "a82dbbcdd444ae999ab2985a81c9d31b81497e36", "parents": [ "50a682ce875f91e04c81ae5680535aba5a770bad" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Wed Nov 09 09:16:26 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:34:50 2011 -0200" }, "message": "perf record: Move mmap_pages to perf_record_opts\n\nTools being developed will need this to allow the user to override this\nvalue.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-zydc1yhxfm0z35fuy95bsn1l@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "50a682ce875f91e04c81ae5680535aba5a770bad", "tree": "d5a6a0c1cfc3b51f55ece86fc02a459c29f3eab2", "parents": [ "35b9d88ecd8c5fb720ba0dd325262f356d0b03e7" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Wed Nov 09 09:10:47 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:26:43 2011 -0200" }, "message": "perf evlist: Handle default value for \u0027pages\u0027 on mmap method\n\nEvery tool that calls this and allows the user to override the value\nneeds this logic.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-lwscxpg57xfzahz5dmdfp9uz@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "35b9d88ecd8c5fb720ba0dd325262f356d0b03e7", "tree": "536902f734862d5b04a6122c81386fddb19f4bcd", "parents": [ "0f82ebc452f921590e216b28eee0b41f5e434a48" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Wed Nov 09 08:47:15 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:26:14 2011 -0200" }, "message": "perf evlist: Introduce {prepare,start}_workload refactored from \u0027perf record\u0027\n\nSo that we can easily start a workload in other tools.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-zdsksd4aphu0nltg2lpwsw3x@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "0f82ebc452f921590e216b28eee0b41f5e434a48", "tree": "96f8f0df01f362f3184e3dbc1137809e4d0aa065", "parents": [ "a8c9ae18d810e1ae12b6ec960907e9af63171d3a" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Tue Nov 08 14:41:57 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:25:31 2011 -0200" }, "message": "perf evsel: Introduce config attr method\n\nOut of the code in \u0027perf record\u0027, so that we can share option parsing,\netc. Eventually will be used by \u0027perf top\u0027, but first \u0027trace\u0027 will use\nit.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-hzjqsgnte1esk90ytq0ap98v@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "a8c9ae18d810e1ae12b6ec960907e9af63171d3a", "tree": "aaeb04c5a0fa18bbafab7bb548142bca36968f02", "parents": [ "50d08e47bc04eb05502f5c86b70bbd19ef1c2778" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Sat Nov 05 08:41:51 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:25:11 2011 -0200" }, "message": "perf evlist: Introduce add_tracepoints method\n\nConvenient way of asking for tracepoint events to be added to an\nexisting evlist.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-0ylj4wrg54791u0baqb9swbb@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "50d08e47bc04eb05502f5c86b70bbd19ef1c2778", "tree": "655bddc48548db3d878ab416fddc13b3e6d34a6c", "parents": [ "ebf294bf4f147aff29df5a16bfb0f8ebca15feaa" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri Nov 04 09:10:59 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:24:43 2011 -0200" }, "message": "perf evlist: Introduce perf_evlist__add_attrs\n\nReplacing the open coded equivalents in \u0027perf stat\u0027.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-1btwadnf2tds2g07hsccsdse@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "ebf294bf4f147aff29df5a16bfb0f8ebca15feaa", "tree": "37464624abf9243100eab47fdc663def4be121fe", "parents": [ "c168fbfb93a1c4044287858c6784f0bd1f6cfe33" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Wed Nov 16 14:03:07 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:11:28 2011 -0200" }, "message": "perf tools: Simplify debugfs mountpoint handling code\n\nWe don\u0027t need to have two PATH_MAX char sized arrays holding it, just\none in util/debugfs.c will do.\n\nAlso rename debugfs_path to tracing_events_path, as it is not the path\nto debugfs, that is debugfs_mountpoint. Both are now accessible.\n\nThis will allow accessing this code in the perf python binding without\nhaving to drag in perf.c and util/parse-events.c.\n\nThe defaults for these variables are the canonical \"/sys/kernel/debug\"\nand \"/sys/kernel/debug/tracing/events/\", removing the need for simple\ntools to call debugfs_mount(NULL).\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-ug9jvtjrsqbluuhqqxpvg30f@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "c168fbfb93a1c4044287858c6784f0bd1f6cfe33", "tree": "517df56c9a1db500e1ccb2bab4a9eac4e9db93d0", "parents": [ "c23205c8488f11cb9ebe7a7b5851a1d8a0171011" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Wed Nov 16 12:55:59 2011 -0200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Nov 28 10:11:04 2011 -0200" }, "message": "perf tools: Eliminate duplicate code and use PATH_MAX consistently\n\nNo need for multiple definitions for STR() and die(), also use SuSv2\u0027s\nPATH_MAX instead of adding MAX_PATH.\n\nCc: David Ahern \u003cdsahern@gmail.com\u003e\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-qpujjkw7u0bf0tr4wt55cr9y@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "c23205c8488f11cb9ebe7a7b5851a1d8a0171011", "tree": "239dd82daddb1ce08b50ea9145d8f2a4685ebead", "parents": [ "5d81e5cfb37a174e8ddc0413e2e70cdf05807ace", "de346b6949063aa040ef607943b072835294f4b3" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Nov 15 11:05:18 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Nov 15 11:05:18 2011 +0100" }, "message": "Merge branch \u0027core\u0027 of git://amd64.org/linux/rric into perf/core\n" }, { "commit": "5d81e5cfb37a174e8ddc0413e2e70cdf05807ace", "tree": "3190ed611a1b88092d4a0aee584b505999a26f17", "parents": [ "9251f904f95175b4a1d8cbc0449e748f9edd7629" ], "author": { "name": "Andrew Vagin", "email": "avagin@openvz.org", "time": "Mon Nov 07 15:54:12 2011 +0300" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 14 13:31:28 2011 +0100" }, "message": "events: Don\u0027t divide events if it has field period\n\nThis patch solves the following problem:\n\nNow some samples may be lost due to throttling. The number of samples is\nrestricted by sysctl_perf_event_sample_rate/HZ. A trace event is\ndivided on some samples according to event\u0027s period. I don\u0027t sure, that\nwe should generate more than one sample on each trace event. I think the\nbetter way to use SAMPLE_PERIOD.\n\nE.g.: I want to trace when a process sleeps. I created a process, which\nsleeps for 1ms and for 4ms. perf got 100 events in both cases.\n\nswapper 0 [000] 1141.371830: sched_stat_sleep: comm\u003dfoo pid\u003d1801 delay\u003d1386750 [ns]\nswapper 0 [000] 1141.369444: sched_stat_sleep: comm\u003dfoo pid\u003d1801 delay\u003d4499585 [ns]\n\nIn the first case a kernel want to send 4499585 events and\nin the second case it wants to send 1386750 events.\nperf-reports shows that process sleeps in both places equal time. It\u0027s\nbug.\n\nWith this patch kernel generates one event on each \"sleep\" and the time\nslice is saved in the field \"period\". Perf knows how handle it.\n\nSigned-off-by: Andrew Vagin \u003cavagin@openvz.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1320670457-2633428-3-git-send-email-avagin@openvz.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9251f904f95175b4a1d8cbc0449e748f9edd7629", "tree": "585b73028c0c6b955d1759faf8544870eae213f5", "parents": [ "efc96737bd82b508794d2b28061a12af4a3f7766" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Sun Oct 16 17:15:04 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 14 13:31:26 2011 +0100" }, "message": "perf: Carve out callchain functionality\n\nSplit the callchain code from the perf events core into\na new kernel/events/callchain.c file.\n\nThis simplifies a bit the big core.c\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\n[keep ctx recursion handling inline and use internal headers]\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1318778104-17152-1-git-send-email-fweisbec@gmail.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "efc96737bd82b508794d2b28061a12af4a3f7766", "tree": "e9fe4982967b74c0d25a35a2d7f7c62d8be98a47", "parents": [ "1ec454baf1245df4fdb5dae728da3363630ce6de", "7e9a49ef542610609144d1afcd516dc3fafac4d6" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 11 08:19:37 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 11 08:19:37 2011 +0100" }, "message": "Merge branch \u0027tip/perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core\n" }, { "commit": "1ec454baf1245df4fdb5dae728da3363630ce6de", "tree": "88bf565984db893b02bfdcae81b3a1d7d351d123", "parents": [ "19e0bafc36abd84a5b4d7c7745b78a6f4626e944" ], "author": { "name": "Masami Hiramatsu", "email": "masami.hiramatsu.pt@hitachi.com", "time": "Thu Oct 20 23:01:09 2011 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 10 12:38:51 2011 +0100" }, "message": "x86, perf: Add a build-time sanity test to the x86 decoder\n\nAdd a sanity test of x86 insn decoder against a stream\nof randomly generated input, at build time.\n\nThis test is also able to reproduce any bug that might\ntrigger by allowing the passing of random-seed and\niteration-number to the test, or by passing input\nwhich has invalid byte code.\n\nChanges in V2:\n - Code cleanup.\n - Show how to reproduce the error by insn_sanity test.\n\nSigned-off-by: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: acme@redhat.com\nCc: ming.m.lin@intel.com\nCc: robert.richter@amd.com\nCc: ravitillo@lbl.gov\nCc: yrl.pp-manager.tt@hitachi.com\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nLink: http://lkml.kernel.org/r/20111020140109.20938.92572.stgit@localhost.localdomain\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "19e0bafc36abd84a5b4d7c7745b78a6f4626e944", "tree": "03de585a0d840db316bcd93eca8882a920ae6c70", "parents": [ "ed72a3d1b4acb8ace77a1049fbbcbc7edb035267", "6aec187a90aeb883533c9180e2acac1e54c87f7d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 18:34:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 18:34:16 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n drivers/media: video/a5k6aa is a module and so needs module.h\n mfd: fix build failures in recently added ab5500 code\n hwspinlock/u8500: include linux/module.h\n MTD: MAPS: bcm963xx-flash.c: explicitly include module.h\n" }, { "commit": "ed72a3d1b4acb8ace77a1049fbbcbc7edb035267", "tree": "20c228d41a9d73a8949858dc915a7a21878cc5a4", "parents": [ "c8c27c955ac633c0d783ec65f65176c82809f04d", "257a4b42af7586fab4eaec7f04e6896b86551843" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 18:33:53 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 18:33:53 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://neil.brown.name/md\n\n* \u0027for-linus\u0027 of git://neil.brown.name/md:\n md/raid5: STRIPE_ACTIVE has lock semantics, add barriers\n md/raid5: abort any pending parity operations when array fails.\n" }, { "commit": "c8c27c955ac633c0d783ec65f65176c82809f04d", "tree": "c20837439bd8f12dad4ba3b0ebe77cedf0cfff29", "parents": [ "98393b8ff2ca98b5b984e73a291b81b326e25184", "5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 18:33:11 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 18:33:11 2011 -0800" }, "message": "Merge branch \u0027docs-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs\n\n* \u0027docs-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: (45 commits)\n DocBook/drm: Clean up a todo-note\n DocBook/drm: `device aware\u0027 -\u003e `device-aware\u0027\n DocBook/drm: `(device|driver) specific\u0027 -\u003e `(device|driver)-specific\u0027\n DocBook/drm: Clean up the paragraph on framebuffer objects\n DocBook/drm: Use `; otherwise,\u0027\n DocBook/drm: Better flow with `, and then\u0027\n DocBook/drm: Refer to the domain-setting function as a device-specific ioctl\n DocBook/drm: Improve flow of GPU/CPU coherence sentence\n DocBook/drm: Use an \u003citemizelist\u003e for fundamental GEM operations\n DocBook/drm: Insert a comma\n DocBook/drm: Use a \u003cvariablelist\u003e for vblank ioctls\n DocBook/drm: Use an itemizedlist for what an encoder needs to provide\n DocBook/drm: Insert `the\u0027 for readability, and change `set\u0027 to `setting\u0027\n DocBook/drm: Remove extraneous commas\n DocBook/drm: Use a colon\n DocBook/drm: Clarify `final initialization\u0027 via better formatting\n DocBook/drm: Remove redundancy\n DocBook/drm: Insert `it\u0027 for smooth reading\n DocBook/drm: The word `so-called\u0027; I do not think it connotes what you think it connotes\n DocBook/drm: Use a singular subject for grammatical cleanliness\n ...\n" }, { "commit": "98393b8ff2ca98b5b984e73a291b81b326e25184", "tree": "eebde91713a68c633a322cce66821b67c434d4b9", "parents": [ "3b7546211d53f600e15ca7867adbf3c085b8ecc9", "815e2bd7d609da9c7615ea28a3990064a394312f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 15:41:10 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 15:41:10 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: (21 commits)\n ktest: Evaluate variables entered on the command line\n ktest: Add variable ${PWD}\n ktest: Add another monitor flush before installing kernel\n ktest: Do not opencode reboot in grub setting\n ktest: Add processing of complex conditionals\n ktest: Fix parsing of config section lines\n ktest: Sort make_min_config configs by dependecies\n ktest: Add DEFINED keyword for IF statements\n ktest: Add OVERRIDE keyword to DEFAULTS section\n ktest: Consolidate TEST_TYPE and DEFAULT code\n ktest: Add INCLUDE keyword to include other config files\n ktest: Let IF keyword take comparisons\n ktest: Add IF and ELSE to config sections\n ktest: Do not reboot on config or build issues\n ktest: Add option REBOOT_SUCCESS_LINE to stop waiting after a reboot\n ktest: Add NO_INSTALL option to not install for a test\n ktest: Fail when grub menu not found\n ktest: Include monitor in reboot code\n ktest: Only need to save .config when doing mrproper\n ktest: Create outputdir if it does not exist\n ...\n" }, { "commit": "3b7546211d53f600e15ca7867adbf3c085b8ecc9", "tree": "9bd7f0eb414bad882d3e7f59e742ac1a21e804c5", "parents": [ "c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1", "156acb166ea9a43d7fcdf9b8051694ce4e91dbfc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 14:24:18 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 14:24:18 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())\n PM / devfreq: fix private_data\n Documentation: Fix typo in freezer-subsystem.txt\n PM / QoS: Set cpu_dma_pm_qos-\u003ename\n" }, { "commit": "156acb166ea9a43d7fcdf9b8051694ce4e91dbfc", "tree": "944ba8516cb681decf943c34b7ba4f872991eaaa", "parents": [ "1a51cfdc4516a6e1f2c1f8a579630a027c30331a" ], "author": { "name": "Thomas Meyer", "email": "thomas@m3y3r.de", "time": "Tue Nov 08 22:34:00 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Nov 08 22:34:00 2011 +0100" }, "message": "PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())\n\nUse ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))\n\n[The semantic patch that makes this change is available\n in scripts/coccinelle/api/err_cast.cocci.\n\n More information about semantic patching is available at\n http://coccinelle.lip6.fr/]\n\nSigned-off-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1", "tree": "f0ba7e8b50a4f103caa1c5033d30375c2d1dd5ed", "parents": [ "6ccce2b32900a8a6f481036e0cbbfe174742352c", "fdcb23634c9b6649bb02c681033d4973491b0e35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:54 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:54 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:\n hwspinlock/u8500: fix build error due to undefined label\n hwspinlock: Don\u0027t return a value in __hwspin_unlock\n" }, { "commit": "6ccce2b32900a8a6f481036e0cbbfe174742352c", "tree": "b7f214d6d72f2b8c51b2f0587736fc0fa9240cb5", "parents": [ "dccefb3729c8c2b17e45c68cdc0d575f2473a5f0", "51ce185af0f71b65c23ed719f72d0241895a61da" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:02 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc: Hook up process_vm_{readv,writev} syscalls.\n" }, { "commit": "dccefb3729c8c2b17e45c68cdc0d575f2473a5f0", "tree": "1369129e16720462e095b50d89a6311b259c82d8", "parents": [ "b9c913f327ccc5cf422b6dc9b5acfbc9b86e7b62" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:49:29 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:49:29 2011 -0800" }, "message": "x86 platform drivers: add POWER_SUPPLY to selected drivers for Dell\n\nThe Kconfig loop detection goes crazy without this.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b9c913f327ccc5cf422b6dc9b5acfbc9b86e7b62", "tree": "af7f7f62fe10a962f4c2b48efd960c10be6df25d", "parents": [ "a8d12007c795f3d69ee0b2d29f0abfefd55c6120" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:17:25 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:17:25 2011 -0800" }, "message": "x86 platform drivers: make Dell laptop driver select needed LED support\n\nOtherwise we get compile errors like this:\n\n ERROR: \"led_classdev_unregister\" [drivers/platform/x86/dell-laptop.ko] undefined!\n ERROR: \"led_classdev_register\" [drivers/platform/x86/dell-laptop.ko] undefined!\n make[1]: *** [__modpost] Error 1\n make: *** [modules] Error 2\n\nwhen the dell-laptop support is enabled without the necessary LED\nsupport being enabled.\n\nReported-by: Alessandro Suardi \u003calessandro.suardi@gmail.com\u003e\nAcked-by: Matthew Garrett \u003cmjg59@srcf.ucam.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6aec187a90aeb883533c9180e2acac1e54c87f7d", "tree": "4448311943ef60cdf47f90200716a54d885b0ede", "parents": [ "3b8ce3aed986090d9249629f97c53b4dfb8c9783" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Nov 08 14:56:50 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Nov 08 14:56:50 2011 -0500" }, "message": "drivers/media: video/a5k6aa is a module and so needs module.h\n\nThis file uses core functions like module_init() and module_exit()\nand so it explicitly needs to include the module.h header.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "a8d12007c795f3d69ee0b2d29f0abfefd55c6120", "tree": "c092e9392ab8265d3e0094d7b55affafb21176c2", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 08 18:02:10 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 10:10:20 2011 -0800" }, "message": "n_gsm: Fix timings\n\nAlek Du reported that the code erroneously applies time to jiffies\nconversions twice to the t1 and t2 values. In normal use on a modem link\nthis cases no visible problem but on a slower link it will break as with\nHZ\u003d1000 as is typical we are running t1/t2 ten times too fast.\n\nAlek\u0027s original patch removed the conversion from the timer setting but we\nin fact have to be more careful as the contents of t1/t2 are visible via\nthe device API and we thus need to correct the constants.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de346b6949063aa040ef607943b072835294f4b3", "tree": "11f5a10b9ab41a10ea26bf8ab1f133b802e7559e", "parents": [ "dcfce4a095932e6e95d83ad982be3609947963bc", "9c48f1c629ecfa114850c03f875c6691003214de" ], "author": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Tue Nov 08 15:52:15 2011 +0100" }, "committer": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Tue Nov 08 15:52:15 2011 +0100" }, "message": "Merge branch \u0027perf/core\u0027 into oprofile/master\n\nMerge reason: Resolve conflicts with Don\u0027s NMI rework:\n\n commit 9c48f1c629ecfa114850c03f875c6691003214de\n Author: Don Zickus \u003cdzickus@redhat.com\u003e\n Date: Fri Sep 30 15:06:21 2011 -0400\n x86, nmi: Wire up NMI handlers to new routines\n\nConflicts:\n\tarch/x86/oprofile/nmi_timer_int.c\n\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\n" }, { "commit": "fdcb23634c9b6649bb02c681033d4973491b0e35", "tree": "e46cca4b5748501aa8f2b3204e1c0e2d87dc0509", "parents": [ "816af3bb5022c1468b3d826c645ddc2cac45bc97" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sun Nov 06 21:14:16 2011 +0800" }, "committer": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Nov 08 09:28:41 2011 +0200" }, "message": "hwspinlock/u8500: fix build error due to undefined label\n\nFix below build error:\n\n CC drivers/hwspinlock/u8500_hsem.o\ndrivers/hwspinlock/u8500_hsem.c: In function \u0027u8500_hsem_probe\u0027:\ndrivers/hwspinlock/u8500_hsem.c:113: error: label \u0027free_state\u0027 used but not defined\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\n" }, { "commit": "816af3bb5022c1468b3d826c645ddc2cac45bc97", "tree": "1b2a6abc75c00366f71c820ae946f4bdce4d90d9", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Thu Nov 03 14:45:48 2011 +0800" }, "committer": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Tue Nov 08 09:28:27 2011 +0200" }, "message": "hwspinlock: Don\u0027t return a value in __hwspin_unlock\n\nFix below build warning:\n\n CC arch/arm/mach-omap2/hwspinlock.o\nIn file included from arch/arm/mach-omap2/hwspinlock.c:22:\ninclude/linux/hwspinlock.h: In function \u0027__hwspin_unlock\u0027:\ninclude/linux/hwspinlock.h:121: warning: \u0027return\u0027 with a value, in function returning void\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\n" }, { "commit": "257a4b42af7586fab4eaec7f04e6896b86551843", "tree": "ec65357b2320ba4e4341a2853245048889666f5c", "parents": [ "9a3f530f39f4490eaa18b02719fb74ce5f4d2d86" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Nov 08 16:22:06 2011 +1100" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Nov 08 16:22:06 2011 +1100" }, "message": "md/raid5: STRIPE_ACTIVE has lock semantics, add barriers\n\nAll updates that occur under STRIPE_ACTIVE should be globally visible\nwhen STRIPE_ACTIVE clears. test_and_set_bit() implies a barrier, but\nclear_bit() does not.\n\nThis is suitable for 3.1-stable.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\nCc: stable@kernel.org\n" }, { "commit": "9a3f530f39f4490eaa18b02719fb74ce5f4d2d86", "tree": "4bcff31bacd9b242360f48dad706d8b5231ffafe", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Nov 08 16:22:01 2011 +1100" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Nov 08 16:22:01 2011 +1100" }, "message": "md/raid5: abort any pending parity operations when array fails.\n\nWhen the number of failed devices exceeds the allowed number\nwe must abort any active parity operations (checks or updates) as they\nare no longer meaningful, and can lead to a BUG_ON in\nhandle_parity_checks6.\n\nThis bug was introduce by commit 6c0069c0ae9659e3a91b68eaed06a5c6c37f45c8\nin 2.6.29.\n\nReported-by: Manish Katiyar \u003cmkatiyar@gmail.com\u003e\nTested-by: Manish Katiyar \u003cmkatiyar@gmail.com\u003e\nAcked-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\nCc: stable@kernel.org\n" }, { "commit": "3b8ce3aed986090d9249629f97c53b4dfb8c9783", "tree": "76e31f066e8c387dd2125957c876a98c73b6f451", "parents": [ "8f7346bdea64f2e3d02b0bcaf456e391c4cba134" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Nov 07 11:17:04 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Nov 07 21:45:14 2011 -0500" }, "message": "mfd: fix build failures in recently added ab5500 code\n\nThese files had implicit dependencies on modular support\nwhich now show up as build failures with the module cleanup\nwork merged to mainline.\n\nReported-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "8f7346bdea64f2e3d02b0bcaf456e391c4cba134", "tree": "811119f8c49358d316440f5ff67ae5d18c01a26c", "parents": [ "4e549d6d4a32d1a610ad081841d575f64087744a" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sun Nov 06 21:16:51 2011 +0800" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Nov 07 21:45:14 2011 -0500" }, "message": "hwspinlock/u8500: include linux/module.h\n\nInclude module.h to fix below build error:\n\n CC drivers/hwspinlock/u8500_hsem.o\ndrivers/hwspinlock/u8500_hsem.c:177: error: \u0027THIS_MODULE\u0027 undeclared here (not in a function)\n [...]\ndrivers/hwspinlock/u8500_hsem.c:196: warning: type defaults to \u0027int\u0027 in declaration of \u0027MODULE_AUTHOR\u0027\ndrivers/hwspinlock/u8500_hsem.c:196: warning: function declaration isn\u0027t a prototype\nmake[2]: *** [drivers/hwspinlock/u8500_hsem.o] Error 1\nmake[1]: *** [drivers/hwspinlock] Error 2\nmake: *** [drivers] Error 2\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "4e549d6d4a32d1a610ad081841d575f64087744a", "tree": "ad6298af387f345504eda5f2fa3c9e3274abe881", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Jonas Gorski", "email": "jonas.gorski@gmail.com", "time": "Sun Nov 06 12:57:31 2011 +0100" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Nov 07 21:26:55 2011 -0500" }, "message": "MTD: MAPS: bcm963xx-flash.c: explicitly include module.h\n\nmodule.h was previously implicitly included through mtd/mtd.h.\n\nFixes the following build failure after the module.h cleanup:\n\n CC drivers/mtd/maps/bcm963xx-flash.o\ndrivers/mtd/maps/bcm963xx-flash.c: In function \u0027bcm963xx_probe\u0027:\ndrivers/mtd/maps/bcm963xx-flash.c:208:29: error: \u0027THIS_MODULE\u0027 undeclared (first use in this function)\n [...]\ndrivers/mtd/maps/bcm963xx-flash.c:276:1: warning: type defaults to \u0027int\u0027 in declaration of \u0027MODULE_AUTHOR\u0027\ndrivers/mtd/maps/bcm963xx-flash.c:276:15: warning: function declaration isn\u0027t a prototype\nmake[7]: *** [drivers/mtd/maps/bcm963xx-flash.o] Error 1\n\nSigned-off-by: Jonas Gorski \u003cjonas.gorski@gmail.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "1ea6b8f48918282bdca0b32a34095504ee65bab5", "tree": "01099b45d72a6b9977cebe34b97938b07d00a0b5", "parents": [ "075cb105cb6dcda8a585989ebd4a71f0b3c33f3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:16:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:16:02 2011 -0800" }, "message": "Linux 3.2-rc1\n\n.. with new name. Because nothing says \"really solid kernel release\"\nlike naming it after an extinct animal that just happened to be in the\nnews lately.\n" }, { "commit": "075cb105cb6dcda8a585989ebd4a71f0b3c33f3e", "tree": "288b8ceb07f2f9780c572ca8c15b9d3096928ba0", "parents": [ "a3fbbde70a0cec017f2431e8f8de208708c76acc", "d30cc16c8e48368e0518f4975a78711e53e14a0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (31 commits)\n ARM: OMAP: Fix export.h or module.h includes\n ARM: OMAP: omap_device: Include linux/export.h\n ARM: OMAP2: Fix H4 matrix keyboard warning\n ARM: OMAP1: Remove unused omap-alsa.h\n ARM: OMAP1: Fix warnings about enabling 32 KiHz timer\n ARM: OMAP2+: timer: Remove omap_device_pm_latency\n ARM: OMAP2+: clock data: Remove redundant timer clkdev\n ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio\n ARM: OMAP: usb: musb: OMAP: Delete unused function\n MAINTAINERS: Update linux-omap git repository\n ARM: OMAP: change get_context_loss_count ret value to int\n ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly\n ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF\n ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list\n ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success\n ARM: OMAP: dmtimer: Include linux/module.h\n ARM: OMAP2+: l3-noc: Include linux/module.h\n ARM: OMAP2+: devices: Fixes for McPDM\n ARM: OMAP: Fix errors and warnings when building for one board\n ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only\n ...\n" }, { "commit": "a3fbbde70a0cec017f2431e8f8de208708c76acc", "tree": "f584856e638ca916a8aca32eda58a8fe89722c9f", "parents": [ "54a0f91301950af3d6ae2ff2bf710c9c68a9bfea" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Mon Nov 07 21:21:26 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 14:58:06 2011 -0800" }, "message": "VFS: we need to set LOOKUP_JUMPED on mountpoint crossing\n\nMountpoint crossing is similar to following procfs symlinks - we do\nnot get -\u003ed_revalidate() called for dentry we have arrived at, with\nunpleasant consequences for NFS4.\n\nSimple way to reproduce the problem in mainline:\n\n cat \u003e/tmp/a.c \u003c\u003c\u0027EOF\u0027\n #include \u003cunistd.h\u003e\n #include \u003cfcntl.h\u003e\n #include \u003cstdio.h\u003e\n main()\n {\n struct flock fl \u003d {.l_type \u003d F_RDLCK, .l_whence \u003d SEEK_SET, .l_len \u003d 1};\n if (fcntl(0, F_SETLK, \u0026fl))\n perror(\"setlk\");\n }\n EOF\n cc /tmp/a.c -o /tmp/test\n\nthen on nfs4:\n\n mount --bind file1 file2\n /tmp/test \u003c file1\t\t# ok\n /tmp/test \u003c file2\t\t# spews \"setlk: No locks available\"...\n\nWhat happens is the missing call of -\u003ed_revalidate() after mountpoint\ncrossing and that\u0027s where NFS4 would issue OPEN request to server.\n\nThe fix is simple - treat mountpoint crossing the same way we deal with\nfollowing procfs-style symlinks. I.e. set LOOKUP_JUMPED...\n\nCc: stable@kernel.org\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a51cfdc4516a6e1f2c1f8a579630a027c30331a", "tree": "e5bd9e80887009225f264a1ba84588f733caa8f0", "parents": [ "5f11161675be1351cadb96c83850e20bf5bcdc48" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Mon Nov 07 23:54:53 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Nov 07 23:54:53 2011 +0100" }, "message": "PM / devfreq: fix private_data\n\nThe \"private_date\" field in struct devfreq_dev_status almost certainly\nwants to be \"private_data\"; since there are no in-tree users of this\nfunctionality, now seems like an easy time to make the fix.\n\nSigned-off-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5f11161675be1351cadb96c83850e20bf5bcdc48", "tree": "5e352c617694d5109319d0f765cae9c56039a11e", "parents": [ "a6f05b97d1ba87326bd96f3da9fef994830d6994" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Nov 06 22:00:20 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Nov 07 23:02:25 2011 +0100" }, "message": "Documentation: Fix typo in freezer-subsystem.txt\n\nFix a typo in Documentation/cgroups/freezer-subsystem.txt.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReviewed-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\n" }, { "commit": "a6f05b97d1ba87326bd96f3da9fef994830d6994", "tree": "d3e4aa1f3d0691c45842b49338d2fce8e74a43e7", "parents": [ "94956eed14b4b16d401c8ad36d68df0608f968cb" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Nov 06 21:54:12 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Nov 07 23:02:24 2011 +0100" }, "message": "PM / QoS: Set cpu_dma_pm_qos-\u003ename\n\nSince commit 4a31a334, the name of this misc device is not initialized,\nwhich leads to a funny device named /dev/(null) being created and\n/proc/misc containing an entry with just a number but no name. The latter\nleads to complaints by cryptsetup, which caused me to investigate this\nmatter.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "54a0f91301950af3d6ae2ff2bf710c9c68a9bfea", "tree": "ffcdf0b916f9c5f805cab347e53b60be17c9aead", "parents": [ "94956eed14b4b16d401c8ad36d68df0608f968cb", "f9e3d4b1a9c86217655997d3ef109b1eaae967bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 12:38:11 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 12:38:11 2011 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf top: Fix live annotation in the --stdio interface\n perf top tui: Don\u0027t recalc column widths considering just the first page\n perf report: Add progress bar when processing time ordered events\n perf hists browser: Warn about lost events\n perf tools: Fix a typo of command name as trace-cmd\n perf hists: Fix recalculation of total_period when sorting entries\n perf header: Fix build on old systems\n perf ui browser: Handle K_RESIZE in dialog windows\n perf ui browser: No need to switch char sets that often\n perf hists browser: Use K_TIMER\n perf ui: Rename ui__warning_paranoid to ui__error_paranoid\n perf ui: Reimplement the popup windows using libslang\n perf ui: Reimplement ui__popup_menu using ui__browser\n perf ui: Reimplement ui_helpline using libslang\n perf ui: Improve handling sigwinch a bit\n perf ui progress: Reimplement using slang\n perf evlist: Fix grouping of multiple events\n" }, { "commit": "d30cc16c8e48368e0518f4975a78711e53e14a0f", "tree": "26b57f7ab5a963cc3d6c57dff6951bd930875583", "parents": [ "41eb2d813f558900884e240c2f723e36c7bd151f", "a1bcc1dcef8451b4291ea2a1b2677cb194102952" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "message": "Merge branch \u0027fixes-modulesplit\u0027 into fixes\n" }, { "commit": "a1bcc1dcef8451b4291ea2a1b2677cb194102952", "tree": "156edbbee0f46bc89d7fb323673edd2a88ba0c1a", "parents": [ "5558141556d20f2bea7a664d70a867b8f64ca38d" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: Fix export.h or module.h includes\n\nCommit 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (Merge branch\n\u0027modsplit-Oct31_2011\u0027...) caused some build errors. Fix these\nand make sure we always have export.h or module.h included\nfor MODULE_ and EXPORT_SYMBOL users:\n\n$ grep -rl ^MODULE_ arch/arm/*omap*/*.c | xargs \\\n grep -L linux/module.h\n arch/arm/mach-omap2/dsp.c\n arch/arm/mach-omap2/mailbox.c\n arch/arm/mach-omap2/omap-iommu.c\n arch/arm/mach-omap2/smartreflex.c\n\nAlso check we either have export.h or module.h included\nfor the files exporting symbols:\n\n$ grep -rl EXPORT_SYMBOL arch/arm/*omap*/*.c | xargs \\\n grep -L linux/export.h | xargs grep -L linux/module.h\n\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "5558141556d20f2bea7a664d70a867b8f64ca38d", "tree": "2d5b5e5c3b2dbfe3471fc172a9e813d178c3fc0f", "parents": [ "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: omap_device: Include linux/export.h\n\nInclude linux/export.h to fix below build warning:\n\n CC arch/arm/plat-omap/omap_device.o\narch/arm/plat-omap/omap_device.c:1055: warning: data definition has no type or storage class\narch/arm/plat-omap/omap_device.c:1055: warning: type defaults to \u0027int\u0027 in declaration of \u0027EXPORT_SYMBOL\u0027\narch/arm/plat-omap/omap_device.c:1055: warning: parameter names (without types) in function declaration\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "94956eed14b4b16d401c8ad36d68df0608f968cb", "tree": "60e4e1a3c2c44e8f6616db78cd6b22737b2a1f37", "parents": [ "50e696308c3fb18a4a0dae7b3a4d47469149c919", "e45a618753d5a8bc9086382f73bbc2d6a3399250" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n forcedeth: fix a few sparse warnings (variable shadowing)\n forcedeth: Improve stats counters\n forcedeth: remove unneeded stats updates\n forcedeth: Acknowledge only interrupts that are being processed\n forcedeth: fix race when unloading module\n MAINTAINERS/rds: update maintainer\n wanrouter: Remove kernel_lock annotations\n usbnet: fix oops in usbnet_start_xmit\n ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n etherh: Add MAINTAINERS entry for etherh\n bonding: comparing a u8 with -1 is always false\n sky2: fix regression on Yukon Optima\n netlink: clarify attribute length check documentation\n netlink: validate NLA_MSECS length\n i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n macvlan: receive multicast with local address\n tg3: Update version to 3.121\n tg3: Eliminate timer race with reset_task\n tg3: Schedule at most one tg3_reset_task run\n tg3: Obtain PCI function number from device\n ...\n" }, { "commit": "50e696308c3fb18a4a0dae7b3a4d47469149c919", "tree": "16ff458026c1551803b86d9e0f9f02c7a64182fa", "parents": [ "a84450604d0fe08b6a2335efbedede18d3d7cc75" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Mon Nov 07 16:39:57 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:54:10 2011 -0800" }, "message": "vfs: d_invalidate() should leave mountpoints alone\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7e9a49ef542610609144d1afcd516dc3fafac4d6", "tree": "a8b3748cbbb2ab61998d4c8e2f8c055e0edda104", "parents": [ "d4d34b981a5327eec956c6cb4cce397ce6f57279" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Mon Nov 07 16:08:49 2011 +0100" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Nov 07 13:48:35 2011 -0500" }, "message": "tracing/latency: Fix header output for latency tracers\n\nIn case the the graph tracer (CONFIG_FUNCTION_GRAPH_TRACER) or even the\nfunction tracer (CONFIG_FUNCTION_TRACER) are not set, the latency tracers\ndo not display proper latency header.\n\nThe involved/fixed latency tracers are:\n wakeup_rt\n wakeup\n preemptirqsoff\n preemptoff\n irqsoff\n\nThe patch adds proper handling of tracer configuration options for latency\ntracers, and displaying correct header info accordingly.\n\n* The current output (for wakeup tracer) with both graph and function\n tracers disabled is:\n\n # tracer: wakeup\n #\n \u003cidle\u003e-0 0d.h5 1us+: 0:120:R + [000] 7: 0:R watchdog/0\n \u003cidle\u003e-0 0d.h5 3us+: ttwu_do_activate.clone.1 \u003c-try_to_wake_up\n ...\n\n* The fixed output is:\n\n # tracer: wakeup\n #\n # wakeup latency trace v1.1.5 on 3.1.0-tip+\n # --------------------------------------------------------------------\n # latency: 55 us, #4/4, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2)\n # -----------------\n # | task: migration/0-6 (uid:0 nice:0 policy:1 rt_prio:99)\n # -----------------\n #\n # _------\u003d\u003e CPU#\n # / _-----\u003d\u003e irqs-off\n # | / _----\u003d\u003e need-resched\n # || / _---\u003d\u003e hardirq/softirq\n # ||| / _--\u003d\u003e preempt-depth\n # |||| / delay\n # cmd pid ||||| time | caller\n # \\ / ||||| \\ | /\n cat-1129 0d..4 1us : 1129:120:R + [000] 6: 0:R migration/0\n cat-1129 0d..4 2us+: ttwu_do_activate.clone.1 \u003c-try_to_wake_up\n\n* The current output (for wakeup tracer) with only function\n tracer enabled is:\n\n # tracer: wakeup\n #\n cat-1140 0d..4 1us+: 1140:120:R + [000] 6: 0:R migration/0\n cat-1140 0d..4 2us : ttwu_do_activate.clone.1 \u003c-try_to_wake_up\n\n* The fixed output is:\n # tracer: wakeup\n #\n # wakeup latency trace v1.1.5 on 3.1.0-tip+\n # --------------------------------------------------------------------\n # latency: 207 us, #109/109, CPU#1 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2)\n # -----------------\n # | task: watchdog/1-12 (uid:0 nice:0 policy:1 rt_prio:99)\n # -----------------\n #\n # _------\u003d\u003e CPU#\n # / _-----\u003d\u003e irqs-off\n # | / _----\u003d\u003e need-resched\n # || / _---\u003d\u003e hardirq/softirq\n # ||| / _--\u003d\u003e preempt-depth\n # |||| / delay\n # cmd pid ||||| time | caller\n # \\ / ||||| \\ | /\n \u003cidle\u003e-0 1d.h5 1us+: 0:120:R + [001] 12: 0:R watchdog/1\n \u003cidle\u003e-0 1d.h5 3us : ttwu_do_activate.clone.1 \u003c-try_to_wake_up\n\nLink: http://lkml.kernel.org/r/20111107150849.GE1807@m.brq.redhat.com\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "d4d34b981a5327eec956c6cb4cce397ce6f57279", "tree": "a5ee3ca4103b2a987f369a15cd9f28798d0d91cf", "parents": [ "49908a1b25d448d68fd26faca260e1850201575f" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Nov 04 20:32:39 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Nov 07 13:48:05 2011 -0500" }, "message": "ftrace: Fix hash record accounting bug\n\nIf the set_ftrace_filter is cleared by writing just whitespace to\nit, then the filter hash refcounts will be decremented but not\nupdated. This causes two bugs:\n\n1) No functions will be enabled for tracing when they all should be\n\n2) If the users clears the set_ftrace_filter twice, it will crash ftrace:\n\n------------[ cut here ]------------\nWARNING: at /home/rostedt/work/git/linux-trace.git/kernel/trace/ftrace.c:1384 __ftrace_hash_rec_update.part.27+0x157/0x1a7()\nModules linked in:\nPid: 2330, comm: bash Not tainted 3.1.0-test+ #32\nCall Trace:\n [\u003cffffffff81051828\u003e] warn_slowpath_common+0x83/0x9b\n [\u003cffffffff8105185a\u003e] warn_slowpath_null+0x1a/0x1c\n [\u003cffffffff810ba362\u003e] __ftrace_hash_rec_update.part.27+0x157/0x1a7\n [\u003cffffffff810ba6e8\u003e] ? ftrace_regex_release+0xa7/0x10f\n [\u003cffffffff8111bdfe\u003e] ? kfree+0xe5/0x115\n [\u003cffffffff810ba51e\u003e] ftrace_hash_move+0x2e/0x151\n [\u003cffffffff810ba6fb\u003e] ftrace_regex_release+0xba/0x10f\n [\u003cffffffff8112e49a\u003e] fput+0xfd/0x1c2\n [\u003cffffffff8112b54c\u003e] filp_close+0x6d/0x78\n [\u003cffffffff8113a92d\u003e] sys_dup3+0x197/0x1c1\n [\u003cffffffff8113a9a6\u003e] sys_dup2+0x4f/0x54\n [\u003cffffffff8150cac2\u003e] system_call_fastpath+0x16/0x1b\n---[ end trace 77a3a7ee73794a02 ]---\n\nLink: http://lkml.kernel.org/r/20111101141420.GA4918@debian\n\nReported-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "e45a618753d5a8bc9086382f73bbc2d6a3399250", "tree": "5d703fb6c245a761d9d6b838ecc7d7c594c97f7b", "parents": [ "0bdfea8ba856826f5901fda608013f323c87f661" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:25 2011 -0500" }, "message": "forcedeth: fix a few sparse warnings (variable shadowing)\n\nThis fixes the following sparse warnings:\ndrivers/net/ethernet/nvidia/forcedeth.c:2113:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2155:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2227:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2271:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2986:20: warning: symbol \u0027addr\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2963:6: originally declared here\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0bdfea8ba856826f5901fda608013f323c87f661", "tree": "8527b969d9e27d5f2ded73c643dc79c0c7dd4433", "parents": [ "4687f3f364a1d5b2df815a8c58a763cab57724e8" ], "author": { "name": "Mandeep Baines", "email": "msb@google.com", "time": "Sat Nov 05 14:38:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Improve stats counters\n\nRx byte count was off; instead use the hardware\u0027s count. Tx packet\ncount was counting pre-TSO packets; instead count on-the-wire packets.\nReport hardware dropped frame count as rx_fifo_errors.\n\n- The count of transmitted packets reported by the forcedeth driver\n reports pre-TSO (TCP Segmentation Offload) packet counts and not the\n count of the number of packets sent on the wire. This change fixes\n the forcedeth driver to report the correct count. Fixed the code by\n copying the count stored in the NIC H/W to the value reported by the\n driver.\n\n- Count rx_drop_frame errors as rx_fifo_errors:\n We see a lot of rx_drop_frame errors if we disable the rx bottom-halves\n for too long. Normally, rx_fifo_errors would be counted in this case.\n The rx_drop_frame error count is private to forcedeth and is not\n reported by ifconfig or sysfs. The rx_fifo_errors count is currently\n unused in the forcedeth driver. It is reported by ifconfig as overruns.\n This change reports rx_drop_frame errors as rx_fifo_errors.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4687f3f364a1d5b2df815a8c58a763cab57724e8", "tree": "9083050ec1f348c3f210172e337fcafb3b736678", "parents": [ "2a4e7a085fb44369c450c92cf8bd53b91f874a57" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: remove unneeded stats updates\n\nFunction ndo_get_stats() updates most of the stats from hardware\nregisters, making the manual updates un-needed. This change removes\nthese manual updates. Main exception is rx_missed_errors which needs\nmanual update.\n\nAnother exception is rx_packets, still updated manually in this commit\nto make sure this patch doesn\u0027t change behavior of driver. This will\nbe addressed by a future patch.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a4e7a085fb44369c450c92cf8bd53b91f874a57", "tree": "c96dd683da76b9698281521d249a11ece0ad59ea", "parents": [ "f9c4082df59e43c6667db197a4fb3eb3286f3fc1" ], "author": { "name": "Mike Ditto", "email": "mditto@google.com", "time": "Sat Nov 05 14:38:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Acknowledge only interrupts that are being processed\n\nThis is to avoid a race, accidentally acknowledging an interrupt that\nwe didn\u0027t notice and won\u0027t immediately process. This is based solely\non code inspection; it is not known if there was an actual bug here.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9c4082df59e43c6667db197a4fb3eb3286f3fc1", "tree": "2bd8c50a7a0ea2b12b0f384fb656eb51e32cfbd0", "parents": [ "dd1294c4ed25725d13a6cb3d93ca0eb5fee14963" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: fix race when unloading module\n\nWhen forcedeth module is unloaded, there exists a path that can lead\nto mod_timer() after del_timer_sync(), causing an oops. This patch\nshort-circuits this unneeded path, which originates in\nnv_get_ethtool_stats().\n\nTested:\n x86_64 16-way + 3 ethtool -S infinite loops + 100Mbps incoming traffic\n + rmmod/modprobe/ifconfig in a loop\n\nInitial-Author: Salman Qazi \u003csqazi@google.com\u003e\nDiscussion: http://patchwork.ozlabs.org/patch/123548/\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a84450604d0fe08b6a2335efbedede18d3d7cc75", "tree": "013be8cd17b787a3051d1d614f794f30573467f8", "parents": [ "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 20:27:43 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0", "tree": "bf8057b31cafcd43e6c4a60551bf24ece185ff07", "parents": [ "1944ce60fe1e92506d3347f4d8e10a82b17096e4" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 18:30:49 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: dm-bufio.c needs to include module.h\n\nsince it uses the module facilities.\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1944ce60fe1e92506d3347f4d8e10a82b17096e4", "tree": "1da72242c0a525e6a46c3ddc9693d88816362a03", "parents": [ "0c073e35550879fd133bc3fe509df5b88da51278" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Sep 28 18:29:32 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:09 2011 -0800" }, "message": "drivers/md: change module.h -\u003e export.h in persistent-data/dm-*\n\nFor the files which are not themselves modular, we can change\nthem to include only the smaller export.h since all they are\ndoing is looking for EXPORT_SYMBOL.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0c073e35550879fd133bc3fe509df5b88da51278", "tree": "7fdbfc7d5cb6a8c3c53defc06387dee6785120fc", "parents": [ "3c00303206c3a1ccd86579efdc90bc35f140962e" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sat Oct 08 23:24:48 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:28:58 2011 -0800" }, "message": "arm: Add export.h to recently added files for EXPORT_SYMBOL\n\nThese files didn\u0027t exist at the time of the module.h split, and\nso were not fixed by the commits on that baseline. Since they use\nthe EXPORT_SYMBOL and/or THIS_MODULE macros, they will need the\nnew export.h file included that provides them.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dd1294c4ed25725d13a6cb3d93ca0eb5fee14963", "tree": "b98556fe938245ac34cb2a24cb06b4be8ff02216", "parents": [ "039c811cb0e6c5696086072794bb79fc7011c765" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Mon Nov 07 13:28:20 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:28:20 2011 -0500" }, "message": "MAINTAINERS/rds: update maintainer \n\nupdate for the actual maintainer\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "039c811cb0e6c5696086072794bb79fc7011c765", "tree": "a74d1a5d974769a9352c09124b9a4275a8204214", "parents": [ "23ba07991dad5a96a024c1b45cb602eef5f83df8" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Mon Nov 07 13:27:30 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:27:30 2011 -0500" }, "message": "wanrouter: Remove kernel_lock annotations\n\nThe BKL is gone, these annotations are useless.\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23ba07991dad5a96a024c1b45cb602eef5f83df8", "tree": "1404d618c42757a234dfb1f0efe946411ecf1b0e", "parents": [ "012641082b34433dac3cbb452e0a6ceccfd4643f" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Nov 07 05:54:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:25:41 2011 -0500" }, "message": "usbnet: fix oops in usbnet_start_xmit\n\nThis patch fixes the bug added in commit v3.1-rc7-1055-gf9b491e\nSKB can be NULL at this point, at least for cdc-ncm.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "012641082b34433dac3cbb452e0a6ceccfd4643f", "tree": "b5fcc89c44d5508f5c669d50e2d879910618ab24", "parents": [ "1a6422f67fbf691cf8721076619aeead9183403d" ], "author": { "name": "Rose, Gregory V", "email": "gregory.v.rose@intel.com", "time": "Mon Nov 07 07:44:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:23:12 2011 -0500" }, "message": "ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n\nFix compiler errors and warnings with CONFIG_PCI_IOV defined and not\ndefined.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c00303206c3a1ccd86579efdc90bc35f140962e", "tree": "66170c84b5ddaeb102aea3530517a26657b6ea29", "parents": [ "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "efb90582c575084723cc14302c1300cb26c7e01f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n cpuidle: Single/Global registration of idle states\n cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev-\u003eprepare()\n cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n ACPI: Fix CONFIG_ACPI_DOCK\u003dn compiler warning\n ACPI: Export FADT pm_profile integer value to userspace\n thermal: Prevent polling from happening during system suspend\n ACPI: Drop ACPI_NO_HARDWARE_INIT\n ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()\n PNPACPI: Simplify disabled resource registration\n ACPI: Fix possible recursive locking in hwregs.c\n ACPI: use kstrdup()\n mrst pmu: update comment\n tools/power turbostat: less verbose debugging\n" }, { "commit": "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "tree": "521737fc0829222c2739e4d50bf8546a39d6aa0e", "parents": [ "6e6bc67982573c221d12cbd123d34395f9f6e22e", "2ac863719e518ae1a8f328849e64ea26a222f079" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (40 commits)\n vmwgfx: Snoop DMA transfers with non-covering sizes\n vmwgfx: Move the prefered mode first in the list\n vmwgfx: Unreference surface on cursor error path\n vmwgfx: Free prefered mode on error path\n vmwgfx: Use pointer return error codes\n vmwgfx: Fix hw cursor position\n vmwgfx: Infrastructure for explicit placement\n vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh\n vmwgfx: Remove screen object active list\n vmwgfx: Screen object cleanups\n drm/radeon/kms: consolidate GART code, fix segfault after GPU lockup V2\n drm/radeon/kms: don\u0027t poll forever if MC GDDR link training fails\n drm/radeon/kms: fix DP setup on TRAVIS bridges\n drm/radeon/kms: set HPD polarity in hpd_init()\n drm/radeon/kms: add MSI module parameter\n drm/radeon/kms: Add MSI quirk for Dell RS690\n drm/radeon/kms: Add MSI quirk for HP RS690\n drm/radeon/kms: split MSI check into a separate function\n vmwgfx: Reinstate the update_layout ioctl\n drm/radeon/kms: always do extended edid probe\n ...\n" }, { "commit": "6e6bc67982573c221d12cbd123d34395f9f6e22e", "tree": "a63ac571bedace9fc04515cd95da1c49a1304b68", "parents": [ "ff4d7fa8c32f6ec513fb792c060809ec82d53ea4", "3a73dbbc9bb3fc8594cd67af4db6c563175dfddb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:59:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:59:02 2011 -0800" }, "message": "Merge branch \u0027urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: fix uninitialized task_ratelimit\n" }, { "commit": "ff4d7fa8c32f6ec513fb792c060809ec82d53ea4", "tree": "2b04ad419ff934fd640a97ac8e9df1abdd1e503c", "parents": [ "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "a88b470773bc5b640292d8be7b8e7e1011a86639" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:56:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:56:22 2011 -0800" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\n* git://git.samba.org/sfrench/cifs-2.6:\n CIFS: Cleanup byte-range locking code style\n CIFS: Simplify setlk error handling for mandatory locking\n" }, { "commit": "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "tree": "7320a130dc304623f5cf4b5dd8f67fb1776225ca", "parents": [ "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "48e546b7f281f251893baa40769581fd15f085fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (226 commits)\n mtd: tests: annotate as DANGEROUS in Kconfig\n mtd: tests: don\u0027t use mtd0 as a default\n mtd: clean up usage of MTD_DOCPROBE_ADDRESS\n jffs2: add compr\u003dlzo and compr\u003dzlib options\n jffs2: implement mount option parsing and compression overriding\n mtd: nand: initialize ops.mode\n mtd: provide an alias for the redboot module name\n mtd: m25p80: don\u0027t probe device which has status of \u0027disabled\u0027\n mtd: nand_h1900 never worked\n mtd: Add DiskOnChip G3 support\n mtd: m25p80: add EON flash EN25Q32B into spi flash id table\n mtd: mark block device queue as non-rotational\n mtd: r852: make r852_pm_ops static\n mtd: m25p80: add support for at25df321a spi data flash\n mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks\n mtd: nand: switch `check_pattern()\u0027 to standard `memcmp()\u0027\n mtd: nand: invalidate cache on unaligned reads\n mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set\n mtd: nand: wait to set BBT version\n mtd: nand: scrub BBT on ECC errors\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-at91/board-usb-a9260.c\n\tMerged into board-usb-a926x.c\n - drivers/mtd/maps/lantiq-flash.c\n\tadd_mtd_partitions -\u003e mtd_device_register vs changed to use\n\tmtd_device_parse_register.\n" }, { "commit": "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "tree": "66ecb6f516d33915171682cc602af978c0ae014f", "parents": [ "31555213f03bca37d2c02e10946296052f4ecfcd", "7606f85a701ed8feeac065e133ff9a51c267aa0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 08:52:19 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 08:52:19 2011 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6:\n UBIFS: fix the dark space calculation\n UBIFS: introduce a helper to dump scanning info\n" }, { "commit": "49908a1b25d448d68fd26faca260e1850201575f", "tree": "75bb37270ccbe943ab437a444e7c006d990ab57c", "parents": [ "c8452afb7426f7e21388492f40227582e3e83879" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Nov 04 16:32:25 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Nov 07 11:02:35 2011 -0500" }, "message": "perf: Fix parsing of __print_flags() in TP_printk()\n\nA update is made to the sched:sched_switch event that adds some\nlogic to the first parameter of the __print_flags() that shows the\nstate of tasks. This change cause perf to fail parsing the flags.\n\nA simple fix is needed to have the parser be able to process ops\nwithin the argument.\n\nCc: stable@vger.kernel.org\nReported-by: Andrew Vagin \u003cavagin@openvz.org\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "c8452afb7426f7e21388492f40227582e3e83879", "tree": "dd01f094321d9d8c6412d11cc4dd1a33d18b48f7", "parents": [ "8ee3c92b7f2751c392be2d8fc360a410480b8757" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Tue Oct 18 19:55:51 2011 +0200" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Nov 07 11:02:34 2011 -0500" }, "message": "jump_label: jump_label_inc may return before the code is patched\n\nIf cpu A calls jump_label_inc() just after atomic_add_return() is\ncalled by cpu B, atomic_inc_not_zero() will return value greater then\nzero and jump_label_inc() will return to a caller before jump_label_update()\nfinishes its job on cpu B.\n\nLink: http://lkml.kernel.org/r/20111018175551.GH17571@redhat.com\n\nCc: stable@vger.kernel.org\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "8ee3c92b7f2751c392be2d8fc360a410480b8757", "tree": "60ebbd1d3dc66eda28f73cc08d19c0ccbd082cbf", "parents": [ "e5e78d08f3ab3094783b8df08a5b6d1d1a56a58f" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Nov 04 10:45:23 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Nov 07 11:02:33 2011 -0500" }, "message": "ftrace: Remove force undef config value left for testing\n\nA forced undef of a config value was used for testing and was\naccidently left in during the final commit. This causes x86 to\nrun slower than needed while running function tracing as well\nas causes the function graph selftest to fail when DYNMAIC_FTRACE\nis not set. This is because the code in MCOUNT expects the ftrace\ncode to be processed with the config value set that happened to\nbe forced not set.\n\nThe forced config option was left in by:\n commit 6331c28c962561aee59e5a493b7556a4bb585957\n ftrace: Fix dynamic selftest failure on some archs\n\nLink: http://lkml.kernel.org/r/20111102150255.GA6973@debian\n\nCc: stable@vger.kernel.org\nReported-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "e5e78d08f3ab3094783b8df08a5b6d1d1a56a58f", "tree": "524c4faf387d4ac1dc46b23015a9d8fc4823ab88", "parents": [ "3890c136357284cb0656f9dd0e62286995ad32e9" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Nov 02 20:24:16 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Nov 07 11:01:46 2011 -0500" }, "message": "lockdep: Show subclass in pretty print of lockdep output\n\nThe pretty print of the lockdep debug splat uses just the lock name\nto show how the locking scenario happens. But when it comes to\nnesting locks, the output becomes confusing which takes away the point\nof the pretty printing of the lock scenario.\n\nWithout displaying the subclass info, we get the following output:\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(slock-AF_INET);\n lock(slock-AF_INET);\n lock(slock-AF_INET);\n lock(slock-AF_INET);\n\n *** DEADLOCK ***\n\nThe above looks more of a A-\u003eA locking bug than a A-\u003eB B-\u003eA.\nBy adding the subclass to the output, we can see what really happened:\n\n other info that might help us debug this:\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(slock-AF_INET);\n lock(slock-AF_INET/1);\n lock(slock-AF_INET);\n lock(slock-AF_INET/1);\n\n *** DEADLOCK ***\n\nThis bug was discovered while tracking down a real bug caught by lockdep.\n\nLink: http://lkml.kernel.org/r/20111025202049.GB25043@hostway.ca\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReported-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nTested-by: Simon Kirby \u003csim@hostway.ca\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "2ac863719e518ae1a8f328849e64ea26a222f079", "tree": "bc3900daf89dfe3f5c8cc994499a7164c16316c2", "parents": [ "d41025c0d6a7b3d80d68f07f943b72962d66ac74" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:08 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:55 2011 +0000" }, "message": "vmwgfx: Snoop DMA transfers with non-covering sizes\n\nEnough to get cursors working under Wayland.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d41025c0d6a7b3d80d68f07f943b72962d66ac74", "tree": "868c2a20eebe3d7698b2c321fbc9c1e6ae0c5856", "parents": [ "e5c8dbb8141e7da81bd8179929d1298302d17128" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:07 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:34 2011 +0000" }, "message": "vmwgfx: Move the prefered mode first in the list\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e5c8dbb8141e7da81bd8179929d1298302d17128", "tree": "53c42a405d17cc491bf469337ea13a840c64617e", "parents": [ "55bde5b215ceb8356328f18cd82a77843bc4ffd3" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:06 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:16:14 2011 +0000" }, "message": "vmwgfx: Unreference surface on cursor error path\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "55bde5b215ceb8356328f18cd82a77843bc4ffd3", "tree": "4d9f311c7d3dc9befb69a1b6cbd6ee9fd996b635", "parents": [ "d982640914d74054d22508ccebeeda70ce5933e1" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:05 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:56 2011 +0000" }, "message": "vmwgfx: Free prefered mode on error path\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d982640914d74054d22508ccebeeda70ce5933e1", "tree": "1f1fbed6d9facf8154879395c61ea034afd220af", "parents": [ "da7653d6a0dcf7c3a173c87df144735e61a86c1e" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Nov 03 21:03:04 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:54 2011 +0000" }, "message": "vmwgfx: Use pointer return error codes\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "da7653d6a0dcf7c3a173c87df144735e61a86c1e", "tree": "333e81fc4a0a667918c891ca521d8d8e77a8b188", "parents": [ "6987427a3953c5038dc14d2a090b5a6c93669428" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:12 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:40 2011 +0000" }, "message": "vmwgfx: Fix hw cursor position\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6987427a3953c5038dc14d2a090b5a6c93669428", "tree": "9e97ef3e0f57aead819845961cb6b892df0ac4e6", "parents": [ "1543b4dd0c4b63975ffdadccd67c3a8805f28814" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:11 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:15:18 2011 +0000" }, "message": "vmwgfx: Infrastructure for explicit placement\n\nMake it possible to use explicit placement\n(although not hooked up with a user-space interface yet)\nand relax the single framebuffer limit to only apply to implicit placement.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1543b4dd0c4b63975ffdadccd67c3a8805f28814", "tree": "fb23465df4e17c0bb702914cef5f40cbcf69807f", "parents": [ "0e708bc5d6403d1a64a0e4155f1b91e318318989" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:10 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:59 2011 +0000" }, "message": "vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0e708bc5d6403d1a64a0e4155f1b91e318318989", "tree": "896ab31125b0e5acc3295a7f7949cdb73bfdbdb9", "parents": [ "d4528b846ec8ba7ccf3116f1c2157c5e14ba46f3" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:09 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:31 2011 +0000" }, "message": "vmwgfx: Remove screen object active list\n\nIt isn\u0027t used for anything. Replace with an active bool.\n\nAlso make a couple of functions return void instead of int\nsince their return value wasn\u0027t checked anyway.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakbo Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d4528b846ec8ba7ccf3116f1c2157c5e14ba46f3", "tree": "21f20296be0c7bd0d84590839b25ca391b97400d", "parents": [ "c9a1be96277b3b2d2e8aff2ba69d7817ea8e46c9" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 02 09:43:08 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 07 13:14:11 2011 +0000" }, "message": "vmwgfx: Screen object cleanups\n\nRemove unused member.\nNo need to pin / unpin fb.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3a73dbbc9bb3fc8594cd67af4db6c563175dfddb", "tree": "e5120c19fd8e83a38d5c0852336a92c5b7862c6a", "parents": [ "31555213f03bca37d2c02e10946296052f4ecfcd" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Mon Nov 07 19:19:28 2011 +0800" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Mon Nov 07 19:19:28 2011 +0800" }, "message": "writeback: fix uninitialized task_ratelimit\n\nIn balance_dirty_pages() task_ratelimit may be not initialized\n(initialization skiped by goto pause), and then used when calling\ntracing hook.\n\nFix it by moving the task_ratelimit assignment before goto pause.\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "31555213f03bca37d2c02e10946296052f4ecfcd", "tree": "8fdd0ad6f3171fe493b2888616997df29abd4b34", "parents": [ "0084e4751e63a71b30f315710f976f8bb0c2cc07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:22:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:22:16 2011 -0800" }, "message": "Revert \"hvc_console: display printk messages on console.\"\n\nThis reverts commit 361162459f62dc0826b82c9690a741a940f457f0.\n\nIt causes an infinite loop when booting Linux under Xen, as so:\n\n [ 2.382984] console [hvc0] enabled\n [ 2.382984] console [hvc0] enabled\n [ 2.382984] console [hvc0] enabled\n ...\n\nas reported by Konrad Rzeszutek Wilk. And Rusty reports the same for\nlguest. He goes on to say:\n\n \"This is not a concurrency problem: the issue seems to be that\n calling register_console() twice on the same struct console is a bad\n idea.\"\n\nand Greg says he\u0027ll fix it up properly at some point later. Revert for now.\n\nReported-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReported-by: Rusty Russell \u003crusty@ozlabs.org\u003e\nRequested-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Miche Baker-Harvey \u003cmiche@google.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0084e4751e63a71b30f315710f976f8bb0c2cc07", "tree": "9973621cd75652f53a7c8e76470f7e01b8281678", "parents": [ "b32fc0a0629bf5894b35f33554c118aacfd0d1e2" ], "author": { "name": "Michael Neuling", "email": "mikey@neuling.org", "time": "Mon Nov 07 17:12:28 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 22:21:18 2011 -0800" }, "message": "powerpc: fix building hvc_opal.c\n\nFix building following build error:\n\n drivers/tty/hvc/hvc_opal.c:244:12: error: \u0027THIS_MODULE\u0027 undeclared here (not in a function)\n\nSigned-off-by: Michael Neuling \u003cmikey@neuling.org\u003e\n[ New file from powerpc tree not following the new rules from the\n module.h split, both of which were merged today. - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36", "tree": "806068fd67093b7d653972d2627c4e6f479f25a5", "parents": [ "b32fc0a0629bf5894b35f33554c118aacfd0d1e2", "bcd3cfc1213894ff955771508d46fa18d66e9328" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sun Nov 06 21:40:22 2011 -0800" }, "committer": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sun Nov 06 21:40:22 2011 -0800" }, "message": "Merge branch \u0027docs/docbook/drm\u0027 of git://github.com/mfwitten/linux into docs-move\n" }, { "commit": "b32fc0a0629bf5894b35f33554c118aacfd0d1e2", "tree": "5d6aaa9a35b7fa63681adab91da3b3dec5276f84", "parents": [ "403299a8515c56db58454c57712f4dc96d6c1fde", "97ce2c88f9ad42e3c60a9beb9fca87abf3639faa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "message": "Merge branch \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n jump-label: initialize jump-label subsystem much earlier\n x86/jump_label: add arch_jump_label_transform_static()\n s390/jump-label: add arch_jump_label_transform_static()\n jump_label: add arch_jump_label_transform_static() to optimise non-live code updates\n sparc/jump_label: drop arch_jump_label_text_poke_early()\n x86/jump_label: drop arch_jump_label_text_poke_early()\n jump_label: if a key has already been initialized, don\u0027t nop it out\n stop_machine: make stop_machine safe and efficient to call early\n jump_label: use proper atomic_t initializer\n\nConflicts:\n - arch/x86/kernel/jump_label.c\n\tAdded __init_or_module to arch_jump_label_text_poke_early vs\n\tremoval of that function entirely\n - kernel/stop_machine.c\n\tsame patch (\"stop_machine: make stop_machine safe and efficient\n\tto call early\") merged twice, with whitespace fix in one version\n" }, { "commit": "403299a8515c56db58454c57712f4dc96d6c1fde", "tree": "1dbcb33c606b03adc7d7fe128ecb3f0c3404ffef", "parents": [ "daedd8708fe7707ed651bb1c83162f25c48a947c", "fdb9eb9f155bfc0f8dc2fc88f90448b30c78ad97" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:15:05 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:15:05 2011 -0800" }, "message": "Merge branch \u0027upstream/xen-settime\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/xen-settime\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n xen/dom0: set wallclock time in Xen\n xen: add dom0_op hypercall\n xen/acpi: Domain0 acpi parser related platform hypercall\n" }, { "commit": "daedd8708fe7707ed651bb1c83162f25c48a947c", "tree": "424e9aaa7d6f686b729257e753e4edf91fecb73c", "parents": [ "6a6662ced4153f6dbcfc40d7225c3cc45416039c", "6b71c52e7f848e2c9f804e175215e5965ea90d32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:13:34 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:13:34 2011 -0800" }, "message": "Merge branch \u0027stable/cleanups-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/cleanups-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: use static initializers in xen-balloon.c\n Xen: fix braces and tabs coding style issue in xenbus_probe.c\n Xen: fix braces coding style issue in xenbus_probe.h\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c\n Xen: fix braces coding style issue in gntdev.c and grant-table.c\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c\n Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c\n\nFix up trivial whitespace-conflicts in\n drivers/xen/{balloon.c,pci.c,xenbus/xenbus_probe.c}\n" }, { "commit": "6a6662ced4153f6dbcfc40d7225c3cc45416039c", "tree": "77ad5d577333f02cd854e44827a407dd0388d4eb", "parents": [ "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "7c7e82a77fe3d89ae50824aa7c897454675eb4c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:03:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:03:41 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (114 commits)\n Btrfs: check for a null fs root when writing to the backup root log\n Btrfs: fix race during transaction joins\n Btrfs: fix a potential btrfs_bio leak on scrub fixups\n Btrfs: rename btrfs_bio multi -\u003e bbio for consistency\n Btrfs: stop leaking btrfs_bios on readahead\n Btrfs: stop the readahead threads on failed mount\n Btrfs: fix extent_buffer leak in the metadata IO error handling\n Btrfs: fix the new inspection ioctls for 32 bit compat\n Btrfs: fix delayed insertion reservation\n Btrfs: ClearPageError during writepage and clean_tree_block\n Btrfs: be smarter about committing the transaction in reserve_metadata_bytes\n Btrfs: make a delayed_block_rsv for the delayed item insertion\n Btrfs: add a log of past tree roots\n btrfs: separate superblock items out of fs_info\n Btrfs: use the global reserve when truncating the free space cache inode\n Btrfs: release metadata from global reserve if we have to fallback for unlink\n Btrfs: make sure to flush queued bios if write_cache_pages waits\n Btrfs: fix extent pinning bugs in the tree log\n Btrfs: make sure btrfs_remove_free_space doesn\u0027t leak EAGAIN\n Btrfs: don\u0027t wait as long for more batches during SSD log commit\n ...\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "efb90582c575084723cc14302c1300cb26c7e01f", "tree": "25af70a2c40e7e404215acd9aadfa42e71e716ae", "parents": [ "e751b759e82629798c4a5e4a87eb3a30c0510154", "46bcfad7a819bd17ac4e831b04405152d59784ab", "22f4521d664030e417f41953e922f61c65f2e189", "aeae1e92daec5a38b40ad12598b97501b675a381" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "message": "Merge branches \u0027acpi\u0027, \u0027idle\u0027, \u0027mrst-pmu\u0027 and \u0027pm-tools\u0027 into next\n" }, { "commit": "e751b759e82629798c4a5e4a87eb3a30c0510154", "tree": "225043e83eecdce1ac8d8ccb6d5a115c5d0b6461", "parents": [ "3bf3f8b19d2bfccc40f13c456bf339fd8f535ebc", "f7f71cfbf0c276ee3d8d856d0f35a41aed997fa4", "c1056b42a87b59375f8f81a92ef029165f44fcce", "362b646062b2073bd5c38efb42171d86e4f717e6", "18fd470a48396c8795ba7256c5973e92ffa25cb3" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:10:14 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:10:14 2011 -0500" }, "message": "Merge branches \u0027atomic-io\u0027, \u0027lockdep\u0027, \u0027misc\u0027, \u0027pm-profile\u0027 and \u0027pnp-cleanup\u0027 into acpi\n" } ], "next": "208bca0860406d16398145ddd950036a737c3c9d" }