)]}' { "log": [ { "commit": "3f029d3c6d62068d59301d90c18dbde8ee402107", "tree": "c9c4e49bc0c8b919a81bf428180b9cffedbef389", "parents": [ "c3a2ae3d93c0f10d29c071f599764d00b8de00cb" ], "author": { "name": "Gregory Haskins", "email": "ghaskins@novell.com", "time": "Wed Jul 29 11:08:47 2009 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 02 14:26:10 2009 +0200" }, "message": "sched: Enhance the pre/post scheduling logic\n\nWe currently have an explicit \"needs_post\" vtable method which\nreturns a stack variable for whether we should later run\npost-schedule. This leads to an awkward exchange of the\nvariable as it bubbles back up out of the context switch. Peter\nZijlstra observed that this information could be stored in the\nrun-queue itself instead of handled on the stack.\n\nTherefore, we revert to the method of having context_switch\nreturn void, and update an internal rq-\u003epost_schedule variable\nwhen we require further processing.\n\nIn addition, we fix a race condition where we try to access\ncurrent-\u003esched_class without holding the rq-\u003elock. This is\ntechnically racy, as the sched-class could change out from\nunder us. Instead, we reference the per-rq post_schedule\nvariable with the runqueue unlocked, but with preemption\ndisabled to see if we need to reacquire the rq-\u003elock.\n\nFinally, we clean the code up slightly by removing the #ifdef\nCONFIG_SMP conditionals from the schedule() call, and implement\nsome inline helper functions instead.\n\nThis patch passes checkpatch, and rt-migrate.\n\nSigned-off-by: Gregory Haskins \u003cghaskins@novell.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c20090729150422.17691.55590.stgit@dev.haskins.net\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8e9ed8b02490fea577b1eb1704c05bf43c891ed7", "tree": "3c0cc5dd498abcf0cc894e85509c131a0dde9a43", "parents": [ "716a42348cdaf04534b15fbdc9c83e25baebfed5", "07903af152b0597d94e9b0030746b63c4664e787" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 02 14:11:26 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 02 14:23:57 2009 +0200" }, "message": "Merge branch \u0027sched/urgent\u0027 into sched/core\n\nMerge reason: avoid upcoming patch conflict.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "716a42348cdaf04534b15fbdc9c83e25baebfed5", "tree": "5a49fe4c0ff258ee03478994ffc7fbe8032a340f", "parents": [ "a004cd42181409eda70804ded240a791f4564d61" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Jul 24 20:05:23 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 02 14:03:57 2009 +0200" }, "message": "sched: Fix cond_resched_lock() in !CONFIG_PREEMPT\n\nThe might_sleep() test inside cond_resched_lock() assumes the\nspinlock is held and then preemption is disabled. This is true\nwith CONFIG_PREEMPT but the preempt_count() doesn\u0027t change\notherwise.\n\nCheck by starting from the appropriate preempt offset depending\non the config.\n\nReported-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1248458723-12146-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a5bc92cdf2ab27a15732976004b3755c40740f57", "tree": "ab7ee562f31ed9fddac78c1e17a2ba9eee6cb028", "parents": [ "6eb80e00bff341dd09a7ec8b9dba6da8410448bf", "cbb4f2646d77b536ed2b1500ef6641083228ed8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 31 12:10:26 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 31 12:10:26 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n io context: fix ref counting\n block: make the end_io functions be non-GPL exports\n block: fix improper kobject release in blk_integrity_unregister\n block: always assign default lock to queues\n mg_disk: Add missing ready status check on mg_write()\n mg_disk: fix issue with data integrity on error in mg_write()\n mg_disk: fix reading invalid status when use polling driver\n mg_disk: remove prohibited sleep operation\n" }, { "commit": "6eb80e00bff341dd09a7ec8b9dba6da8410448bf", "tree": "c0966b7f7d2bb3510de15226a61071abb3d8c453", "parents": [ "d27d4e2a660939f1bdf74f0e24c4c109f90cd98d", "c7121843685de2bf7f3afd3ae1d6a146010bf1fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 31 12:09:57 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 31 12:09:57 2009 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n clocksource: Save mult_orig in clocksource_disable()\n" }, { "commit": "c7121843685de2bf7f3afd3ae1d6a146010bf1fc", "tree": "f3a098159b8463386cd6d55b6272b6604bfbb9ce", "parents": [ "4be3bd7849165e7efa6b0b35a23d6a3598d97465" ], "author": { "name": "Magnus Damm", "email": "magnus.damm@gmail.com", "time": "Tue Jul 28 14:09:55 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jul 31 14:12:36 2009 +0200" }, "message": "clocksource: Save mult_orig in clocksource_disable()\n\nTo fix the common case where -\u003eenable() does not set up\nmult, make sure mult_orig is saved in mult on disable.\n\nAlso add comments to explain why we do this.\n\nSigned-off-by: Magnus Damm \u003cdamm@igel.co.jp\u003e\nCc: johnstul@us.ibm.com\nCc: lethal@linux-sh.org\nCc: akpm@linux-foundation.org\nLKML-Reference: \u003c20090618152432.10136.9932.sendpatchset@rx1.opensource.se\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "4b2a108cd0d34880fe9d932258ca5b2ccebcd05e", "tree": "ce41850f6b9a738804cc8d811f74f3a09bc954f4", "parents": [ "da60a91d012bcb10bc5bcd86d585c4281742832c" ], "author": { "name": "Sebastian Andrzej Siewior", "email": "sebastian@breakpoint.cc", "time": "Mon Jun 22 09:18:05 2009 +0200" }, "committer": { "name": "Pierre Ossman", "email": "pierre@ossman.eu", "time": "Fri Jul 31 12:28:46 2009 +0200" }, "message": "cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG\n\nthe code allready uses flush_kernel_dcache_page(). This patch updates the\ndriver to the recent sg API changes which require that either SG_MITER_TO_SG\nor SG_MITER_FROM_SG is set. SG_MITER_TO_SG calls flush_kernel_dcache_page()\nin sg_mitter_stop()\n\nSigned-off-by: Sebastian Andrzej Siewior \u003csebastian@breakpoint.cc\u003e\nAcked-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: Pierre Ossman \u003cpierre@ossman.eu\u003e\n" }, { "commit": "6de7e356faf54aa75de5b624bbce28a5b776dfa8", "tree": "09b341b7c1371448a5ae8a9cd4009a4f81f4a3dd", "parents": [ "b592972493c38665efd7d429a01b23fcb21e331a" ], "author": { "name": "Sebastian Andrzej Siewior", "email": "sebastian@breakpoint.cc", "time": "Thu Jun 18 10:19:12 2009 +0200" }, "committer": { "name": "Pierre Ossman", "email": "pierre@ossman.eu", "time": "Fri Jul 31 12:28:45 2009 +0200" }, "message": "lib/scatterlist: add a flags to signalize mapping direction\n\nsg_miter_start() is currently unaware of the direction of the copy\nprocess (to or from the scatter list). It is important to know the\ndirection because the page has to be flushed in case the data written\nis seen on a different mapping in user land on cache incoherent\narchitectures.\n\nSigned-off-by: Sebastian Andrzej Siewior \u003csebastian@breakpoint.cc\u003e\nAcked-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Pierre Ossman \u003cpierre@ossman.eu\u003e\n" }, { "commit": "cbb4f2646d77b536ed2b1500ef6641083228ed8f", "tree": "e238098c2239ca1a2ec978858f63566d0281d49a", "parents": [ "56ad1740d9a8dc271e71fee234be662638c64458" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Jul 31 08:55:48 2009 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri Jul 31 08:55:48 2009 +0200" }, "message": "io context: fix ref counting\n\nCommit d9c7d394a8ebacb60097b192939ae9f15235225e\n(\"block: prevent possible io_context-\u003erefcount overflow\") mistakenly\nchanged atomic_inc(\u0026ioc-\u003enr_tasks) to atomic_long_inc(\u0026ioc-\u003erefcount).\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Nikanth Karthikesan \u003cknikanth@suse.de\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "1842f23c05b6a866be831aa60bc8a8731c58ddd0", "tree": "8047f21d149b3958b5c4278c1a5601ddce9e0e4b", "parents": [ "a91d74a3c4de8115295ee87350c13a329164aaaf" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jul 30 16:03:46 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jul 30 16:03:46 2009 +0930" }, "message": "lguest and virtio: cleanup struct definitions to Linux style.\n\nI\u0027ve been doing this for years, and akpm picked me up on it about 12\nmonths ago. lguest partly serves as example code, so let\u0027s do it Right.\n\nAlso, remove two unused fields in struct vblk_info in the example launcher.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\n" }, { "commit": "2e04ef76916d1e29a077ea9d0f2003c8fd86724d", "tree": "2ff8d625d6e467be9f9f1b67a3674cb6e125e970", "parents": [ "e969fed542cae08cb11d666efac4f7c5d624d09f" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jul 30 16:03:45 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jul 30 16:03:45 2009 +0930" }, "message": "lguest: fix comment style\n\nI don\u0027t really notice it (except to begrudge the extra vertical\nspace), but Ingo does. And he pointed out that one excuse of lguest\nis as a teaching tool, it should set a good example.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\n" }, { "commit": "91a5698d1f253d30f53f0c58d2504eaec481b854", "tree": "684d8060e16b33c6ede5b814dbd459e0c5cb1f39", "parents": [ "084bad91afd0f40ff4db9ceb56e29234c314d8d1", "dddac6a7b445de95515f64fdf82fe5dc36c02f26" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:15:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:15:18 2009 -0700" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PM / Hibernate: Replace bdget call with simple atomic_inc of i_count\n PM / ACPI: HP G7000 Notebook needs a SCI_EN resume quirk\n" }, { "commit": "812ed032cdc8138b7546eecc996879756b92d801", "tree": "6285496aedfaedbf63b472a2f09ab944af9a86e0", "parents": [ "8da14b5fc32368f582df09fe9c0bec2507868583" ], "author": { "name": "Jiri Slaby", "email": "jirislaby@gmail.com", "time": "Wed Jul 29 15:04:19 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:10:39 2009 -0700" }, "message": "uio: mark uio.h functions __KERNEL__ only\n\nTo avoid userspace build failures such as:\n\n.../linux/uio.h:37: error: expected `\u003d\u0027, `,\u0027, `;\u0027, `asm\u0027 or `__attribute__\u0027 before `iov_length\u0027\n.../linux/uio.h:47: error: expected declaration specifiers or `...\u0027 before `size_t\u0027\n\nmove uio functions inside a __KERNEL__ block.\n\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "534acc057b5a08ec33fa57cdd2f5a09ef124e7f2", "tree": "186e6ff90a7a696a2d15f183871250c9d83f476d", "parents": [ "a9e58f25734e153b8c6516d904e2398fb8b0b23d" ], "author": { "name": "Dave Hansen", "email": "dave@linux.vnet.ibm.com", "time": "Wed Jul 29 15:04:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:10:36 2009 -0700" }, "message": "lib: flexible array implementation\n\nOnce a structure goes over PAGE_SIZE*2, we see occasional allocation\nfailures. Some people have chosen to switch over to things like vmalloc()\nthat will let them keep array-like access to such a large structures.\nBut, vmalloc() has plenty of downsides.\n\nHere\u0027s an alternative. I think it\u0027s what Andrew was suggesting here:\n\n\thttp://lkml.org/lkml/2009/7/2/518\n\nI call it a flexible array. It does all of its work in PAGE_SIZE bits, so\nnever does an order\u003e0 allocation. The base level has\nPAGE_SIZE-2*sizeof(int) bytes of storage for pointers to the second level.\n So, with a 32-bit arch, you get about 4MB (4183112 bytes) of total\nstorage when the objects pack nicely into a page. It is half that on\n64-bit because the pointers are twice the size. There\u0027s a table detailing\nthis in the code.\n\nThere are kerneldocs for the functions, but here\u0027s an\noverview:\n\nflex_array_alloc() - dynamically allocate a base structure\nflex_array_free() - free the array and all of the\n\t\t second-level pages\nflex_array_free_parts() - free the second-level pages, but\n\t\t\t not the base (for static bases)\nflex_array_put() - copy into the array at the given index\nflex_array_get() - copy out of the array at the given index\nflex_array_prealloc() - preallocate the second-level pages\n\t\t\tbetween the given indexes to\n\t\t\tguarantee no allocs will occur at\n\t\t\tput() time.\n\nWe could also potentially just pass the \"element_size\" into each of the\nAPI functions instead of storing it internally. That would get us one\nmore base pointer on 32-bit.\n\nI\u0027ve been testing this by running it in userspace. The header and patch\nthat I\u0027ve been using are here, as well as the little script I\u0027m using to\ngenerate the size table which goes in the kerneldocs.\n\n\thttp://sr71.net/~dave/linux/flexarray/\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f5a55efa140f5e9c9dd0f398fef54f20cdb74ec9", "tree": "d576ed9bebfa3e1d5f47b4c3b701d0056101a34b", "parents": [ "5c8053652328693d10551131432ef3573e77ed2d" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Wed Jul 29 15:04:12 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:10:36 2009 -0700" }, "message": "pps.h needs \u003clinux/types.h\u003e\n\nFound with make headers_check\n\n/usr/include/linux/pps.h:52: found __[us]{8,16,32,64} type without #include \u003clinux/types.h\u003e\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Rodolfo Giometti \u003cgiometti@linux.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "887032670d47366a8c8f25396ea7c14b7b2cc620", "tree": "e5f9ece5ab9239648e8d7051ccb9a217d92553d7", "parents": [ "f0d83679a8d471dc8b646919f70595d6fe8c9606" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Jul 29 15:04:06 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:10:35 2009 -0700" }, "message": "cgroup avoid permanent sleep at rmdir\n\nAfter commit ec64f51545fffbc4cb968f0cea56341a4b07e85a (\"cgroup: fix\nfrequent -EBUSY at rmdir\"), cgroup\u0027s rmdir (especially against memcg)\ndoesn\u0027t return -EBUSY by temporary ref counts. That commit expects all\nrefs after pre_destroy() is temporary but...it wasn\u0027t. Then, rmdir can\nwait permanently. This patch tries to fix that and change followings.\n\n - set CGRP_WAIT_ON_RMDIR flag before pre_destroy().\n - clear CGRP_WAIT_ON_RMDIR flag when the subsys finds racy case.\n if there are sleeping ones, wakes them up.\n - rmdir() sleeps only when CGRP_WAIT_ON_RMDIR flag is set.\n\nTested-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nReported-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nReviewed-by: Paul Menage \u003cmenage@google.com\u003e\nAcked-by: Balbir Sigh \u003cbalbir@linux.vnet.ibm.com\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "096b7fe012d66ed55e98bc8022405ede0cc80e96", "tree": "755709b6d3ff21a9e9640d6c19432b31c863ad34", "parents": [ "b317c833211b7fbf902163de766f09554090e0bf" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Wed Jul 29 15:04:04 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:10:35 2009 -0700" }, "message": "cgroups: fix pid namespace bug\n\nThe bug was introduced by commit cc31edceee04a7b87f2be48f9489ebb72d264844\n(\"cgroups: convert tasks file to use a seq_file with shared pid array\").\n\nWe cache a pid array for all threads that are opening the same \"tasks\"\nfile, but the pids in the array are always from the namespace of the\nlast process that opened the file, so all other threads will read pids\nfrom that namespace instead of their own namespaces.\n\nTo fix it, we maintain a list of pid arrays, which is keyed by pid_ns.\nThe list will be of length 1 at most time.\n\nReported-by: Paul Menage \u003cmenage@google.com\u003e\nIdea-by: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nReviewed-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "84210aeb4a6a77de8a3067b121026bad630cd3da", "tree": "1a458ba7dba9955108349a49a4e878ed9ea79755", "parents": [ "7d4dd028b022ddf8631b4530ed8d7777526f545e", "ed8f0d9e708a1a7c9222e7d0a35d97521e904223" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 12:31:59 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 12:31:59 2009 -0700" }, "message": "Merge branch \u0027drm-radeon-kms\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-radeon-kms\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (35 commits)\n drm/radeon: set fb aperture sizes for framebuffer handoff.\n drm/ttm: fix highuser vs dma32 confusion.\n drm/radeon: Fix size used for benchmarking BO copies.\n drm/radeon: Add radeon.test parameter for running BO GPU copy tests.\n drm/radeon/kms: allow interruptible waits for objects.\n drm/ttm: powerpc: Fix Highmem cache flushing.\n x86: Export kmap_atomic_prot() needed for TTM.\n drm/ttm: Fix ttm in-kernel copying of pages with non-standard caching attributes.\n drm/ttm: Fix an oops and sync object leak.\n drm/radeon/kms: vram sizing on certain r100 chips needs workaround.\n drm/radeon: Pay more attention to object placement requested by userspace.\n drm/radeon: Fall back to evicting BOs with memcpy if necessary.\n drm/radeon: Don\u0027t unreserve twice on failure to validate.\n drm/radeon/kms: fix bandwidth computation on avivo hardware\n drm/radeon/kms: add initial colortiling support.\n drm/radeon/kms: fix hotspot handling on pre-avivo chips\n drm/radeon/kms: enable frac fb divs on rs600/rs690/rs740\n drm/radeon/kms: add PLL flag to prefer frequencies \u003c\u003d the target freq\n drm/radeon/kms: block RN50 from using 3D engine.\n drm/radeon/kms: fix VRAM sizing like DDX does it.\n ...\n" }, { "commit": "2e13e5f03538cfded0c463fd60eddd0c8e2cd959", "tree": "b8a8d2e24c86ea2d15caca8851c9427631f72761", "parents": [ "ccf5675a82a72bc1599b9b29cf33f7e391658485", "5920dadfb4aec6c1372c5570e71bcd3b4837e63c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 12:29:39 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 12:29:39 2009 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n libata: accept late unlocking of HPA\n libata: Updates and fixes for pata_at91 driver\n ata_piix: Add new short cable ID\n ata_piix: Add new laptop short cable IDs\n ahci: add device IDs for Ibex Peak ahci controllers\n libata: remove superfluous NULL pointer checks\n libata: add missing NULL pointer check to ata_eh_reset()\n pata_pcmcia: add CNF-CDROM-ID\n" }, { "commit": "e043e42bdb66885b3ac10d27a01ccb9972e2b0a3", "tree": "12b40fd776f653484a77fd84f07cc304276141b1", "parents": [ "7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d" ], "author": { "name": "OGAWA Hirofumi", "email": "hirofumi@mail.parknet.co.jp", "time": "Wed Jul 29 12:15:56 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 12:15:56 2009 -0700" }, "message": "pty: avoid forcing \u0027low_latency\u0027 tty flag\n\nWe really don\u0027t want to mark the pty as a low-latency device, because as\nAlan points out, the -\u003ewrite method can be called from an IRQ (ppp?),\nand that means we can\u0027t use -\u003elow_latency\u003d1 as we take mutexes in the\nlow_latency case.\n\nSo rather than using low_latency to force the written data to be pushed\nto the ldisc handling at \u0027write()\u0027 time, just make the reader side (or\nthe poll function) do the flush when it checks whether there is data to\nbe had.\n\nThis also fixes the problem with lost data in an emacs compile buffer\n(bugzilla 13815), and we can thus revert the low_latency pty hack\n(commit 3a54297478e6578f96fd54bf4daa1751130aca86: \"pty: quickfix for the\npty ENXIO timing problems\").\n\nSigned-off-by: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nTested-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\n[ Modified to do the tty_flush_to_ldisc() inside input_available_p() so\n that it triggers for both read and poll() - Linus]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dddac6a7b445de95515f64fdf82fe5dc36c02f26", "tree": "39651610292d6b0c17f210f253a0dd16b022727d", "parents": [ "ec79be26875f6c1468784876cb99192b7f41c7a5" ], "author": { "name": "Alan Jenkins", "email": "alan-jenkins@tuffmail.co.uk", "time": "Wed Jul 29 21:07:55 2009 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jul 29 21:07:55 2009 +0200" }, "message": "PM / Hibernate: Replace bdget call with simple atomic_inc of i_count\n\nCreate bdgrab(). This function copies an existing reference to a\nblock_device. It is safe to call from any context.\n\nHibernation code wishes to copy a reference to the active swap device.\nRight now it calls bdget() under a spinlock, but this is wrong because\nbdget() can sleep. It doesn\u0027t need a full bdget() because we already\nhold a reference to active swap devices (and the spinlock protects\nagainst swapoff).\n\nFixes http://bugzilla.kernel.org/show_bug.cgi?id\u003d13827\n\nSigned-off-by: Alan Jenkins \u003calan-jenkins@tuffmail.co.uk\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "e024e11070a0a0dc7163ce1ec2da354a638bdbed", "tree": "add483e7428f91da6f3c26be702aa45e6d69b694", "parents": [ "c836e862803b2aa2bd9a354e151316d2b42c44ec" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 24 09:48:08 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 29 15:42:18 2009 +1000" }, "message": "drm/radeon/kms: add initial colortiling support.\n\nThis adds new set/get tiling interfaces where the pitch\nand macro/micro tiling enables can be set. Along with\na flag to decide if this object should have a surface when mapped.\n\nThe only thing we need to allocate with a mapped surface should be\nthe frontbuffer. Note rotate scanout shouldn\u0027t require one, and\nback/depth shouldn\u0027t either, though mesa needs some fixes.\n\nIt fixes the TTM interfaces along Thomas\u0027s suggestions, and I\u0027ve tested\nthe surface stealing code with two X servers and not seen any lockdep issues.\n\nI\u0027ve stopped tiling the fbcon frontbuffer, as I don\u0027t see there being\nany advantage other than testing, I\u0027ve left the testing commands in there,\njust flip the fb_tiled to true in radeon_fb.c\n\nOpen: Can we integrate endian swapping in with this?\n\nFuture features:\ntexture tiling - need to relocate texture registers TXOFFSET* with tiling info.\n\nThis also merges Michel\u0027s cleanup surfaces regs at init time patch\neven though it makes sense on its own, this patch really relies on it.\n\nSome PowerMac firmwares set up a tiling surface at the beginning of VRAM\nwhich messes us up otherwise.\nthat patch is:\nSigned-off-by: Michel Dänzer \u003cdaenzer@vmware.com\u003e\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5920dadfb4aec6c1372c5570e71bcd3b4837e63c", "tree": "4d4e1c5a47d23b1578bfde9ab223b07206a77c64", "parents": [ "7d084d96fdf1d791cb171da57efc1ca89d68dd6c" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jul 15 17:11:41 2009 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Jul 28 21:07:09 2009 -0400" }, "message": "libata: accept late unlocking of HPA\n\nOn certain configurations, HPA isn\u0027t or can\u0027t be unlocked during\nprobing but it somehow ends up unlocked afterwards. In the following\nthread, the problem can be reliably reproduced after resuming from\nSTR. The BIOS turns on HPA during boot but forgets to do it during\nresume.\n\n http://thread.gmane.org/gmane.linux.kernel/858310\n\nThis patch updates libata revalidation such that it considers native\nn_sectors. If the device size has increased to match native\nn_sectors, it\u0027s assumed that HPA has been unlocked involuntarily and\nthe device is recognized as the same one. This should be fairly safe\nwhile nicely working around the problem.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Christof Warlich \u003cchristof@warlich.name\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "fc013a58859b7cf85e53a05804a74952fe0a4117", "tree": "012d671d822c281edef18f00992ec8c9ea4b0893", "parents": [ "3a54297478e6578f96fd54bf4daa1751130aca86", "f44aebcc566d1d6275f7191867b9633dc11de2ee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 15:54:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 15:54:10 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/users/eparis/notify\n\n* \u0027for-linus\u0027 of git://git.infradead.org/users/eparis/notify:\n inotify: use GFP_NOFS under potential memory pressure\n fsnotify: fix inotify tail drop check with path entries\n inotify: check filename before dropping repeat events\n fsnotify: use def_bool in kconfig instead of letting the user choose\n inotify: fix error paths in inotify_update_watch\n inotify: do not leak inode marks in inotify_add_watch\n inotify: drop user watch count when a watch is removed\n" }, { "commit": "f1462147f15a954a1a0553390846c6fa3ca742b1", "tree": "c57ad5f209bd6bc735580172057153d60f0a4442", "parents": [ "e00b95debb9a0f023b61abcd4b1e74f687276b47", "6d7760a88c25057c2c2243e5dfe2d731064bd31d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 13:42:47 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 13:42:47 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)\n cnic: Fix ISCSI_KEVENT_IF_DOWN message handling.\n net: irda: init spinlock after memcpy\n ixgbe: fix for 82599 errata marking UDP checksum errors\n r8169: WakeOnLan fix for the 8168\n netxen: reset ring consumer during cleanup\n net/bridge: use kobject_put to release kobject in br_add_if error path\n smc91x.h: add config for Nomadik evaluation kit\n NET: ROSE: Don\u0027t use static buffer.\n eepro: Read buffer overflow\n tokenring: Read buffer overflow\n at1700: Read buffer overflow\n fealnx: Write outside array bounds\n ixgbe: remove unnecessary call to device_init_wakeup\n ixgbe: Don\u0027t priority tag control frames in DCB mode\n ixgbe: Enable FCoE offload when DCB is enabled for 82599\n net: Rework mdio-ofgpio driver to use of_mdio infrastructure\n register at91_ether using platform_driver_probe\n skge: Enable WoL by default if supported\n net: KS8851 needs to depend on MII\n be2net: Bug fix in the non-lro path. Size of received packet was not updated in statistics properly.\n ...\n" }, { "commit": "04fc0a4097014db7c22da33a56494e3e8a1895d5", "tree": "90ae528ddbe01f7a8e2818a94056c08a3d8475fa", "parents": [ "760dcc6e1839e7ca82507698fb077d5d78b24964", "ca4e771f7b878b7bab02dedb539f7742f9b4f50e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:16:57 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:16:57 2009 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (34 commits)\n V4L/DVB (12303): cx23885: check pointers before dereferencing in dprintk macro\n V4L/DVB (12302): cx23885-417: fix broken IOCTL handling\n V4L/DVB (12300): bttv: fix regression: tvaudio must be loaded before tuner\n V4L/DVB (12291): b2c2: fix frontends compiled into kernel\n V4L/DVB (12286): sn9c20x: reorder includes to be like other drivers\n V4L/DVB (12284): gspca - jpeg subdrivers: Check the result of kmalloc(jpeg header).\n V4L/DVB (12283): gspca - sn9c20x: New subdriver for sn9c201 and sn9c202 bridges.\n V4L/DVB (12282): gspca - main: Support for vidioc_g_chip_ident and vidioc_g/s_register.\n V4L/DVB (12269): af9013: auto-detect parameters in case of garbage given by app\n V4L/DVB (12267): gspca - sonixj: Bad sensor init of non ov76xx sensors.\n V4L/DVB (12265): em28xx: fix tuning problem in HVR-900 (R1)\n V4L/DVB (12263): em28xx: set demod profile for Pinnacle Hybrid Pro 320e\n V4L/DVB (12262): em28xx: Make sure the tuner is initialized if generic empia USB id was used\n V4L/DVB (12261): em28xx: set GPIO properly for Pinnacle Hybrid Pro analog support\n V4L/DVB (12260): em28xx: make support work for the Pinnacle Hybrid Pro (eb1a:2881)\n V4L/DVB (12258): em28xx: fix typo in mt352 init sequence for Terratec Cinergy T XS USB\n V4L/DVB (12257): em28xx: make tuning work for Terratec Cinergy T XS USB (mt352 variant)\n V4L/DVB (12245): em28xx: add support for mt9m001 webcams\n V4L/DVB (12244): em28xx: adjust vinmode/vinctl based on the stream input format\n V4L/DVB (12243): em28xx: allow specifying sensor xtal frequency\n ...\n" }, { "commit": "4897f1011aff7534b8e319404f7cd4028de7a453", "tree": "610380b8e0899cb6bb0f088d17d87c67a1c15618", "parents": [ "a9355cf8e68baac964f815079b820d2680756300", "5dea271b6d87bd1d79a59c1d5baac2596a841c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:16:21 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:16:21 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:\n dm table: pass correct dev area size to device_area_is_valid\n dm: remove queue next_ordered workaround for barriers\n dm raid1: wake kmirrord when requeueing delayed bios after remote recovery\n" }, { "commit": "2bc20d09b03bca6e068e07440812d75b70b1c0b2", "tree": "50711d4320e12efd1439639af8464b69a3b7af6a", "parents": [ "c7425eb4814bce40f3d117ff7a7870cc12e350e3", "f1015c447781729060c415f5133164c638561f25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:12:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:12:10 2009 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:\n jbd: fix race between write_metadata_buffer and get_write_access\n ext3: Get rid of extenddisksize parameter of ext3_get_blocks_handle()\n jbd: Fix a race between checkpointing code and journal_get_write_access()\n ext3: Fix truncation of symlinks after failed write\n jbd: Fail to load a journal if it is too short\n" }, { "commit": "9e1b32caa525cb236e80e9c671e179bcecccc657", "tree": "8a1f0abf5291b23047cfdf099d5cfc96cc9d9253", "parents": [ "4be3bd7849165e7efa6b0b35a23d6a3598d97465" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 22 15:44:28 2009 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:10:38 2009 -0700" }, "message": "mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()\n\nmm: Pass virtual address to [__]p{te,ud,md}_free_tlb()\n\nUpcoming paches to support the new 64-bit \"BookE\" powerpc architecture\nwill need to have the virtual address corresponding to PTE page when\nfreeing it, due to the way the HW table walker works.\n\nBasically, the TLB can be loaded with \"large\" pages that cover the whole\nvirtual space (well, sort-of, half of it actually) represented by a PTE\npage, and which contain an \"indirect\" bit indicating that this TLB entry\nRPN points to an array of PTEs from which the TLB can then create direct\nentries. Thus, in order to invalidate those when PTE pages are deleted,\nwe need the virtual address to pass to tlbilx or tlbivax instructions.\n\nThe old trick of sticking it somewhere in the PTE page struct page sucks\ntoo much, the address is almost readily available in all call sites and\nalmost everybody implemets these as macros, so we may as well add the\nargument everywhere. I added it to the pmd and pud variants for consistency.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e [MN10300 \u0026 FRV]\nAcked-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e [s390]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dcf777f6ed9799c5ac90ac17a5c369e6b73ca92e", "tree": "dc15b2d5800241d124528d627f8b039ac29d32d4", "parents": [ "d513d018e2236930b6163241bbdce64d2c0de49e" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sun Jul 26 19:11:14 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 26 19:11:14 2009 -0700" }, "message": "NET: ROSE: Don\u0027t use static buffer.\n\nThe use of a static buffer in rose2asc() to return its result is not\nthreadproof and can result in corruption if multiple threads are trying\nto use one of the procfs files based on rose2asc().\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "26e744b6b61066203fd57de0d3962353621e06f8", "tree": "b8f6941a2b37ee46594bd336ca100916ece8ac38", "parents": [ "af1d9afa75082663ea9e2b67b9381d1af403f52b" ], "author": { "name": "Brian Johnson", "email": "brijohn@gmail.com", "time": "Sun Jul 19 05:52:58 2009 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Jul 24 14:03:30 2009 -0300" }, "message": "V4L/DVB (12283): gspca - sn9c20x: New subdriver for sn9c201 and sn9c202 bridges.\n\nSigned-off-by: Brian Johnson \u003cbrijohn@gmail.com\u003e\nSigned-off-by: Jean-Francois Moine \u003cmoinejf@free.fr\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "5dea271b6d87bd1d79a59c1d5baac2596a841c37", "tree": "c85bcee4f90729927285fc282c6df94bf18d023d", "parents": [ "a732c207d19e899845ae47139708af898daaf9fd" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Thu Jul 23 20:30:42 2009 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Thu Jul 23 20:30:42 2009 +0100" }, "message": "dm table: pass correct dev area size to device_area_is_valid\n\nIncorrect device area lengths are being passed to device_area_is_valid().\n\nThe regression appeared in 2.6.31-rc1 through commit\n754c5fc7ebb417b23601a6222a6005cc2e7f2913.\n\nWith the dm-stripe target, the size of the target (ti-\u003elen) was used\ninstead of the stripe_width (ti-\u003elen/#stripes). An example of a\nconsequent incorrect error message is:\n\n device-mapper: table: 254:0: sdb too small for target\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "3c3301083e3bea4d14c597106c7b20b4b85fc03d", "tree": "6eabdd073bdc27eb3f0dd999ea946955afca18bf", "parents": [ "612e900c286a9535cc17da5171b0d8dcf8f3a12f", "0fdc7e67dd312986e30b861adff48732bd33eb3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 11:41:56 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 11:41:56 2009 -0700" }, "message": "Merge branch \u0027perf-counters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf\n\n* \u0027perf-counters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf: (31 commits)\n perf_counter tools: Give perf top inherit option\n perf_counter tools: Fix vmlinux symbol generation breakage\n perf_counter: Detect debugfs location\n perf_counter: Add tracepoint support to perf list, perf stat\n perf symbol: C++ demangling\n perf: avoid structure size confusion by using a fixed size\n perf_counter: Fix throttle/unthrottle event logging\n perf_counter: Improve perf stat and perf record option parsing\n perf_counter: PERF_SAMPLE_ID and inherited counters\n perf_counter: Plug more stack leaks\n perf: Fix stack data leak\n perf_counter: Remove unused variables\n perf_counter: Make call graph option consistent\n perf_counter: Add perf record option to log addresses\n perf_counter: Log vfork as a fork event\n perf_counter: Synthesize VDSO mmap event\n perf_counter: Make sure we dont leak kernel memory to userspace\n perf_counter tools: Fix index boundary check\n perf_counter: Fix the tracepoint channel to perfcounters\n perf_counter, x86: Extend perf_counter Pentium M support\n ...\n" }, { "commit": "d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d", "tree": "cb12e313178092e92136704660d68f7ce6578d19", "parents": [ "de72e5de062e48a992d6cafe2291a82fe498d641", "154839962a582b8eb661cde94ef3af0e03b374d7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 22 11:18:40 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 22 11:18:40 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "612e900c286a9535cc17da5171b0d8dcf8f3a12f", "tree": "f6931d0c1bc6cf8f798e04437a1a9c3d59a4eea5", "parents": [ "c57c3743784e08d8ceaaea928a8c84ad8b403aed", "9ba5f005c994ad28e266a0cd14ef29354be382c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 10:12:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 10:12:18 2009 -0700" }, "message": "Merge branch \u0027core-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n softirq: introduce tasklet_hrtimer infrastructure\n" }, { "commit": "5b26776bd9253931097a85dcb1b9da1bac554c02", "tree": "3dc8104e82cda8bbbfeefd8f5d21a1522c663a16", "parents": [ "356d1b52eb2445d94c6781f15346f00f4a675fda", "591d2fb02ea80472d846c0b8507007806bdd69cc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 10:11:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 10:11:24 2009 -0700" }, "message": "Merge branch \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n genirq: Delegate irq affinity setting to the irq thread\n" }, { "commit": "356d1b52eb2445d94c6781f15346f00f4a675fda", "tree": "16e908c7548b3697183432a3771f511e8c1c9c05", "parents": [ "bb184d11ffd015e67e5334e5a88bec2e00be5c20", "6301cb95c119ebf324bb96ee226fa9ddffad80a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 10:10:36 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 10:10:36 2009 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: fix nr_uninterruptible accounting of frozen tasks really\n sched: fix load average accounting vs. cpu hotplug\n sched: Account for vruntime wrapping\n" }, { "commit": "402168cee1a0b791c54c54a68ae21bb26880f40b", "tree": "127b1bd8f2d06b18449998022eaab1c20baab950", "parents": [ "12e8ffe35eaca1411afc1f3124478f8e2b65eedc", "a947a39d52f5b647a2fd5eca55d39e722a2fa90f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 09:49:58 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 09:49:58 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)\n sky2: Avoid races in sky2_down\n drivers/net/mlx4: Adjust constant\n drivers/net: Move a dereference below a NULL test\n drivers/net: Move a dereference below a NULL test\n connector: maintainer/mail update.\n USB host CDC Phonet network interface driver\n macsonic, jazzsonic: fix oops on module unload\n macsonic: move probe function to .devinit.text\n can: switch carrier on if device was stopped while in bus-off state\n can: restart device even if dev_alloc_skb() fails\n can: sja1000: remove duplicated includes\n New device ID for sc92031 [1088:2031]\n 3c589_cs: re-initialize the multicast in the tc589_reset\n Fix error return for setsockopt(SO_TIMESTAMPING)\n netxen: fix thermal check and shutdown\n netxen: fix deadlock on dev close\n netxen: fix context deletion sequence\n net: Micrel KS8851 SPI network driver\n tcp: Use correct peer adr when copying MD5 keys\n tcp: Fix MD5 signature checking on IPv4 mapped sockets\n ...\n" }, { "commit": "24c30dbbcdda9aeccb23b4eecb6bb8e538742ea4", "tree": "3b19ab216397bae4712e435d68f1e40ce444527b", "parents": [ "a947a39d52f5b647a2fd5eca55d39e722a2fa90f" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Thu Jul 16 21:31:31 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 22 09:27:18 2009 -0700" }, "message": "of/mdio: Add support function for Ethernet fixed-link property\n\nFixed-link support is broken for the ucc_eth, gianfar, and fs_enet\ndevice drivers. The \"OF MDIO rework\" patches removed most of the\nsupport. Instead of re-adding fixed-link stuff to the drivers, this\npatch adds a support function for parsing the fixed-link property\nand obtaining a dummy phy to match.\n\nNote: the dummy phy handling in arch/powerpc is a bit of a hack and\nneeds to be reworked. This function is being added now to solve the\nregression in the Ethernet drivers, but it should be considered a\ntemporary measure until the fixed link handling can be reworked.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f453c24b95a085fc7bd35d53b33abc4dc5a048b", "tree": "63d2b80acb3095a3e1a56c69d20a8137a1337aed", "parents": [ "573402db02746179b3f95f83a11a787501f52d0a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Jul 21 13:19:40 2009 +0200" }, "committer": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Jul 22 18:05:56 2009 +0200" }, "message": "perf_counter: PERF_SAMPLE_ID and inherited counters\n\nAnton noted that for inherited counters the counter-id as provided by\nPERF_SAMPLE_ID isn\u0027t mappable to the id found through PERF_RECORD_ID\nbecause each inherited counter gets its own id.\n\nHis suggestion was to always return the parent counter id, since that\nis the primary counter id as exposed. However, these inherited\ncounters have a unique identifier so that events like\nPERF_EVENT_PERIOD and PERF_EVENT_THROTTLE can be specific about which\ncounter gets modified, which is important when trying to normalize the\nsample streams.\n\nThis patch removes PERF_EVENT_PERIOD in favour of PERF_SAMPLE_PERIOD,\nwhich is more useful anyway, since changing periods became a lot more\ncommon than initially thought -- rendering PERF_EVENT_PERIOD the less\nuseful solution (also, PERF_SAMPLE_PERIOD reports the more accurate\nvalue, since it reports the value used to trigger the overflow,\nwhereas PERF_EVENT_PERIOD simply reports the requested period changed,\nwhich might only take effect on the next cycle).\n\nThis still leaves us PERF_EVENT_THROTTLE to consider, but since that\n_should_ be a rare occurrence, and linking it to a primary id is the\nmost useful bit to diagnose the problem, we introduce a\nPERF_SAMPLE_STREAM_ID, for those few cases where the full\nreconstruction is important.\n\n[Does change the ABI a little, but I see no other way out]\n\nSuggested-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1248095846.15751.8781.camel@twins\u003e\n" }, { "commit": "9ba5f005c994ad28e266a0cd14ef29354be382c9", "tree": "0a2ff570070afc18e7dad61a2955b94614ce9b51", "parents": [ "aea1f7964ae6cba5eb419a958956deb9016b3341" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Wed Jul 22 14:18:35 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jul 22 17:01:17 2009 +0200" }, "message": "softirq: introduce tasklet_hrtimer infrastructure\n\ncommit ca109491f (hrtimer: removing all ur callback modes) moved all\nhrtimer callbacks into hard interrupt context when high resolution\ntimers are active. That breaks code which relied on the assumption\nthat the callback happens in softirq context.\n\nProvide a generic infrastructure which combines tasklets and hrtimers\ntogether to provide an in-softirq hrtimer experience.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: torvalds@linux-foundation.org\nCc: kaber@trash.net\nCc: David Miller \u003cdavem@davemloft.net\u003e\nLKML-Reference: \u003c1248265724.27058.1366.camel@twins\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "f44aebcc566d1d6275f7191867b9633dc11de2ee", "tree": "a5faaf5ca8e1360f359ee22ad29582992596c3e6", "parents": [ "c05594b62125c528d93af3a78229793aae36df7f" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Wed Jul 15 15:49:52 2009 -0400" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jul 21 15:26:27 2009 -0400" }, "message": "inotify: use GFP_NOFS under potential memory pressure\n\ninotify can have a watchs removed under filesystem reclaim.\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ INFO: inconsistent lock state ]\n2.6.31-rc2 #16\n---------------------------------\ninconsistent {IN-RECLAIM_FS-W} -\u003e {RECLAIM_FS-ON-W} usage.\nkhubd/217 [HC0[0]:SC0[0]:HE1:SE1] takes:\n (iprune_mutex){+.+.?.}, at: [\u003cc10ba899\u003e] invalidate_inodes+0x20/0xe3\n{IN-RECLAIM_FS-W} state was registered at:\n [\u003cc10536ab\u003e] __lock_acquire+0x2c9/0xac4\n [\u003cc1053f45\u003e] lock_acquire+0x9f/0xc2\n [\u003cc1308872\u003e] __mutex_lock_common+0x2d/0x323\n [\u003cc1308c00\u003e] mutex_lock_nested+0x2e/0x36\n [\u003cc10ba6ff\u003e] shrink_icache_memory+0x38/0x1b2\n [\u003cc108bfb6\u003e] shrink_slab+0xe2/0x13c\n [\u003cc108c3e1\u003e] kswapd+0x3d1/0x55d\n [\u003cc10449b5\u003e] kthread+0x66/0x6b\n [\u003cc1003fdf\u003e] kernel_thread_helper+0x7/0x10\n [\u003cffffffff\u003e] 0xffffffff\n\nTwo things are needed to fix this. First we need a method to tell\nfsnotify_create_event() to use GFP_NOFS and second we need to stop using\none global IN_IGNORED event and allocate them one at a time. This solves\ncurrent issues with multiple IN_IGNORED on a queue having tail drop\nproblems and simplifies the allocations since we don\u0027t have to worry about\ntwo tasks opperating on the IGNORED event concurrently.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "e56f0975360369347725c49654ecfe3792710429", "tree": "52845ecc6fca6a66c192f87eb8d3d45b0ddbce18", "parents": [ "c66284f2a421f6aebbafd56cb8b90b8e6a9cb2de" ], "author": { "name": "Alan Jenkins", "email": "alan-jenkins@tuffmail.co.uk", "time": "Sat Jul 18 19:20:20 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 21 12:07:43 2009 -0400" }, "message": "rfkill: remove too-strict __must_check\n\nSome drivers don\u0027t need the return value of rfkill_set_hw_state(),\nso it should not be marked as __must_check.\n\nSigned-off-by: Alan Jenkins \u003calan-jenkins@tuffmail.co.uk\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "591d2fb02ea80472d846c0b8507007806bdd69cc", "tree": "c7962a95a47bbdf664f15a504eff24c351f33613", "parents": [ "aea1f7964ae6cba5eb419a958956deb9016b3341" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 21 11:09:39 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 21 14:35:07 2009 +0200" }, "message": "genirq: Delegate irq affinity setting to the irq thread\n\nirq_set_thread_affinity() calls set_cpus_allowed_ptr() which might\nsleep, but irq_set_thread_affinity() is called with desc-\u003elock held\nand can be called from hard interrupt context as well. The code has\nanother bug as it does not hold a ref on the task struct as required\nby set_cpus_allowed_ptr().\n\nJust set the IRQTF_AFFINITY bit in action-\u003ethread_flags. The next time\nthe thread runs it migrates itself. Solves all of the above problems\nnicely.\n\nAdd kerneldoc to irq_set_thread_affinity() while at it.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLKML-Reference: \u003cnew-submission\u003e\n\n" }, { "commit": "aea1f7964ae6cba5eb419a958956deb9016b3341", "tree": "e326d376529ea0be73ab435317709b684bb3f7cf", "parents": [ "457f82bac659745f6d5052e4c493d92d62722c9c", "04e448d9a386640a79a4aa71251aa1cdd314f662" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 20 16:49:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 20 16:49:45 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:\n vmlinux.lds.h: restructure BSS linker script macros\n kconfig: initialize the screen before using curses(3) functions\n kconfig: variable argument lists needs `stdarg.h\u0027\n kbuild, deb-pkg: fix install scripts for posix sh\n" }, { "commit": "e3afe7b75ed8f809c1473ea9b39267487c187ccb", "tree": "715aa813d57ffbc6b1a179e2f7f2957b88b415dc", "parents": [ "a50a97d415d839e6db9df288ff0205528e52c03e" ], "author": { "name": "John Dykstra", "email": "john.dykstra1@gmail.com", "time": "Thu Jul 16 05:04:51 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 20 07:49:07 2009 -0700" }, "message": "tcp: Fix MD5 signature checking on IPv4 mapped sockets\n\nFix MD5 signature checking so that an IPv4 active open\nto an IPv6 socket can succeed. In particular, use the\ncorrect address family\u0027s signature generation function\nfor the SYN/ACK.\n\nReported-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: John Dykstra \u003cjohn.dykstra1@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "def01bc53d03881acfc393bd10a5c7575187e008", "tree": "7b6a82ca80e95e3a3b5ea4f10adb6a1cdda277b5", "parents": [ "613afbf83298efaead05ebcac23d2285609d7160" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 16 15:44:29 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 15:51:45 2009 +0200" }, "message": "sched: Convert the only user of cond_resched_bkl to use cond_resched()\n\nfs/locks.c:flock_lock_file() is the only user of\ncond_resched_bkl()\n\nThis helper doesn\u0027t do anything more than cond_resched(). The\nlatter naming is enough to explain that we are rescheduling if\nneeded.\n\nThe bkl suffix suggests another semantics but it\u0027s actually a\nsynonym of cond_resched().\n\nReported-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1247725694-6082-7-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "613afbf83298efaead05ebcac23d2285609d7160", "tree": "15fa2025d74cee5f6805ab974c532c6b6a603333", "parents": [ "6f80bd985fe242c2e6a8b6209ed20b0495d3d63b" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 16 15:44:29 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 15:51:44 2009 +0200" }, "message": "sched: Pull up the might_sleep() check into cond_resched()\n\nmight_sleep() is called late-ish in cond_resched(), after the\nneed_resched()/preempt enabled/system running tests are\nchecked.\n\nIt\u0027s better to check the sleeps while atomic earlier and not\ndepend on some environment datas that reduce the chances to\ndetect a problem.\n\nAlso define cond_resched_*() helpers as macros, so that the\nFILE/LINE reported in the sleeping while atomic warning\ndisplays the real origin and not sched.h\n\nChanges in v2:\n\n - Call __might_sleep() directly instead of might_sleep() which\n may call cond_resched()\n\n - Turn cond_resched() into a macro so that the file:line\n couple reported refers to the caller of cond_resched() and\n not __cond_resched() itself.\n\nChanges in v3:\n\n - Also propagate this __might_sleep() pull up to\n cond_resched_lock() and cond_resched_softirq()\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1247725694-6082-6-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6f80bd985fe242c2e6a8b6209ed20b0495d3d63b", "tree": "cd21eeb013fe87a59c3406126e8357e30a22635a", "parents": [ "e4aafea2d4bde8b44d6500c4ee7195bbfc51269e" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 16 15:44:29 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 15:51:43 2009 +0200" }, "message": "sched: Remove the CONFIG_PREEMPT_BKL case definition of cond_resched()\n\nCONFIG_PREEMPT_BKL doesn\u0027t exist anymore. So remove this\nconfig-on case definition of cond_resched().\n\nReported-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1247725694-6082-5-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e4aafea2d4bde8b44d6500c4ee7195bbfc51269e", "tree": "bf0c9df18b9f63bb10da0096d81ba80712a71665", "parents": [ "e09758fae8ccde97e026c704319eaa18d488dc86" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 16 15:44:29 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 15:51:42 2009 +0200" }, "message": "sched: Add a preempt count base offset to __might_sleep()\n\nAdd a preempt count base offset to compare against the current\npreempt level count. It prepares to pull up the might_sleep\ncheck from cond_resched() to cond_resched_lock() and\ncond_resched_bh().\n\nFor these two helpers, we need to respectively ensure that once\nwe\u0027ll unlock the given spinlock / reenable local softirqs, we\nwill reach a sleepable state.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n[ Move and rename preempt_count_equals() ]\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1247725694-6082-4-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e09758fae8ccde97e026c704319eaa18d488dc86", "tree": "b2605cb49f9ac5a5d723cde13e14b5380ef9ed86", "parents": [ "4b2155678d7cc7b5f45d6b36049091376c3408a2" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 16 15:44:29 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 15:51:41 2009 +0200" }, "message": "sched: Cover the CONFIG_DEBUG_SPINLOCK_SLEEP off-case for __might_sleep()\n\nCover the off case for __might_sleep(), so that we avoid\n#ifdefs in files that make use of it. Especially, this prepares\nfor the __might_sleep() pull up on cond_resched().\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1247725694-6082-3-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5304d5fc74a269cc6c3e70f9713684ca729abdf0", "tree": "6a5db62915abd260241a2b9aee34086c93293ca6", "parents": [ "54d35f29f49224d86b994acb6e5969b9ba09022d", "78af08d90b8f745044b1274430bc4bc6b2b27aca" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 15:50:22 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 15:50:40 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into sched/core\n\nMerge reason: branch had an old upstream base (-rc1-ish), but also\n merge to avoid a conflict.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6301cb95c119ebf324bb96ee226fa9ddffad80a7", "tree": "7201f406d135212bae3775dc7d71cbdd6990e5de", "parents": [ "a468d389349a7560249b355cdb6d2097ea1616c9" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 17 14:15:47 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Jul 18 14:19:53 2009 +0200" }, "message": "sched: fix nr_uninterruptible accounting of frozen tasks really\n\ncommit e3c8ca8336 (sched: do not count frozen tasks toward load) broke\nthe nr_uninterruptible accounting on freeze/thaw. On freeze the task\nis excluded from accounting with a check for (task-\u003eflags \u0026\nPF_FROZEN), but that flag is cleared before the task is thawed. So\nwhile we prevent that the task with state TASK_UNINTERRUPTIBLE\nis accounted to nr_uninterruptible on freeze we decrement\nnr_uninterruptible on thaw.\n\nUse a separate flag which is handled by the freezing task itself. Set\nit before calling the scheduler with TASK_UNINTERRUPTIBLE state and\nclear it after we return from frozen state.\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "78af08d90b8f745044b1274430bc4bc6b2b27aca", "tree": "9e233eb5acf9974bf02de57a9d88c35f86629114", "parents": [ "a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232", "ecca0683230b83e8f830ff157911fad20bc43015" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 21:19:50 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 21:19:50 2009 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm: Move a dereference below a NULL test\n fb/intelfb: conflict with DRM_I915 and hide by default\n drm/ttm: fix misplaced parentheses\n drm/via: Fix vblank IRQ on VIA hardware.\n drm: drm_gem, check kzalloc retval\n drm: drm_debugfs, check kmalloc retval\n drm/radeon: add some missing pci ids\n" }, { "commit": "04e448d9a386640a79a4aa71251aa1cdd314f662", "tree": "a73a00fd881ee61cf756f0edd8ffbc77abcf1e3e", "parents": [ "d0e1e09568507ac771072d97f0781af82c935b3e" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Sun Jul 12 18:23:33 2009 -0400" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Jul 18 00:02:45 2009 +0200" }, "message": "vmlinux.lds.h: restructure BSS linker script macros\n\nThe BSS section macros in vmlinux.lds.h currently place the .sbss\ninput section outside the bounds of [__bss_start, __bss_end]. On all\narchitectures except for microblaze that handle both .sbss and\n__bss_start/__bss_end, this is wrong: the .sbss input section is\nwithin the range [__bss_start, __bss_end]. Relatedly, the example\ncode at the top of the file actually has __bss_start/__bss_end defined\ntwice; I believe the right fix here is to define them in the\nBSS_SECTION macro but not in the BSS macro.\n\nAnother problem with the current macros is that several\narchitectures have an ALIGN(4) or some other small number just before\n__bss_stop in their linker scripts. The BSS_SECTION macro currently\nhardcodes this to 4; while it should really be an argument. It also\nignores its sbss_align argument; fix that.\n\nmn10300 is the only user at present of any of the macros touched by\nthis patch. It looks like mn10300 actually was incorrectly converted\nto use the new BSS() macro (the alignment of 4 prior to conversion was\na __bss_stop alignment, but the argument to the BSS macro is a start\nalignment). So fix this as well.\n\nI\u0027d like acks from Sam and David on this one. Also CCing Paul, since\nhe has a patch from me which will need to be updated to use\nBSS_SECTION(0, PAGE_SIZE, 4) once this gets merged.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "e79f07e2925b10f09a2621650c16f3d6ea778747", "tree": "564b574f0e517c16a48ff2fb59d444b28543702e", "parents": [ "4b892e6582e3a4fe01f623aea386907270d5bf83" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@hp.com", "time": "Tue Jul 07 08:47:10 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:47 2009 +0930" }, "message": "virtio_net: Sync header with qemu\n\nQemu added support for a few extra RX modes that Linux doesn\u0027t\ncurrently make use of. Sync the headers to maintain consistency.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@hp.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "5780888bcac316508eb5f4dd23bbea8b5057647c", "tree": "59d8b6ad427e87ebb7b41f855d32b7a2126b1dc6", "parents": [ "4b0a84043e0c14088958fddb62f416d050368011" ], "author": { "name": "Matias Zabaljauregui", "email": "zabaljauregui@gmail.com", "time": "Thu Jun 18 11:44:06 2009 -0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:44 2009 +0930" }, "message": "lguest: fix journey\n\nfix: \"make Guest\" was complaining about duplicated G:032\n\nSigned-off-by: Matias Zabaljauregui \u003czabaljauregui@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "4dc6dc7162c08b9965163c9ab3f9375d4adff2c7", "tree": "f4b9959e9ca5e5b8bdb6301663a15e0f67d4c68c", "parents": [ "303d67c288319768b19ed8dbed429fef7eb7c275" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jul 15 23:13:10 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 16 18:05:26 2009 -0700" }, "message": "net: sock_copy() fixes\n\nCommit e912b1142be8f1e2c71c71001dc992c6e5eb2ec1\n(net: sk_prot_alloc() should not blindly overwrite memory)\ntook care of not zeroing whole new socket at allocation time.\n\nsock_copy() is another spot where we should be very careful.\nWe should not set refcnt to a non null value, until\nwe are sure other fields are correctly setup, or\na lockless reader could catch this socket by mistake,\nwhile not fully (re)initialized.\n\nThis patch puts sk_node \u0026 sk_refcnt to the very beginning\nof struct sock to ease sock_copy() \u0026 sk_prot_alloc() job.\n\nWe add appropriate smp_wmb() before sk_refcnt initializations\nto match our RCU requirements (changes to sock keys should\nbe committed to memory before sk_refcnt setting)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63f7a330014ad29b662638caabd8e96fe945b9ed", "tree": "4a866e63fee62d3f36ca430bbdd5adf5bb75e82b", "parents": [ "a132ebcb454568cc06fbdf3a5629eb9d64c9d578", "f9f868dbcca961ed62f1df1d114abd0c38c47dce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:07:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:07:37 2009 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n timer stats: fix quick check optimization\n" }, { "commit": "5c9228f0cfb09a098a8a380116b42ae099e967b6", "tree": "f3306b2a1e53309b876d5d2543ad6fa85ae66caf", "parents": [ "ff5392d77bbb0746d1a034e955231f03ffc30b61" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Jul 16 16:06:09 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "vt: drop bootmem/slab memory distinction\n\nBootmem is not used for the vt screen buffer anymore as slab is now\navailable at the time the console is initialized.\n\nGet rid of the now superfluous distinction between slab and bootmem,\nit\u0027s always slab.\n\nThis also fixes a kmalloc leak which Catalin described thusly:\n\nCommit a5f4f52e (\"vt: use kzalloc() instead of the bootmem allocator\")\nreplaced the alloc_bootmem() with kzalloc() but didn\u0027t set vc_kmalloced to\n1 and the memory block is later leaked. The corresponding kmemleak trace:\n\nunreferenced object 0xdf828000 (size 8192):\n comm \"swapper\", pid 0, jiffies 4294937296\n backtrace:\n [\u003cc006d473\u003e] __save_stack_trace+0x17/0x1c\n [\u003cc000d869\u003e] log_early+0x55/0x84\n [\u003cc01cfa4b\u003e] kmemleak_alloc+0x33/0x3c\n [\u003cc006c013\u003e] __kmalloc+0xd7/0xe4\n [\u003cc00108c7\u003e] con_init+0xbf/0x1b8\n [\u003cc0010149\u003e] console_init+0x11/0x20\n [\u003cc0008797\u003e] start_kernel+0x137/0x1e4\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nTested-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "43237b5490e8f2f4679decd660064ff35ce490cc", "tree": "487380755d875bfe4e5b3700d08c85d58f97ae14", "parents": [ "1e9fd53b783ea646de3ee09a4574afeb6778d504" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed May 20 18:41:58 2009 +0200" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Jul 15 21:30:46 2009 +0200" }, "message": "ext3: Get rid of extenddisksize parameter of ext3_get_blocks_handle()\n\nGet rid of extenddisksize parameter of ext3_get_blocks_handle(). This seems to\nbe a relict from some old days and setting disksize in this function does not\nmake much sence. Currently it was set only by ext3_getblk(). Since the\nparameter has some effect only if create \u003d\u003d 1, it is easy to check that the\nthree callers which end up calling ext3_getblk() with create \u003d\u003d 1 (ext3_append,\next3_quota_write, ext3_mkdir) do the right thing and set disksize themselves.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\n" }, { "commit": "35b5c55fee08e6e4001ba98060a2d0b82f70b5f4", "tree": "a50b920260c7ccdb2da90bd6a064de168280beeb", "parents": [ "e9e961c9a818a2f24711af493b907a8e40a69efc", "b2dde6afe5d29212d521e69492ebc299db235001" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 15 10:29:09 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 15 10:29:09 2009 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n ahci: add device ID for 82801JI sata controller\n drivers/ata: Move a dereference below a NULL test\n libata: implement and use HORKAGE_NOSETXFER, take#2\n libata: fix follow-up SRST failure path\n" }, { "commit": "ad49f501867cba87e1e45e5ebae0b12435d68bf1", "tree": "4602e5caf96451b1dcdda7a38628d494466d2e20", "parents": [ "61b576dbbe6a19d102c025ebc102a0749e2d3c80" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Fri Jul 10 22:36:26 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 15 17:13:18 2009 +1000" }, "message": "drm/ttm/radeon: add dma32 support.\n\nThis add support for using dma32 memory on gpus that really need it.\n\nCurrently IGPs are left without DMA32 but we might need to change\nthat unless we can fix rs690.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d1724078d6a01177c1db4ea0b75fda1ca8a73d57", "tree": "24c2cef55a572938acadbbd662df4d65701ca38e", "parents": [ "531369e62649bb8f31217cc0bf33ee6f89f1dff6" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Jun 24 19:57:35 2009 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 15 17:13:09 2009 +1000" }, "message": "ttm: Make messages more readable.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "069a9dce384e211784ce6fdfaf1f13921327480d", "tree": "82bdedb49c4712f441ef940c34ffe748eb8835f7", "parents": [ "e9e961c9a818a2f24711af493b907a8e40a69efc" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 01 13:03:52 2009 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 15:48:36 2009 +1000" }, "message": "drm/radeon: add some missing pci ids\n\nAlso, fix ordering for a couple others\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "d0cb43b35d64877b2944bd37719708be5d7bbf99", "tree": "7b282b1070613c552143d143f74e407c2ccb4b6e", "parents": [ "fe2c4d018fc6127610fef677e020b3bb41cfaaaf" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jul 09 09:27:50 2009 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Jul 14 22:41:46 2009 -0400" }, "message": "libata: implement and use HORKAGE_NOSETXFER, take#2\n\nPIONEER DVD-RW DVRTD08 times out SETXFER if no media is present. The\ndevice is SATA and simply skipping SETXFER works around the problem.\nImplement ATA_HORKAGE_NOSETXFER and apply it to the device.\n\nReported by Moritz Rigler in the following thread.\n\n http://thread.gmane.org/gmane.linux.ide/36790\n\nand by Lars in bko#9540.\n\nUpdated to whine and ignore NOSETXFER if PATA component is detected as\nsuggested by Alan Cox.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Moritz Rigler \u003clinux-ide@momail.e4ward.com\u003e\nReported-by: Lars \u003clars21ce@gmx.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "62f49052ac4b68152ddf742b78b2151ba20dbc28", "tree": "f5cc92c195484360176e884fd88e8d3d01ae4b18", "parents": [ "5be6717e0d2493a20791d592e2d20fd2b2f62d44", "6ff7041dbfeb3bd7dfe9aa67275c21199ef760d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:24 2009 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n hrtimer: Fix migration expiry check\n hrtimer: migration: do not check expiry time on current CPU\n" }, { "commit": "c0c50b541a4b147c5c2572ed051420238c47f57a", "tree": "7500aefddead1009ed271c5b413f4b4fa89083a1", "parents": [ "a376d446771710790f5f3425172b467bf8578e22", "6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:34:32 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:34:32 2009 -0700" }, "message": "Merge branch \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing/function-profiler: do not free per cpu variable stat\n tracing/events: Move TRACE_SYSTEM outside of include guard\n" }, { "commit": "a376d446771710790f5f3425172b467bf8578e22", "tree": "64dd36bcb3df9a4d76d31900f1967b0cc302254e", "parents": [ "6847e154e3cd74fca6084124c097980a7634285a", "252aa9d94a04252046f3a382e6aca1b5c95921d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:33:54 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:33:54 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n Revert \"NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.\"\n skbuff.h: Fix comment for NET_IP_ALIGN\n drivers/net: using spin_lock_irqsave() in net_send_packet()\n NET: phy_device, fix lock imbalance\n gre: fix ToS/DiffServ inherit bug\n igb: gcc-3.4.6 fix\n atlx: duplicate testing of MCAST flag\n NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.\n netdev: restore MTU change operation\n netdev: restore MAC address set and validate operations\n sit: fix regression: do not release skb-\u003edst before xmit\n net: ip_push_pending_frames() fix\n net: sk_prot_alloc() should not blindly overwrite memory\n" }, { "commit": "8660c1240ec6016522b882c88751cb4ce40bf0e8", "tree": "560b0136efdface63b6c3dc52d5ab7bcf30b4021", "parents": [ "79fbe134832ebb70a49d8802cfeb2401dc35bb38" ], "author": { "name": "Tobias Klauser", "email": "klto@zhaw.ch", "time": "Mon Jul 13 22:48:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 14 12:03:42 2009 -0700" }, "message": "skbuff.h: Fix comment for NET_IP_ALIGN\n\nUse the correct function call for skb_reserve in the comment for\nNET_IP_ALIGN.\n\nSigned-off-by: Tobias Klauser \u003cklto@zhaw.ch\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1cf29683f4414296dc772a87caa207cab16c310c", "tree": "90d05ba531c5ad48d8d171d5b78038a7df7728e7", "parents": [ "4a390e07fc53ce9dd615d7b788e9ecc73f87ad94", "96577c43827697ca1af5982fa256a34786d0c720" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 16:39:25 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 16:39:25 2009 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n jbd2: fix race between write_metadata_buffer and get_write_access\n ext4: Fix ext4_mb_initialize_context() to initialize all fields\n ext4: fix null handler of ioctls in no journal mode\n ext4: Fix buffer head reference leak in no-journal mode\n ext4: Move __ext4_journalled_writepage() to avoid forward declaration\n ext4: Fix mmap/truncate race when blocksize \u003c pagesize \u0026\u0026 !nodellaoc\n ext4: Fix mmap/truncate race when blocksize \u003c pagesize \u0026\u0026 delayed allocation\n ext4: Don\u0027t look at buffer_heads outside i_size.\n ext4: Fix goal inum check in the inode allocator\n ext4: fix no journal corruption with locale-gen\n ext4: Calculate required journal credits for inserting an extent properly\n ext4: Fix truncation of symlinks after failed write\n jbd2: Fix a race between checkpointing code and journal_get_write_access()\n ext4: Use rcu_barrier() on module unload.\n ext4: naturally align struct ext4_allocation_request\n ext4: mark several more functions in mballoc.c as noinline\n ext4: Fix potential reclaim deadlock when truncating partial block\n jbd2: Remove GFP_ATOMIC kmalloc from inside spinlock critical region\n ext4: Fix type warning on 64-bit platforms in tracing events header\n" }, { "commit": "a4dc32374ed6dd56e09039ea8b7151c3a3e2307d", "tree": "c1a5482db418ff1adb0135ac9d3abd01d138c2ad", "parents": [ "51feb98d2547a389be2f666514f5bcd658f79eab", "38c7dc373029e4666b17850054dd43c1c96bb264" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:24:08 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:24:08 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n wm97xx_batery: replace driver_data with dev_get_drvdata()\n omap: video: remove direct access of driver_data\n Sound: remove direct access of driver_data\n driver model: fix show/store prototypes in doc.\n Firmware: firmware_class, fix lock imbalance\n Driver Core: remove BUS_ID_SIZE\n sparc: remove driver-core BUS_ID_SIZE\n partitions: fix broken uevent_suppress conversion\n devres: WARN() and return, don\u0027t crash on device_del() of uninitialized device\n" }, { "commit": "51feb98d2547a389be2f666514f5bcd658f79eab", "tree": "bd3d3eb486a0008340afd5807d9d2db12ec3b7b3", "parents": [ "8f8f013478133eb98e35e1d669c98c5e39d769c7", "dc7520c17982ca4232233d2781e5cde29e58fbad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:23:03 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:23:03 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (48 commits)\n USB: otg: fix module reinsert issue\n USB: handle zero-length usbfs submissions correctly\n USB: EHCI: report actual_length for iso transfers\n USB: option: remove unnecessary and erroneous code\n USB: cypress_m8: remove invalid Clear-Halt\n USB: musb_host: undo incorrect change in musb_advance_schedule()\n USB: fix LANGID\u003d0 regression\n USB: serial: sierra driver id_table additions\n USB serial: Add ID for Turtelizer, an FT2232L-based JTAG/RS-232 adapter.\n USB: fix race leading to a write after kfree in usbfs\n USB: Sierra: fix oops upon device close\n USB: option.c: add A-Link 3GU device id\n USB: Serial: Add support for Arkham Technology adapters\n USB: Fix option_ms regression in 2.6.31-rc2\n USB: gadget audio: select SND_PCM\n USB: ftdi: support NDI devices\n Revert USB: usbfs: deprecate and hide option for !embedded\n USB: usb.h: fix kernel-doc notation\n USB: RNDIS gadget, fix issues talking from PXA\n USB: serial: FTDI with product code FB80 and vendor id 0403\n ...\n" }, { "commit": "d0b6e04a4cd8360e3c9c419f7c30a3081a0c142a", "tree": "621a99cac5fdc0c90a3bcdab60d5896daba04a00", "parents": [ "7638d5322bd89d49e013a03fe2afaeb6d214fabd" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Jul 13 10:33:21 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 13 10:59:55 2009 +0200" }, "message": "tracing/events: Move TRACE_SYSTEM outside of include guard\n\nIf TRACE_INCLDUE_FILE is defined, \u003ctrace/events/TRACE_INCLUDE_FILE.h\u003e\nwill be included and compiled, otherwise it will be\n\u003ctrace/events/TRACE_SYSTEM.h\u003e\n\nSo TRACE_SYSTEM should be defined outside of #if proctection,\njust like TRACE_INCLUDE_FILE.\n\nImaging this scenario:\n\n #include \u003ctrace/events/foo.h\u003e\n -\u003e TRACE_SYSTEM \u003d\u003d foo\n ...\n #include \u003ctrace/events/bar.h\u003e\n -\u003e TRACE_SYSTEM \u003d\u003d bar\n ...\n #define CREATE_TRACE_POINTS\n #include \u003ctrace/events/foo.h\u003e\n -\u003e TRACE_SYSTEM \u003d\u003d bar !!!\n\nand then bar.h will be included and compiled.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4A5A9CF1.2010007@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e376bbbb6a82cf119c93bde66937f66c72cba27b", "tree": "ae1b628e5e12b6295b07a40d3f4df9ba3bf5213a", "parents": [ "4e19f220d4e84f5728cb7edde36352ab425cfba4" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu Jun 18 10:39:11 2009 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jul 12 15:16:39 2009 -0700" }, "message": "USB: usb.h: fix kernel-doc notation\n\nFix usb.h kernel-doc warnings:\n\nWarning(include/linux/usb.h:918): Excess struct/union/enum/typedef member \u0027nodename\u0027 description in \u0027usb_device_driver\u0027\nWarning(include/linux/usb.h:939): No description found for parameter \u0027nodename\u0027\nWarning(include/linux/usb.h:1219): No description found for parameter \u0027sg\u0027\nWarning(include/linux/usb.h:1219): No description found for parameter \u0027num_sgs\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "1a74826fa1cd6c2e382f927403b4440675f0f55a", "tree": "5746aa98ac691b828a2345c4d772e4965f281e8e", "parents": [ "e3a3174519bae99fe3a3d3b9dfda68d820527b44" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jun 23 15:58:48 2009 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jul 12 15:16:36 2009 -0700" }, "message": "Revert \"USB: Add Intel Langwell USB OTG Transceiver Drive\"\n\nThis reverts commit 453f77558810ffa669ed5a510a7173ec49def396.\n\nThe driver should not have been accepted as the MSRT code is not\nin the main kernel yet, which this depends on.\n\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Hao Wu \u003chao.wu@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4ead0a2b6b3aa0b527871ec978c3ef12aafb6bfb", "tree": "d1ffedf68fa4c6c5437bd457fa4b561b1b5805f3", "parents": [ "08f42877aff6b966a386c47e0aeb98e7645db2a9" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Thu Jul 02 23:25:44 2009 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jul 12 13:02:10 2009 -0700" }, "message": "Driver Core: remove BUS_ID_SIZE\n\nThe name size limit is gone from the driver-core, this is\nthe removal of the last left-over.\n\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "7638d5322bd89d49e013a03fe2afaeb6d214fabd", "tree": "cfafc7c6c9f169a7a308c290363dde765e21735d", "parents": [ "dd0d9a46f573b086a67522f819566427dba9c4c7", "264ef8a904943ed7d0b04fa958894d7a5c2b2c61" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 12 12:24:35 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 12 12:24:35 2009 -0700" }, "message": "Merge branch \u0027kmemleak\u0027 of git://linux-arm.org/linux-2.6\n\n* \u0027kmemleak\u0027 of git://linux-arm.org/linux-2.6:\n kmemleak: Remove alloc_bootmem annotations introduced in the past\n kmemleak: Add callbacks to the bootmem allocator\n kmemleak: Allow partial freeing of memory blocks\n kmemleak: Trace the kmalloc_large* functions in slub\n kmemleak: Scan objects allocated during a scanning episode\n kmemleak: Do not acquire scan_mutex in kmemleak_open()\n kmemleak: Remove the reported leaks number limitation\n kmemleak: Add more cond_resched() calls in the scanning thread\n kmemleak: Renice the scanning thread to +10\n" }, { "commit": "405f55712dfe464b3240d7816cc4fe4174831be2", "tree": "96c425ea7fa8b31058b8f83a433c5e5265c8ebc7", "parents": [ "f9fabcb58a6d26d6efde842d1703ac7cfa9427b6" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sat Jul 11 22:08:37 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 12 12:22:34 2009 -0700" }, "message": "headers: smp_lock.h redux\n\n* Remove smp_lock.h from files which don\u0027t need it (including some headers!)\n* Add smp_lock.h to files which do need it\n* Make smp_lock.h include conditional in hardirq.h\n It\u0027s needed only for one kernel_locked() usage which is under CONFIG_PREEMPT\n\n This will make hardirq.h inclusion cheaper for every PREEMPT\u003dn config\n (which includes allmodconfig/allyesconfig, BTW)\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f9fabcb58a6d26d6efde842d1703ac7cfa9427b6", "tree": "3bab868d1db85521932b77897983e7c673f7a669", "parents": [ "a137802ee839ace40079bebde24cfb416f73208a" ], "author": { "name": "Julien Tinnes", "email": "jt@cr0.org", "time": "Fri Jun 26 20:27:40 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 12 12:21:33 2009 -0700" }, "message": "personality: fix PER_CLEAR_ON_SETID\n\nWe have found that the current PER_CLEAR_ON_SETID mask on Linux doesn\u0027t\ninclude neither ADDR_COMPAT_LAYOUT, nor MMAP_PAGE_ZERO.\n\nThe current mask is READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE.\n\nWe believe it is important to add MMAP_PAGE_ZERO, because by using this\npersonality it is possible to have the first page mapped inside a\nprocess running as setuid root. This could be used in those scenarios:\n\n - Exploiting a NULL pointer dereference issue in a setuid root binary\n - Bypassing the mmap_min_addr restrictions of the Linux kernel: by\n running a setuid binary that would drop privileges before giving us\n control back (for instance by loading a user-supplied library), we\n could get the first page mapped in a process we control. By further\n using mremap and mprotect on this mapping, we can then completely\n bypass the mmap_min_addr restrictions.\n\nLess importantly, we believe ADDR_COMPAT_LAYOUT should also be added\nsince on x86 32bits it will in practice disable most of the address\nspace layout randomization (only the stack will remain randomized).\n\nSigned-off-by: Julien Tinnes \u003cjt@cr0.org\u003e\nSigned-off-by: Tavis Ormandy \u003ctaviso@sdf.lonestar.org\u003e\nCc: stable@kernel.org\nAcked-by: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: Kees Cook \u003ckees@ubuntu.com\u003e\nAcked-by: Eugene Teo \u003ceugene@redhat.com\u003e\n[ Shortened lines and fixed whitespace as per Christophs\u0027 suggestion ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "373c0a7ed3ea3b34efedb7c83ffb521adff7c894", "tree": "1fcc8cdcf8deab3ed1d16ff3c0f2dfa38bcf7915", "parents": [ "f00caa76297a534e30c3ec85382fbc3fd0dcbc69" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 11 10:06:54 2009 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 11 11:22:26 2009 -0700" }, "message": "Fix compile error due to congestion_wait() changes\n\nMove the definition of BLK_RW_ASYNC/BLK_RW_SYNC into linux/backing-dev.h\nso that it is available to all callers of set/clear_bdi_congested().\n\nThis replaces commit 097041e576ee3a50d92dd643ee8ca65bf6a62e21 (\"fuse:\nFix build error\"), which will be reverted.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nAcked-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Miklos Szeredi \u003cmiklos@szeredi.hu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "24a15a62dcb1968bf4ffdae55c88fa934d971180", "tree": "39a2231da07c6a47a4b66baf0158591a9739ac8f", "parents": [ "4cd1de0afaaa45309f34d7282ea4c07d9b56a3ff" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Jul 09 13:36:22 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 19:17:22 2009 -0700" }, "message": "tty: Fix USB kref leak\n\nThe sysrq code acquired a kref leak. Fix it by passing the tty separately\nfrom the caller (thus effectively using the callers kref which all the\ncallers hold anyway)\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "69ca06c9454169c4a9303e8834adae9080f94859", "tree": "d713fe8ac3ada06c0989706e237f6e6176396347", "parents": [ "9f2d8be4266f8861af806d964ae5db2949b670f3", "32f2e807a3938b24d0831211e6094f9e44b2fc83" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:29:58 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:29:58 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n cfq-iosched: reset oom_cfqq in cfq_set_request()\n block: fix sg SG_DXFER_TO_FROM_DEV regression\n block: call blk_scsi_ioctl_init()\n Fix congestion_wait() sync/async vs read/write confusion\n" }, { "commit": "ac3f482236793c75caae2c2ebb3f3e5f8b7393e1", "tree": "f769225f9a77ae1e026b18d3d9260f5e5aefe99d", "parents": [ "85be928c4101670f99cdd7c927798aa4dcbb3168", "f39d1b9792881ce4eb982ec8cc65258bf95674b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:25:59 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:25:59 2009 -0700" }, "message": "Merge branch \u0027core-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n dma-debug: Fix the overlap() function to be correct and readable\n oprofile: reset bt_lost_no_mapping with other stats\n x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon\n signals: declare sys_rt_tgsigqueueinfo in syscalls.h\n rcu: Mark Hierarchical RCU no longer experimental\n dma-debug: Put all hash-chain locks into the same lock class\n dma-debug: fix off-by-one error in overlap function\n" }, { "commit": "d86ee4809d0329d4aa0d0f2c76c2295a16862799", "tree": "32b3eaf766c1127ef2298c2e48b5441b7cf9b843", "parents": [ "c99e6efe1ba04561e7d93a81f0be07e37427e835" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 10 14:57:57 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:24:05 2009 -0700" }, "message": "sched: optimize cond_resched()\n\nOptimize cond_resched() by removing one conditional.\n\nCurrently cond_resched() checks system_state \u003d\u003d\nSYSTEM_RUNNING in order to avoid scheduling before the\nscheduler is running.\n\nWe can however, as per suggestion of Matt, use\nPREEMPT_ACTIVE to accomplish that very same.\n\nSuggested-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c99e6efe1ba04561e7d93a81f0be07e37427e835", "tree": "8a1743463ef9676e68b9c3971f0bbeea04111bdd", "parents": [ "2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 10 14:57:56 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:24:05 2009 -0700" }, "message": "sched: INIT_PREEMPT_COUNT\n\nPull the initial preempt_count value into a single\ndefinition site.\n\nMaintainers for: alpha, ia64 and m68k, please have a look,\nyour arch code is funny.\n\nThe header magic is a bit odd, but similar to the KERNEL_DS\none, CPP waits with expanding these macros until the\nINIT_THREAD_INFO macro itself is expanded, which is in\narch/*/kernel/init_task.c where we\u0027ve already included\nsched.h so we\u0027re good.\n\nCc: tony.luck@intel.com\nCc: rth@twiddle.net\nCc: geert@linux-m68k.org\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ecb554a846f8e9d2a58f6d6c118168a63ac065aa", "tree": "c52b265969972d5df0fe104110bc5cbfb220f3a7", "parents": [ "76da03467a1a78811777561bbb1fa56175ee4778" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Thu Jul 09 14:46:53 2009 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@carl.(none)", "time": "Fri Jul 10 20:31:53 2009 +0200" }, "message": "block: fix sg SG_DXFER_TO_FROM_DEV regression\n\nI overlooked SG_DXFER_TO_FROM_DEV support when I converted sg to use\nthe block layer mapping API (2.6.28).\n\nDouglas Gilbert explained SG_DXFER_TO_FROM_DEV:\n\nhttp://www.spinics.net/lists/linux-scsi/msg37135.html\n\n\u003d\nThe semantics of SG_DXFER_TO_FROM_DEV were:\n - copy user space buffer to kernel (LLD) buffer\n - do SCSI command which is assumed to be of the DATA_IN\n (data from device) variety. This would overwrite\n some or all of the kernel buffer\n - copy kernel (LLD) buffer back to the user space.\n\nThe idea was to detect short reads by filling the original\nuser space buffer with some marker bytes (\"0xec\" it would\nseem in this report). The \"resid\" value is a better way\nof detecting short reads but that was only added this century\nand requires co-operation from the LLD.\n\u003d\n\nThis patch changes the block layer mapping API to support this\nsemantics. This simply adds another field to struct rq_map_data and\nenables __bio_copy_iov() to copy data from user space even with READ\nrequests.\n\nIt\u0027s better to add the flags field and kills null_mapped and the new\nfrom_user fields in struct rq_map_data but that approach makes it\ndifficult to send this patch to stable trees because st and osst\ndrivers use struct rq_map_data (they were converted to use the block\nlayer in 2.6.29 and 2.6.30). Well, I should clean up the block layer\nmapping API.\n\nzhou sf reported this regiression and tested this patch:\n\nhttp://www.spinics.net/lists/linux-scsi/msg37128.html\nhttp://www.spinics.net/lists/linux-scsi/msg37168.html\n\nReported-by: zhou sf \u003csxzzsf@gmail.com\u003e\nTested-by: zhou sf \u003csxzzsf@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0", "tree": "76c8b4f1362a928d426f2201790ab5d128f57724", "parents": [ "c2cc49a2f8a479dde96a599646d30b6cc9dbed78" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Jul 09 14:52:32 2009 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@carl.(none)", "time": "Fri Jul 10 20:31:53 2009 +0200" }, "message": "Fix congestion_wait() sync/async vs read/write confusion\n\nCommit 1faa16d22877f4839bd433547d770c676d1d964c accidentally broke\nthe bdi congestion wait queue logic, causing us to wait on congestion\nfor WRITE (\u003d\u003d 1) when we really wanted BLK_RW_ASYNC (\u003d\u003d 0) instead.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "f9f868dbcca961ed62f1df1d114abd0c38c47dce", "tree": "97cf348e0d03119d9b3a0f98cd86f8c793b9d250", "parents": [ "6ff7041dbfeb3bd7dfe9aa67275c21199ef760d6" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Thu Jul 09 11:24:26 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 10 19:33:00 2009 +0200" }, "message": "timer stats: fix quick check optimization\n\ngit commit 507e1231 \"timer stats: Optimize by adding quick check to\navoid function calls\" added one wrong check so that one unnecessary\nfunction call isn\u0027t elimated.\n\ntime_stats_account_hrtimer() checks if timer-\u003estart_pid isn\u0027t\ninitialized in order to find out if timer_stats_update_stats() should\nbe called. However start_pid is initialized with -1 instead of 0, so\nthat the function call always happens.\n\nCheck timer-\u003estart_site like in timer_stats_account_timer() to fix\nthis.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "6ff7041dbfeb3bd7dfe9aa67275c21199ef760d6", "tree": "c8897de7ba6c09d51d83557d981ced3da48bba61", "parents": [ "7e0c5086c172ecf8b0c2ad860b02a586967d17d0" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 10 14:57:05 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 10 17:32:55 2009 +0200" }, "message": "hrtimer: Fix migration expiry check\n\nThe timer migration expiry check should prevent the migration of a\ntimer to another CPU when the timer expires before the next event is\nscheduled on the other CPU. Migrating the timer might delay it because\nwe can not reprogram the clock event device on the other CPU. But the\ncode implementing that check has two flaws:\n\n- for !HIGHRES the check compares the expiry value with the clock\n events device expiry value which is wrong for CLOCK_REALTIME based\n timers.\n\n- the check is racy. It holds the hrtimer base lock of the target CPU,\n but the clock event device expiry value can be modified\n nevertheless, e.g. by an timer interrupt firing.\n\nThe !HIGHRES case is easy to fix as we can enqueue the timer on the\ncpu which was selected by the load balancer. It runs the idle\nbalancing code once per jiffy anyway. So the maximum delay for the\ntimer is the same as when we keep the tick on the current cpu going.\n\nIn the HIGHRES case we can get the next expiry value from the hrtimer\ncpu_base of the target CPU and serialize the update with the cpu_base\nlock. This moves the lock section in hrtimer_interrupt() so we can set\nnext_event to KTIME_MAX while we are handling the expired timers and\nset it to the next expiry value after we handled the timers under the\nbase lock. While the expired timers are processed timer migration is\nblocked because the expiry time of the timer is always \u003c\u003d KTIME_MAX.\n\nAlso remove the now useless clockevents_get_next_event() function.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "e864561c12bc743789eab76242b8314d394daa52", "tree": "5f9bf951fd8e713b224062a37b2a0b24c14f17ce", "parents": [ "42359da44112565e12a5209befb36dc6b6d6cd9c", "e594e96e8a14101a6decabf6746bd5186287debc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 09 20:33:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 09 20:33:18 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits)\n cxgb3: Fix crash caused by stashing wrong netdev_queue\n ixgbe: Fix coexistence of FCoE and Flow Director in 82599\n memory barrier: adding smp_mb__after_lock\n net: adding memory barrier to the poll and receive callbacks\n netpoll: Fix carrier detection for drivers that are using phylib\n includecheck fix: include/linux, rfkill.h\n p54: tx refused but queue active\n Atheros Kconfig needs to be dependent on WLAN_80211\n mac80211: fix docbook\n mac80211_hwsim: avoid NULL access\n ssb: Add support for 4318E\n b43: Add support for 4318E\n zd1211rw: adding SONY IFU-WLM2 (054c:0257) as a zd1211b device\n zd1211rw: 07b8:6001 is a ZD1211B\n r6040: bump driver version to 0.24 and date to 08 July 2009\n r6040: restore MIER register correctly when IRQ line is shared\n ipv4: Fix fib_trie rebalancing, part 4 (root thresholds)\n davinci_emac: fix kernel oops when changing MAC address while interface is down\n igb: set lan id prior to configuring phy\n mac80211: minstrel: avoid accessing negative indices in rix_to_ndx()\n ...\n" }, { "commit": "ad46276952f1af34cd91d46d49ba13d347d56367", "tree": "55cf35156794ab34d8a607c25fd044c37231f9e4", "parents": [ "a57de0b4336e48db2811a2030bb68dba8dd09d88" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Wed Jul 08 12:10:31 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 09 17:06:58 2009 -0700" }, "message": "memory barrier: adding smp_mb__after_lock\n\nAdding smp_mb__after_lock define to be used as a smp_mb call after\na lock.\n\nMaking it nop for x86, since {read|write|spin}_lock() on x86 are\nfull memory barriers.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a57de0b4336e48db2811a2030bb68dba8dd09d88", "tree": "a01c189d5fd55c69c9e2e842241e84b46728bc60", "parents": [ "1b614fb9a00e97b1eab54d4e442d405229c059dd" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Wed Jul 08 12:09:13 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 09 17:06:57 2009 -0700" }, "message": "net: adding memory barrier to the poll and receive callbacks\n\nAdding memory barrier after the poll_wait function, paired with\nreceive callbacks. Adding fuctions sock_poll_wait and sk_has_sleeper\nto wrap the memory barrier.\n\nWithout the memory barrier, following race can happen.\nThe race fires, when following code paths meet, and the tp-\u003ercv_nxt\nand __add_wait_queue updates stay in CPU caches.\n\nCPU1 CPU2\n\nsys_select receive packet\n ... ...\n __add_wait_queue update tp-\u003ercv_nxt\n ... ...\n tp-\u003ercv_nxt check sock_def_readable\n ... {\n schedule ...\n if (sk-\u003esk_sleep \u0026\u0026 waitqueue_active(sk-\u003esk_sleep))\n wake_up_interruptible(sk-\u003esk_sleep)\n ...\n }\n\nIf there was no cache the code would work ok, since the wait_queue and\nrcv_nxt are opposit to each other.\n\nMeaning that once tp-\u003ercv_nxt is updated by CPU2, the CPU1 either already\npassed the tp-\u003ercv_nxt check and sleeps, or will get the new value for\ntp-\u003ercv_nxt and will return with new data mask.\nIn both cases the process (CPU1) is being added to the wait queue, so the\nwaitqueue_active (CPU2) call cannot miss and will wake up CPU1.\n\nThe bad case is when the __add_wait_queue changes done by CPU1 stay in its\ncache, and so does the tp-\u003ercv_nxt update on CPU2 side. The CPU1 will then\nendup calling schedule and sleep forever if there are no more data on the\nsocket.\n\nCalls to poll_wait in following modules were ommited:\n\tnet/bluetooth/af_bluetooth.c\n\tnet/irda/af_irda.c\n\tnet/irda/irnet/irnet_ppp.c\n\tnet/mac80211/rc80211_pid_debugfs.c\n\tnet/phonet/socket.c\n\tnet/rds/af_rds.c\n\tnet/rfkill/core.c\n\tnet/sunrpc/cache.c\n\tnet/sunrpc/rpc_pipe.c\n\tnet/tipc/socket.c\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ce822fa04fd6878f079461a4b8affe4bb5ec27b", "tree": "f518f114a426759c9371b7589981e82549fb4fee", "parents": [ "47ab3840a389ff1b9959734995123e5bc94c3443" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinder@kernel.org", "time": "Wed Jul 08 21:25:54 2009 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 08 15:24:32 2009 -0400" }, "message": "includecheck fix: include/linux, rfkill.h\n\nfix the following \u0027make includecheck\u0027 warning:\n\n include/linux/rfkill.h: linux/types.h is included more than once.\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5e75c5f5d723074b1ceefe916c3005888e431d12", "tree": "d929d72d9e4f0abcd74cd65922b35123cd3455d5", "parents": [ "d6d4655172f9c5b9402bb453ed9145a7ab5c46d0", "eeafa5ef6de5acf678624a21f7dba7d43ba73845" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 09:32:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 09:32:41 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: gpio_mouse - use standard driver registration method\n Input: mark serio and i8042 as suspended when hibernating too\n Input: add support for generic GPIO-based matrix keypad\n Input: arrange keyboards alphabetically\n Input: gpio-keys - avoid possibility of sleeping in timer function\n Input: gpio-keys - revert \u0027change timer to workqueue\u0027\n Input: dm355evm_keys - fix kconfig symbol names\n Input: wacom - add DTF720a support and fix rotation on Intuos3\n Input: i8042 - more reset quirks for MSI Wind-clone netbooks\n" }, { "commit": "b43f3cbd21ffbd719fd4fa6642bfe6af255ded34", "tree": "f09372f7aa3057a4cca32d5c7fc19032bd7cda5a", "parents": [ "622f8061a68d3f7a576c20a47b7f3bae7c8cfbef" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Wed Jul 08 01:54:37 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 09:31:56 2009 -0700" }, "message": "headers: mnt_namespace.h redux\n\nFix various silly problems wrt mnt_namespace.h:\n\n - exit_mnt_ns() isn\u0027t used, remove it\n - done that, sched.h and nsproxy.h inclusions aren\u0027t needed\n - mount.h inclusion was need for vfsmount_lock, but no longer\n - remove mnt_namespace.h inclusion from files which don\u0027t use anything\n from mnt_namespace.h\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e9bf0cc7cbfbf3952cdf8028aa0d348d09ecdba1", "tree": "3d44e78af85ce720091ed7d0a8e1307d5d54e364", "parents": [ "faf80d62e44dc627efb741f48db50c1858d1667c" ], "author": { "name": "Parag Warudkar", "email": "parag.lkml@gmail.com", "time": "Wed Jul 08 11:46:02 2009 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 09:18:05 2009 -0700" }, "message": "elfcore.h : Fix UML build breakage\n\nCommit a65e7bfcd74e4c0939f235d2bf9f48ddb3a57991 broke the UML build with\nthe following error -\n\n In file included from fs/proc/kcore.c:17:\n include/linux/elfcore.h: In function \u0027elf_core_copy_task_regs\u0027:\n include/linux/elfcore.h:129: error: implicit declaration of function \u0027task_pt_regs\u0027\n\nFix this by restoring the previous behavior of returning 0 for all arches\nlike UML that don\u0027t define task_pt_regs.\n\nSigned-off-by: Parag Warudkar \u003cparag.lkml@gmail.com\u003e\nAcked-by: Amerigo Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "53238a60dd4a679f6fe5613a7ed46899587205cf", "tree": "d2224ecfb18f7e9c6cc6fb2a48d81a87e5d5b62a", "parents": [ "e4f7c0b44a8ac8935f223195af9ea637d0c08091" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Tue Jul 07 10:33:00 2009 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Wed Jul 08 14:25:14 2009 +0100" }, "message": "kmemleak: Allow partial freeing of memory blocks\n\nFunctions like free_bootmem() are allowed to free only part of a memory\nblock. This patch adds support for this via the kmemleak_free_part()\ncallback which removes the original object and creates one or two\nadditional objects as a result of the memory block split.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\n" }, { "commit": "e4f7c0b44a8ac8935f223195af9ea637d0c08091", "tree": "9d8627800137ae50a1d5707c21489969c77c9e8a", "parents": [ "2587362eaf5c9df4e08de11e6340e3c4a88ed4c8" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Tue Jul 07 10:32:59 2009 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Wed Jul 08 14:25:14 2009 +0100" }, "message": "kmemleak: Trace the kmalloc_large* functions in slub\n\nThe kmalloc_large() and kmalloc_large_node() functions were missed when\nadding the kmemleak hooks to the slub allocator. However, they should be\ntraced to avoid false positives.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\n" }, { "commit": "7afdbf23c3acdec3eaf1b94f87132fff3d81ce73", "tree": "d9249575f95beacb1c2698d9e76ffcb1341fa0cf", "parents": [ "c222dce48cb2adf5ed68201fb2a59d00544b9a74" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jul 07 10:23:43 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 07 10:51:39 2009 +0200" }, "message": "signals: declare sys_rt_tgsigqueueinfo in syscalls.h\n\nsys_rt_tgsigqueueinfo needs to be declared in linux/syscalls.h so that\narchitectures defining the system call table in C can reference it.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nLKML-Reference: \u003c200907071023.44008.arnd@arndb.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" } ], "next": "eeaecb8619fb679006ab24a11ed292e37c74703c" }