)]}' { "log": [ { "commit": "8d2763770c34e8ed771f0be86760eb4485febc05", "tree": "38ca3d44f84b8f575f3378c6be525e559bd314c1", "parents": [ "54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f", "1f14c1ac19aa45118054b6d5425873c5c7fc23a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:22:10 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:22:10 2013 -0800" }, "message": "Merge branch \u0027akpm\u0027 (fixes from Andrew)\n\nMerge patches from Andrew Morton:\n \"13 fixes\"\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n mm: memcg: do not allow task about to OOM kill to bypass the limit\n mm: memcg: fix race condition between memcg teardown and swapin\n thp: move preallocated PTE page table on move_huge_pmd()\n mfd/rtc: s5m: fix register updating by adding regmap for RTC\n rtc: s5m: enable IRQ wake during suspend\n rtc: s5m: limit endless loop waiting for register update\n rtc: s5m: fix unsuccesful IRQ request during probe\n drivers/rtc/rtc-s5m.c: fix info-\u003ertc assignment\n include/linux/kernel.h: make might_fault() a nop for !MMU\n drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap\n procfs: also fix proc_reg_get_unmapped_area() for !MMU case\n mm: memcg: do not declare OOM from __GFP_NOFAIL allocations\n include/linux/hugetlb.h: make isolate_huge_page() an inline\n" }, { "commit": "1f14c1ac19aa45118054b6d5425873c5c7fc23a1", "tree": "bb7e0beb99d7808579800382db5e5820d1d2ff39", "parents": [ "96f1c58d853497a757463e0b57fed140d6858f3a" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Dec 12 17:12:35 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mm: memcg: do not allow task about to OOM kill to bypass the limit\n\nCommit 4942642080ea (\"mm: memcg: handle non-error OOM situations more\ngracefully\") allowed tasks that already entered a memcg OOM condition to\nbypass the memcg limit on subsequent allocation attempts hoping this\nwould expedite finishing the page fault and executing the kill.\n\nDavid Rientjes is worried that this breaks memcg isolation guarantees\nand since there is no evidence that the bypass actually speeds up fault\nprocessing just change it so that these subsequent charge attempts fail\noutright. The notable exception being __GFP_NOFAIL charges which are\nrequired to bypass the limit regardless.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nReported-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-bt: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003cstable@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": "96f1c58d853497a757463e0b57fed140d6858f3a", "tree": "9d2c6fca20e2a6de39cb4aff25d015b75615ea64", "parents": [ "3592806cfa08b7cca968f793c33f8e9460bab395" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Dec 12 17:12:34 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mm: memcg: fix race condition between memcg teardown and swapin\n\nThere is a race condition between a memcg being torn down and a swapin\ntriggered from a different memcg of a page that was recorded to belong\nto the exiting memcg on swapout (with CONFIG_MEMCG_SWAP extension). The\nresult is unreclaimable pages pointing to dead memcgs, which can lead to\nanything from endless loops in later memcg teardown (the page is charged\nto all hierarchical parents but is not on any LRU list) or crashes from\nfollowing the dangling memcg pointer.\n\nMemcgs with tasks in them can not be torn down and usually charges don\u0027t\nshow up in memcgs without tasks. Swapin with the CONFIG_MEMCG_SWAP\nextension is the notable exception because it charges the cgroup that\nwas recorded as owner during swapout, which may be empty and in the\nprocess of being torn down when a task in another memcg triggers the\nswapin:\n\n teardown: swapin:\n\n lookup_swap_cgroup_id()\n rcu_read_lock()\n mem_cgroup_lookup()\n css_tryget()\n rcu_read_unlock()\n disable css_tryget()\n call_rcu()\n offline_css()\n reparent_charges()\n res_counter_charge() (hierarchical!)\n css_put()\n css_free()\n pc-\u003emem_cgroup \u003d dead memcg\n add page to dead lru\n\nAdd a final reparenting step into css_free() to make sure any such raced\ncharges are moved out of the memcg before it\u0027s finally freed.\n\nIn the longer term it would be cleaner to have the css_tryget() and the\nres_counter charge under the same RCU lock section so that the charge\nreparenting is deferred until the last charge whose tryget succeeded is\nvisible. But this will require more invasive changes that will be\nharder to evaluate and backport into stable, so better defer them to a\nseparate change set.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003cstable@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": "3592806cfa08b7cca968f793c33f8e9460bab395", "tree": "fb988d60d644cf5b561fff0866e2ee5632874b36", "parents": [ "3e1e4a5f3a324502c27c4e8808e06ac2ea842360" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Thu Dec 12 17:12:33 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "thp: move preallocated PTE page table on move_huge_pmd()\n\nAndrey Wagin reported crash on VM_BUG_ON() in pgtable_pmd_page_dtor() with\nfallowing backtrace:\n\n free_pgd_range+0x2bf/0x410\n free_pgtables+0xce/0x120\n unmap_region+0xe0/0x120\n do_munmap+0x249/0x360\n move_vma+0x144/0x270\n SyS_mremap+0x3b9/0x510\n system_call_fastpath+0x16/0x1b\n\nThe crash can be reproduce with this test case:\n\n #define _GNU_SOURCE\n #include \u003csys/mman.h\u003e\n #include \u003cstdio.h\u003e\n #include \u003cunistd.h\u003e\n\n #define MB (1024 * 1024UL)\n #define GB (1024 * MB)\n\n int main(int argc, char **argv)\n {\n\tchar *p;\n\tint i;\n\n\tp \u003d mmap((void *) GB, 10 * MB, PROT_READ | PROT_WRITE,\n\t\t\tMAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);\n\tfor (i \u003d 0; i \u003c 10 * MB; i +\u003d 4096)\n\t\tp[i] \u003d 1;\n\tmremap(p, 10 * MB, 10 * MB, MREMAP_FIXED | MREMAP_MAYMOVE, 2 * GB);\n\treturn 0;\n }\n\nDue to split PMD lock, we now store preallocated PTE tables for THP\npages per-PMD table. It means we need to move them to other PMD table\nif huge PMD moved there.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nReported-by: Andrey Vagin \u003cavagin@openvz.org\u003e\nTested-by: Andrey Vagin \u003cavagin@openvz.org\u003e\nReviewed-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3e1e4a5f3a324502c27c4e8808e06ac2ea842360", "tree": "ce7ded2263f37dd7c25c7799a24607b2fd6ebc24", "parents": [ "222ead7fd80f455ac377ae20dfeb56cab513db96" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:31 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mfd/rtc: s5m: fix register updating by adding regmap for RTC\n\nRename old regmap field of \"struct sec_pmic_dev\" to \"regmap_pmic\" and\nadd new regmap for RTC.\n\nOn S5M8767A registers were not properly updated and read due to usage of\nthe same regmap as the PMIC. This could be observed in various hangs,\ne.g. in infinite loop during waiting for UDR field change.\n\nOn this chip family the RTC has different I2C address than PMIC so\nadditional regmap is needed.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@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": "222ead7fd80f455ac377ae20dfeb56cab513db96", "tree": "d32eb368882569d2b9ba1d30805b0e3f658b7f9b", "parents": [ "d73238d4a6ca2eadbd14565d769706c85650c641" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:30 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "rtc: s5m: enable IRQ wake during suspend\n\nAdd PM suspend/resume ops to rtc-s5m driver and enable IRQ wake during\nsuspend so the RTC would act like a wake up source. This allows waking\nup from suspend to RAM on RTC alarm interrupt.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@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": "d73238d4a6ca2eadbd14565d769706c85650c641", "tree": "656c58a23c71db744b97e7d4b79d1924c8099cbb", "parents": [ "7b003be82676ddf0bca52e0f98e0694da2ac427f" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:28 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "rtc: s5m: limit endless loop waiting for register update\n\nAfter setting alarm or time the driver is waiting for UDR register to be\ncleared indicating that registers data have been transferred.\n\nLimit the endless loop to only 5 retries.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@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": "7b003be82676ddf0bca52e0f98e0694da2ac427f", "tree": "621a273f3849879d445e1ef4c19c7c97dcfc2e9b", "parents": [ "5ccb7d718e1551ed672b7e2e39fb626dc869594b" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:26 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "rtc: s5m: fix unsuccesful IRQ request during probe\n\nProbe failed for rtc-s5m:\n\n\ts5m-rtc s5m-rtc: Failed to request alarm IRQ: 12: -22\n\ts5m-rtc: probe of s5m-rtc failed with error -22\n\nFix rtc-s5m interrupt request by using regmap_irq_get_virq() for mapping\nthe IRQ.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5ccb7d718e1551ed672b7e2e39fb626dc869594b", "tree": "51519468cf7a03ada5393096ecb4712dd1e85dcc", "parents": [ "386e79066f04850352f144e67edfd5b636c0f95c" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Dec 12 17:12:25 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "drivers/rtc/rtc-s5m.c: fix info-\u003ertc assignment\n\nFix this warning:\n\n drivers/rtc/rtc-s5m.c: In function `s5m_rtc_probe\u0027:\n drivers/rtc/rtc-s5m.c:545: warning: assignment from incompatible pointer type\n\nstruct s5m_rtc_info.rtc has type \"struct regmap *\", while\nstruct sec_pmic_dev.rtc has type \"struct i2c_client *\".\n\nProbably the author wanted to assign \"struct sec_pmic_dev.regmap\", which\nhas the correct type.\n\nAlso, as \"rtc\" doesn\u0027t make much sense as a name for a regmap, rename it\nto \"regmap\".\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Sachin Kamat \u003csachin.kamat@linaro.org\u003e\nTested-by: Krzysztof Kozlowski \u003ck.kozlowski@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": "386e79066f04850352f144e67edfd5b636c0f95c", "tree": "3944d1346d3209e713b6768d1a0c28c520639a4f", "parents": [ "eb3c227289840eed95ddfb0516046f08d8993940" ], "author": { "name": "Axel Lin", "email": "axel.lin@ingics.com", "time": "Thu Dec 12 17:12:24 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "include/linux/kernel.h: make might_fault() a nop for !MMU\n\nThe machine cannot fault if !MUU, so make might_fault() a nop for !MMU.\n\nThis fixes below build error if\n!CONFIG_MMU \u0026\u0026 (CONFIG_PROVE_LOCKING\u003dy || CONFIG_DEBUG_ATOMIC_SLEEP\u003dy):\n\n arch/arm/kernel/built-in.o: In function `arch_ptrace\u0027:\n arch/arm/kernel/ptrace.c:852: undefined reference to `might_fault\u0027\n arch/arm/kernel/built-in.o: In function `restore_sigframe\u0027:\n arch/arm/kernel/signal.c:173: undefined reference to `might_fault\u0027\n ...\n arch/arm/kernel/built-in.o:arch/arm/kernel/signal.c:177: more undefined references to `might_fault\u0027 follow\n make: *** [vmlinux] Error 1\n\nSigned-off-by: Axel Lin \u003caxel.lin@ingics.com\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eb3c227289840eed95ddfb0516046f08d8993940", "tree": "27121b7d09bf85b682ab373c293e0553844adbf5", "parents": [ "ae5758a1a7b7bdfdcfaf2d78a5a0f8675149dd79" ], "author": { "name": "Linus Pizunski", "email": "linus@narrativeteam.com", "time": "Thu Dec 12 17:12:23 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap\n\nUpdate month and day of month to the alarm month/day instead of current\nday/month when setting the RTC alarm mask.\n\nSigned-off-by: Linus Pizunski \u003clinus@narrativeteam.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ae5758a1a7b7bdfdcfaf2d78a5a0f8675149dd79", "tree": "724d6af0adf51da4e34c09bb66c9586f0de945b6", "parents": [ "a0d8b00a3381f9d75764b3377590451cb0b4fe41" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Thu Dec 12 17:12:22 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "procfs: also fix proc_reg_get_unmapped_area() for !MMU case\n\nCommit fad1a86e25e0 (\"procfs: call default get_unmapped_area on\nMMU-present architectures\"), as its title says, took care of only the\nMMU case, leaving the !MMU side still in the regressed state (returning\n-EIO in all cases where pde-\u003eproc_fops-\u003eget_unmapped_area is NULL).\n\nFrom the fad1a86e25e0 changelog:\n\n \"Commit c4fe24485729 (\"sparc: fix PCI device proc file mmap(2)\") added\n proc_reg_get_unmapped_area in proc_reg_file_ops and\n proc_reg_file_ops_no_compat, by which now mmap always returns EIO if\n get_unmapped_area method is not defined for the target procfs file, which\n causes regression of mmap on /proc/vmcore.\n\n To address this issue, like get_unmapped_area(), call default\n current-\u003emm-\u003eget_unmapped_area on MMU-present architectures if\n pde-\u003eproc_fops-\u003eget_unmapped_area, i.e. the one in actual file operation\n in the procfs file, is not defined\"\n\nSigned-off-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: HATAYAMA Daisuke \u003cd.hatayama@jp.fujitsu.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.12.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a0d8b00a3381f9d75764b3377590451cb0b4fe41", "tree": "8e50e004aa354150558a637ff7a9d5d8ddab9b13", "parents": [ "f40386a4e976acb2bd3e0f9ead11e8e769acbe98" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Dec 12 17:12:20 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mm: memcg: do not declare OOM from __GFP_NOFAIL allocations\n\nCommit 84235de394d9 (\"fs: buffer: move allocation failure loop into the\nallocator\") started recognizing __GFP_NOFAIL in memory cgroups but\nforgot to disable the OOM killer.\n\nAny task that does not fail allocation will also not enter the OOM\ncompletion path. So don\u0027t declare an OOM state in this case or it\u0027ll be\nleaked and the task be able to bypass the limit until the next\nuserspace-triggered page fault cleans up the OOM state.\n\nReported-by: William Dauchy \u003cwdauchy@gmail.com\u003e\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.12.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f40386a4e976acb2bd3e0f9ead11e8e769acbe98", "tree": "7b87fce0a88425cb3c7bafbf52751500063cb117", "parents": [ "846f29a6afb5f272ee1c8b2a57c5730ab31eabaa" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Thu Dec 12 17:12:19 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:25 2013 -0800" }, "message": "include/linux/hugetlb.h: make isolate_huge_page() an inline\n\nWith CONFIG_HUGETLBFS\u003dn:\n\n mm/migrate.c: In function `do_move_page_to_node_array\u0027:\n include/linux/hugetlb.h:140:33: warning: statement with no effect [-Wunused-value]\n #define isolate_huge_page(p, l) false\n ^\n mm/migrate.c:1170:4: note: in expansion of macro `isolate_huge_page\u0027\n isolate_huge_page(page, \u0026pagelist);\n\nReported-by: Borislav Petkov \u003cbp@alien8.de\u003e\nTested-by: Borislav Petkov \u003cbp@alien8.de\u003e\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\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": "54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f", "tree": "71a21d846cd6fe301f1077c98cdf6dfff58048d2", "parents": [ "ea1e61cbb9b1397192a478eca4c3138bd1b4441c", "17d68b763f09a9ce824ae23eb62c9efc57b69271" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:46:06 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:46:06 2013 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull kvm fixes from Paolo Bonzini:\n \"Four security fixes for KVM on x86. Thanks to Andrew Honig and Lars\n Bull from Google for reporting them\"\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: x86: fix guest-initiated crash with x2apic (CVE-2013-6376)\n KVM: x86: Convert vapic synchronization to _cached functions (CVE-2013-6368)\n KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)\n KVM: Improve create VCPU parameter (CVE-2013-4587)\n" }, { "commit": "ea1e61cbb9b1397192a478eca4c3138bd1b4441c", "tree": "ffd04ecf7494838c3236896dfea85a975cadcb27", "parents": [ "e09f67f1472bb3027448251d51bd52543d0af699", "6f97dc8d4663abed96fa30e3ea4a1d4cfd1c4276" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:45:03 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:45:03 2013 -0800" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"Another week, another batch of fixes.\n\n Again, OMAP regressions due to move to DT is the bulk of the changes\n here, but this should be the last of it for 3.13. There are also a\n handful of OMAP hwmod changes (power management, reset handling) for\n USB on OMAP3 that fixes some longish-standing bugs around USB resets.\n\n There are a couple of other changes that also add up line count a bit:\n One is a long-standing bug with the keyboard layout on one of the PXA\n platforms. The other is a fix for highbank that moves their\n power-off/reset button handling to be done in-kernel since relying on\n userspace to handle it was fragile and awkward\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: sun6i: dt: Fix interrupt trigger types\n ARM: sun7i: dt: Fix interrupt trigger types\n MAINTAINERS: merge IMX6 entry into IMX\n ARM: tegra: add missing break to fuse initialization code\n ARM: pxa: prevent PXA270 occasional reboot freezes\n ARM: pxa: tosa: fix keys mapping\n ARM: OMAP2+: omap_device: add fail hook for runtime_pm when bad data is detected\n ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present\n ARM: OMAP3: hwmod data: Don\u0027t prevent RESET of USB Host module\n ARM: OMAP2+: hwmod: Fix SOFTRESET logic\n ARM: OMAP4+: hwmod data: Don\u0027t prevent RESET of USB Host module\n ARM: dts: Fix booting for secure omaps\n ARM: OMAP2+: Fix the machine entry for am3517\n ARM: dts: Fix missing entries for am3517\n ARM: OMAP2+: Fix overwriting hwmod data with data from device tree\n ARM: davinci: Fix McASP mem resource names\n ARM: highbank: handle soft poweroff and reset key events\n ARM: davinci: fix number of resources passed to davinci_gpio_register()\n gpio: davinci: fix check for unbanked gpio\n" }, { "commit": "e09f67f1472bb3027448251d51bd52543d0af699", "tree": "9482160f3a0d000333ed69f5286406e0e9ffbdb0", "parents": [ "c9111b4df407e6b73f2a92c36f7fc93a7b27fd99", "700ff4f095d78af0998953e922e041d75254518b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:25:10 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:25:10 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull btrfs fixes from Chris Mason:\n \"This is a small collection of fixes. It was rebased this morning, but\n I was just fixing signed-off-by tags with the wrong email\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:\n Btrfs: fix access_ok() check in btrfs_ioctl_send()\n Btrfs: make sure we cleanup all reloc roots if error happens\n Btrfs: skip building backref tree for uuid and quota tree when doing balance relocation\n Btrfs: fix an oops when doing balance relocation\n Btrfs: don\u0027t miss skinny extent items on delayed ref head contention\n btrfs: call mnt_drop_write after interrupted subvol deletion\n Btrfs: don\u0027t clear the default compression type\n" }, { "commit": "c9111b4df407e6b73f2a92c36f7fc93a7b27fd99", "tree": "1a5445e1efa58ac914ada74be50ee8ad9593b69f", "parents": [ "2208f6513accb06ccb0f7b6f9e97989cd865585a", "781c2a5a5f75eacc04663aced0f0f1a648d4f308" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:24:32 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:24:32 2013 -0800" }, "message": "Merge branch \u0027for-3.13\u0027 of git://linux-nfs.org/~bfields/linux\n\nPull nfsd reply cache bugfix from Bruce Fields:\n \"One bugfix for nfsd crashes\"\n\n* \u0027for-3.13\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd: when reusing an existing repcache entry, unhash it first\n" }, { "commit": "17d68b763f09a9ce824ae23eb62c9efc57b69271", "tree": "2be4f93e491c3094d7ae1994191941ba4c1dcc4f", "parents": [ "fda4e2e85589191b123d31cdc21fd33ee70f50fd" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Thu Dec 12 21:20:08 2013 +0100" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:46:18 2013 +0100" }, "message": "KVM: x86: fix guest-initiated crash with x2apic (CVE-2013-6376)\n\nA guest can cause a BUG_ON() leading to a host kernel crash.\nWhen the guest writes to the ICR to request an IPI, while in x2apic\nmode the following things happen, the destination is read from\nICR2, which is a register that the guest can control.\n\nkvm_irq_delivery_to_apic_fast uses the high 16 bits of ICR2 as the\ncluster id. A BUG_ON is triggered, which is a protection against\naccessing map-\u003elogical_map with an out-of-bounds access and manages\nto avoid that anything really unsafe occurs.\n\nThe logic in the code is correct from real HW point of view. The problem\nis that KVM supports only one cluster with ID 0 in clustered mode, but\nthe code that has the bug does not take this into account.\n\nReported-by: Lars Bull \u003clarsbull@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "fda4e2e85589191b123d31cdc21fd33ee70f50fd", "tree": "68cfbeb6ea9d06ffd164bcc8b692993a90367333", "parents": [ "b963a22e6d1a266a67e9eecc88134713fd54775c" ], "author": { "name": "Andy Honig", "email": "ahonig@google.com", "time": "Wed Nov 20 10:23:22 2013 -0800" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:39:46 2013 +0100" }, "message": "KVM: x86: Convert vapic synchronization to _cached functions (CVE-2013-6368)\n\nIn kvm_lapic_sync_from_vapic and kvm_lapic_sync_to_vapic there is the\npotential to corrupt kernel memory if userspace provides an address that\nis at the end of a page. This patches concerts those functions to use\nkvm_write_guest_cached and kvm_read_guest_cached. It also checks the\nvapic_address specified by userspace during ioctl processing and returns\nan error to userspace if the address is not a valid GPA.\n\nThis is generally not guest triggerable, because the required write is\ndone by firmware that runs before the guest. Also, it only affects AMD\nprocessors and oldish Intel that do not have the FlexPriority feature\n(unless you disable FlexPriority, of course; then newer processors are\nalso affected).\n\nFixes: b93463aa59d6 (\u0027KVM: Accelerated apic support\u0027)\n\nReported-by: Andrew Honig \u003cahonig@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Andrew Honig \u003cahonig@google.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "b963a22e6d1a266a67e9eecc88134713fd54775c", "tree": "b378e97caf7869445b6168e87b7c6b36d7e87674", "parents": [ "338c7dbadd2671189cec7faf64c84d01071b3f96" ], "author": { "name": "Andy Honig", "email": "ahonig@google.com", "time": "Tue Nov 19 14:12:18 2013 -0800" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:39:45 2013 +0100" }, "message": "KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)\n\nUnder guest controllable circumstances apic_get_tmcct will execute a\ndivide by zero and cause a crash. If the guest cpuid support\ntsc deadline timers and performs the following sequence of requests\nthe host will crash.\n- Set the mode to periodic\n- Set the TMICT to 0\n- Set the mode bits to 11 (neither periodic, nor one shot, nor tsc deadline)\n- Set the TMICT to non-zero.\nThen the lapic_timer.period will be 0, but the TMICT will not be. If the\nguest then reads from the TMCCT then the host will perform a divide by 0.\n\nThis patch ensures that if the lapic_timer.period is 0, then the division\ndoes not occur.\n\nReported-by: Andrew Honig \u003cahonig@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Andrew Honig \u003cahonig@google.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "338c7dbadd2671189cec7faf64c84d01071b3f96", "tree": "f8aa565a09db010f6a5693051197bcb75073108a", "parents": [ "2e7babfa892a55588467ef03b545002e32f31528" ], "author": { "name": "Andy Honig", "email": "ahonig@google.com", "time": "Mon Nov 18 16:09:22 2013 -0800" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:39:33 2013 +0100" }, "message": "KVM: Improve create VCPU parameter (CVE-2013-4587)\n\nIn multiple functions the vcpu_id is used as an offset into a bitfield. Ag\nmalicious user could specify a vcpu_id greater than 255 in order to set or\nclear bits in kernel memory. This could be used to elevate priveges in the\nkernel. This patch verifies that the vcpu_id provided is less than 255.\nThe api documentation already specifies that the vcpu_id must be less than\nmax_vcpus, but this is currently not checked.\n\nReported-by: Andrew Honig \u003cahonig@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Andrew Honig \u003cahonig@google.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "2208f6513accb06ccb0f7b6f9e97989cd865585a", "tree": "03514487e4fde23e1cdfe27717d610fad393035b", "parents": [ "ea4ebd1cb093c8ec5d7f4bf9070dc444184c3971", "3690739b013504d33fe9348dd45f6b126aa370fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:14:25 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:14:25 2013 -0800" }, "message": "Merge tag \u0027sound-3.13-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"Still a slightly high amount of changes than wished, but they are all\n good regression and/or device-specific fixes. Majority of commits are\n for HD-audio, an HDMI ctl index fix that hits old graphics boards,\n regression fixes for AD codecs and a few quirks.\n\n Other than that, two major fixes are included: a 64bit ABI fix for\n compress offload, and 64bit dma_addr_t truncation fix, which had hit\n on PAE kernels\"\n\n* tag \u0027sound-3.13-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Add static DAC/pin mapping for AD1986A codec\n ALSA: hda - One more Dell headset detection quirk\n ALSA: hda - hdmi: Fix IEC958 ctl indexes for some simple HDMI devices\n ALSA: hda - Mute all aamix inputs as default\n ALSA: compress: Fix 64bit ABI incompatibility\n ALSA: memalloc.h - fix wrong truncation of dma_addr_t\n ALSA: hda - Another Dell headset detection quirk\n ALSA: hda - A Dell headset detection quirk\n ALSA: hda - Remove quirk for Dell Vostro 131\n ALSA: usb-audio: fix uninitialized variable compile warning\n ALSA: hda - fix mic issues on Acer Aspire E-572\n" }, { "commit": "ea4ebd1cb093c8ec5d7f4bf9070dc444184c3971", "tree": "b1a3fd2e9dd3846d5d30c5e75c79db1ad31c0d80", "parents": [ "846f29a6afb5f272ee1c8b2a57c5730ab31eabaa", "241ecf1ce528804d5ffc8fb386ff2a01b1f937c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:13:47 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:13:47 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input fixes from Dmitry Torokhov:\n \"A fix for recent sysfs breakage in serio subsystem plus a fixup to\n adxl34x driver\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: adxl34x - Fix bug in definition of ADXL346_2D_ORIENT\n Input: serio - fix sysfs layout\n" }, { "commit": "846f29a6afb5f272ee1c8b2a57c5730ab31eabaa", "tree": "5c0028e45bccaf4af65e9996faf59964e5914593", "parents": [ "86b581f6f18e5cfe420e94ce72e8a44d05cc23b1", "64c832a4f79542809d6c10b8ec6225ff8b76092e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:06:13 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:06:13 2013 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media fixes from Mauro Carvalho Chehab:\n \"A dvb core deadlock fix, a couple videobuf2 fixes an a series of media\n driver fixes\"\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (30 commits)\n [media] videobuf2-dma-sg: fix possible memory leak\n [media] vb2: regression fix: always set length field.\n [media] mt9p031: Include linux/of.h header\n [media] rtl2830: add parent for I2C adapter\n [media] media: marvell-ccic: use devm to release clk\n [media] ths7303: Declare as static a private function\n [media] em28xx-video: Swap release order to avoid lock nesting\n [media] usbtv: Add support for PAL video source\n [media] media_tree: Fix spelling errors\n [media] videobuf2: Add support for file access mode flags for DMABUF exporting\n [media] radio-shark2: Mark shark_resume_leds() inline to kill compiler warning\n [media] radio-shark: Mark shark_resume_leds() inline to kill compiler warning\n [media] af9035: unlock on error in af9035_i2c_master_xfer()\n [media] af9033: fix broken I2C\n [media] v4l: omap3isp: Don\u0027t check for missing get_fmt op on remote subdev\n [media] af9035: fix broken I2C and USB I/O\n [media] wm8775: fix broken audio routing\n [media] marvell-ccic: drop resource free in driver remove\n [media] tef6862/radio-tea5764: actually assign clamp result\n [media] cx231xx: use after free on error path in probe\n ...\n" }, { "commit": "86b581f6f18e5cfe420e94ce72e8a44d05cc23b1", "tree": "91856f7973addbf1d559fd71b859b755d8038f82", "parents": [ "c8469441c4415b9738327f64c74a5b76bf465815", "efabcc2123f0ed47870033b8d6fc73b50d76d635" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:05:19 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:05:19 2013 -0800" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon fix from Guenter Roeck:\n \"Fix HIH-6130 driver to work with BeagleBone\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK\n" }, { "commit": "c8469441c4415b9738327f64c74a5b76bf465815", "tree": "bb99933464ccbcdef528d21b4c2ee843da56d98f", "parents": [ "11ec50caedb56e3a87715edeff6a1852e6ae5416", "3806b45ba4655147a011df03242cc197ab986c43" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:03:57 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:03:57 2013 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\nPull hwmon fixes from Jean Delvare.\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: Prevent some divide by zeros in FAN_TO_REG()\n hwmon: (w83l768ng) Fix fan speed control range\n hwmon: (w83l786ng) Fix fan speed control mode setting and reporting\n hwmon: (lm90) Unregister hwmon device if interrupt setup fails\n" }, { "commit": "11ec50caedb56e3a87715edeff6a1852e6ae5416", "tree": "a94b6a3d2456800197d67effa2677d426d00d31d", "parents": [ "a5c21dcefa1c3d759457a604b3cfc4af29c8713f" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Thu Dec 12 17:40:22 2013 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:39:01 2013 -0800" }, "message": "word-at-a-time: provide generic big-endian zero_bytemask implementation\n\nWhilst architectures may be able to do better than this (which they can,\nby simply defining their own macro), this is a generic stab at a\nzero_bytemask implementation for the asm-generic, big-endian\nword-at-a-time implementation.\n\nOn arm64, a clz instruction is used to implement the fls efficiently.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a5c21dcefa1c3d759457a604b3cfc4af29c8713f", "tree": "6832dfcb836f8d5043ba70f17a0ea9c2c428bc4d", "parents": [ "319720f534d88039615bceb88d4bc094a7cd4ce9" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Thu Dec 12 17:40:21 2013 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:39:01 2013 -0800" }, "message": "dcache: allow word-at-a-time name hashing with big-endian CPUs\n\nWhen explicitly hashing the end of a string with the word-at-a-time\ninterface, we have to be careful which end of the word we pick up.\n\nOn big-endian CPUs, the upper-bits will contain the data we\u0027re after, so\nensure we generate our masks accordingly (and avoid hashing whatever\nrandom junk may have been sitting after the string).\n\nThis patch adds a new dcache helper, bytemask_from_count, which creates\na mask appropriate for the CPU endianness.\n\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "319720f534d88039615bceb88d4bc094a7cd4ce9", "tree": "85f6a53e2926de546f02c3f60acf7303984121b7", "parents": [ "5dec682c7f33a765a5eb764cc18b1d02b17cd762", "239a87020b263fe7e70adc5803cb157955023d3c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:20:58 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:20:58 2013 -0800" }, "message": "Merge tag \u0027iommu-fixes-for-v3.13-rc4\u0027 of git://github.com/awilliam/linux-vfio\n\nPull iommu fixes from Alex Williamson:\n \"arm/smmu driver updates via Will Deacon fixing locking around page\n table walks and a couple other issues\"\n\n* tag \u0027iommu-fixes-for-v3.13-rc4\u0027 of git://github.com/awilliam/linux-vfio:\n iommu/arm-smmu: fix error return code in arm_smmu_device_dt_probe()\n iommu/arm-smmu: remove potential NULL dereference on mapping path\n iommu/arm-smmu: use mutex instead of spinlock for locking page tables\n" }, { "commit": "5dec682c7f33a765a5eb764cc18b1d02b17cd762", "tree": "fe75d0d632ac4343dcff1335dbccc58dd6bbcdf0", "parents": [ "48a2f0b2728c88b18829e191eafdde60290aa64f", "62226983da070f7e51068ec2e3a4da34672964c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:15:24 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:15:24 2013 -0800" }, "message": "Merge tag \u0027keys-devel-20131210\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs\n\nPull misc keyrings fixes from David Howells:\n \"These break down into five sets:\n\n - A patch to error handling in the big_key type for huge payloads.\n If the payload is larger than the \"low limit\" and the backing store\n allocation fails, then big_key_instantiate() doesn\u0027t clear the\n payload pointers in the key, assuming them to have been previously\n cleared - but only one of them is.\n\n Unfortunately, the garbage collector still calls big_key_destroy()\n when sees one of the pointers with a weird value in it (and not\n NULL) which it then tries to clean up.\n\n - Three patches to fix the keyring type:\n\n * A patch to fix the hash function to correctly divide keyrings off\n from keys in the topology of the tree inside the associative\n array. This is only a problem if searching through nested\n keyrings - and only if the hash function incorrectly puts the a\n keyring outside of the 0 branch of the root node.\n\n * A patch to fix keyrings\u0027 use of the associative array. The\n __key_link_begin() function initially passes a NULL key pointer\n to assoc_array_insert() on the basis that it\u0027s holding a place in\n the tree whilst it does more allocation and stuff.\n\n This is only a problem when a node contains 16 keys that match at\n that level and we want to add an also matching 17th. This should\n easily be manufactured with a keyring full of keyrings (without\n chucking any other sort of key into the mix) - except for (a)\n above which makes it on average adding the 65th keyring.\n\n * A patch to fix searching down through nested keyrings, where any\n keyring in the set has more than 16 keyrings and none of the\n first keyrings we look through has a match (before the tree\n iteration needs to step to a more distal node).\n\n Test in keyutils test suite:\n\n http://git.kernel.org/cgit/linux/kernel/git/dhowells/keyutils.git/commit/?id\u003d8b4ae963ed92523aea18dfbb8cab3f4979e13bd1\n\n - A patch to fix the big_key type\u0027s use of a shmem file as its\n backing store causing audit messages and LSM check failures. This\n is done by setting S_PRIVATE on the file to avoid LSM checks on the\n file (access to the shmem file goes through the keyctl() interface\n and so is gated by the LSM that way).\n\n This isn\u0027t normally a problem if a key is used by the context that\n generated it - and it\u0027s currently only used by libkrb5.\n\n Test in keyutils test suite:\n\n http://git.kernel.org/cgit/linux/kernel/git/dhowells/keyutils.git/commit/?id\u003dd9a53cbab42c293962f2f78f7190253fc73bd32e\n\n - A patch to add a generated file to .gitignore.\n\n - A patch to fix the alignment of the system certificate data such\n that it it works on s390. As I understand it, on the S390 arch,\n symbols must be 2-byte aligned because loading the address discards\n the least-significant bit\"\n\n* tag \u0027keys-devel-20131210\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:\n KEYS: correct alignment of system_certificate_list content in assembly file\n Ignore generated file kernel/x509_certificate_list\n security: shmem: implement kernel private shmem inodes\n KEYS: Fix searching of nested keyrings\n KEYS: Fix multiple key add into associative array\n KEYS: Fix the keyring hash function\n KEYS: Pre-clear struct key on allocation\n" }, { "commit": "48a2f0b2728c88b18829e191eafdde60290aa64f", "tree": "7d8095fbb0afde5a695891b7b141533dd111c780", "parents": [ "5cdec2d833748fbd27d3682f7209225c504c79c5", "f94c44573e7c22860e2c3dfe349c45f72ba35ad3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:14:13 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:14:13 2013 -0800" }, "message": "Merge tag \u0027xfs-for-linus-v3.13-rc4\u0027 of git://oss.sgi.com/xfs/xfs\n\nPull xfs bugfixes from Ben Myers:\n\n - fix for buffer overrun in agfl with growfs on v4 superblock\n\n - return EINVAL if requested discard length is less than a block\n\n - fix possible memory corruption in xfs_attrlist_by_handle()\n\n* tag \u0027xfs-for-linus-v3.13-rc4\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: growfs overruns AGFL buffer on V4 filesystems\n xfs: don\u0027t perform discard if the given range length is less than block size\n xfs: underflow bug in xfs_attrlist_by_handle()\n" }, { "commit": "5cdec2d833748fbd27d3682f7209225c504c79c5", "tree": "361baa6aa742bf8f712331c59db9c1b755f0ec35", "parents": [ "f12d5bfceb7e1f9051563381ec047f7f13956c3c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:53:51 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:53:51 2013 -0800" }, "message": "futex: move user address verification up to common code\n\nWhen debugging the read-only hugepage case, I was confused by the fact\nthat get_futex_key() did an access_ok() only for the non-shared futex\ncase, since the user address checking really isn\u0027t in any way specific\nto the private key handling.\n\nNow, it turns out that the shared key handling does effectively do the\nequivalent checks inside get_user_pages_fast() (it doesn\u0027t actually\ncheck the address range on x86, but does check the page protections for\nbeing a user page). So it wasn\u0027t actually a bug, but the fact that we\ntreat the address differently for private and shared futexes threw me\nfor a loop.\n\nJust move the check up, so that it gets done for both cases. Also, use\nthe \u0027rw\u0027 parameter for the type, even if it doesn\u0027t actually matter any\nmore (it\u0027s a historical artifact of the old racy i386 \"page faults from\nkernel space don\u0027t check write protections\").\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f12d5bfceb7e1f9051563381ec047f7f13956c3c", "tree": "5b4eba241978619d763e5ba6209e111299a22bd3", "parents": [ "9538e10086bd1301fe915683b1ba0a1de66d7483" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:38:42 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:38:42 2013 -0800" }, "message": "futex: fix handling of read-only-mapped hugepages\n\nThe hugepage code had the exact same bug that regular pages had in\ncommit 7485d0d3758e (\"futexes: Remove rw parameter from\nget_futex_key()\").\n\nThe regular page case was fixed by commit 9ea71503a8ed (\"futex: Fix\nregression with read only mappings\"), but the transparent hugepage case\n(added in a5b338f2b0b1: \"thp: update futex compound knowledge\") case\nremained broken.\n\nFound by Dave Jones and his trinity tool.\n\nReported-and-tested-by: Dave Jones \u003cdavej@fedoraproject.org\u003e\nCc: stable@kernel.org # v2.6.38+\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Darren Hart \u003cdvhart@linux.intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "700ff4f095d78af0998953e922e041d75254518b", "tree": "62a52b7a6f5f2eaa91809a0cc5abeac44c4c3f4e", "parents": [ "467bb1d27c0b783b73e6349304c0d90b5b4f431b" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Jan 10 03:57:25 2013 -0500" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:13:02 2013 -0800" }, "message": "Btrfs: fix access_ok() check in btrfs_ioctl_send()\n\nThe closing parenthesis is in the wrong place. We want to check\n\"sizeof(*arg-\u003eclone_sources) * arg-\u003eclone_sources_count\" instead of\n\"sizeof(*arg-\u003eclone_sources * arg-\u003eclone_sources_count)\".\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nReviewed-by: Jie Liu \u003cjeff.liu@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\ncc: stable@vger.kernel.org\n" }, { "commit": "467bb1d27c0b783b73e6349304c0d90b5b4f431b", "tree": "0c425a7f15c52b005cf3265af284cec5597d0a78", "parents": [ "6646374863508e24da7c7d21527f8dadc8687ff9" ], "author": { "name": "Wang Shilong", "email": "wangsl.fnst@cn.fujitsu.com", "time": "Wed Dec 11 19:29:52 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:12:51 2013 -0800" }, "message": "Btrfs: make sure we cleanup all reloc roots if error happens\n\nI hit an oops when merging reloc roots fails, the reason is that\nnew reloc roots may be added and we should make sure we cleanup\nall reloc roots.\n\nSigned-off-by: Wang Shilong \u003cwangsl.fnst@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "6646374863508e24da7c7d21527f8dadc8687ff9", "tree": "200c5355b9da16ee192d32fa37ea45d0154edd3f", "parents": [ "c974c4642fee8c58239c7753d0bf548b23799923" ], "author": { "name": "Wang Shilong", "email": "wangsl.fnst@cn.fujitsu.com", "time": "Tue Dec 10 00:14:34 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:12:36 2013 -0800" }, "message": "Btrfs: skip building backref tree for uuid and quota tree when doing balance relocation\n\nQuota tree and UUID Tree is only cowed, they can not be snapshoted.\n\nSigned-off-by: Wang Shilong \u003cwangsl.fnst@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "c974c4642fee8c58239c7753d0bf548b23799923", "tree": "a671a832030045d977a38ec25a84044fcbca5d1e", "parents": [ "639eefc8afd1b8b839b1fd5605378d869d3612a1" ], "author": { "name": "Wang Shilong", "email": "wangsl.fnst@cn.fujitsu.com", "time": "Wed Dec 11 19:29:51 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:12:20 2013 -0800" }, "message": "Btrfs: fix an oops when doing balance relocation\n\nI hit an oops when inserting reloc root into @reloc_root_tree(it can be\neasily triggered when forcing cow for relocation root)\n\n[ 866.494539] [\u003cffffffffa0499579\u003e] btrfs_init_reloc_root+0x79/0xb0 [btrfs]\n[ 866.495321] [\u003cffffffffa044c240\u003e] record_root_in_trans+0xb0/0x110 [btrfs]\n[ 866.496109] [\u003cffffffffa044d758\u003e] btrfs_record_root_in_trans+0x48/0x80 [btrfs]\n[ 866.496908] [\u003cffffffffa0494da8\u003e] select_reloc_root+0xa8/0x210 [btrfs]\n[ 866.497703] [\u003cffffffffa0495c8a\u003e] do_relocation+0x16a/0x540 [btrfs]\n\nThis is because reloc root inserted into @reloc_root_tree is not within one\ntransaction,reloc root may be cowed and root block bytenr will be reused then\noops happens.We should update reloc root in @reloc_root_tree when cow reloc\nroot node, fix it.\n\nSigned-off-by: Wang Shilong \u003cwangsl.fnst@cn.fujitsu.com\u003e\nReviewed-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "639eefc8afd1b8b839b1fd5605378d869d3612a1", "tree": "a22b52dc25388f67129fb2bc83248a426cc46bcf", "parents": [ "e43f998e47bae27e37e159915625e8d4b130153b" ], "author": { "name": "Filipe David Borba Manana", "email": "fdmanana@gmail.com", "time": "Sun Dec 08 00:26:29 2013 +0000" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:11:58 2013 -0800" }, "message": "Btrfs: don\u0027t miss skinny extent items on delayed ref head contention\n\nCurrently extent-tree.c:btrfs_lookup_extent_info() can miss the lookup\nof skinny extent items. This can happen when the execution flow is the\nfollowing:\n\n* We do an extent tree lookup and fail to find a skinny extent item;\n\n* As a result, we attempt to see if a non-skinny extent item exists,\n either by looking at previous item in the leaf or by doing another\n full extent tree search;\n\n* We have a transaction and then we check for a matching delayed ref\n head in the transaction\u0027s delayed refs rbtree;\n\n* We find such delayed ref head and then we try to lock it with a\n call to mutex_trylock();\n\n* The lock was contended so we jump to the label \"again\", which repeats\n the extent tree search but for a non-skinny extent item, because we set\n previously metadata variable to 0 and the search key to look for a\n non-skinny extent-item;\n\n* After the jump (and after releasing the transaction\u0027s delayed refs\n lock), a skinny extent item might have been added to the extent tree\n but we will miss it because metadata is set to 0 and the search key\n is set for a non-skinny extent-item.\n\nThe fix here is to not reset metadata to 0 and to jump to the initial search\nkey setup if the delayed ref head is contended, instead of jumping directly\nto the extent tree search label (\"again\").\n\nThis issue was found while investigating the issue reported at Bugzilla 64961.\n\nDavid Sterba suspected this function was missing extent items, and that\nthis could be caused by the last change to this function, which was made\nin the following patch:\n\n [PATCH] Btrfs: optimize btrfs_lookup_extent_info()\n (commit 74be9510876a66ad9826613ac8a526d26f9e7f01)\n\nBut in fact this issue already existed before, because after failing to find\na skinny extent item, the code set the search key for a non-skinny extent\nitem, and on contention of a matching delayed ref head it would not search\nthe extent tree for a skinny extent item anymore.\n\nSigned-off-by: Filipe David Borba Manana \u003cfdmanana@gmail.com\u003e\nReviewed-by: Liu Bo \u003cbo.li.liu@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "e43f998e47bae27e37e159915625e8d4b130153b", "tree": "03a1788ff0601554fca2c0fce2476548c80c78bd", "parents": [ "a7e252af5a819eb71c9494e62b2bfca982e92f84" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Fri Dec 06 17:51:32 2013 +0100" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:11:38 2013 -0800" }, "message": "btrfs: call mnt_drop_write after interrupted subvol deletion\n\nIf btrfs_ioctl_snap_destroy blocks on the mutex and the process is\nkilled, mnt_write count is unbalanced and leads to unmountable\nfilesystem.\n\nCC: stable@vger.kernel.org\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "a7e252af5a819eb71c9494e62b2bfca982e92f84", "tree": "73554777e84f56b52adbfe58a52cb6b370ecbcdd", "parents": [ "c0778e2534b81be6b85b5ee07c0e15ff774f7136" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Fri Nov 22 18:47:59 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:11:19 2013 -0800" }, "message": "Btrfs: don\u0027t clear the default compression type\n\nWe met a oops caused by the wrong compression type:\n[ 556.512356] BUG: unable to handle kernel NULL pointer dereference at (null)\n[ 556.512370] IP: [\u003cffffffff811dbaa0\u003e] __list_del_entry+0x1/0x98\n[SNIP]\n[ 556.512490] [\u003cffffffff811dbb44\u003e] ? list_del+0xd/0x2b\n[ 556.512539] [\u003cffffffffa05dd5ce\u003e] find_workspace+0x97/0x175 [btrfs]\n[ 556.512546] [\u003cffffffff813c14b5\u003e] ? _raw_spin_lock+0xe/0x10\n[ 556.512576] [\u003cffffffffa05de276\u003e] btrfs_compress_pages+0x2d/0xa2 [btrfs]\n[ 556.512601] [\u003cffffffffa05af060\u003e] compress_file_range.constprop.54+0x1f2/0x4e8 [btrfs]\n[ 556.512627] [\u003cffffffffa05af388\u003e] async_cow_start+0x32/0x4d [btrfs]\n[ 556.512655] [\u003cffffffffa05cc7a1\u003e] worker_loop+0x144/0x4c3 [btrfs]\n[ 556.512661] [\u003cffffffff81059404\u003e] ? finish_task_switch+0x80/0xb8\n[ 556.512689] [\u003cffffffffa05cc65d\u003e] ? btrfs_queue_worker+0x244/0x244 [btrfs]\n[ 556.512695] [\u003cffffffff8104fa4e\u003e] kthread+0x8d/0x95\n[ 556.512699] [\u003cffffffff81050000\u003e] ? bit_waitqueue+0x34/0x7d\n[ 556.512704] [\u003cffffffff8104f9c1\u003e] ? __kthread_parkme+0x65/0x65\n[ 556.512709] [\u003cffffffff813c7eec\u003e] ret_from_fork+0x7c/0xb0\n[ 556.512713] [\u003cffffffff8104f9c1\u003e] ? __kthread_parkme+0x65/0x65\n\nSteps to reproduce:\n # mkfs.btrfs -f \u003cdev\u003e\n # mount -o nodatacow \u003cdev\u003e \u003cmnt\u003e\n # touch \u003cmnt\u003e/\u003cfile\u003e\n # chattr \u003dc \u003cmnt\u003e/\u003cfile\u003e\n # dd if\u003d/dev/zero of\u003d\u003cmnt\u003e/\u003cfile\u003e bs\u003d1M count\u003d10\n\nIt is because we cleared the default compression type when setting the\nnodatacow. In fact, we needn\u0027t do it because we have used COMPRESS flag to\nindicate if we need compressed the file data or not, needn\u0027t use the\nvariant -- compress_type -- in btrfs_info to do the same thing, and just\nuse it to hold the default compression type. Or we would get a wrong compress\ntype for a file whose own compress flag is set but the compress flag of its\nfilesystem is not set.\n\nReported-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nReviewed-by: Liu Bo \u003cbo.li.liu@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "3806b45ba4655147a011df03242cc197ab986c43", "tree": "6f16fdaab2125caf51cd1c9b2fb9cd9e1eb3674f", "parents": [ "33a7ab91d509fa33b4bcd3ce0038cc80298050da" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Dec 12 08:05:33 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:33 2013 +0100" }, "message": "hwmon: Prevent some divide by zeros in FAN_TO_REG()\n\nThe \"rpm * div\" operations can overflow here, so this patch adds an\nupper limit to rpm to prevent that. Jean Delvare helped me with this\npatch.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Roger Lucas \u003cvt8231@hiddenengine.co.uk\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "33a7ab91d509fa33b4bcd3ce0038cc80298050da", "tree": "1fbadcdac126109d49f064b41e236f26dfc1dd5b", "parents": [ "cf7559bc053471f32373d71d04a9aa19e0b48d59" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "message": "hwmon: (w83l768ng) Fix fan speed control range\n\nThe W83L786NG stores the fan speed on 4 bits while the sysfs interface\nuses a 0-255 range. Thus the driver should scale the user input down\nto map it to the device range, and scale up the value read from the\ndevice before presenting it to the user. The reserved register nibble\nshould be left unchanged.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: stable@vger.kernel.org\nReviewed-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\n" }, { "commit": "cf7559bc053471f32373d71d04a9aa19e0b48d59", "tree": "6bec0dc9466ff39f33d0b98d3cc3a9fa677a07ae", "parents": [ "3d489ac07ed85c4908d864abb77ab1e6f94e0e4b" ], "author": { "name": "Brian Carnes", "email": "bmcarnes@gmail.com", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "message": "hwmon: (w83l786ng) Fix fan speed control mode setting and reporting\n\nThe wrong mask is used, which causes some fan speed control modes\n(pwmX_enable) to be incorrectly reported, and some modes to be\nimpossible to set.\n\n[JD: add subject and description.]\n\nSigned-off-by: Brian Carnes \u003cbmcarnes@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "3d489ac07ed85c4908d864abb77ab1e6f94e0e4b", "tree": "378baa783a7cba54e125f2b1d5f13b277a7fd25c", "parents": [ "9538e10086bd1301fe915683b1ba0a1de66d7483" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "message": "hwmon: (lm90) Unregister hwmon device if interrupt setup fails\n\nCommit 109b1283fb (hwmon: (lm90) Add support to handle IRQ) introduced\ninterrupt support. Its error handling code fails to unregister the already\nregistered hwmon device.\n\nFixes: 109b1283fb532ac773a076748ffccf76a7067cab\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "6f97dc8d4663abed96fa30e3ea4a1d4cfd1c4276", "tree": "58a6f0363e104122e4f4d9fe7d328c0cfce5960b", "parents": [ "378d0aee3b53bd8549b29dcc75f2bf47ee446e8f" ], "author": { "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com", "time": "Tue Dec 10 19:37:22 2013 +0100" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:15:24 2013 -0800" }, "message": "ARM: sun6i: dt: Fix interrupt trigger types\n\nThe Allwinner A31 uses the ARM GIC as its internal interrupts controller. The\nGIC can work on several interrupt triggers, and the A31 was actually setting it\nup to use a rising edge as a trigger, while it was actually a level high\ntrigger, leading to some interrupts that would be completely ignored if the\nedge was missed.\n\nSigned-off-by: Maxime Ripard \u003cmaxime.ripard@free-electrons.com\u003e\nAcked-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nCc: stable@vger.kernel.org # 3.12+\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "378d0aee3b53bd8549b29dcc75f2bf47ee446e8f", "tree": "9bc3b735a436e12e01e6317e8dfdeb6594772acd", "parents": [ "2a82f95c3fb4904a473e205f3510b6e8884dd34d" ], "author": { "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com", "time": "Tue Dec 10 19:37:21 2013 +0100" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:15:21 2013 -0800" }, "message": "ARM: sun7i: dt: Fix interrupt trigger types\n\nThe Allwinner A20 uses the ARM GIC as its internal interrupts controller. The\nGIC can work on several interrupt triggers, and the A20 was actually setting it\nup to use a rising edge as a trigger, while it was actually a level high\ntrigger, leading to some interrupts that would be completely ignored if the\nedge was missed.\n\nSigned-off-by: Maxime Ripard \u003cmaxime.ripard@free-electrons.com\u003e\nAcked-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nCc: stable@vger.kernel.org #3.12+\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "2a82f95c3fb4904a473e205f3510b6e8884dd34d", "tree": "d45cfcd54896a0e805cbdb9b0ac1a65d6f04a85a", "parents": [ "b988ba1b4eba12008107b16fe3714293afdca47e" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Dec 10 22:19:21 2013 +0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:12:04 2013 -0800" }, "message": "MAINTAINERS: merge IMX6 entry into IMX\n\nI have been co-maintaining IMX sub-architecture for a couple of years,\nand collecting IMX sub-architecture patches rather than IMX6 only ones\nfor a few release cycles. It makes sense to officially add myself as\nthe co-maintainer for IMX sub-architecture now. Consequently, IMX6\nentry can just be merged into IMX.\n\nWhile at it, add a \u0027F:\u0027 entry for IMX DTS files.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "b988ba1b4eba12008107b16fe3714293afdca47e", "tree": "cc5301213e4c9f7f711e49a33f65990015d5a9e8", "parents": [ "ff88b4724fde18056a4c539f7327389aec0f4c2d" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Dec 06 14:31:02 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:09:11 2013 -0800" }, "message": "ARM: tegra: add missing break to fuse initialization code\n\nAdd a missing break to the switch in tegra_init_fuse() which determines\nwhich SoC the code is running on. This prevents the Tegra30+ fuse\nhandling code from running on Tegra20.\n\nFixes: 3bd1ae57f7bb (\"ARM: tegra: add fuses as device randomness\")\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "ff88b4724fde18056a4c539f7327389aec0f4c2d", "tree": "1b80c7a934808607e0050ec1a11f09b60de22e34", "parents": [ "506cac15ac86f204b83e3cfccde73eeb4e7c5f34" ], "author": { "name": "Sergei Ianovich", "email": "ynvich@gmail.com", "time": "Tue Dec 10 08:39:15 2013 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 16:35:16 2013 -0800" }, "message": "ARM: pxa: prevent PXA270 occasional reboot freezes\n\nErratum 71 of PXA270M Processor Family Specification Update\n(April 19, 2010) explains that watchdog reset time is just\n8us insead of 10ms in EMTS.\n\nIf SDRAM is not reset, it causes memory bus congestion and\nthe device hangs. We put SDRAM in selfresh mode before watchdog\nreset, removing potential freezes.\n\nWithout this patch PXA270-based ICP DAS LP-8x4x hangs after up to 40\nreboots. With this patch it has successfully rebooted 500 times.\n\nSigned-off-by: Sergei Ianovich \u003cynvich@gmail.com\u003e\nTested-by: Marek Vasut \u003cmarex@denx.de\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "506cac15ac86f204b83e3cfccde73eeb4e7c5f34", "tree": "873d391db017f24c96eb4409b17fa31f2547dc9f", "parents": [ "f5c33b070de3fdb8ad995b767ad0e3487cf0d242" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Sat Nov 16 16:47:50 2013 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 16:34:32 2013 -0800" }, "message": "ARM: pxa: tosa: fix keys mapping\n\nWhen converting from tosa-keyboard driver to matrix keyboard, tosa keys\nreceived extra 1 column shift. Replace that with correct values to make\nkeyboard work again.\n\nFixes: f69a6548c9d5 (\u0027[ARM] pxa/tosa: make use of the matrix keypad driver\u0027)\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "efabcc2123f0ed47870033b8d6fc73b50d76d635", "tree": "7cfd6a2641b7d7f5a616d5a4d346fbbb164eb59e", "parents": [ "374b105797c3d4f29c685f3be535c35f5689b30e" ], "author": { "name": "José Miguel Gonçalves", "email": "jose.goncalves@inov.pt", "time": "Wed Dec 11 11:11:13 2013 +0000" }, "committer": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Wed Dec 11 13:37:30 2013 -0800" }, "message": "hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK\n\nSome I2C bus drivers do not allow zero-length data transfers which are\nrequired to start a measurement with the HIH6130/1 sensor. Nevertheless,\nwe can overcome this limitation by writing a zero dummy byte. This byte\nis ignored by the sensor and was verified to be working with the OMAP\nI2C bus driver in a BeagleBone board.\n\nSigned-off-by: José Miguel Gonçalves \u003cjose.goncalves@inov.pt\u003e\n[Guenter Roeck: Simplified complexity of write_length initialization]\nCc: stable@vger.kernel.org # v3.10+\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\n" }, { "commit": "3690739b013504d33fe9348dd45f6b126aa370fb", "tree": "988c1e5b41e676f57930d6e4171fe89e031233ad", "parents": [ "7dca4bc6f34829db50d9723ac3bcd1c6518ee6c3" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 17:29:26 2013 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Dec 11 07:16:20 2013 +0100" }, "message": "ALSA: hda - Add static DAC/pin mapping for AD1986A codec\n\nAD1986A codec is a pretty old codec and has really many hidden\nrestrictions. One of such is that each DAC is dedicated to certain\npin although there are possible connections. Currently, the generic\nparser tries to assign individual DACs as much as possible, and this\nlead to two bad situations: connections where the sound actually\ndoesn\u0027t work, and connections conflicting other channels.\n\nWe may fix this by trying to find the best connections more harder,\nbut as of now, it\u0027s easier to give some hints for paired DAC/pin\nconnections and honor them if available, since such a hint is needed\nonly for specific codecs (right now only AD1986A, and there will be\nunlikely any others in future).\n\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d64971\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d66621\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "7dca4bc6f34829db50d9723ac3bcd1c6518ee6c3", "tree": "aef95d065ebb677cbcea3440d0cc786014b63244", "parents": [ "c9a6338aecdb92f9d015ecc26d203e54250bebbb" ], "author": { "name": "Hui Wang", "email": "hui.wang@canonical.com", "time": "Wed Dec 11 11:41:31 2013 +0800" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Dec 11 07:12:55 2013 +0100" }, "message": "ALSA: hda - One more Dell headset detection quirk\n\nOn the Dell machines with codec whose Subsystem Id is 0x10280624,\nno external microphone can be detected when plugging a 3-ring\nheadset. If we add \"model\u003ddell-headset-multi\" for the\nsnd-hda-intel.ko, the problem will disappear.\n\nBugLink: https://bugs.launchpad.net/bugs/1259790\nCc: David Henningsson \u003cdavid.henningsson@canonical.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Hui Wang \u003chui.wang@canonical.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "c9a6338aecdb92f9d015ecc26d203e54250bebbb", "tree": "d39b4a450a4b06352f5945d39750e35daeb95216", "parents": [ "ebb93c057dda376414fbc499ad6ace9b527dff5a" ], "author": { "name": "Anssi Hannula", "email": "anssi.hannula@iki.fi", "time": "Tue Dec 10 22:46:34 2013 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Dec 11 07:12:07 2013 +0100" }, "message": "ALSA: hda - hdmi: Fix IEC958 ctl indexes for some simple HDMI devices\n\nIn case a single HDA card has both HDMI and S/PDIF outputs, the S/PDIF\noutputs will have their IEC958 controls created starting from index 16\nand the HDMI controls will be created starting from index 0.\n\nHowever, HDMI simple_playback_build_controls() as used by old VIA and\nNVIDIA codecs incorrectly requests the IEC958 controls to be created\nwith an S/PDIF type instead of HDMI.\nIn case the card has other codecs that have HDMI outputs, the controls\nwill be created with wrong index\u003d16, causing them to e.g. be unreachable\nby the ALSA \"hdmi\" alias.\n\nFix that by making simple_playback_build_controls() request controls\nwith HDMI indexes.\n\nNot many cards have an affected configuration, but e.g. ASUS M3N78-VM\ncontains an integrated NVIDIA HDA \"card\" with:\n- a VIA codec that has, among others, an S/PDIF pin incorrectly\n labelled as an HDMI pin, and\n- an NVIDIA MCP7x HDMI codec.\n\nReported-by: MysterX on #openelec\nTested-by: MysterX on #openelec\nSigned-off-by: Anssi Hannula \u003canssi.hannula@iki.fi\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.8+\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "781c2a5a5f75eacc04663aced0f0f1a648d4f308", "tree": "d99f1c5131cf632a13096f10dbd54c43618c5872", "parents": [ "374b105797c3d4f29c685f3be535c35f5689b30e" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Mon Dec 02 15:26:19 2013 -0500" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Dec 10 20:34:44 2013 -0500" }, "message": "nfsd: when reusing an existing repcache entry, unhash it first\n\nThe DRC code will attempt to reuse an existing, expired cache entry in\npreference to allocating a new one. It\u0027ll then search the cache, and if\nit gets a hit it\u0027ll then free the cache entry that it was going to\nreuse.\n\nThe cache code doesn\u0027t unhash the entry that it\u0027s going to reuse\nhowever, so it\u0027s possible for it end up designating an entry for reuse\nand then subsequently freeing the same entry after it finds it. This\nleads it to a later use-after-free situation and usually some list\ncorruption warnings or an oops.\n\nFix this by simply unhashing the entry that we intend to reuse. That\nwill mean that it\u0027s not findable via a search and should prevent this\nsituation from occurring.\n\nCc: stable@vger.kernel.org # v3.10+\nReported-by: Christoph Hellwig \u003chch@infradead.org\u003e\nReported-by: g. artim \u003cgartim@gmail.com\u003e\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "ebb93c057dda376414fbc499ad6ace9b527dff5a", "tree": "524813e7a7d239d1f0e861c245d3d25d21991b59", "parents": [ "6733cf572a9e20db2b7580a5dd39d5782d571eec" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 17:33:49 2013 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 21:16:50 2013 +0100" }, "message": "ALSA: hda - Mute all aamix inputs as default\n\nNot all channels have been initialized, so far, especially when aamix\nNID itself doesn\u0027t have amps but its leaves have. This patch fixes\nthese holes. Otherwise you might get unexpected loopback inputs,\ne.g. from surround channels.\n\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "9538e10086bd1301fe915683b1ba0a1de66d7483", "tree": "5fe464dca440c75843b04cbad1ee703ca82a96e9", "parents": [ "5e0af24cee56e75d0cb13dc072539acb52f694cf", "dace8bbfccfd9e4fcccfffcfbd82881fda3e756f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 10 11:30:10 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 10 11:30:10 2013 -0800" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\nPull watchdog fixes from Wim Van Sebroeck:\n \"Drop the unnecessary miscdevice.h includes that we forgot in commit\n 487722cf2d66 (\"watchdog: Get rid of MODULE_ALIAS_MISCDEV statements\")\n and fix an oops for the sc1200_wdt driver\"\n\n* git://www.linux-watchdog.org/linux-watchdog:\n sc1200_wdt: Fix oops\n watchdog: Drop unnecessary include of miscdevice.h\n" }, { "commit": "5e0af24cee56e75d0cb13dc072539acb52f694cf", "tree": "94353a6408b6bf148ad58769d0a040e1c54b1587", "parents": [ "22056614ee39ef43670814d2000f810901768277", "464b500e37a588be69ed9c9c21bca62a578ca66c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 10 11:19:13 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 10 11:19:13 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32\n\nPull AVR32 fixes from Hans-Christian Egtvedt.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:\n avr32: favr-32: clk_round_rate() can return a zero upon error\n avr32: remove deprecated IRQF_DISABLED\n cpufreq_ at32ap-cpufreq.c: Fix section mismatch\n avr32: pm: Fix section mismatch\n avr32: Kill CONFIG_MTD_PARTITIONS\n" }, { "commit": "22056614ee39ef43670814d2000f810901768277", "tree": "82c08d6f89cc0e5771e9d289357c91d96130a9a3", "parents": [ "17b2112f332db7c2bac56926c9e627807bce3615", "ca5de58ba746b08c920b2024aaf01aa1500b110d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 10 11:02:33 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 10 11:02:33 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 fixes from Martin Schwidefsky:\n \"One patch to increase the number of possible CPUs to 256, with the\n latest machine a single LPAR can have up to 101 CPUs. Plus a number\n of bug fixes, the clock_gettime patch fixes a regression added in the\n 3.13 merge window\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:\n s390/time,vdso: fix clock_gettime for CLOCK_MONOTONIC\n s390/vdso: ectg gettime support for CLOCK_THREAD_CPUTIME_ID\n s390/vdso: fix access-list entry initialization\n s390: increase CONFIG_NR_CPUS limit\n s390/smp,sclp: fix size of sclp_cpu_info structure\n s390/sclp: replace uninitialized early_event_mask_sccb variable with sccb_early\n s390/dasd: fix memory leak caused by dangling references to request_queue\n" }, { "commit": "62226983da070f7e51068ec2e3a4da34672964c7", "tree": "04a0e1bc11282cc966f7c7c0521fa1e0f70b8956", "parents": [ "7cfe5b3310a1b45f385ff18647bddb487a6c5525" ], "author": { "name": "Hendrik Brueckner", "email": "brueckner@linux.vnet.ibm.com", "time": "Thu Dec 05 14:48:22 2013 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Dec 10 18:25:28 2013 +0000" }, "message": "KEYS: correct alignment of system_certificate_list content in assembly file\n\nApart from data-type specific alignment constraints, there are also\narchitecture-specific alignment requirements.\nFor example, on s390 symbols must be on even addresses implying a 2-byte\nalignment. If the system_certificate_list_end symbol is on an odd address\nand if this address is loaded, the least-significant bit is ignored. As a\nresult, the load_system_certificate_list() fails to load the certificates\nbecause of a wrong certificate length calculation.\n\nTo be safe, align system_certificate_list on an 8-byte boundary. Also improve\nthe length calculation of the system_certificate_list content. Introduce a\nsystem_certificate_list_size (8-byte aligned because of unsigned long) variable\nthat stores the length. Let the linker calculate this size by introducing\na start and end label for the certificate content.\n\nSigned-off-by: Hendrik Brueckner \u003cbrueckner@linux.vnet.ibm.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "7cfe5b3310a1b45f385ff18647bddb487a6c5525", "tree": "75a3d7393d876770807f66bbda22e5316f19ba0c", "parents": [ "c7277090927a5e71871e799a355ed2940f6c8fc6" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Tue Dec 10 17:42:50 2013 +1030" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Dec 10 18:21:34 2013 +0000" }, "message": "Ignore generated file kernel/x509_certificate_list\n\n$ git status\n# On branch pending-rebases\n# Untracked files:\n# (use \"git add \u003cfile\u003e...\" to include in what will be committed)\n#\n#\tkernel/x509_certificate_list\nnothing added to commit but untracked files present (use \"git add\" to track)\n$\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "f5c33b070de3fdb8ad995b767ad0e3487cf0d242", "tree": "f97d808d0009da823a7c54695cdbee45cfb027cc", "parents": [ "3daf65c0ed7660f75da927c250163c26c9043f1b" ], "author": { "name": "Nishanth Menon", "email": "nm@ti.com", "time": "Tue Dec 03 19:39:13 2013 -0600" }, "committer": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Tue Dec 10 09:39:52 2013 -0800" }, "message": "ARM: OMAP2+: omap_device: add fail hook for runtime_pm when bad data is detected\n\nDue to the cross dependencies between hwmod for automanaged device\ninformation for OMAP and dts node definitions, we can run into scenarios\nwhere the dts node is defined, however it\u0027s hwmod entry is yet to be\nadded. In these cases:\na) omap_device does not register a pm_domain (since it cannot find\n hwmod entry).\nb) driver does not know about (a), does a pm_runtime_get_sync which\n never fails\nc) It then tries to do some operation on the device (such as read the\n revision register (as part of probe) without clock or adequate OMAP\n generic PM operation performed for enabling the module.\n\nThis causes a crash such as that reported in:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d66441\n\nWhen \u0027ti,hwmod\u0027 is provided in dt node, it is expected that the device\nwill not function without the OMAP\u0027s power automanagement. Hence, when\nwe hit a fail condition (due to hwmod entries not present or other\nsimilar scenario), fail at pm_domain level due to lack of data, provide\nenough information for it to be fixed, however, it allows for the driver\nto take appropriate measures to prevent crash.\n\nReported-by: Tobias Jakobi \u003ctjakobi@math.uni-bielefeld.de\u003e\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@linaro.org\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@linaro.org\u003e\n" }, { "commit": "f94c44573e7c22860e2c3dfe349c45f72ba35ad3", "tree": "088e5c2e9cab8439e088fbabc6d6831a8570602f", "parents": [ "2f42d612e7d4c4fb1819ea7b2b6e18938714ae7a" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Thu Nov 21 15:41:06 2013 +1100" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Tue Dec 10 10:04:27 2013 -0600" }, "message": "xfs: growfs overruns AGFL buffer on V4 filesystems\n\nThis loop in xfs_growfs_data_private() is incorrect for V4\nsuperblocks filesystems:\n\n\t\tfor (bucket \u003d 0; bucket \u003c XFS_AGFL_SIZE(mp); bucket++)\n\t\t\tagfl-\u003eagfl_bno[bucket] \u003d cpu_to_be32(NULLAGBLOCK);\n\nFor V4 filesystems, we don\u0027t have a agfl header structure, and so\nXFS_AGFL_SIZE() returns an entire sector\u0027s worth of entries, which\nwe then index from an offset into the sector. Hence: buffer overrun.\n\nThis problem was introduced in 3.10 by commit 77c95bba (\"xfs: add\nCRC checks to the AGFL\") which changed the AGFL structure but failed\nto update the growfs code to handle the different structures.\n\nFix it by using the correct offset into the buffer for both V4 and\nV5 filesystems.\n\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nReviewed-by: Jie Liu \u003cjeff.liu@oracle.com\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n\n(cherry picked from commit b7d961b35b3ab69609aeea93f870269cb6e7ba4d)\n" }, { "commit": "2f42d612e7d4c4fb1819ea7b2b6e18938714ae7a", "tree": "4c09011b252a333c6fbaa17d00737a2605a53409", "parents": [ "31978b5cc66b8ba8a7e8eef60b12395d41b7b890" ], "author": { "name": "Jie Liu", "email": "jeff.liu@oracle.com", "time": "Wed Nov 20 16:08:53 2013 +0800" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Tue Dec 10 10:00:33 2013 -0600" }, "message": "xfs: don\u0027t perform discard if the given range length is less than block size\n\nFor discard operation, we should return EINVAL if the given range length\nis less than a block size, otherwise it will go through the file system\nto discard data blocks as the end range might be evaluated to -1, e.g,\n# fstrim -v -o 0 -l 100 /xfs7\n/xfs7: 9811378176 bytes were trimmed\n\nThis issue can be triggered via xfstests/generic/288.\n\nAlso, it seems to get the request queue pointer via bdev_get_queue()\ninstead of the hard code pointer dereference is not a bad thing.\n\nSigned-off-by: Jie Liu \u003cjeff.liu@oracle.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n\n(cherry picked from commit f9fd0135610084abef6867d984e9951c3099950d)\n" }, { "commit": "31978b5cc66b8ba8a7e8eef60b12395d41b7b890", "tree": "77d24804c4e53b726d459b79a0b9850fe90c8c52", "parents": [ "dc1ccc48159d63eca5089e507c82c7d22ef60839" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Oct 31 21:00:10 2013 +0300" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Tue Dec 10 09:59:37 2013 -0600" }, "message": "xfs: underflow bug in xfs_attrlist_by_handle()\n\nIf we allocate less than sizeof(struct attrlist) then we end up\ncorrupting memory or doing a ZERO_PTR_SIZE dereference.\n\nThis can only be triggered with CAP_SYS_ADMIN.\n\nReported-by: Nico Golde \u003cnico@ngolde.de\u003e\nReported-by: Fabian Yamaguchi \u003cfabs@goesec.de\u003e\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nReviewed-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n\n(cherry picked from commit 071c529eb672648ee8ca3f90944bcbcc730b4c06)\n" }, { "commit": "3daf65c0ed7660f75da927c250163c26c9043f1b", "tree": "4b3ae732261ac47e7b8364106177a5bbe2e9f573", "parents": [ "ed16c8c50e26df3c16e40d35c9a4c0e9f032656c", "0e7dc862cf687234ed1b01a6b2461b782ea0bca0" ], "author": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Tue Dec 10 07:44:32 2013 -0800" }, "committer": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Tue Dec 10 07:44:48 2013 -0800" }, "message": "Merge tag \u0027for-v3.13-rc/hwmod-fixes-a\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes\n\nFrom Paul Walmsley:\nARM: OMAP2+: hwmod code/data: fixes for v3.13-rc\n\nFix a few hwmod code problems involving recovery with bad data and bad\nIP block OCP reset handling. Also, fix the hwmod data to enable IP\nblock OCP reset for the OMAP USBHOST devices on OMAP3+.\n\nBasic build, boot, and PM tests are available here:\n\nhttp://www.pwsan.com/omap/testlogs/prcm_fixes_a_v3.13-rc/20131209030611/\n\n* tag \u0027for-v3.13-rc/hwmod-fixes-a\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:\n ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present\n ARM: OMAP3: hwmod data: Don\u0027t prevent RESET of USB Host module\n ARM: OMAP2+: hwmod: Fix SOFTRESET logic\n ARM: OMAP4+: hwmod data: Don\u0027t prevent RESET of USB Host module\n\nSigned-off-by: Kevin Hilman \u003ckhilman@linaro.org\u003e\n" }, { "commit": "6733cf572a9e20db2b7580a5dd39d5782d571eec", "tree": "965a2b1a992a5b801a98efa1f9c9e483cf3c4896", "parents": [ "932e9dec380c67ec15ac3eb073bb55797d8b4801" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 12:15:52 2013 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 15:32:44 2013 +0100" }, "message": "ALSA: compress: Fix 64bit ABI incompatibility\n\nsnd_pcm_uframes_t is defined as unsigned long so it would take\ndifferent sizes depending on 32 or 64bit architectures. As we don\u0027t\nwant this ABI incompatibility, and there is no real 64bit user yet,\nlet\u0027s make it the fixed size with __u32.\n\nAlso bump the protocol version number to 0.1.2.\n\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "932e9dec380c67ec15ac3eb073bb55797d8b4801", "tree": "b949c0b86510f230f28ffe53687b3b2f4d7403db", "parents": [ "0dfb9809e93b60946d1915b554138eb93595860c" ], "author": { "name": "Stefano Panella", "email": "stefano.panella@citrix.com", "time": "Tue Dec 10 14:20:28 2013 +0000" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 15:30:46 2013 +0100" }, "message": "ALSA: memalloc.h - fix wrong truncation of dma_addr_t\n\nWhen running a 32bit kernel the hda_intel driver is still reporting\na 64bit dma_mask if the HW supports it.\n\nFrom sound/pci/hda/hda_intel.c:\n\n /* allow 64bit DMA address if supported by H/W */\n if ((gcap \u0026 ICH6_GCAP_64OK) \u0026\u0026 !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))\n pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(64));\n else {\n pci_set_dma_mask(pci, DMA_BIT_MASK(32));\n pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32));\n }\n\nwhich means when there is a call to dma_alloc_coherent from\nsnd_malloc_dev_pages a machine address bigger than 32bit can be returned.\nThis can be true in particular if running the 32bit kernel as a pv dom0\nunder the Xen Hypervisor or PAE on bare metal.\n\nThe problem is that when calling setup_bdle to program the BLE the\ndma_addr_t returned from the dma_alloc_coherent is wrongly truncated\nfrom snd_sgbuf_get_addr if running a 32bit kernel:\n\nstatic inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab,\n size_t offset)\n{\n struct snd_sg_buf *sgbuf \u003d dmab-\u003eprivate_data;\n dma_addr_t addr \u003d sgbuf-\u003etable[offset \u003e\u003e PAGE_SHIFT].addr;\n addr \u0026\u003d PAGE_MASK;\n return addr + offset % PAGE_SIZE;\n}\n\nwhere PAGE_MASK in a 32bit kernel is zeroing the upper 32bit af addr.\n\nWithout this patch the HW will fetch the 32bit truncated address,\nwhich is not the one obtained from dma_alloc_coherent and will result\nto a non working audio but can corrupt host memory at a random location.\n\nThe current patch apply to v3.13-rc3-74-g6c843f5\n\nSigned-off-by: Stefano Panella \u003cstefano.panella@citrix.com\u003e\nReviewed-by: Frediano Ziglio \u003cfrediano.ziglio@citrix.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "0dfb9809e93b60946d1915b554138eb93595860c", "tree": "34fb057dfc4edbb2936525191cc0b0edd2061136", "parents": [ "6c6eb4270c209cd3b46e4f0bb6b6480b53398111" ], "author": { "name": "Hui Wang", "email": "hui.wang@canonical.com", "time": "Tue Dec 10 15:57:21 2013 +0800" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 09:02:58 2013 +0100" }, "message": "ALSA: hda - Another Dell headset detection quirk\n\nOn the Dell Inspiron 3045 machine (codec Subsystem Id: 0x10280628),\nno external microphone can be detected when plugging a 3-ring\nheadset. If we add \"model\u003ddell-headset-multi\" for the\nsnd-hda-intel.ko, the problem will disappear.\n\nBugLink: https://bugs.launchpad.net/hwe-somerville/+bug/1259437\nCC: David Henningsson \u003cdavid.henningsson@canonical.com\u003e\nSigned-off-by: Hui Wang \u003chui.wang@canonical.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "6c6eb4270c209cd3b46e4f0bb6b6480b53398111", "tree": "a0105dae9312521aadc3a1fd7d8ef89efec9b42c", "parents": [ "31660e9084dfc44592051bc40882a54036f17a78" ], "author": { "name": "Hui Wang", "email": "hui.wang@canonical.com", "time": "Tue Dec 10 15:57:20 2013 +0800" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Dec 10 09:02:49 2013 +0100" }, "message": "ALSA: hda - A Dell headset detection quirk\n\nOn the Dell Optiplex 3030 machine (codec Subsystem Id: 0x10280623),\nno external microphone can be detected when plugging a 3-ring\nheadset. If we add \"model\u003ddell-headset-multi\" for the\nsnd-hda-intel.ko, the problem will disappear.\n\nBugLink: https://bugs.launchpad.net/hwe-somerville/+bug/1259435\nCC: David Henningsson \u003cdavid.henningsson@canonical.com\u003e\nSigned-off-by: Hui Wang \u003chui.wang@canonical.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "dace8bbfccfd9e4fcccfffcfbd82881fda3e756f", "tree": "95032d1270fd51614b0553252227fbb36639ddad", "parents": [ "9539210e17dc09ea1472076c297d461c7507a5bb" ], "author": { "name": "Alan", "email": "gnomes@lxorguk.ukuu.org.uk", "time": "Wed Dec 04 15:31:52 2013 +0000" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Tue Dec 10 08:48:15 2013 +0100" }, "message": "sc1200_wdt: Fix oops\n\nIf loaded with isapnp \u003d 0 the driver explodes. This is catching\npeople out now and then. What should happen in the working case is\na complete mystery and the code appears terminally confused, but we\ncan at least make the error path work properly.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nReviewed-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\nPartially-Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id\u003d53991\n" }, { "commit": "9539210e17dc09ea1472076c297d461c7507a5bb", "tree": "65a2aa9687e9796ac4e3bef21cbd65bf01c64811", "parents": [ "17b2112f332db7c2bac56926c9e627807bce3615" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Tue Nov 19 13:26:17 2013 -0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Tue Dec 10 08:48:09 2013 +0100" }, "message": "watchdog: Drop unnecessary include of miscdevice.h\n\nAfter commit 487722cf2 (watchdog: Get rid of MODULE_ALIAS_MISCDEV\nstatements) the affected drivers no longer need to include miscdevice.h.\nOnly exception is rt2880_wdt.c which never needed it.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nReviewed-by: Jean Delvare \u003cjdelvare@suse.de\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "464b500e37a588be69ed9c9c21bca62a578ca66c", "tree": "539049f9f53f1c9b0608069a6722f81d70dcf44a", "parents": [ "7155530d9eb692994d208836e4965da06b17c99d" ], "author": { "name": "Paul Walmsley", "email": "pwalmsley@nvidia.com", "time": "Mon Dec 09 18:35:24 2013 -0800" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hegtvedt@cisco.com", "time": "Tue Dec 10 08:46:38 2013 +0100" }, "message": "avr32: favr-32: clk_round_rate() can return a zero upon error\n\nTreat both negative and zero return values from clk_round_rate() as\nerrors. This is needed since subsequent patches will convert\nclk_round_rate()\u0027s return value to be an unsigned type, rather than a\nsigned type, since some clock sources can generate rates higher than\n(2^31)-1 Hz.\n\nEventually, when calling clk_round_rate(), only a return value of zero\nwill be considered a error. All other values will be considered valid\nrates. The comparison against values less than 0 is kept to preserve\nthe correct behavior in the meantime.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Håvard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\n" }, { "commit": "7155530d9eb692994d208836e4965da06b17c99d", "tree": "f933c6156f0a98b831cd8ff485c8344cfd679161", "parents": [ "fa1513f60a370a38512ccad4da11548f236768c4" ], "author": { "name": "Michael Opdenacker", "email": "michael.opdenacker@free-electrons.com", "time": "Mon Dec 09 06:16:51 2013 +0100" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hegtvedt@cisco.com", "time": "Tue Dec 10 08:46:38 2013 +0100" }, "message": "avr32: remove deprecated IRQF_DISABLED\n\nThis patch proposes to remove the use of the IRQF_DISABLED flag\n\nIt\u0027s a NOOP since 2.6.35 and it will be removed one day.\n\nSigned-off-by: Michael Opdenacker \u003cmichael.opdenacker@free-electrons.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\n" }, { "commit": "fa1513f60a370a38512ccad4da11548f236768c4", "tree": "a017ead1c4164042d878c1f389404846e0dfcfeb", "parents": [ "e6a7906cbfe6f4a793ff427e065ccbb494d65d7b" ], "author": { "name": "Matthias Brugger", "email": "matthias.bgg@gmail.com", "time": "Thu Dec 05 10:59:57 2013 +0100" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hegtvedt@cisco.com", "time": "Tue Dec 10 08:46:38 2013 +0100" }, "message": "cpufreq_ at32ap-cpufreq.c: Fix section mismatch\n\nThe function at32_cpufreq_driver_init was marked as __init but will be\ncalled from inside the cpufreq framework. This lead to the following a\nsection mismatch during compilation:\n\nWARNING: drivers/built-in.o(.data+0x2448): Section mismatch in reference\nfrom the variable at32_driver to the function\n.init.text:at32_cpufreq_driver_init()\nThe variable at32_driver references\nthe function __init at32_cpufreq_driver_init()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the\nvariable:\n*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console\n\nSigned-off-by: Matthias Brugger \u003cmatthias.bgg@gmail.com\u003e\n" }, { "commit": "e6a7906cbfe6f4a793ff427e065ccbb494d65d7b", "tree": "a02b519918e88637f9f5d85e32742ce827ce6f4e", "parents": [ "b96fa8f0f4e09eacf16535af66d74ff92fe7de73" ], "author": { "name": "Matthias Brugger", "email": "matthias.bgg@gmail.com", "time": "Wed Dec 04 17:52:55 2013 +0100" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hegtvedt@cisco.com", "time": "Tue Dec 10 08:46:38 2013 +0100" }, "message": "avr32: pm: Fix section mismatch\n\nThe power management has a section mismatch which leads to the following\nwarning during compilation:\n\nWARNING: arch/avr32/mach-at32ap/built-in.o(.text+0x16d4): Section\nmismatch in reference from the function avr32_pm_offset() to the\nfunction .init.text:pm_exception()\nThe function avr32_pm_offset() references\nthe function __init pm_exception().\n\nSigned-off-by: Matthias Brugger \u003cmatthias.bgg@gmail.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003chegtvedt@cisco.com\u003e\n" }, { "commit": "b96fa8f0f4e09eacf16535af66d74ff92fe7de73", "tree": "5ebd34fa037db3257d444d4df5ca8c72fbb50501", "parents": [ "17b2112f332db7c2bac56926c9e627807bce3615" ], "author": { "name": "Eunbong Song", "email": "eunb.song@samsung.com", "time": "Wed Nov 27 00:49:37 2013 +0000" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hegtvedt@cisco.com", "time": "Tue Dec 10 08:46:37 2013 +0100" }, "message": "avr32: Kill CONFIG_MTD_PARTITIONS\n\nThis patch removes CONFIG_MTD_PARTITIONS in config files for avr32.\nBecause CONFIG_MTD_PARTITIONS was removed by commit\n6a8a98b22b10f1560d5f90aded4a54234b9b2724.\n\nSigned-off-by: Eunbong Song \u003ceunb.song@samsung.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003chegtvedt@cisco.com\u003e\n" }, { "commit": "64c832a4f79542809d6c10b8ec6225ff8b76092e", "tree": "e3ab4af41bdba5a3e3c65f1a1ea90124257a1f63", "parents": [ "a5e3d743cb6ed2d73546eaf070138202c0c64a6f" ], "author": { "name": "Geyslan G. Bem", "email": "geyslan@gmail.com", "time": "Wed Nov 20 18:02:52 2013 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "m.chehab@samsung.com", "time": "Tue Dec 10 05:40:57 2013 -0200" }, "message": "[media] videobuf2-dma-sg: fix possible memory leak\n\nFix the return when \u0027buf-\u003epages\u0027 allocation error.\n\nSigned-off-by: Geyslan G. Bem \u003cgeyslan@gmail.com\u003e\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\n" }, { "commit": "a5e3d743cb6ed2d73546eaf070138202c0c64a6f", "tree": "1d6618189bd6824d56e8eb8bdd76ff62863511ec", "parents": [ "3d8b24d27808e6ab95eae70cb15315051a7f90eb" ], "author": { "name": "Hans Verkuil", "email": "hansverk@cisco.com", "time": "Wed Dec 04 15:14:05 2013 +0100" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "m.chehab@samsung.com", "time": "Tue Dec 10 05:40:57 2013 -0200" }, "message": "[media] vb2: regression fix: always set length field.\n\nCommit dc77523c5da5513df1bbc74db2a522a94f4cec0e ensured that m.offset is\nonly set for the MMAP memory mode by calling __setup_offsets only for that\nmode.\n\nHowever, __setup_offsets also initializes the length fields, and that should\nbe done regardless of the memory mode. Because of that change the v4l2-ctl\ntest application fails for the USERPTR mode.\n\nThis fix creates a __setup_lengths function that sets the length, and\n__setup_offsets just sets the offset and no longer touches the length.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nAcked-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "241ecf1ce528804d5ffc8fb386ff2a01b1f937c4", "tree": "3bac96d0f5c15a0250c7814f729399c7492abe5b", "parents": [ "e696c68363740d3a8fe495e353de3ff26b86257a" ], "author": { "name": "Michael Hennerich", "email": "michael.hennerich@analog.com", "time": "Mon Dec 09 22:13:10 2013 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Dec 09 22:23:31 2013 -0800" }, "message": "Input: adxl34x - Fix bug in definition of ADXL346_2D_ORIENT\n\nCoverity report pointet out by Dmitry\n\nReported-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "e696c68363740d3a8fe495e353de3ff26b86257a", "tree": "325f52f65bca1bbcdb150ad25e7886b1016b46e8", "parents": [ "5d43889c07bb38694742936aa70d1187c012e198" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Dec 07 07:13:56 2013 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Dec 09 22:23:26 2013 -0800" }, "message": "Input: serio - fix sysfs layout\n\nRestore previous layout of sysfs attributes that was broken by commit\n3778a2129bcce84f684cc0017ed20d2524afd289 (input: serio: remove bus usage of\ndev_attrs) which moved all serio device attributes into \u0027id\u0027 group, when\nonly \u0027type\u0027, \u0027proto\u0027, \u0027id\u0027, and \u0027extra\u0027 should be in \u0027id\u0027 group and the\nrest of attributes should be attached directly to the device.\n\nReported-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nTested-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "5d43889c07bb38694742936aa70d1187c012e198", "tree": "73809dddae39ae3b746396e9779142dbd1973f33", "parents": [ "95f75e91588afecfb0090988393653d21f5d1f91", "374b105797c3d4f29c685f3be535c35f5689b30e" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Dec 09 22:22:40 2013 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Dec 09 22:22:40 2013 -0800" }, "message": "Merge tag \u0027v3.13-rc3\u0027 into for-linus\n\nMerging with the mainline to sync up on changes to serio core.\n" }, { "commit": "17b2112f332db7c2bac56926c9e627807bce3615", "tree": "72f8ad178eece0588e2b396d0de76ef14ebe616e", "parents": [ "78fd82238d0e5716578c326404184a27ba67fd6e", "e641eb03ab2b0f065fa5e64b4202fb5b0441b427" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 09 19:21:39 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 09 19:21:39 2013 -0800" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fixes from Ben Herrenschmidt:\n \"Here are a handful of powerpc fixes for 3.13.\n\n The patches are reasonably trivial and self contained. Note the offb\n patches outside of arch/powerpc, they are LE fixes for our\n open-firmware \u0027dumb\u0027 framebuffer\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: Fix up the kdump base cap to 128M\n powernv: Fix VFIO support with PHB3\n powerpc/52xx: Re-enable bestcomm driver in defconfigs\n powerpc/pasemi: Turn on devtmpfs in defconfig\n offb: Add palette hack for little endian\n offb: Little endian fixes\n powerpc: Fix PTE page address mismatch in pgtable ctor/dtor\n powerpc/44x: Fix ocm_block allocation\n powerpc: Fix build break with PPC_EARLY_DEBUG_BOOTX\u003dy\n powerpc/512x: dts: remove misplaced IRQ spec from \u0027soc\u0027 node\n" }, { "commit": "e641eb03ab2b0f065fa5e64b4202fb5b0441b427", "tree": "3c92bfb8705a637fcd1b317d851ac089d7ac7eb5", "parents": [ "08607afba64cc7a14d22b8aa2837d00f1d877d83" ], "author": { "name": "Mahesh Salgaonkar", "email": "mahesh@linux.vnet.ibm.com", "time": "Mon Dec 09 15:33:39 2013 +0530" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:28:39 2013 +1100" }, "message": "powerpc: Fix up the kdump base cap to 128M\n\nThe current logic sets the kdump base to min of 2G or ppc64_rma_size/2.\nOn PowerNV kernel the first memory block \u0027memory@0\u0027 can be very large,\nequal to the DIMM size with ppc64_rma_size value capped to 1G. Hence on\nPowerNV, kdump base is set to 512M resulting kdump to fail while allocating\npaca array. This is because, paca need its memory from RMA region capped\nat 256M (see allocate_pacas()).\n\nThis patch lowers the kdump base cap to 128M so that kdump kernel can\nsuccessfully get memory below 256M for paca allocation.\n\nSigned-off-by: Mahesh Salgaonkar \u003cmahesh@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "08607afba64cc7a14d22b8aa2837d00f1d877d83", "tree": "c56b0d782a094c9d18a014a268b5f10a3cbba1d8", "parents": [ "84953f969bd198b342330b4867856d228260c96e" ], "author": { "name": "Thadeu Lima de Souza Cascardo", "email": "cascardo@linux.vnet.ibm.com", "time": "Mon Dec 09 14:41:01 2013 -0200" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:28:38 2013 +1100" }, "message": "powernv: Fix VFIO support with PHB3\n\nI have recently found out that no iommu_groups could be found under\n/sys/ on a P8. That prevents PCI passthrough from working.\n\nDuring my investigation, I found out there seems to be a missing\niommu_register_group for PHB3. The following patch seems to fix the\nproblem. After applying it, I see iommu_groups under\n/sys/kernel/iommu_groups/, and can also bind vfio-pci to an adapter,\nwhich gives me a device at /dev/vfio/.\n\nSigned-off-by: Thadeu Lima de Souza Cascardo \u003ccascardo@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "84953f969bd198b342330b4867856d228260c96e", "tree": "7ec15946a00f5c004202303e27cff36c4fc1965f", "parents": [ "fbae00e63d18ae50bcc902ca1a2439206445726c" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Mon Dec 09 22:15:44 2013 +0100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:25:08 2013 +1100" }, "message": "powerpc/52xx: Re-enable bestcomm driver in defconfigs\n\nThe bestcomm driver has been moved to drivers/dma, so to select\nthis driver by default additionally CONFIG_DMADEVICES has to be\nenabled. Currently it is not enabled in the config despite existing\nCONFIG_PPC_BESTCOMM\u003dy in the config files. Fix it.\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "fbae00e63d18ae50bcc902ca1a2439206445726c", "tree": "8b97426ddd2b3d11c82f713607be55c447b1da2a", "parents": [ "e1edf18b20076da83dd231dbd2146cbbc31c0b14" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 09 15:40:20 2013 -0800" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:25:08 2013 +1100" }, "message": "powerpc/pasemi: Turn on devtmpfs in defconfig\n\nAt least some distros expect it these days; turn it on. Also, random\nchurn from doing a savedefconfig for the first time in a year or so.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e1edf18b20076da83dd231dbd2146cbbc31c0b14", "tree": "6e5e18f89477bb201cde20f37c98d1a657790c37", "parents": [ "212c0cbd5be721a39ef3e2f723e0c78008f9e955" ], "author": { "name": "Cedric Le Goater", "email": "clg@fr.ibm.com", "time": "Wed Dec 04 17:49:52 2013 +0100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:25:07 2013 +1100" }, "message": "offb: Add palette hack for little endian\n\nThe pseudo palette color entries need to be ajusted for little\nendian.\n\nThis patch byteswaps the values in the pseudo palette depending\non the host endian order and the screen depth.\n\nSigned-off-by: Cédric Le Goater \u003cclg@fr.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "212c0cbd5be721a39ef3e2f723e0c78008f9e955", "tree": "1bd0ccf4aebe577f986afbb12bed89180e1563ba", "parents": [ "cf77ee54362a245f9a01f240adce03a06c05eb68" ], "author": { "name": "Cedric Le Goater", "email": "clg@fr.ibm.com", "time": "Wed Dec 04 17:49:51 2013 +0100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:25:06 2013 +1100" }, "message": "offb: Little endian fixes\n\nThe \"screen\" properties : depth, width, height, linebytes need\nto be converted to the host endian order when read from the device\ntree.\n\nThe offb_init_palette_hacks() routine also made assumption on the\nhost endian order.\n\nSigned-off-by: Cédric Le Goater \u003cclg@fr.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "cf77ee54362a245f9a01f240adce03a06c05eb68", "tree": "0c8a9b60e17be65256cbf13bcb27453c5e570329", "parents": [ "1b429835be7ce514b36b551e785d425fd56cd1f2" ], "author": { "name": "Hong H. Pham", "email": "hong.pham@windriver.com", "time": "Sat Dec 07 09:06:33 2013 -0500" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:25:05 2013 +1100" }, "message": "powerpc: Fix PTE page address mismatch in pgtable ctor/dtor\n\nIn pte_alloc_one(), pgtable_page_ctor() is passed an address that has\nnot been converted by page_address() to the newly allocated PTE page.\n\nWhen the PTE is freed, __pte_free_tlb() calls pgtable_page_dtor()\nwith an address to the PTE page that has been converted by page_address().\nThe mismatch in the PTE\u0027s page address causes pgtable_page_dtor() to access\ninvalid memory, so resources for that PTE (such as the page lock) is not\nproperly cleaned up.\n\nOn PPC32, only SMP kernels are affected.\n\nOn PPC64, only SMP kernels with 4K page size are affected.\n\nThis bug was introduced by commit d614bb041209fd7cb5e4b35e11a7b2f6ee8f62b8\n\"powerpc: Move the pte free routines from common header\".\n\nOn a preempt-rt kernel, a spinlock is dynamically allocated for each\nPTE in pgtable_page_ctor(). When the PTE is freed, calling\npgtable_page_dtor() with a mismatched page address causes a memory leak,\nas the pointer to the PTE\u0027s spinlock is bogus.\n\nOn mainline, there isn\u0027t any immediately obvious symptoms, but the\nproblem still exists here.\n\nFixes: d614bb041209fd7c \"powerpc: Move the pte free routes from common header\"\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: linux-stable \u003cstable@vger.kernel.org\u003e # v3.10+\nSigned-off-by: Hong H. Pham \u003chong.pham@windriver.com\u003e\nReviewed-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "1b429835be7ce514b36b551e785d425fd56cd1f2", "tree": "6696b1ef3296dd0d0298744bb8a1b3eedb59b3eb", "parents": [ "2d6f0c3ae609a73ce6753395daaab3204cd33918" ], "author": { "name": "Ilia Mirkin", "email": "imirkin@alum.mit.edu", "time": "Fri Dec 06 19:43:37 2013 -0500" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:25:04 2013 +1100" }, "message": "powerpc/44x: Fix ocm_block allocation\n\nAllocate enough memory for the ocm_block structure, not just a pointer\nto it.\n\nSigned-off-by: Ilia Mirkin \u003cimirkin@alum.mit.edu\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "2d6f0c3ae609a73ce6753395daaab3204cd33918", "tree": "e8c2d0275aebe850de186114327260f4b2d7dd1d", "parents": [ "e80ba46120f92102ba92c04158fcbf20cb175515" ], "author": { "name": "Michael Ellerman", "email": "mpe@ellerman.id.au", "time": "Fri Nov 29 14:55:22 2013 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:25:03 2013 +1100" }, "message": "powerpc: Fix build break with PPC_EARLY_DEBUG_BOOTX\u003dy\n\nA kernel configured with PPC_EARLY_DEBUG_BOOTX\u003dy but PPC_PMAC\u003dn and\nPPC_MAPLE\u003dn will fail to link:\n\n btext.c:(.text+0x2d0fc): undefined reference to `.rmci_off\u0027\n btext.c:(.text+0x2d214): undefined reference to `.rmci_on\u0027\n\nFix it by making the build of rmci_on/off() depend on\nPPC_EARLY_DEBUG_BOOTX, which also enable the only code that uses them.\n\nSigned-off-by: Michael Ellerman \u003cmpe@ellerman.id.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e80ba46120f92102ba92c04158fcbf20cb175515", "tree": "9a7c6b6f6fb637a63d09af50d21357b1743f9690", "parents": [ "721cb59e9d95eb7f47ec73711ed35ef85e1ea1ca", "c65ec135960e4555f65d8c9243f65b2fb88ac071" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:24:10 2013 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Dec 10 11:24:10 2013 +1100" }, "message": "Merge remote-tracking branch \u0027agust/merge\u0027 into merge\n\nAnatolij Gustschin says:\n\n\u003c\u003c\nPlease pull a device tree fix for v3.13. The booting on mpc512x\nis broken since v3.13-rc1, this patch repairs it.\n\u003e\u003e\n" }, { "commit": "ed16c8c50e26df3c16e40d35c9a4c0e9f032656c", "tree": "f268748e4bd3a6ceb08b7a7a70fb86c4dfce0e02", "parents": [ "8ae19ec3356901bafa64816d9ea9378896f8979c", "f2e2c9d9b4087b74eb9e00d8dfac148354cb0b71" ], "author": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Mon Dec 09 15:38:00 2013 -0800" }, "committer": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Mon Dec 09 15:38:41 2013 -0800" }, "message": "Merge tag \u0027omap-for-v3.13/yet-more-dt-regressions-take2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes\n\nA rather big fix for a regression where we have dropped omap4 hwmod\ndata earlier but are not initializing it from device tree. In addition\nto this fix we eventually also be fix the issues in the .dts files\nand drivers, but that\u0027s too intrusive for the -rc cycle and must be\ndone later on.\n\nAlso a fix for a regression where we now are wrongly trying to initialize\ndevices on secure omaps like n900 and n9* when booted using device tree.\nWe need to set aes, sham and timer12 to disabled mode for secure\ndevices as they are claimed by the firmware running in the secure mode.\n\nAnd two more legacy booting vs device tree based booting fixes for\nam3517 that I did not notice earlier until Nishant Menon reported\nthese to me few days ago. With these we\u0027re good to go having v3.13\nworking both for legacy booting and device tree based booting, and we\ncan then go ahed and drop the legacy booting for mach-omap2 for v3.14.\n\n* tag \u0027omap-for-v3.13/yet-more-dt-regressions-take2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (494 commits)\n ARM: dts: Fix booting for secure omaps\n ARM: OMAP2+: Fix the machine entry for am3517\n ARM: dts: Fix missing entries for am3517\n ARM: OMAP2+: Fix overwriting hwmod data with data from device tree\n +Linux 3.13-rc3\n" }, { "commit": "0e7dc862cf687234ed1b01a6b2461b782ea0bca0", "tree": "348515464ac254197a68bc61e7b19f47d6d7b41d", "parents": [ "7f4d3641e2548d1ac5dee837ff434df668a2810c" ], "author": { "name": "Nishanth Menon", "email": "nm@ti.com", "time": "Sun Dec 08 18:39:03 2013 -0700" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Mon Dec 09 11:51:30 2013 -0700" }, "message": "ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present\n\ncommit dc75925d(OMAP: hwmod: Fix the missing braces) introduced\nmissing braces, however, we just set return result if clk_get fail\nand we populate the error pointer in clk pointer and pass it along to\nclk_prepare. This is wrong. The intent seems to be retry remaining\nclocks if they are available and warn the ones we cant find clks for.\n\nWith the current logic, we see the following crash:\nomap_hwmod: l3_main: cannot clk_get interface_clk emac_ick\nUnable to handle kernel NULL pointer dereference at virtual address 00000032\npgd \u003d c0004000\n[00000032] *pgd\u003d00000000\nInternal error: Oops: 5 [#1] SMP ARM\nModules linked in:\nCPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.13.0-rc1-00044-gcc9fd5a-dirty #19\ntask: ce0c3440 ti: ce0c4000 task.ti: ce0c4000\nPC is at __clk_prepare+0x10/0x74\nLR is at clk_prepare+0x14/0x24\n \u003csnip\u003e\n[\u003cc044d59c\u003e] (__clk_prepare+0x10/0x74) from [\u003cc044d9b0\u003e] (clk_prepare+0x14/0x24)\n[\u003cc044d9b0\u003e] (clk_prepare+0x14/0x24) from [\u003cc077d8c4\u003e] (_init+0x24c/0x3bc)\n[\u003cc077d8c4\u003e] (_init+0x24c/0x3bc) from [\u003cc0027328\u003e] (omap_hwmod_for_each+0x34/0x5c)\n[\u003cc0027328\u003e] (omap_hwmod_for_each+0x34/0x5c) from [\u003cc077dfa0\u003e] (__omap_hwmod_setup_all+0x24/0x40)\n[\u003cc077dfa0\u003e] (__omap_hwmod_setup_all+0x24/0x40) from [\u003cc0008928\u003e] (do_one_initcall+0x38/0x168)\n[\u003cc0008928\u003e] (do_one_initcall+0x38/0x168) from [\u003cc0771be8\u003e] (kernel_init_freeable+0xfc/0x1cc)\n[\u003cc0771be8\u003e] (kernel_init_freeable+0xfc/0x1cc) from [\u003cc0521064\u003e] (kernel_init+0x8/0x110)\n[\u003cc0521064\u003e] (kernel_init+0x8/0x110) from [\u003cc000e568\u003e] (ret_from_fork+0x14/0x2c)\nCode: e92d4038 e2504000 01a05004 0a000005 (e5943034)\n\nSo, just warn and continue instead of proceeding and crashing, with\nmissing clock nodes/bad data, we will eventually fail, however we\nshould now have enough information to identify the culprit.\n\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\n" }, { "commit": "7f4d3641e2548d1ac5dee837ff434df668a2810c", "tree": "4243d7ca0703828ab6ea487b97662dbca5504a0f", "parents": [ "313a76ee11cda6700548afe68499ef174a240688" ], "author": { "name": "Roger Quadros", "email": "rogerq@ti.com", "time": "Sun Dec 08 18:39:02 2013 -0700" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Mon Dec 09 11:51:29 2013 -0700" }, "message": "ARM: OMAP3: hwmod data: Don\u0027t prevent RESET of USB Host module\n\nUnlike what the comment states, errata i660 does not state that we\ncan\u0027t RESET the USB host module. Instead it states that RESET is the\nonly way to recover from a deadlock situation.\n\nRESET ensures that the module is in a known good state irrespective\nof what bootloader does with the module, so it must be done at boot.\n\nSigned-off-by: Roger Quadros \u003crogerq@ti.com\u003e\nTested-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e # Panda, BeagleXM\nFixes: de231388cb80 (\"ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3\")\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\n" }, { "commit": "313a76ee11cda6700548afe68499ef174a240688", "tree": "9f3229756b91b02f155e055ac4ae82b62dcab324", "parents": [ "b483a4a5a7117ac7d21397770d5adb458c157dbe" ], "author": { "name": "Roger Quadros", "email": "rogerq@ti.com", "time": "Sun Dec 08 18:39:02 2013 -0700" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Mon Dec 09 11:51:08 2013 -0700" }, "message": "ARM: OMAP2+: hwmod: Fix SOFTRESET logic\n\nIn _ocp_softreset(), after _set_softreset() + write_sysconfig(),\nthe hwmod\u0027s sysc_cache will always contain SOFTRESET bit set\nso all further writes to sysconfig using this cache will initiate\na repeated SOFTRESET e.g. enable_sysc(). This is true for OMAP3 like\nplatforms that have RESET_DONE status in the SYSSTATUS register and\nso the the SOFTRESET bit in SYSCONFIG is not automatically cleared.\nIt is not a problem for OMAP4 like platforms that indicate RESET\ncompletion by clearing the SOFTRESET bit in the SYSCONFIG register.\n\nThis repeated SOFTRESET is undesired and was the root cause of\nUSB host issues on OMAP3 platforms when hwmod was allowed to do the\nSOFTRESET for the USB Host module.\n\nTo fix this we clear the SOFTRESET bit and update the sysconfig\nregister + sysc_cache using write_sysconfig().\n\nSigned-off-by: Roger Quadros \u003crogerq@ti.com\u003e\nTested-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e # Panda, BeagleXM\n[paul@pwsan.com: renamed _clr_softreset() to _clear_softreset()]\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\n" }, { "commit": "78fd82238d0e5716578c326404184a27ba67fd6e", "tree": "389bbadbfec951707158abe6f3d137cd33d72ff7", "parents": [ "32ac486967a1786ffbdf958cfb2c33f42c5a6103", "9255ce80f88ba885c38c0bbd235db7c24392e22e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 09 09:43:07 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 09 09:43:07 2013 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"This is probably a bit big, but just because I fell behind last week\n and didn\u0027t get to doing any pulls, so stuff backed up behind me, I\n actually should have sent this for -rc3 but failed to even manage\n that.\n\n So this has radeon, intel, nouveau, vmware, exynos and tegra fixes in\n it, and the line count isn\u0027t all the bad in the end\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (50 commits)\n drm: fix the addition of the side-by-side (half) flag for extra 3D modes\n drm/edid: fix length check when adding extra 3D modes\n drm/radeon/atom: fix bus probes when hw_i2c is set (v2)\n drm/radeon: fix null pointer dereference in dce6+ audio code\n drm/radeon: fixup bad vram size on SI\n udl: fix issue with imported prime buffers\n drm/vmwgfx: Add our connectors to sysfs\n drm/vmwgfx: Fix dma buffer memory size accounting\n drm/vmwgfx: Fix up and comment the dumb buffer implementation\n drm/vmwgfx: Correctly set the enabled state on crtcs\n drm/nv50/disp: min/max are reversed in nv50_crtc_gamma_set()\n drm/nouveau/sw: fix oops if gpu has its display block disabled\n drm/nouveau: unreference fence after syncing\n drm/nouveau/kms: send timestamp data for correct head in flip completion events\n drm/nouveau/clk: Add support for NVAA/NVAC\n drm/nouveau/fifo: Hook up pause and resume for NV50 and NV84+\n drm/nv10/plane: some chipsets don\u0027t support NV12\n drm/nv10/plane: add downscaling restrictions\n drm/nv10/plane: fix format computation\n drm/nv04-nv30/clk: provide an empty domain list\n ...\n" }, { "commit": "32ac486967a1786ffbdf958cfb2c33f42c5a6103", "tree": "8829b70afb04648b4d1df05fbcca80648c46bf0e", "parents": [ "77bd2adb97271c5f2237cfacf5984cc810033131", "88ec6a4d836904a75bef87bfcd906193ad11d88a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 09 09:30:21 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 09 09:30:21 2013 -0800" }, "message": "Merge tag \u0027mfd-fixes-3.13-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes\n\nPull mfd fixes from Samuel Ortiz:\n \"This is the first 3.13 pull request for MFD fixes. We have:\n\n - A ti-ssp build failure fix\n - An as3722 build failure fix\n - An lpc_ich copy paste error fix\"\n\n* tag \u0027mfd-fixes-3.13-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:\n mfd: lpc_ich: Fix Wildcat Point info name field\n mfd: ti-ssp: Fix build\n mfd: Make MFD_AS3722 depend on I2C\u003dy\n" } ], "next": "77bd2adb97271c5f2237cfacf5984cc810033131" }