)]}' { "log": [ { "commit": "0ad50c3896afbb3c103409a18260e601b87a744c", "tree": "3a59c1e90b3ee62daf18bc9689cf454a31f164be", "parents": [ "918854a65e856574523d94763ef2a2b48ad55a25" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Dec 17 16:01:45 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:18 2012 -0800" }, "message": "compat: generic compat_sys_sched_rr_get_interval() implementation\n\nThis function is used by sparc, powerpc tile and arm64 for compat support.\n The patch adds a generic implementation with a wrapper for PowerPC to do\nthe u32-\u003eint sign extension.\n\nThe reason for a single patch covering powerpc, tile, sparc and arm64 is\nto keep it bisectable, otherwise kernel building may fail with mismatched\nfunction declarations.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e [for tile]\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8ebe34731a0d1a9d89b536430afd98d0fadec99b", "tree": "bb378645318ce7c9b1b5a389a5e522835916cbed", "parents": [ "9390ef0c85fd065f01045fef708b046c98cda04c" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Dec 17 16:01:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:18 2012 -0800" }, "message": "percpu_rw_semaphore: add lockdep annotations\n\nAdd lockdep annotations. Not only this can help to find the potential\nproblems, we do not want the false warnings if, say, the task takes two\ndifferent percpu_rw_semaphore\u0027s for reading. IOW, at least -\u003erw_sem\nshould not use a single class.\n\nThis patch exposes this internal lock to lockdep so that it represents the\nwhole percpu_rw_semaphore. This way we do not need to add another \"fake\"\n-\u003elockdep_map and lock_class_key. More importantly, this also makes the\noutput from lockdep much more understandable if it finds the problem.\n\nIn short, with this patch from lockdep pov percpu_down_read() and\npercpu_up_read() acquire/release -\u003erw_sem for reading, this matches the\nactual semantics. This abuses __up_read() but I hope this is fine and in\nfact I\u0027d like to have down_read_no_lockdep() as well,\npercpu_down_read_recursive_readers() will need it.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Michal Marek \u003cmmarek@suse.cz\u003e\nCc: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9390ef0c85fd065f01045fef708b046c98cda04c", "tree": "22ae17e0d07a9386cd494a869f60df757cfc56d7", "parents": [ "a1fd3e24d8a484b3265a6d485202afe093c058f3" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Dec 17 16:01:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:18 2012 -0800" }, "message": "percpu_rw_semaphore: kill -\u003ewriter_mutex, add -\u003ewrite_ctr\n\npercpu_rw_semaphore-\u003ewriter_mutex was only added to simplify the initial\nrewrite, the only thing it protects is clear_fast_ctr() which otherwise\ncould be called by multiple writers. -\u003erw_sem is enough to serialize the\nwriters.\n\nKill this mutex and add \"atomic_t write_ctr\" instead. The writers\nincrement/decrement this counter, the readers check it is zero instead of\nmutex_is_locked().\n\nMove atomic_add(clear_fast_ctr(), slow_read_ctr) under down_write() to\navoid the race with other writers. This is a bit sub-optimal, only the\nfirst writer needs this and we do not need to exclude the readers at this\nstage. But this is simple, we do not want another internal lock until we\nadd more features.\n\nAnd this speeds up the write-contended case. Before this patch the racing\nwriters sleep in synchronize_sched_expedited() sequentially, with this\npatch multiple synchronize_sched_expedited\u0027s can \"overlap\" with each\nother. Note: we can do more optimizations, this is only the first step.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Michal Marek \u003cmmarek@suse.cz\u003e\nCc: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1fd3e24d8a484b3265a6d485202afe093c058f3", "tree": "472f6480a81abbc04b27eccdb798d80b1685bee0", "parents": [ "53809751ac230a3611b5cdd375f3389f3207d471" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Dec 17 16:01:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:18 2012 -0800" }, "message": "percpu_rw_semaphore: reimplement to not block the readers unnecessarily\n\nCurrently the writer does msleep() plus synchronize_sched() 3 times to\nacquire/release the semaphore, and during this time the readers are\nblocked completely. Even if the \"write\" section was not actually started\nor if it was already finished.\n\nWith this patch down_write/up_write does synchronize_sched() twice and\ndown_read/up_read are still possible during this time, just they use the\nslow path.\n\npercpu_down_write() first forces the readers to use rw_semaphore and\nincrement the \"slow\" counter to take the lock for reading, then it\ntakes that rw_semaphore for writing and blocks the readers.\n\nAlso. With this patch the code relies on the documented behaviour of\nsynchronize_sched(), it doesn\u0027t try to pair synchronize_sched() with\nbarrier.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nReviewed-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b18888ab256f05626193be955a7a03f01d676f8c", "tree": "50e0839fc250c1766138b47f9d8750124ed938aa", "parents": [ "0edd807dc96522d9a8e8b5298552cd8adf810cc5" ], "author": { "name": "Andy Shevchenko", "email": "andriy.shevchenko@linux.intel.com", "time": "Mon Dec 17 16:01:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:17 2012 -0800" }, "message": "string: introduce helper to get base file name from given path\n\nThere are several places in the kernel that use functionality like\nbasename(3) with the exception: in case of \u0027/foo/bar/\u0027 we expect to get an\nempty string. Let\u0027s do it common helper for them.\n\nSigned-off-by: Andy Shevchenko \u003candriy.shevchenko@linux.intel.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: YAMANE Toshiaki \u003cyamanetoshi@gmail.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "762a936fba7bd9225ca9a96e4860f6969b6b5670", "tree": "afb3f60c95eb8d21573e80683c61bb43ebb58ffe", "parents": [ "fb08cd9b111c6a922f468ef5e33acc67eb91d40b" ], "author": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Mon Dec 17 16:01:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:16 2012 -0800" }, "message": "backlight: add of_find_backlight_by_node()\n\nThis function finds the struct backlight_device for a given device tree\nnode. A dummy function is provided so that it safely compiles out if OF\nsupport is disabled.\n\n[akpm@linux-foundation.org: Don\u0027t use IS_ENABLED(CONFIG_OF)]\nSigned-off-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nAcked-by: Jingoo Han \u003cjg1.han@samsung.com\u003e\nReviewed-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nReviewed-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Jingoo Han \u003cjg1.han@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8cc9764c9c7d01a6e2c3ddac8f0ac7716be01868", "tree": "29a1e895f720dcd8ee969df19ba089401e870f8b", "parents": [ "05a5d4d2640dfe934ec78ba577dd21baccb11aa6" ], "author": { "name": "Kim, Milo", "email": "Milo.Kim@ti.com", "time": "Mon Dec 17 16:00:43 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:16 2012 -0800" }, "message": "drivers/video/backlight/lp855x_bl.c: use generic PWM functions\n\nThe LP855x family devices support the PWM input for the backlight control.\n Period of the PWM is configurable in the platform side. Platform\nspecific functions are unnecessary anymore because generic PWM functions\nare used inside the driver.\n\n(PWM input mode)\nTo set the brightness, new lp855x_pwm_ctrl() is used.\nIf a PWM device is not allocated, devm_pwm_get() is called.\nThe PWM consumer name is from the chip name such as \u0027lp8550\u0027 and \u0027lp8556\u0027.\nTo get the brightness value, no additional handling is required.\nJust the value of \u0027props.brightness\u0027 is returned.\n\nIf the PWM driver is not ready while initializing the LP855x driver, it\u0027s\nOK. The PWM device can be retrieved later, when the brightness value is\nchanged.\n\nDocumentation is updated with an example.\n\n[akpm@linux-foundation.org: coding-style simplification, per Thierry]\nSigned-off-by: Milo(Woogyom) Kim \u003cmilo.kim@ti.com\u003e\nCc: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Bryan Wu \u003cbryan.wu@canonical.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "965c8e59cfcf845ecde2265a1d1bfee5f011d302", "tree": "22758a99b4ecb475750966d5202200dc0e89876c", "parents": [ "c0f041602c33bae10b8e321c49024490d03ced3d" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon Dec 17 15:59:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:12 2012 -0800" }, "message": "lseek: the \"whence\" argument is called \"whence\"\n\nBut the kernel decided to call it \"origin\" instead. Fix most of the\nsites.\n\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7929d407e47fbf843fe1337fd95ed57785ae5e9d", "tree": "5c94b07b1d60cbf2499ec59f89c61a2113ea753f", "parents": [ "fbb97d87802247a7bb32a207a8275372e79e6b88" ], "author": { "name": "Matthew Leach", "email": "matthew@mattleach.net", "time": "Mon Dec 17 15:59:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 17:15:12 2012 -0800" }, "message": "include/linux/init.h: use the stringify operator for the __define_initcall macro\n\nCurrently the __define_initcall() macro takes three arguments, fn, id and\nlevel. The level argument is exactly the same as the id argument but\nwrapped in quotes. To overcome this need to specify three arguments to\nthe __define_initcall macro, where one argument is the stringification of\nanother, we can just use the stringification macro instead.\n\nSigned-off-by: Matthew Leach \u003cmatthew@mattleach.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9360b53661a2c7754517b2925580055bacc8ec38", "tree": "58a0c6f266524247baf87d21bf41ac3bc395cf8a", "parents": [ "fa4c95bfdb85d568ae327d57aa33a4f55bab79c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 11:29:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 11:29:09 2012 -0800" }, "message": "Revert \"bdi: add a user-tunable cpu_list for the bdi flusher threads\"\n\nThis reverts commit 8fa72d234da9b6b473bbb1f74d533663e4996e6b.\n\nPeople disagree about how this should be done, so let\u0027s revert this for\nnow so that nobody starts using the new tuning interface. Tejun is\nthinking about a more generic interface for thread pool affinity.\n\nRequested-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "60da5bf47dd3d301a1d3bd4f0a4b9e29a184515c", "tree": "30de83370440aae5350d9ab3fbe6583abd439ee8", "parents": [ "3c2e81ef344a90bb0a39d84af6878b4aeff568a2", "cbae8d45d61f3a8c155caf267d01e5e0f0b2f4b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 08:27:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 08:27:23 2012 -0800" }, "message": "Merge branch \u0027for-3.8/core\u0027 of git://git.kernel.dk/linux-block\n\nPull block layer core updates from Jens Axboe:\n \"Here are the core block IO bits for 3.8. The branch contains:\n\n - The final version of the surprise device removal fixups from Bart.\n\n - Don\u0027t hide EFI partitions under advanced partition types. It\u0027s\n fairly wide spread these days. This is especially dangerous for\n systems that have both msdos and efi partition tables, where you\n want to keep them in sync.\n\n - Cleanup of using -1 instead of the proper NUMA_NO_NODE\n\n - Export control of bdi flusher thread CPU mask and default to using\n the home node (if known) from Jeff.\n\n - Export unplug tracepoint for MD.\n\n - Core improvements from Shaohua. Reinstate the recursive merge, as\n the original bug has been fixed. Add plugging for discard and also\n fix a problem handling non pow-of-2 discard limits.\n\n There\u0027s a trivial merge in block/blk-exec.c due to a fix that went\n into 3.7-rc at a later point than -rc4 where this is based.\"\n\n* \u0027for-3.8/core\u0027 of git://git.kernel.dk/linux-block:\n block: export block_unplug tracepoint\n block: add plug for blkdev_issue_discard\n block: discard granularity might not be power of 2\n deadline: Allow 0ms deadline latency, increase the read speed\n partitions: enable EFI/GPT support by default\n bsg: Remove unused function bsg_goose_queue()\n block: Make blk_cleanup_queue() wait until request_fn finished\n block: Avoid scheduling delayed work on a dead queue\n block: Avoid that request_fn is invoked on a dead queue\n block: Let blk_drain_queue() caller obtain the queue lock\n block: Rename queue dead flag\n bdi: add a user-tunable cpu_list for the bdi flusher threads\n block: use NUMA_NO_NODE instead of -1\n block: recursive merge requests\n block CFQ: avoid moving request to different queue\n" }, { "commit": "3c2e81ef344a90bb0a39d84af6878b4aeff568a2", "tree": "bd8c8b23466174899d2fe4d35af6e1e838edb068", "parents": [ "221392c3ad0432e39fd74a349364f66cb0ed78f6", "55bde6b1442fed8af67b92d21acce67db454c9f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 08:26:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 08:26:17 2012 -0800" }, "message": "Merge branch \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull DRM updates from Dave Airlie:\n \"This is the one and only next pull for 3.8, we had a regression we\n found last week, so I was waiting for that to resolve itself, and I\n ended up with some Intel fixes on top as well.\n\n Highlights:\n - new driver: nvidia tegra 20/30/hdmi support\n - radeon: add support for previously unused DMA engines, more HDMI\n regs, eviction speeds ups and fixes\n - i915: HSW support enable, agp removal on GEN6, seqno wrapping\n - exynos: IPP subsystem support (image post proc), HDMI\n - nouveau: display class reworking, nv20-\u003e40 z compression\n - ttm: start of locking fixes, rcu usage for lookups,\n - core: documentation updates, docbook integration, monotonic clock\n usage, move from connector to object properties\"\n\n* \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux: (590 commits)\n drm/exynos: add gsc ipp driver\n drm/exynos: add rotator ipp driver\n drm/exynos: add fimc ipp driver\n drm/exynos: add iommu support for ipp\n drm/exynos: add ipp subsystem\n drm/exynos: support device tree for fimd\n radeon: fix regression with eviction since evict caching changes\n drm/radeon: add more pedantic checks in the CP DMA checker\n drm/radeon: bump version for CS ioctl support for async DMA\n drm/radeon: enable the async DMA rings in the CS ioctl\n drm/radeon: add VM CS parser support for async DMA on cayman/TN/SI\n drm/radeon/kms: add evergreen/cayman CS parser for async DMA (v2)\n drm/radeon/kms: add 6xx/7xx CS parser for async DMA (v2)\n drm/radeon: fix htile buffer size computation for command stream checker\n drm/radeon: fix fence locking in the pageflip callback\n drm/radeon: make indirect register access concurrency-safe\n drm/radeon: add W|RREG32_IDX for MM_INDEX|DATA based mmio accesss\n drm/exynos: support extended screen coordinate of fimd\n drm/exynos: fix x, y coordinates for right bottom pixel\n drm/exynos: fix fb offset calculation for plane\n ...\n" }, { "commit": "2dfea3803dcf70983d14ce1dcbb3e97a7459a28b", "tree": "59bffc7389ff554585f79d7cc06021790dc2b317", "parents": [ "aed606e3bc1f10753254db308d3fd8c053c41328", "1881b68b8961a86d40c3c5c205e533515a2dc9c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 18:55:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 18:55:20 2012 -0800" }, "message": "Merge tag \u0027mfd-3.8-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\nPull MFS update from Samuel Ortiz:\n \"This is the MFD patch set for the 3.8 merge window.\n\n We have several new drivers, most of the time coming with their sub\n devices drivers:\n\n - Austria Microsystem\u0027s AS3711\n - Nano River\u0027s viperboard\n - TI\u0027s TPS80031, AM335x TS/ADC,\n - Realtek\u0027s MMC/memstick card reader\n - Nokia\u0027s retu\n\n We also got some notable cleanups and improvements:\n\n - tps6586x got converted to IRQ domains.\n - tps65910 and tps65090 moved to the regmap IRQ API.\n - STMPE is now Device Tree aware.\n - A general twl6040 and twl-core cleanup, with moves to the regmap\n I/O and IRQ APIs and a conversion to the recently added PWM\n framework.\n - sta2x11 gained regmap support.\n\n Then the rest is mostly tiny cleanups and fixes, among which we have\n Mark\u0027s wm5xxx and wm8xxx patchset.\"\n\nFar amount of annoying but largely trivial conflicts. Many due to\n__devinit/exit removal, others due to one or two of the new drivers also\nhaving come in through another tree.\n\n* tag \u0027mfd-3.8-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits)\n mfd: tps6507x: Convert to devm_kzalloc\n mfd: stmpe: Update DT support for stmpe driver\n mfd: wm5102: Add readback of DSP status 3 register\n mfd: arizona: Log if we fail to create the primary IRQ domain\n mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ\n mfd: tps80031: Add terminating entry for tps80031_id_table\n mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask()\n mfd: wm5102: Add tuning for revision B\n mfd: arizona: Defer patch initialistation until after first device boot\n mfd: tps65910: Fix wrong ack_base register\n mfd: tps65910: Remove unused data\n mfd: stmpe: Get rid of irq_invert_polarity\n mfd: ab8500-core: Fix invalid free of devm_ allocated data\n mfd: wm5102: Mark DSP memory regions as volatile\n mfd: wm5102: Correct default for LDO1_CONTROL_2\n mfd: arizona: Register haptics devices\n mfd: wm8994: Make current device behaviour the default\n mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ\n mfd: Fix stmpe.c build when OF is not enabled\n mfd: jz4740-adc: Use devm_kzalloc\n ...\n" }, { "commit": "9b690c3d56ce15dd265b6398f9d8d58c29c17032", "tree": "56477d1f4e596011f17d1c64e8597613330e5439", "parents": [ "36cd5c19c3fe8291fac45a262c44c00bd14b531a", "af51a9f1848ff50079a10def56a2c064f326af22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 17:39:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 17:39:14 2012 -0800" }, "message": "Merge tag \u0027stable/for-linus-3.8-rc0-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb\n\nPull swiotlb update from Konrad Rzeszutek Wilk:\n \"Feature:\n - Use dma addresses instead of the virt_to_phys and vice versa\n functions.\n\n Remove the multitude of phys_to_virt/virt_to_phys calls and instead\n operate on the physical addresses instead of virtual in many of the\n internal functions. This does provide a speed up in interrupt\n handlers that do DMA operations and use SWIOTLB.\"\n\n* tag \u0027stable/for-linus-3.8-rc0-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:\n swiotlb: Do not export swiotlb_bounce since there are no external consumers\n swiotlb: Use physical addresses instead of virtual in swiotlb_tbl_sync_single\n swiotlb: Use physical addresses for swiotlb_tbl_unmap_single\n swiotlb: Return physical addresses when calling swiotlb_tbl_map_single\n swiotlb: Make io_tlb_overflow_buffer a physical address\n swiotlb: Make io_tlb_start a physical address instead of a virtual one\n swiotlb: Make io_tlb_end a physical address instead of a virtual one\n" }, { "commit": "36cd5c19c3fe8291fac45a262c44c00bd14b531a", "tree": "77813e551c82546c9f6cddc8a3216ba5d02807ed", "parents": [ "2a74dbb9a86e8102dcd07d284135b4530a84826e", "bd9926e80330d43f15b710c2935fa41b792d56fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 17:33:01 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 17:33:01 2012 -0800" }, "message": "Merge tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\nPull ext4 update from Ted Ts\u0027o:\n \"There are two major features for this merge window. The first is\n inline data, which allows small files or directories to be stored in\n the in-inode extended attribute area. (This requires that the file\n system use inodes which are at least 256 bytes or larger; 128 byte\n inodes do not have any room for in-inode xattrs.)\n\n The second new feature is SEEK_HOLE/SEEK_DATA support. This is\n enabled by the extent status tree patches, and this infrastructure\n will be used to further optimize ext4 in the future.\n\n Beyond that, we have the usual collection of code cleanups and bug\n fixes.\"\n\n* tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (63 commits)\n ext4: zero out inline data using memset() instead of empty_zero_page\n ext4: ensure Inode flags consistency are checked at build time\n ext4: Remove CONFIG_EXT4_FS_XATTR\n ext4: remove unused variable from ext4_ext_in_cache()\n ext4: remove redundant initialization in ext4_fill_super()\n ext4: remove redundant code in ext4_alloc_inode()\n ext4: use sync_inode_metadata() when syncing inode metadata\n ext4: enable ext4 inline support\n ext4: let fallocate handle inline data correctly\n ext4: let ext4_truncate handle inline data correctly\n ext4: evict inline data out if we need to strore xattr in inode\n ext4: let fiemap work with inline data\n ext4: let ext4_rename handle inline dir\n ext4: let empty_dir handle inline dir\n ext4: let ext4_delete_entry() handle inline data\n ext4: make ext4_delete_entry generic\n ext4: let ext4_find_entry handle inline data\n ext4: create a new function search_dir\n ext4: let ext4_readdir handle inline data\n ext4: let add_dir_entry handle inline data properly\n ...\n" }, { "commit": "2a74dbb9a86e8102dcd07d284135b4530a84826e", "tree": "a54403e312b6062dfb57bd904ba8b8ce3b11e720", "parents": [ "770b6cb4d21fb3e3df2a7a51e186a3c14db1ec30", "e93072374112db9dc86635934ee761249be28370" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 15:40:50 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 15:40:50 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates from James Morris:\n \"A quiet cycle for the security subsystem with just a few maintenance\n updates.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n Smack: create a sysfs mount point for smackfs\n Smack: use select not depends in Kconfig\n Yama: remove locking from delete path\n Yama: add RCU to drop read locking\n drivers/char/tpm: remove tasklet and cleanup\n KEYS: Use keyring_alloc() to create special keyrings\n KEYS: Reduce initial permissions on keys\n KEYS: Make the session and process keyrings per-thread\n seccomp: Make syscall skipping and nr changes more consistent\n key: Fix resource leak\n keys: Fix unreachable code\n KEYS: Add payload preparsing opportunity prior to key instantiate or update\n" }, { "commit": "3d59eebc5e137bd89c6351e4c70e90ba1d0dc234", "tree": "b4ddfd0b057454a7437a3b4e3074a3b8b4b03817", "parents": [ "11520e5e7c1855fc3bf202bb3be35a39d9efa034", "4fc3f1d66b1ef0d7b8dc11f4ff1cc510f78b37d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 14:33:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 15:18:08 2012 -0800" }, "message": "Merge tag \u0027balancenuma-v11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma\n\nPull Automatic NUMA Balancing bare-bones from Mel Gorman:\n \"There are three implementations for NUMA balancing, this tree\n (balancenuma), numacore which has been developed in tip/master and\n autonuma which is in aa.git.\n\n In almost all respects balancenuma is the dumbest of the three because\n its main impact is on the VM side with no attempt to be smart about\n scheduling. In the interest of getting the ball rolling, it would be\n desirable to see this much merged for 3.8 with the view to building\n scheduler smarts on top and adapting the VM where required for 3.9.\n\n The most recent set of comparisons available from different people are\n\n mel: https://lkml.org/lkml/2012/12/9/108\n mingo: https://lkml.org/lkml/2012/12/7/331\n tglx: https://lkml.org/lkml/2012/12/10/437\n srikar: https://lkml.org/lkml/2012/12/10/397\n\n The results are a mixed bag. In my own tests, balancenuma does\n reasonably well. It\u0027s dumb as rocks and does not regress against\n mainline. On the other hand, Ingo\u0027s tests shows that balancenuma is\n incapable of converging for this workloads driven by perf which is bad\n but is potentially explained by the lack of scheduler smarts. Thomas\u0027\n results show balancenuma improves on mainline but falls far short of\n numacore or autonuma. Srikar\u0027s results indicate we all suffer on a\n large machine with imbalanced node sizes.\n\n My own testing showed that recent numacore results have improved\n dramatically, particularly in the last week but not universally.\n We\u0027ve butted heads heavily on system CPU usage and high levels of\n migration even when it shows that overall performance is better.\n There are also cases where it regresses. Of interest is that for\n specjbb in some configurations it will regress for lower numbers of\n warehouses and show gains for higher numbers which is not reported by\n the tool by default and sometimes missed in treports. Recently I\n reported for numacore that the JVM was crashing with\n NullPointerExceptions but currently it\u0027s unclear what the source of\n this problem is. Initially I thought it was in how numacore batch\n handles PTEs but I\u0027m no longer think this is the case. It\u0027s possible\n numacore is just able to trigger it due to higher rates of migration.\n\n These reports were quite late in the cycle so I/we would like to start\n with this tree as it contains much of the code we can agree on and has\n not changed significantly over the last 2-3 weeks.\"\n\n* tag \u0027balancenuma-v11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma: (50 commits)\n mm/rmap, migration: Make rmap_walk_anon() and try_to_unmap_anon() more scalable\n mm/rmap: Convert the struct anon_vma::mutex to an rwsem\n mm: migrate: Account a transhuge page properly when rate limiting\n mm: numa: Account for failed allocations and isolations as migration failures\n mm: numa: Add THP migration for the NUMA working set scanning fault case build fix\n mm: numa: Add THP migration for the NUMA working set scanning fault case.\n mm: sched: numa: Delay PTE scanning until a task is scheduled on a new node\n mm: sched: numa: Control enabling and disabling of NUMA balancing if !SCHED_DEBUG\n mm: sched: numa: Control enabling and disabling of NUMA balancing\n mm: sched: Adapt the scanning rate if a NUMA hinting fault does not migrate\n mm: numa: Use a two-stage filter to restrict pages being migrated for unlikely task\u003c-\u003enode relationships\n mm: numa: migrate: Set last_nid on newly allocated page\n mm: numa: split_huge_page: Transfer last_nid on tail page\n mm: numa: Introduce last_nid to the page frame\n sched: numa: Slowly increase the scanning period as NUMA faults are handled\n mm: numa: Rate limit setting of pte_numa if node is saturated\n mm: numa: Rate limit the amount of memory that is migrated between nodes\n mm: numa: Structures for Migrate On Fault per NUMA migration rate limiting\n mm: numa: Migrate pages handled during a pmd_numa hinting fault\n mm: numa: Migrate on reference policy\n ...\n" }, { "commit": "11520e5e7c1855fc3bf202bb3be35a39d9efa034", "tree": "734ea170f825000dceef3f724dff474b46fce11d", "parents": [ "5bd665f28db2b04a8d6fe277342479906fc60b62" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 15:15:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 15:20:41 2012 -0800" }, "message": "Revert \"x86-64/efi: Use EFI to deal with platform wall clock (again)\"\n\nThis reverts commit bd52276fa1d4 (\"x86-64/efi: Use EFI to deal with\nplatform wall clock (again)\"), and the two supporting commits:\n\n da5a108d05b4: \"x86/kernel: remove tboot 1:1 page table creation code\"\n\n 185034e72d59: \"x86, efi: 1:1 pagetable mapping for virtual EFI calls\")\n\nas they all depend semantically on commit 53b87cf088e2 (\"x86, mm:\nInclude the entire kernel memory map in trampoline_pgd\") that got\nreverted earlier due to the problems it caused.\n\nThis was pointed out by Yinghai Lu, and verified by me on my Macbook Air\nthat uses EFI.\n\nPointed-out-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "115b1cc2ef0f43ecb42bdbf55f06e9d2231d5a7e", "tree": "776fe64cb84da07ad52b1cad4052fc715433fe29", "parents": [ "2b8318881ddbcb67c5e8d2178b42284749442222", "962b686c450493adb8596e813bdfd0e1613482e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 14:04:50 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 14:04:50 2012 -0800" }, "message": "Merge tag \u0027char-misc-3.8-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull EXTCON patches from Greg Kroah-Hartman:\n \"Here are some drivers/extcon/ patches that I forgot to have you pull\n in the larger char/misc patchset from yesterday, for the 3.8-rc1\n kernel.\n\n Nothing major here, just some driver updates, and cleanups, all of\n which have been in linux-next for a while now.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027char-misc-3.8-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n extcon: kernel_doc style fix\n extcon: max77693: Fix uninitialised variable warning\n extcon: max77693: Use devm_kzalloc\n extcon: max8997: Use devm_kzalloc\n extcon: max8997: Fix a typo\n extcon: max8997: Fix checkpatch error\n extcon: max77693: Fix coding style\n extcon: max77693: Fix incorrect error check and return value\n extcon: max8997: Fix incorrect error check and return value\n extcon: Fix return value in extcon-class.c\n extcon: Add missing header file to extcon.h\n extcon: arizona: unlock mutex on error path in arizona_micdet()\n" }, { "commit": "2b8318881ddbcb67c5e8d2178b42284749442222", "tree": "b43ded0118bb7a6d9f89f6875c18d7ef447ba3be", "parents": [ "e81d372ff9f694e13fa46e8b5aaed505c7fd2a1f", "e7f5c9a16ea2648a3e85af8e34191026bf3dcb62" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 13:03:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 13:03:48 2012 -0800" }, "message": "Merge tag \u0027fbdev-for-3.8\u0027 of git://gitorious.org/linux-omap-dss2/linux\n\nPull fbdev changes from Tomi Valkeinen:\n \"OMAPDSS changes, including:\n - use dynanic debug prints\n - OMAP platform dependency removals\n - Creation of compat-layer, helping us to improve omapdrm\n - Misc cleanups, aiming to make omadss more in line with the upcoming\n common display framework\n\n Exynos DP changes for the 3.8 merge window:\n - Device Tree support for Samsung Exynos DP\n - SW Link training is cleaned up.\n - HPD interrupt is supported.\n\n Samsung Framebuffer changes for the 3.8 merge window:\n - The bit definitions of header file are updated.\n - Some minor typos are fixed.\n - Some minor bugs of s3c_fb_check_var() are fixed.\n\n FB related changes for SH Mobile, Freescale DIU\n\n Add support for the Solomon SSD1307 OLED Controller\"\n\n* tag \u0027fbdev-for-3.8\u0027 of git://gitorious.org/linux-omap-dss2/linux: (191 commits)\n OMAPDSS: fix TV-out issue with DSI PLL\n Revert \"OMAPFB: simplify locking\"\n OMAPFB: remove silly loop in fb2display()\n OMAPFB: fix error handling in omapfb_find_best_mode()\n OMAPFB: use devm_kzalloc to allocate omapfb2_device\n OMAPDSS: DISPC: remove dispc fck uses\n OMAPDSS: DISPC: get dss clock rate from dss driver\n drivers/video/console/softcursor.c: remove redundant NULL check before kfree()\n drivers/video: add support for the Solomon SSD1307 OLED Controller\n OMAPDSS: use omapdss_compat_init() in other drivers\n OMAPDSS: export dispc functions\n OMAPDSS: export dss_feat functions\n OMAPDSS: export dss_mgr_ops functions\n OMAPDSS: separate compat files in the Makefile\n OMAPDSS: move display sysfs init to compat layer\n OMAPDSS: DPI: use dispc\u0027s check_timings\n OMAPDSS: DISPC: add dispc_ovl_check()\n OMAPDSS: move irq handling to dispc-compat\n OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c\n OMAPDSS: move blocking mgr enable/disable to compat layer\n ...\n\nConflicts:\n\tarch/arm/mach-davinci/devices-da8xx.c\n\tarch/arm/plat-omap/common.c\n\tdrivers/media/platform/omap/omap_vout.c\n" }, { "commit": "e81d372ff9f694e13fa46e8b5aaed505c7fd2a1f", "tree": "058d5004b6ca7602aaec6ef2d992be9c71a8e81c", "parents": [ "75e300c8ba5864367634d946c729d8fd05c1cbc2", "2f05e1d4458f9cb68d4d36fb47e6830fec03c80e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 12:52:42 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 12:52:42 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds\n\nPull LED subsystem update from Bryan Wu.\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (47 commits)\n leds: leds-lp5521: return an error code on error in probe()\n leds: leds-clevo-mail: Use pr_* instead of printks\n leds: leds-rb532: Fix checkpatch errors\n leds: led-triggers: Fix checkpatch warnings\n leds: ledtrig-backlight: Fix checkpatch error\n leds: leds-wrap: Use \u003clinux/io.h\u003e instead of \u003casm/io.h\u003e\n leds: leds-wm8350: Use dev_err instead of printk\n leds: leds-pwm: Fix checkpatch warning\n leds: leds-pca955x: Use dev_info instead of printk\n leds: leds-net48xx: Use linux/io.h instead of asm/io.h\n leds: leds-lt3593: Fix checkpatch warnings\n leds: leds-gpio: Use dev_info instead of printk\n leds: leds-da903x: Fix checkpatch error and warnings\n leds: leds-bd2802: Fix checkpatch warnings\n leds: leds-adp5520: Fix checkpatch warnings\n leds: led-class: Fix checkpatch warning\n leds: leds-ns2: use devm_gpio_request_one\n leds: leds-lt3593: use devm_gpio_request_one\n leds: leds-gpio: use devm_gpio_request_one\n leds: lp3944: Fix return value\n ...\n" }, { "commit": "c13e69b2f0e1e2da41a175c7e9215659842cbef9", "tree": "e422a97edf4169ced53cab98d700225ae1766759", "parents": [ "c5258190c2ae664cdf367417a2a25e5fa4104322", "72d5f2da2c3717f1be484d97e35d67dde0efb4c0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 12:37:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 15 12:37:18 2012 -0800" }, "message": "Merge tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\nPull libata updates from Jeff Garzik:\n\n - More ACPI fixes\n\n - ata_piix: cosmetic code movement, re-enable MS Virtual PC support\n\n - generic platform driver improvements; use common code\n\n - pata_cs5536: add quirk for broken udma\n\n - printk prettiness (dev_printk becomes dev_info, etc.)\n\n - sata_promise: fix hardreset lockdep error\n\n - minor cleanups from Sergei Shtylyov\n\n - minor, automated cleanups from Wei Yongjun\n\n - fix null ptr deref bug, in sysfs API\n\n* tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (37 commits)\n sata_dwc_460ex: remove file exec bit (chmod 0755 -\u003e 0644)\n [libata] fix Null pointer dereference on disk error\n ahci: convert ata_link_printk() to ata_link_warn()\n pata_imx: convert ata_dev_printk() to ata_dev_info()\n ARM: ep93xx: convert ata_\u003cfoo\u003e_printk() to ata_\u003cfoo\u003e_\u003clevel\u003e()\n ahci_platform: make structs static\n Revert \"pata_octeon_cf: perform host detach, removal on exit\"\n Revert \"libata: check SATA_SETTINGS log with HW Feature Ctrl\"\n pata_of_platform: fix compile error\n libata: use pci_get_drvdata() helper\n pata_octeon_cf: perform host detach, removal on exit\n sata_highbank: utilize common ata_platform_remove_one()\n pata_palmld: utilize common ata_platform_remove_one()\n pata_platform: remove unused remove function\n pata_platform: utilize common ata_platform_remove_one()\n pata_of_platform: utilize common ata_platform_remove_one()\n pata_mpc52xx: utilize common ata_platform_remove_one()\n pata_ixp4xx_cf: utilize common ata_platform_remove_one()\n ahci_platform: utilize common ata_platform_remove_one()\n libata: implement ata_platform_remove_one()\n ...\n" }, { "commit": "4939e27d46fee2609f2112f85f7f7cbd952075dc", "tree": "0f83542cb7e51d167000ce91f493bd8fdc30bdfa", "parents": [ "c2714334b944abbeaaadda8cddde619eff0292a1", "93c667ca2598bd84f1bd3f2fa176af69707699fe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 15:37:46 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 15:37:46 2012 -0800" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull another devicetree update from Grant Likely:\n \"Here\u0027s a couple more devicetree changes that I missed in the first\n pull by putting the tag in the wrong place.\n\n Two minor devicetree fixups for v3.8. Addition of dummy inlines and\n constification of node argument to of_parse_phandle_with_args().\"\n\n* tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of: *node argument to of_parse_phandle_with_args should be const\n of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn\u0027t defined\n" }, { "commit": "c2714334b944abbeaaadda8cddde619eff0292a1", "tree": "b45be97a313f58aa62933040230d51aa3a8592b4", "parents": [ "0beb58783f2168354e2b5297af45fc7db70adf12", "5e5d8999a316d596f2012fe1cf4c59e0de693dab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 14:54:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 14:54:26 2012 -0800" }, "message": "Merge tag \u0027mvebu\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC updates for Marvell mvebu/kirkwood from Olof Johansson:\n \"This is a branch with updates for Marvell\u0027s mvebu/kirkwood platforms.\n They came in late-ish, and were heavily interdependent such that it\n didn\u0027t make sense to split them up across the cross-platform topic\n branches. So here they are (for the second release in a row) in a\n branch on their own.\"\n\n* tag \u0027mvebu\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (88 commits)\n arm: l2x0: add aurora related properties to OF binding\n arm: mvebu: add Aurora L2 Cache Controller to the DT\n arm: mvebu: add L2 cache support\n dma: mv_xor: fix error handling path\n dma: mv_xor: fix error checking of irq_of_parse_and_map()\n dma: mv_xor: use request_irq() instead of devm_request_irq()\n dma: mv_xor: clear the window override control registers\n arm: mvebu: fix address decoding armada_cfg_base() function\n ARM: mvebu: update defconfig with I2C and RTC support\n ARM: mvebu: Add SATA support for OpenBlocks AX3-4\n ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4\n ARM: mvebu: Add support for I2C on OpenBlocks AX3-4\n ARM: mvebu: Add support for I2C controllers in Armada 370/XP\n arm: mvebu: Add hardware I/O Coherency support\n arm: plat-orion: Add coherency attribute when setup mbus target\n arm: dma mapping: Export a dma ops function arm_dma_set_mask\n arm: mvebu: Add SMP support for Armada XP\n arm: mm: Add support for PJ4B cpu and init routines\n arm: mvebu: Add IPI support via doorbells\n arm: mvebu: Add initial support for power managmement service unit\n ...\n" }, { "commit": "0beb58783f2168354e2b5297af45fc7db70adf12", "tree": "4debaf4f276990adf1892b7efe57edd344367464", "parents": [ "6a57d104c8cb5b6adad6784b4ce6e2f7f9961a3a", "eabc5fa51c1fae4b66cf883e3a3c2b3ca794494c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 14:42:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 14:42:53 2012 -0800" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC device-tree updates, take 2, from Olof Johansson:\n \"This branch contains device-tree updates for the SPEAr platform. They\n had dependencies on earlier branches from this merge window, which is\n why they were broken out in a separate branch.\"\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/\n ARM: SPEAr320: DT: Add SPEAr 320 HMI board support\n ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor\n ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT\n ARM: SPEAr1310: Fix AUXDATA for compact flash controller\n ARM: SPEAr13xx: Remove fields not required for ssp controller\n ARM: SPEAr1310: Move 1310 specific misc register into machine specific files\n ARM: SPEAr: DT: Update device nodes\n ARM: SPEAr: DT: add uart state to fix warning\n ARM: SPEAr: DT: Modify DT bindings for STMMAC\n ARM: SPEAr: DT: Fix existing DT support\n ARM: SPEAr: DT: Update partition info for MTD devices\n ARM: SPEAr: DT: Update pinctrl list\n ARM: SPEAr13xx: DT: Add spics gpio controller nodes\n" }, { "commit": "cebfa85eb86d92bf85d3b041c6b044184517a988", "tree": "be0a374556fe335ce96dfdb296c89537750d5868", "parents": [ "d42b3a2906a10b732ea7d7f849d49be79d242ef0", "241738bd51cb0efe58e6c570223153e970afe3ae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 14:27:45 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 14:27:45 2012 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS updates from Ralf Baechle:\n \"The MIPS bits for 3.8. This also includes a bunch fixes that were\n sitting in the linux-mips.org git tree for a long time. This pull\n request contains updates to several OCTEON drivers and the board\n support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,\n updates to the SSB bus support, MIPS kexec code and adds support for\n kdump.\n\n When pulling this, there are two expected merge conflicts in\n include/linux/bcma/bcma_driver_chipcommon.h which are trivial to\n resolve, just remove the conflict markers and keep both alternatives.\"\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)\n MIPS: PMC-Sierra Yosemite: Remove support.\n VIDEO: Newport Fix console crashes\n MIPS: wrppmc: Fix build of PCI code.\n MIPS: IP22/IP28: Fix build of EISA code.\n MIPS: RB532: Fix build of prom code.\n MIPS: PowerTV: Fix build.\n MIPS: IP27: Correct fucked grammar in ops-bridge.c\n MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled\n MIPS: Fix potencial corruption\n MIPS: Fix for warning from FPU emulation code\n MIPS: Handle COP3 Unusable exception as COP1X for FP emulation\n MIPS: Fix poweroff failure when HOTPLUG_CPU configured.\n MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS\u003dy\n MIPS: Remove unused smvp.h\n MIPS/EDAC: Improve OCTEON EDAC support.\n MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.\n MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h\n ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.\n MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.\n MIPS: Remove usage of CEVT_R4K_LIB config option.\n ...\n" }, { "commit": "8dd2cb7e880d2f77fba53b523c99133ad5054cfd", "tree": "ea51e89f8c8bf9ca8e888d68ecf6732a52e8e99d", "parents": [ "75274551c81796b636c5acb0c2597dec7ec2e6c4" ], "author": { "name": "Shaohua Li", "email": "shli@kernel.org", "time": "Fri Dec 14 11:15:36 2012 +0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Dec 14 20:46:04 2012 +0100" }, "message": "block: discard granularity might not be power of 2\n\nIn MD raid case, discard granularity might not be power of 2, for example, a\n4-disk raid5 has 3*chunk_size discard granularity. Correct the calculation for\nsuch cases.\n\nReported-by: Neil Brown \u003cneilb@suse.de\u003e\nSigned-off-by: Shaohua Li \u003cshli@fusionio.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "d42b3a2906a10b732ea7d7f849d49be79d242ef0", "tree": "1f4f2387bf53f8015aa87eb9c05ba8316cb5ed50", "parents": [ "18dd0bf22b6f0c1bd5e4e813a42245ed86ec57b6", "e83af1f18c78c7b6aa720beecc927ecc8afd3647" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 10:08:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 10:08:40 2012 -0800" }, "message": "Merge branch \u0027core-efi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 EFI update from Peter Anvin:\n \"EFI tree, from Matt Fleming. Most of the patches are the new efivarfs\n filesystem by Matt Garrett \u0026 co. The balance are support for EFI\n wallclock in the absence of a hardware-specific driver, and various\n fixes and cleanups.\"\n\n* \u0027core-efi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)\n efivarfs: Make efivarfs_fill_super() static\n x86, efi: Check table header length in efi_bgrt_init()\n efivarfs: Use query_variable_info() to limit kmalloc()\n efivarfs: Fix return value of efivarfs_file_write()\n efivarfs: Return a consistent error when efivarfs_get_inode() fails\n efivarfs: Make \u0027datasize\u0027 unsigned long\n efivarfs: Add unique magic number\n efivarfs: Replace magic number with sizeof(attributes)\n efivarfs: Return an error if we fail to read a variable\n efi: Clarify GUID length calculations\n efivarfs: Implement exclusive access for {get,set}_variable\n efivarfs: efivarfs_fill_super() ensure we clean up correctly on error\n efivarfs: efivarfs_fill_super() ensure we free our temporary name\n efivarfs: efivarfs_fill_super() fix inode reference counts\n efivarfs: efivarfs_create() ensure we drop our reference on inode on error\n efivarfs: efivarfs_file_read ensure we free data in error paths\n x86-64/efi: Use EFI to deal with platform wall clock (again)\n x86/kernel: remove tboot 1:1 page table creation code\n x86, efi: 1:1 pagetable mapping for virtual EFI calls\n x86, mm: Include the entire kernel memory map in trampoline_pgd\n ...\n" }, { "commit": "18dd0bf22b6f0c1bd5e4e813a42245ed86ec57b6", "tree": "a4794b6041b44fa94f5d9438cdb5bbfc58b35f05", "parents": [ "2d9c8b5d6a5f5f7a6111cc68a050b5b44729376b", "385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 10:03:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 10:03:23 2012 -0800" }, "message": "Merge branch \u0027x86-acpi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 ACPI update from Peter Anvin:\n \"This is a patchset which didn\u0027t make the last merge window. It adds a\n debugging capability to feed ACPI tables via the initramfs.\n\n On a grander scope, it formalizes using the initramfs protocol for\n feeding arbitrary blobs which need to be accessed early to the kernel:\n they are fed first in the initramfs blob (lots of bootloaders can\n concatenate this at boot time, others can use a single file) in an\n uncompressed cpio archive using filenames starting with \"kernel/\".\n\n The ACPI maintainers requested that this patchset be fed via the x86\n tree rather than the ACPI tree as the footprint in the general x86\n code is much bigger than in the ACPI code proper.\"\n\n* \u0027x86-acpi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n X86 ACPI: Use #ifdef not #if for CONFIG_X86 check\n ACPI: Fix build when disabled\n ACPI: Document ACPI table overriding via initrd\n ACPI: Create acpi_table_taint() function to avoid code duplication\n ACPI: Implement physical address table override\n ACPI: Store valid ACPI tables passed via early initrd in reserved memblock areas\n x86, acpi: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling\n lib: Add early cpio decoder\n" }, { "commit": "2d9c8b5d6a5f5f7a6111cc68a050b5b44729376b", "tree": "9382e643df9d4115637ca320822702bb06130c1f", "parents": [ "17bc14b767cf0692420c43dbe5310ae98a5a7836", "003db633d6f2d3649ea18652a3c55ad17d4f0e47" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 09:59:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 14 09:59:59 2012 -0800" }, "message": "Merge branch \u0027x86-ras-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 RAS update from Ingo Molnar:\n \"Rework all config variables used throughout the MCA code and collect\n them together into a mca_config struct. This keeps them tightly and\n neatly packed together instead of spilled all over the place.\n\n Then, convert those which are used as booleans into real booleans and\n save some space. These bits are exposed via\n /sys/devices/system/machinecheck/machinecheck*/\"\n\n* \u0027x86-ras-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, MCA: Finish mca_config conversion\n x86, MCA: Convert the next three variables batch\n x86, MCA: Convert rip_msr, mce_bootlog, monarch_timeout\n x86, MCA: Convert dont_log_ce, banks and tolerant\n drivers/base: Add a DEVICE_BOOL_ATTR macro\n" }, { "commit": "8349e5aeaadd160b7cce554a62a05be4b2d894aa", "tree": "63025f59280dcf5276e9b551391025481f59ac84", "parents": [ "84043ac26ed120826db8e6198531da888c6e57b0" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Dec 14 09:34:01 2012 -0500" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Fri Dec 14 09:34:01 2012 -0500" }, "message": "Revert \"libata: check SATA_SETTINGS log with HW Feature Ctrl\"\n\nThis reverts commit de90cd71f68e947d3bd6c3f2ef5731ead010a768.\n\nShane Huang writes:\n\n Please suspend this patch because I just received two new\n DevSlp drives but found word 78 bit 5 is _not_ set.\n\n I\u0027m checking with the drive vendor whether he gave me\n the wrong information. If bit 5 is not the necessary and\n sufficient condition, I will implement another patch to\n replace ata_device-\u003esata_settings into -\u003edevslp_timing.\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "7313264b899bbf3988841296265a6e0e8a7b6521", "tree": "59b5069980434945394152e94eeaef2b32cf4e72", "parents": [ "d8c532c40721f7507896d202b8cae3b3642d2b0d", "76d8a23b127020472207b281427d3e9f4f1227e4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:26:04 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:26:04 2012 -0800" }, "message": "Merge tag \u0027for-v3.8-merged\u0027 of git://git.infradead.org/battery-2.6\n\nPull battery subsystem updates from Anton Vorontsov:\n \"Highlights:\n\n - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and\n bq2415x_charger. The drivers are a part of a solution to replace\n the proprietary Nokia BME stack\n\n - Power supply core now registers devices with a thermal cooling\n subsystem, so we can now automatically throttle charging. Thanks\n to Ramakrishna Pallala!\n\n - Device tree support for ab8500 and max8925_power drivers\n\n - Random fixups and enhancements for a bunch of drivers.\"\n\n* tag \u0027for-v3.8-merged\u0027 of git://git.infradead.org/battery-2.6: (22 commits)\n max8925_power: Add support for device-tree initialization\n ab8500: Add devicetree support for chargalg\n ab8500: Add devicetree support for charger\n ab8500: Add devicetree support for btemp\n ab8500: Add devicetree support for fuelgauge\n twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*\n jz4740-battery: Use devm_request_and_ioremap\n jz4740-battery: Use devm_kzalloc\n bq27x00_battery: Fixup nominal available capacity reporting\n bq2415x_charger: Fix style issues\n bq2415x_charger: Add Kconfig/Makefile entries\n power_supply: Add bq2415x charger driver\n power_supply: Add new Nokia RX-51 (N900) power supply battery driver\n max17042_battery: Fix missing verify_model_lock() return value check\n ds2782_battery: Fix signedness bug in ds278x_read_reg16()\n lp8788-charger: Fix ADC channel names\n lp8788-charger: Fix wrong ADC conversion\n lp8788-charger: Use consumer device name on setting IIO channels\n power_supply: Register power supply for thermal cooling device\n power_supply: Add support for CHARGE_CONTROL_* attributes\n ...\n" }, { "commit": "d8c532c40721f7507896d202b8cae3b3642d2b0d", "tree": "42b1ce76671eb85324281ed93491432f4523f983", "parents": [ "e777d192ffb9f2929d547a2f8a5f65b7db7a9552", "77c53d0b56264a8fc5844e087ad15fffe20c299d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:22:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:22:22 2012 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media updates from Mauro Carvalho Chehab:\n\n - Missing MAINTAINERS entries were added for several drivers\n\n - Adds V4L2 support for DMABUF handling, allowing zero-copy buffer\n sharing between V4L2 devices and GPU\n\n - Got rid of all warnings when compiling with W\u003d1 on x86\n\n - Add a new driver for Exynos hardware (s3c-camif)\n\n - Several bug fixes, cleanups and driver improvements\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (243 commits)\n [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check\n [media] omap3isp: Prepare/unprepare clocks before/after enable/disable\n [media] omap3isp: preview: Add support for 8-bit formats at the sink pad\n [media] omap3isp: Replace printk with dev_*\n [media] omap3isp: Find source pad from external entity\n [media] omap3isp: Configure CSI-2 phy based on platform data\n [media] omap3isp: Add PHY routing configuration\n [media] omap3isp: Add CSI configuration registers from control block to ISP resources\n [media] omap3isp: Remove unneeded module memory address definitions\n [media] omap3isp: Use monotonic timestamps for statistics buffers\n [media] uvcvideo: Fix control value clamping for unsigned integer controls\n [media] uvcvideo: Mark first output terminal as default video node\n [media] uvcvideo: Add VIDIOC_[GS]_PRIORITY support\n [media] uvcvideo: Return -ENOTTY for unsupported ioctls\n [media] uvcvideo: Set device_caps in VIDIOC_QUERYCAP\n [media] uvcvideo: Don\u0027t fail when an unsupported format is requested\n [media] uvcvideo: Return -EACCES when trying to access a read/write-only control\n [media] uvcvideo: Set error_idx properly for extended controls API failures\n [media] rtl28xxu: add NOXON DAB/DAB+ USB dongle rev 2\n [media] fc2580: write some registers conditionally\n ...\n" }, { "commit": "e777d192ffb9f2929d547a2f8a5f65b7db7a9552", "tree": "c9a82698ae66c0465aeb07908c9063d8c098da27", "parents": [ "f132c54e3ab25b305a1e368ad413a417052c966e", "f92363d12359498f9a9960511de1a550f0ec41c2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:20:31 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:20:31 2012 -0800" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi\n\nPull first round of SCSI updates from James Bottomley:\n \"This patch set includes two large new drivers: mpt3sas (for the next\n gen fusion SAS hardware) and csiostor a FCoE offload driver for the\n Chelsio converged network cards (this includes some net changes which\n I\u0027ve OK\u0027d with DaveM).\n\n The rest of the patch is driver updates (qla2xxx, lpfc, hptiop,\n be2iscsi) plus a few assorted updates and bug fixes.\n\n We also have a Power Management rework in the Upper Layer Drivers\n preparatory to doing ACPI zero power optical devices, but the actual\n enabler is still being worked on.\n\n Signed-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\"\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (72 commits)\n [SCSI] mpt3sas: add new driver supporting 12GB SAS\n [SCSI] scsi_transport_sas: add 12GB definitions for mpt3sas\n [SCSI] miscdevice: Adding support for MPT3SAS_MINOR(222)\n [SCSI] csiostor: remove unneeded memset()\n [SCSI] csiostor: Fix sparse warnings.\n [SCSI] qla2xxx: Display that driver is operating in legacy interrupt mode.\n [SCSI] qla2xxx: Dont clear drv active on iospace config failure.\n [SCSI] qla2xxx: Fix typo in qla2xxx driver.\n [SCSI] qla2xxx: Update ql2xextended_error_logging parameter description with new option.\n [SCSI] qla2xxx: Parameterize the link speed of hba rather than fcport.\n [SCSI] qla2xxx: Add 16Gb/s case to get port speed capability.\n [SCSI] qla2xxx: Move marking fcport online ahead of setting iiDMA speed.\n [SCSI] qla2xxx: Add acquiring of risc semaphore before doing ISP reset.\n [SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set.\n [SCSI] qla2xxx: Fix typo in qla83xx_fw_dump function.\n [SCSI] qla2xxx: Add Gen3 PCIe speed 8GT/s to the log message.\n [SCSI] qla2xxx: Use correct Request-Q-Out register during bidirectional request processing\n [SCSI] qla2xxx: Move noisy Start scsi failed messages to verbose logging level.\n [SCSI] qla2xxx: Fix coccinelle warnings in qla2x00_relogin.\n [SCSI] qla2xxx: No fcport FC-4 type assignment in GA_NXT response.\n ...\n" }, { "commit": "f132c54e3ab25b305a1e368ad413a417052c966e", "tree": "e34ef551cd3e544f9b8599728e56cce292703179", "parents": [ "d3b43e12b2c8c69f79ab76dcdc5956f47c376378", "01e03365981ebd99f1b4027dbf7c215d1c136f71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:19:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:19:09 2012 -0800" }, "message": "Merge tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull infiniband upate from Roland Dreier:\n \"First batch of InfiniBand/RDMA changes for the 3.8 merge window:\n - A good chunk of Bart Van Assche\u0027s SRP fixes\n - UAPI disintegration from David Howells\n - mlx4 support for \"64-byte CQE\" hardware feature from Or Gerlitz\n - Other miscellaneous fixes\"\n\nFix up trivial conflict in mellanox/mlx4 driver.\n\n* tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (33 commits)\n RDMA/nes: Fix for crash when registering zero length MR for CQ\n RDMA/nes: Fix for terminate timer crash\n RDMA/nes: Fix for BUG_ON due to adding already-pending timer\n IB/srp: Allow SRP disconnect through sysfs\n srp_transport: Document sysfs attributes\n srp_transport: Simplify attribute initialization code\n srp_transport: Fix attribute registration\n IB/srp: Document sysfs attributes\n IB/srp: send disconnect request without waiting for CM timewait exit\n IB/srp: destroy and recreate QP and CQs when reconnecting\n IB/srp: Eliminate state SRP_TARGET_DEAD\n IB/srp: Introduce the helper function srp_remove_target()\n IB/srp: Suppress superfluous error messages\n IB/srp: Process all error completions\n IB/srp: Introduce srp_handle_qp_err()\n IB/srp: Simplify SCSI error handling\n IB/srp: Keep processing commands during host removal\n IB/srp: Eliminate state SRP_TARGET_CONNECTING\n IB/srp: Increase block layer timeout\n RDMA/cm: Change return value from find_gid_port()\n ...\n" }, { "commit": "d3b43e12b2c8c69f79ab76dcdc5956f47c376378", "tree": "4fba9e425d7407e5abd5ab50d5ac09398ec5bff6", "parents": [ "15de0599277f3477ddd11766282587f12d214252", "7cb943615aabbd72624f77f0a84b8c5d627cf846" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:15:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 19:15:11 2012 -0800" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull SPI updates from Grant Likely:\n \"Primarily SPI device driver bug fixes, one removal of an old driver,\n and some new tegra support. There is some core code change too, but\n all in all pretty small stuff.\n\n The new features to note are:\n - Common code for describing GPIO CS lines in the device tree\n - Remove the SPI_BUFSIZ limitation on spi_write_the_read()\n - core spi ensures bits_per_word is set correctly\n - SPARC can now use SPI\"\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (36 commits)\n spi/sparc: Allow of_register_spi_devices for sparc\n spi: Remove HOTPLUG section attributes\n spi: Add support for specifying 3-wire mode via device tree\n spi: Fix comparison of different integer types\n spi/orion: Add SPI_CHPA and SPI_CPOL support to kirkwood driver.\n spi/sh: Add SH Mobile series as dependency to MSIOF controller\n spi/sh-msiof: Remove unneeded clock name\n spi: Remove SPI_BUFSIZ restriction on spi_write_then_read()\n spi/stmp: remove obsolete driver\n spi/clps711x: New SPI master driver\n spi: omap2-mcspi: remove duplicate inclusion of linux/err.h\n spi: omap2-mcspi: Fix the redifine warning\n spi/sh-hspi: add CS manual control support\n of_spi: add generic binding support to specify cs gpio\n spi: omap2-mcspi: remove duplicated include from spi-omap2-mcspi.c\n spi/bitbang: (cosmetic) simplify list manipulation\n spi/bitbang: avoid needless loop flow manipulations\n spi/omap: fix D0/D1 direction confusion\n spi: tegra: add spi driver for sflash controller\n spi: Dont call master-\u003esetup if not populated\n ...\n" }, { "commit": "66cdd0ceaf65a18996f561b770eedde1d123b019", "tree": "4892eaa422d366fce5d1e866ff1fe0988af95569", "parents": [ "896ea17d3da5f44b2625c9cda9874d7dfe447393", "58b7825bc324da55415034a9f6ca5d716b8fd898" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 15:31:08 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 15:31:08 2012 -0800" }, "message": "Merge tag \u0027kvm-3.8-1\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM updates from Marcelo Tosatti:\n \"Considerable KVM/PPC work, x86 kvmclock vsyscall support,\n IA32_TSC_ADJUST MSR emulation, amongst others.\"\n\nFix up trivial conflict in kernel/sched/core.c due to cross-cpu\nmigration notifier added next to rq migration call-back.\n\n* tag \u0027kvm-3.8-1\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (156 commits)\n KVM: emulator: fix real mode segment checks in address linearization\n VMX: remove unneeded enable_unrestricted_guest check\n KVM: VMX: fix DPL during entry to protected mode\n x86/kexec: crash_vmclear_local_vmcss needs __rcu\n kvm: Fix irqfd resampler list walk\n KVM: VMX: provide the vmclear function and a bitmap to support VMCLEAR in kdump\n x86/kexec: VMCLEAR VMCSs loaded on all cpus if necessary\n KVM: MMU: optimize for set_spte\n KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface\n KVM: PPC: bookehv: Add EPCR support in mtspr/mfspr emulation\n KVM: PPC: bookehv: Add guest computation mode for irq delivery\n KVM: PPC: Make EPCR a valid field for booke64 and bookehv\n KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit\n KVM: PPC: e500: Mask MAS2 EPN high 32-bits in 32/64 tlbwe emulation\n KVM: PPC: Mask ea\u0027s high 32-bits in 32/64 instr emulation\n KVM: PPC: e500: Add emulation helper for getting instruction ea\n KVM: PPC: bookehv64: Add support for interrupt handling\n KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler\n KVM: PPC: booke: Fix get_tb() compile error on 64-bit\n KVM: PPC: e500: Silence bogus GCC warning in tlb code\n ...\n" }, { "commit": "c7708fac5a878d6e0f2de0aa19f9749cff4f707f", "tree": "21a59cbe503ca526697f7d0bce5e0e30980bcbc0", "parents": [ "3127f23f013eabe9b58132c05061684c49146ba3", "6726a807c38d7fd09bc23a0adc738efec6ff9492" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 14:20:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 14:20:19 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 update from Martin Schwidefsky:\n \"Add support to generate code for the latest machine zEC12, MOD and XOR\n instruction support for the BPF jit compiler, the dasd safe offline\n feature and the big one: the s390 architecture gets PCI support!!\n Right before the world ends on the 21st ;-)\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (41 commits)\n s390/qdio: rename the misleading PCI flag of qdio devices\n s390/pci: remove obsolete email addresses\n s390/pci: speed up __iowrite64_copy by using pci store block insn\n s390/pci: enable NEED_DMA_MAP_STATE\n s390/pci: no msleep in potential IRQ context\n s390/pci: fix potential NULL pointer dereference in dma_free_seg_table()\n s390/pci: use kmem_cache_zalloc instead of kmem_cache_alloc/memset\n s390/bpf,jit: add support for XOR instruction\n s390/bpf,jit: add support MOD instruction\n s390/cio: fix pgid reserved check\n vga: compile fix, disable vga for s390\n s390/pci: add PCI Kconfig options\n s390/pci: s390 specific PCI sysfs attributes\n s390/pci: PCI hotplug support via SCLP\n s390/pci: CHSC PCI support for error and availability events\n s390/pci: DMA support\n s390/pci: PCI adapter interrupts for MSI/MSI-X\n s390/bitops: find leftmost bit instruction support\n s390/pci: CLP interface\n s390/pci: base support\n ...\n" }, { "commit": "f6e858a00af788bab0fd4c0b7f5cd788000edc18", "tree": "f9403ca3671be9821dbf83e726e61dbe75fbca6b", "parents": [ "193c0d682525987db59ac3a24531a77e4947aa95", "98870901cce098bbe94d90d2c41d8d1fa8d94392" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 13:11:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 13:11:15 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge misc VM changes from Andrew Morton:\n \"The rest of most-of-MM. The other MM bits await a slab merge.\n\n This patch includes the addition of a huge zero_page. Not a\n performance boost but it an save large amounts of physical memory in\n some situations.\n\n Also a bunch of Fujitsu engineers are working on memory hotplug.\n Which, as it turns out, was badly broken. About half of their patches\n are included here; the remainder are 3.8 material.\"\n\nHowever, this merge disables CONFIG_MOVABLE_NODE, which was totally\nbroken. We don\u0027t add new features with \"default y\", nor do we add\nKconfig questions that are incomprehensible to most people without any\nhelp text. Does the feature even make sense without compaction or\nmemory hotplug?\n\n* akpm: (54 commits)\n mm/bootmem.c: remove unused wrapper function reserve_bootmem_generic()\n mm/memory.c: remove unused code from do_wp_page()\n asm-generic, mm: pgtable: consolidate zero page helpers\n mm/hugetlb.c: fix warning on freeing hwpoisoned hugepage\n hwpoison, hugetlbfs: fix RSS-counter warning\n hwpoison, hugetlbfs: fix \"bad pmd\" warning in unmapping hwpoisoned hugepage\n mm: protect against concurrent vma expansion\n memcg: do not check for mm in __mem_cgroup_count_vm_event\n tmpfs: support SEEK_DATA and SEEK_HOLE (reprise)\n mm: provide more accurate estimation of pages occupied by memmap\n fs/buffer.c: remove redundant initialization in alloc_page_buffers()\n fs/buffer.c: do not inline exported function\n writeback: fix a typo in comment\n mm: introduce new field \"managed_pages\" to struct zone\n mm, oom: remove statically defined arch functions of same name\n mm, oom: remove redundant sleep in pagefault oom handler\n mm, oom: cleanup pagefault oom handler\n memory_hotplug: allow online/offline memory to result movable node\n numa: add CONFIG_MOVABLE_NODE for movable-dedicated node\n mm, memcg: avoid unnecessary function call when memcg is disabled\n ...\n" }, { "commit": "193c0d682525987db59ac3a24531a77e4947aa95", "tree": "7b58346171c4d07e2c2ee6c3c469c325495149a4", "parents": [ "8b0cab14951fbf8126795ab301835a8f8126a988", "1cb73f8c479e66541fefd3f7fa547b1fa56cdc54" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:14:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:14:47 2012 -0800" }, "message": "Merge tag \u0027for-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI update from Bjorn Helgaas:\n \"Host bridge hotplug:\n - Untangle _PRT from struct pci_bus (Bjorn Helgaas)\n - Request _OSC control before scanning root bus (Taku Izumi)\n - Assign resources when adding host bridge (Yinghai Lu)\n - Remove root bus when removing host bridge (Yinghai Lu)\n - Remove _PRT during hot remove (Yinghai Lu)\n\n SRIOV\n - Add sysfs knobs to control numVFs (Don Dutile)\n\n Power management\n - Notify devices when power resource turned on (Huang Ying)\n\n Bug fixes\n - Work around broken _SEG on HP xw9300 (Bjorn Helgaas)\n - Keep runtime PM enabled for unbound PCI devices (Huang Ying)\n - Fix Optimus dual-GPU runtime D3 suspend issue (Dave Airlie)\n - Fix xen frontend shutdown issue (David Vrabel)\n - Work around PLX PCI 9050 BAR alignment erratum (Ian Abbott)\n\n Miscellaneous\n - Add GPL license for drivers/pci/ioapic (Andrew Cooks)\n - Add standard PCI-X, PCIe ASPM register #defines (Bjorn Helgaas)\n - NumaChip remote PCI support (Daniel Blueman)\n - Fix PCIe Link Capabilities Supported Link Speed definition (Jingoo\n Han)\n - Convert dev_printk() to dev_info(), etc (Joe Perches)\n - Add support for non PCI BAR ROM data (Matthew Garrett)\n - Add x86 support for host bridge translation offset (Mike Yoknis)\n - Report success only when every driver supports AER (Vijay\n Pandarathil)\"\n\nFix up trivial conflicts.\n\n* tag \u0027for-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (48 commits)\n PCI: Use phys_addr_t for physical ROM address\n x86/PCI: Add NumaChip remote PCI support\n ath9k: Use standard #defines for PCIe Capability ASPM fields\n iwlwifi: Use standard #defines for PCIe Capability ASPM fields\n iwlwifi: collapse wrapper for pcie_capability_read_word()\n iwlegacy: Use standard #defines for PCIe Capability ASPM fields\n iwlegacy: collapse wrapper for pcie_capability_read_word()\n cxgb3: Use standard #defines for PCIe Capability ASPM fields\n PCI: Add standard PCIe Capability Link ASPM field names\n PCI/portdrv: Use PCI Express Capability accessors\n PCI: Use standard PCIe Capability Link register field names\n x86: Use PCI setup data\n PCI: Add support for non-BAR ROMs\n PCI: Add pcibios_add_device\n EFI: Stash ROMs if they\u0027re not in the PCI BAR\n PCI: Add and use standard PCI-X Capability register names\n PCI/PM: Keep runtime PM enabled for unbound PCI devices\n xen-pcifront: Handle backend CLOSED without CLOSING\n PCI: SRIOV control and status via sysfs (documentation)\n PCI/AER: Report success only when every device has AER-aware driver\n ...\n" }, { "commit": "8b0cab14951fbf8126795ab301835a8f8126a988", "tree": "2bf23662944ac9bfcd34d13ef81a6e331266ebf9", "parents": [ "fd62c5450324af7f6cc12897b09b77285cd48a92", "4ffc45c3604dd8e283884ce006faf0e955cbd9e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:04:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:04:35 2012 -0800" }, "message": "Merge tag \u0027regulator-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator updates from Mark Brown:\n \"A fairly quiet release again, a couple of relatively small new\n features and a bunch of driver specific work including yet more code\n elimination and fixes from Axel Lin.\n\n - Addidion of linear_min_sel for offsetting linear selectors in the\n helpers.\n - Support for continuous voltage ranges for regulators with extremely\n high resolution.\n - Drivers for AS3711, DA9055, MAX9873, TPS51632, TPS80031 and ARM\n vexpress.\"\n\nFix up trivial conflict (due to typo fix) in palmas-regulator.c\n\n* tag \u0027regulator-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (80 commits)\n regulator: core: Fix logic to determinate if regulator can change voltage\n regulator: s5m8767: Fix to work even if no DVS gpio present\n regulator: s5m8767: Fix to read the first DVS register.\n regulator: s5m8767: Fix to work when platform registers less regulators\n regulator: gpio-regulator: gpio_set_value should use cansleep\n regulator: gpio-regulator: Fix logical error in for() loop\n regulator: anatop: Use regulator_[get|set]_voltage_sel_regmap\n regulator: anatop: Use linear_min_sel with linear mapping\n regulator: max1586: Implement get_voltage_sel callback\n regulator: lp8788-buck: Kill _gpio_request function\n regulator: tps80031: Convert tps80031_ldo_ops to linear_min_sel and list_voltage_linear\n regulator: lp8788-ldo: Remove val array in lp8788_config_ldo_enable_mode\n regulator: gpio-regulator: Add ifdef CONFIG_OF guard for regulator_gpio_of_match\n regulator: palmas: Convert palmas_ops_smps to regulator_[get|set]_voltage_sel_regmap\n regulator: palmas: Return raw register values as the selectors in [get|set]_voltage_sel\n regulators: add regulator_can_change_voltage() function\n regulator: tps51632: Ensure [base|max]_voltage_uV pdata settings are valid\n regulator: wm831x-dcdc: Add MODULE_ALIAS for wm831x-boostp\n regulator: wm831x-dcdc: Ensure selected voltage falls within requested range\n regulator: tps51632: Use linear_min_sel and regulator_[map|list]_voltage_linear\n ...\n" }, { "commit": "fd62c5450324af7f6cc12897b09b77285cd48a92", "tree": "d4390981348e5a08e31a50fe9cb0da0715cf005c", "parents": [ "a2013a13e68354e0c8f3696b69701803e13fb737", "818b930bc15077fc00ff16bb22c5df1857f05afa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:00:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:00:48 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID subsystem updates from Jiri Kosina:\n\n 1) Support for HID over I2C bus has been added by Benjamin Tissoires.\n ACPI device discovery is still in the works.\n\n 2) Support for Win8 Multitiouch protocol is being added, most work done\n by Benjamin Tissoires as well\n\n 3) EIO/ERESTARTSYS is fixed in hiddev/hidraw, fixes by Andrew Duggan\n and Jiri Kosina\n\n 4) ION iCade driver added by Bastien Nocera\n\n 5) Support for a couple new Roccat devices has been added by Stefan\n Achatz\n\n 6) HID sensor hubs are now auto-detected instead of having to list all\n the VID/PID combinations in the blacklist array\n\n 7) other random fixes and support for new device IDs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (65 commits)\n HID: i2c-hid: add mutex protecting open/close race\n Revert \"HID: sensors: add to special driver list\"\n HID: sensors: autodetect USB HID sensor hubs\n HID: hidp: fallback to input session properly if hid is blacklisted\n HID: i2c-hid: fix ret_count check\n HID: i2c-hid: fix i2c_hid_get_raw_report count mismatches\n HID: i2c-hid: remove extra .irq field in struct i2c_hid\n HID: i2c-hid: reorder allocation/free of buffers\n HID: i2c-hid: fix memory corruption due to missing hid declaration\n HID: i2c-hid: remove superfluous include\n HID: i2c-hid: remove unneeded test in i2c_hid_remove\n HID: i2c-hid: i2c_hid_get_report may fail\n HID: i2c-hid: also call i2c_hid_free_buffers in i2c_hid_remove\n HID: i2c-hid: fix error messages\n HID: i2c-hid: fix return paths\n HID: i2c-hid: remove unused static declarations\n HID: i2c-hid: fix i2c_hid_dbg macro\n HID: i2c-hid: fix checkpatch.pl warning\n HID: i2c-hid: enhance Kconfig\n HID: i2c-hid: change I2C name\n ...\n" }, { "commit": "a2013a13e68354e0c8f3696b69701803e13fb737", "tree": "a7e1da6bfad1aa2afd83f401874d606269ce90b4", "parents": [ "dadfab4873256d2145640c0ce468fcbfb48977fe", "106f9d9337f65bd428c0c79f650e3489e458d771" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:00:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 12:00:02 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial branch from Jiri Kosina:\n \"Usual stuff -- comment/printk typo fixes, documentation updates, dead\n code elimination.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n HOWTO: fix double words typo\n x86 mtrr: fix comment typo in mtrr_bp_init\n propagate name change to comments in kernel source\n doc: Update the name of profiling based on sysfs\n treewide: Fix typos in various drivers\n treewide: Fix typos in various Kconfig\n wireless: mwifiex: Fix typo in wireless/mwifiex driver\n messages: i2o: Fix typo in messages/i2o\n scripts/kernel-doc: check that non-void fcts describe their return value\n Kernel-doc: Convention: Use a \"Return\" section to describe return values\n radeon: Fix typo and copy/paste error in comments\n doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c\n various: Fix spelling of \"asynchronous\" in comments.\n Fix misspellings of \"whether\" in comments.\n eisa: Fix spelling of \"asynchronous\".\n various: Fix spelling of \"registered\" in comments.\n doc: fix quite a few typos within Documentation\n target: iscsi: fix comment typos in target/iscsi drivers\n treewide: fix typo of \"suport\" in various comments and Kconfig\n treewide: fix typo of \"suppport\" in various comments\n ...\n" }, { "commit": "046e7d685bc370fd4c879ab6635ad3f69e6673d1", "tree": "36b981f8d1f2bfd348c1479acbe3a9426d35c377", "parents": [ "fe504c5c745aeb767d978fbedeb94775fd4cb69c", "6eb827d23577a4efec2b10a9c4cc9ded268a1d1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 11:51:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 11:51:23 2012 -0800" }, "message": "Merge tag \u0027sound-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound updates from Takashi Iwai:\n \"This update contains a fairly wide range of changes all over in sound\n subdirectory, mainly because of UAPI header moves by David and __dev*\n annotation removals by Bill. Other highlights are:\n\n - Introduced the support for wallclock timestamps in ALSA PCM core\n\n - Add the poll loop implementation for HD-audio jack detection\n\n - Yet more VGA-switcheroo fixes for HD-audio\n\n - New VIA HD-audio codec support\n\n - More fixes on resource management in USB audio and MIDI drivers\n\n - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,\n Roland VG-99, etc\n\n - Add support for FastTrack C400 usb-audio\n\n - Clean ups in many drivers regarding firmware loading\n\n - Add PSC724 Ultiimate Edge support to ice1712\n\n - A few hdspm driver updates\n\n - New Stanton SCS.1d/1m FireWire driver\n\n - Standardisation of the logging in ASoC codes\n\n - DT and dmaengine support for ASoC Atmel\n\n - Support for Wolfson ADSP cores\n\n - New drivers for Freescale/iVeia P1022 and Maxim MAX98090\n\n - Lots of other ASoC driver fixes and developments\"\n\nFix up trivial conflicts. And go out on a limb and assume the dts file\n\u0027status\u0027 field of one of the conflicting things was supposed to be\n\"disabled\", not \"disable\" like in pretty much all other cases.\n\n* tag \u0027sound-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)\n ALSA: hda - Move runtime PM check to runtime_idle callback\n ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522\n ALSA: hda - Avoid doubly suspend after vga switcheroo\n ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3\n ALSA: hda - Check validity of CORB/RIRB WP reads\n ALSA: hda - use usleep_range in link reset and change timeout check\n ALSA: HDA: VIA: Add support for codec VT1808.\n ALSA: HDA: VIA Add support for codec VT1705CF.\n ASoC: codecs: remove __dev* attributes\n ASoC: utils: remove __dev* attributes\n ASoC: ux500: remove __dev* attributes\n ASoC: txx9: remove __dev* attributes\n ASoC: tegra: remove __dev* attributes\n ASoC: spear: remove __dev* attributes\n ASoC: sh: remove __dev* attributes\n ASoC: s6000: remove __dev* attributes\n ASoC: OMAP: remove __dev* attributes\n ASoC: nuc900: remove __dev* attributes\n ASoC: mxs: remove __dev* attributes\n ASoC: kirkwood: remove __dev* attributes\n ...\n" }, { "commit": "a11da7df6543b5f71a150b47c0d08ecf0799a0f3", "tree": "77eaac99426f64a0a8dc3b5d62c86138a8c72d43", "parents": [ "b8edf848e9119bab9d999b9ca80d8520641810f2", "9c7466b217af784280d9fc841bbd559ef3bf33e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 10:58:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 10:58:20 2012 -0800" }, "message": "Merge tag \u0027pm-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC power management and clock changes from Olof Johansson:\n \"This branch contains a largeish set of updates of power management and\n clock setup. The bulk of it is for OMAP/AM33xx platforms, but also a\n few around hotplug/suspend/resume on Exynos.\n\n It includes a split-up of some of the OMAP clock data into separate\n files which adds to the diffstat, but gross delta is fairly reasonable.\"\n\n* tag \u0027pm-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)\n ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h\n ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support\n watchdog: OMAP: fixup for ARM multiplatform support\n ARM: EXYNOS: Add flush_cache_all in suspend finisher\n ARM: EXYNOS: Remove scu_enable from cpuidle\n ARM: EXYNOS: Fix soft reboot hang after suspend/resume\n ARM: EXYNOS: Add support for rtc wakeup\n ARM: EXYNOS: fix the hotplug for Cortex-A15\n ARM: OMAP2+: omap_device: Correct resource handling for DT boot\n ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type\n ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count\n ARM: OMAP2+: PRM: initialize some PRM functions early\n ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM\u003dn\n ARM: OMAP4: USB: power down MUSB PHY during boot\n ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts\n ARM: OMAP2xxx: clock: drop obsolete clock data\n ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts\n ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections\n ARM: AM33xx: clock: drop obsolete clock data\n ARM: OMAP3xxx: clk: drop obsolete clock data\n ...\n" }, { "commit": "b8edf848e9119bab9d999b9ca80d8520641810f2", "tree": "76517286b247626ed37dda41a4f946f6c34b8bff", "parents": [ "db5b0ae00712b5176d7405e7a1dd2bfd6e8f5070", "3f54db784a6af9a6d53396949cbecf62edbad247" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 10:57:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 10:57:16 2012 -0800" }, "message": "Merge tag \u0027multiplatform\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC multiplatform conversion patches from Olof Johansson:\n \"Here are more patches in the progression towards multiplatform, sparse\n irq conversions in particular.\n\n Tegra has a handful of cleanups and general groundwork, but is not\n quite there yet on full enablement.\n\n Platforms that are enabled through this branch are VT8500 and Zynq.\n Note that i.MX was converted in one of the earlier cleanup branches as\n well (before we started a separate topic for multiplatform). And both\n new platforms for this merge window, sunxi and bcm, were merged with\n multiplatform support enabled.\"\n\nFix up conflicts mostly as per Olof.\n\n* tag \u0027multiplatform\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)\n ARM: zynq: Remove all unused mach headers\n ARM: zynq: add support for ARCH_MULTIPLATFORM\n ARM: zynq: make use of debug_ll_io_init()\n ARM: zynq: remove TTC early mapping\n ARM: tegra: move debug-macro.S to include/debug\n ARM: tegra: don\u0027t include iomap.h from debug-macro.S\n ARM: tegra: decouple uncompress.h and debug-macro.S\n ARM: tegra: simplify DEBUG_LL UART selection options\n ARM: tegra: select SPARSE_IRQ\n ARM: tegra: enhance timer.c to get IO address from device tree\n ARM: tegra: enhance timer.c to get IRQ info from device tree\n ARM: timer: fix checkpatch warnings\n ARM: tegra: add TWD to device tree\n ARM: tegra: define DT bindings for and instantiate RTC\n ARM: tegra: define DT bindings for and instantiate timer\n clocksource/mtu-nomadik: use apb_pclk\n clk: ux500: Register mtu apb_pclocks\n ARM: plat-nomadik: convert platforms to SPARSE_IRQ\n mfd/db8500-prcmu: use the irq_domain_add_simple()\n mfd/ab8500-core: use irq_domain_add_simple()\n ...\n" }, { "commit": "241738bd51cb0efe58e6c570223153e970afe3ae", "tree": "05263e1ec3fbd58cc4ba5ee69163612fbb769a4a", "parents": [ "bdf20507da11a9a5b32ef04fa09f352828189aef", "ce8f0d0607bcad3ec0e8599be80353204427093e" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Dec 13 19:40:13 2012 +0100" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Dec 13 19:40:13 2012 +0100" }, "message": "Merge branch \u0027mips-next\u0027 of http://dev.phrozen.org/githttp/mips-next into mips-for-linux-next\n" }, { "commit": "db5b0ae00712b5176d7405e7a1dd2bfd6e8f5070", "tree": "4e874d81ca9037dda1007178bbc9613649d43305", "parents": [ "6be35c700f742e911ecedd07fcc43d4439922334", "64507dd7028e3e0145077e73b8374bd75aea117c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 10:39:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 13 10:39:26 2012 -0800" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC device tree conversions and enablement from Olof Johansson:\n \"Continued device tree conversion and enablement across a number of\n platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other\n smaller series as well.\n\n ux500 has seen continued conversion for platforms. Several platforms\n have seen pinctrl-via-devicetree conversions for simpler\n multiplatform. Tegra is adding data for new devices/drivers, and\n Exynos has a bunch of new bindings and devices added as well.\n\n So, pretty much the same progression in the right direction as the\n last few releases.\"\n\nFix up conflicts as per Olof.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (185 commits)\n ARM: ux500: Rename dbx500 cpufreq code to be more generic\n ARM: dts: add missing ux500 device trees\n ARM: ux500: Stop registering the PCM driver from platform code\n ARM: ux500: Move board specific GPIO info out to subordinate DTS files\n ARM: ux500: Disable the MMCI gpio-regulator by default\n ARM: Kirkwood: remove kirkwood_ehci_init() from new boards\n ARM: Kirkwood: Add support LED of OpenBlocks A6\n ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6\n ARM: kirkwood: Add NAND partiton map for OpenBlocks A6\n ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6\n ARM: kirkwood: Add support DT of second I2C bus\n ARM: kirkwood: Convert mplcec4 board to pinctrl\n ARM: Kirkwood: Convert km_kirkwood to pinctrl\n ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl\n ARM: Kirkwood: Convert IX2-200 to pinctrl.\n ARM: Kirkwood: Convert lsxl boards to pinctrl.\n ARM: Kirkwood: Convert ib62x0 to pinctrl.\n ARM: Kirkwood: Convert GoFlex Net to pinctrl.\n ARM: Kirkwood: Convert dreamplug to pinctrl.\n ARM: Kirkwood: Convert dockstar to pinctrl.\n ...\n" }, { "commit": "6be35c700f742e911ecedd07fcc43d4439922334", "tree": "ca9f37214d204465fcc2d79c82efd291e357c53c", "parents": [ "e37aa63e87bd581f9be5555ed0ba83f5295c92fc", "520dfe3a3645257bf83660f672c47f8558f3d4c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 18:07:07 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 18:07:07 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking changes from David Miller:\n\n1) Allow to dump, monitor, and change the bridge multicast database\n using netlink. From Cong Wang.\n\n2) RFC 5961 TCP blind data injection attack mitigation, from Eric\n Dumazet.\n\n3) Networking user namespace support from Eric W. Biederman.\n\n4) tuntap/virtio-net multiqueue support by Jason Wang.\n\n5) Support for checksum offload of encapsulated packets (basically,\n tunneled traffic can still be checksummed by HW). From Joseph\n Gasparakis.\n\n6) Allow BPF filter access to VLAN tags, from Eric Dumazet and\n Daniel Borkmann.\n\n7) Bridge port parameters over netlink and BPDU blocking support\n from Stephen Hemminger.\n\n8) Improve data access patterns during inet socket demux by rearranging\n socket layout, from Eric Dumazet.\n\n9) TIPC protocol updates and cleanups from Ying Xue, Paul Gortmaker, and\n Jon Maloy.\n\n10) Update TCP socket hash sizing to be more in line with current day\n realities. The existing heurstics were choosen a decade ago.\n From Eric Dumazet.\n\n11) Fix races, queue bloat, and excessive wakeups in ATM and\n associated drivers, from Krzysztof Mazur and David Woodhouse.\n\n12) Support DOVE (Distributed Overlay Virtual Ethernet) extensions\n in VXLAN driver, from David Stevens.\n\n13) Add \"oops_only\" mode to netconsole, from Amerigo Wang.\n\n14) Support set and query of VEB/VEPA bridge mode via PF_BRIDGE, also\n allow DCB netlink to work on namespaces other than the initial\n namespace. From John Fastabend.\n\n15) Support PTP in the Tigon3 driver, from Matt Carlson.\n\n16) tun/vhost zero copy fixes and improvements, plus turn it on\n by default, from Michael S. Tsirkin.\n\n17) Support per-association statistics in SCTP, from Michele\n Baldessari.\n\nAnd many, many, driver updates, cleanups, and improvements. Too\nnumerous to mention individually.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)\n net/mlx4_en: Add support for destination MAC in steering rules\n net/mlx4_en: Use generic etherdevice.h functions.\n net: ethtool: Add destination MAC address to flow steering API\n bridge: add support of adding and deleting mdb entries\n bridge: notify mdb changes via netlink\n ndisc: Unexport ndisc_{build,send}_skb().\n uapi: add missing netconf.h to export list\n pkt_sched: avoid requeues if possible\n solos-pci: fix double-free of TX skb in DMA mode\n bnx2: Fix accidental reversions.\n bna: Driver Version Updated to 3.1.2.1\n bna: Firmware update\n bna: Add RX State\n bna: Rx Page Based Allocation\n bna: TX Intr Coalescing Fix\n bna: Tx and Rx Optimizations\n bna: Code Cleanup and Enhancements\n ath9k: check pdata variable before dereferencing it\n ath5k: RX timestamp is reported at end of frame\n ath9k_htc: RX timestamp is reported at end of frame\n ...\n" }, { "commit": "98870901cce098bbe94d90d2c41d8d1fa8d94392", "tree": "958332e0e55eb80cded9f2e9d889ab1e391fd786", "parents": [ "66521d5aa6c0f74b5e90c21569acbaa8c5ac0998" ], "author": { "name": "Lin Feng", "email": "linfeng@cn.fujitsu.com", "time": "Wed Dec 12 13:52:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:35 2012 -0800" }, "message": "mm/bootmem.c: remove unused wrapper function reserve_bootmem_generic()\n\nreserve_bootmem_generic() has no caller,\n\nSigned-off-by: Lin Feng \u003clinfeng@cn.fujitsu.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Yinghai Lu \u003cyinghai@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": "816422ad76474fed8052b6f7b905a054d082e59a", "tree": "9918f68e9c5f93be98940b4b7b478e1637547926", "parents": [ "56f2fb147659e05b1e87b99791bf44b988d38545" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Wed Dec 12 13:52:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:35 2012 -0800" }, "message": "asm-generic, mm: pgtable: consolidate zero page helpers\n\nWe have two different implementation of is_zero_pfn() and my_zero_pfn()\nhelpers: for architectures with and without zero page coloring.\n\nLet\u0027s consolidate them in \u003casm-generic/pgtable.h\u003e.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.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": "9feedc9d831e18ae6d0d15aa562e5e46ba53647b", "tree": "cb26ff54b0f02c4905772288b27f99b8b384ad6d", "parents": [ "c2d23f919bafcbc2259f5257d9a7d729802f0e3a" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Dec 12 13:52:12 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:34 2012 -0800" }, "message": "mm: introduce new field \"managed_pages\" to struct zone\n\nCurrently a zone\u0027s present_pages is calcuated as below, which is\ninaccurate and may cause trouble to memory hotplug.\n\n\tspanned_pages - absent_pages - memmap_pages - dma_reserve.\n\nDuring fixing bugs caused by inaccurate zone-\u003epresent_pages, we found\nzone-\u003epresent_pages has been abused. The field zone-\u003epresent_pages may\nhave different meanings in different contexts:\n\n1) pages existing in a zone.\n2) pages managed by the buddy system.\n\nFor more discussions about the issue, please refer to:\n http://lkml.org/lkml/2012/11/5/866\n https://patchwork.kernel.org/patch/1346751/\n\nThis patchset tries to introduce a new field named \"managed_pages\" to\nstruct zone, which counts \"pages managed by the buddy system\". And revert\nzone-\u003epresent_pages to count \"physical pages existing in a zone\", which\nalso keep in consistence with pgdat-\u003enode_present_pages.\n\nWe will set an initial value for zone-\u003emanaged_pages in function\nfree_area_init_core() and will adjust it later if the initial value is\ninaccurate.\n\nFor DMA/normal zones, the initial value is set to:\n\n\t(spanned_pages - absent_pages - memmap_pages - dma_reserve)\n\nLater zone-\u003emanaged_pages will be adjusted to the accurate value when the\nbootmem allocator frees all free pages to the buddy system in function\nfree_all_bootmem_node() and free_all_bootmem().\n\nThe bootmem allocator doesn\u0027t touch highmem pages, so highmem zones\u0027\nmanaged_pages is set to the accurate value \"spanned_pages - absent_pages\"\nin function free_area_init_core() and won\u0027t be updated anymore.\n\nThis patch also adds a new field \"managed_pages\" to /proc/zoneinfo\nand sysrq showmem.\n\n[akpm@linux-foundation.org: small comment tweaks]\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Maciej Rutecki \u003cmaciej.rutecki@gmail.com\u003e\nTested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nCc: \"Rafael J . Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20b2f52b73febce476fc9376f0296c1aa0e4f5a7", "tree": "037d74ec3666d3dfc7c235c7b59b11ed9b29d3b4", "parents": [ "68ae564bbac8eb9ed54ddd2529b0e29ee190b355" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Wed Dec 12 13:52:00 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:34 2012 -0800" }, "message": "numa: add CONFIG_MOVABLE_NODE for movable-dedicated node\n\nWe need a node which only contains movable memory. This feature is very\nimportant for node hotplug. If a node has normal/highmem, the memory may\nbe used by the kernel and can\u0027t be offlined. If the node only contains\nmovable memory, we can offline the memory and the node.\n\nAll are prepared, we can actually introduce N_MEMORY.\nadd CONFIG_MOVABLE_NODE make we can use it for movable-dedicated node\n\n[akpm@linux-foundation.org: fix Kconfig text]\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nTested-by: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nSigned-off-by: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "68ae564bbac8eb9ed54ddd2529b0e29ee190b355", "tree": "5cef83b5fa072f62091552457e7d0319ce170b98", "parents": [ "05b0afd73d04109d87f00ccd39f099e217c37263" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Dec 12 13:51:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:34 2012 -0800" }, "message": "mm, memcg: avoid unnecessary function call when memcg is disabled\n\nWhile profiling numa/core v16 with cgroup_disable\u003dmemory on the command\nline, I noticed mem_cgroup_count_vm_event() still showed up as high as\n0.60% in perftop.\n\nThis occurs because the function is called extremely often even when memcg\nis disabled.\n\nTo fix this, inline the check for mem_cgroup_disabled() so we avoid the\nunnecessary function call if memcg is disabled.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Glauber Costa \u003cglommer@parallels.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "05b0afd73d04109d87f00ccd39f099e217c37263", "tree": "0f1506b53cdc1e0b84d3d1784b4dbc1776ae0394", "parents": [ "2897b4d29d9fca82a57b09b8a216a5d604966e4b" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Dec 12 13:51:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:34 2012 -0800" }, "message": "mm: add a reminder comment for __GFP_BITS_SHIFT\n\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44e33e8f95171b93968c3ac3cf8516998b1db65d", "tree": "b0b56f8454b400e545f57bb63e767327bc72c788", "parents": [ "6715ddf94576ff39f5d1cda8d4c568d3b79e82ec" ], "author": { "name": "Greg Thelen", "email": "gthelen@google.com", "time": "Wed Dec 12 13:51:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:33 2012 -0800" }, "message": "res_counter: delete res_counter_write()\n\nSince commit 628f42355389 (\"memcg: limit change shrink usage\") both\nres_counter_write() and write_strategy_fn have been unused. This patch\ndeletes them both.\n\nSigned-off-by: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6715ddf94576ff39f5d1cda8d4c568d3b79e82ec", "tree": "208f32528f28a4ee1d2cff6836830c900ff7f31f", "parents": [ "4b0ef1fe8a626f0ba7f649764f979d0dc9eab86b" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Wed Dec 12 13:51:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:33 2012 -0800" }, "message": "hotplug: update nodemasks management\n\nUpdate nodemasks management for N_MEMORY.\n\n[lliubbo@gmail.com: fix build]\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nSigned-off-by: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Lin Feng \u003clinfeng@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "38d7bee9d24adf4c95676a3dc902827c72930ebb", "tree": "f61a6ae69f5976d31bfabe264dd36c8d4d7e3547", "parents": [ "8219fc48adb3b09eabf502c560bf13f273ea69a3" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Wed Dec 12 13:51:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:32 2012 -0800" }, "message": "cpuset: use N_MEMORY instead N_HIGH_MEMORY\n\nN_HIGH_MEMORY stands for the nodes that has normal or high memory.\nN_MEMORY stands for the nodes that has any memory.\n\nThe code here need to handle with the nodes which have memory, we should\nuse N_MEMORY instead.\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Lin Feng \u003clinfeng@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8219fc48adb3b09eabf502c560bf13f273ea69a3", "tree": "3054133bbce79097ce4bad7c2667742fe1cd0469", "parents": [ "be49a6e13537f32f85bd8c4ba04317ca36ca60ff" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Wed Dec 12 13:51:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:32 2012 -0800" }, "message": "mm: node_states: introduce N_MEMORY\n\nWe have N_NORMAL_MEMORY for standing for the nodes that have normal memory\nwith zone_type \u003c\u003d ZONE_NORMAL.\n\nAnd we have N_HIGH_MEMORY for standing for the nodes that have normal or\nhigh memory.\n\nBut we don\u0027t have any word to stand for the nodes that have *any* memory.\n\nAnd we have N_CPU but without N_MEMORY.\n\nCurrent code reuse the N_HIGH_MEMORY for this purpose because any node\nwhich has memory must have high memory or normal memory currently.\n\nA)\tBut this reusing is bad for *readability*. Because the name\n\tN_HIGH_MEMORY just stands for high or normal:\n\nA.example 1)\n\tmem_cgroup_nr_lru_pages():\n\t\tfor_each_node_state(nid, N_HIGH_MEMORY)\n\n\tThe user will be confused(why this function just counts for high or\n\tnormal memory node? does it counts for ZONE_MOVABLE\u0027s lru pages?)\n\tuntil someone else tell them N_HIGH_MEMORY is reused to stand for\n\tnodes that have any memory.\n\nA.cont) If we introduce N_MEMORY, we can reduce this confusing\n\tAND make the code more clearly:\n\nA.example 2) mm/page_cgroup.c use N_HIGH_MEMORY twice:\n\n\tOne is in page_cgroup_init(void):\n\t\tfor_each_node_state(nid, N_HIGH_MEMORY) {\n\n\tIt means if the node have memory, we will allocate page_cgroup map for\n\tthe node. We should use N_MEMORY instead here to gaim more clearly.\n\n\tThe second using is in alloc_page_cgroup():\n\t\tif (node_state(nid, N_HIGH_MEMORY))\n\t\t\taddr \u003d vzalloc_node(size, nid);\n\n\tIt means if the node has high or normal memory that can be allocated\n\tfrom kernel. We should keep N_HIGH_MEMORY here, and it will be better\n\tif the \"any memory\" semantic of N_HIGH_MEMORY is removed.\n\nB)\tThis reusing is out-dated if we introduce MOVABLE-dedicated node.\n\tThe MOVABLE-dedicated node should not appear in\n\tnode_stats[N_HIGH_MEMORY] nor node_stats[N_NORMAL_MEMORY],\n\tbecause MOVABLE-dedicated node has no high or normal memory.\n\n\tIn x86_64, N_HIGH_MEMORY\u003dN_NORMAL_MEMORY, if a MOVABLE-dedicated node\n\tis in node_stats[N_HIGH_MEMORY], it is also means it is in\n\tnode_stats[N_NORMAL_MEMORY], it causes SLUB wrong.\n\n\tThe slub uses\n\t\tfor_each_node_state(nid, N_NORMAL_MEMORY)\n\tand creates kmem_cache_node for MOVABLE-dedicated node and cause problem.\n\nIn one word, we need a N_MEMORY. We just intrude it as an alias to\nN_HIGH_MEMORY and fix all im-proper usages of N_HIGH_MEMORY in late\npatches.\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Christoph Lameter \u003ccl@linux.com\u003e\nAcked-by: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Lin Feng \u003clinfeng@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "79da5407eeadc740fbf4b45d6df7d7f8e6adaf2c", "tree": "a9f1ca92b2711bb84a4707c904fcada24614d60e", "parents": [ "d8a8e1f0da3d29d7268b3300c96a059d63901b76" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Wed Dec 12 13:51:12 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:32 2012 -0800" }, "message": "thp: introduce sysfs knob to disable huge zero page\n\nBy default kernel tries to use huge zero page on read page fault. It\u0027s\npossible to disable huge zero page by writing 0 or enable it back by\nwriting 1:\n\necho 0 \u003e/sys/kernel/mm/transparent_hugepage/khugepaged/use_zero_page\necho 1 \u003e/sys/kernel/mm/transparent_hugepage/khugepaged/use_zero_page\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@linux.intel.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8a8e1f0da3d29d7268b3300c96a059d63901b76", "tree": "46bd195f1cf4fd66c87f7d16c6bf043ad7fda9ff", "parents": [ "97ae17497e996ff09bf97b6db3b33f7fd4029092" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Wed Dec 12 13:51:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:32 2012 -0800" }, "message": "thp, vmstat: implement HZP_ALLOC and HZP_ALLOC_FAILED events\n\nhzp_alloc is incremented every time a huge zero page is successfully\n\tallocated. It includes allocations which where dropped due\n\trace with other allocation. Note, it doesn\u0027t count every map\n\tof the huge zero page, only its allocation.\n\nhzp_alloc_failed is incremented if kernel fails to allocate huge zero\n\tpage and falls back to using small pages.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@linux.intel.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e180377f1ae48b3cbc559c9875d9b038f7f000c6", "tree": "c51e0db181acc0372479bce5cd68b99abca7d8bb", "parents": [ "cad7f613c4d010e1d0f05c9a4fb33c7ae40ba115" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Wed Dec 12 13:50:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:31 2012 -0800" }, "message": "thp: change split_huge_page_pmd() interface\n\nPass vma instead of mm and add address parameter.\n\nIn most cases we already have vma on the stack. We provides\nsplit_huge_page_pmd_mm() for few cases when we have mm, but not vma.\n\nThis change is preparation to huge zero pmd splitting implementation.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@linux.intel.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "93b4796dede916de74b21fbd637588da6a99a7ec", "tree": "3833de6051bb1b8d361a614743aafa56b43902e1", "parents": [ "fc9fe822f7112db23e51e2be3b886f5d8f0afdb6" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Wed Dec 12 13:50:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 17:38:31 2012 -0800" }, "message": "thp: do_huge_pmd_wp_page(): handle huge zero page\n\nOn write access to huge zero page we alloc a new huge page and clear it.\n\nIf ENOMEM, graceful fallback: we create a new pmd table and set pte around\nfault address to newly allocated normal (4k) page. All other ptes in the\npmd set to normal zero page.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@linux.intel.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "818b930bc15077fc00ff16bb22c5df1857f05afa", "tree": "d799c1037eb55e5f8bdecf72d5fdd45ab4f57569", "parents": [ "f9af7b9edccb87d4d80b58687ab63e58f3b64c4c", "b5531318f18b5054c0e4a82beb560a77d85948d8", "7a7d6d9c5fcd4b674da38e814cfc0724c67731b2", "1b42fc4a2889729c740321eb487f887161e38428", "955dca354c3c02850409e773fcbd625ac68dd5e7", "68fd32b8228a62ca7f46ed64da8267daad29480b", "4529eefad087f97b33c0f31984d924b1f15d7bae" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 12 21:41:55 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 12 21:41:55 2012 +0100" }, "message": "Merge branches \u0027for-3.7/upstream-fixes\u0027, \u0027for-3.8/hidraw\u0027, \u0027for-3.8/i2c-hid\u0027, \u0027for-3.8/multitouch\u0027, \u0027for-3.8/roccat\u0027, \u0027for-3.8/sensors\u0027 and \u0027for-3.8/upstream\u0027 into for-linus\n\nConflicts:\n\tdrivers/hid/hid-core.c\n" }, { "commit": "9977d9b379cb77e0f67bd6f4563618106e58e11d", "tree": "0191accfddf578edb52c69c933d64521e3dce297", "parents": [ "cf4af01221579a4e895f43dbfc47598fbfc5a731", "541880d9a2c7871f6370071d55aa6662d329c51e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 12:22:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 12:22:13 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull big execve/kernel_thread/fork unification series from Al Viro:\n \"All architectures are converted to new model. Quite a bit of that\n stuff is actually shared with architecture trees; in such cases it\u0027s\n literally shared branch pulled by both, not a cherry-pick.\n\n A lot of ugliness and black magic is gone (-3KLoC total in this one):\n\n - kernel_thread()/kernel_execve()/sys_execve() redesign.\n\n We don\u0027t do syscalls from kernel anymore for either kernel_thread()\n or kernel_execve():\n\n kernel_thread() is essentially clone(2) with callback run before we\n return to userland, the callbacks either never return or do\n successful do_execve() before returning.\n\n kernel_execve() is a wrapper for do_execve() - it doesn\u0027t need to\n do transition to user mode anymore.\n\n As a result kernel_thread() and kernel_execve() are\n arch-independent now - they live in kernel/fork.c and fs/exec.c\n resp. sys_execve() is also in fs/exec.c and it\u0027s completely\n architecture-independent.\n\n - daemonize() is gone, along with its parts in fs/*.c\n\n - struct pt_regs * is no longer passed to do_fork/copy_process/\n copy_thread/do_execve/search_binary_handler/-\u003eload_binary/do_coredump.\n\n - sys_fork()/sys_vfork()/sys_clone() unified; some architectures\n still need wrappers (ones with callee-saved registers not saved in\n pt_regs on syscall entry), but the main part of those suckers is in\n kernel/fork.c now.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (113 commits)\n do_coredump(): get rid of pt_regs argument\n print_fatal_signal(): get rid of pt_regs argument\n ptrace_signal(): get rid of unused arguments\n get rid of ptrace_signal_deliver() arguments\n new helper: signal_pt_regs()\n unify default ptrace_signal_deliver\n flagday: kill pt_regs argument of do_fork()\n death to idle_regs()\n don\u0027t pass regs to copy_process()\n flagday: don\u0027t pass regs to copy_thread()\n bfin: switch to generic vfork, get rid of pointless wrappers\n xtensa: switch to generic clone()\n openrisc: switch to use of generic fork and clone\n unicore32: switch to generic clone(2)\n score: switch to generic fork/vfork/clone\n c6x: sanitize copy_thread(), get rid of clone(2) wrapper, switch to generic clone()\n take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h\n mn10300: switch to generic fork/vfork/clone\n h8300: switch to generic fork/vfork/clone\n tile: switch to generic clone()\n ...\n\nConflicts:\n\tarch/microblaze/include/asm/Kbuild\n" }, { "commit": "d027db132b395dabfac208e52a7e510e441bb9d2", "tree": "24b055b2385f9848e77e646ce475991d8675c3c4", "parents": [ "d01e4afdbb65e030fd6f1f96c30a558e2eb0f279", "5faf7cbb848da827f6ea1458b5a1c26a44e7510a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 12:05:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 12:05:15 2012 -0800" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC updates from Olof Johansson:\n \"This contains the bulk of new SoC development for this merge window.\n\n Two new platforms have been added, the sunxi platforms (Allwinner A1x\n SoCs) by Maxime Ripard, and a generic Broadcom platform for a new\n series of ARMv7 platforms from them, where the hope is that we can\n keep the platform code generic enough to have them all share one mach\n directory. The new Broadcom platform is contributed by Christian\n Daudt.\n\n Highbank has grown support for Calxeda\u0027s next generation of hardware,\n ECX-2000.\n\n clps711x has seen a lot of cleanup from Alexander Shiyan, and he\u0027s\n also taken on maintainership of the platform.\n\n Beyond this there has been a bunch of work from a number of people on\n converting more platforms to IRQ domains, pinctrl conversion, cleanup\n and general feature enablement across most of the active platforms.\"\n\nFix up trivial conflicts as per Olof.\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)\n mfd: vexpress-sysreg: Remove LEDs code\n irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids\n clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids\n irq: versatile: delete dangling variable\n ARM: sunxi: add missing include for mdelay()\n ARM: EXYNOS: Avoid early use of of_machine_is_compatible()\n ARM: dts: add node for PL330 MDMA1 controller for exynos4\n ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412\n ARM: EXYNOS: add UART3 to DEBUG_LL ports\n ARM: S3C24XX: Add clkdev entry for camif-upll clock\n ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers\n ARM: sunxi: Add missing sun4i.dtsi file\n pinctrl: samsung: Do not initialise statics to 0\n ARM i.MX6: remove gate_mask from pllv3\n ARM i.MX6: Fix ethernet PLL clocks\n ARM i.MX6: rename PLLs according to datasheet\n ARM i.MX6: Add pwm support\n ARM i.MX51: Add pwm support\n ARM i.MX53: Add pwm support\n ARM: mx5: Replace clk_register_clkdev with clock DT lookup\n ...\n" }, { "commit": "d01e4afdbb65e030fd6f1f96c30a558e2eb0f279", "tree": "02ef82b2740cf93a98199eded5ef765fa6e03052", "parents": [ "8287361abca36504da813638310d2547469283eb", "794b175fc0c0c4844dbb7b137a73bbfd01f6c608" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 11:51:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 11:51:39 2012 -0800" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC cleanups on various subarchitectures from Olof Johansson:\n \"Cleanup patches for various ARM platforms and some of their associated\n drivers. There\u0027s also a branch in here that enables Freescale i.MX to\n be part of the multiplatform support -- the first \"big\" SoC that is\n moved over (more multiplatform work comes in a separate branch later\n during the merge window).\"\n\nConflicts fixed as per Olof, including a silent semantic one in\narch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to\nomap3xxx_restart(), and a new user of the old name was added).\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)\n ARM: omap: fix typo on timer cleanup\n ARM: EXYNOS: Remove unused regs-mem.h file\n ARM: EXYNOS: Remove unused non-dt support for dwmci controller\n ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan\n ARM: OMAP3: cm-t3517: use GPTIMER for system clock\n ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER\n ARM: SAMSUNG: use devm_ functions for ADC driver\n ARM: EXYNOS: no duplicate mask/unmask in eint0_15\n ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443\n ARM: EXYNOS: Remove i2c0 resource information and setting of device names\n ARM: Kirkwood: checkpatch cleanups\n ARM: Kirkwood: Fix sparse warnings.\n ARM: Kirkwood: Remove unused includes\n ARM: kirkwood: cleanup lsxl board includes\n ARM: integrator: use BUG_ON where possible\n ARM: integrator: push down SC dependencies\n ARM: integrator: delete static UART1 mapping\n ARM: integrator: delete SC mapping on the CP\n ARM: integrator: remove static CP syscon mapping\n ARM: integrator: remove static AP syscon mapping\n ...\n" }, { "commit": "8287361abca36504da813638310d2547469283eb", "tree": "8d98e9a910885efdb09ae5390a3ae44040557e2f", "parents": [ "2989950cea13711f0cc573c26cde8fe08a36be03", "8556650dd3370a927217f16444aac5cc0c71e61b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 11:45:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 11:45:16 2012 -0800" }, "message": "Merge tag \u0027headers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC Header cleanups from Olof Johansson:\n \"This is a collection of header file cleanups, mostly for OMAP and\n AT91, that keeps moving the platforms in the direction of\n multiplatform by removing the need for mach-dependent header files\n used in drivers and other places.\"\n\nFix up mostly trivial conflicts as per Olof.\n\n* tag \u0027headers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits)\n ARM: OMAP2+: Move iommu/iovmm headers to platform_data\n ARM: OMAP2+: Make some definitions local\n ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c\n ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h\n ARM: OMAP2+: Move iopgtable header to drivers/iommu/\n ARM: OMAP: Merge iommu2.h into iommu.h\n atmel: move ATMEL_MAX_UART to platform_data/atmel.h\n ARM: OMAP: Remove omap_init_consistent_dma_size()\n arm: at91: move at91rm9200 rtc header in drivers/rtc\n arm: at91: move reset controller header to arm/arm/mach-at91\n arm: at91: move pit define to the driver\n arm: at91: move at91_shdwc.h to arch/arm/mach-at91\n arm: at91: move board header to arch/arm/mach-at91\n arn: at91: move at91_tc.h to arch/arm/mach-at91\n arm: at91 move at91_aic.h to arch/arm/mach-at91\n arm: at91 move board.h to arch/arm/mach-at91\n arm: at91: move platfarm_data to include/linux/platform_data/atmel.h\n arm: at91: drop machine defconfig\n ARM: OMAP: Remove NEED_MACH_GPIO_H\n ARM: OMAP: Remove unnecessary mach and plat includes\n ...\n" }, { "commit": "b1286f4e9ac14c8973140b338b4d3c5691264d3b", "tree": "5a67788bb2276cd67230d24b5a6994ddafb10707", "parents": [ "6facac1ab68fbf9cbad31a9d521f3a0d6aa9470e", "0fa5d3996dbda1ee9653c43d39b7ef159fb57ee7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 11:30:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 11:30:02 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM updates from Russell King:\n \"Here\u0027s the updates for ARM for this merge window, which cover quite a\n variety of areas.\n\n There\u0027s a bunch of patch series from Will tackling various bugs like\n the PROT_NONE handling, ASID allocation, cluster boot protocol and\n ASID TLB tagging updates.\n\n We move to a build-time sorted exception table rather than doing the\n sorting at run-time, add support for the secure computing filter, and\n some updates to the perf code. We also have sorted out the placement\n of some headers, fixed some build warnings, fixed some hotplug\n problems with the per-cpu TWD code.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (73 commits)\n ARM: 7594/1: Add .smp entry for REALVIEW_EB\n ARM: 7599/1: head: Remove boot-time HYP mode check for v5 and below\n ARM: 7598/1: net: bpf_jit_32: fix sp-relative load/stores offsets.\n ARM: 7595/1: syscall: rework ordering in syscall_trace_exit\n ARM: 7596/1: mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep\n ARM: 7597/1: net: bpf_jit_32: fix kzalloc gfp/size mismatch.\n ARM: 7593/1: nommu: do not enable DCACHE_WORD_ACCESS when !CONFIG_MMU\n ARM: 7592/1: nommu: prevent generation of kernel unaligned memory accesses\n ARM: 7591/1: nommu: Enable the strict alignment (CR_A) bit only if ARCH \u003c v6\n ARM: 7590/1: /proc/interrupts: limit the display of IPIs to online CPUs only\n ARM: 7587/1: implement optimized percpu variable access\n ARM: 7589/1: integrator: pass the lm resource to amba\n ARM: 7588/1: amba: create a resource parent registrator\n ARM: 7582/2: rename kvm_seq to vmalloc_seq so to avoid confusion with KVM\n ARM: 7585/1: kernel: fix nr_cpu_ids check in DT logical map init\n ARM: 7584/1: perf: fix link error when CONFIG_HW_PERF_EVENTS is not selected\n ARM: gic: use a private mapping for CPU target interfaces\n ARM: kernel: add logical mappings look-up\n ARM: kernel: add cpu logical map DT init in setup_arch\n ARM: kernel: add device tree init map function\n ...\n" }, { "commit": "d206e09036d6201f90b2719484c8a59526c46125", "tree": "84b9057919bcb8cfd1cff47baa5fc74457e77d6d", "parents": [ "fef3ff2eb777e76cfa5ae67591982d902c17139c", "15ef4ffaa797034d5ff82844daf8f595d7c6d53c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 08:18:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 08:18:24 2012 -0800" }, "message": "Merge branch \u0027for-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup changes from Tejun Heo:\n \"A lot of activities on cgroup side. The big changes are focused on\n making cgroup hierarchy handling saner.\n\n - cgroup_rmdir() had peculiar semantics - it allowed cgroup\n destruction to be vetoed by individual controllers and tried to\n drain refcnt synchronously. The vetoing never worked properly and\n caused good deal of contortions in cgroup. memcg was the last\n reamining user. Michal Hocko removed the usage and cgroup_rmdir()\n path has been simplified significantly. This was done in a\n separate branch so that the memcg people can base further memcg\n changes on top.\n\n - The above allowed cleaning up cgroup lifecycle management and\n implementation of generic cgroup iterators which are used to\n improve hierarchy support.\n\n - cgroup_freezer updated to allow migration in and out of a frozen\n cgroup and handle hierarchy. If a cgroup is frozen, all descendant\n cgroups are frozen.\n\n - netcls_cgroup and netprio_cgroup updated to handle hierarchy\n properly.\n\n - Various fixes and cleanups.\n\n - Two merge commits. One to pull in memcg and rmdir cleanups (needed\n to build iterators). The other pulled in cgroup/for-3.7-fixes for\n device_cgroup fixes so that further device_cgroup patches can be\n stacked on top.\"\n\nFixed up a trivial conflict in mm/memcontrol.c as per Tejun (due to\ncommit bea8c150a7 (\"memcg: fix hotplugged memory zone oops\") in master\ntouching code close to commit 2ef37d3fe4 (\"memcg: Simplify\nmem_cgroup_force_empty_list error handling\") in for-3.8)\n\n* \u0027for-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (65 commits)\n cgroup: update Documentation/cgroups/00-INDEX\n cgroup_rm_file: don\u0027t delete the uncreated files\n cgroup: remove subsystem files when remounting cgroup\n cgroup: use cgroup_addrm_files() in cgroup_clear_directory()\n cgroup: warn about broken hierarchies only after css_online\n cgroup: list_del_init() on removed events\n cgroup: fix lockdep warning for event_control\n cgroup: move list add after list head initilization\n netprio_cgroup: allow nesting and inherit config on cgroup creation\n netprio_cgroup: implement netprio[_set]_prio() helpers\n netprio_cgroup: use cgroup-\u003eid instead of cgroup_netprio_state-\u003eprioidx\n netprio_cgroup: reimplement priomap expansion\n netprio_cgroup: shorten variable names in extend_netdev_table()\n netprio_cgroup: simplify write_priomap()\n netcls_cgroup: move config inheritance to -\u003ecss_online() and remove .broken_hierarchy marking\n cgroup: remove obsolete guarantee from cgroup_task_migrate.\n cgroup: add cgroup-\u003eid\n cgroup, cpuset: remove cgroup_subsys-\u003epost_clone()\n cgroup: s/CGRP_CLONE_CHILDREN/CGRP_CPUSET_CLONE_CHILDREN/\n cgroup: rename -\u003ecreate/post_create/pre_destroy/destroy() to -\u003ecss_alloc/online/offline/free()\n ...\n" }, { "commit": "50851c6248e1a13c45d97c41f6ebcf716093aa5e", "tree": "792c5721aab6669ca14716a1220222a99c0a3fc3", "parents": [ "99b8f42ee2ab93077154f09d397cdc1dfb15926e", "1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:57:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:57:13 2012 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux\n\nPull thermal management update from Zhang Rui:\n \"Highlights:\n\n - Introduction of thermal policy support, together with three new\n thermal governors, including step_wise, user_space, fire_share.\n\n - Introduction of ST-Ericsson db8500_thermal driver and ST-Ericsson\n db8500_cpufreq_cooling driver.\n\n - Thermal Kconfig file and Makefile refactor.\n\n - Fixes for generic thermal layer, generic cpucooling, rcar thermal\n driver and Exynos thermal driver.\"\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)\n Thermal: Fix DEFAULT_THERMAL_GOVERNOR\n Thermal: fix a NULL pointer dereference when generic thermal layer is built as a module\n thermal: rcar: add rcar_zone_to_priv() macro\n thermal: rcar: fixup the unit of temperature\n thermal: cpu cooling: allow module builds\n thermal: cpu cooling: use const parameter while registering\n Thermal: Add ST-Ericsson DB8500 thermal properties and platform data.\n Thermal: Add ST-Ericsson DB8500 thermal driver.\n drivers/thermal/Makefile refactor\n Exynos: Add missing dependency\n Refactor drivers/thermal/Kconfig\n thermal: cpu_cooling: Make \u0027notify_device\u0027 static\n Thermal: Remove the cooling_cpufreq_list.\n Thermal: fix bug of counting cpu frequencies.\n Thermal: add indent for code alignment.\n thermal: rcar_thermal: remove explicitly used devm_kfree/iounap()\n thermal: user_space: Add missing static storage class specifiers\n thermal: fair_share: Add missing static storage class specifiers\n thermal: step_wise: Add missing static storage class specifiers\n Thermal: Fix oops and unlocking in thermal_sys.c\n ...\n" }, { "commit": "99b8f42ee2ab93077154f09d397cdc1dfb15926e", "tree": "5a76a94a568fcf306743f9708b940410fab1ad14", "parents": [ "139353ffbe42ac7abda42f3259c1c374cbf4b779", "7c8a2994309214cbb6dba33cd72ec85f91fd6fcd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:55:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:55:48 2012 -0800" }, "message": "Merge tag \u0027regmap-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull regmap updates from Mark Brown:\n \"Quite a few enhancements this time around, helpers and diagnostics for\n the most part which is good to see:\n\n - Addition of table based lookups for the register access checks from\n Davide Ciminaghi, making life easier for drivers with big blocks of\n similar registers.\n - Allow drivers to get the irqdomain for regmap irq_chips, allowing\n the domain to be used with other APIs.\n - Debug improvements for paged register maps.\n - Performance improvments for some of the diagnostic infrastructure,\n very helpful for devices with large register maps.\"\n\n* tag \u0027regmap-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:\n regmap: debugfs: Cache offsets of valid regions for dump\n regmap: debugfs: Factor out initial seek\n regmap: debugfs: Avoid overflows for very small reads\n regmap: Cache register and value sizes for debugfs\n regmap: introduce tables for readable/writeable/volatile/precious checks\n regmap: core: Report registers in hex when we can\u0027t cache\n regmap: Fix printing of size_t variable\n regmap: make lock/unlock functions customizable\n regmap: silence GCC warning\n regmap: Split raw writes that cross window boundaries\n regmap: Make return code checks consistent\n regmap: Factor range lookup out of page selection\n regmap: Provide debugfs read of register ranges\n regmap: Factor out debugfs register read\n regmap: Allow ranges to be named\n regmap: When we sanity check during range adds say what errors we find\n regmap: Rename n_ranges to num_ranges\n regmap: irq: Allow users to retrieve the irq_domain\n" }, { "commit": "251a8cfeda7c8a0ff26c62659a2358d3b4ff32df", "tree": "8bff8895744c4eb159124a62750e89dadd9d17f8", "parents": [ "70f2836d023237868f2fef3625da84643e5aaf33", "f94ec0c0594ef73ab3a2f1f32735aca8ddaf65e2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:50:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:50:59 2012 -0800" }, "message": "Merge tag \u0027please-pull-pstore_mevent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\nPull pstore fixes from Tony Luck:\n \"Patch series to allow EFI variable backend to pstore to hold multiple\n records.\"\n\n* tag \u0027please-pull-pstore_mevent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n efi_pstore: Add a format check for an existing variable name at erasing time\n efi_pstore: Add a format check for an existing variable name at reading time\n efi_pstore: Add a sequence counter to a variable name\n efi_pstore: Add ctime to argument of erase callback\n efi_pstore: Remove a logic erasing entries from a write callback to hold multiple logs\n efi_pstore: Add a logic erasing entries to an erase callback\n efi_pstore: Check remaining space with QueryVariableInfo() before writing data\n" }, { "commit": "83499b52c61f50292f0aae36499de8a8fc3e37c3", "tree": "e9e64260fc9aa83cfc6c34bc5226c5252b84c68c", "parents": [ "1a1e8c6fada5f6dc48aa5dad453c9d9ebfdc8218" ], "author": { "name": "Alexander Holler", "email": "holler@ahsoftware.de", "time": "Sun Dec 09 12:44:30 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 12 16:49:10 2012 +0100" }, "message": "HID: sensors: autodetect USB HID sensor hubs\n\nIt should not be necessary to add IDs for HID sensor hubs to lists in\nhid-core.c and hid-sensor-hub.c. So instead of a whitelist, autodetect such USB\nHID sensor hubs, based on a collection of type physical inside a useage page of\ntype sensor. If some sensor hubs stil must be usable as raw devices, a\nblacklist might be created.\n\nSigned-off-by: Alexander Holler \u003choller@ahsoftware.de\u003e\nAcked-by: \"Pandruvada, Srinivas\" \u003csrinivas.pandruvada@intel.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d07e43d70eef15a44a2c328a913d8d633a90e088", "tree": "7a7cac7c90f4b8f19edfb2aecfa27d77e266eafc", "parents": [ "1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf", "3af08bd7adb09b0806c51c06b87db08cc7075568" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:45:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 07:45:16 2012 -0800" }, "message": "Merge branch \u0027omap-serial\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM OMAP serial updates from Russell King:\n \"This series is a major reworking of the OMAP serial driver code fixing\n various bugs in the hardware-assisted flow control, extending up into\n serial_core for a couple of issues. These fixes have been done as a\n set of progressive changes and transformations in the hope that no new\n bugs will be introduced by this series.\n\n The problems are many-fold, from the driver not being informed about\n updated settings, to the driver not knowing what the intentions of the\n upper layers are.\n\n The first four patches tackle the serial_core layer, allowing it to\n provide the necessary information to drivers, and the remaining\n patches allow the OMAP serial driver to take advantage of this.\n\n This brings hardware assisted RTS/CTS and XON/OFF flow control into a\n useful state.\n\n These patches have been in linux-next for most of the last cycle;\n indeed they predate the previous merge window. They\u0027ve also been\n posted to the OMAP people.\"\n\n* \u0027omap-serial\u0027 of git://git.linaro.org/people/rmk/linux-arm: (21 commits)\n SERIAL: omap: fix hardware assisted flow control\n SERIAL: omap: simplify (2)\n SERIAL: omap: move xon/xoff setting earlier\n SERIAL: omap: always set TCR\n SERIAL: omap: simplify\n SERIAL: omap: don\u0027t read back LCR/MCR/EFR\n SERIAL: omap: serial_omap_configure_xonxoff() contents into set_termios\n SERIAL: omap: configure xon/xoff before setting modem control lines\n SERIAL: omap: remove OMAP_UART_SYSC_RESET and OMAP_UART_FIFO_CLR\n SERIAL: omap: move driver private definitions and structures to driver\n SERIAL: omap: remove \u0027irq_pending\u0027 bitfield\n SERIAL: omap: fix MCR TCRTLR bit handling\n SERIAL: omap: fix set_mctrl() breakage\n SERIAL: omap: no need to re-read EFR\n SERIAL: omap: remove setting of EFR SCD bit\n SERIAL: omap: allow hardware assisted IXANY mode to be disabled\n SERIAL: omap: allow hardware assisted rts/cts modes to be disabled\n SERIAL: core: add throttle/unthrottle callbacks for hardware assisted flow control\n SERIAL: core: add hardware assisted h/w flow control support\n SERIAL: core: add hardware assisted s/w flow control support\n ...\n\nConflicts:\n\tdrivers/tty/serial/omap-serial.c\n" }, { "commit": "1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95", "tree": "1f26888dcdd55e44293124344c64a219b928958e", "parents": [ "d567c686aebc7140f73318ee250236bda39c04eb" ], "author": { "name": "Zhang Rui", "email": "rui.zhang@intel.com", "time": "Wed Dec 12 15:31:37 2012 +0800" }, "committer": { "name": "Zhang Rui", "email": "rui.zhang@intel.com", "time": "Wed Dec 12 15:34:48 2012 +0800" }, "message": "Thermal: Fix DEFAULT_THERMAL_GOVERNOR\n\nFix DEFAULT_THERMAL_GOVERNOR to be consistant with the\ndefault governor selected in kernel config file.\n\nSigned-off-by: Zhang Rui \u003crui.zhang@intel.com\u003e\n" }, { "commit": "76d8a23b127020472207b281427d3e9f4f1227e4", "tree": "e14d7063d96d850fb259115d6fb08cbeb98ccf88", "parents": [ "eba3b670a9166a91be5a11fe33290dca6b9457a2", "1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf" ], "author": { "name": "Anton Vorontsov", "email": "anton.vorontsov@linaro.org", "time": "Tue Dec 11 22:15:57 2012 -0800" }, "committer": { "name": "Anton Vorontsov", "email": "anton.vorontsov@linaro.org", "time": "Tue Dec 11 22:15:57 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux\n\nThe merge is merely to fix conflicts before sending a pull request.\n\nConflicts:\n\tdrivers/power/ab8500_btemp.c\n\tdrivers/power/ab8500_charger.c\n\tdrivers/power/ab8500_fg.c\n\tdrivers/power/abx500_chargalg.c\n\tdrivers/power/max8925_power.c\n\nSigned-off-by: Anton Vorontsov \u003canton.vorontsov@linaro.org\u003e\n" }, { "commit": "b64c5fda3868cb29d5dae0909561aa7d93fb7330", "tree": "2ac4be822f32fe5a8e8f33138be81b221ff52384", "parents": [ "f57d54bab696133fae569c5f01352249c36fc74f", "9c3f9e281697d02889c3b08922f3b30be75f56c2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:22:46 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:22:46 2012 -0800" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull core timer changes from Ingo Molnar:\n \"It contains continued generic-NOHZ work by Frederic and smaller\n cleanups.\"\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n time: Kill xtime_lock, replacing it with jiffies_lock\n clocksource: arm_generic: use this_cpu_ptr per-cpu helper\n clocksource: arm_generic: use integer math helpers\n time/jiffies: Make clocksource_jiffies static\n clocksource: clean up parse_pmtmr()\n tick: Correct the comments for tick_sched_timer()\n tick: Conditionally build nohz specific code in tick handler\n tick: Consolidate tick handling for high and low res handlers\n tick: Consolidate timekeeping handling code\n" }, { "commit": "f57d54bab696133fae569c5f01352249c36fc74f", "tree": "8ebe3c6deaf95c424c86843c3d290fbf2a9e80d2", "parents": [ "da830e589a45f0c42eef6f3cbd07275f8893f181", "c1ad41f1f7270c1956da13fa8fd59d8d5929d56e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:21:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:21:38 2012 -0800" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler updates from Ingo Molnar:\n \"The biggest change affects group scheduling: we now track the runnable\n average on a per-task entity basis, allowing a smoother, exponential\n decay average based load/weight estimation instead of the previous\n binary on-the-runqueue/off-the-runqueue load weight method.\n\n This will inevitably disturb workloads that were in some sort of\n borderline balancing state or unstable equilibrium, so an eye has to\n be kept on regressions.\n\n For that reason the new load average is only limited to group\n scheduling (shares distribution) at the moment (which was also hurting\n the most from the prior, crude weight calculation and whose scheduling\n quality wins most from this change) - but we plan to extend this to\n regular SMP balancing as well in the future, which will simplify and\n speed up things a bit.\n\n Other changes involve ongoing preparatory work to extend NOHZ to the\n scheduler as well, eventually allowing completely irq-free user-space\n execution.\"\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)\n Revert \"sched/autogroup: Fix crash on reboot when autogroup is disabled\"\n cputime: Comment cputime\u0027s adjusting code\n cputime: Consolidate cputime adjustment code\n cputime: Rename thread_group_times to thread_group_cputime_adjusted\n cputime: Move thread_group_cputime() to sched code\n vtime: Warn if irqs aren\u0027t disabled on system time accounting APIs\n vtime: No need to disable irqs on vtime_account()\n vtime: Consolidate a bit the ctx switch code\n vtime: Explicitly account pending user time on process tick\n vtime: Remove the underscore prefix invasion\n sched/autogroup: Fix crash on reboot when autogroup is disabled\n cputime: Separate irqtime accounting from generic vtime\n cputime: Specialize irq vtime hooks\n kvm: Directly account vtime to system on guest switch\n vtime: Make vtime_account_system() irqsafe\n vtime: Gather vtime declarations to their own header file\n sched: Describe CFS load-balancer\n sched: Introduce temporary FAIR_GROUP_SCHED dependency for load-tracking\n sched: Make __update_entity_runnable_avg() fast\n sched: Update_cfs_shares at period edge\n ...\n" }, { "commit": "090f8ccba37034cec5a5972a70abeaae7eb0222b", "tree": "0b7cf8a4bb94601816399acfb336835fbf309a2a", "parents": [ "aefb058b0c27dafb15072406fbfd92d2ac2c8790", "cc1b39dbf9f55a438e8a21a694394c20e6a17129" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:14:31 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:14:31 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf updates from Ingo Molnar:\n \"Lots of activity:\n\n 211 files changed, 8328 insertions(+), 4116 deletions(-)\n\n most of it on the tooling side.\n\n Main changes:\n\n * ftrace enhancements and fixes from Steve Rostedt.\n\n * uprobes fixes, cleanups and preparation for the ARM port from Oleg\n Nesterov.\n\n * UAPI fixes, from David Howels - prepares the arch/x86 UAPI\n transition\n\n * Separate perf tests into multiple objects, one per test, from Jiri\n Olsa.\n\n * Make hardware event translations available in sysfs, from Jiri\n Olsa.\n\n * Fixes to /proc/pid/maps parsing, preparatory to supporting data\n maps, from Namhyung Kim\n\n * Implement ui_progress for GTK, from Namhyung Kim\n\n * Add framework for automated perf_event_attr tests, where tools with\n different command line options will be run from a \u0027perf test\u0027, via\n python glue, and the perf syscall will be intercepted to verify\n that the perf_event_attr fields set by the tool are those expected,\n from Jiri Olsa\n\n * Add a \u0027link\u0027 method for hists, so that we can have the leader with\n buckets for all the entries in all the hists. This new method is\n now used in the default \u0027diff\u0027 output, making the sum of the\n \u0027baseline\u0027 column be 100%, eliminating blind spots.\n\n * libtraceevent fixes for compiler warnings trying to make perf it\n build on some distros, like fedora 14, 32-bit, some of the warnings\n really pointed to real bugs.\n\n * Add a browser for \u0027perf script\u0027 and make it available from the\n report and annotate browsers. It does filtering to find the\n scripts that handle events found in the perf.data file used. From\n Feng Tang\n\n * perf inject changes to allow showing where a task sleeps, from\n Andrew Vagin.\n\n * Makefile improvements from Namhyung Kim.\n\n * Add --pre and --post command hooks in \u0027stat\u0027, from Peter Zijlstra.\n\n * Don\u0027t stop synthesizing threads when one vanishes, this is for the\n existing threads when we start a tool like trace.\n\n * Use sched:sched_stat_runtime to provide a thread summary, this\n produces the same output as the \u0027trace summary\u0027 subcommand of\n tglx\u0027s original \"trace\" tool.\n\n * Support interrupted syscalls in \u0027trace\u0027\n\n * Add an event duration column and filter in \u0027trace\u0027.\n\n * There are references to the man pages in some tools, so try to\n build Documentation when installing, warning the user if that is\n not possible, from Borislav Petkov.\n\n * Give user better message if precise is not supported, from David\n Ahern.\n\n * Try to find cross-built objdump path by using the session\n environment information in the perf.data file header, from Irina\n Tirdea, original patch and idea by Namhyung Kim.\n\n * Diplays more output on features check for make V\u003d1, so that one can\n figure out what is happening by looking at gcc output, etc. From\n Jiri Olsa.\n\n * Add on_exit implementation for systems without one, e.g. Android,\n from Bernhard Rosenkraenzer.\n\n * Only process events for vcpus of interest, helps handling large\n number of events, from David Ahern.\n\n * Cross compilation fixes for Android, from Irina Tirdea.\n\n * Add documentation on compiling for Android, from Irina Tirdea.\n\n * perf diff improvements from Jiri Olsa.\n\n * Target (task/user/cpu/syswide) handling improvements, from Namhyung\n Kim.\n\n * Add support in \u0027trace\u0027 for tracing workload given by command line,\n from Namhyung Kim.\n\n * ... and much more.\"\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (194 commits)\n uprobes: Use percpu_rw_semaphore to fix register/unregister vs dup_mmap() race\n perf evsel: Introduce is_group_member method\n perf powerpc: Use uapi/unistd.h to fix build error\n tools: Pass the target in descend\n tools: Honour the O\u003d flag when tool build called from a higher Makefile\n tools: Define a Makefile function to do subdir processing\n perf ui: Always compile browser setup code\n perf ui: Add ui_progress__finish()\n perf ui gtk: Implement ui_progress functions\n perf ui: Introduce generic ui_progress helper\n perf ui tui: Move progress.c under ui/tui directory\n perf tools: Add basic event modifier sanity check\n perf tools: Omit group members from perf_evlist__disable/enable\n perf tools: Ensure single disable call per event in record comand\n perf tools: Fix \u0027disabled\u0027 attribute config for record command\n perf tools: Fix attributes for \u0027{}\u0027 defined event groups\n perf tools: Use sscanf for parsing /proc/pid/maps\n perf tools: Add gtk.\u003ccommand\u003e config option for launching GTK browser\n perf tools: Fix compile error on NO_NEWT\u003d1 build\n perf hists: Initialize all of he-\u003estat with zeroes\n ...\n" }, { "commit": "aefb058b0c27dafb15072406fbfd92d2ac2c8790", "tree": "de24b50221cfdbd8ebedb2add38c6125de604c3d", "parents": [ "37ea95a959d4a49846ecbf2dd45326b6b34bf049", "04aa530ec04f61875b99c12721162e2964e3318c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:12:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:12:06 2012 -0800" }, "message": "Merge branch \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull irq fixes from Ingo Molnar:\n \"Affinity fixes and a nested threaded IRQ handling fix.\"\n\n* \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n genirq: Always force thread affinity\n irq: Set CPU affinity right on thread creation\n genirq: Provide means to retrigger parent\n" }, { "commit": "37ea95a959d4a49846ecbf2dd45326b6b34bf049", "tree": "43791e1244ce06d8ca18ecbfd0b0f6dcb86ebb8b", "parents": [ "de0c276b31538fcd56611132f20b63eae2891876", "630e1e0bcddfda9566462d4f9a0d58b31c29d467" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:10:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:10:49 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull RCU update from Ingo Molnar:\n \"The major features of this tree are:\n\n 1. A first version of no-callbacks CPUs. This version prohibits\n offlining CPU 0, but only when enabled via CONFIG_RCU_NOCB_CPU\u003dy.\n Relaxing this constraint is in progress, but not yet ready\n for prime time. These commits were posted to LKML at\n https://lkml.org/lkml/2012/10/30/724.\n\n 2. Changes to SRCU that allows statically initialized srcu_struct\n structures. These commits were posted to LKML at\n https://lkml.org/lkml/2012/10/30/296.\n\n 3. Restructuring of RCU\u0027s debugfs output. These commits were posted\n to LKML at https://lkml.org/lkml/2012/10/30/341.\n\n 4. Additional CPU-hotplug/RCU improvements, posted to LKML at\n https://lkml.org/lkml/2012/10/30/327.\n Note that the commit eliminating __stop_machine() was judged to\n be too-high of risk, so is deferred to 3.9.\n\n 5. Changes to RCU\u0027s idle interface, most notably a new module\n parameter that redirects normal grace-period operations to\n their expedited equivalents. These were posted to LKML at\n https://lkml.org/lkml/2012/10/30/739.\n\n 6. Additional diagnostics for RCU\u0027s CPU stall warning facility,\n posted to LKML at https://lkml.org/lkml/2012/10/30/315.\n The most notable change reduces the\n default RCU CPU stall-warning time from 60 seconds to 21 seconds,\n so that it once again happens sooner than the softlockup timeout.\n\n 7. Documentation updates, which were posted to LKML at\n https://lkml.org/lkml/2012/10/30/280.\n A couple of late-breaking changes were posted at\n https://lkml.org/lkml/2012/11/16/634 and\n https://lkml.org/lkml/2012/11/16/547.\n\n 8. Miscellaneous fixes, which were posted to LKML at\n https://lkml.org/lkml/2012/10/30/309.\n\n 9. Finally, a fix for an lockdep-RCU splat was posted to LKML\n at https://lkml.org/lkml/2012/11/7/486.\"\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (49 commits)\n context_tracking: New context tracking susbsystem\n sched: Mark RCU reader in sched_show_task()\n rcu: Separate accounting of callbacks from callback-free CPUs\n rcu: Add callback-free CPUs\n rcu: Add documentation for the new rcuexp debugfs trace file\n rcu: Update documentation for TREE_RCU debugfs tracing\n rcu: Reduce default RCU CPU stall warning timeout\n rcu: Fix TINY_RCU rcu_is_cpu_rrupt_from_idle check\n rcu: Clarify memory-ordering properties of grace-period primitives\n rcu: Add new rcutorture module parameters to start/end test messages\n rcu: Remove list_for_each_continue_rcu()\n rcu: Fix batch-limit size problem\n rcu: Add tracing for synchronize_sched_expedited()\n rcu: Remove old debugfs interfaces and also RCU flavor name\n rcu: split \u0027rcuhier\u0027 to each flavor\n rcu: split \u0027rcugp\u0027 to each flavor\n rcu: split \u0027rcuboost\u0027 to each flavor\n rcu: split \u0027rcubarrier\u0027 to each flavor\n rcu: Fix tracing formatting\n rcu: Remove the interface \"rcudata.csv\"\n ...\n" }, { "commit": "608ff1a210ab0e8b969399039bf8e18693605910", "tree": "faea7bb1764461c73d0953089bd5439d91733a03", "parents": [ "414a6750e59b0b687034764c464e9ddecac0f7a6", "74d42d8fe146e870c52bde3b1c692f86cc8ff844" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:05:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:05:37 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patchbomb)\n\nMerge misc updates from Andrew Morton:\n \"About half of most of MM. Going very early this time due to\n uncertainty over the coreautounifiednumasched things. I\u0027ll send the\n other half of most of MM tomorrow. The rest of MM awaits a slab merge\n from Pekka.\"\n\n* emailed patches from Andrew Morton: (71 commits)\n memory_hotplug: ensure every online node has NORMAL memory\n memory_hotplug: handle empty zone when online_movable/online_kernel\n mm, memory-hotplug: dynamic configure movable memory and portion memory\n drivers/base/node.c: cleanup node_state_attr[]\n bootmem: fix wrong call parameter for free_bootmem()\n avr32, kconfig: remove HAVE_ARCH_BOOTMEM\n mm: cma: remove watermark hacks\n mm: cma: skip watermarks check for already isolated blocks in split_free_page()\n mm, oom: fix race when specifying a thread as the oom origin\n mm, oom: change type of oom_score_adj to short\n mm: cleanup register_node()\n mm, mempolicy: remove duplicate code\n mm/vmscan.c: try_to_freeze() returns boolean\n mm: introduce putback_movable_pages()\n virtio_balloon: introduce migration primitives to balloon pages\n mm: introduce compaction and migration for ballooned pages\n mm: introduce a common interface for balloon pages mobility\n mm: redefine address_space.assoc_mapping\n mm: adjust address_space_operations.migratepage() return code\n arch/sparc/kernel/sys_sparc_64.c: s/COLOUR/COLOR/\n ...\n" }, { "commit": "511c2aba8f07fc45bdcba548cb63f7b8a450c6dc", "tree": "6a1a853e60e0004f5895d78231ed1bea33fecaac", "parents": [ "fcf07d22f089856631b52a75c35ba3c33b70a1b4" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 11 16:03:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:28 2012 -0800" }, "message": "mm, memory-hotplug: dynamic configure movable memory and portion memory\n\nAdd online_movable and online_kernel for logic memory hotplug. This is\nthe dynamic version of \"movablecore\" \u0026 \"kernelcore\".\n\nWe have the same reason to introduce it as to introduce \"movablecore\" \u0026\n\"kernelcore\". It has the same motive as \"movablecore\" \u0026 \"kernelcore\", but\nit is dynamic/running-time:\n\no We can configure memory as kernelcore or movablecore after boot.\n\n Userspace workload is increased, we need more hugepage, we can\u0027t use\n \"online_movable\" to add memory and allow the system use more\n THP(transparent-huge-page), vice-verse when kernel workload is increase.\n\n Also help for virtualization to dynamic configure host/guest\u0027s memory,\n to save/(reduce waste) memory.\n\n Memory capacity on Demand\n\no When a new node is physically online after boot, we need to use\n \"online_movable\" or \"online_kernel\" to configure/portion it as we\n expected when we logic-online it.\n\n This configuration also helps for physically-memory-migrate.\n\no all benefit as the same as existed \"movablecore\" \u0026 \"kernelcore\".\n\no Preparing for movable-node, which is very important for power-saving,\n hardware partitioning and high-available-system(hardware fault\n management).\n\n(Note, we don\u0027t introduce movable-node here.)\n\nAction behavior:\nWhen a memoryblock/memorysection is onlined by \"online_movable\", the kernel\nwill not have directly reference to the page of the memoryblock,\nthus we can remove that memory any time when needed.\n\nWhen it is online by \"online_kernel\", the kernel can use it.\nWhen it is online by \"online\", the zone type doesn\u0027t changed.\n\nCurrent constraints:\nOnly the memoryblock which is adjacent to the ZONE_MOVABLE\ncan be online from ZONE_NORMAL to ZONE_MOVABLE.\n\n[akpm@linux-foundation.org: use min_t, cleanups]\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nSigned-off-by: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nCc: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nCc: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "81df9bff2609f07cef4690ac2ebda1611b55b05a", "tree": "52c5ebc7e9e5efd93040cba5f0439e043eec368e", "parents": [ "e9b2e78c6a4247b1bb3e89c61e7d73636d2e48d1" ], "author": { "name": "Joonsoo Kim", "email": "js1304@gmail.com", "time": "Tue Dec 11 16:03:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:28 2012 -0800" }, "message": "bootmem: fix wrong call parameter for free_bootmem()\n\nIt is strange that alloc_bootmem() returns a virtual address and\nfree_bootmem() requires a physical address. Anyway, free_bootmem()\u0027s\nfirst parameter should be physical address.\n\nThere are some call sites for free_bootmem() with virtual address. So fix\nthem.\n\n[akpm@linux-foundation.org: improve free_bootmem() and free_bootmem_pate() documentation]\nSigned-off-by: Joonsoo Kim \u003cjs1304@gmail.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bc357f431c836c6631751e3ef7dfe7882394ad67", "tree": "b67904e354a30c9ecc0a53b8288a3a74c37b9bc2", "parents": [ "2e30abd1730751d58463d88bc0844ab8fd7112a9" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Dec 11 16:02:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:27 2012 -0800" }, "message": "mm: cma: remove watermark hacks\n\nCommits 2139cbe627b8 (\"cma: fix counting of isolated pages\") and\nd95ea5d18e69 (\"cma: fix watermark checking\") introduced a reliable\nmethod of free page accounting when memory is being allocated from CMA\nregions, so the workaround introduced earlier by commit 49f223a9cd96\n(\"mm: trigger page reclaim in alloc_contig_range() to stabilise\nwatermarks\") can be finally removed.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cb.zolnierkie@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e1e12d2f3104be886073ac6c5c4678f30b1b9e51", "tree": "b08cba1dba28e18cf7c2ffd8d076ce744e368b5f", "parents": [ "a9c58b907dbc6821533dfc295b63caf111ff1f16" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Tue Dec 11 16:02:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:27 2012 -0800" }, "message": "mm, oom: fix race when specifying a thread as the oom origin\n\ntest_set_oom_score_adj() and compare_swap_oom_score_adj() are used to\nspecify that current should be killed first if an oom condition occurs in\nbetween the two calls.\n\nThe usage is\n\n\tshort oom_score_adj \u003d test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);\n\t...\n\tcompare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX, oom_score_adj);\n\nto store the thread\u0027s oom_score_adj, temporarily change it to the maximum\nscore possible, and then restore the old value if it is still the same.\n\nThis happens to still be racy, however, if the user writes\nOOM_SCORE_ADJ_MAX to /proc/pid/oom_score_adj in between the two calls.\nThe compare_swap_oom_score_adj() will then incorrectly reset the old value\nprior to the write of OOM_SCORE_ADJ_MAX.\n\nTo fix this, introduce a new oom_flags_t member in struct signal_struct\nthat will be used for per-thread oom killer flags. KSM and swapoff can\nnow use a bit in this member to specify that threads should be killed\nfirst in oom conditions without playing around with oom_score_adj.\n\nThis also allows the correct oom_score_adj to always be shown when reading\n/proc/pid/oom_score.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Anton Vorontsov \u003canton.vorontsov@linaro.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a9c58b907dbc6821533dfc295b63caf111ff1f16", "tree": "e50714c48de89400a02a8e92ef4e240c5206bbcc", "parents": [ "fa264375175a382621c5344a6508e02ec4d1c3c0" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Tue Dec 11 16:02:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:27 2012 -0800" }, "message": "mm, oom: change type of oom_score_adj to short\n\nThe maximum oom_score_adj is 1000 and the minimum oom_score_adj is -1000,\nso this range can be represented by the signed short type with no\nfunctional change. The extra space this frees up in struct signal_struct\nwill be used for per-thread oom kill flags in the next patch.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Anton Vorontsov \u003canton.vorontsov@linaro.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fa264375175a382621c5344a6508e02ec4d1c3c0", "tree": "e0641d14919f69c39db1e53353e3b5e21c1b455f", "parents": [ "212a0a6f28dda0a1e732d20d57abb465750d473c" ], "author": { "name": "Yasuaki Ishimatsu", "email": "isimatu.yasuaki@jp.fujitsu.com", "time": "Tue Dec 11 16:02:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:27 2012 -0800" }, "message": "mm: cleanup register_node()\n\nregister_node() is defined as extern in include/linux/node.h. But the\nfunction is only called from register_one_node() in driver/base/node.c.\n\nSo the patch defines register_node() as static.\n\nSigned-off-by: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5733c7d11dff44e98d2ca16617886a78086b354f", "tree": "2d7b982297b3be46b765123fad9d7d446b4cbdb3", "parents": [ "e22504296d4f64fbbbd741602ab47ee874649c18" ], "author": { "name": "Rafael Aquini", "email": "aquini@redhat.com", "time": "Tue Dec 11 16:02:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:27 2012 -0800" }, "message": "mm: introduce putback_movable_pages()\n\nThe PATCH \"mm: introduce compaction and migration for virtio ballooned pages\"\nhacks around putback_lru_pages() in order to allow ballooned pages to be\nre-inserted on balloon page list as if a ballooned page was like a LRU page.\n\nAs ballooned pages are not legitimate LRU pages, this patch introduces\nputback_movable_pages() to properly cope with cases where the isolated\npageset contains ballooned pages and LRU pages, thus fixing the mentioned\ninelegant hack around putback_lru_pages().\n\nSigned-off-by: Rafael Aquini \u003caquini@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Minchan Kim \u003cminchan@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": "18468d93e53b037e1a04ec58398eab763d054064", "tree": "74392b876400391567f55bb5292107b65e3791a2", "parents": [ "252aa6f5be64c90c67b9f066ccff880f6b487d32" ], "author": { "name": "Rafael Aquini", "email": "aquini@redhat.com", "time": "Tue Dec 11 16:02:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:26 2012 -0800" }, "message": "mm: introduce a common interface for balloon pages mobility\n\nMemory fragmentation introduced by ballooning might reduce significantly\nthe number of 2MB contiguous memory blocks that can be used within a guest,\nthus imposing performance penalties associated with the reduced number of\ntransparent huge pages that could be used by the guest workload.\n\nThis patch introduces a common interface to help a balloon driver on\nmaking its page set movable to compaction, and thus allowing the system\nto better leverage the compation efforts on memory defragmentation.\n\n[akpm@linux-foundation.org: use PAGE_FLAGS_CHECK_AT_PREP, s/__balloon_page_flags/page_flags_cleared/, small cleanups]\n[rientjes@google.com: allow balloon compaction for any system with memory compaction enabled, which is the defconfig]\nSigned-off-by: Rafael Aquini \u003caquini@redhat.com\u003e\nAcked-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "252aa6f5be64c90c67b9f066ccff880f6b487d32", "tree": "9bb13ada4d838d232d761f45aa9e1a0b26a40cff", "parents": [ "78bd52097d04205a33a8014a1b8ac01cf1ae9d06" ], "author": { "name": "Rafael Aquini", "email": "aquini@redhat.com", "time": "Tue Dec 11 16:02:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:26 2012 -0800" }, "message": "mm: redefine address_space.assoc_mapping\n\nOverhaul struct address_space.assoc_mapping renaming it to\naddress_space.private_data and its type is redefined to void*. By this\napproach we consistently name the .private_* elements from struct\naddress_space as well as allow extended usage for address_space\nassociation with other data structures through -\u003eprivate_data.\n\nAlso, all users of old -\u003eassoc_mapping element are converted to reflect\nits new name and type change (-\u003eprivate_data).\n\nSigned-off-by: Rafael Aquini \u003caquini@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Minchan Kim \u003cminchan@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": "78bd52097d04205a33a8014a1b8ac01cf1ae9d06", "tree": "4f86e6e56a9e3a3d49e9c46042b3ce980cc04dbc", "parents": [ "748ba883ba2818890a73461ef7dde1eed17ad89f" ], "author": { "name": "Rafael Aquini", "email": "aquini@redhat.com", "time": "Tue Dec 11 16:02:31 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:26 2012 -0800" }, "message": "mm: adjust address_space_operations.migratepage() return code\n\nMemory fragmentation introduced by ballooning might reduce significantly\nthe number of 2MB contiguous memory blocks that can be used within a\nguest, thus imposing performance penalties associated with the reduced\nnumber of transparent huge pages that could be used by the guest workload.\n\nThis patch-set follows the main idea discussed at 2012 LSFMMS session:\n\"Ballooning for transparent huge pages\" -- http://lwn.net/Articles/490114/\nto introduce the required changes to the virtio_balloon driver, as well as\nthe changes to the core compaction \u0026 migration bits, in order to make\nthose subsystems aware of ballooned pages and allow memory balloon pages\nbecome movable within a guest, thus avoiding the aforementioned\nfragmentation issue\n\nFollowing are numbers that prove this patch benefits on allowing\ncompaction to be more effective at memory ballooned guests.\n\nResults for STRESS-HIGHALLOC benchmark, from Mel Gorman\u0027s mmtests suite,\nrunning on a 4gB RAM KVM guest which was ballooning 512mB RAM in 64mB\nchunks, at every minute (inflating/deflating), while test was running:\n\n\u003d\u003d\u003dBEGIN stress-highalloc\n\nSTRESS-HIGHALLOC\n highalloc-3.7 highalloc-3.7\n rc4-clean rc4-patch\nPass 1 55.00 ( 0.00%) 62.00 ( 7.00%)\nPass 2 54.00 ( 0.00%) 62.00 ( 8.00%)\nwhile Rested 75.00 ( 0.00%) 80.00 ( 5.00%)\n\nMMTests Statistics: duration\n 3.7 3.7\n rc4-clean rc4-patch\nUser 1207.59 1207.46\nSystem 1300.55 1299.61\nElapsed 2273.72 2157.06\n\nMMTests Statistics: vmstat\n 3.7 3.7\n rc4-clean rc4-patch\nPage Ins 3581516 2374368\nPage Outs 11148692 10410332\nSwap Ins 80 47\nSwap Outs 3641 476\nDirect pages scanned 37978 33826\nKswapd pages scanned 1828245 1342869\nKswapd pages reclaimed 1710236 1304099\nDirect pages reclaimed 32207 31005\nKswapd efficiency 93% 97%\nKswapd velocity 804.077 622.546\nDirect efficiency 84% 91%\nDirect velocity 16.703 15.682\nPercentage direct scans 2% 2%\nPage writes by reclaim 79252 9704\nPage writes file 75611 9228\nPage writes anon 3641 476\nPage reclaim immediate 16764 11014\nPage rescued immediate 0 0\nSlabs scanned 2171904 2152448\nDirect inode steals 385 2261\nKswapd inode steals 659137 609670\nKswapd skipped wait 1 69\nTHP fault alloc 546 631\nTHP collapse alloc 361 339\nTHP splits 259 263\nTHP fault fallback 98 50\nTHP collapse fail 20 17\nCompaction stalls 747 499\nCompaction success 244 145\nCompaction failures 503 354\nCompaction pages moved 370888 474837\nCompaction move failure 77378 65259\n\n\u003d\u003d\u003dEND stress-highalloc\n\nThis patch:\n\nIntroduce MIGRATEPAGE_SUCCESS as the default return code for\naddress_space_operations.migratepage() method and documents the expected\nreturn code for the same method in failure cases.\n\nSigned-off-by: Rafael Aquini \u003caquini@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Minchan Kim \u003cminchan@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": "db4fbfb9523c93583c339e66023506f651c1d54b", "tree": "8dfc250bb2249feaafe27c11cc4de5a654815833", "parents": [ "e4c6bfd2d79d063017ab19a18915f0bc759f32d9" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Tue Dec 11 16:01:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:25 2012 -0800" }, "message": "mm: vm_unmapped_area() lookup function\n\nImplement vm_unmapped_area() using the rb_subtree_gap and highest_vm_end\ninformation to look up for suitable virtual address space gaps.\n\nstruct vm_unmapped_area_info is used to define the desired allocation\nrequest:\n - lowest or highest possible address matching the remaining constraints\n - desired gap length\n - low/high address limits that the gap must fit into\n - alignment mask and offset\n\nAlso update the generic arch_get_unmapped_area[_topdown] functions to make\nuse of vm_unmapped_area() instead of implementing a brute force search.\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4c6bfd2d79d063017ab19a18915f0bc759f32d9", "tree": "4f97a0303f939a7846a86c7ade2533a8e2712f29", "parents": [ "5a0768f641a5bad844860e67250baf0d1aa5e03c" ], "author": { "name": "Rik van Riel", "email": "riel@surriel.com", "time": "Tue Dec 11 16:01:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:25 2012 -0800" }, "message": "mm: rearrange vm_area_struct for fewer cache misses\n\nThe kernel walks the VMA rbtree in various places, including the page\nfault path. However, the vm_rb node spanned two cache lines, on 64 bit\nsystems with 64 byte cache lines (most x86 systems).\n\nRearrange vm_area_struct a little, so all the information we need to do a\nVMA tree walk is in the first cache line.\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d37371870ceb1d2165397dc36114725b6dca946c", "tree": "907bed40a8b2b3a66da1531fe8ff7183639a5cc3", "parents": [ "fcc1f2d5dd3480214ab52e06d081d123019814ed" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Tue Dec 11 16:01:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:25 2012 -0800" }, "message": "mm: augment vma rbtree with rb_subtree_gap\n\nDefine vma-\u003erb_subtree_gap as the largest gap between any vma in the\nsubtree rooted at that vma, and their predecessor. Or, for a recursive\ndefinition, vma-\u003erb_subtree_gap is the max of:\n\n - vma-\u003evm_start - vma-\u003evm_prev-\u003evm_end\n - rb_subtree_gap fields of the vmas pointed by vma-\u003erb.rb_left and\n vma-\u003erb.rb_right\n\nThis will allow get_unmapped_area_* to find a free area of the right\nsize in O(log(N)) time, instead of potentially having to do a linear\nwalk across all the VMAs.\n\nAlso define mm-\u003ehighest_vm_end as the vm_end field of the highest vma,\nso that we can easily check if the following gap is suitable.\n\nThis does have the potential to make unmapping VMAs more expensive,\nespecially for processes with very large numbers of VMAs, where the VMA\nrbtree can grow quite deep.\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "42d7395feb56f0655cd8b68e06fc6063823449f8", "tree": "47cfbad1737d98d9752a2aab7e525f1fe5194d27", "parents": [ "ff604cf6d41f1e05f34762e1d764fe14a0f5f964" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Tue Dec 11 16:01:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:25 2012 -0800" }, "message": "mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB\n\nThere was some desire in large applications using MAP_HUGETLB or\nSHM_HUGETLB to use 1GB huge pages on some mappings, and stay with 2MB on\nothers. This is useful together with NUMA policy: use 2MB interleaving\non some mappings, but 1GB on local mappings.\n\nThis patch extends the IPC/SHM syscall interfaces slightly to allow\nspecifying the page size.\n\nIt borrows some upper bits in the existing flag arguments and allows\nencoding the log of the desired page size in addition to the *_HUGETLB\nflag. When 0 is specified the default size is used, this makes the\nchange fully compatible.\n\nExtending the internal hugetlb code to handle this is straight forward.\nInstead of a single mount it just keeps an array of them and selects the\nright mount based on the specified page size. When no page size is\nspecified it uses the mount of the default page size.\n\nThe change is not visible in /proc/mounts because internal mounts don\u0027t\nappear there. It also has very little overhead: the additional mounts\njust consume a super block, but not more memory when not used.\n\nI also exported the new flags to the user headers (they were previously\nunder __KERNEL__). Right now only symbols for x86 and some other\narchitecture for 1GB and 2MB are defined. The interface should already\nwork for all other architectures though. Only architectures that define\nmultiple hugetlb sizes actually need it (that is currently x86, tile,\npowerpc). However tile and powerpc have user configurable hugetlb\nsizes, so it\u0027s not easy to add defines. A program on those\narchitectures would need to query sysfs and use the appropiate log2.\n\n[akpm@linux-foundation.org: cleanups]\n[rientjes@google.com: fix build]\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1dd450bcb1a05e8218b9aac0ee36f8755d8a140", "tree": "a46f3306e3802b59ed5df6eef0e03b8b11cca30c", "parents": [ "eb2db439a3203ae86c35ad277ac4a3268a94baa1" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Tue Dec 11 16:01:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:24 2012 -0800" }, "message": "mm: thp: set the accessed flag for old pages on access fault\n\nOn x86 memory accesses to pages without the ACCESSED flag set result in\nthe ACCESSED flag being set automatically. With the ARM architecture a\npage access fault is raised instead (and it will continue to be raised\nuntil the ACCESSED flag is set for the appropriate PTE/PMD).\n\nFor normal memory pages, handle_pte_fault will call pte_mkyoung\n(effectively setting the ACCESSED flag). For transparent huge pages,\npmd_mkyoung will only be called for a write fault.\n\nThis patch ensures that faults on transparent hugepages which do not\nresult in a CoW update the access flags for the faulting pmd.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Ni zhan Chen \u003cnizhan.chen@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d9713679dbd2a6ecb840cd5b65a3ec555c1ec3d4", "tree": "b998ae43dc18e7459cab5a2cb5ba12900c96c7e1", "parents": [ "6dcd73d7011ba9046f9b98e7f7c9d958f5810e6b" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 11 16:01:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:23 2012 -0800" }, "message": "memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]\n\nCurrently memory_hotplug only manages the node_states[N_HIGH_MEMORY], it\nforgets to manage node_states[N_NORMAL_MEMORY]. This may cause\nnode_states[N_NORMAL_MEMORY] to become incorrect.\n\nExample, if a node is empty before online, and we online a memory which is\nin ZONE_NORMAL. And after online, node_states[N_HIGH_MEMORY] is correct,\nbut node_states[N_NORMAL_MEMORY] is incorrect, the online code doesn\u0027t set\nthe new online node to node_states[N_NORMAL_MEMORY].\n\nThe same thing will happen when offlining (the offline code doesn\u0027t clear\nthe node from node_states[N_NORMAL_MEMORY] when needed). Some memory\nmanagment code depends node_states[N_NORMAL_MEMORY], so we have to fix up\nthe node_states[N_NORMAL_MEMORY].\n\nWe add node_states_check_changes_online() and\nnode_states_check_changes_offline() to detect whether\nnode_states[N_HIGH_MEMORY] and node_states[N_NORMAL_MEMORY] are changed\nwhile hotpluging.\n\nAlso add @status_change_nid_normal to struct memory_notify, thus the\nmemory hotplug callbacks know whether the node_states[N_NORMAL_MEMORY] are\nchanged. (We can add a @flags and reuse @status_change_nid instead of\nintroducing @status_change_nid_normal, but it will add much more\ncomplexity in memory hotplug callback in every subsystem. So introducing\n@status_change_nid_normal is better and it doesn\u0027t change the sematics of\n@status_change_nid)\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nCc: Rob Landley \u003crob@landley.net\u003e\nCc: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8732794b166196cc501c2ddd9e7c97cf45ab64c5", "tree": "f9a3f04d08054de5d296e0104f61d4a1b13fbfb6", "parents": [ "97d0da2204ed9e34d9d42c2024c5bea5543f13c6" ], "author": { "name": "Wen Congyang", "email": "wency@cn.fujitsu.com", "time": "Tue Dec 11 16:00:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 17:22:23 2012 -0800" }, "message": "numa: convert static memory to dynamically allocated memory for per node device\n\nWe use a static array to store struct node. In many cases, we don\u0027t have\ntoo many nodes, and some memory will be unused. Convert it to per-device\ndynamically allocated memory.\n\nSigned-off-by: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Jiang Liu \u003cliuj97@gmail.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "b023f46813cde6e3b8a8c24f432ff9c1fd8e9a64" }