)]}' { "log": [ { "commit": "058ce5ca8155a4c8eeac9b9e8a70e6664996337b", "tree": "a03efe966b0299fe36ec297ba370c241deb182ce", "parents": [ "88a488f6243c98b38ac5191d4255e09d3b1c6455" ], "author": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Fri May 10 14:37:17 2013 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Fri May 10 14:37:17 2013 +0100" }, "message": "dm: document iterate_devices\n\nDocument iterate_devices in device-mapper.h.\n\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "ebb37277796269da36a8bc5d72ed1e8e1fb7d34b", "tree": "0ded627a62a5cec70b18d12825dd858855c135d3", "parents": [ "4de13d7aa8f4d02f4dc99d4609575659f92b3c5a", "f50efd2fdbd9b35b11f5778ed85beb764184bda9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 08 11:51:05 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 08 11:51:05 2013 -0700" }, "message": "Merge branch \u0027for-3.10/drivers\u0027 of git://git.kernel.dk/linux-block\n\nPull block driver updates from Jens Axboe:\n \"It might look big in volume, but when categorized, not a lot of\n drivers are touched. The pull request contains:\n\n - mtip32xx fixes from Micron.\n\n - A slew of drbd updates, this time in a nicer series.\n\n - bcache, a flash/ssd caching framework from Kent.\n\n - Fixes for cciss\"\n\n* \u0027for-3.10/drivers\u0027 of git://git.kernel.dk/linux-block: (66 commits)\n bcache: Use bd_link_disk_holder()\n bcache: Allocator cleanup/fixes\n cciss: bug fix to prevent cciss from loading in kdump crash kernel\n cciss: add cciss_allow_hpsa module parameter\n drivers/block/mg_disk.c: add CONFIG_PM_SLEEP to suspend/resume functions\n mtip32xx: Workaround for unaligned writes\n bcache: Make sure blocksize isn\u0027t smaller than device blocksize\n bcache: Fix merge_bvec_fn usage for when it modifies the bvm\n bcache: Correctly check against BIO_MAX_PAGES\n bcache: Hack around stuff that clones up to bi_max_vecs\n bcache: Set ra_pages based on backing device\u0027s ra_pages\n bcache: Take data offset from the bdev superblock.\n mtip32xx: mtip32xx: Disable TRIM support\n mtip32xx: fix a smatch warning\n bcache: Disable broken btree fuzz tester\n bcache: Fix a format string overflow\n bcache: Fix a minor memory leak on device teardown\n bcache: Documentation updates\n bcache: Use WARN_ONCE() instead of __WARN()\n bcache: Add missing #include \u003clinux/prefetch.h\u003e\n ...\n" }, { "commit": "4de13d7aa8f4d02f4dc99d4609575659f92b3c5a", "tree": "3bc9729eabe79c6164cd29a5d605000bc82bf837", "parents": [ "5af43c24ca59a448c9312dd4a4a51d27ec3b9a73", "b8d4a5bf6a049303a29a3275f463f09a490b50ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 08 10:13:35 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 08 10:13:35 2013 -0700" }, "message": "Merge branch \u0027for-3.10/core\u0027 of git://git.kernel.dk/linux-block\n\nPull block core updates from Jens Axboe:\n\n - Major bit is Kents prep work for immutable bio vecs.\n\n - Stable candidate fix for a scheduling-while-atomic in the queue\n bypass operation.\n\n - Fix for the hang on exceeded rq-\u003edatalen 32-bit unsigned when merging\n discard bios.\n\n - Tejuns changes to convert the writeback thread pool to the generic\n workqueue mechanism.\n\n - Runtime PM framework, SCSI patches exists on top of these in James\u0027\n tree.\n\n - A few random fixes.\n\n* \u0027for-3.10/core\u0027 of git://git.kernel.dk/linux-block: (40 commits)\n relay: move remove_buf_file inside relay_close_buf\n partitions/efi.c: replace useless kzalloc\u0027s by kmalloc\u0027s\n fs/block_dev.c: fix iov_shorten() criteria in blkdev_aio_read()\n block: fix max discard sectors limit\n blkcg: fix \"scheduling while atomic\" in blk_queue_bypass_start\n Documentation: cfq-iosched: update documentation help for cfq tunables\n writeback: expose the bdi_wq workqueue\n writeback: replace custom worker pool implementation with unbound workqueue\n writeback: remove unused bdi_pending_list\n aoe: Fix unitialized var usage\n bio-integrity: Add explicit field for owner of bip_buf\n block: Add an explicit bio flag for bios that own their bvec\n block: Add bio_alloc_pages()\n block: Convert some code to bio_for_each_segment_all()\n block: Add bio_for_each_segment_all()\n bounce: Refactor __blk_queue_bounce to not use bi_io_vec\n raid1: use bio_copy_data()\n pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage\n pktcdvd: use bio_copy_data()\n block: Add bio_copy_data()\n ...\n" }, { "commit": "5af43c24ca59a448c9312dd4a4a51d27ec3b9a73", "tree": "65288caabc91fc04242acace38789a6dd5b86ed4", "parents": [ "9affd6becbfb2c3f0d04e554bb87234761b37aba", "a27bb332c04cec8c4afd7912df0dc7890db27560" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 20:49:51 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 20:49:51 2013 -0700" }, "message": "Merge branch \u0027akpm\u0027 (incoming from Andrew)\n\nMerge more incoming from Andrew Morton:\n\n - Various fixes which were stalled or which I picked up recently\n\n - A large rotorooting of the AIO code. Allegedly to improve\n performance but I don\u0027t really have good performance numbers (I might\n have lost the email) and I can\u0027t raise Kent today. I held this out\n of 3.9 and we could give it another cycle if it\u0027s all too late/scary.\n\nI ended up taking only the first two thirds of the AIO rotorooting. I\nleft the percpu parts and the batch completion for later. - Linus\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (33 commits)\n aio: don\u0027t include aio.h in sched.h\n aio: kill ki_retry\n aio: kill ki_key\n aio: give shared kioctx fields their own cachelines\n aio: kill struct aio_ring_info\n aio: kill batch allocation\n aio: change reqs_active to include unreaped completions\n aio: use cancellation list lazily\n aio: use flush_dcache_page()\n aio: make aio_read_evt() more efficient, convert to hrtimers\n wait: add wait_event_hrtimeout()\n aio: refcounting cleanup\n aio: make aio_put_req() lockless\n aio: do fget() after aio_get_req()\n aio: dprintk() -\u003e pr_debug()\n aio: move private stuff out of aio.h\n aio: add kiocb_cancel()\n aio: kill return value of aio_complete()\n char: add aio_{read,write} to /dev/{null,zero}\n aio: remove retry-based AIO\n ...\n" }, { "commit": "a27bb332c04cec8c4afd7912df0dc7890db27560", "tree": "86e6c41c2012f24c40ab455e2449d76346ae8956", "parents": [ "41ef4eb8eef8d06bc1399e7b00c940d771554711" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:19:08 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 20:16:25 2013 -0700" }, "message": "aio: don\u0027t include aio.h in sched.h\n\nFaster kernel compiles by way of fewer unnecessary includes.\n\n[akpm@linux-foundation.org: fix fallout]\n[akpm@linux-foundation.org: fix build]\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "41ef4eb8eef8d06bc1399e7b00c940d771554711", "tree": "3b8194de916d638f73394ed4b9c8910bbab04feb", "parents": [ "8a6608907cf165b3ae658c9de2efe6af4be68bff" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:19:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 19:46:02 2013 -0700" }, "message": "aio: kill ki_retry\n\nThanks to Zach Brown\u0027s work to rip out the retry infrastructure, we don\u0027t\nneed this anymore - ki_retry was only called right after the kiocb was\ninitialized.\n\nThis also refactors and trims some duplicated code, as well as cleaning up\nthe refcounting/error handling a bit.\n\n[akpm@linux-foundation.org: use fmode_t in aio_run_iocb()]\n[akpm@linux-foundation.org: fix file_start_write/file_end_write tests]\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8a6608907cf165b3ae658c9de2efe6af4be68bff", "tree": "bb2bee9e1c77576ead3d904fdd409ff355a7a867", "parents": [ "4e23bcaeb9e8df234e47840ac2c757ab79a0b572" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:19:10 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 19:41:50 2013 -0700" }, "message": "aio: kill ki_key\n\nki_key wasn\u0027t actually used for anything previously - it was always 0.\nDrop it to trim struct kiocb a bit.\n\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1c8eae75ea3b0168fca93788db1b5aef2424921", "tree": "9f22b400935bf4a58e676a0515822d674efddf52", "parents": [ "3e845ce01a391d7c5d59ff2f28db5381bf02fa27" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:18:53 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:29 2013 -0700" }, "message": "aio: kill batch allocation\n\nPreviously, allocating a kiocb required touching quite a few global\n(well, per kioctx) cachelines... so batching up allocation to amortize\nthose was worthwhile. But we\u0027ve gotten rid of some of those, and in\nanother couple of patches kiocb allocation won\u0027t require writing to any\nshared cachelines, so that means we can just rip this code out.\n\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0460fef2a9215680f7f85415b57731b7e0fdf673", "tree": "a97456b0a9c6c6f66c4f22eac11d037be4c4d290", "parents": [ "21b40200cfe961b1428a529c63c33b1f1e1b4738" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:18:49 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:29 2013 -0700" }, "message": "aio: use cancellation list lazily\n\nCancelling kiocbs requires adding them to a per kioctx linked list,\nwhich is one of the few things we need to take the kioctx lock for in\nthe fast path. But most kiocbs can\u0027t be cancelled - so if we just do\nthis lazily, we can avoid quite a bit of locking overhead.\n\nWhile we\u0027re at it, instead of using a flag bit switch to using ki_cancel\nitself to indicate that a kiocb has been cancelled/completed. This lets\nus get rid of ki_flags entirely.\n\n[akpm@linux-foundation.org: remove buggy BUG()]\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "774a08b3548f3f4f36c1a4f2a29a1b3710a2c939", "tree": "fddb989d580444aaae64a5904f029cc86fe23de9", "parents": [ "36f5588905c10a8c4568a210d601fe8c3c27e0f0" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:18:43 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:28 2013 -0700" }, "message": "wait: add wait_event_hrtimeout()\n\nAnalagous to wait_event_timeout() and friends, this adds\nwait_event_hrtimeout() and wait_event_interruptible_hrtimeout().\n\nNote that unlike the versions that use regular timers, these don\u0027t\nreturn the amount of time remaining when they return - instead, they\nreturn 0 or -ETIME if they timed out. because I was uncomfortable with\nthe semantics of doing it the other way (that I could get it right,\nanyways).\n\nIf the timer expires, there\u0027s no real guarantee that expire_time -\ncurrent_time would be \u003c\u003d 0 - due to timer slack certainly, and I\u0027m not\nsure I want to know the implications of the different clock bases in\nhrtimers.\n\nIf the timer does expire and the code calculates that the time remaining\nis nonnegative, that could be even worse if the calling code then reuses\nthat timeout. Probably safer to just return 0 then, but I could imagine\nweird bugs or at least unintended behaviour arising from that too.\n\nI came to the conclusion that if other users end up actually needing the\namount of time remaining, the sanest thing to do would be to create a\nversion that uses absolute timeouts instead of relative.\n\n[akpm@linux-foundation.org: fix description of `timeout\u0027 arg]\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "11599ebac4a249ab3c8b9a535c21db7a51458c0a", "tree": "c5927106704034f4dbe6c10ae2c2c6bd60df42d8", "parents": [ "1d98ebfccc15aeea87a7c48d50d7343e1ce8daae" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:18:39 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:28 2013 -0700" }, "message": "aio: make aio_put_req() lockless\n\nFreeing a kiocb needed to touch the kioctx for three things:\n\n * Pull it off the reqs_active list\n * Decrementing reqs_active\n * Issuing a wakeup, if the kioctx was in the process of being freed.\n\nThis patch moves these to aio_complete(), for a couple reasons:\n\n * aio_complete() already has to issue the wakeup, so if we drop the\n kioctx refcount before aio_complete does its wakeup we don\u0027t have to\n do it twice.\n * aio_complete currently has to take the kioctx lock, so it makes sense\n for it to pull the kiocb off the reqs_active list too.\n * A later patch is going to change reqs_active to include unreaped\n completions - this will mean allocating a kiocb doesn\u0027t have to look\n at the ringbuffer. So taking the decrement of reqs_active out of\n kiocb_free() is useful prep work for that patch.\n\nThis doesn\u0027t really affect cancellation, since existing (usb) code that\nimplements a cancel function still calls aio_complete() - we just have\nto make sure that aio_complete does the necessary teardown for cancelled\nkiocbs.\n\nIt does affect code paths where we free kiocbs that were never\nsubmitted; they need to decrement reqs_active and pull the kiocb off the\nreqs_active list. This occurs in two places: kiocb_batch_free(), which\nis going away in a later patch, and the error path in io_submit_one.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4e179bca6718693148c7445c236bc3e0e0013ffd", "tree": "2830668902bcdddd6c8e74e8d9dba226efdc5ad4", "parents": [ "906b973cf0ae8f10a6e8182845729b2ecc0da95a" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:18:33 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:28 2013 -0700" }, "message": "aio: move private stuff out of aio.h\n\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nCc: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2d68449e86168744513ca4f13477f081ce167130", "tree": "93fd1853637a41f2906ed96662a15168c251ec4b", "parents": [ "162934de51e0271f6e2955075735656ea5092ea9" ], "author": { "name": "Kent Overstreet", "email": "koverstreet@google.com", "time": "Tue May 07 16:18:29 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:28 2013 -0700" }, "message": "aio: kill return value of aio_complete()\n\nNothing used the return value, and it probably wasn\u0027t possible to use it\nsafely for the locked versions (aio_complete(), aio_put_req()). Just\nkill it.\n\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nAcked-by: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "41003a7bcfed1255032e1e7c7b487e505b22e298", "tree": "b09cb3e5efaeaabbee5a27daff490f77c78aa27b", "parents": [ "a80bf61ef36da48285850974f30700d1e8efbfc0" ], "author": { "name": "Zach Brown", "email": "zab@redhat.com", "time": "Tue May 07 16:18:25 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:27 2013 -0700" }, "message": "aio: remove retry-based AIO\n\nThis removes the retry-based AIO infrastructure now that nothing in tree\nis using it.\n\nWe want to remove retry-based AIO because it is fundemantally unsafe.\nIt retries IO submission from a kernel thread that has only assumed the\nmm of the submitting task. All other task_struct references in the IO\nsubmission path will see the kernel thread, not the submitting task.\nThis design flaw means that nothing of any meaningful complexity can use\nretry-based AIO.\n\nThis removes all the code and data associated with the retry machinery.\nThe most significant benefit of this is the removal of the locking\naround the unused run list in the submission path.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nSigned-off-by: Zach Brown \u003czab@redhat.com\u003e\nCc: Zach Brown \u003czab@redhat.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4b49bb8ad6d6e6e564017e2fad2357c3024683eb", "tree": "d26092d5dfe2d04c947eb8178d8d85c50c33b064", "parents": [ "697f4d68cfd10d10731f6fa98f59488b29c1729d" ], "author": { "name": "Zach Brown", "email": "zab@redhat.com", "time": "Tue May 07 16:18:21 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:27 2013 -0700" }, "message": "aio: remove dead code from aio.h\n\nSigned-off-by: Zach Brown \u003czab@redhat.com\u003e\nSigned-off-by: Kent Overstreet \u003ckoverstreet@google.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nCc: Selvan Mani \u003csmani@micron.com\u003e\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nReviewed-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "22ea9c070350b824d6c3b65bce06ee7c6cc87b99", "tree": "17f15f52e304aa09f17d24a173f8084b4679d008", "parents": [ "50bea5c0d583e255e3d8a193f8b20e177bac8ec8" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Tue May 07 16:18:17 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:27 2013 -0700" }, "message": "remove unused random32() and srandom32()\n\nAfter finishing a naming transition, remove unused backward\ncompatibility wrapper macros\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "af73e4d9506d3b797509f3c030e7dcd554f7d9c4", "tree": "f9f1bf7483495b66b6cf2cfb3c676791133733b1", "parents": [ "1ab4ce762370b82870834899e49c08129d7ae271" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Tue May 07 16:18:13 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:27 2013 -0700" }, "message": "hugetlbfs: fix mmap failure in unaligned size request\n\nThe current kernel returns -EINVAL unless a given mmap length is\n\"almost\" hugepage aligned. This is because in sys_mmap_pgoff() the\ngiven length is passed to vm_mmap_pgoff() as it is without being aligned\nwith hugepage boundary.\n\nThis is a regression introduced in commit 40716e29243d (\"hugetlbfs: fix\nalignment of huge page requests\"), where alignment code is pushed into\nhugetlb_file_setup() and the variable len in caller side is not changed.\n\nTo fix this, this patch partially reverts that commit, and adds\nalignment code in caller side. And it also introduces hstate_sizelog()\nin order to get proper hstate to specified hugepage size.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d56881\n\n[akpm@linux-foundation.org: fix warning when CONFIG_HUGETLB_PAGE\u003dn]\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nReported-by: \u003ciceman_dvd@yahoo.com\u003e\nCc: Steven Truelove \u003csteven.truelove@utoronto.ca\u003e\nCc: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0f157a5b58d0d2890f0ae20da9fe66aa19a91a4d", "tree": "f9136e1e39bd6123d375299fb414b6345b00fcff", "parents": [ "b070e65c0bb58d90fa1ac693dc85e239a6b16872" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue May 07 16:18:10 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 18:38:26 2013 -0700" }, "message": "include/linux/mm.h: complete the mm_walk definition\n\nThat nameless-function-arguments thing drives me batty. Fix.\n\nCc: Dave Hansen \u003cdave.hansen@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2d864e41710f1d2ba406fb62018ab0487152e6f2", "tree": "52c6a3172b7a4099830962323f2a1742fa166b01", "parents": [ "292088ee032d0df59e7c8a7a00e9b97260146078" ], "author": { "name": "Anatol Pomozov", "email": "anatol.pomozov@gmail.com", "time": "Tue May 07 15:37:48 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 16:09:00 2013 -0700" }, "message": "kref: minor cleanup\n\n - make warning smp-safe\n - result of atomic _unless_zero functions should be checked by caller\n to avoid use-after-free error\n - trivial whitespace fix.\n\nLink: https://lkml.org/lkml/2013/4/12/391\n\nTested: compile x86, boot machine and run xfstests\nSigned-off-by: Anatol Pomozov \u003canatol.pomozov@gmail.com\u003e\n[ Removed line-break, changed to use WARN_ON_ONCE() - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "292088ee032d0df59e7c8a7a00e9b97260146078", "tree": "99e5eee404285d4e2b6d282113cccee58236580f", "parents": [ "bc2d968f0ec698c66750e0ad1c1d35568fe93c05", "254844d3b9959b52fedf2f22810cc66e82a1ca16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 15:14:53 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 15:14:53 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull more vfs updates from Al Viro:\n \"A couple of fixes + getting rid of __blkdev_put() return value\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n proc: Use PDE attribute setting accessor functions\n make blkdev_put() return void\n block_device_operations-\u003erelease() should return void\n mtd_blktrans_ops-\u003erelease() should return void\n hfs: SMP race on directory close()\n" }, { "commit": "de9c9f86be0dc3495de98dc65c80abe6e7c7d643", "tree": "47ad4787412b26eea9f49b858855f919b0cb4898", "parents": [ "3e11a00d8561622a2598254853e2e8cc3e51e544", "b9777859ec015a78dae1476e317d04f851bfdd0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 14:04:56 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 14:04:56 2013 -0700" }, "message": "Merge tag \u0027remoteproc-3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc\n\nPull remoteproc update from Ohad Ben-Cohen:\n\n - Some refactoring, cleanups and small improvements from Sjur\n Brændeland. The improvements are mainly about better supporting\n varios virtio properties (such as virtio\u0027s config space, status and\n features). I now see that I messed up while commiting one of Sjur\u0027s\n patches and erroneously put myself as the author, as well as letting\n a nasty typo sneak in. I will not fix this in order to avoid\n rebasing the patches. Sjur - sorry!\n\n - A new remoteproc driver for OMAP-L13x (technically a DaVinci\n platform) from Robert Tivy.\n\n - Extend OMAP support to OMAP5 as well, from Vincent Stehlé.\n\n - Fix Kconfig VIRTUALIZATION dependency, from Suman Anna (a\n non-critical fix which arrived late during the rc cycle).\n\n* tag \u0027remoteproc-3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:\n remoteproc: fix kconfig dependencies for VIRTIO\n remoteproc/davinci: add a remoteproc driver for OMAP-L13x DSP\n remoteproc: support default firmware name in rproc_alloc()\n remoteproc/omap: support OMAP5 too\n remoteproc: set vring addresses in resource table\n remoteproc: support virtio config space.\n remoteproc: perserve resource table data\n remoteproc: calculate max_notifyid by counting vrings\n remoteproc: code cleanup of resource parsing\n remoteproc: parse STE-firmware and find resource table address\n remoteproc: add find_loaded_rsc_table firmware ops\n remoteproc: refactor rproc_elf_find_rsc_table()\n" }, { "commit": "bb9055b2744ada735a2fe555c4196ad39a83ef2a", "tree": "014e0f462217cfa49988872a5134ae41b90b2e9c", "parents": [ "1bf25e78af317e6d5d9b5594dfeb0036e0d589d6", "241a9871263f3114717c0ed416a1bd1d2415d1fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:28:42 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:28:42 2013 -0700" }, "message": "Merge tag \u0027multiplatform-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull late ARM Exynos multiplatform changes from Arnd Bergmann:\n \"These continue the multiplatform support for exynos, adding support\n for building most of the essential drivers (clocksource, clk, irqchip)\n when combined with other platforms. As a result, it should become\n really easy to add full multiplatform exynos support in 3.11, although\n we don\u0027t yet enable it for 3.10.\n\n The changes were not included in the earlier multiplatform series in\n order to avoid clashes with the other Exynos updates.\n\n This also includes work from Tomasz Figa to fix the pwm clocksource\n code on Exynos, which is not strictly required for multiplatform, but\n related to the other patches in this set and needed as a bug fix for\n at least one board.\"\n\n* tag \u0027multiplatform-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)\n ARM: dts: exynops4210: really add universal_c210 dts\n ARM: dts: exynos4210: Add basic dts file for universal_c210 board\n ARM: dts: exynos4: Add node for PWM device\n ARM: SAMSUNG: Do not register legacy timer interrupts on Exynos\n clocksource: samsung_pwm_timer: Work around rounding errors in clockevents core\n clocksource: samsung_pwm_timer: Correct programming of clock events\n clocksource: samsung_pwm_timer: Use proper clockevents max_delta\n clocksource: samsung_pwm_timer: Add support for non-DT platforms\n clocksource: samsung_pwm_timer: Drop unused samsung_pwm struct\n clocksource: samsung_pwm_timer: Keep all driver data in a structure\n clocksource: samsung_pwm_timer: Make PWM spinlock global\n clocksource: samsung_pwm_timer: Let platforms select the driver\n Documentation: Add device tree bindings for Samsung PWM timers\n clocksource: add samsung pwm timer driver\n irqchip: exynos: look up irq using irq_find_mapping\n irqchip: exynos: pass irq_base from platform\n irqchip: exynos: localize irq lookup for ATAGS\n irqchip: exynos: allocate combiner_data dynamically\n irqchip: exynos: pass max combiner number to combiner_init\n ARM: exynos: add missing properties for combiner IRQs\n ...\n" }, { "commit": "1bf25e78af317e6d5d9b5594dfeb0036e0d589d6", "tree": "49dbd2d7bd6856b8ae1864c2dd0c0eb5e36d5398", "parents": [ "38f56f33ca381751f9b8910f67e7a805ec0b68cb", "0592c2189ece16f3e0c5a56245634aba93d0c9dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:22:14 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:22:14 2013 -0700" }, "message": "Merge tag \u0027cleanup-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC late cleanups from Arnd Bergmann:\n \"These are cleanups and smaller changes that either depend on earlier\n feature branches or came in late during the development cycle. We\n normally try to get all cleanups early, so these are the exceptions:\n\n - A follow-up on the clocksource reworks, hopefully the last time we\n need to merge clocksource subsystem changes through arm-soc.\n\n A first set of patches was part of the original 3.10 arm-soc\n cleanup series because of interdependencies with timer drivers now\n moved out of arch/arm.\n\n - Migrating the SPEAr13xx platform away from using auxdata for DMA\n channel descriptions towards using information in device tree,\n based on the earlier SPEAr multiplatform series\n\n - A few follow-ups on the Atmel SAMA5 support and other changes for\n Atmel at91 based on the larger at91 reworks.\n\n - Moving the armada irqchip implementation to drivers/irqchip\n\n - Several OMAP cleanups following up on the larger series already\n merged in 3.10.\"\n\n* tag \u0027cleanup-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)\n ARM: OMAP4: change the device names in usb_bind_phy\n ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a\n ARM: SPEAr: conditionalize SMP code\n ARM: arch_timer: Silence debug preempt warnings\n ARM: OMAP: remove unused variable\n serial: amba-pl011: fix !CONFIG_DMA_ENGINE case\n ata: arasan: remove the need for platform_data\n ARM: at91/sama5d34ek.dts: remove not needed compatibility string\n ARM: at91: dts: add MCI DMA support\n ARM: at91: dts: add i2c dma support\n ARM: at91: dts: set #dma-cells to the correct value\n ARM: at91: suspend both memory controllers on at91sam9263\n irqchip: armada-370-xp: slightly cleanup irq controller driver\n irqchip: armada-370-xp: move IRQ handler to avoid forward declaration\n irqchip: move IRQ driver for Armada 370/XP\n ARM: mvebu: move L2 cache initialization in init_early()\n devtree: add binding documentation for sp804\n ARM: integrator-cp: convert use CLKSRC_OF for timer init\n ARM: versatile: use OF init for sp804 timer\n ARM: versatile: add versatile dtbs to dtbs target\n ...\n" }, { "commit": "38f56f33ca381751f9b8910f67e7a805ec0b68cb", "tree": "202f2ce60f3f43a948607ec76c8cc48c1cf73a4b", "parents": [ "fcba914542082b272f31c8e4c40000b88ed3208d", "4183bef2e093a2f0aab45f2d5fed82b0e02aeacf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:06:17 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:06:17 2013 -0700" }, "message": "Merge tag \u0027dt-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC device tree updates (part 2) from Arnd Bergmann:\n \"These are mostly new device tree bindings for existing drivers, as\n well as changes to the device tree source files to add support for\n those devices, and a couple of new boards, most notably Samsung\u0027s\n Exynos5 based Chromebook.\n\n The changes depend on earlier platform specific updates and touch the\n usual platforms: omap, exynos, tegra, mxs, mvebu and davinci.\"\n\n* tag \u0027dt-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (169 commits)\n ARM: exynos: dts: cros5250: add EC device\n ARM: dts: Add sbs-battery for exynos5250-snow\n ARM: dts: Add i2c-arbitrator bus for exynos5250-snow\n ARM: dts: add mshc controller node for Exynos4x12 SoCs\n ARM: dts: Add chip-id controller node on Exynos4/5 SoC\n ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree\n ARM: davinci: da850-evm: add SPI flash support\n ARM: davinci: da850: override SPI DT node device name\n ARM: davinci: da850: add SPI1 DT node\n spi/davinci: add DT binding documentation\n spi/davinci: no wildcards in DT compatible property\n ARM: dts: mvebu: Convert mvebu device tree files to 64 bits\n ARM: dts: mvebu: introduce internal-regs node\n ARM: dts: mvebu: Convert all the mvebu files to use the range property\n ARM: dts: mvebu: move all peripherals inside soc\n ARM: dts: mvebu: fix cpus section indentation\n ARM: davinci: da850: add EHRPWM \u0026 ECAP DT node\n ARM/dts: OMAP3: fix pinctrl-single configuration\n ARM: dts: Add OMAP3430 SDP NOR flash memory binding\n ARM: dts: Add NOR flash bindings for OMAP2420 H4\n ...\n" }, { "commit": "fcba914542082b272f31c8e4c40000b88ed3208d", "tree": "fb28069bf571d93420daafd501b4e97f221d526c", "parents": [ "a8c4b90e670be3b01e9395c7310639c8109fc77e", "5c5f0421a8eea5bdaba9b9313c5bb4833aeb39cd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:02:18 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:02:18 2013 -0700" }, "message": "Merge tag \u0027soc-for-linus-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC platform updates (part 3) from Arnd Bergmann:\n \"This is the third and smallest of the SoC specific updates. Changes\n include:\n\n - SMP support for the Xilinx zynq platform\n - Smaller imx changes\n - LPAE support for mvebu\n - Moving the orion5x, kirkwood, dove and mvebu platforms to a common\n \"mbus\" driver for their internal devices.\n\n It would be good to get feedback on the location of the \"mbus\" driver.\n Since this is used on multiple platforms may potentially get shared\n with other architectures (powerpc and arm64), it was moved to\n drivers/bus/. We expect other similar drivers to get moved to the\n same place in order to avoid creating more top-level directories under\n drivers/ or cluttering up the messy drivers/misc/ even more.\"\n\n* tag \u0027soc-for-linus-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)\n ARM: imx: reset_controller may be disabled\n ARM: mvebu: Align the internal registers virtual base to support LPAE\n ARM: mvebu: Limit the DMA zone when LPAE is selected\n arm: plat-orion: remove addr-map code\n arm: mach-mv78xx0: convert to use the mvebu-mbus driver\n arm: mach-orion5x: convert to use mvebu-mbus driver\n arm: mach-dove: convert to use mvebu-mbus driver\n arm: mach-kirkwood: convert to use mvebu-mbus driver\n arm: mach-mvebu: convert to use mvebu-mbus driver\n ARM i.MX53: set CLK_SET_RATE_PARENT flag on the tve_ext_sel clock\n ARM i.MX53: tve_di clock is not part of the CCM, but of TVE\n ARM i.MX53: make tve_ext_sel propagate rate change to PLL\n ARM i.MX53: Remove unused tve_gate clkdev entry\n ARM i.MX5: Remove tve_sel clock from i.MX53 clock tree\n ARM: i.MX5: Add PATA and SRTC clocks\n ARM: imx: do not bring up unavailable cores\n ARM: imx: add initial imx6dl support\n ARM: imx1: mm: add call to mxc_device_init\n ARM: imx_v4_v5_defconfig: Add CONFIG_GPIO_SYSFS\n ARM: imx_v6_v7_defconfig: Select CONFIG_PERF_EVENTS\n ...\n" }, { "commit": "a8c4b90e670be3b01e9395c7310639c8109fc77e", "tree": "272f7988aeeaf930efd594f66c1a41a7d28ecd74", "parents": [ "eac84105cddf8686440aaa9fbcb58093e37e4180", "9251c6c0dc929d8eec6751c12ef312597f84e147" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 10:57:51 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 10:57:51 2013 -0700" }, "message": "Merge tag \u0027soc-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC platform updates (part 2) from Arnd Bergmann:\n \"These patches are all for Renesas shmobile, and depend on the earlier\n pinctrl updates. Remarkably, this adds support for three new SoCs:\n r8a73a4, r8a73a4 and r8a7778. The bulk of the code added for these is\n for pinctrl (using the new subsystem) and for clocks (not yet using\n the common clock subsystem). The latter will have to get converted in\n one of the upcoming releases, but shmobile is not ready for that yet.\n\n The series also contains Renesas shmobile board changes, adding one\n board file for each of the three new SoCs. These boards are using a\n mix of classic and device-tree based probing, as there is still a lot\n of infrastructure in shmobile that has not been converted to DT yet.\n Once those are resolved to the degree that no board specific setup\n code is needed, they can get folded into the respective SoC setup files.\"\n\n* tag \u0027soc-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits)\n ARM: shmobile: use r8a7790 timer setup code on Lager\n ARM: shmobile: force enable of r8a7790 arch timer\n ARM: shmobile: Add second I/O range for r8a7790 PFC\n ARM: shmobile: bockw: enable network settings on bootargs\n ARM: shmobile: bockw: add SMSC ethernet support\n ARM: shmobile: R8A7778: add Ether support\n ARM: shmobile: bockw: enable SMSC ethernet on defconfig\n ARM: shmobile: r8a7778: add r8a7778_init_irq_extpin()\n ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO()\n ARM: shmobile: mackerel: clean up MMCIF vs. SDHI1 selection\n ARM: shmobile: mackerel: add interrupt names for SDHI0\n ARM: shmobile: mackerel: switch SDHI and MMCIF interfaces to slot-gpio\n ARM: shmobile: mackerel: remove OCR masks, where regulators are used\n ARM: shmobile: mackerel: SDHI resources do not have to be numbered\n ARM: shmobile: Initial r8a7790 Lager board support\n ARM: shmobile: APE6EVM LAN9220 support\n ARM: shmobile: APE6EVM PFC support\n ARM: shmobile: APE6EVM base support\n ARM: shmobile: kzm9g-reference: add ethernet support\n ARM: shmobile: add R-Car M1A Bock-W platform support\n ...\n" }, { "commit": "a26ea93a3d19c2b79e8b382356014eba607ce477", "tree": "9a37d34ff60121c78123bc8bd4aab2b8b841e36b", "parents": [ "c818c778b0384e5d9e8184ec43b73e05a7ced86f", "60b9df7a54804a965850db00beec4d3a2c002536" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 10:12:32 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 10:12:32 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\nPull fuse updates from Miklos Szeredi:\n \"This contains two patchsets from Maxim Patlasov.\n\n The first reworks the request throttling so that only async requests\n are throttled. Wakeup of waiting async requests is also optimized.\n\n The second series adds support for async processing of direct IO which\n optimizes direct IO and enables the use of the AIO userspace\n interface.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: add flag to turn on async direct IO\n fuse: truncate file if async dio failed\n fuse: optimize short direct reads\n fuse: enable asynchronous processing direct IO\n fuse: make fuse_direct_io() aware about AIO\n fuse: add support of async IO\n fuse: move fuse_release_user_pages() up\n fuse: optimize wake_up\n fuse: implement exclusive wakeup for blocked_waitq\n fuse: skip blocking on allocations of synchronous requests\n fuse: add flag fc-\u003einitialized\n fuse: make request allocations for background processing explicit\n" }, { "commit": "0f47c9423c0fe468d0b5b153f9b9d6e8e20707eb", "tree": "9eaec7fb4dc5fbfae07d168d0493a0a0a67c7d47", "parents": [ "b9e306e07ed58fc354bbd58124b281dd7dc697b7", "69df2ac1288b456a95aceadafbf88cd891a577c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 08:42:20 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 08:42:20 2013 -0700" }, "message": "Merge branch \u0027slab/for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux\n\nPull slab changes from Pekka Enberg:\n \"The bulk of the changes are more slab unification from Christoph.\n\n There\u0027s also few fixes from Aaron, Glauber, and Joonsoo thrown into\n the mix.\"\n\n* \u0027slab/for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (24 commits)\n mm, slab_common: Fix bootstrap creation of kmalloc caches\n slab: Return NULL for oversized allocations\n mm: slab: Verify the nodeid passed to ____cache_alloc_node\n slub: tid must be retrieved from the percpu area of the current processor\n slub: Do not dereference NULL pointer in node_match\n slub: add \u0027likely\u0027 macro to inc_slabs_node()\n slub: correct to calculate num of acquired objects in get_partial_node()\n slub: correctly bootstrap boot caches\n mm/sl[au]b: correct allocation type check in kmalloc_slab()\n slab: Fixup CONFIG_PAGE_ALLOC/DEBUG_SLAB_LEAK sections\n slab: Handle ARCH_DMA_MINALIGN correctly\n slab: Common definition for kmem_cache_node\n slab: Rename list3/l3 to node\n slab: Common Kmalloc cache determination\n stat: Use size_t for sizes instead of unsigned\n slab: Common function to create the kmalloc array\n slab: Common definition for the array of kmalloc caches\n slab: Common constants for kmalloc boundaries\n slab: Rename nodelists to node\n slab: Common name for the per node structures\n ...\n" }, { "commit": "69df2ac1288b456a95aceadafbf88cd891a577c8", "tree": "0f2e83a8c4bc826f12d3f3871ecc1d7be0c9e4e3", "parents": [ "c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1", "8a965b3baa89ffedc73c0fbc750006c631012ced" ], "author": { "name": "Pekka Enberg", "email": "penberg@kernel.org", "time": "Tue May 07 09:19:47 2013 +0300" }, "committer": { "name": "Pekka Enberg", "email": "penberg@kernel.org", "time": "Tue May 07 09:19:47 2013 +0300" }, "message": "Merge branch \u0027slab/next\u0027 into slab/for-linus\n" }, { "commit": "4385bab128911df14ab25f0b5ae1a48d7b53dd94", "tree": "d8c6f5557f09ebdf294eaba7eba01a140f8da78a", "parents": [ "db2a144bedd58b3dcf19950c2f476c58c9f39d18" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun May 05 22:11:03 2013 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue May 07 02:16:31 2013 -0400" }, "message": "make blkdev_put() return void\n\nsame story as with the previous patches - note that return\nvalue of blkdev_close() is lost, since there\u0027s nowhere the\ncaller (__fput()) could return it to.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "db2a144bedd58b3dcf19950c2f476c58c9f39d18", "tree": "931f1b5a8e6bafe388b317bce02a9fd9af309d38", "parents": [ "a8ca889ed9585894d53fd8919d80cbe8baff09e7" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun May 05 21:52:57 2013 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue May 07 02:16:21 2013 -0400" }, "message": "block_device_operations-\u003erelease() should return void\n\nThe value passed is 0 in all but \"it can never happen\" cases (and those\nonly in a couple of drivers) *and* it would\u0027ve been lost on the way\nout anyway, even if something tried to pass something meaningful.\nJust don\u0027t bother.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "51a26ae7a14b85c99c9be470c2d28eeeba0f26a3", "tree": "63b38cb292a53e89d4b0cfe631c7031e1fed3cfe", "parents": [ "2b69703fea185bb0ae1af78ca2da41af677b9dff", "6bf15191f666c5965d212561d7a5c7b78b808dfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 15:51:10 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 15:51:10 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n \"Just a small pile of fixes\"\n\n 1) Fix race conditions in IP fragmentation LRU list handling, from\n Konstantin Khlebnikov.\n\n 2) vfree() is no longer verboten in interrupts, so deferring is\n pointless, from Al Viro.\n\n 3) Conversion from mutex to semaphore in netpoll left trylock test\n inverted, caught by Dan Carpenter.\n\n 4) 3c59x uses wrong base address when releasing regions, from Sergei\n Shtylyov.\n\n 5) Bounds checking in TIPC from Dan Carpenter.\n\n 6) Fastopen cookies should not be expired as aggressively as other TCP\n metrics. From Eric Dumazet.\n\n 7) Fix retrieval of MAC address in ibmveth, from Ben Herrenschmidt.\n\n 8) Don\u0027t use \"u16\" in virtio user headers, from Stephen Hemminger\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n tipc: potential divide by zero in tipc_link_recv_fragment()\n tipc: add a bounds check in link_recv_changeover_msg()\n net/usb: new driver for RTL8152\n 3c59x: fix freeing nonexistent resource on driver unload\n netpoll: inverted down_trylock() test\n rps_dev_flow_table_release(): no need to delay vfree()\n fib_trie: no need to delay vfree()\n net: frag, fix race conditions in LRU list maintenance\n tcp: do not expire TCP fastopen cookies\n net/eth/ibmveth: Fixup retrieval of MAC address\n virtio: don\u0027t expose u16 in userspace api\n" }, { "commit": "2b69703fea185bb0ae1af78ca2da41af677b9dff", "tree": "26b13044a0a20bed5525638d193e776f31f70af2", "parents": [ "30c67e93c526639aaac90fa873800104b7c16d16", "df92d5ff5e70999274f53884cc2c40ae620a109a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 15:41:42 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 15:41:42 2013 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds\n\nPull LED subsystem updates from Bryan Wu:\n - move LED trigger drivers into a new directory\n - lp55xx common driver updates\n - other led drivers updates and bug fixing\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:\n leds: leds-asic3: switch to using SIMPLE_DEV_PM_OPS\n leds: leds-bd2802: add CONFIG_PM_SLEEP to suspend/resume functions\n leds: lp55xx: configure the clock detection\n leds: lp55xx: use common clock framework when external clock is used\n leds: leds-ns2: fix oops at module removal\n leds: leds-pwm: Defer led_pwm_set() if PWM can sleep\n leds: lp55xx: fix the sysfs read operation\n leds: lm355x, lm3642: support camera LED triggers for flash and torch\n leds: add camera LED triggers\n leds: trigger: use inline functions instead of macros\n leds: tca6507: Use of_match_ptr() macro\n leds: wm8350: Complain if we fail to reenable DCDC\n leds: renesas: set gpio_request_one() flags param correctly\n leds: leds-ns2: set devm_gpio_request_one() flags param correctly\n leds: leds-lt3593: set devm_gpio_request_one() flags param correctly\n leds: leds-bd2802: remove erroneous __exit annotation\n leds: atmel-pwm: remove erroneous __exit annotation\n leds: move LED trigger drivers into new subdirectory\n leds: add new LP5562 LED driver\n" }, { "commit": "30c67e93c526639aaac90fa873800104b7c16d16", "tree": "6d8d0fd248d4e60bdc175dacbd196fc44f23ce11", "parents": [ "f87bb9ee62700fa11713c630ac5671f253233b94", "08ffb2229fafc2c3a696b325a74bf4198d6b91d7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 15:40:55 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 15:40:55 2013 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux\n\nPull GPIO changes from Grant Likely:\n \"The usual selection of bug fixes and driver updates for GPIO. Nothing\n really stands out except the addition of the GRGPIO driver and some\n enhacements to ACPI support\"\n\nI\u0027m pulling this despite the earlier mess. Let\u0027s hope it compiles these\ndays.\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux: (46 commits)\n gpio: grgpio: Add irq support\n gpio: grgpio: Add device driver for GRGPIO cores\n gpiolib-acpi: introduce acpi_get_gpio_by_index() helper\n GPIO: gpio-generic: remove kfree() from bgpio_remove call\n gpio / ACPI: Handle ACPI events in accordance with the spec\n gpio: lpc32xx: Fix off-by-one valid range checking for bank\n gpio: mcp23s08: convert driver to DT\n gpio/omap: force restore if context loss is not detectable\n gpio/omap: optimise interrupt service routine\n gpio/omap: remove extra context restores in *_runtime_resume()\n gpio/omap: free irq domain in probe() failure paths\n gpio: gpio-generic: Add 16 and 32 bit big endian byte order support\n gpio: samsung: Add terminating entry for exynos_pinctrl_ids\n gpio: mvebu: add dbg_show function\n MAX7301 GPIO: Do not force SPI speed when using OF Platform\n gpio: gpio-tps65910.c: fix checkpatch error\n gpio: gpio-timberdale.c: fix checkpatch error\n gpio: gpio-tc3589x.c: fix checkpatch errors\n gpio: gpio-stp-xway.c: fix checkpatch error\n gpio: gpio-sch.c: fix checkpatch error\n ...\n" }, { "commit": "99737982ca39065a58021bdc31486ea783f952d3", "tree": "e402502e0f4700d92c4c0b48d0919ea2687f53dc", "parents": [ "91f8575685e35f3bd021286bc82d26397458f5a9", "0c4513be3d01a854867446ee793748409cc0ebdf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 14:59:13 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 14:59:13 2013 -0700" }, "message": "Merge tag \u0027iommu-updates-v3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\nPull IOMMU updates from Joerg Roedel:\n \"The updates are mostly about the x86 IOMMUs this time.\n\n Exceptions are the groundwork for the PAMU IOMMU from Freescale (for a\n PPC platform) and an extension to the IOMMU group interface.\n\n On the x86 side this includes a workaround for VT-d to disable\n interrupt remapping on broken chipsets. On the AMD-Vi side the most\n important new feature is a kernel command-line interface to override\n broken information in IVRS ACPI tables and get interrupt remapping\n working this way.\n\n Besides that there are small fixes all over the place.\"\n\n* tag \u0027iommu-updates-v3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (24 commits)\n iommu/tegra: Fix printk formats for dma_addr_t\n iommu: Add a function to find an iommu group by id\n iommu/vt-d: Remove warning for HPET scope type\n iommu: Move swap_pci_ref function to drivers/iommu/pci.h.\n iommu/vt-d: Disable translation if already enabled\n iommu/amd: fix error return code in early_amd_iommu_init()\n iommu/AMD: Per-thread IOMMU Interrupt Handling\n iommu: Include linux/err.h\n iommu/amd: Workaround for ERBT1312\n iommu/amd: Document ivrs_ioapic and ivrs_hpet parameters\n iommu/amd: Don\u0027t report firmware bugs with cmd-line ivrs overrides\n iommu/amd: Add ioapic and hpet ivrs override\n iommu/amd: Add early maps for ioapic and hpet\n iommu/amd: Extend IVRS special device data structure\n iommu/amd: Move add_special_device() to __init\n iommu: Fix compile warnings with forward declarations\n iommu/amd: Properly initialize irq-table lock\n iommu/amd: Use AMD specific data structure for irq remapping\n iommu/amd: Remove map_sg_no_iommu()\n iommu/vt-d: add quirk for broken interrupt remapping on 55XX chipsets\n ...\n" }, { "commit": "241a9871263f3114717c0ed416a1bd1d2415d1fb", "tree": "c41f73f7c38ae2120c3507cd2d487eeed160472a", "parents": [ "2254c36ddeb87d4975d2e4709413dd275a913e83", "0682edaaa32c778ad2efac73fe3c8d9309e35991" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 06 23:49:09 2013 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 06 23:49:09 2013 +0200" }, "message": "Merge branch \u0027exynos/pwm-clocksource\u0027 into late/multiplatform\n\nThis series from Tomasz Figa restores support for the pwm clocksource\nin Exynos, which was broken during the conversion of the platform\nto the common clk framework. The clocksource is only used in one\nboard in the mainline kernel (universal_c210), and this makes it\nwork for DT based probing as well as restoring the non-DT based\ncase.\n\n* exynos/pwm-clocksource:\n ARM: dts: exynops4210: really add universal_c210 dts\n ARM: dts: exynos4210: Add basic dts file for universal_c210 board\n ARM: dts: exynos4: Add node for PWM device\n ARM: SAMSUNG: Do not register legacy timer interrupts on Exynos\n clocksource: samsung_pwm_timer: Work around rounding errors in clockevents core\n clocksource: samsung_pwm_timer: Correct programming of clock events\n clocksource: samsung_pwm_timer: Use proper clockevents max_delta\n clocksource: samsung_pwm_timer: Add support for non-DT platforms\n clocksource: samsung_pwm_timer: Drop unused samsung_pwm struct\n clocksource: samsung_pwm_timer: Keep all driver data in a structure\n clocksource: samsung_pwm_timer: Make PWM spinlock global\n clocksource: samsung_pwm_timer: Let platforms select the driver\n Documentation: Add device tree bindings for Samsung PWM timers\n clocksource: add samsung pwm timer driver\n\nConflicts:\n\tarch/arm/boot/dts/Makefile\n\tarch/arm/mach-exynos/common.c\n\tdrivers/clocksource/Kconfig\n\tdrivers/clocksource/Makefile\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "442a33ebce9e02a2dd6662f16c9f2aad834d0115", "tree": "ca8654a286f61da917318645cab9e061095ecdba", "parents": [ "a94d236dc355f374857ee4e6e78b7dec8a0f29e3", "f31c2f1c68aff83277eddc6798adf3438e9c680a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 06 23:43:45 2013 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 06 23:43:45 2013 +0200" }, "message": "Merge branch \u0027late/clksrc\u0027 into late/cleanup\n\nThere is no reason to keep the clksrc cleanups separate from the\nother cleanups, and this resolves some merge conflicts.\n\nConflicts:\n\tarch/arm/mach-spear/spear13xx.c\n\tdrivers/irqchip/Makefile\n" }, { "commit": "4183bef2e093a2f0aab45f2d5fed82b0e02aeacf", "tree": "e84c484db3746a0f3ead0fb7a2bb9e5a42b89e85", "parents": [ "662478d060a39b8faf2b1fe2fbbb212556c2e052", "775c4f66fd855e68a98fc5049003810fe98e2e20" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 06 23:38:00 2013 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 06 23:38:00 2013 +0200" }, "message": "Merge branch \u0027late/dt\u0027 into next/dt2\n\nThis is support for the ARM Chromebook, originally scheduled\nas a \"late\" pull request. Since it\u0027s already late now, we\ncan combine this into the existing next/dt2 branch.\n\n* late/dt:\n ARM: exynos: dts: cros5250: add EC device\n ARM: dts: Add sbs-battery for exynos5250-snow\n ARM: dts: Add i2c-arbitrator bus for exynos5250-snow\n ARM: dts: Add chip-id controller node on Exynos4/5 SoC\n ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree\n" }, { "commit": "91f8575685e35f3bd021286bc82d26397458f5a9", "tree": "09de8d889758a12071adb9427ed741e27c907aa6", "parents": [ "2e378f3eebd28feefbb1f9953834a5a19482f053", "b5b09be30cf99f9c699e825629f02e3bce555d44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 13:11:19 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 06 13:11:19 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\nPull Ceph changes from Alex Elder:\n \"This is a big pull.\n\n Most of it is culmination of Alex\u0027s work to implement RBD image\n layering, which is now complete (yay!).\n\n There is also some work from Yan to fix i_mutex behavior surrounding\n writes in cephfs, a sync write fix, a fix for RBD images that get\n resized while they are mapped, and a few patches from me that resolve\n annoying auth warnings and fix several bugs in the ceph auth code.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (254 commits)\n rbd: fix image request leak on parent read\n libceph: use slab cache for osd client requests\n libceph: allocate ceph message data with a slab allocator\n libceph: allocate ceph messages with a slab allocator\n rbd: allocate image object names with a slab allocator\n rbd: allocate object requests with a slab allocator\n rbd: allocate name separate from obj_request\n rbd: allocate image requests with a slab allocator\n rbd: use binary search for snapshot lookup\n rbd: clear EXISTS flag if mapped snapshot disappears\n rbd: kill off the snapshot list\n rbd: define rbd_snap_size() and rbd_snap_features()\n rbd: use snap_id not index to look up snap info\n rbd: look up snapshot name in names buffer\n rbd: drop obj_request-\u003eversion\n rbd: drop rbd_obj_method_sync() version parameter\n rbd: more version parameter removal\n rbd: get rid of some version parameters\n rbd: stop tracking header object version\n rbd: snap names are pointer to constant data\n ...\n" }, { "commit": "243198d09f535f5cd74114f1b779c3da25bc70c8", "tree": "c8bc152937a6a5de879b4d8f958a8f21a8131ae4", "parents": [ "0020356355192cbaf6d315515e6c95bd09618c3b" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Sun May 05 16:05:55 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 06 11:06:51 2013 -0400" }, "message": "rps_dev_flow_table_release(): no need to delay vfree()\n\nThe same story as with fib_trie patch - vfree() from RCU callbacks\nis legitimate now.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b56141ab34e2c3e2d7960cea12c20c99530c0c76", "tree": "cd6b8da53195f6d7b18c78f01abbcc83356c2959", "parents": [ "efeaa5550e4bfd335396415958fe3615530e5d5c" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Sun May 05 04:56:22 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 06 11:06:51 2013 -0400" }, "message": "net: frag, fix race conditions in LRU list maintenance\n\nThis patch fixes race between inet_frag_lru_move() and inet_frag_lru_add()\nwhich was introduced in commit 3ef0eb0db4bf92c6d2510fe5c4dc51852746f206\n(\"net: frag, move LRU list maintenance outside of rwlock\")\n\nOne cpu already added new fragment queue into hash but not into LRU.\nOther cpu found it in hash and tries to move it to the end of LRU.\nThis leads to NULL pointer dereference inside of list_move_tail().\n\nAnother possible race condition is between inet_frag_lru_move() and\ninet_frag_lru_del(): move can happens after deletion.\n\nThis patch initializes LRU list head before adding fragment into hash and\ninet_frag_lru_move() doesn\u0027t touches it if it\u0027s empty.\n\nI saw this kernel oops two times in a couple of days.\n\n[119482.128853] BUG: unable to handle kernel NULL pointer dereference at (null)\n[119482.132693] IP: [\u003cffffffff812ede89\u003e] __list_del_entry+0x29/0xd0\n[119482.136456] PGD 2148f6067 PUD 215ab9067 PMD 0\n[119482.140221] Oops: 0000 [#1] SMP\n[119482.144008] Modules linked in: vfat msdos fat 8021q fuse nfsd auth_rpcgss nfs_acl nfs lockd sunrpc ppp_async ppp_generic bridge slhc stp llc w83627ehf hwmon_vid snd_hda_codec_hdmi snd_hda_codec_realtek kvm_amd k10temp kvm snd_hda_intel snd_hda_codec edac_core radeon snd_hwdep ath9k snd_pcm ath9k_common snd_page_alloc ath9k_hw snd_timer snd soundcore drm_kms_helper ath ttm r8169 mii\n[119482.152692] CPU 3\n[119482.152721] Pid: 20, comm: ksoftirqd/3 Not tainted 3.9.0-zurg-00001-g9f95269 #132 To Be Filled By O.E.M. To Be Filled By O.E.M./RS880D\n[119482.161478] RIP: 0010:[\u003cffffffff812ede89\u003e] [\u003cffffffff812ede89\u003e] __list_del_entry+0x29/0xd0\n[119482.166004] RSP: 0018:ffff880216d5db58 EFLAGS: 00010207\n[119482.170568] RAX: 0000000000000000 RBX: ffff88020882b9c0 RCX: dead000000200200\n[119482.175189] RDX: 0000000000000000 RSI: 0000000000000880 RDI: ffff88020882ba00\n[119482.179860] RBP: ffff880216d5db58 R08: ffffffff8155c7f0 R09: 0000000000000014\n[119482.184570] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88020882ba00\n[119482.189337] R13: ffffffff81c8d780 R14: ffff880204357f00 R15: 00000000000005a0\n[119482.194140] FS: 00007f58124dc700(0000) GS:ffff88021fcc0000(0000) knlGS:0000000000000000\n[119482.198928] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n[119482.203711] CR2: 0000000000000000 CR3: 00000002155f0000 CR4: 00000000000007e0\n[119482.208533] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[119482.213371] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[119482.218221] Process ksoftirqd/3 (pid: 20, threadinfo ffff880216d5c000, task ffff880216d3a9a0)\n[119482.223113] Stack:\n[119482.228004] ffff880216d5dbd8 ffffffff8155dcda 0000000000000000 ffff000200000001\n[119482.233038] ffff8802153c1f00 ffff880000289440 ffff880200000014 ffff88007bc72000\n[119482.238083] 00000000000079d5 ffff88007bc72f44 ffffffff00000002 ffff880204357f00\n[119482.243090] Call Trace:\n[119482.248009] [\u003cffffffff8155dcda\u003e] ip_defrag+0x8fa/0xd10\n[119482.252921] [\u003cffffffff815a8013\u003e] ipv4_conntrack_defrag+0x83/0xe0\n[119482.257803] [\u003cffffffff8154485b\u003e] nf_iterate+0x8b/0xa0\n[119482.262658] [\u003cffffffff8155c7f0\u003e] ? inet_del_offload+0x40/0x40\n[119482.267527] [\u003cffffffff815448e4\u003e] nf_hook_slow+0x74/0x130\n[119482.272412] [\u003cffffffff8155c7f0\u003e] ? inet_del_offload+0x40/0x40\n[119482.277302] [\u003cffffffff8155d068\u003e] ip_rcv+0x268/0x320\n[119482.282147] [\u003cffffffff81519992\u003e] __netif_receive_skb_core+0x612/0x7e0\n[119482.286998] [\u003cffffffff81519b78\u003e] __netif_receive_skb+0x18/0x60\n[119482.291826] [\u003cffffffff8151a650\u003e] process_backlog+0xa0/0x160\n[119482.296648] [\u003cffffffff81519f29\u003e] net_rx_action+0x139/0x220\n[119482.301403] [\u003cffffffff81053707\u003e] __do_softirq+0xe7/0x220\n[119482.306103] [\u003cffffffff81053868\u003e] run_ksoftirqd+0x28/0x40\n[119482.310809] [\u003cffffffff81074f5f\u003e] smpboot_thread_fn+0xff/0x1a0\n[119482.315515] [\u003cffffffff81074e60\u003e] ? lg_local_lock_cpu+0x40/0x40\n[119482.320219] [\u003cffffffff8106d870\u003e] kthread+0xc0/0xd0\n[119482.324858] [\u003cffffffff8106d7b0\u003e] ? insert_kthread_work+0x40/0x40\n[119482.329460] [\u003cffffffff816c32dc\u003e] ret_from_fork+0x7c/0xb0\n[119482.334057] [\u003cffffffff8106d7b0\u003e] ? insert_kthread_work+0x40/0x40\n[119482.338661] Code: 00 00 55 48 8b 17 48 b9 00 01 10 00 00 00 ad de 48 8b 47 08 48 89 e5 48 39 ca 74 29 48 b9 00 02 20 00 00 00 ad de 48 39 c8 74 7a \u003c4c\u003e 8b 00 4c 39 c7 75 53 4c 8b 42 08 4c 39 c7 75 2b 48 89 42 08\n[119482.343787] RIP [\u003cffffffff812ede89\u003e] __list_del_entry+0x29/0xd0\n[119482.348675] RSP \u003cffff880216d5db58\u003e\n[119482.353493] CR2: 0000000000000000\n\nOops happened on this path:\nip_defrag() -\u003e ip_frag_queue() -\u003e inet_frag_lru_move() -\u003e list_move_tail() -\u003e __list_del_entry()\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nCc: Florian Westphal \u003cfw@strlen.de\u003e\nCc: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6286ae97d10ea2b5cd90532163797ab217bfdbdf", "tree": "0724efb47d735ce835709d2402de02de4dd61f07", "parents": [ "14e50c6a9bc2b283bb4021026226268312ceefdd" ], "author": { "name": "Christoph Lameter", "email": "cl@linux.com", "time": "Fri May 03 15:43:18 2013 +0000" }, "committer": { "name": "Pekka Enberg", "email": "penberg@kernel.org", "time": "Mon May 06 09:24:16 2013 +0300" }, "message": "slab: Return NULL for oversized allocations\n\nThe inline path seems to have changed the SLAB behavior for very large\nkmalloc allocations with commit e3366016 (\"slab: Use common\nkmalloc_index/kmalloc_size functions\"). This patch restores the old\nbehavior but also adds diagnostics so that we can figure where in the\ncode these large allocations occur.\n\nReported-and-tested-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: Christoph Lameter \u003ccl@linux.com\u003e\nLink: http://lkml.kernel.org/r/201305040348.CIF81716.OStQOHFJMFLOVF@I-love.SAKURA.ne.jp\n[ penberg@kernel.org: use WARN_ON_ONCE ]\nSigned-off-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\n" }, { "commit": "a8ca889ed9585894d53fd8919d80cbe8baff09e7", "tree": "72461b2648110bf57d28d1949d1b5fe76a2148c1", "parents": [ "1950267e6e9dc2531f2790bf217aa7aadc9aa324" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun May 05 21:31:22 2013 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun May 05 21:31:22 2013 -0400" }, "message": "mtd_blktrans_ops-\u003erelease() should return void\n\nBoth existing instances always return 0 and even if they didn\u0027t,\nthe value would be lost on the way out. Just don\u0027t bother...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d7ab7302f970a254997687a1cdede421a5635c68", "tree": "71341b72e81c8e031b98e8115c51682427192798", "parents": [ "01227a889ed56ae53aeebb9f93be9d54dd8b2de8", "99f4c6b66a9ae362d21e6df95d04bc74e04d285e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 17:36:20 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 17:36:20 2013 -0700" }, "message": "Merge tag \u0027mfd-3.10-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next\n\nPull MFD update from Samuel Ortiz:\n \"For 3.10 we have a few new MFD drivers for:\n\n - The ChromeOS embedded controller which provides keyboard, battery\n and power management services. This controller is accessible\n through i2c or SPI.\n\n - Silicon Laboratories 476x controller, providing access to their FM\n chipset and their audio codec.\n\n - Realtek\u0027s RTS5249, a memory stick, MMC and SD/SDIO PCI based\n reader.\n\n - Nokia\u0027s Tahvo power button and watchdog device. This device is\n very similar to Retu and is thus supported by the same code base.\n\n - STMicroelectronics STMPE1801, a keyboard and GPIO controller\n supported by the stmpe driver.\n\n - ST-Ericsson AB8540 and AB8505 power management and voltage\n converter controllers through the existing ab8500 code.\n\n Some other drivers got cleaned up or improved. In particular:\n\n - The Linaro/STE guys got the ab8500 driver in sync with their\n internal code through a series of optimizations, fixes and\n improvements.\n\n - The AS3711 and OMAP USB drivers now have DT support.\n\n - The arizona clock and interrupt handling code got improved.\n\n - The wm5102 register patch and boot mechanism also got improved.\"\n\n* tag \u0027mfd-3.10-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (104 commits)\n mfd: si476x: Don\u0027t use 0bNNN\n mfd: vexpress: Handle pending config transactions\n mfd: ab8500: Export ab8500_gpadc_sw_hw_convert properly\n mfd: si476x: Fix i2c warning\n mfd: si476x: Add header files and Kbuild plumbing\n mfd: si476x: Add chip properties handling code\n mfd: si476x: Add the bulk of the core driver\n mfd: si476x: Add commands abstraction layer\n mfd: rtsx: Support RTS5249\n mfd: retu: Add Tahvo support\n mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus\n mfd: wm8994: Add some OF properties\n mfd: wm8994: Add device ID data to WM8994 OF device IDs\n input: Export matrix_keypad_parse_of_params()\n mfd: tps65090: Add compatible string for charger subnode\n mfd: db8500-prcmu: Support platform dependant device selection\n mfd: syscon: Fix warnings when printing resource_size_t\n of: Add stub of_get_parent for non-OF builds\n mfd: omap-usb-tll: Convert to devm_ioremap_resource()\n mfd: omap-usb-host: Convert to devm_ioremap_resource()\n ...\n" }, { "commit": "01227a889ed56ae53aeebb9f93be9d54dd8b2de8", "tree": "d5eba9359a9827e84d4112b84d48c54df5c5acde", "parents": [ "9e6879460c8edb0cd3c24c09b83d06541b5af0dc", "db6ae6158186a17165ef990bda2895ae7594b039" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 14:47:31 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 14:47:31 2013 -0700" }, "message": "Merge tag \u0027kvm-3.10-1\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull kvm updates from Gleb Natapov:\n \"Highlights of the updates are:\n\n general:\n - new emulated device API\n - legacy device assignment is now optional\n - irqfd interface is more generic and can be shared between arches\n\n x86:\n - VMCS shadow support and other nested VMX improvements\n - APIC virtualization and Posted Interrupt hardware support\n - Optimize mmio spte zapping\n\n ppc:\n - BookE: in-kernel MPIC emulation with irqfd support\n - Book3S: in-kernel XICS emulation (incomplete)\n - Book3S: HV: migration fixes\n - BookE: more debug support preparation\n - BookE: e6500 support\n\n ARM:\n - reworking of Hyp idmaps\n\n s390:\n - ioeventfd for virtio-ccw\n\n And many other bug fixes, cleanups and improvements\"\n\n* tag \u0027kvm-3.10-1\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (204 commits)\n kvm: Add compat_ioctl for device control API\n KVM: x86: Account for failing enable_irq_window for NMI window request\n KVM: PPC: Book3S: Add API for in-kernel XICS emulation\n kvm/ppc/mpic: fix missing unlock in set_base_addr()\n kvm/ppc: Hold srcu lock when calling kvm_io_bus_read/write\n kvm/ppc/mpic: remove users\n kvm/ppc/mpic: fix mmio region lists when multiple guests used\n kvm/ppc/mpic: remove default routes from documentation\n kvm: KVM_CAP_IOMMU only available with device assignment\n ARM: KVM: iterate over all CPUs for CPU compatibility check\n KVM: ARM: Fix spelling in error message\n ARM: KVM: define KVM_ARM_MAX_VCPUS unconditionally\n KVM: ARM: Fix API documentation for ONE_REG encoding\n ARM: KVM: promote vfp_host pointer to generic host cpu context\n ARM: KVM: add architecture specific hook for capabilities\n ARM: KVM: perform HYP initilization for hotplugged CPUs\n ARM: KVM: switch to a dual-step HYP init code\n ARM: KVM: rework HYP page table freeing\n ARM: KVM: enforce maximum size for identity mapped code\n ARM: KVM: move to a KVM provided HYP idmap\n ...\n" }, { "commit": "77d21f23a1e4db8639e3916547c903a3b3c7a07c", "tree": "193391695807d4e1a8c6c0612d30adfc73f85296", "parents": [ "f8ce1faf55955de62e0a12e330c6d9a526071f65" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Fri May 03 14:49:41 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 05 16:58:01 2013 -0400" }, "message": "virtio: don\u0027t expose u16 in userspace api\n\nPrograms using virtio headers outside of kernel will no longer\nbuild because u16 type does not exist in userspace. All user ABI\nmust use __u16 typedef instead.\n\nBug introduce by:\n commit 986a4f4d452dec004697f667439d27c3fda9c928\n Author: Jason Wang \u003cjasowang@redhat.com\u003e\n Date: Fri Dec 7 07:04:56 2012 +0000\n\n virtio_net: multiqueue support\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "534c97b0950b1967bca1c753aeaed32f5db40264", "tree": "9421d26e4f6d479d1bc32b036a731b065daab0fa", "parents": [ "64049d1973c1735f543eb7a55653e291e108b0cb", "265f22a975c1e4cc3a4d1f94a3ec53ffbb6f5b9f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 13:23:27 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 13:23:27 2013 -0700" }, "message": "Merge branch \u0027timers-nohz-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull \u0027full dynticks\u0027 support from Ingo Molnar:\n \"This tree from Frederic Weisbecker adds a new, (exciting! :-) core\n kernel feature to the timer and scheduler subsystems: \u0027full dynticks\u0027,\n or CONFIG_NO_HZ_FULL\u003dy.\n\n This feature extends the nohz variable-size timer tick feature from\n idle to busy CPUs (running at most one task) as well, potentially\n reducing the number of timer interrupts significantly.\n\n This feature got motivated by real-time folks and the -rt tree, but\n the general utility and motivation of full-dynticks runs wider than\n that:\n\n - HPC workloads get faster: CPUs running a single task should be able\n to utilize a maximum amount of CPU power. A periodic timer tick at\n HZ\u003d1000 can cause a constant overhead of up to 1.0%. This feature\n removes that overhead - and speeds up the system by 0.5%-1.0% on\n typical distro configs even on modern systems.\n\n - Real-time workload latency reduction: CPUs running critical tasks\n should experience as little jitter as possible. The last remaining\n source of kernel-related jitter was the periodic timer tick.\n\n - A single task executing on a CPU is a pretty common situation,\n especially with an increasing number of cores/CPUs, so this feature\n helps desktop and mobile workloads as well.\n\n The cost of the feature is mainly related to increased timer\n reprogramming overhead when a CPU switches its tick period, and thus\n slightly longer to-idle and from-idle latency.\n\n Configuration-wise a third mode of operation is added to the existing\n two NOHZ kconfig modes:\n\n - CONFIG_HZ_PERIODIC: [formerly !CONFIG_NO_HZ], now explicitly named\n as a config option. This is the traditional Linux periodic tick\n design: there\u0027s a HZ tick going on all the time, regardless of\n whether a CPU is idle or not.\n\n - CONFIG_NO_HZ_IDLE: [formerly CONFIG_NO_HZ\u003dy], this turns off the\n periodic tick when a CPU enters idle mode.\n\n - CONFIG_NO_HZ_FULL: this new mode, in addition to turning off the\n tick when a CPU is idle, also slows the tick down to 1 Hz (one\n timer interrupt per second) when only a single task is running on a\n CPU.\n\n The .config behavior is compatible: existing !CONFIG_NO_HZ and\n CONFIG_NO_HZ\u003dy settings get translated to the new values, without the\n user having to configure anything. CONFIG_NO_HZ_FULL is turned off by\n default.\n\n This feature is based on a lot of infrastructure work that has been\n steadily going upstream in the last 2-3 cycles: related RCU support\n and non-periodic cputime support in particular is upstream already.\n\n This tree adds the final pieces and activates the feature. The pull\n request is marked RFC because:\n\n - it\u0027s marked 64-bit only at the moment - the 32-bit support patch is\n small but did not get ready in time.\n\n - it has a number of fresh commits that came in after the merge\n window. The overwhelming majority of commits are from before the\n merge window, but still some aspects of the tree are fresh and so I\n marked it RFC.\n\n - it\u0027s a pretty wide-reaching feature with lots of effects - and\n while the components have been in testing for some time, the full\n combination is still not very widely used. That it\u0027s default-off\n should reduce its regression abilities and obviously there are no\n known regressions with CONFIG_NO_HZ_FULL\u003dy enabled either.\n\n - the feature is not completely idempotent: there is no 100%\n equivalent replacement for a periodic scheduler/timer tick. In\n particular there\u0027s ongoing work to map out and reduce its effects\n on scheduler load-balancing and statistics. This should not impact\n correctness though, there are no known regressions related to this\n feature at this point.\n\n - it\u0027s a pretty ambitious feature that with time will likely be\n enabled by most Linux distros, and we\u0027d like you to make input on\n its design/implementation, if you dislike some aspect we missed.\n Without flaming us to crisp! :-)\n\n Future plans:\n\n - there\u0027s ongoing work to reduce 1Hz to 0Hz, to essentially shut off\n the periodic tick altogether when there\u0027s a single busy task on a\n CPU. We\u0027d first like 1 Hz to be exposed more widely before we go\n for the 0 Hz target though.\n\n - once we reach 0 Hz we can remove the periodic tick assumption from\n nr_running\u003e\u003d2 as well, by essentially interrupting busy tasks only\n as frequently as the sched_latency constraints require us to do -\n once every 4-40 msecs, depending on nr_running.\n\n I am personally leaning towards biting the bullet and doing this in\n v3.10, like the -rt tree this effort has been going on for too long -\n but the final word is up to you as usual.\n\n More technical details can be found in Documentation/timers/NO_HZ.txt\"\n\n* \u0027timers-nohz-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)\n sched: Keep at least 1 tick per second for active dynticks tasks\n rcu: Fix full dynticks\u0027 dependency on wide RCU nocb mode\n nohz: Protect smp_processor_id() in tick_nohz_task_switch()\n nohz_full: Add documentation.\n cputime_nsecs: use math64.h for nsec resolution conversion helpers\n nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config\n nohz: Reduce overhead under high-freq idling patterns\n nohz: Remove full dynticks\u0027 superfluous dependency on RCU tree\n nohz: Fix unavailable tick_stop tracepoint in dynticks idle\n nohz: Add basic tracing\n nohz: Select wide RCU nocb for full dynticks\n nohz: Disable the tick when irq resume in full dynticks CPU\n nohz: Re-evaluate the tick for the new task after a context switch\n nohz: Prepare to stop the tick on irq exit\n nohz: Implement full dynticks kick\n nohz: Re-evaluate the tick from the scheduler IPI\n sched: New helper to prevent from stopping the tick in full dynticks\n sched: Kick full dynticks CPU that have more than one task enqueued.\n perf: New helper to prevent full dynticks CPUs from stopping tick\n perf: Kick full dynticks CPU if events rotation is needed\n ...\n" }, { "commit": "f8ce1faf55955de62e0a12e330c6d9a526071f65", "tree": "a3b0ddd3f37e40d3ed0fd2cd433a2723403c8b97", "parents": [ "24d0c2542b38963ae4d5171ecc0a2c1326c656bc", "a53a11f35762ff1d5e268adedf2ab9ce313f871d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 10:58:06 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 05 10:58:06 2013 -0700" }, "message": "Merge tag \u0027modules-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull mudule updates from Rusty Russell:\n \"We get rid of the general module prefix confusion with a binary config\n option, fix a remove/insert race which Never Happens, and (my\n favorite) handle the case when we have too many modules for a single\n commandline. Seriously, the kernel is full, please go away!\"\n\n* tag \u0027modules-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:\n modpost: fix unwanted VMLINUX_SYMBOL_STR expansion\n X.509: Support parse long form of length octets in Authority Key Identifier\n module: don\u0027t unlink the module until we\u0027ve removed all exposure.\n kernel: kallsyms: memory override issue, need check destination buffer length\n MODSIGN: do not send garbage to stderr when enabling modules signature\n modpost: handle huge numbers of modules.\n modpost: add -T option to read module names from file/stdin.\n modpost: minor cleanup.\n genksyms: pass symbol-prefix instead of arch\n module: fix symbol versioning with symbol prefixes\n CONFIG_SYMBOL_PREFIX: cleanup.\n" }, { "commit": "173192958d06b8d1eb44f56d74373052ad6a9a60", "tree": "838a4f063c994d4d0a6259a85f21005c4098b752", "parents": [ "e72a5d1ceb1c5cbe39c35c1c7a7f5909cbe8451a", "e4404fab2e0b70287a471a1e760c9338ce683fde" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 13:45:17 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 13:45:17 2013 -0700" }, "message": "Merge tag \u0027mmc-updates-for-3.10-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC update from Chris Ball:\n \"MMC highlights for 3.10:\n\n Core:\n - Introduce MMC_CAP2_NO_PRESCAN_POWERUP to allow skipping\n mmc_power_up() at boot/initialization time if it\u0027s already\n happened, for performance (faster boot time) reasons.\n - Fix a bit width test failure that resulted in old eMMC cards being\n put into 1-bit mode when 4-bit mode was available.\n - Expose fwrev/hwrev for MMCv4 parts.\n - Improve card removal logic in the case where the card\u0027s removed\n slowly; we were missing card removal events if the card retained\n contact with the slot pads for long enough to reply to a CMD13\n while being removed.\n\n Drivers:\n - davinci_mmc: Support using PIO instead of DMA.\n - dw_mmc: Add support for Exynos4412.\n - mxcmmc: DT support, use slot-gpio API.\n - mxs-mmc: Add broken-cd/cd-inverted/non-removable DT property\n support.\n - sdhci-sirf: New sdhci-pltfm driver for CSR SiRF SoCs:\n SiRFprimaII: unicore ARM Cortex-A9\n SiRFatlas6: unicore ARM Cortex-A9\n SiRFmarco: dual core ARM Cortex-A9 SMP\n - sdhci-tegra: Add support for Tegra114 platforms, use\n mmc_of_parse()\"\n\n* tag \u0027mmc-updates-for-3.10-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)\n mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE\n mmc: core: fix init controller performance regression, updated patch\n mmc: mxcmmc: enable DMA support on mpc512x\n mmc: mxcmmc: constify mxcmci_devtype\n mmc: mxcmmc: use slot-gpio API for write-protect detection\n mmc: mxcmmc: add mpc512x SDHC support\n mmc: mxcmmc: fix race conditions for host-\u003ereq and host-\u003edata access\n mmc: mxcmmc: DT support\n mmc: dw_mmc: let device core setup the default pin configuration\n mmc: mxs-mmc: add broken-cd property\n mmc: mxs-mmc: add non-removable property\n mmc: mxs-mmc: add cd-inverted property\n mmc: core: call pm_runtime_put_noidle in pm_runtime_get_sync failed case\n mmc: mxcmmc: Fix bug when card is present during boot\n mmc: core: fix performance regression initializing MMC host controllers\n Revert \"mmc: core: wait while adding MMC host to ensure root mounts successfully\"\n mmc: atmel-mci: pio hang on block errors\n mmc: core: Fix bit width test failing on old eMMC cards\n mmc: dw_mmc: Use pr_info instead of printk\n mmc: dw_mmc: Check return value of regulator_enable\n ...\n" }, { "commit": "bd932ae1bd655979d0d765108721951051f0837d", "tree": "ec8ba10a8f6b02770a81587eb63f0560d19bd782", "parents": [ "150a8dcf109f68f322bf112c7604f2d950303f00", "4fe56e80825b47083100b2a98843df98fc7d4f07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 13:29:38 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 13:29:38 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull second round of VFS updates from Al Viro:\n \"Assorted fixes\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n xtensa simdisk: fix braino in \"xtensa simdisk: switch to proc_create_data()\"\n hostfs: use kmalloc instead of kzalloc\n hostfs: move HOSTFS_SUPER_MAGIC to \u003clinux/magic.h\u003e\n hostfs: remove \"will unlock\" comment\n vfs: use list_move instead of list_del/list_add\n proc_devtree: Replace include linux/module.h with linux/export.h\n create_mnt_ns: unidiomatic use of list_add()\n fs: remove dentry_lru_prune()\n Removed unused typedef to avoid \"unused local typedef\" warnings.\n kill fs/read_write.h\n fs: Fix hang with BSD accounting on frozen filesystem\n sun3_scsi: add -\u003eshow_info()\n nubus: Kill nubus_proc_detach_device()\n more mode_t whack-a-mole...\n do_coredump(): don\u0027t wait for thaw if coredump has already been interrupted\n do_mount(): fix a leak introduced in 3.9 (\"mount: consolidate permission checks\")\n" }, { "commit": "2b3b9bb03a9fb1e4c72947cc235771c6455ec7c9", "tree": "fd9ea03631b1df21d723b7bf71afe7756c13e3a2", "parents": [ "9dcc5e8a4635d6a0b20273e3db21507ff02764ea" ], "author": { "name": "James Hogan", "email": "james.hogan@imgtec.com", "time": "Wed Mar 27 10:47:13 2013 +0000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 04 15:48:44 2013 -0400" }, "message": "hostfs: move HOSTFS_SUPER_MAGIC to \u003clinux/magic.h\u003e\n\nMove HOSTFS_SUPER_MAGIC to \u003clinux/magic.h\u003e to be with it\u0027s magical\nfriends from other file systems.\n\nReported-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: James Hogan \u003cjames.hogan@imgtec.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "150a8dcf109f68f322bf112c7604f2d950303f00", "tree": "d2219f3de4facbcd34625c733b6fae85ea3b7b8c", "parents": [ "e3d98847ded1d183111ff7c4d1ef56b161c7f13e", "21bdcc1a2ffce8c9bc7caad711401fff47f99c00" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 12:34:30 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 12:34:30 2013 -0700" }, "message": "Merge tag \u0027boards-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC board specific changes (part 1) from Olof Johansson:\n \"These changes are all for board specific files. These used to make up\n a large portion of the ARM changes in the past, but as we are\n generalizing the support and moving to device tree probing, this has\n gotten significantly smaller.\n\n The only platform actually adding new code here at the moment is\n Renesas shmobile, as they are still busy converting their code to\n device tree and have not come far enough to not need it.\"\n\n* tag \u0027boards-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)\n ARM: msm: USB_MSM_OTG needs USB_PHY\n ARM: davinci: da850 evm: fix const qualifier placement\n ARM: davinci: da850 board: add remoteproc support\n ARM: pxa: move debug uart code\n ARM: pxa: select PXA935 on saar \u0026 tavorevb\n ARM: mmp: add more compatible names in gpio driver\n ARM: pxa: move PXA_GPIO_TO_IRQ macro\n ARM: pxa: remove cpu_is_xxx in gpio driver\n ARM: Kirkwood: update Network Space Mini v2 description\n ARM: Kirkwood: DT board setup for CloudBox\n ARM: Kirkwood: sort board entries by ASCII-code order\n ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight\n ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight\n ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor\n omap2+: Remove useless Makefile line\n omap2+: Remove useless Makefile line\n ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d\n ARM: OMAP1: fix omap_udc registration\n ARM: davinci: use is IS_ENABLED macro\n ARM: kirkwood: add MACH_GURUPLUG_DT to defconfig\n ...\n" }, { "commit": "6fa52ed33bea997374a88dbacbba5bf8c7ac4fef", "tree": "a0904b78d66c9b99d6acf944cf58bcaa0cffc511", "parents": [ "1db772216f48978d5146b858586f6178433aad38", "bc8fd900c4d460b4e4bf785bb48bfced0ac9941b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 12:31:18 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 04 12:31:18 2013 -0700" }, "message": "Merge tag \u0027drivers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC driver changes from Olof Johansson:\n \"This is a rather large set of patches for device drivers that for one\n reason or another the subsystem maintainer preferred to get merged\n through the arm-soc tree. There are both new drivers as well as\n existing drivers that are getting converted from platform-specific\n code into standalone drivers using the appropriate subsystem specific\n interfaces.\n\n In particular, we can now have pinctrl, clk, clksource and irqchip\n drivers in one file per driver, without the need to call into platform\n specific interface, or to get called from platform specific code, as\n long as all information about the hardware is provided through a\n device tree.\n\n Most of the drivers we touch this time are for clocksource. Since now\n most of them are part of drivers/clocksource, I expect that we won\u0027t\n have to touch these again from arm-soc and can let the clocksource\n maintainers take care of these in the future.\n\n Another larger part of this series is specific to the exynos platform,\n which is seeing some significant effort in upstreaming and\n modernization of its device drivers this time around, which\n unfortunately is also the cause for the churn and a lot of the merge\n conflicts.\n\n There is one new subsystem that gets merged as part of this series:\n the reset controller interface, which is a very simple interface for\n taking devices on the SoC out of reset or back into reset. Patches to\n use this interface on i.MX follow later in this merge window, and we\n are going to have other platforms (at least tegra and sirf) get\n converted in 3.11. This will let us get rid of platform specific\n callbacks in a number of platform independent device drivers.\"\n\n* tag \u0027drivers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (256 commits)\n irqchip: s3c24xx: add missing __init annotations\n ARM: dts: Disable the RTC by default on exynos5\n clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3}\n ARM: exynos: restore mach/regs-clock.h for exynos5\n clocksource: exynos_mct: fix build error on non-DT\n pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()\n irqchip: vt8500: Convert arch-vt8500 to new irqchip infrastructure\n reset: NULL deref on allocation failure\n reset: Add reset controller API\n dt: describe base reset signal binding\n ARM: EXYNOS: Add arm-pmu DT binding for exynos421x\n ARM: EXYNOS: Add arm-pmu DT binding for exynos5250\n ARM: EXYNOS: Enable PMUs for exynos4\n irqchip: exynos-combiner: Correct combined IRQs for exynos4\n irqchip: exynos-combiner: Add set_irq_affinity function for combiner_irq\n ARM: EXYNOS: fix compilation error introduced due to common clock migration\n clk: exynos5250: Fix divider values for sclk_mmc{0,1,2,3}\n clk: exynos4: export clocks required for fimc-is\n clk: samsung: Fix compilation error\n clk: tegra: fix enum tegra114_clk to match binding\n ...\n" }, { "commit": "5ae98f1589e076e4b314fc54ae2beac58842ddc2", "tree": "ea0ea08edbc6f4f0644faca5e8c3a29a68f71c51", "parents": [ "9dcc26cf67fb7db7613290e62eeed6c4276c75ce" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Sat May 04 00:11:23 2013 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 04 14:57:58 2013 -0400" }, "message": "fs: Fix hang with BSD accounting on frozen filesystem\n\nWhen BSD process accounting is enabled and logs information to a\nfilesystem which gets frozen, system easily becomes unusable because\neach attempt to account process information blocks. Thus e.g. every task\ngets blocked in exit.\n\nIt seems better to drop accounting information (which can already happen\nwhen filesystem is running out of space) instead of locking system up.\nSo we just skip the write if the filesystem is frozen.\n\nReported-by: Nikola Ciprich \u003cnikola.ciprich@linuxbox.cz\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "e765acb4673f377c53505c01279c040906bd706e", "tree": "a0ab507a1136cbf986f55bf568ad8d54b0e9b525", "parents": [ "60b7bf4e61dd45e2fe06bd16ba04984405b564f1" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri May 03 22:20:38 2013 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 04 14:47:26 2013 -0400" }, "message": "nubus: Kill nubus_proc_detach_device()\n\nCommit 59d8053f1e16904d54ed7469d4b36801ea6b8f2c (\"proc: Move non-public\nstuff from linux/proc_fs.h to fs/proc/internal.h\") broke Apple NuBus\nsupport:\n\ndrivers/nubus/proc.c: In function ‘nubus_proc_detach_device’:\ndrivers/nubus/proc.c:156: error: dereferencing pointer to incomplete type\ndrivers/nubus/proc.c:158: error: dereferencing pointer to incomplete type\n\nFortunately nubus_proc_detach_device() is unused, and appears to have never\nbeen used, so just remove it.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "265f22a975c1e4cc3a4d1f94a3ec53ffbb6f5b9f", "tree": "c5b7ec6b64fc31e879e730d2edf8e836cfaf7e9b", "parents": [ "73c30828771acafb0a5e3a1c4cf75e6c5dc5f98a" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri May 03 03:39:05 2013 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat May 04 08:32:02 2013 +0200" }, "message": "sched: Keep at least 1 tick per second for active dynticks tasks\n\nThe scheduler doesn\u0027t yet fully support environments\nwith a single task running without a periodic tick.\n\nIn order to ensure we still maintain the duties of scheduler_tick(),\nkeep at least 1 tick per second.\n\nThis makes sure that we keep the progression of various scheduler\naccounting and background maintainance even with a very low granularity.\nExamples include cpu load, sched average, CFS entity vruntime,\navenrun and events such as load balancing, amongst other details\nhandled in sched_class::task_tick().\n\nThis limitation will be removed in the future once we get\nthese individual items to work in full dynticks CPUs.\n\nSuggested-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Hakan Akkan \u003chakanakkan@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Kevin Hilman \u003ckhilman@linaro.org\u003e\nCc: Li Zhong \u003czhong@linux.vnet.ibm.com\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "1db772216f48978d5146b858586f6178433aad38", "tree": "4cb1f7345256c7a89c85b7a6157bbf16b944782e", "parents": [ "86652188f345edec56b0074a65f6db17f16eb359", "676e4ebd5f2c3b4fd1d2bff79b68385c23c5c105" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 10:59:39 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 10:59:39 2013 -0700" }, "message": "Merge branch \u0027for-3.10\u0027 of git://linux-nfs.org/~bfields/linux\n\nPull nfsd changes from J Bruce Fields:\n \"Highlights include:\n\n - Some more DRC cleanup and performance work from Jeff Layton\n\n - A gss-proxy upcall from Simo Sorce: currently krb5 mounts to the\n server using credentials from Active Directory often fail due to\n limitations of the svcgssd upcall interface. This replacement\n lifts those limitations. The existing upcall is still supported\n for backwards compatibility.\n\n - More NFSv4.1 support: at this point, if a user with a current\n client who upgrades from 4.0 to 4.1 should see no regressions. In\n theory we do everything a 4.1 server is required to do. Patches\n for a couple minor exceptions are ready for 3.11, and with those\n and some more testing I\u0027d like to turn 4.1 on by default in 3.11.\"\n\nFix up semantic conflict as per Stephen Rothwell and linux-next:\n\nCommit 030d794bf498 (\"SUNRPC: Use gssproxy upcall for server RPCGSS\nauthentication\") adds two new users of \"PDE(inode)-\u003edata\", but we\u0027re\nsupposed to use \"PDE_DATA(inode)\" instead since commit d9dda78bad87\n(\"procfs: new helper - PDE_DATA(inode)\").\n\nThe old PDE() macro is no longer available since commit c30480b92cf4\n(\"proc: Make the PROC_I() and PDE() macros internal to procfs\")\n\n* \u0027for-3.10\u0027 of git://linux-nfs.org/~bfields/linux: (60 commits)\n NFSD: SECINFO doesn\u0027t handle unsupported pseudoflavors correctly\n NFSD: Simplify GSS flavor encoding in nfsd4_do_encode_secinfo()\n nfsd: make symbol nfsd_reply_cache_shrinker static\n svcauth_gss: fix error return code in rsc_parse()\n nfsd4: don\u0027t remap EISDIR errors in rename\n svcrpc: fix gss-proxy to respect user namespaces\n SUNRPC: gssp_procedures[] can be static\n SUNRPC: define {create,destroy}_use_gss_proxy_proc_entry in !PROC case\n nfsd4: better error return to indicate SSV non-support\n nfsd: fix EXDEV checking in rename\n SUNRPC: Use gssproxy upcall for server RPCGSS authentication.\n SUNRPC: Add RPC based upcall mechanism for RPCGSS auth\n SUNRPC: conditionally return endtime from import_sec_context\n SUNRPC: allow disabling idle timeout\n SUNRPC: attempt AF_LOCAL connect on setup\n nfsd: Decode and send 64bit time values\n nfsd4: put_client_renew_locked can be static\n nfsd4: remove unused macro\n nfsd4: remove some useless code\n nfsd4: implement SEQ4_STATUS_RECALLABLE_STATE_REVOKED\n ...\n" }, { "commit": "14a9e5c09d13aa36b88ea54b8b6134b60ff2a410", "tree": "4c8c477d4e459bd3429b83a81e3db531ffe32969", "parents": [ "8546dc1d4b671480961c3eaf4c0c102ae6848340", "fb1c2d8294a60184a151ff12182446d7b930ed95" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 09:56:25 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 09:56:25 2013 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs\n\nPull ext3/jbd fixes from Jan Kara:\n \"A couple of ext3/jbd fixes\"\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:\n jbd: use kmem_cache_zalloc for allocating journal head\n jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset\n jbd: don\u0027t wait (forever) for stale tid caused by wraparound\n ext3: fix data\u003djournal fast mount/umount hang\n" }, { "commit": "9992ba72327fa0d8bdc9fb624e80f5cce338a711", "tree": "e0bf31ae53cb19c44674df7e0d0343a26037ad34", "parents": [ "00fdffb5131125dce0702bf61e24a806ec3aed80", "4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 09:10:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 09:10:23 2013 -0700" }, "message": "Merge tag \u0027sound-3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound updates from Takashi Iwai:\n \"Mostly many small changes spread as seen in diffstat in sound/*\n directory by this update. A significant change in the subsystem level\n is the introduction of snd_soc_component, which will help more generic\n handling of SoC and off-SoC components.\n\n Also, snd_BUG_ON() macro is enabled unconditionally now due to its\n misuses, so people might hit kernel warnings (it\u0027s a good thing for\n us).\n\n - compress-offload: support for capture by Charles Keepax\n - HD-audio: codec delay support by Dylan Reid\n - HD-audio: improvements/fixes in generic parser: better headphone\n mic and headset mic support, jack_modes hint consolidation, proper\n beep attach/detachment, generalized power filter controls by David\n Henningsson, et al\n - HD-audio: Improved management of HDMI codec pins/converters\n - HD-audio: Better pin/DAC assignment for VIA codecs\n - HD-audio: Haswell HDMI workarounds\n - HD-audio: ALC268 codec support, a few new quirks for Chromebooks\n - USB: regression fixes: USB-MIDI autopm fix, the recent ISO latency\n fix by Clemens Ladisch\n - USB: support for DSD formats by Daniel Mack\n - USB: A few UAC2 device endian/cock fixes by Eldad Zack\n - USB: quirks for Emu 192kHz support, Novation Twitch DJ controller,\n Yamaha THRxx devices\n - HDSPM: updates for TCO controls by Adrian Knoth\n - ASoC: Add a snd_soc_component object type for generic handling of\n SoC and off-SoC components by Kuninori Morimoto,\n - dmaengine: a large set of cleanups and conversions by Lars-Peter\n Clausen\n - ASoC DAPM: performance optimizations from Ryo Tsutsui\n - ASoC DAPM: support for mixer control sharing by Stephen Warren\n - ASoC: multiplatform ARM cleanups from Arnd Bergmann\n - ASoC: new codec drivers for AK5385 and TAS5086 from Daniel Mack\"\n\n* tag \u0027sound-3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (315 commits)\n ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch\n ALSA: asihpi: add format support check in snd_card_asihpi_capture_formats\n ALSA: pcm_format_to_bits strong-typed conversion\n ALSA: compress: fix the states to check for allowing read\n ALSA: hda - Move Thinkpad X220 to use auto parser\n ALSA: USB: adjust for changed 3.8 USB API\n ALSA: usb - Avoid unnecessary sample rate changes on USB 2.0 clock sources\n sound: oss/dmabuf: use dma_map_single\n ALSA: ali5451: use mdelay instead of large udelay constants\n ALSA: hda - Add the support for ALC286 codec\n ALSA: usb-audio: USB quirk for Yamaha THR10C\n ALSA: usb-audio: USB quirk for Yamaha THR5A\n ALSA: usb-audio: USB quirk for Yamaha THR10\n ALSA: usb-audio: Fix autopm error during probing\n ALSA: snd-usb: try harder to find USB_DT_CS_ENDPOINT\n ALSA: sound kconfig typo\n ALSA: emu10k1: Fix dock firmware loading\n ASoC: ux500: forward declare msp_i2s_platform_data\n ASoC: davinci-mcasp: Add Support BCLK-to-LRCLK ratio for TDM modes\n ASoC: davinci-pcm, davinci-mcasp: Clean up active_serializers\n ...\n" }, { "commit": "00fdffb5131125dce0702bf61e24a806ec3aed80", "tree": "1cf855601ce34630b487f8555cf7df2e96efb506", "parents": [ "ce857229e0c3adc211944a13a5579ef84fd7b4af", "bd08ec33b5c23833581e5a36b2a69ccae6b39a28" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 07:06:37 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 03 07:06:37 2013 -0700" }, "message": "Merge tag \u0027for-v3.10\u0027 of git://git.infradead.org/users/cbou/linux-pstore\n\nPull pstore update from Anton Vorontsov:\n\n - A new platform data parameter to specify ECC configuration;\n\n - Rounding fixup to not waste memory in ecc_blocks;\n\n - Restore ECC information printouts;\n\n - A small code cleanup: use kmemdup where appropriate.\n\n* tag \u0027for-v3.10\u0027 of git://git.infradead.org/users/cbou/linux-pstore:\n pstore/ram: Restore ecc information block\n pstore/ram: Allow specifying ecc parameters in platform data\n pstore/ram: Include ecc_size when calculating ecc_block\n pstore: Replace calls to kmalloc and memcpy with kmemdup\n" }, { "commit": "fb1c2d8294a60184a151ff12182446d7b930ed95", "tree": "4414bcf352831d84ff0ed40f694e96016ffb98cc", "parents": [ "35e5cbc0af240778e61113286c019837e06aeec6", "8bb9da943a62f4ffaabba1ad745990260fbb39df" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri May 03 11:41:39 2013 +0200" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri May 03 11:41:39 2013 +0200" }, "message": "Merge branch \u0027for_next\u0027 into for_linus\n" }, { "commit": "20a2078ce7705a6e0722ef5184336eb8657a58d8", "tree": "5b927c96516380aa0ecd68d8a609f7cd72120ad5", "parents": [ "0279b3c0ada1d78882f24acf94ac4595bd657a89", "307b9c022720f9de90d58e51743e01e9a42aec59" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 19:40:34 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 19:40:34 2013 -0700" }, "message": "Merge branch \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm updates from Dave Airlie:\n \"This is the main drm pull request for 3.10.\n\n Wierd bits:\n - OMAP drm changes required OMAP dss changes, in drivers/video, so I\n took them in here.\n - one more fbcon fix for font handover\n - VT switch avoidance in pm code\n - scatterlist helpers for gpu drivers - have acks from akpm\n\n Highlights:\n - qxl kms driver - driver for the spice qxl virtual GPU\n\n Nouveau:\n - fermi/kepler VRAM compression\n - GK110/nvf0 modesetting support.\n\n Tegra:\n - host1x core merged with 2D engine support\n\n i915:\n - vt switchless resume\n - more valleyview support\n - vblank fixes\n - modesetting pipe config rework\n\n radeon:\n - UVD engine support\n - SI chip tiling support\n - GPU registers initialisation from golden values.\n\n exynos:\n - device tree changes\n - fimc block support\n\n Otherwise:\n - bunches of fixes all over the place.\"\n\n* \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux: (513 commits)\n qxl: update to new idr interfaces.\n drm/nouveau: fix build with nv50-\u003envc0\n drm/radeon: fix handling of v6 power tables\n drm/radeon: clarify family checks in pm table parsing\n drm/radeon: consolidate UVD clock programming\n drm/radeon: fix UPLL_REF_DIV_MASK definition\n radeon: add bo tracking debugfs\n drm/radeon: add new richland pci ids\n drm/radeon: add some new SI PCI ids\n drm/radeon: fix scratch reg handling for UVD fence\n drm/radeon: allocate SA bo in the requested domain\n drm/radeon: fix possible segfault when parsing pm tables\n drm/radeon: fix endian bugs in atom_allocate_fb_scratch()\n OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found\n OMAPDSS: VENC: Add error handling for venc_probe_pdata\n OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata\n OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata\n OMAPDSS: DSI: Add error handling for dsi_probe_pdata\n OMAPDSS: SDI: Add error handling for sdi_probe_pdata\n OMAPDSS: DPI: Add error handling for dpi_probe_pdata\n ...\n" }, { "commit": "0279b3c0ada1d78882f24acf94ac4595bd657a89", "tree": "ba31505ea6581b840604493d0233857bb7ce58d1", "parents": [ "797994f81a8b2bdca2eecffa415c1e7a89a4f961", "f3002134158092178be81339ec5a22ff80e6c308" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:56:31 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:56:31 2013 -0700" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler fixes from Ingo Molnar:\n \"This fixes the cputime scaling overflow problems for good without\n having bad 32-bit overhead, and gets rid of the div64_u64_rem() helper\n as well.\"\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n Revert \"math64: New div64_u64_rem helper\"\n sched: Avoid prev-\u003estime underflow\n sched: Do not account bogus utime\n sched: Avoid cputime scaling overflow\n" }, { "commit": "797994f81a8b2bdca2eecffa415c1e7a89a4f961", "tree": "1383dc469c26ad37fdf960f682d9a48c782935c5", "parents": [ "c8d8566952fda026966784a62f324c8352f77430", "3862de1f6c442d53bd828d39f86d07d933a70605" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:53:12 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:53:12 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto update from Herbert Xu:\n\n - XTS mode optimisation for twofish/cast6/camellia/aes on x86\n\n - AVX2/x86_64 implementation for blowfish/twofish/serpent/camellia\n\n - SSSE3/AVX/AVX2 optimisations for sha256/sha512\n\n - Added driver for SAHARA2 crypto accelerator\n\n - Fix for GMAC when used in non-IPsec secnarios\n\n - Added generic CMAC implementation (including IPsec glue)\n\n - IP update for crypto/atmel\n\n - Support for more than one device in hwrng/timeriomem\n\n - Added Broadcom BCM2835 RNG driver\n\n - Misc fixes\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (59 commits)\n crypto: caam - fix job ring cleanup code\n crypto: camellia - add AVX2/AES-NI/x86_64 assembler implementation of camellia cipher\n crypto: serpent - add AVX2/x86_64 assembler implementation of serpent cipher\n crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher\n crypto: blowfish - add AVX2/x86_64 implementation of blowfish cipher\n crypto: tcrypt - add async cipher speed tests for blowfish\n crypto: testmgr - extend camellia test-vectors for camellia-aesni/avx2\n crypto: aesni_intel - fix Kconfig problem with CRYPTO_GLUE_HELPER_X86\n crypto: aesni_intel - add more optimized XTS mode for x86-64\n crypto: x86/camellia-aesni-avx - add more optimized XTS code\n crypto: cast6-avx: use new optimized XTS code\n crypto: x86/twofish-avx - use optimized XTS code\n crypto: x86 - add more optimized XTS-mode for serpent-avx\n xfrm: add rfc4494 AES-CMAC-96 support\n crypto: add CMAC support to CryptoAPI\n crypto: testmgr - add empty test vectors for null ciphers\n crypto: testmgr - add AES GMAC test vectors\n crypto: gcm - fix rfc4543 to handle async crypto correctly\n crypto: gcm - make GMAC work when dst and src are different\n hwrng: timeriomem - added devicetree hooks\n ...\n" }, { "commit": "99bece775f988a4ee21ad3db9fd413caf1704ff6", "tree": "5975cdcd92301e54dfe1424ec5d008898b5c9331", "parents": [ "736a2dd2571ac56b11ed95a7814d838d5311be04", "c39e8e4354ce4daf23336de5daa28a3b01f00aa6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:38:53 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:38:53 2013 -0700" }, "message": "Merge branch \u0027i2c/for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux\n\nPull i2c changes from Wolfram Sang:\n\n - an arbitration driver. While the driver is quite simple, it caused\n discussion if we need additional arbitration on top of the one\n specified in the I2C standard. Conclusion is that I accept a few\n generic mechanisms, but not very specific ones.\n\n - the core lost the detach_adapter() call. It has no users anymore and\n was in the way for other cleanups. attach_adapter() is sadly still\n there since there are users waiting to be converted.\n\n - the core gained a bus recovery infrastructure. I2C defines a way to\n recover if the data line is stalled. This mechanism is now in the\n core and drivers can now pass some data to make use of it.\n\n - bigger driver cleanups for designware, s3c2410\n\n - removing superfluous refcounting from drivers\n\n - removing Ben Dooks as second maintainer due to inactivity. Thanks\n for all your work so far, Ben!\n\n - bugfixes, feature additions, devicetree fixups, simplifications...\n\n* \u0027i2c/for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)\n i2c: xiic: must always write 16-bit words to TX_FIFO\n i2c: octeon: use HZ in timeout value\n i2c: octeon: Fix i2c fail problem when a process is terminated by a signal\n i2c: designware-pci: drop superfluous {get|put}_device\n i2c: designware-plat: drop superfluous {get|put}_device\n i2c: davinci: drop superfluous {get|put}_device\n MAINTAINERS: Ben Dooks is inactive regarding I2C\n i2c: mux: Add i2c-arb-gpio-challenge \u0027mux\u0027 driver\n i2c: at91: convert to dma_request_slave_channel_compat()\n i2c: mxs: do error checking and handling in PIO mode\n i2c: mxs: remove races in PIO code\n i2c-designware: switch to use runtime PM autosuspend\n i2c-designware: use usleep_range() in the busy-loop\n i2c-designware: enable/disable the controller properly\n i2c-designware: use dynamic adapter numbering on Lynxpoint\n i2c-designware-pci: use managed functions pcim_* and devm_*\n i2c-designware-pci: use dev_err() instead of printk()\n i2c-designware: move to managed functions (devm_*)\n i2c: remove CONFIG_HOTPLUG ifdefs\n i2c: s3c2410: Add SMBus emulation for block read\n ...\n" }, { "commit": "736a2dd2571ac56b11ed95a7814d838d5311be04", "tree": "de10d107025970c6e51d5b6faeba799ed4b9caae", "parents": [ "0b2e3b6bb4a415379f16e38fc92db42379be47a1", "01d779a14ef800b74684d9692add4944df052461" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:14:04 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:14:04 2013 -0700" }, "message": "Merge tag \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull virtio \u0026 lguest updates from Rusty Russell:\n \"Lots of virtio work which wasn\u0027t quite ready for last merge window.\n\n Plus I dived into lguest again, reworking the pagetable code so we can\n move the switcher page: our fixmaps sometimes take more than 2MB now...\"\n\nUgh. Annoying conflicts with the tcm_vhost -\u003e vhost_scsi rename.\nHopefully correctly resolved.\n\n* tag \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (57 commits)\n caif_virtio: Remove bouncing email addresses\n lguest: improve code readability in lg_cpu_start.\n virtio-net: fill only rx queues which are being used\n lguest: map Switcher below fixmap.\n lguest: cache last cpu we ran on.\n lguest: map Switcher text whenever we allocate a new pagetable.\n lguest: don\u0027t share Switcher PTE pages between guests.\n lguest: expost switcher_pages array (as lg_switcher_pages).\n lguest: extract shadow PTE walking / allocating.\n lguest: make check_gpte et. al return bool.\n lguest: assume Switcher text is a single page.\n lguest: rename switcher_page to switcher_pages.\n lguest: remove RESERVE_MEM constant.\n lguest: check vaddr not pgd for Switcher protection.\n lguest: prepare to make SWITCHER_ADDR a variable.\n virtio: console: replace EMFILE with EBUSY for already-open port\n virtio-scsi: reset virtqueue affinity when doing cpu hotplug\n virtio-scsi: introduce multiqueue support\n virtio-scsi: push vq lock/unlock into virtscsi_vq_done\n virtio-scsi: pass struct virtio_scsi to virtqueue completion function\n ...\n" }, { "commit": "0b2e3b6bb4a415379f16e38fc92db42379be47a1", "tree": "ac6af620793ecd5e4b1d5523e0f431d2d8a5ef66", "parents": [ "e95893004104054d49406fd108fefa3ddc054366", "664e9386bd05dbdfecfb28d6cf2fde983aabc65c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:02:32 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 14:02:32 2013 -0700" }, "message": "Merge tag \u0027vfio-for-v3.10\u0027 of git://github.com/awilliam/linux-vfio\n\nPull vfio updates from Alex Williamson:\n \"Changes include extension to support PCI AER notification to\n userspace, byte granularity of PCI config space and access to\n unarchitected PCI config space, better protection around IOMMU driver\n accesses, default file mode fix, and a few misc cleanups.\"\n\n* tag \u0027vfio-for-v3.10\u0027 of git://github.com/awilliam/linux-vfio:\n vfio: Set container device mode\n vfio: Use down_reads to protect iommu disconnects\n vfio: Convert container-\u003egroup_lock to rwsem\n PCI/VFIO: use pcie_flags_reg instead of access PCI-E Capabilities Register\n vfio-pci: Enable raw access to unassigned config space\n vfio-pci: Use byte granularity in config map\n vfio: make local function vfio_pci_intx_unmask_handler() static\n VFIO-AER: Vfio-pci driver changes for supporting AER\n VFIO: Wrapper for getting reference to vfio_device\n" }, { "commit": "e95893004104054d49406fd108fefa3ddc054366", "tree": "9bf38e91f4767d9842ba32839eda28a1ac1a971a", "parents": [ "5a148af66932c31814e263366094b5812210b501", "181c04a357bb791587c55a99362c2fdde2c64f18" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 13:29:14 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 13:29:14 2013 -0700" }, "message": "Merge tag \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n\nPull vhost cleanups and fixes from Michael Tsirkin:\n \"Here are vhost cleanups and fixes by Asias He and myself. They affect\n both vhost-net and vhost-scsi devices. They also *depend* on both\n net-next and target-pending, where the net and target commits these\n changes depend on are already merged. So merging through the common\n vhost tree.\"\n\n* tag \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:\n vhost_scsi: module rename\n tcm_vhost: header split up\n vhost: src file renames\n vhost: fix error handling in RESET_OWNER ioctl\n tcm_vhost: remove virtio-net.h dependency\n vhost: move per-vq net specific fields out to net\n tcm_vhost: document inflight ref-counting use\n vhost: move vhost-net zerocopy fields to net.c\n tcm_vhost: Wait for pending requests in vhost_scsi_flush()\n vhost: Allow device specific fields per vq\n" }, { "commit": "5a148af66932c31814e263366094b5812210b501", "tree": "c5155ae89d7109533b8b073631bd65a7dd394b9d", "parents": [ "99c6bcf46d2233d33e441834e958ed0bc22b190a", "54d5999d98f2ab36ad71b9ef4d82cf5f399205f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 10:16:16 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 10:16:16 2013 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc update from Benjamin Herrenschmidt:\n \"The main highlights this time around are:\n\n - A pile of addition POWER8 bits and nits, such as updated\n performance counter support (Michael Ellerman), new branch history\n buffer support (Anshuman Khandual), base support for the new PCI\n host bridge when not using the hypervisor (Gavin Shan) and other\n random related bits and fixes from various contributors.\n\n - Some rework of our page table format by Aneesh Kumar which fixes a\n thing or two and paves the way for THP support. THP itself will\n not make it this time around however.\n\n - More Freescale updates, including Altivec support on the new e6500\n cores, new PCI controller support, and a pile of new boards support\n and updates.\n\n - The usual batch of trivial cleanups \u0026 fixes\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)\n powerpc: Fix build error for book3e\n powerpc: Context switch the new EBB SPRs\n powerpc: Turn on the EBB H/FSCR bits\n powerpc: Replace CPU_FTR_BCTAR with CPU_FTR_ARCH_207S\n powerpc: Setup BHRB instructions facility in HFSCR for POWER8\n powerpc: Fix interrupt range check on debug exception\n powerpc: Update tlbie/tlbiel as per ISA doc\n powerpc: Print page size info during boot\n powerpc: print both base and actual page size on hash failure\n powerpc: Fix hpte_decode to use the correct decoding for page sizes\n powerpc: Decode the pte-lp-encoding bits correctly.\n powerpc: Use encode avpn where we need only avpn values\n powerpc: Reduce PTE table memory wastage\n powerpc: Move the pte free routines from common header\n powerpc: Reduce the PTE_INDEX_SIZE\n powerpc: Switch 16GB and 16MB explicit hugepages to a different page table format\n powerpc: New hugepage directory format\n powerpc: Don\u0027t truncate pgd_index wrongly\n powerpc: Don\u0027t hard code the size of pte page\n powerpc: Save DAR and DSISR in pt_regs on MCE\n ...\n" }, { "commit": "5522ae0b68421e2645303ff010e27afc5292e0ab", "tree": "200ec4895513e032a6ce9e844a457150f22b0708", "parents": [ "81b36be4c56299ac4c4c786908cb117ad232b62e" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed May 01 12:43:04 2013 -0500" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu May 02 11:58:41 2013 -0500" }, "message": "libceph: use slab cache for osd client requests\n\nCreate a slab cache to manage allocation of ceph_osdc_request\nstructures.\n\nThis resolves:\n http://tracker.ceph.com/issues/3926\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "99c6bcf46d2233d33e441834e958ed0bc22b190a", "tree": "25abf5e856bc0f08d75e623715eb5acc4d4de2b2", "parents": [ "97b1007a2924aaa9126398623f6755a8c3c6a616", "2fdfe1c26fb9f24cfdf124384abb35396ca2cd3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:38:16 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:38:16 2013 -0700" }, "message": "Merge tag \u0027multiplatform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC multiplatform updates from Olof Johansson:\n \"More multiplatform enablement for ARM platforms. The ones converted\n in this branch are:\n\n - bcm2835\n - cns3xxx\n - sirf\n - nomadik\n - msx\n - spear\n - tegra\n - ux500\n\n We\u0027re getting close to having most of them converted!\n\n One of the larger platforms remaining is Samsung Exynos, and there are\n a bunch of supporting patches in this merge window for it. There was\n a patch in this branch to a early version of multiplatform conversion,\n but it ended up being reverted due to need of more bake time. The\n revert commit is part of the branch since it would have required\n rebasing multiple dependent branches and they were stable by then\"\n\n* tag \u0027multiplatform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)\n mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms\n clocksource: nomadik-mtu: fix up clocksource/timer\n Revert \"ARM: exynos: enable multiplatform support\"\n ARM: SPEAr13xx: Fix typo \"ARCH_HAVE_CPUFREQ\"\n ARM: exynos: enable multiplatform support\n rtc: s3c: make header file local\n mtd: onenand/samsung: make regs-onenand.h file local\n thermal/exynos: remove unnecessary header inclusions\n mmc: sdhci-s3c: remove platform dependencies\n ARM: samsung: move mfc device definition to s5p-dev-mfc.c\n ARM: exynos: move debug-macro.S to include/debug/\n ARM: exynos: prepare for sparse IRQ\n ARM: exynos: introduce EXYNOS_ATAGS symbol\n ARM: tegra: build assembly files with -march\u003darmv7-a\n ARM: Push selects for TWD/SCU into machine entries\n ARM: ux500: build hotplug.o for ARMv7-a\n ARM: ux500: move to multiplatform\n ARM: ux500: make remaining headers local\n ARM: ux500: make irqs.h local to platform\n ARM: ux500: get rid of \u003cmach/[hardware|db8500-regs].h\u003e\n ...\n" }, { "commit": "97b1007a2924aaa9126398623f6755a8c3c6a616", "tree": "b65c6edb631256e64bb3c72f083fa1be048de097", "parents": [ "dfab34aa61a0f8c14a67d7b4c1dae28e57ba592d", "e0d20b69d3fa74a21ec363989612bddd58b930b8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:31:45 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:31:45 2013 -0700" }, "message": "Merge tag \u0027soc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC platform updates from Olof Johansson:\n \"This branch contains part 1 of the platform updates for 3.10. Among\n the highlights:\n\n - Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)\n - New support for CSR SiRFatlas6 SoCs\n - A handful of updates for NVidia T114 (a.k.a. Tegra 4)\n - A bunch of updates for the shmobile platforms\n - A handful of updates for davinci\n - A few updates for Qualcomm MSM\n - Plus a handful of other patches, defconfig updates, etc.\"\n\n* tag \u0027soc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)\n ARM: tegra: pm: fix build error w/o PM_SLEEP\n ARM: davinci: ensure global variables are declared\n ARM: davinci: sram.c: fix incorrect type in assignment\n ARM: davinci: da8xx dt: make file local symbols static\n ARM: davinci: da8xx: add remoteproc support\n ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries\n ARM: socfpga: Add clock entries into device tree\n ARM: socfpga: Enable soft reset\n ARM: EXYNOS: replace cpumask by the corresponding macro\n ARM: EXYNOS: handle properly the return values\n ARM: EXYNOS: factor out the idle states\n ARM: OMAP4: Enable fix for Cortex-A9 erratas\n ARM: OMAP2+: Export SoC information to userspace\n ARM: OMAP2+: SoC name and revision unification\n ARM: OMAP2+: Move common part of late init into common function\n ARM: tegra: pm: remove duplicated include from pm.c\n ARM: davinci: da850: override mmc DT node device name\n ARM: davinci: da850: add mmc DT entries\n mmc: davinci_mmc: add DT support\n ARM: SAMSUNG: check processor type before cache restoration in resume\n ...\n" }, { "commit": "dfab34aa61a0f8c14a67d7b4c1dae28e57ba592d", "tree": "581fd4d7394b838acb70c3c2e5d585b5b8a86b0d", "parents": [ "a7726350e06401929eac0aa0677a5467106565fc", "88cf9c5e494795a53ec360d0b38f483a6d4e508f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:28:03 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:28:03 2013 -0700" }, "message": "Merge tag \u0027dt-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC device-tree updates from Olof Johansson:\n \"Part 1 of device-tree updates for 3.10. The bulk of the churn in this\n branch is due to i.MX moving from C-defined pin control over to device\n tree, which is a one-time conversion that will allow greater\n flexibility down the road.\n\n Besides that, there\u0027s PCI-e bindings for Marvell mvebu platforms and a\n handful of cleanups to tegra due to the new include file functionality\n of the device tree compiler\"\n\n* tag \u0027dt-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (113 commits)\n arm: mvebu: PCIe Device Tree informations for Armada XP GP\n arm: mvebu: PCIe Device Tree informations for Armada 370 DB\n arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox\n arm: mvebu: PCIe Device Tree informations for Armada XP DB\n arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4\n arm: mvebu: add PCIe Device Tree informations for Armada XP\n arm: mvebu: add PCIe Device Tree informations for Armada 370\n ARM: sunxi: unify osc24M_fixed and osc24M\n arm: vt8500: Add SDHC support to WM8505 DT\n ARM: dts: Add a 64 bits version of the skeleton device tree\n ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig\n ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board\n ARM: mvebu: Add support for NOR flash device on Armada XP-GP board\n ARM: mvebu: Add Device Bus support for Armada 370/XP SoC\n ARM: dts: imx6dl-wandboard: Add USB Host support\n ARM: dts: imx51 cpu node\n ARM: dts: Add missing imx27-phytec-phycore dtb target\n ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module\n ARM: i.MX51: Add PATA support\n ARM: dts: Add initial support for Wandboard Dual-Lite\n ...\n" }, { "commit": "a7726350e06401929eac0aa0677a5467106565fc", "tree": "e189513e5014bdfccd73a3af731a6b57733743fa", "parents": [ "4d26aa305414dbb33b3c32fb205b68004cda8ffc", "afcf7924ecab726dab0227188783c4a40d9f0eec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:03:55 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 09:03:55 2013 -0700" }, "message": "Merge tag \u0027cleanup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC cleanup from Olof Johansson:\n \"Here is a collection of cleanup patches. Among the pieces that stand\n out are:\n\n - The deletion of h720x platforms\n - Split of at91 non-dt platforms to their own Kconfig file to keep\n them separate\n - General cleanups and refactoring of i.MX and MXS platforms\n - Some restructuring of clock tables for OMAP\n - Convertion of PMC driver for Tegra to dt-only\n - Some renames of sunxi -\u003e sun4i (Allwinner A10)\n - ... plus a bunch of other stuff that I haven\u0027t mentioned\"\n\n* tag \u0027cleanup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)\n ARM: i.MX: remove unused ARCH_* configs\n ARM i.MX53: remove platform ahci support\n ARM: sunxi: Rework the restart code\n irqchip: sunxi: Rename sunxi to sun4i\n irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro\n clocksource: sunxi: Rename sunxi to sun4i\n clocksource: sunxi: make use of CLKSRC_OF\n clocksource: sunxi: Cleanup the timer code\n ARM: at91: remove trailing semicolon from macros\n ARM: at91/setup: fix trivial typos\n ARM: EXYNOS: remove \"config EXYNOS_DEV_DRM\"\n ARM: EXYNOS: change the name of USB ohci header\n ARM: SAMSUNG: Remove unnecessary code for dma\n ARM: S3C24XX: Remove unused GPIO drive strength register definitions\n ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method\n ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412\n ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410\n ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards\n ARM: SAMSUNG: Fix typo \"CONFIG_SAMSUNG_DEV_RTC\"\n ARM: S5P64X0: Fix typo \"CONFIG_S5P64X0_SETUP_SDHCI\"\n ...\n" }, { "commit": "c032862fba51a3ca504752d3a25186b324c5ce83", "tree": "955dc2ba4ab3df76ecc2bb780ee84aca04967e8d", "parents": [ "fda76e074c7737fc57855dd17c762e50ed526052", "8700c95adb033843fc163d112b9d21d4fda78018" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu May 02 17:37:49 2013 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu May 02 17:54:19 2013 +0200" }, "message": "Merge commit \u00278700c95adb03\u0027 into timers/nohz\n\nThe full dynticks tree needs the latest RCU and sched\nupstream updates in order to fix some dependencies.\n\nMerge a common upstream merge point that has these\nupdates.\n\nConflicts:\n\tinclude/linux/perf_event.h\n\tkernel/rcutree.h\n\tkernel/rcutree_plugin.h\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "4ada8db38a44654446fe35ceb20a1972220e0f69", "tree": "e440f4a1605a8d74d3d583c3a8796d0a12c13792", "parents": [ "20b4fb485227404329e41ad15588afad3df23050" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Thu May 02 04:31:32 2013 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 02 07:34:58 2013 -0700" }, "message": "net: Restore NETIF_F_* bit ordering.\n\nCommit 8ad227ff89a7 (\"net: vlan: add 802.1ad support\") added some new\nNETIF_F_* features bits, but it added them in the middle of existing\nvalues.\n\nUserland depends upon the flag bits via the per-netdevice \u0027flags\u0027 sysfs\nfile.\n\nSo restore the previous ordering by adding the new flags at the end.\n\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "62d1f92e06aef9665d71ca7e986b3047ecf0b3c7", "tree": "d6c4e05d6196451f6f8540f1956c1e5274298ac0", "parents": [ "18932a28419596bc9403770f5d8a108c5433fe59" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Apr 25 14:06:05 2013 -0400" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu May 02 10:01:49 2013 -0400" }, "message": "drm/radeon: add new richland pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "18932a28419596bc9403770f5d8a108c5433fe59", "tree": "8a38e47d6b12979e7856fc2b9aaaed2434131b06", "parents": [ "581bc3a9f628dad6221536d9f37af0472c66bb92" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Apr 25 13:55:15 2013 -0400" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu May 02 10:01:48 2013 -0400" }, "message": "drm/radeon: add some new SI PCI ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "5975a2e0950291a6bfe9fd5880e7952ff87764be", "tree": "a27a2f6645a74ad756ac4a3eba21e1086beab25d", "parents": [ "d133b40f2cdd527af01090ffd6a041485d1a29b4" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Sat Apr 27 00:28:37 2013 +0000" }, "committer": { "name": "Alexander Graf", "email": "agraf@suse.de", "time": "Thu May 02 15:28:36 2013 +0200" }, "message": "KVM: PPC: Book3S: Add API for in-kernel XICS emulation\n\nThis adds the API for userspace to instantiate an XICS device in a VM\nand connect VCPUs to it. The API consists of a new device type for\nthe KVM_CREATE_DEVICE ioctl, a new capability KVM_CAP_IRQ_XICS, which\nfunctions similarly to KVM_CAP_IRQ_MPIC, and the KVM_IRQ_LINE ioctl,\nwhich is used to assert and deassert interrupt inputs of the XICS.\n\nThe XICS device has one attribute group, KVM_DEV_XICS_GRP_SOURCES.\nEach attribute within this group corresponds to the state of one\ninterrupt source. The attribute number is the same as the interrupt\nsource number.\n\nThis does not support irq routing or irqfd yet.\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nAcked-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nSigned-off-by: Alexander Graf \u003cagraf@suse.de\u003e\n" }, { "commit": "5012a3a384ad917b5c72a918607bd0cc64452ff8", "tree": "d014dbbbf78f061098a757b5a67c3212ed1259c1", "parents": [ "eb62b74e90790dbc1aca7ea2a7161e23de7c9065" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu May 02 03:50:34 2013 +0300" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu May 02 13:40:15 2013 +0300" }, "message": "tcm_vhost: header split up\n\nmove uapi parts to vhost.h\nmove .c private parts to .c itself\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nReviewed-by: Asias He \u003casias@redhat.com\u003e\nAcked-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "0c4513be3d01a854867446ee793748409cc0ebdf", "tree": "08648dc4fa179e33b82758b9927b46ea6ac1564f", "parents": [ "ae3e7f3aba4441eca7a1ff5cb3e089824318ba79", "83ed9c13e37e352b5a16caca01798c2766d91c29", "80f97f0f73b82444f714651ea053838d27779dca", "aa16bea929aed6ea854b55d2be8306a9fb40e694", "72ca55dbae815745403364ad915d912e92da5b9a" ], "author": { "name": "Joerg Roedel", "email": "joro@8bytes.org", "time": "Thu May 02 12:10:19 2013 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joro@8bytes.org", "time": "Thu May 02 12:10:19 2013 +0200" }, "message": "Merge branches \u0027iommu/fixes\u0027, \u0027x86/vt-d\u0027, \u0027x86/amd\u0027, \u0027ppc/pamu\u0027, \u0027core\u0027 and \u0027arm/tegra\u0027 into next\n" }, { "commit": "4f0dcb10cf1454a1c38aeaa04cb2757535e4905e", "tree": "1637c6a8961c95bdf02b7326cea79ca9b0b8e07f", "parents": [ "b536f69a3a589113992c32982bf2981c8225c9da" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Tue Apr 30 00:44:32 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:20:08 2013 -0700" }, "message": "libceph: create source file \"net/ceph/snapshot.c\"\n\nThis creates a new source file \"net/ceph/snapshot.c\" to contain\nutility routines related to ceph snapshot contexts. The main\nmotivation was to define ceph_create_snap_context() as a common way\nto create these structures, but I\u0027ve moved the definitions of\nceph_get_snap_context() and ceph_put_snap_context() there too.\n(The benefit of inlining those is very small, and I\u0027d rather\nkeep this collection of functions together.)\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "c3f56102f28d90946171ae51753bd417b003fd42", "tree": "7c96c0c4818fa655c6ba4fe61e7de2f1b6915a6a", "parents": [ "b587398a4ff6520753f9a58da294c80ee22443a5" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 19 15:34:50 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:19:17 2013 -0700" }, "message": "libceph: validate timespec conversions\n\nA ceph timespec contains 32-bit unsigned values for its seconds and\nnanoseconds components. For a standard timespec, both fields are\nsigned, and the seconds field is almost surely 64 bits.\n\nAdd some explicit casts so the fact that this conversion is taking\nplace is obvious. Also trip a bug if we ever try to put out of\nrange (negative or too big) values into a ceph timespec.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "b587398a4ff6520753f9a58da294c80ee22443a5", "tree": "3b484127a6c612977b8656d4506ef62a7d277bd7", "parents": [ "a9e8ba2cb3eb64cf6cfa509d096ef79bc1c827ae" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 19 15:34:50 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:19:16 2013 -0700" }, "message": "libceph: add signed type limits\n\nFlesh out the limits defined in \u003clinux/ceph/decode.h\u003e to include the\nmaximum and minimum values for signed type S8, S16, S32, and S64.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "6c57b5545d46e276381a15a59283c984cf3f94e3", "tree": "426b0aae89ea8f70df73fbd607d829fd8ed92f81", "parents": [ "a51b272e9e99f912e8e07d4c9f58c1d433afea7c" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 19 15:34:49 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:19:06 2013 -0700" }, "message": "libceph: support pages for class request data\n\nAdd the ability to provide an array of pages as outbound request\ndata for object class method calls.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "49719778bfa5371ec9b5a7d989bb29000e3ac5df", "tree": "89e02e651d419c04b18bc8eb419576f0132769b4", "parents": [ "863c7eb590c154c7c2cfac40914f5bedcad1a166" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Feb 11 12:33:24 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:19:00 2013 -0700" }, "message": "libceph: support raw data requests\n\nAllow osd request ops that aren\u0027t otherwise structured (not class,\nextent, or watch ops) to specify \"raw\" data to be used to hold\nincoming data for the op. Make use of this capability for the osd\nSTAT op.\n\nPrefix the name of the private function osd_req_op_init() with \"_\",\nand expose a new function by that (earlier) name whose purpose is to\ninitialize osd ops with (only) implied data.\n\nFor now we\u0027ll just support the use of a page array for an osd op\nwith incoming raw data.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "406e2c9f9286fc93ae2191a7abf477dea05aadc9", "tree": "121034644585b0171bfd436d77fe988ad1704753", "parents": [ "ac7f29bf2ee4a526efb68f947475ff77a43028de" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Apr 15 14:50:36 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:58 2013 -0700" }, "message": "libceph: kill off osd data write_request parameters\n\nIn the incremental move toward supporting distinct data items in an\nosd request some of the functions had \"write_request\" parameters to\nindicate, basically, whether the data belonged to in_data or the\nout_data. Now that we maintain the data fields in the op structure\nthere is no need to indicate the direction, so get rid of the\n\"write_request\" parameters.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "26be88087ae8a04a5b576aa2f490597b649fc132", "tree": "de16ba5b5b9fe678546fe82f0d6801a2ef441b0d", "parents": [ "7d7d51ce14fde491a6d0677d9bded9b3bd0d21d9" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Apr 15 11:20:42 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:52 2013 -0700" }, "message": "libceph: change how \"safe\" callback is used\n\nAn osd request currently has two callbacks. They inform the\ninitiator of the request when we\u0027ve received confirmation for the\ntarget osd that a request was received, and when the osd indicates\nall changes described by the request are durable.\n\nThe only time the second callback is used is in the ceph file system\nfor a synchronous write. There\u0027s a race that makes some handling of\nthis case unsafe. This patch addresses this problem. The error\nhandling for this callback is also kind of gross, and this patch\nchanges that as well.\n\nIn ceph_sync_write(), if a safe callback is requested we want to add\nthe request on the ceph inode\u0027s unsafe items list. Because items on\nthis list must have their tid set (by ceph_osd_start_request()), the\nrequest added *after* the call to that function returns. The\nproblem with this is that there\u0027s a race between starting the\nrequest and adding it to the unsafe items list; the request may\nalready be complete before ceph_sync_write() even begins to put it\non the list.\n\nTo address this, we change the way the \"safe\" callback is used.\nRather than just calling it when the request is \"safe\", we use it to\nnotify the initiator the bounds (start and end) of the period during\nwhich the request is *unsafe*. So the initiator gets notified just\nbefore the request gets sent to the osd (when it is \"unsafe\"), and\nagain when it\u0027s known the results are durable (it\u0027s no longer\nunsafe). The first call will get made in __send_request(), just\nbefore the request message gets sent to the messenger for the first\ntime. That function is only called by __send_queued(), which is\nalways called with the osd client\u0027s request mutex held.\n\nWe then have this callback function insert the request on the ceph\ninode\u0027s unsafe list when we\u0027re told the request is unsafe. This\nwill avoid the race because this call will be made under protection\nof the osd client\u0027s request mutex. It also nicely groups the setup\nand cleanup of the state associated with managing unsafe requests.\n\nThe name of the \"safe\" callback field is changed to \"unsafe\" to\nbetter reflect its new purpose. It has a Boolean \"unsafe\" parameter\nto indicate whether the request is becoming unsafe or is now safe.\nBecause the \"msg\" parameter wasn\u0027t used, we drop that.\n\nThis resolves the original problem reportedin:\n http://tracker.ceph.com/issues/4706\n\nReported-by: Yan, Zheng \u003czheng.z.yan@intel.com\u003e\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Yan, Zheng \u003czheng.z.yan@intel.com\u003e\nReviewed-by: Sage Weil \u003csage@inktank.com\u003e\n" }, { "commit": "04017e29bbcf0673d8a6af616c56e395d05f5971", "tree": "09bd1c613cf85e4410755e2931cf3c21fa5da488", "parents": [ "90af36022aecdeeb1b9c0755461187de717c86dd" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 14:46:02 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:35 2013 -0700" }, "message": "libceph: make method call data be a separate data item\n\nRight now the data for a method call is specified via a pointer and\nlength, and it\u0027s copied--along with the class and method name--into\na pagelist data item to be sent to the osd. Instead, encode the\ndata in a data item separate from the class and method names.\n\nThis will allow large amounts of data to be supplied to methods\nwithout copying. Only rbd uses the class functionality right now,\nand when it really needs this it will probably need to use a page\narray rather than a page list. But this simple implementation\ndemonstrates the functionality on the osd client, and that\u0027s enough\nfor now.\n\nThis resolves:\n http://tracker.ceph.com/issues/4104\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "90af36022aecdeeb1b9c0755461187de717c86dd", "tree": "275c653789249a7499165cb36ddb608b5b4bc6df", "parents": [ "ca8b3a69174b04376722672d7dd6b666a7f17c50" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 14:46:01 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:34 2013 -0700" }, "message": "libceph: add, don\u0027t set data for a message\n\nChange the names of the functions that put data on a pagelist to\nreflect that we\u0027re adding to whatever\u0027s already there rather than\njust setting it to the one thing. Currently only one data item is\never added to a message, but that\u0027s about to change.\n\nThis resolves:\n http://tracker.ceph.com/issues/2770\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "ca8b3a69174b04376722672d7dd6b666a7f17c50", "tree": "68c78a604897ae23ff10d971d511b8e2690e2f58", "parents": [ "5240d9f95dfe0f0701b35fbff1cb5b70825ad23f" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 14:46:01 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:33 2013 -0700" }, "message": "libceph: implement multiple data items in a message\n\nThis patch adds support to the messenger for more than one data item\nin its data list.\n\nA message data cursor has two more fields to support this:\n - a count of the number of bytes left to be consumed across\n all data items in the list, \"total_resid\"\n - a pointer to the head of the list (for validation only)\n\nThe cursor initialization routine has been split into two parts: the\nouter one, which initializes the cursor for traversing the entire\nlist of data items; and the inner one, which initializes the cursor\nto start processing a single data item.\n\nWhen a message cursor is first initialized, the outer initialization\nroutine sets total_resid to the length provided. The data pointer\nis initialized to the first data item on the list. From there, the\ninner initialization routine finishes by setting up to process the\ndata item the cursor points to.\n\nAdvancing the cursor consumes bytes in total_resid. If the resid\nfield reaches zero, it means the current data item is fully\nconsumed. If total_resid indicates there is more data, the cursor\nis advanced to point to the next data item, and then the inner\ninitialization routine prepares for using that. (A check is made at\nthis point to make sure we don\u0027t wrap around the front of the list.)\n\nThe type-specific init routines are modified so they can be given a\nlength that\u0027s larger than what the data item can support. The resid\nfield is initialized to the smaller of the provided length and the\nlength of the entire data item.\n\nWhen total_resid reaches zero, we\u0027re done.\n\nThis resolves:\n http://tracker.ceph.com/issues/3761\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "5240d9f95dfe0f0701b35fbff1cb5b70825ad23f", "tree": "570f8f274803e56bb86e43180b230f3d70a61649", "parents": [ "8ae4f4f5c056150d5480710ab356801e84d01a3d" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Mar 14 14:09:06 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:32 2013 -0700" }, "message": "libceph: replace message data pointer with list\n\nIn place of the message data pointer, use a list head which links\nthrough message data items. For now we only support a single entry\non that list.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "8ae4f4f5c056150d5480710ab356801e84d01a3d", "tree": "8e468e214e55cb4f6f0858d127bc7f5cfa5569fb", "parents": [ "36153ec9dd6287d7cedf6afb51453c445d946cee" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Mar 14 14:09:06 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:30 2013 -0700" }, "message": "libceph: have cursor point to data\n\nRather than having a ceph message data item point to the cursor it\u0027s\nassociated with, have the cursor point to a data item. This will\nallow a message cursor to be used for more than one data item.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "36153ec9dd6287d7cedf6afb51453c445d946cee", "tree": "71f690eef5012f3d3c5df2723cc776701d57dc84", "parents": [ "c851c49591ebf000c610711e39eea7da5ff05b21" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Mar 14 14:09:06 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:29 2013 -0700" }, "message": "libceph: move cursor into message\n\nA message will only be processing a single data item at a time, so\nthere\u0027s no need for each data item to have its own cursor.\n\nMove the cursor embedded in the message data structure into the\nmessage itself. To minimize the impact, keep the data-\u003ecursor\nfield, but make it be a pointer to the cursor in the message.\n\nMove the definition of ceph_msg_data above ceph_msg_data_cursor so\nthe cursor can point to the data without a forward definition rather\nthan vice-versa.\n\nThis and the upcoming patches are part of:\n http://tracker.ceph.com/issues/3761\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "c851c49591ebf000c610711e39eea7da5ff05b21", "tree": "917451c570fae240e1902085a75d7ff970deb981", "parents": [ "f759ebb968dbf185fc079dd2e824b1aa3a3d71aa" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 14:46:01 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:28 2013 -0700" }, "message": "libceph: record bio length\n\nThe bio is the only data item type that doesn\u0027t record its full\nlength. Fix that.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "ea96571f7b865edaf1acd472e6f2cddc9fb67892", "tree": "f77ecb81c70e9e63ab875b53c2954780f70ddb84", "parents": [ "5476492fba9fd0b4118aacf5b924dd29b8cca56c" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 14:46:01 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:26 2013 -0700" }, "message": "libceph: fix possible CONFIG_BLOCK build problem\n\nThis patch:\n 15a0d7b libceph: record message data length\ndid not enclose some bio-specific code inside CONFIG_BLOCK as\nit should have. Fix that.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "5476492fba9fd0b4118aacf5b924dd29b8cca56c", "tree": "e012b546f1f0d33bd016f8af278f79e4ae1df4da", "parents": [ "ec9123c56787fa7fb2608f05b19d21c5e1912d87" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 01:27:12 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:25 2013 -0700" }, "message": "libceph: kill off osd request r_data_in and r_data_out\n\nFinally! Convert the osd op data pointers into real structures, and\nmake the switch over to using them instead of having all ops share\nthe in and/or out data structures in the osd request.\n\nSet up a new function to traverse the set of ops and release any\ndata associated with them (pages).\n\nThis and the patches leading up to it resolve:\n http://tracker.ceph.com/issues/4657\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "ec9123c56787fa7fb2608f05b19d21c5e1912d87", "tree": "84eb73a2dbb596c7aba369d42cd37146330fd2d4", "parents": [ "a4ce40a9a7c1053ac2a41cf64255e44e356e5522" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 01:27:12 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:24 2013 -0700" }, "message": "libceph: set the data pointers when encoding ops\n\nStill using the osd request r_data_in and r_data_out pointer, but\nwe\u0027re basically only referring to it via the data pointers in the\nosd ops. And we\u0027re transferring that information to the request\nor reply message only when the op indicates it\u0027s needed, in\nosd_req_encode_op().\n\nTo avoid a forward reference, ceph_osdc_msg_data_set() was moved up\nin the file.\n\nDon\u0027t bother calling ceph_osd_data_init(), in ceph_osd_alloc(),\nbecause the ops array will already be zeroed anyway.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "a4ce40a9a7c1053ac2a41cf64255e44e356e5522", "tree": "de1aeb42625f19f6cfe8806db333ec853de0f5b7", "parents": [ "39b44cbe86db42e70693787b2ede81c309925d0b" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 01:27:12 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:23 2013 -0700" }, "message": "libceph: combine initializing and setting osd data\n\nThis ends up being a rather large patch but what it\u0027s doing is\nsomewhat straightforward.\n\nBasically, this is replacing two calls with one. The first of the\ntwo calls is initializing a struct ceph_osd_data with data (either a\npage array, a page list, or a bio list); the second is setting an\nosd request op so it associates that data with one of the op\u0027s\nparameters. In place of those two will be a single function that\ninitializes the op directly.\n\nThat means we sort of fan out a set of the needed functions:\n - extent ops with pages data\n - extent ops with pagelist data\n - extent ops with bio list data\nand\n - class ops with page data for receiving a response\n\nWe also have define another one, but it\u0027s only used internally:\n - class ops with pagelist data for request parameters\n\nNote that we *still* haven\u0027t gotten rid of the osd request\u0027s\nr_data_in and r_data_out fields. All the osd ops refer to them for\ntheir data. For now, these data fields are pointers assigned to the\nappropriate r_data_* field when these new functions are called.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "5f562df5f59340eae4272501b974903f48d2ad92", "tree": "6dccede3254a6878526da788febbddd8eac27462", "parents": [ "2169238dd3a01bc06670fb9c85635cbe97338ff8" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Apr 05 01:27:12 2013 -0500" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:18:19 2013 -0700" }, "message": "libceph: format class info at init time\n\nAn object class method is formatted using a pagelist which contains\nthe class name, the method name, and the data concatenated into an\nosd request\u0027s outbound data.\n\nCurrently when a class op is initialized in osd_req_op_cls_init(),\nthe lengths of and pointers to these three items are recorded.\nLater, when the op is getting formatted into the request message, a\nnew pagelist is created and that is when these items get copied into\nthe pagelist.\n\nThis patch makes it so the pagelist to hold these items is created\nwhen the op is initialized instead.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" } ], "next": "c99d2d4abb6c405ef52e9bc1da87b382b8f41739" }