)]}' { "log": [ { "commit": "3a366e614d0837d9fc23f78cdb1a1186ebc3387f", "tree": "5be6ec716687234ac1e6202db62c84ee1d2246be", "parents": [ "ac9a19745196388ae5d828c0be7a1d6e472101f3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Jan 11 13:06:33 2013 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Mon Jan 14 15:00:36 2013 +0100" }, "message": "block: add missing block_bio_complete() tracepoint\n\nbio completion didn\u0027t kick block_bio_complete TP. Only dm was\nexplicitly triggering the TP on IO completion. This makes\nblock_bio_complete TP useless for tracers which want to know about\nbios, and all other bio based drivers skip generating blktrace\ncompletion events.\n\nThis patch makes all bio completions via bio_endio() generate\nblock_bio_complete TP.\n\n* Explicit trace_block_bio_complete() invocation removed from dm and\n the trace point is unexported.\n\n* @rq dropped from trace_block_bio_complete(). bios may fly around\n w/o queue associated. Verifying and accessing the assocaited queue\n belongs to TP probes.\n\n* blktrace now gets both request and bio completions. Make it ignore\n bio completions if request completion path is happening.\n\nThis makes all bio based drivers generate blktrace completion events\nproperly and makes the block_bio_complete TP actually useful.\n\nv2: With this change, block_bio_complete TP could be invoked on sg\n commands which have bio\u0027s with %NULL bi_bdev. Update TP\n assignment code to check whether bio-\u003ebi_bdev is %NULL before\n dereferencing.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nOriginal-patch-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Alasdair Kergon \u003cagk@redhat.com\u003e\nCc: dm-devel@redhat.com\nCc: Neil Brown \u003cneilb@suse.de\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "ac9a19745196388ae5d828c0be7a1d6e472101f3", "tree": "49c47e1a07241653deb4a4b4e7a91626f586ad05", "parents": [ "422765c2638924da10ff363b5eed77924911bdc7", "43114018cb0b253fd03c4ff4d42bcdc43389ac1c" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Jan 11 19:53:53 2013 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Jan 11 19:53:53 2013 +0100" }, "message": "Merge branch \u0027blkcg-cfq-hierarchy\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-3.9/core\n\nTejun writes:\n\nHello, Jens.\n\nPlease consider pulling from the following branch to receive cfq blkcg\nhierarchy support. The branch is based on top of v3.8-rc2.\n\n git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git blkcg-cfq-hierarchy\n\nThe patchset was reviewd in the following thread.\n\n http://thread.gmane.org/gmane.linux.kernel.cgroups/5571\n" }, { "commit": "422765c2638924da10ff363b5eed77924911bdc7", "tree": "76ae39f6f744e45ec023859c2d46fad2aeaf7714", "parents": [ "242d98f077ac0ab80920219769eb095503b93f61" ], "author": { "name": "Jianpeng Ma", "email": "majianpeng@gmail.com", "time": "Fri Jan 11 14:46:09 2013 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Jan 11 14:46:09 2013 +0100" }, "message": "block: Remove should_sort judgement when flush blk_plug\n\nIn commit 975927b942c932,it add blk_rq_pos to sort rq when flushing.\nAlthough this commit was used for the situation which blk_plug handled\nmulti devices on the same time like md device.\nI think there must be some situations like this but only single\ndevice.\nSo remove the should_sort judgement.\nBecause the parameter should_sort is only for this purpose,it can delete\nshould_sort from blk_plug.\n\nCC: Shaohua Li \u003cshli@kernel.org\u003e\nSigned-off-by: Jianpeng Ma \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "242d98f077ac0ab80920219769eb095503b93f61", "tree": "df4bd59a6db181b796ff8687339e4335e2c59104", "parents": [ "9931faca02c604c22335f5a935a501bb2ace6e20" ], "author": { "name": "Sasha Levin", "email": "sasha.levin@oracle.com", "time": "Mon Dec 17 10:01:27 2012 -0500" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Jan 11 14:43:13 2013 +0100" }, "message": "block,elevator: use new hashtable implementation\n\nSwitch elevator to use the new hashtable implementation. This reduces the\namount of generic unrelated code in the elevator.\n\nThis also removes the dymanic allocation of the hash table. The size of the table is\nconstant so there\u0027s no point in paying the price of an extra dereference when accessing\nit.\n\nThis patch depends on d9b482c (\"hashtable: introduce a small and naive\nhashtable\") which was merged in v3.6.\n\nSigned-off-by: Sasha Levin \u003csasha.levin@oracle.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "9931faca02c604c22335f5a935a501bb2ace6e20", "tree": "3fd91d0b3aba06ebfd30599ac9a450118935c4f4", "parents": [ "5c49985c21bba4d2f899e3a97121868a5c58a876" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 18:59:55 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 18:59:55 2013 -0800" }, "message": "Linux 3.8-rc3\n" }, { "commit": "5c49985c21bba4d2f899e3a97121868a5c58a876", "tree": "f877cde6c0effa6c8cd6e1d0d7e116358eb41ee8", "parents": [ "57a0c1e2d6cb70ad0f8549ae730fc58fd0553429", "8a3a180d21793f2e4386b3cb61c48322564fc80a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 08:58:57 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 08:58:57 2013 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM fixes from Russell King.\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: 7616/1: cache-l2x0: aurora: Use writel_relaxed instead of writel\n ARM: 7615/1: cache-l2x0: aurora: Invalidate during clean operation with WT enable\n ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b\n ARM: 7612/1: imx: Do not select some errata that depends on !ARCH_MULTIPLATFORM\n ARM: 7611/1: VIC: fix bug in VIC irqdomain code\n ARM: 7610/1: versatile: bump IRQ numbers\n ARM: 7609/1: disable errata work-arounds which access secure registers\n ARM: 7608/1: l2x0: Only set .set_debug on PL310 r3p0 and earlier\n" }, { "commit": "57a0c1e2d6cb70ad0f8549ae730fc58fd0553429", "tree": "1c6bd5ceec0de88c357b698fe4d8fe8d110e26cb", "parents": [ "e53289c0c5e5a24e29e571eba7af05c845c10890", "44d22e2404b3ce93a314654962d31acc8afcdd62" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 08:43:56 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 08:43:56 2013 -0800" }, "message": "Merge tag \u0027edac_fixes_for_3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp\n\nPull EDAC fixes from Borislav Petkov:\n \"Two error path fixes causing a crash and a Kconfig fix for an issue\n which spilled all EDAC suboptions into the \u0027Device Drivers\u0027 menu.\"\n\n* tag \u0027edac_fixes_for_3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:\n EDAC: Cleanup device deregistering path\n EDAC: Fix EDAC Kconfig menu\n EDAC: Fix kernel panic on module unloading\n" }, { "commit": "e53289c0c5e5a24e29e571eba7af05c845c10890", "tree": "fd8852edc6b91152f30b8a7eb0e75fc5ca6750af", "parents": [ "08c097fc3bb283299a6915a6a3795edab85979b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 08:36:54 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 08:36:54 2013 -0800" }, "message": "mm: reinstante dropped pmd_trans_splitting() check\n\nThe check for a pmd being in the process of being split was dropped by\nmistake by commit d10e63f29488 (\"mm: numa: Create basic numa page\nhinting infrastructure\"). Put it back.\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nDebugged-by: Hillf Danton \u003cdhillf@gmail.com\u003e\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Kirill Shutemov \u003ckirill@shutemov.name\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "08c097fc3bb283299a6915a6a3795edab85979b1", "tree": "5c19a18fd83a34a0a853a4a43c83ec9b9aa1ee96", "parents": [ "974b33586b4bbbdab33c666417f9ba9ef50b62c3" ], "author": { "name": "Marc Dionne", "email": "marc.c.dionne@gmail.com", "time": "Wed Jan 09 14:16:30 2013 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 09 08:26:53 2013 -0800" }, "message": "cred: Remove tgcred pointer from struct cred\n\nCommit 3a50597de863 (\"KEYS: Make the session and process keyrings\nper-thread\") removed the definition of the thread_group_cred structure,\nbut left a now unused pointer in struct cred.\n\nSigned-off-by: Marc Dionne \u003cmarc.c.dionne@gmail.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "43114018cb0b253fd03c4ff4d42bcdc43389ac1c", "tree": "abe35791e5ab46d944f35112e25570ab861a7e2f", "parents": [ "0b39920b5f9f3ad37dd259bfa2e9cbca33475b28" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "message": "cfq-iosched: add hierarchical cfq_group statistics\n\nUnfortunately, at this point, there\u0027s no way to make the existing\nstatistics hierarchical without creating nasty surprises for the\nexisting users. Just create recursive counterpart of the existing\nstats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "0b39920b5f9f3ad37dd259bfa2e9cbca33475b28", "tree": "84f3c07ae535dbf02276ff3645b4fbfe95419d9b", "parents": [ "689665af4489f779bc82e7869509c9ac11b5a903" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "message": "cfq-iosched: collect stats from dead cfqgs\n\nTo support hierarchical stats, it\u0027s necessary to remember stats from\ndead children. Add cfqg-\u003edead_stats and make a dying cfqg transfer\nits stats to the parent\u0027s dead-stats.\n\nThe transfer happens form -\u003epd_offline_fn() and it is possible that\nthere are some residual IOs completing afterwards. Currently, we lose\nthese stats. Given that cgroup removal isn\u0027t a very high frequency\noperation and the amount of residual IOs on offline are likely to be\nnil or small, this shouldn\u0027t be a big deal and the complexity needed\nto handle residual IOs - another callback and rather elaborate\nsynchronization to reach and lock the matching q - doesn\u0027t seem\njustified.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "689665af4489f779bc82e7869509c9ac11b5a903", "tree": "2ae00b3beb2f658987d3e65cf9d08ff24ce916e3", "parents": [ "810ecfa765f8be20c8d9c468885b3403a2232d2f" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "message": "cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats()\n\nSeparate out cfqg_stats_reset() which takes struct cfqg_stats * from\ncfq_pd_reset_stats() and move the latter to where other pd methods are\ndefined. cfqg_stats_reset() will be used to implement hierarchical\nstats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "810ecfa765f8be20c8d9c468885b3403a2232d2f", "tree": "0c9173defed8de28cf43d972b8e36b48fbcc6f24", "parents": [ "548bc8e1b38e48653a90f48f636f8d253504f8a2" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "message": "blkcg: make blkcg_print_blkgs() grab q locks instead of blkcg lock\n\nInstead of holding blkcg-\u003elock while walking -\u003eblkg_list and executing\nprfill(), RCU walk -\u003eblkg_list and hold the blkg\u0027s queue lock while\nexecuting prfill(). This makes prfill() implementations easier as\nstats are mostly protected by queue lock.\n\nThis will be used to implement hierarchical stats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "548bc8e1b38e48653a90f48f636f8d253504f8a2", "tree": "db4aca3e40185423e465ef5a67f44658ff292443", "parents": [ "16b3de6652c7aef151f38726faf90f0dbc9e9c71" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:13 2013 -0800" }, "message": "block: RCU free request_queue\n\nRCU free request_queue so that blkcg_gq-\u003eq can be dereferenced under\nRCU lock. This will be used to implement hierarchical stats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "16b3de6652c7aef151f38726faf90f0dbc9e9c71", "tree": "1b8e615c5261b677ff6a6a3b25fad46b34d1b64b", "parents": [ "b50da39f51139f81b3115d0f9d8632507f802755" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "message": "blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge()\n\nImplement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge().\nThe former two collect the [rw]stats designated by the target policy\ndata and offset from the pd\u0027s subtree. The latter two add one\n[rw]stat to another.\n\nNote that the recursive sum functions require the queue lock to be\nheld on entry to make blkg online test reliable. This is necessary to\nproperly handle stats of a dying blkg.\n\nThese will be used to implement hierarchical stats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "b50da39f51139f81b3115d0f9d8632507f802755", "tree": "98d8fc862dfa6ad7ed7c9366035eea36a6489d5c", "parents": [ "4d5e80a76074786a49879ff482a83e72ad634606" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "message": "blkcg: export __blkg_prfill_rwstat()\n\nHierarchical stats for cfq-iosched will need __blkg_prfill_rwstat().\nExport it.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "4d5e80a76074786a49879ff482a83e72ad634606", "tree": "2bfc06bd5707407c53a295061a2a609af75791d0", "parents": [ "f427d909648aa592c9588d0f66b5b457752a0cd1" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "message": "blkcg: s/blkg_rwstat_sum()/blkg_rwstat_total()/\n\nRename blkg_rwstat_sum() to blkg_rwstat_total(). sum will be used for\nsumming up stats from multiple blkgs.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "f427d909648aa592c9588d0f66b5b457752a0cd1", "tree": "d6f91a6d46a1302f0cca6137851f0806364b7965", "parents": [ "b276a876a014c5fa58a16f247c0933f6c42112e3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "message": "blkcg: implement blkcg_policy-\u003eon/offline_pd_fn() and blkcg_gq-\u003eonline\n\nAdd two blkcg_policy methods, -\u003eonline_pd_fn() and -\u003eoffline_pd_fn(),\nwhich are invoked as the policy_data gets activated and deactivated\nwhile holding both blkcg and q locks.\n\nAlso, add blkcg_gq-\u003eonline bool, which is set and cleared as the\nblkcg_gq gets activated and deactivated. This flag also is toggled\nwhile holding both blkcg and q locks.\n\nThese will be used to implement hierarchical stats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "b276a876a014c5fa58a16f247c0933f6c42112e3", "tree": "c49f85e03d11296683ed938864bd823cdeaa614f", "parents": [ "d02f7aa8dce8166dbbc515ce393912aa45e6b8a6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:12 2013 -0800" }, "message": "blkcg: add blkg_policy_data-\u003eplid\n\nAdd pd-\u003eplid so that the policy a pd belongs to can be identified\neasily. This will be used to implement hierarchical blkg_[rw]stats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "d02f7aa8dce8166dbbc515ce393912aa45e6b8a6", "tree": "8a3e8e54bed797bb084a83008ca47065a261a9d6", "parents": [ "41cad6ab2cb9ccb3b11546ad56b8b285e47c6279" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "message": "cfq-iosched: enable full blkcg hierarchy support\n\nWith the previous two patches, all cfqg scheduling decisions are based\non vfraction and ready for hierarchy support. The only thing which\nkeeps the behavior flat is cfqg_flat_parent() which makes vfraction\ncalculation consider all non-root cfqgs children of the root cfqg.\n\nReplace it with cfqg_parent() which returns the real parent. This\nenables full blkcg hierarchy support for cfq-iosched. For example,\nconsider the following hierarchy.\n\n root\n / \\\n A:500 B:250\n / \\\n AA:500 AB:1000\n\nFor simplicity, let\u0027s say all the leaf nodes have active tasks and are\non service tree. For each leaf node, vfraction would be\n\n AA: (500 / 1500) * (500 / 750) \u003d~ 0.2222\n AB: (1000 / 1500) * (500 / 750) \u003d~ 0.4444\n B: (250 / 750) \u003d~ 0.3333\n\nand vdisktime will be distributed accordingly. For more detail,\nplease refer to Documentation/block/cfq-iosched.txt.\n\nv2: cfq-iosched.txt updated to describe group scheduling as suggested\n by Vivek.\n\nv3: blkio-controller.txt updated.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "41cad6ab2cb9ccb3b11546ad56b8b285e47c6279", "tree": "c6308080ab464a5f7a5da52035e948431061949a", "parents": [ "1d3650f713e7f6392b02fde450c5bae40291e65b" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "message": "cfq-iosched: convert cfq_group_slice() to use cfqg-\u003evfraction\n\ncfq_group_slice() calculates slice by taking a fraction of\ncfq_target_latency according to the ratio of cfqg-\u003eweight against\nservice_tree-\u003etotal_weight. This currently works only because all\ncfqgs are treated to be at the same level.\n\nTo prepare for proper hierarchy support, convert cfq_group_slice() to\nbase the calculation on cfqg-\u003evfraction. As cfqg-\u003evfraction is always\na fraction of 1 and represents the fraction allocated to the cfqg with\nhierarchy considered, the slice can be simply calculated by\nmultiplying cfqg-\u003evfraction to cfq_target_latency (with fixed point\nshift factored in).\n\nAs vfraction calculation currently treats all non-root cfqgs as\nchildren of the root cfqg, this patch doesn\u0027t introduce noticeable\nbehavior difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "1d3650f713e7f6392b02fde450c5bae40291e65b", "tree": "bc1645e9ce6d762894b51505fc90253f9a9aed58", "parents": [ "7918ffb5b83e3373206ada84873c674fbddf61cc" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "message": "cfq-iosched: implement hierarchy-ready cfq_group charge scaling\n\nCurrently, cfqg charges are scaled directly according to cfqg-\u003eweight.\nRegardless of the number of active cfqgs or the amount of active\nweights, a given weight value always scales charge the same way. This\nworks fine as long as all cfqgs are treated equally regardless of\ntheir positions in the hierarchy, which is what cfq currently\nimplements. It can\u0027t work in hierarchical settings because the\ninterpretation of a given weight value depends on where the weight is\nlocated in the hierarchy.\n\nThis patch reimplements cfqg charge scaling so that it can be used to\nsupport hierarchy properly. The scheme is fairly simple and\nlight-weight.\n\n* When a cfqg is added to the service tree, v(disktime)weight is\n calculated. It walks up the tree to root calculating the fraction\n it has in the hierarchy. At each level, the fraction can be\n calculated as\n\n cfqg-\u003eweight / parent-\u003elevel_weight\n\n By compounding these, the global fraction of vdisktime the cfqg has\n claim to - vfraction - can be determined.\n\n* When the cfqg needs to be charged, the charge is scaled inversely\n proportionally to the vfraction.\n\nThe new scaling scheme uses the same CFQ_SERVICE_SHIFT for fixed point\nrepresentation as before; however, the smallest scaling factor is now\n1 (ie. 1 \u003c\u003c CFQ_SERVICE_SHIFT). This is different from before where 1\nwas for CFQ_WEIGHT_DEFAULT and higher weight would result in smaller\nscaling factor.\n\nWhile this shifts the global scale of vdisktime a bit, it doesn\u0027t\nchange the relative relationships among cfqgs and the scheduling\nresult isn\u0027t different.\n\ncfq_group_notify_queue_add uses fixed CFQ_IDLE_DELAY when appending\nnew cfqg to the service tree. The specific value of CFQ_IDLE_DELAY\ndidn\u0027t have any relevance to vdisktime before and is unlikely to cause\nany visible behavior difference now especially as the scale shift\nisn\u0027t that large.\n\nAs the new scheme now makes proper distinction between cfqg-\u003eweight\nand -\u003eleaf_weight, reverse the weight aliasing for root cfqgs. For\nroot, both weights are now mapped to -\u003eleaf_weight instead of the\nother way around.\n\nBecause we\u0027re still using cfqg_flat_parent(), this patch shouldn\u0027t\nchange the scheduling behavior in any noticeable way.\n\nv2: Beefed up comments on vfraction as requested by Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "7918ffb5b83e3373206ada84873c674fbddf61cc", "tree": "d7b2fe17efe9453fbb1afbfad8c7fc0e7a6bb01b", "parents": [ "e71357e118bdd4057e3bc020b9d80fecdd08f588" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:11 2013 -0800" }, "message": "cfq-iosched: implement cfq_group-\u003enr_active and -\u003echildren_weight\n\nTo prepare for blkcg hierarchy support, add cfqg-\u003enr_active and\n-\u003echildren_weight. cfqg-\u003enr_active counts the number of active cfqgs\nat the cfqg\u0027s level and -\u003echildren_weight is sum of weights of those\ncfqgs. The level covers itself (cfqg-\u003eleaf_weight) and immediate\nchildren.\n\nThe two values are updated when a cfqg enters and leaves the group\nservice tree. Unless the hierarchy is very deep, the added overhead\nshould be negligible.\n\nCurrently, the parent is determined using cfqg_flat_parent() which\nmakes the root cfqg the parent of all other cfqgs. This is to make\nthe transition to hierarchy-aware scheduling gradual. Scheduling\nlogic will be converted to use cfqg-\u003echildren_weight without actually\nchanging the behavior. When everything is ready,\nblkcg_weight_parent() will be replaced with proper parent function.\n\nThis patch doesn\u0027t introduce any behavior chagne.\n\nv2: s/cfqg-\u003elevel_weight/cfqg-\u003echildren_weight/ as per Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "e71357e118bdd4057e3bc020b9d80fecdd08f588", "tree": "a26644afeb5efb7dcd5f2e8a59c32c1d509f8574", "parents": [ "3c547865902e9fc30dc15941f326fd8039c6628d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "message": "cfq-iosched: add leaf_weight\n\ncfq blkcg is about to grow proper hierarchy handling, where a child\nblkg\u0027s weight would nest inside the parent\u0027s. This makes tasks in a\nblkg to compete against both tasks in the sibling blkgs and the tasks\nof child blkgs.\n\nWe\u0027re gonna use the existing weight as the group weight which decides\nthe blkg\u0027s weight against its siblings. This patch introduces a new\nweight - leaf_weight - which decides the weight of a blkg against the\nchild blkgs.\n\nIt\u0027s named leaf_weight because another way to look at it is that each\ninternal blkg nodes have a hidden child leaf node which contains all\nits tasks and leaf_weight is the weight of the leaf node and handled\nthe same as the weight of the child blkgs.\n\nThis patch only adds leaf_weight fields and exposes it to userland.\nThe new weight isn\u0027t actually used anywhere yet. Note that\ncfq-iosched currently offcially supports only single level hierarchy\nand root blkgs compete with the first level blkgs - ie. root weight is\nbasically being used as leaf_weight. For root blkgs, the two weights\nare kept in sync for backward compatibility.\n\nv2: cfqd-\u003eroot_group-\u003eleaf_weight initialization was missing from\n cfq_init_queue() causing divide by zero when\n !CONFIG_CFQ_GROUP_SCHED. Fix it. Reported by Fengguang.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "3c547865902e9fc30dc15941f326fd8039c6628d", "tree": "e86d926e86258cfc69d6665e28551fa14267634e", "parents": [ "93e6d5d8f5c909479623c6ab4427f038c6c3f63f" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "message": "blkcg: make blkcg_gq\u0027s hierarchical\n\nCurrently a child blkg (blkcg_gq) can be created even if its parent\ndoesn\u0027t exist. ie. Given a blkg, it\u0027s not guaranteed that its\nancestors will exist. This makes it difficult to implement proper\nhierarchy support for blkcg policies.\n\nAlways create blkgs recursively and make a child blkg hold a reference\nto its parent. blkg-\u003eparent is added so that finding the parent is\neasy. blkcg_parent() is also added in the process.\n\nThis change can be visible to userland. e.g. while issuing IO in a\nnested cgroup didn\u0027t affect the ancestors at all, now it will\ninitialize all ancestor blkgs and zero stats for the request_queue\nwill always appear on them. While this is userland visible, this\nshouldn\u0027t cause any functional difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "93e6d5d8f5c909479623c6ab4427f038c6c3f63f", "tree": "a67f60f0b7582f0e85437455c40e071fb27607dd", "parents": [ "86cde6b62313dd221c2e5935db02de7234cb4164" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "message": "blkcg: cosmetic updates to blkg_create()\n\n* Rename out_* labels to err_*.\n\n* Do ERR_PTR() conversion once in the error return path.\n\nThis patch is cosmetic and to prepare for the hierarchy support.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "86cde6b62313dd221c2e5935db02de7234cb4164", "tree": "879485988325bb8d97882cac82056bff434b000e", "parents": [ "356d2e581032b686da0854c7f17de2027c872762" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "message": "blkcg: reorganize blkg_lookup_create() and friends\n\nReorganize such that\n\n* __blkg_lookup() takes bool param @update_hint to determine whether\n to update hint.\n\n* __blkg_lookup_create() no longer performs lookup before trying to\n create. Renamed to blkg_create().\n\n* blkg_lookup_create() now performs lookup and then invokes\n blkg_create() if lookup fails.\n\n* root_blkg creation in blkcg_activate_policy() updated accordingly.\n Note that blkcg_activate_policy() no longer updates lookup hint if\n root_blkg already exists.\n\nExcept for the last lookup hint bit which is immaterial, this is pure\nreorganization and doesn\u0027t introduce any visible behavior change.\nThis is to prepare for proper hierarchy support.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "356d2e581032b686da0854c7f17de2027c872762", "tree": "c3c10018d5856523ba6a8a3816b433a1b5214412", "parents": [ "b226e5c411759eec29308f0ea38e918aa695dc7f" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:10 2013 -0800" }, "message": "blkcg: fix minor bug in blkg_alloc()\n\nblkg_alloc() was mistakenly checking blkcg_policy_enabled() twice.\nThe latter test should have been on whether pol-\u003epd_init_fn() exists.\nThis doesn\u0027t cause actual problems because both blkcg policies\nimplement pol-\u003epd_init_fn(). Fix it.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "b226e5c411759eec29308f0ea38e918aa695dc7f", "tree": "6f2499ce07c59f7a180de4b21bd5fc8e8f4c09bd", "parents": [ "1f23f12151ab508728dd5fca12180e2fce6c6949" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Oct 03 16:57:01 2012 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:09 2013 -0800" }, "message": "cfq-iosched: Print sync-noidle information in blktrace messages\n\nCurrently we attach a character \"S\" or \"A\" to the cfqq\u003cpid\u003e, to represent\nwhether queues is sync or async. Add one more character \"N\" to represent\nwhether it is sync-noidle queue or sync queue. So now three different\ntype of queues will look as follows.\n\ncfq1234S --\u003e sync queus\ncfq1234SN --\u003e sync noidle queue\ncfq1234A --\u003e Async queue\n\nPreviously S/A classification was being printed only if group scheduling\nwas enabled. This patch also makes sure that this classification is\ndisplayed even if group idling is disabled.\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "1f23f12151ab508728dd5fca12180e2fce6c6949", "tree": "ebd8f061f62d381d9f346f4d720f0a6288143eb6", "parents": [ "6d816ec7c83871da7c2472af7479d2438e641052" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Oct 03 16:57:00 2012 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:09 2013 -0800" }, "message": "cfq-iosched: Get rid of unnecessary local variable\n\nUse of local varibale \"n\" seems to be unnecessary. Remove it. This brings\nit inline with function __cfq_group_st_add(), which is also doing the\nsimilar operation of adding a group to a rb tree.\n\nNo functionality change here.\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "6d816ec7c83871da7c2472af7479d2438e641052", "tree": "39c8593f5524ac5a68e9a031d61ae5ff8a8c5477", "parents": [ "34b98d03bd6e3f3c67af1e4933aaf19887a61192" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Oct 03 16:56:59 2012 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:09 2013 -0800" }, "message": "cfq-iosched: Rename few functions related to selecting workload\n\nchoose_service_tree() selects/sets both wl_class and wl_type. Rename it to\nchoose_wl_class_and_type() to make it very clear.\n\ncfq_choose_wl() only selects and sets wl_type. It is easy to confuse\nit with choose_st(). So rename it to cfq_choose_wl_type() to make\nit clear what does it do.\n\nJust renaming. No functionality change.\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "34b98d03bd6e3f3c67af1e4933aaf19887a61192", "tree": "f8c12ac87eda374852f02cc0de078e2c74146c23", "parents": [ "4d2ceea4cb86060b03b2aa4826b365320bc78651" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Oct 03 16:56:58 2012 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:09 2013 -0800" }, "message": "cfq-iosched: Rename \"service_tree\" to \"st\" at some places\n\nAt quite a few places we use the keyword \"service_tree\". At some places,\nespecially local variables, I have abbreviated it to \"st\".\n\nAlso at couple of places moved binary operator \"+\" from beginning of line\nto end of previous line, as per Tejun\u0027s feedback.\n\nv2:\n Reverted most of the service tree name change based on Jeff Moyer\u0027s feedback.\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "4d2ceea4cb86060b03b2aa4826b365320bc78651", "tree": "2d848153c4feb146f603b3d2273f9a486febe992", "parents": [ "3bf10fea3ba3804090e82aa59fabf25f43fa74c2" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Oct 03 16:56:57 2012 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:09 2013 -0800" }, "message": "cfq-iosched: More renaming to better represent wl_class and wl_type\n\nSome more renaming. Again making the code uniform w.r.t use of\nwl_class/class to represent IO class (RT, BE, IDLE) and using\nwl_type/type to represent subclass (SYNC, SYNC-IDLE, ASYNC).\n\nAt places this patch shortens the string \"workload\" to \"wl\".\nRenamed \"saved_workload\" to \"saved_wl_type\". Renamed\n\"saved_serving_class\" to \"saved_wl_class\".\n\nFor uniformity with \"saved_wl_*\" variables, renamed \"serving_class\"\nto \"serving_wl_class\" and renamed \"serving_type\" to \"serving_wl_type\".\n\nAgain, just trying to improve upon code uniformity and improve\nreadability. No functional change.\n\nv2:\n- Restored the usage of keyword \"service\" based on Jeff Moyer\u0027s feedback.\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "3bf10fea3ba3804090e82aa59fabf25f43fa74c2", "tree": "ac129e9bc5655f9ae925db7093e6e7bc60f77737", "parents": [ "d1c3ed669a2d452cacfb48c2d171a1f364dae2ed" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Wed Oct 03 16:56:56 2012 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jan 09 08:05:08 2013 -0800" }, "message": "cfq-iosched: Properly name all references to IO class\n\nCurrently CFQ has three IO classes, RT, BE and IDLE. At many a places we\nare calling workloads belonging to these classes as \"prio\". This gets\nvery confusing as one starts to associate it with ioprio.\n\nSo this patch just does bunch of renaming so that reading code becomes\neasier. All reference to RT, BE and IDLE workload are done using keyword\n\"class\" and all references to subclass, SYNC, SYNC-IDLE, ASYNC are made\nusing keyword \"type\".\n\nThis makes me feel much better while I am reading the code. There is no\nfunctionality change due to this patch.\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "974b33586b4bbbdab33c666417f9ba9ef50b62c3", "tree": "0ee18a21c5d9fba897903e8505b606793cb8fb27", "parents": [ "ca5c8a4c2aba577b4cd2f4c3c72a768a80830294", "434fec16948cf5afa3cba31dcb00359bdbf24758" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 18:53:56 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 18:53:56 2013 -0800" }, "message": "Merge tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"People are back from the holiday breaks, and it shows. Here are a\n bunch of fixes for a number of platforms:\n - A couple of small fixes for Nomadik\n - A larger set of changes for kirkwood/mvebu\n - uart driver selection, dt clocks, gpio-poweroff fixups, a few\n __init annotation fixes and some error handling improvement in\n their xor dma driver.\n - i.MX had a couple of minor fixes (and a critical one for flexcan2\n clock setup)\n - MXS has a small board fix and a framebuffer bugfix\n - A set of fixes for Samsung Exynos, fixing default bootargs and some\n Exynos5440 clock issues\n - A set of OMAP changes including PM fixes and a few sparse warning\n fixups\n\n All in all a bit more positive code delta than we\u0027d ideally want to\n see here, mostly from the OMAP PM changes, but nothing overly crazy.\"\n\n* tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n ARM: clps711x: Fix bad merge of clockevents setup\n ARM: highbank: save and restore L2 cache and GIC on suspend\n ARM: highbank: add a power request clear\n ARM: highbank: fix secondary boot and hotplug\n ARM: highbank: fix typos with hignbank in power request functions\n ARM: dts: fix highbank cpu mpidr values\n ARM: dts: add device_type prop to cpu nodes on Calxeda platforms\n ARM: mx5: Fix MX53 flexcan2 clock\n ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array\n pinctrl: mvebu: make pdma clock on dove mandatory\n ARM: Dove: Add pinctrl clock to DT\n dma: mv_xor: fix error handling for clocks\n dma: mv_xor: fix error handling of mv_xor_channel_add()\n arm: mvebu: Add missing ; for cpu node.\n arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces\n arm: mvebu: Armada XP MV78230 has two cores, not one\n clk: mvebu: Remove inappropriate __init tagging\n ARM: Kirkwood: Use fixed-regulator instead of board gpio call\n ARM: Kirkwood: Fix missing sdio clock\n ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers\n ...\n" }, { "commit": "ca5c8a4c2aba577b4cd2f4c3c72a768a80830294", "tree": "78e48d1a5cdd25f4e20c3e5c84000e122c9f25e1", "parents": [ "ed2c8911684ac780d051d251ad0cd9d797dd029c", "e8e89622ed361c46bf90ba4828e685a8b603f7e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 16:08:10 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 16:08:10 2013 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm update from Dave Airlie:\n \"Exynos and Radeon mostly, with a dma-buf and ttm fix thrown in.\n\n It\u0027s a bit big but its mostly exynos license fix ups and I\u0027d rather\n not hold those up since its legally stuff.\n\n Radeon has a couple of fixes from dma engine work, TTM is just a\n locking fix, and dma-buf fix has been hanging around and I finally got\n a chance to review it.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (30 commits)\n drm/ttm: fix fence locking in ttm_buffer_object_transfer\n drm/prime: drop reference on imported dma-buf come from gem\n drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks\n drm/exynos: move finish page flip to a common place\n drm/exynos: fimd: modify condition in fimd resume\n drm/radeon: fix DMA CS parser for r6xx linear copy packet\n drm/radeon: split r6xx and r7xx copy_dma functions\n drm/exynos: Use devm_clk_get in exynos_drm_gsc.c\n drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c\n drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c\n drm/exynos: Use devm_clk_get in exynos_drm_rotator.c\n drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c\n drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c\n drm/exynos: Use devm_clk_get in exynos_drm_fimc.c\n drm/exynos: Remove redundant NULL check\n drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c\n drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c\n drm/exynos: fix gem buffer allocation type checking\n drm/exynos: remove needless parenthesis.\n drm/exynos: fix incorrect interrupt induced by m2m operation.\n ...\n" }, { "commit": "434fec16948cf5afa3cba31dcb00359bdbf24758", "tree": "1cff6e5ea34fa2f02f6cd67b1405f81f178ec38f", "parents": [ "2f64a8d7b28bd052150eda82fab2e0c7d6a4ab94", "6adba67eb0c4731ed0346731d024b2102f5b4d9d" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 09:49:50 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 09:50:04 2013 -0800" }, "message": "Merge tag \u0027omap-for-v3.8-rc2/fixes-signed-v2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes\n\nFrom Tony Lindgren:\nThe biggest change is a fix to deal with different power state\non omap2 registers that causes issues trying to use common PM code.\nAlso fix few incorrect registers, and an issue for omap1 USB, and\nfew sparse fixes for issues that sneaked in with all the clean-up.\n\n* tag \u0027omap-for-v3.8-rc2/fixes-signed-v2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array\n ARM: OMAP1: fix USB configuration use-after-release\n ARM: OMAP2/3: PRM: fix bogus OMAP2xxx powerstate return values\n ARM: OMAP3: clock data: Add missing enable/disable for EMU clock\n ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources\n ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets\n ARM: OMAP4: PRM: Correct reset source map\n ARM: OMAP: SRAM: resolve sparse warnings\n ARM: OMAP AM33xx: hwmod data: resolve sparse warnings\n ARM: OMAP: 32k counter: resolve sparse warnings\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "2f64a8d7b28bd052150eda82fab2e0c7d6a4ab94", "tree": "50de8cf53a37f187d848faf807006b102eaac3d4", "parents": [ "5595e755b67a963db20b74ef8e1670a6fd245ed9", "61bcbc2af8be4cafb5723d4bd306053b70f52a7a" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 09:42:52 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 09:42:52 2013 -0800" }, "message": "Merge branch \u0027v3.8-samsung-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes\n\nFrom Kukjin Kim:\nMost of them are EXYNOS5440 fixes which are for changing uart console,\ncpu id (typo) and silent complaining gpio error in kernel boot.\n\n* \u0027v3.8-samsung-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:\n ARM: EXYNOS: skip the clock initialization for exynos5440\n ARM: EXYNOS: enable PINCTRL for EXYNOS5440\n ARM: dts: use uart port1 for console on exynos4210-smdkv310\n ARM: dts: use uart port0 for console on exynos5440-ssdk5440\n ARM: SAMSUNG: fix the cpu id for EXYNOS5440\n ARM: EXYNOS: Revise HDMI resource size\n" }, { "commit": "5595e755b67a963db20b74ef8e1670a6fd245ed9", "tree": "c261934b8ed42749ce0856f0102c1508dd5b690f", "parents": [ "2d9e02cad61c49798d9d36b9d87739c279fd6b0f", "6c1ecba8d84841277d68140ef485335d5be28485" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 08:39:27 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 08:39:27 2013 -0800" }, "message": "Merge tag \u0027mxs-fixes-3.8\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes\n\nFrom Shawn Guo:\nI have to send one critical mxsfb fix through arm-soc, as FB maintainer\nis unresponsive for quite a while. People start complaining the missing\nof such an important fix.\n\n* tag \u0027mxs-fixes-3.8\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n video: mxsfb: fix crash when unblanking the display\n ARM: dts: imx23-olinuxino: Fix IOMUX settings\n" }, { "commit": "2d9e02cad61c49798d9d36b9d87739c279fd6b0f", "tree": "cd3411d435b6163a65963c427b5ec7d4f794908c", "parents": [ "5cf87a12cac05460666faa22711b655a327b2219", "e37f0d5b32c2a66677d0f2a21431a87e7e9ce22d" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 08:39:00 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jan 08 08:39:00 2013 -0800" }, "message": "Merge tag \u0027imx-fixes-3.8\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes\n\nFrom Shawn Guo:\n\nIt includes one critical fix - wrong flexcan2 clock will hang system\nwhen the port gets brought up. The other two are non-critical fixes,\nwhich are sent together here, since it\u0027s still early -rc stage.\n\n* tag \u0027imx-fixes-3.8\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n ARM: mx5: Fix MX53 flexcan2 clock\n ARM: dts: imx31-bug: Fix manufacturer compatible string\n clk: imx: Remove \u0027clock-output-names\u0027 from the examples\n" }, { "commit": "ed2c8911684ac780d051d251ad0cd9d797dd029c", "tree": "aa2419792165a1ce247382b14fbf3cf45a7355c3", "parents": [ "5c33d9b248603ef33049da71180f443e8d242599", "6d3cd5d444223c41eabb70dccff14fae4e8cb8b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 07:33:41 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 07:33:41 2013 -0800" }, "message": "Merge tag \u0027sound-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"Nothing too exciting here, just a few regression and trivial fixes,\n and new quirks for HD-audio and USB-audio.\n\n - HD-audio mute LED mode enum fix\n - Fix kernel panic of Digidesign Mbox2 usb-audio quirk (which was new\n in 3.8-rc1)\n - Creative BT-D1 usb-audio quirk\n - mute LED fixup for HP Pavillion 17 laptop\"\n\n* tag \u0027sound-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)\n ALSA: au88x0: fix incorrect left shift\n sound: oss/pas2: Fix possible access out of array\n ALSA: usb-audio: Fix kernel panic of Digidesign Mbox2 quirk\n ALSA: usb-audio: Add support for Creative BT-D1 via usb sound quirks\n ALSA: hda - Switch \"On\" and \"Off\" for \"Mute-LED Mode\" kcontrol\n" }, { "commit": "5c33d9b248603ef33049da71180f443e8d242599", "tree": "4435a23a9cc0bced7c00237d036312b1dfe05f62", "parents": [ "2a893f91f57314c593f36cee689ad6e353af9daf", "d9a58a782e396a0f04e8445b7ba3763c8a48c7fe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 07:31:49 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 08 07:31:49 2013 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) New sysctl ndisc_notify needs some documentation, from Hanns\n Frederic Sowa.\n\n 2) Netfilter REJECT target doesn\u0027t set transport header of SKB\n correctly, from Mukund Jampala.\n\n 3) Forcedeth driver needs to check for DMA mapping failures, from Larry\n Finger.\n\n 4) brcmsmac driver can\u0027t use usleep_range while holding locks, use\n udelay instead. From Niels Ole Salscheider.\n\n 5) Fix unregister of netlink bridge multicast database handlers, from\n Vlad Yasevich and Rami Rosen.\n\n 6) Fix checksum calculations in netfilter\u0027s ipv6 network prefix\n translation module.\n\n 7) Fix high order page allocation failures in netfilter xt_recent, from\n Eric Dumazet.\n\n 8) mac802154 needs to use netif_rx_ni() instead of netif_rx() because\n mac802154_process_data() can execute in process rather than\n interrupt context. From Alexander Aring.\n\n 9) Fix splice handling of MSG_SENDPAGE_NOTLAST, otherwise we elide one\n tcp_push() too many. From Eric Dumazet and Willy Tarreau.\n\n10) Fix skb-\u003etruesize tracking in XEN netfront driver, from Ian\n Campbell.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)\n xen/netfront: improve truesize tracking\n ipv4: fix NULL checking in devinet_ioctl()\n tcp: fix MSG_SENDPAGE_NOTLAST logic\n net/ipv4/ipconfig: really display the BOOTP/DHCP server\u0027s address.\n ip-sysctl: fix spelling errors\n mac802154: fix NOHZ local_softirq_pending 08 warning\n ipv6: document ndisc_notify in networking/ip-sysctl.txt\n ath9k: Fix Kconfig for ATH9K_HTC\n netfilter: xt_recent: avoid high order page allocations\n netfilter: fix missing dependencies for the NOTRACK target\n netfilter: ip6t_NPT: fix IPv6 NTP checksum calculation\n bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.\n vxlan: allow live mac address change\n bridge: Correctly unregister MDB rtnetlink handlers\n brcmfmac: fix parsing rsn ie for ap mode.\n brcmsmac: add copyright information for Canonical\n rtlwifi: rtl8723ae: Fix warning for unchecked pci_map_single() call\n rtlwifi: rtl8192se: Fix warning for unchecked pci_map_single() call\n rtlwifi: rtl8192de: Fix warning for unchecked pci_map_single() call\n rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call\n ...\n" }, { "commit": "e8e89622ed361c46bf90ba4828e685a8b603f7e5", "tree": "76504439c1af179c0aa7377e45b38e5503dffd48", "parents": [ "c75be2592c350035ce871624ebf549b4609aeeab" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Dec 18 22:25:11 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 08 18:35:31 2013 +1000" }, "message": "drm/ttm: fix fence locking in ttm_buffer_object_transfer\n\nNoticed while reviewing the fence locking in the radeon pageflip\nhandler.\n\nv2: Instead of grabbing the bdev-\u003efence_lock in object_transfer just\nmove the single callsite of that function a few lines, so that it is\nprotected by the fence_lock. Suggested by Jerome Glisse.\n\nv3: Fix typo in commit message.\n\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5cf87a12cac05460666faa22711b655a327b2219", "tree": "123819235d0a5b6591ae79fe38fdb349dbd9ffcb", "parents": [ "0e3a4a2eb67acdd710a833b767c20e9189cc3458", "ba607b6238a1f418c45b9d7f73212bcc6922da53" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:09:17 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:11:12 2013 -0800" }, "message": "Merge tag \u0027mvebu_fixes_for_v3.8\u0027 of git://git.infradead.org/users/jcooper/linux into fixes\n\nFrom Jason Cooper:\n\nfixes for mvebu/kirkwood v3.8\n - use correct uart driver for mvebu boards\n - add a missing DT clocks\n - gpio-poweroff level vs. edge triggering, use gpio_is_valid()\n - remove an inappropriate __init, modules need to access function.\n - various DT fixes\n - error handling in mv_xor\n\n* tag \u0027mvebu_fixes_for_v3.8\u0027 of git://git.infradead.org/users/jcooper/linux:\n pinctrl: mvebu: make pdma clock on dove mandatory\n ARM: Dove: Add pinctrl clock to DT\n dma: mv_xor: fix error handling for clocks\n dma: mv_xor: fix error handling of mv_xor_channel_add()\n arm: mvebu: Add missing ; for cpu node.\n arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces\n arm: mvebu: Armada XP MV78230 has two cores, not one\n clk: mvebu: Remove inappropriate __init tagging\n ARM: Kirkwood: Use fixed-regulator instead of board gpio call\n ARM: Kirkwood: Fix missing sdio clock\n ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers\n Power: gpio-poweroff: Fix documentation and gpio_is_valid\n ARM: Kirkwood: Fix missing clk for USB device.\n arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "0e3a4a2eb67acdd710a833b767c20e9189cc3458", "tree": "450324f5a403cab068d4c254ae727be22d0950a9", "parents": [ "daaeec936fe43f7f3f15e61e1da86f1fa1c37e3e" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jan 05 08:33:30 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:27 2013 -0800" }, "message": "ARM: clps711x: Fix bad merge of clockevents setup\n\nI mismerged a previous branch from Alexander, and accidentally left\nin ARCH_USES_GETTIMEOFFSET. Remove it.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nCc: Alexander Shiyan \u003cshc_work@mail.ru\u003e\n" }, { "commit": "daaeec936fe43f7f3f15e61e1da86f1fa1c37e3e", "tree": "2290013d78edd149839a462903c7aa02598a8cb1", "parents": [ "1ddda1cd235e05961bada337f87494272701c189", "d9621176872319a568d9892701410bcbfbd5b35c" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jan 04 18:45:08 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:26 2013 -0800" }, "message": "Merge tag \u0027nomadik-fixes-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes\n\nFrom Linus Walleij:\nTwo fixes to the Nomadik:\n- Delete a dangling include\n- Bump IRQ numbers to offset at 32\n\n* tag \u0027nomadik-fixes-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:\n ARM: nomadik: bump the IRQ numbers again\n ARM: nomadik: delete dangling include\n" }, { "commit": "1ddda1cd235e05961bada337f87494272701c189", "tree": "244089a86431a7cf4c03628639b99b13de2ad860", "parents": [ "9852910a0b0aa5548f990b51ad335921e0a710bf" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Dec 30 10:15:07 2012 -0600" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:26 2013 -0800" }, "message": "ARM: highbank: save and restore L2 cache and GIC on suspend\n\nThis fixes suspend to RAM adding necessary save and restore of L2 and GIC.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "9852910a0b0aa5548f990b51ad335921e0a710bf", "tree": "a440d465931017c0d0e3c6a9ac8f14fecae87457", "parents": [ "0b3455a71e38b9c8cf4c2e791c909618c0a72078" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Dec 30 10:15:06 2012 -0600" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:25 2013 -0800" }, "message": "ARM: highbank: add a power request clear\n\nWhen we fail to power down, we need to clear out the power request.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "0b3455a71e38b9c8cf4c2e791c909618c0a72078", "tree": "cb74263e3414f9fa4dcf7d50e41aee834723ebb7", "parents": [ "c05ee88f6f20746aff938a85ef49e777ef4c6513" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Dec 30 10:15:05 2012 -0600" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:25 2013 -0800" }, "message": "ARM: highbank: fix secondary boot and hotplug\n\nWith commit 384a290 (ARM: gic: use a private mapping for CPU target\ninterfaces), wake-up IPIs now go to all cores as the gic cpu interface\nnumbering may not follow core numbering. This broke secondary boot on\nhighbank since the boot address was already set for all secondary cores,\nthis caused all cores to boot before the kernel was ready.\n\nFix this by moving the setting of the jump address to\nhighbank_boot_secondary instead of highbank_smp_prepare_cpus and\nhighbank_cpu_die. Also, clear the address when we boot. This prevents\ncores from booting before they are actually triggered and is also necessary\nto get suspend/resume to work.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c05ee88f6f20746aff938a85ef49e777ef4c6513", "tree": "06ca5bd0f1bf6c26d2d84e5300dc467774f1dab9", "parents": [ "3943deeddac65ab1d19fcc839ab58ef13a653532" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Dec 30 10:15:04 2012 -0600" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:24 2013 -0800" }, "message": "ARM: highbank: fix typos with hignbank in power request functions\n\ns/hignbank/highbank/\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "3943deeddac65ab1d19fcc839ab58ef13a653532", "tree": "4f46df39e4991a65e548faf86e11200397ee3021", "parents": [ "36ff67bc948292065b0f20928d7e96f261b6ddc1" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Dec 30 10:15:03 2012 -0600" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:23 2013 -0800" }, "message": "ARM: dts: fix highbank cpu mpidr values\n\nWith the addition of commit a0ae0240 (ARM: kernel: add device tree init\nmap function), the cpu reg values must match the cpu mpidr register or we\u0027ll\nget warnings. For some reason, the CLUSTERID on highbank is 9, so the reg\nvalue needs to be 0x90n to quiet the warnings.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "36ff67bc948292065b0f20928d7e96f261b6ddc1", "tree": "df4948d2c4f92c9eabd7de49d9a9a55fb0932c24", "parents": [ "d1c3ed669a2d452cacfb48c2d171a1f364dae2ed" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Dec 30 10:15:02 2012 -0600" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 07 21:08:23 2013 -0800" }, "message": "ARM: dts: add device_type prop to cpu nodes on Calxeda platforms\n\nWhile device_type is considered deprecated, it is still needed for tools\nlike lshw to identify cpu nodes.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c75be2592c350035ce871624ebf549b4609aeeab", "tree": "da25117dac120ea28c36a33a4ca6fd3eb3a4ebbf", "parents": [ "be8a42ae60addd8b6092535c11b42d099d6470ec", "d1f9809ed1315c4cdc5760cf2f59626fd3276952" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 08 14:52:52 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 08 14:52:52 2013 +1000" }, "message": "Merge branch \u0027drm-fixes-3.8\u0027 of git://people.freedesktop.org/~agd5f/linux into drm-next\n\nAlex writes:\n A few more fixes for DMA and a mac quirk.\n\n* \u0027drm-fixes-3.8\u0027 of git://people.freedesktop.org/~agd5f/linux:\n drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks\n drm/radeon: fix DMA CS parser for r6xx linear copy packet\n drm/radeon: split r6xx and r7xx copy_dma functions\n" }, { "commit": "be8a42ae60addd8b6092535c11b42d099d6470ec", "tree": "f8fe5dc8c565f9ad02c7f129bf8ad091a4b0581e", "parents": [ "f3215be950e40fede0dffb8534729fe0bf410727" ], "author": { "name": "Seung-Woo Kim", "email": "sw0312.kim@samsung.com", "time": "Thu Sep 27 15:30:06 2012 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 08 14:41:53 2013 +1000" }, "message": "drm/prime: drop reference on imported dma-buf come from gem\n\nIncreasing ref counts of both dma-buf and gem for imported dma-buf come from gem\nmakes memory leak. release function of dma-buf cannot be called because f_count\nof dma-buf increased by importing gem and gem ref count cannot be decrease\nbecause of exported dma-buf.\n\nSo I add dma_buf_put() for imported gem come from its own gem into each drivers\nhaving prime_import and prime_export capabilities. With this, only gem ref\ncount is increased if importing gem exported from gem of same driver.\n\nSigned-off-by: Seung-Woo Kim \u003csw0312.kim@samsung.com\u003e\nSigned-off-by: Kyungmin.park \u003ckyungmin.park@samsung.com\u003e\nCc: Inki Dae \u003cinki.dae@samsung.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Rob Clark \u003crob.clark@linaro.org\u003e\nCc: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d9a58a782e396a0f04e8445b7ba3763c8a48c7fe", "tree": "319af7e412885f2c7c9c7f45d5d7bfbc68d762cd", "parents": [ "32fa10b24ef64b41e8ca17068fa9dc625427a05e" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Mon Jan 07 05:32:06 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 07 19:51:19 2013 -0800" }, "message": "xen/netfront: improve truesize tracking\n\nUsing RX_COPY_THRESHOLD is incorrect if the SKB is actually smaller\nthan that. We have already accounted for this in\nNETFRONT_SKB_CB(skb)-\u003epull_to so use that instead.\n\nFixes WARN_ON from skb_try_coalesce.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: Sander Eikelenboom \u003clinux@eikelenboom.it\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: annie li \u003cannie.li@oracle.com\u003e\nCc: xen-devel@lists.xen.org\nCc: netdev@vger.kernel.org\nCc: stable@kernel.org # 3.7.x only\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3215be950e40fede0dffb8534729fe0bf410727", "tree": "ff627211888040e0273a46588487a90ebd16be4d", "parents": [ "eda85d6ad490923152544fba0473798b6cc0edf6", "663d8766702c8bb8da31b040b6d6e900b09edbf7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 08 13:39:02 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jan 08 13:39:02 2013 +1000" }, "message": "Merge branch \u0027exynos-drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next\n\nSummary:\n- change exynos file license\n . Most of exynos files had been copied from some randome\n file and not updated correctly(wrong company name used).\n This was our mistakes so chagnes it correctly. For this,\n I\u0027m not sure that this patch should go to -fix or -next.\n So please give me any comment if there is any problem.\n- consider buffer allocation without iommu\n . Without iommu, dma_alloc_attrs function allocates some\n memory region and returns cpu address so this patch makes\n the cpu address to be set to buf-\u003ekvaddr correctly\n- cleanups to ipp relevant codes.\n- use common finish page flip function\n . to avoid the duplication of same code, use\n exynos_drm_crtc_finish_pageflip function commonly instead\n of each one.\n- fix fimd resume issue.\n . when fimd was turned off by suspend, there was one issue that\n the fimd wasn\u0027t turned on by resume so fix it chaing resume\n condition.\n\n* \u0027exynos-drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (25 commits)\n drm/exynos: move finish page flip to a common place\n drm/exynos: fimd: modify condition in fimd resume\n drm/exynos: Use devm_clk_get in exynos_drm_gsc.c\n drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c\n drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c\n drm/exynos: Use devm_clk_get in exynos_drm_rotator.c\n drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c\n drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c\n drm/exynos: Use devm_clk_get in exynos_drm_fimc.c\n drm/exynos: Remove redundant NULL check\n drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c\n drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c\n drm/exynos: fix gem buffer allocation type checking\n drm/exynos: remove needless parenthesis.\n drm/exynos: fix incorrect interrupt induced by m2m operation.\n drm/exynos: remove color bar pattern operation.\n drm/exynos: correct some comments to abbreviation.\n drm/exynos: fix build warning.\n drm/exynos: consider both case of vflip and hflip.\n drm/exynos: remove needless error handling to property.\n ...\n" }, { "commit": "32fa10b24ef64b41e8ca17068fa9dc625427a05e", "tree": "a67c31db4f21b740f8101e35e2f1219e93310f77", "parents": [ "c7e2e1d72ed7707239d20525e0ebcad7e3303659", "2727de76041b2064c0b74f00a2a89678fb3efafc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 07 19:25:13 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 07 19:25:13 2013 -0800" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/nf\n\nPablo Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThe following batch contains Netfilter fixes for 3.8-rc2, they are:\n\n* Fix IPv6 stateless network/port translation (NPT) checksum\n calculation, from Ulrich Weber.\n\n* Fix for xt_recent to avoid memory allocation failures if large\n hashtables are used, from Eric Dumazet.\n\n* Fix missing dependencies in Kconfig for the deprecated NOTRACK,\n from myself.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e37f0d5b32c2a66677d0f2a21431a87e7e9ce22d", "tree": "15c863e8cb6af8396200d36e0f552812f7e45cb3", "parents": [ "4aaa01959959ea38a77ab91da8736e9cb8108157" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Mon Jan 07 15:27:00 2013 +0100" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Jan 08 08:53:07 2013 +0800" }, "message": "ARM: mx5: Fix MX53 flexcan2 clock\n\nThe second FlexCAN port uses different clock than the first one, configure\ncorrect clock to prevent hanging of the system during bringing up of the port.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nCc: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "2a893f91f57314c593f36cee689ad6e353af9daf", "tree": "6c8287371612ddc9070991cd5c6b6c011c7d5dc1", "parents": [ "127aa93066261c2b8f03cb38e7165de8cd71736e", "f67ffa95836b31be5d8fe336aee3bfc6412c5696" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 16:17:18 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 16:17:18 2013 -0800" }, "message": "Merge tag \u0027pm+acpi-for-3.8-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull ACPI and power management fixes from Rafael Wysocki:\n\n - Removal of some ACPICA code that the kernel will never use from Lv\n Zheng.\n\n - APEI fix from Adrian Huang.\n\n - Removal of unnecessary ACPI memory hotplug driver code from Liu\n Jinsong.\n\n - Minor ACPI power management fixes.\n\n - ACPI debug code fix from Joe Perches.\n\n - ACPI fix to make system bus device nodes get the right names.\n\n - PNP resources handling fixes from Witold Szczeponik.\n\n - cpuidle fix for a recent regression stalling boot on systems with\n great numbers of CPUs from Daniel Lezcano.\n\n - cpuidle fixes from Sivaram Nair.\n\n - intel_idle debug message fix from Youquan Song.\n\n - cpufreq build regression fix from Larry Finger.\n\n - cpufreq fix for an obscure initialization race related to statistics\n from Konstantin Khlebnikov.\n\n - cpufreq change disabling the Longhaul driver by default from Rafał\n Bilski.\n\n - PM core fix preventing device suspend errors from happening during\n system suspend due to obscure race conditions.\n\n - PM QoS local variable name cleanup.\n\n* tag \u0027pm+acpi-for-3.8-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM: Move disabling/enabling runtime PM to late suspend/early resume\n PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()\n ACPI / scan: Do not use dummy HID for system bus ACPI nodes\n cpufreq / governor: Fix problem with cpufreq_ondemand or cpufreq_conservative\n cpufreq / Longhaul: Disable driver by default\n cpufreq / stats: fix race between stats allocation and first usage\n cpuidle: fix lock contention in the idle path\n intel_idle: pr_debug information need separated\n cpuidle / coupled: fix ready counter decrement\n cpuidle: Fix finding state with min power_usage\n PNP: Handle IORESOURCE_BITS in resource allocation\n PNP: Simplify setting of resources\n ACPI / power: Remove useless message from device registering routine\n ACPI / glue: Update DBG macro to include KERN_DEBUG\n ACPI / PM: Do not apply ACPI_SUCCESS() to acpi_bus_get_device() result\n ACPI / memhotplug: remove redundant logic of acpi memory hotadd\n ACPI / APEI: Fix the returned value in erst_dbg_read\n ACPICA: Remove useless mini-C library.\n" }, { "commit": "127aa93066261c2b8f03cb38e7165de8cd71736e", "tree": "4f97fcd50878a973fcd7a7d7d2af1f3e4ac05408", "parents": [ "d287b8750e47c1702dab0e37ac11012bb751ece0", "63b7d3a41ccadef971a4ffbe6662119d4275ebf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 13:21:55 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 13:21:55 2013 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.samba.org/sfrench/cifs-2.6\n\nPull CIFS fixes from Steve French:\n \"Misc small cifs fixes\"\n\n* \u0027for-next\u0027 of git://git.samba.org/sfrench/cifs-2.6:\n CIFS: Don\u0027t let read only caching for mandatory byte-range locked files\n CIFS: Fix write after setting a read lock for read oplock files\n Revert \"CIFS: Fix write after setting a read lock for read oplock files\"\n cifs: adjust sequence number downward after signing NT_CANCEL request\n cifs: move check for NULL socket into smb_send_rqst\n" }, { "commit": "6adba67eb0c4731ed0346731d024b2102f5b4d9d", "tree": "e087e34f3c087c0756d8b1a8bc46e25cb04ee5fe", "parents": [ "07fd296d3a44f41d8a40b7b3082fa53c2a73862e" ], "author": { "name": "Pantelis Antoniou", "email": "panto@antoniou-consulting.com", "time": "Fri Jan 04 00:32:22 2013 +0200" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Jan 07 12:38:07 2013 -0800" }, "message": "ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array\n\nThe IRQ array must be terminated by -1 and not by -1+OMAP_INTC_START\nThis led to having a resource list of 100s of IRQs.\n\nLooks like this was caused by commit a2cfc509 (ARM: OMAP3+: hwmod: Add\nAM33XX HWMOD data) that probably had some search and replace updates\ndone for the patch for sparse irq support.\n\nSigned-off-by: Pantelis Antoniou \u003cpanto@antoniou-consulting.com\u003e\nAcked-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\n[tony@atomide.com: updated wit information about the breaking commit]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "d287b8750e47c1702dab0e37ac11012bb751ece0", "tree": "f3663e3e612b2e25be1d261acd39dda6f36ca08e", "parents": [ "36a25de23359940b7713fc40cbcbb046b3797511", "08b60f8438879a84246d7debded31c9cb7aea6e4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 09:41:20 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 09:41:20 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull namei.h missing include fix from Al Viro.\n\nThe new use of ESTALE in namei.h can cause compile failures on ARM with\ncertain configurations due to lack of errno.h.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n namei.h: include errno.h\n" }, { "commit": "36a25de23359940b7713fc40cbcbb046b3797511", "tree": "5f9184354f39e32a100d7762a070d9e949dedde6", "parents": [ "f77637206d7b24d5701715433e8d28da64d8d998" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Jan 07 10:47:46 2013 -0600" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 09:27:06 2013 -0800" }, "message": "sctp: fix Kconfig bug in default cookie hmac selection\n\nCommit 0d0863b02002 (\"sctp: Change defaults on cookie hmac selection\")\nadded a \"choice\" to the sctp Kconfig file. It introduced a bug which\nled to an infinite loop when while running \"make oldconfig\".\n\nThe problem is that the wrong symbol was defined as the default value\nfor the choice. Using the correct value gets rid of the infinite loop.\n\nNote: if CONFIG_SCTP_COOKIE_HMAC_SHA1\u003dy was present in the input\nconfig file, both that and CONFIG_SCTP_COOKIE_HMAC_MD5\u003dy be present\nin the generated config file.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f77637206d7b24d5701715433e8d28da64d8d998", "tree": "d0a3efaf90a4ae97b052cbc86f1fa48686e82155", "parents": [ "4c9014f2ca7e5ecf8806e838be0f07aa1810c985", "fef0ebdb229bedce888b63923e2a1ba4e6c6a84c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 09:22:50 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 09:22:50 2013 -0800" }, "message": "Merge tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\nPull ext4 regression fixes from Ted Ts\u0027o:\n \"Bug fixes, including two regressions introduced in v3.8. The most\n serious of these regressions is a buffer cache leak.\"\n\n* tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir()\n ext4: release buffer in failed path in dx_probe()\n ext4: fix configuration dependencies for ext4 ACLs and security labels\n" }, { "commit": "44d22e2404b3ce93a314654962d31acc8afcdd62", "tree": "f3d254d755d99d723caa4caff200455d19f52b27", "parents": [ "5445166384755adc39c772acccca87ad5747be52" ], "author": { "name": "Lans Zhang", "email": "jia.zhang@windriver.com", "time": "Mon Dec 24 14:01:34 2012 +0100" }, "committer": { "name": "Borislav Petkov", "email": "bpetkov@suse.de", "time": "Mon Jan 07 17:43:00 2013 +0100" }, "message": "EDAC: Cleanup device deregistering path\n\nUse device_unregister to replace put_device + device_del for\ncleanup, and fix the potential use after free.\n\nSigned-off-by: Lans Zhang \u003cjia.zhang@windriver.com\u003e\nSigned-off-by: Borislav Petkov \u003cbp@alien8.de\u003e\n" }, { "commit": "5445166384755adc39c772acccca87ad5747be52", "tree": "443e8775b05d9d97f958d85dd0e1d93d93fc2e5f", "parents": [ "311bd84247ee0bedae6cdfbfc5e2c3450f9decd1" ], "author": { "name": "Borislav Petkov", "email": "bp@alien8.de", "time": "Tue Dec 18 22:02:56 2012 +0100" }, "committer": { "name": "Borislav Petkov", "email": "bpetkov@suse.de", "time": "Mon Jan 07 17:42:59 2013 +0100" }, "message": "EDAC: Fix EDAC Kconfig menu\n\nAfter f65aad41772f(\"MIPS: Cavium: Add EDAC support.\"), when entering\nthe \"Device Drivers\" toplevel menu in menuconfig, the suboptions behind\nEDAC appeared merged with the rest of the device drivers types. This was\nbecause the menuconfig option EDAC is querying an EDAC_SUPPORT Kconfig\nbool which was defined after the menu definition.\n\nWhen pushing EDAC_SUPPORT up, before the menu definition, the variable\nis defined earlier and the above menuconfig artifact doesn\u0027t happen.\n\nDrop a useless menuconfig comment while at it.\n\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: Borislav Petkov \u003cbp@alien8.de\u003e\n" }, { "commit": "311bd84247ee0bedae6cdfbfc5e2c3450f9decd1", "tree": "23e7218b9e23c33ca9e8534ddbb05664f896fab3", "parents": [ "d1c3ed669a2d452cacfb48c2d171a1f364dae2ed" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Fri Dec 14 15:03:10 2012 +0400" }, "committer": { "name": "Borislav Petkov", "email": "bpetkov@suse.de", "time": "Mon Jan 07 17:42:58 2013 +0100" }, "message": "EDAC: Fix kernel panic on module unloading\n\nThis patch fixes use-after-free and double-free bugs in\nedac_mc_sysfs_exit(). mci_pdev has single reference and put_device()\ncalls mc_attr_release() which calls kfree(). The following\ndevice_del() works with already released memory. An another kfree() in\nedac_mc_sysfs_exit() releses the same memory again. Great.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: stable@vger.kernel.org # 3.[67]\nCc: Denis Kirjanov \u003ckirjanov@gmail.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nLink: http://lkml.kernel.org/r/20121214110310.11019.21098.stgit@zurg\nSigned-off-by: Borislav Petkov \u003cbp@alien8.de\u003e\n" }, { "commit": "4c9014f2ca7e5ecf8806e838be0f07aa1810c985", "tree": "dd33fdebedf1ce6497737113e183f2a5d8bbca63", "parents": [ "5ce2955e04a80da7287dc12f32da7f870039bf8f", "ecf0eb9edbb607d74f74b73c14af8b43f3729528" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 08:36:45 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 08:36:45 2013 -0800" }, "message": "Merge tag \u0027nfs-for-3.8-2\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n\n - Fix a permissions problem when opening NFSv4 files that only have the\n exec bit set.\n\n - Fix a couple of typos in pNFS (inverted logic), and the mount parsing\n (missing pointer dereference).\n\n - Work around a series of deadlock issues due to workqueues using\n struct work_struct pointer address comparisons in the re-entrancy\n tests. Ensure that we don\u0027t free struct work_struct prematurely if\n our work function involves waiting for completion of other work items\n (e.g. by calling rpc_shutdown_client).\n\n - Revert the part of commit 168e4b3 that is causing unnecessary\n warnings to be issued in the nfsd callback code.\n\n* tag \u0027nfs-for-3.8-2\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n nfs: avoid dereferencing null pointer in initiate_bulk_draining\n SUNRPC: Partial revert of commit 168e4b39d1afb79a7e3ea6c3bb246b4c82c6bdb9\n NFS: Ensure that we free the rpc_task after read and write cleanups are done\n SUNRPC: Ensure that we free the rpc_task after cleanups are done\n nfs: fix null checking in nfs_get_option_str()\n pnfs: Increase the refcount when LAYOUTGET fails the first time\n NFS: Fix access to suid/sgid executables\n" }, { "commit": "6d3cd5d444223c41eabb70dccff14fae4e8cb8b1", "tree": "c79d6c185a9c476e37c14dba7daf517bc01b9602", "parents": [ "61ed1dca1645d2dd64c83a01f728dfd59fa789b6" ], "author": { "name": "David Henningsson", "email": "david.henningsson@canonical.com", "time": "Mon Jan 07 12:03:47 2013 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jan 07 17:29:55 2013 +0100" }, "message": "ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)\n\nThe mute LED is in this case connected to the Mic1 VREF.\n\nThe machine also exposes the following string in BIOS:\n\"HP_Mute_LED_0_A\", so if more machines are coming, it probably\nmakes sense to try to do something more generic, like for the\nIDT codec.\n\nCc: stable@vger.kernel.org\nBugLink: https://bugs.launchpad.net/bugs/1096789\nSigned-off-by: David Henningsson \u003cdavid.henningsson@canonical.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "ba607b6238a1f418c45b9d7f73212bcc6922da53", "tree": "8ad82b1783bbf6e448a82b6f6e941d235ae86387", "parents": [ "db7d77e6a7a60dbbac34fe59bc38bc8e7e5e1380" ], "author": { "name": "Sebastian Hesselbarth", "email": "sebastian.hesselbarth@gmail.com", "time": "Mon Nov 26 20:16:39 2012 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Mon Jan 07 16:19:02 2013 +0000" }, "message": "pinctrl: mvebu: make pdma clock on dove mandatory\n\nWith the ability to pass clocks through DT, now make the pdma\nclock of dove pinctrl mandatory. Otherwise, pinctrl will hang\nthe system when accessing some registers.\n\nSigned-off-by: Sebastian Hesselbarth \u003csebastian.hesselbarth@gmail.com\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "db7d77e6a7a60dbbac34fe59bc38bc8e7e5e1380", "tree": "f8ff237e8b31a265f1934a1172e7b7c7e3c1de87", "parents": [ "dab9206445952e64213582b2ab9077972850d65b" ], "author": { "name": "Sebastian Hesselbarth", "email": "sebastian.hesselbarth@gmail.com", "time": "Mon Nov 26 20:16:38 2012 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Mon Jan 07 16:18:57 2013 +0000" }, "message": "ARM: Dove: Add pinctrl clock to DT\n\nDuring merge of the mvebu patches a clock gate for pinctrl was\nlost. This patch just readds the clock gate.\n\nSigned-off-by: Sebastian Hesselbarth \u003csebastian.hesselbarth@gmail.com\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "5ce2955e04a80da7287dc12f32da7f870039bf8f", "tree": "1d8fef77ac0ac767c47550c3ac631037908f7d33", "parents": [ "d0631c6e09f51e094ae5aec1eabe81cc63d78178", "2f12fb20dee7285d8e9b8c1f703c0c1604b2c22e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:50:41 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:50:41 2013 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS fixes from Ralf Baechle:\n \"Various fixes across the tree. The modpost error due to\n virt_addr_valid() not being usable from modules required a number of\n preparatory cleanups so a clean fix was possible.\"\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:\n MIPS: 64-bit: Fix build if !CONFIG_MODULES\n MIPS: Wire up finit_module syscall.\n MIPS: Fix modpost error in modules attepting to use virt_addr_valid().\n MIPS: page.h: Remove now unnecessary #ifndef __ASSEMBLY__ wrapper.\n MIPS: Switch remaining assembler PAGE_SIZE users to \u003casm/asm-offsets.h\u003e.\n MIPS: Include PAGE_S{IZE,HIFT} in \u003casm/offset.h\u003e.\n MIPS: Don\u0027t include \u003casm/page.h\u003e unnecessarily.\n MIPS: Fix comment.\n Revert \"MIPS: Optimise TLB handlers for MIPS32/64 R2 cores.\"\n MIPS: perf: Fix build failure in XLP perf support.\n MIPS: Alchemy: Make 32kHz and r4k timer coexist peacefully\n" }, { "commit": "d0631c6e09f51e094ae5aec1eabe81cc63d78178", "tree": "69d8dc6fa37d2e440f37cda06c40f1800edb8a08", "parents": [ "de9ac5cea33098143edd26d10ece7fe215e66623", "35dac27cedd14c3b6fcd4ba7bc3c31738cfd1831" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:42:38 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:42:38 2013 -0800" }, "message": "Merge branch \u0027akpm\u0027 (fixes from Andrew)\n\nMerge emailed fixes from Andrew Morton:\n \"Bunch of fixes:\n\n - delayed IPC updates. I held back on this because of some possible\n outstanding bug reports, but they appear to have been addressed in\n later versions\n\n - A bunch of MAINTAINERS updates\n\n - Yet Another RTC driver. I\u0027d held this back while a couple of\n little issues were being worked out.\n\n I\u0027m expecting an intrusive-but-simple patchset from Joe Perches which\n splits up printk.c into kernel/printk/*. That will be a pig to\n maintain for two months so if it passes testing I\u0027d like to get it\n upstream after a week or so.\"\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (35 commits)\n printk: fix incorrect length from print_time() when seconds \u003e 99999\n drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time\n drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield\n rtc: add RTC driver for TPS6586x\n MAINTAINERS: fix drivers/staging/sm7xx/\n MAINTAINERS: remove include/linux/of_pwm.h\n MAINTAINERS: remove arch/*/lib/perf_event*.c\n MAINTAINERS: remove drivers/mmc/host/imxmmc.*\n MAINTAINERS: fix Documentation/mei/\n MAINTAINERS: remove arch/x86/platform/mrst/pmu.*\n MAINTAINERS: remove firmware/isci/\n MAINTAINERS: fix drivers/ieee802154/\n MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h\n MAINTAINERS: remove drivers/video/epson1355fb.c\n MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb*\n MAINTAINERS: adjust for UAPI\n MAINTAINERS: fix drivers/media/platform/atmel-isi.c\n MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h\n MAINTAINERS: fix drivers/rtc/rtc-vt8500.c\n MAINTAINERS: remove arch/arm/plat-s5p/\n ...\n" }, { "commit": "de9ac5cea33098143edd26d10ece7fe215e66623", "tree": "b42efed8d401080acc0ab444999a6a27623c3a77", "parents": [ "7991b03d653865e4de7e6c056f85c004f542dbbe", "d0e045401f268a8de6f87d65678214748b772680" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:39:32 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:39:32 2013 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\nPull microblaze update from Michal Simek:\n \"This fixes noMMU kernel and I have also added defconfig updates which\n fix issue with one external dependency and enable all xilinx device\n drivers for 0-day testing system.\n\n Additionally wire up finit_module system call, and do highmem fixup\n and pci warnings reported by the 0-day testing system\"\n\n* \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n microblaze: Update microblaze defconfigs\n microblaze: Fix pci compilation and sparse warnings\n microblaze: Add finit_module syscall\n microblaze: Kill __kmap_atomic()\n microblaze: Change section flags for noMMU\n microblaze: Microblaze wants sys_fork for noMMU too\n" }, { "commit": "7991b03d653865e4de7e6c056f85c004f542dbbe", "tree": "8c96f4f81f2b1d660d89b9a503afd0aa813f4110", "parents": [ "0c4a842349b27d361f1503f6437df303e1b541c9", "ade24c93ab173b392a905ef8d510874dfb05a417" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:37:36 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 07 07:37:36 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull integrity subsystem regression fix from James Morris:\n \"Commit fdf90729e578 \"ima: support new kernel module syscall\" by error\n modified init_module() to return INTEGRITY_UNKNOWN (which is 4) to\n user space if the kernel was built with CONFIG_IMA_APPRAISE\u003dy.\n\n As a result, user space can no longer load kernel modules using\n init_module(). This commit fixes this regression.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n ima: fallback to MODULE_SIG_ENFORCE for existing kernel module syscall\n" }, { "commit": "d1f9809ed1315c4cdc5760cf2f59626fd3276952", "tree": "f8ffb7e0f315b22e6ff5cd00016382c2eda909ed", "parents": [ "a10fbb4224e53c6b3528d671051be4b98bd8e9b9" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Mon Jan 07 15:18:47 2013 +0100" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jan 07 10:13:36 2013 -0500" }, "message": "drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks\n\nvga-switcheroo with apple-gmux does not switch correctly on my system. The PCI\nconfiguration space is not restored correctly, resulting in MSI not working after switch.\n\nOnly useful item in dmesg is:\n\n[ 33.922807] radeon 0000:01:00.0: Refused to change power state, currently in D3\n\nI did some testing, dumping the difference in ms between first succesful switch\nfrom D3 to D0, and it seems that there is slightly more than 20 ms difference when\nthe device is re-enabled through vga-switcheroo.\n\nSo bump the re-enable d3 delay to 20 ms to handle this, which fixes msi not working\non my system after switcheroo-ing. Default d3_delay value is PCI_PM_D3_WAIT, 10 ms.\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "8a3a180d21793f2e4386b3cb61c48322564fc80a", "tree": "4ab574bb3a8531387a21f6a63be02f9d241137a7", "parents": [ "8b827c60a1d984ef8c3ed175c99a33dd451348ff" ], "author": { "name": "Gregory CLEMENT", "email": "gregory.clement@free-electrons.com", "time": "Mon Jan 07 11:28:42 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 07 15:04:17 2013 +0000" }, "message": "ARM: 7616/1: cache-l2x0: aurora: Use writel_relaxed instead of writel\n\nThe use of writel instead of writel_relaxed lead to deadlock in some\nsituation (SMP on Armada 370 for instance). The use of writel_relaxed\nas it was done in the rest of this driver fixes this bug.\n\nSigned-off-by: Gregory CLEMENT \u003cgregory.clement@free-electrons.com\u003e\nTested-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nAcked-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8b827c60a1d984ef8c3ed175c99a33dd451348ff", "tree": "59aac11c91a9452a3985a261f4994cf4567a3f6e", "parents": [ "d106de38ca927f2a53cd56ef94c506e8f6bd37e1" ], "author": { "name": "Gregory CLEMENT", "email": "gregory.clement@free-electrons.com", "time": "Mon Jan 07 11:27:14 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 07 15:04:17 2013 +0000" }, "message": "ARM: 7615/1: cache-l2x0: aurora: Invalidate during clean operation with WT enable\n\nThis patch fixes a bug for Aurora L2 cache controller when the\nwrite-through mode is enable. For the clean operation even if we don\u0027t\nhave to flush the lines we still need to invalidate them.\n\nSigned-off-by: Gregory CLEMENT \u003cgregory.clement@free-electrons.com\u003e\nTested-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nAcked-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "61ed1dca1645d2dd64c83a01f728dfd59fa789b6", "tree": "e5d9193fa34153055f033be06261733426c25903", "parents": [ "dc30a436903ccf180b0313d3fc3f44278a1d44c8" ], "author": { "name": "Nickolai Zeldovich", "email": "nickolai@csail.mit.edu", "time": "Sat Jan 05 14:14:08 2013 -0500" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jan 07 09:33:56 2013 +0100" }, "message": "ALSA: au88x0: fix incorrect left shift\n\nvortex_wt_setdsout performs bit-negation on the bit position (wt\u00260x1f)\nrather than on the resulting bitmask. This code is never actually\ninvoked (vortex_wt_setdsout is always called with en\u003d1), so this does\nnot currently cause any problem, and this patch is simply cleanup.\n\nSigned-off-by: Nickolai Zeldovich \u003cnickolai@csail.mit.edu\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "c7e2e1d72ed7707239d20525e0ebcad7e3303659", "tree": "1ada00f778308f034bfc082b03f740955599f526", "parents": [ "ae62ca7b03217be5e74759dc6d7698c95df498b3" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Sat Jan 05 11:19:24 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 06 21:11:18 2013 -0800" }, "message": "ipv4: fix NULL checking in devinet_ioctl()\n\nThe NULL pointer check `!ifa\u0027 should come before its first use.\n\n[ Bug origin : commit fd23c3b31107e2fc483301ee923d8a1db14e53f4\n (ipv4: Add hash table of interface addresses) in linux-2.6.39 ]\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "663d8766702c8bb8da31b040b6d6e900b09edbf7", "tree": "ff627211888040e0273a46588487a90ebd16be4d", "parents": [ "28998afa1380a4ba7ad2d5e9a2ab76a15417b8b1" ], "author": { "name": "Rahul Sharma", "email": "rahul.sharma@samsung.com", "time": "Thu Jan 03 05:44:04 2013 -0500" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Mon Jan 07 13:58:37 2013 +0900" }, "message": "drm/exynos: move finish page flip to a common place\n\nThis patch implements the exynos_drm_crtc_finish_pageflip in\nexynos_drm_crtc.c. This avoids the duplication of same code\nin mixer, fimd and vidi.\n\nSigned-off-by: Rahul Sharma \u003crahul.sharma@samsung.com\u003e\nSigned-off-by: Stephane Marchesin \u003cmarcheu@chromium.org\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "ae62ca7b03217be5e74759dc6d7698c95df498b3", "tree": "417481b4ddfbd7f05589ae331b41f20939391b50", "parents": [ "9dd4a13a89d7c27e51cb87b9e95e82d8999826da" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Jan 06 18:21:49 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 06 20:58:13 2013 -0800" }, "message": "tcp: fix MSG_SENDPAGE_NOTLAST logic\n\ncommit 35f9c09fe9c72e (tcp: tcp_sendpages() should call tcp_push() once)\nadded an internal flag : MSG_SENDPAGE_NOTLAST meant to be set on all\nfrags but the last one for a splice() call.\n\nThe condition used to set the flag in pipe_to_sendpage() relied on\nsplice() user passing the exact number of bytes present in the pipe,\nor a smaller one.\n\nBut some programs pass an arbitrary high value, and the test fails.\n\nThe effect of this bug is a lack of tcp_push() at the end of a\nsplice(pipe -\u003e socket) call, and possibly very slow or erratic TCP\nsessions.\n\nWe should both test sd-\u003etotal_len and fact that another fragment\nis in the pipe (pipe-\u003enrbufs \u003e 1)\n\nMany thanks to Willy for providing very clear bug report, bisection\nand test programs.\n\nReported-by: Willy Tarreau \u003cw@1wt.eu\u003e\nBisected-by: Willy Tarreau \u003cw@1wt.eu\u003e\nTested-by: Willy Tarreau \u003cw@1wt.eu\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28998afa1380a4ba7ad2d5e9a2ab76a15417b8b1", "tree": "ff46b991f78ed477c7d43c6c0017f12eb823482d", "parents": [ "5cbd419cc533a821448fa47fc16f50990eef296f" ], "author": { "name": "Prathyush K", "email": "prathyush.k@samsung.com", "time": "Thu Dec 27 06:40:13 2012 -0500" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Mon Jan 07 13:49:02 2013 +0900" }, "message": "drm/exynos: fimd: modify condition in fimd resume\n\nIf fimd is runtime suspended (by DPMS OFF), fimd_suspend does not\ncall fimd_activate(false) and just returns. Similarily the check in\nfimd_resume should not resume if previously runtime_suspended.\nInstead the existing check does the opposite. So if fimd was not\nruntime suspended, suspend will turn off fimd but resume will not turn\nit on. This patch fixes this issue by reversing the condition.\n\nSigned-off-by: Prathyush K \u003cprathyush.k@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "fef0ebdb229bedce888b63923e2a1ba4e6c6a84c", "tree": "bff420c9a7e6b614a1ed83f22157475b885b421c", "parents": [ "0ecaef0644973e9006fdbc6974301047aaff9bc6" ], "author": { "name": "Guo Chao", "email": "yan@linux.vnet.ibm.com", "time": "Sun Jan 06 23:40:25 2013 -0500" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Sun Jan 06 23:40:25 2013 -0500" }, "message": "ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir()\n\nThis fixes a buffer cache leak when creating a directory, introduced\nin commit a774f9c20.\n\nSigned-off-by: Guo Chao \u003cyan@linux.vnet.ibm.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nReviewed-by: Tao Ma \u003cboyu.mt@taobao.com\u003e\n" }, { "commit": "0ecaef0644973e9006fdbc6974301047aaff9bc6", "tree": "8c0b65a4401435ee094c00e7a09bce81f4b90685", "parents": [ "96465efee14ecca0cdffcb09f9903635db8fc504" ], "author": { "name": "Guo Chao", "email": "yan@linux.vnet.ibm.com", "time": "Sun Jan 06 23:38:47 2013 -0500" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Sun Jan 06 23:38:47 2013 -0500" }, "message": "ext4: release buffer in failed path in dx_probe()\n\nIf checksum fails, we should also release the buffer\nread from previous iteration.\n\nSigned-off-by: Guo Chao \u003cyan@linux.vnet.ibm.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nReviewed-by: Darrick J. Wong \u003cdarrick.wong@oracle.com\u003e-\nCc: stable@vger.kernel.org\n--\n fs/ext4/namei.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n" }, { "commit": "96465efee14ecca0cdffcb09f9903635db8fc504", "tree": "82b6ad8084cc97422fa7ebab015059a3a135209f", "parents": [ "d1c3ed669a2d452cacfb48c2d171a1f364dae2ed" ], "author": { "name": "Valerie Aurora", "email": "val@vaaconsulting.com", "time": "Sun Jan 06 23:38:44 2013 -0500" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Sun Jan 06 23:38:44 2013 -0500" }, "message": "ext4: fix configuration dependencies for ext4 ACLs and security labels\n\nCommit \"ext4: Remove CONFIG_EXT4_FS_XATTR\" removed the configuration\ndependencies for ext4 xattrs from the ext4 ACLs and security labels\nconfiguration options, but did not replace them with a dependency on\next4 itself. Add back the dependency on ext4 so the options only show\nup if ext4 is enabled.\n\nSigned-off-by: Valerie Aurora \u003cval@vaaconsulting.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nReviewed-by: Tao Ma \u003cboyu.mt@taobao.com\u003e\n" }, { "commit": "ade24c93ab173b392a905ef8d510874dfb05a417", "tree": "f984a9b428cdf1866566cf9dba808d8fcc60d468", "parents": [ "5f243b9b46a22e5790dbbc36f574c2417af49a41", "a7f2a366f62319dfebf8d4dfe8b211f631c78457" ], "author": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Mon Jan 07 12:11:37 2013 +1100" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Mon Jan 07 12:11:37 2013 +1100" }, "message": "Merge branch \u0027for-Linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus\n\nPulled from Mimi\u0027s tree.\n" }, { "commit": "d106de38ca927f2a53cd56ef94c506e8f6bd37e1", "tree": "ca44d4eda03c584274a810327af73391c31ed3b4", "parents": [ "a47e3bc10d0e34a67e10a9f8150a144af654be2a" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@linaro.org", "time": "Sat Jan 05 13:57:38 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 06 17:54:08 2013 +0000" }, "message": "ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b\n\nIf CONFIG_ARCH_MULTIPLATFORM \u0026 CONFIG_ARCH_MVEBU are both enabled,\n__v7_pj4b_setup is added between __v7_ca9mp_setup and __v7_setup.\n\nBut there\u0027s no jump instruction added. If the chip is Cortex A5/A9,\nit goes through __v7_pj4b_setup also. It results in system hang.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a47e3bc10d0e34a67e10a9f8150a144af654be2a", "tree": "5abf5102a3b66efc1e1b7853e9cc6113529a726b", "parents": [ "5ced33bc06e7e76cb8a236f15bff49eb6155b618" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Sat Jan 05 03:51:59 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 06 17:54:02 2013 +0000" }, "message": "ARM: 7612/1: imx: Do not select some errata that depends on !ARCH_MULTIPLATFORM\n\nSince commit 62e4d357a (ARM: 7609/1: disable errata work-arounds which access\nsecure registers) ARM_ERRATA_743622/751472 depends on !ARCH_MULTIPLATFORM.\n\nSince imx has been converted to multiplatform, the following warning happens:\n\n$ make imx_v6_v7_defconfig\nwarning: (SOC_IMX6Q \u0026\u0026 ARCH_TEGRA_2x_SOC \u0026\u0026 ARCH_TEGRA_3x_SOC) selects\nARM_ERRATA_751472 which has unmet direct dependencies (CPU_V7 \u0026\u0026\n!ARCH_MULTIPLATFORM)\nwarning: (SOC_IMX6Q \u0026\u0026 ARCH_TEGRA_3x_SOC) selects ARM_ERRATA_743622\nwhich has unmet direct dependencies (CPU_V7 \u0026\u0026 !ARCH_MULTIPLATFORM)\nwarning: (SOC_IMX6Q \u0026\u0026 ARCH_TEGRA_3x_SOC) selects ARM_ERRATA_743622\nwhich has unmet direct dependencies (CPU_V7 \u0026\u0026 !ARCH_MULTIPLATFORM)\nwarning: (SOC_IMX6Q \u0026\u0026 ARCH_TEGRA_2x_SOC \u0026\u0026 ARCH_TEGRA_3x_SOC) selects\nARM_ERRATA_751472 which has unmet direct dependencies (CPU_V7 \u0026\u0026\n!ARCH_MULTIPLATFORM)\n\nRecommended approach is to remove ARM_ERRATA_743622/751472 from being selected\nby SOC_IMX6Q and apply such workarounds into the bootloader.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "dab9206445952e64213582b2ab9077972850d65b", "tree": "92fe891f1fdcca9882523aa615fcdb809c3dc3b4", "parents": [ "ab6e439fd07aba7cadcadb3fb5e11d3758e19679" ], "author": { "name": "Thomas Petazzoni", "email": "thomas.petazzoni@free-electrons.com", "time": "Sun Jan 06 11:10:44 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:28 2013 +0000" }, "message": "dma: mv_xor: fix error handling for clocks\n\nWhen a channel fails to initialize, we release all ressources,\nincluding clocks. However, a XOR unit is not necessarily associated to\na clock (some variants of Marvell SoCs have a clock for XOR units,\nsome don\u0027t), so we shouldn\u0027t unconditionally be releasing the clock.\n\nInstead, just like we do in the mv_xor_remove() function, we should\ncheck if one clock was found before releasing it.\n\nSigned-off-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "ab6e439fd07aba7cadcadb3fb5e11d3758e19679", "tree": "f123a743e71256d792a28a56e7cc3b8ee63b11d7", "parents": [ "41be8dc1a44ee2a0a52bdf2b77273624c40782b6" ], "author": { "name": "Thomas Petazzoni", "email": "thomas.petazzoni@free-electrons.com", "time": "Sun Jan 06 11:10:43 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:25 2013 +0000" }, "message": "dma: mv_xor: fix error handling of mv_xor_channel_add()\n\nWhen mv_xor_channel_add() fails for one XOR channel, we jump to the\nerr_channel_add label to clean up all previous channels that had been\ninitialized correctly. Unfortunately, while handling this error\ncondition, we were disposing the IRQ mapping before calling\nmv_xor_channel_remove() (which does the free_irq()), which is\nincorrect.\n\nInstead, do things properly in the reverse order of the\ninitialization: first remove the XOR channel (so that free_irq() is\ndone), and then dispose the IRQ mapping.\n\nThis avoids ugly warnings when for some reason one of the XOR channel\nfails to initialize.\n\nSigned-off-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "41be8dc1a44ee2a0a52bdf2b77273624c40782b6", "tree": "7e357de0297bfcc06e2605a6bd8d65ad4b84fea9", "parents": [ "77916519cba3425c7e3a6d17393d123f9b76e54f" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Sun Jan 06 11:10:42 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:22 2013 +0000" }, "message": "arm: mvebu: Add missing ; for cpu node.\n\nThe Armada XP MV78230 DT include file is missing a ; at the\nend of the cpu node.\n\nReported-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "77916519cba3425c7e3a6d17393d123f9b76e54f", "tree": "551f415607c1bdef64bb1c36d357d30978ac2aeb", "parents": [ "44cfae9ac608fbad98d0e139bc81fe0abd21e3c3" ], "author": { "name": "Thomas Petazzoni", "email": "thomas.petazzoni@free-electrons.com", "time": "Sun Jan 06 11:10:41 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:19 2013 +0000" }, "message": "arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces\n\nWe originally thought that the MV78230 variant of the Armada XP had\nfour Ethernet interfaces, like the other variants MV78260 and\nMV78460. In fact, this is not true, and the MV78230 has only three\nEthernet interfaces.\n\nSo, the definitions of the Ethernet interfaces is now done as follows:\n\n * armada-370-xp.dtsi: definitions of the first two interfaces, that\n are common to Armada 370 and Armada XP\n\n * armada-xp.dtsi: definition of the third interface, common to all\n Armada XP variants.\n\n * armada-xp-mv78260.dtsi and armada-xp-mv78460.dtsi: definition of\n the fourth interface.\n\nSigned-off-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "44cfae9ac608fbad98d0e139bc81fe0abd21e3c3", "tree": "fbe40cae7adff8d47af3415a9b1ada77fa612631", "parents": [ "3810e6304185f5a5bc4bb99b0ed467a28e63e9ed" ], "author": { "name": "Thomas Petazzoni", "email": "thomas.petazzoni@free-electrons.com", "time": "Sun Jan 06 11:10:40 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:16 2013 +0000" }, "message": "arm: mvebu: Armada XP MV78230 has two cores, not one\n\nContrary to our understanding at the time armada-xp-mv78230.dtsi was\nwritten, the MV78230 variant of the Armada XP SoC has two cores and\nnot one. This patch updates the .dtsi file to take into account this\nreality.\n\nSigned-off-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "3810e6304185f5a5bc4bb99b0ed467a28e63e9ed", "tree": "c3fa7cc27d644031bc8176525024a220716d05d1", "parents": [ "8758c885c43859266e45db588b1a5992c049c595" ], "author": { "name": "Joshua Coombs", "email": "josh.coombs@gmail.com", "time": "Sun Jan 06 11:10:39 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:13 2013 +0000" }, "message": "clk: mvebu: Remove inappropriate __init tagging\n\nIf the Orion WDT driver is built as a module, an opps occurs during\nclk lookup when calling mvebu_clk_gating_get_src(). Remove the\ninappropriate __init tag so the function is available for modules\nafter kernel init.\n\nSigned-off-by: Joshua Coombs \u003cjosh.coombs@gmail.com\u003e\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "8758c885c43859266e45db588b1a5992c049c595", "tree": "125215c6ffeda5ac06b3e0dc2330753c77917891", "parents": [ "d2268be3dc0ef59f9d572f082c08e698e4617bc4" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Sun Jan 06 11:10:38 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:10 2013 +0000" }, "message": "ARM: Kirkwood: Use fixed-regulator instead of board gpio call\n\nWith the change to a DT based pinctrl/gpio driver, using gpio API\ncalls in board-*.c files no longer works, a dereferenced NULL pointer\nexception occurs instead. By converting the GPIO code into a\nfixed-regulator which gets probed later once pinctrl/gpio is\navailable, we avoid the exception.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nTested-by: Stefan Peter \u003cs.peter@mplch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "d2268be3dc0ef59f9d572f082c08e698e4617bc4", "tree": "3bbf96cb96faef318524cf2f01dfc400be5718f2", "parents": [ "107c21c3461d402ac0d2cdc1929e686612890727" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Sun Jan 06 11:10:37 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:06 2013 +0000" }, "message": "ARM: Kirkwood: Fix missing sdio clock\n\nWe moved to declaring clk gates in DT. However, device which do not\nyet have a DT binding need to have a clkdev alias. This was missing\nfor SDIO.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nTested-by: Stefan Peter \u003cs.peter@mplch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "107c21c3461d402ac0d2cdc1929e686612890727", "tree": "feaae30eaf10ddba9c19b2715277e2d367f0ce00", "parents": [ "5343527bbfab3f71f64d8ba5d51ce12dec8d82d0" ], "author": { "name": "Nobuhiro Iwamatsu", "email": "iwamatsu@nigauri.org", "time": "Sun Jan 06 11:10:36 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:04 2013 +0000" }, "message": "ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers\n\nClock Management of kirkwood has moved to DT clock providers.\nHowever, TWSI1 has not yet been done.\nThis switches TWSI1 of 88f6282 to DT clock providers.\n\nSigned-off-by: Nobuhiro Iwamatsu \u003ciwamatsu@nigauri.org\u003e\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "5343527bbfab3f71f64d8ba5d51ce12dec8d82d0", "tree": "42e197b8fb215663bbdd5023226acea16c0b55f5", "parents": [ "53dfa8e4aa740cc7a19a39d6d4542f856c6b49ae" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Sun Jan 06 11:10:35 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:53:00 2013 +0000" }, "message": "Power: gpio-poweroff: Fix documentation and gpio_is_valid\n\nImprove the documentation to clarify level vs edge triggered power off.\nImprove the comments for level vs edge triggered power off.\nMake use of gpio_is_valid().\n\nReported-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "53dfa8e4aa740cc7a19a39d6d4542f856c6b49ae", "tree": "9f83ea547c14331e33d5639618800934337cd91b", "parents": [ "b24212fbfba25102cab7b4b1fd2919a58e02ae31" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Sun Jan 06 11:10:34 2013 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun Jan 06 17:52:56 2013 +0000" }, "message": "ARM: Kirkwood: Fix missing clk for USB device.\n\nWithout the clock being held by a driver, it gets turned off at a bad\ntime causing the SoC to lockup. This is often during reboot.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nTested-by: Stefan Peter \u003cs.peter@mpl.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" } ], "next": "b24212fbfba25102cab7b4b1fd2919a58e02ae31" }