)]}' { "log": [ { "commit": "b94de9bb7519f597a3aed521d5eaeb5b02a7cbc0", "tree": "1c2771372fc23c55dd678080aa6529c98f8de371", "parents": [ "a2b6bf63cb7a3e34bd2e753a6f2c2776b5c8496f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jul 28 22:59:02 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Wed Jul 28 22:59:02 2010 +0100" }, "message": "lib/scatterlist: Hook sg_kmalloc into kmemleak (v2)\n\nkmemleak ignores page_alloc() and so believes the final sub-page\nallocation using the plain kmalloc is decoupled and lost. This leads to\nlots of false-positives with code that uses scatterlists.\n\nThe options seem to be either to tell kmemleak that the kmalloc is not\nleaked or to notify kmemleak of the page allocations. The danger of the\nfirst approach is that we may hide a real leak, so choose the latter\napproach (of which I am not sure of the downsides).\n\nv2: Added comments on the suggestion of Catalin.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\n" }, { "commit": "a2b6bf63cb7a3e34bd2e753a6f2c2776b5c8496f", "tree": "4134b50892d8465fc60d4b4aacd6256fb9785843", "parents": [ "ab0155a22ad5bda3a6dbfbbecc416cbe92619755" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:17 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:17 2010 +0100" }, "message": "kmemleak: Add DocBook style comments to kmemleak.c\n\nThe description and parameters of the kmemleak API weren\u0027t obvious. This\npatch adds comments clarifying the API usage.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\n" }, { "commit": "ab0155a22ad5bda3a6dbfbbecc416cbe92619755", "tree": "0a8b2caea650cc31f61bc8723b0da275382701af", "parents": [ "a7686a45c07462b78df5ac15fc696a86e57ccf91" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Mon Jul 19 11:54:17 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:17 2010 +0100" }, "message": "kmemleak: Introduce a default off mode for kmemleak\n\nIntroduce a new DEBUG_KMEMLEAK_DEFAULT_OFF config parameter that allows\nkmemleak to be disabled by default, but enabled on the command line\nvia: kmemleak\u003don. Although a reboot is required to turn it on, its still\nuseful to not require a re-compile.\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\n" }, { "commit": "a7686a45c07462b78df5ac15fc696a86e57ccf91", "tree": "68f9f2961afc1deb714acabb53f48eb681b7441a", "parents": [ "9078370c0d2cfe4a905aa34f398bbb0d65921a2b" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:16 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:16 2010 +0100" }, "message": "kmemleak: Show more information for objects found by alias\n\nThere may be situations when an object is freed using a pointer inside\nthe memory block. Kmemleak should show more information to help with\ndebugging.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\n" }, { "commit": "9078370c0d2cfe4a905aa34f398bbb0d65921a2b", "tree": "0b0d3b1f2a9a6dd2f2deaae9fbf9c8c5509ac13c", "parents": [ "7952f98818d561ed0e11434a7a16acd9a7bae859" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:15 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:15 2010 +0100" }, "message": "kmemleak: Add support for NO_BOOTMEM configurations\n\nWith commits 08677214 and 59be5a8e, alloc_bootmem()/free_bootmem() and\nfriends use the early_res functions for memory management when\nNO_BOOTMEM is enabled. This patch adds the kmemleak calls in the\ncorresponding code paths for bootmem allocations.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nAcked-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "7952f98818d561ed0e11434a7a16acd9a7bae859", "tree": "b8e74d8a3aa9ac6939889487b8c46ce098c7d9f3", "parents": [ "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:14 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:14 2010 +0100" }, "message": "kmemleak: Annotate false positive in init_section_page_cgroup()\n\nThe pointer to the page_cgroup table allocated in\ninit_section_page_cgroup() is stored in section-\u003epage_cgroup as (base -\npfn). Since this value does not point to the beginning or inside the\nallocated memory block, kmemleak reports a false positive.\n\nThis was reported in bugzilla.kernel.org as #16297.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nReported-by: Adrien Dessemond \u003cadrien.dessemond@gmail.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78", "tree": "79b87ea9b3f5ee5e2d1efdeb2807f1afd1f02e16", "parents": [ "71665963af194f50402a2cb1339828caff4ee9ee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:22:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:22:50 2010 -0700" }, "message": "Linux 2.6.35-rc4\n" }, { "commit": "71665963af194f50402a2cb1339828caff4ee9ee", "tree": "f5e39b7cd098419a7bfeee911e75ec19bb0abd63", "parents": [ "3f7d7b4bded5bd2cc9934a2ed9a7ce68feb636b0", "446a5a8b1eb91a6990e5c8fe29f14e7a95b69132" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:21:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:21:39 2010 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6205/1: perf: ensure counter delta is treated as unsigned\n ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220\n ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220\n ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU\n ARM: 6194/1: change definition of cpu_relax() for ARM11MPCore\n ARM: 6193/1: RealView: Align the machine_desc.phys_io to 1MB section\n ARM: 6192/1: VExpress: Align the machine_desc.phys_io to 1MB section\n ARM: 6188/1: Add a config option for the ARM11MPCore DMA cache maintenance workaround\n ARM: 6187/1: The v6_dma_inv_range() function must preserve data on SMP\n ARM: 6186/1: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds\n ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI\n [ARM] mmp: fix build failure due to IRQ_PMU depends on ARCH_PXA\n [ARM] pxa/mioa701: fix camera regression\n [ARM] pxa/z2: fix flash layout to final version\n [ARM] pxa/z2: fix missing include in battery driver\n [ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h\n" }, { "commit": "3f7d7b4bded5bd2cc9934a2ed9a7ce68feb636b0", "tree": "2667a923fedcbf8324dde93f0acc17879fa7d862", "parents": [ "ff49d74ad383f54041378144ca1a229ee9aeaa59", "f287d332ce835f77a4f5077d2c0ef1e3f9ea42d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:20:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:20:53 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf, x86: Fix incorrect branches event on AMD CPUs\n perf tools: Fix find tids routine by excluding \".\" and \"..\"\n x86: Send a SIGTRAP for user icebp traps\n" }, { "commit": "ff49d74ad383f54041378144ca1a229ee9aeaa59", "tree": "6f37335e313c9a680db8d4e4ce00d17aa11a099b", "parents": [ "e3668dd83ba5958429984286efbc3055be5344c4" ], "author": { "name": "Yehuda Sadeh", "email": "yehuda@hq.newdream.net", "time": "Sat Jul 03 13:07:35 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:17:22 2010 -0700" }, "message": "module: initialize module dynamic debug later\n\nWe should initialize the module dynamic debug datastructures\nonly after determining that the module is not loaded yet. This\nfixes a bug that introduced in 2.6.35-rc2, where when a trying\nto load a module twice, we also load it\u0027s dynamic printing data\ntwice which causes all sorts of nasty issues. Also handle\nthe dynamic debug cleanup later on failure.\n\nSigned-off-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (removed a #ifdef)\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e3668dd83ba5958429984286efbc3055be5344c4", "tree": "0614463a7bf4a6514db31556edd6848ed7a6fd7a", "parents": [ "744c557892d3bfb575287ee95947f5c0b9a0458f", "7b6259e7a83647948fa33a736cc832310c8d85aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:13:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:13:31 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: remove block number from inode lookup code\n xfs: rename XFS_IGET_BULKSTAT to XFS_IGET_UNTRUSTED\n xfs: validate untrusted inode numbers during lookup\n xfs: always use iget in bulkstat\n xfs: prevent swapext from operating on write-only files\n" }, { "commit": "744c557892d3bfb575287ee95947f5c0b9a0458f", "tree": "02e75a88f2f0472bca3515e08c8c12468b7d1797", "parents": [ "62fd98571727a22ef77f1a9c1637260ad5a10baa", "3e6b02d9f5a9715f7d4ff9e0978e5f9cef53d31f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:12:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:12:31 2010 -0700" }, "message": "Merge branch \u0027merge-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027merge-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of/dma: fix build breakage in ppc4xx adma driver\n" }, { "commit": "62fd98571727a22ef77f1a9c1637260ad5a10baa", "tree": "0b0118c028b5de70ba42d45f18b08cd7cea96dad", "parents": [ "404504470177d5ca1b46db5197ee0b78d639a2eb", "67c8931677090540e31b4f816e5fe315ff51f262" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:12:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:12:06 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core:\n MAINTAINERS: Add an entry for i7core_edac\n i7core_edac: Avoid doing multiple probes for the same card\n i7core_edac: Properly discover the first QPI device\n" }, { "commit": "404504470177d5ca1b46db5197ee0b78d639a2eb", "tree": "fe589d5017b199094920decd8283f748c4d668be", "parents": [ "123f94f22e3d283dfe68742b269c245b0501ad82", "62052be3a797f26f6f0fe30fc8d7f40ab54e08fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 19:55:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 19:55:23 2010 -0700" }, "message": "Merge branch \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:\n kbuild: Propagate LOCALVERSION\u003d down to scripts/setlocalversion\n kbuild: Clean up and speed up the localversion logic\n" }, { "commit": "446a5a8b1eb91a6990e5c8fe29f14e7a95b69132", "tree": "dd60d5a5db4438d66e0baa78acda85f7be4fbae6", "parents": [ "42c4dafe803dcad82980fd8b0831a89032156f93" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Jul 02 16:41:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jul 04 23:11:37 2010 +0100" }, "message": "ARM: 6205/1: perf: ensure counter delta is treated as unsigned\n\nHardware performance counters on ARM are 32-bits wide but atomic64_t\nvariables are used to represent counter data in the hw_perf_event structure.\n\nThe armpmu_event_update function right-shifts a signed 64-bit delta variable\nand adds the result to the event count. This can lead to shifting in sign-bits\nif the MSB of the 32-bit counter value is set. This results in perf output\nsuch as:\n\n Performance counter stats for \u0027sleep 20\u0027:\n\n 18446744073460670464 cycles \u003c-- 0xFFFFFFFFF12A6000\n 7783773 instructions # 0.000 IPC\n 465 context-switches\n 161 page-faults\n 1172393 branches\n\n 20.154242147 seconds time elapsed\n\nThis patch ensures that the delta value is treated as unsigned so that the\nright shift sets the upper bits to zero.\n\nCc: \u003cstable@kernel.org\u003e\nAcked-by: Jamie Iles \u003cjamie.iles@picochip.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f287d332ce835f77a4f5077d2c0ef1e3f9ea42d2", "tree": "c302334770641d1808393968ee42c34be1e62fcb", "parents": [ "c214909b36efec632432acdcbfacdd46a6e11370" ], "author": { "name": "Vince Weaver", "email": "vweaver1@eecs.utk.edu", "time": "Thu Jul 01 15:30:16 2010 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 03 15:19:34 2010 +0200" }, "message": "perf, x86: Fix incorrect branches event on AMD CPUs\n\nWhile doing some performance counter validation tests on some\nassembly language programs I noticed that the \"branches:u\"\ncount was very wrong on AMD machines.\n\nIt looks like the wrong event was selected.\n\nSigned-off-by: Vince Weaver \u003cvweaver1@eecs.utk.edu\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: \u003cstable@kernel.org\u003e\nLKML-Reference: \u003calpine.DEB.2.00.1007011526010.23160@cl320.eecs.utk.edu\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3e6b02d9f5a9715f7d4ff9e0978e5f9cef53d31f", "tree": "0e08d7cdff6856b7df8ec6a93f05787debb0f04c", "parents": [ "123f94f22e3d283dfe68742b269c245b0501ad82" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jul 02 15:46:17 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 02 15:46:17 2010 -0600" }, "message": "of/dma: fix build breakage in ppc4xx adma driver\n\nConvert ppc4xx adma driver to use new node pointer location\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nAcked-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "67c8931677090540e31b4f816e5fe315ff51f262", "tree": "07d1626c35a979886a2af2bd97b24a6848331aa8", "parents": [ "2d95d8158b5ab51339f8482c98c01469c45ff6d7" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jun 30 01:45:28 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Jul 02 18:04:38 2010 -0300" }, "message": "MAINTAINERS: Add an entry for i7core_edac\n\nWhile here, fixes the mailing list for i5400_edac\n\nAcked-by: Doug Thompson \u003cdougthompson@xmission.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2d95d8158b5ab51339f8482c98c01469c45ff6d7", "tree": "59d8edd1e277112baee013d185792a0d79a1d3c4", "parents": [ "bda142890e6bdd9b1115715e50b0276ea4b9978a" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jun 30 01:42:21 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Jul 02 18:04:29 2010 -0300" }, "message": "i7core_edac: Avoid doing multiple probes for the same card\n\nAs Nehalem/Nehalem-EP/Westmere devices uses several devices for the same\nfunctionality (memory controller), the default way of proping devices doesn\u0027t\nwork. So, instead of a per-device probe, all devices should be probed at once.\n\nThis means that we should block any new attempt of probe, otherwise, it will\ntry to register the same device several times.\n\nAcked-by: Doug Thompson \u003cdougthompson@xmission.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "bda142890e6bdd9b1115715e50b0276ea4b9978a", "tree": "41b885fc4e9bb14eb7f7c57d93318acd2cdb4453", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jun 30 01:41:35 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Jul 02 18:04:05 2010 -0300" }, "message": "i7core_edac: Properly discover the first QPI device\n\nOn Nehalem/Nehalem-EP/Westmere, the first QPI device is the last PCI bus.\nThe last bus is generally at 0x3f or 0xff, but there are also other systems\nusing different setups. For example, HP Z800 has 0x7f as the last bus.\n\nThis patch adds a logic to discover the last bus, dynamically detecting it\nat runtime.\n\nAcked-by: Doug Thompson \u003cdougthompson@xmission.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "123f94f22e3d283dfe68742b269c245b0501ad82", "tree": "1d40043b0909f309cf77204ea87be9e61f143e79", "parents": [ "4b78c119f0ba715b4e29b190bf4d7bce810ea0d6", "8c215bd3890c347dfb6a2db4779755f8b9c298a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:58 2010 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Cure nr_iowait_cpu() users\n init: Fix comment\n init, sched: Fix race between init and kthreadd\n" }, { "commit": "4b78c119f0ba715b4e29b190bf4d7bce810ea0d6", "tree": "92bd694fab05988654849e77c789a4fcd18d8f8f", "parents": [ "97e0214044d9f279a3d6286c9f859696ef0b7ebe", "41c310447fe06bcedc22b75752c18b60e0b9521b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:31 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:\n amd64_edac: Fix syndrome calculation on K8\n" }, { "commit": "41c310447fe06bcedc22b75752c18b60e0b9521b", "tree": "20839d92f95d88d70813d9ef81058ba2c1a62a7c", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Fri Jul 02 17:02:43 2010 +0200" }, "committer": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Fri Jul 02 17:32:34 2010 +0200" }, "message": "amd64_edac: Fix syndrome calculation on K8\n\nWhen calculating the DCT channel from the syndrome we need to know the\nsyndrome type (x4 vs x8). On F10h, this is read out from extended PCI\ncfg space register F3x180 while on K8 we only support x4 syndromes and\ndon\u0027t have extended PCI config space anyway.\n\nMake the code accessing F3x180 F10h only and fall back to x4 syndromes\non everything else.\n\nCc: \u003cstable@kernel.org\u003e # .33.x .34.x\nReported-by: Jeffrey Merkey \u003cjeffmerkey@gmail.com\u003e\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\n" }, { "commit": "62052be3a797f26f6f0fe30fc8d7f40ab54e08fd", "tree": "bfdd68b770778dfaade57a51c0e8f6938f14c6f6", "parents": [ "d5eda75f3a6a08f5a3644764a88d288e62e7823d", "0a564b2645c8766a669c55bde1f1ef5b0518caec" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Fri Jul 02 11:56:52 2010 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Fri Jul 02 11:56:52 2010 +0200" }, "message": "Merge branch \u0027setlocalversion-speedup\u0027 into kbuild/rc-fixes\n\nConflicts:\n\tMakefile\n" }, { "commit": "42c4dafe803dcad82980fd8b0831a89032156f93", "tree": "4ee6615d25d034420925215ee798924f54b4a0c3", "parents": [ "2503a5ecd86c002506001eba432c524ea009fe7f" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Thu Jul 01 13:22:48 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 02 10:10:20 2010 +0100" }, "message": "ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220\n\nRealView boards with certain revisions of the L210/L220 cache controller\nmay have issues (hardware deadlock) with the mandatory barriers (DSB\nfollowed by an L2 cache sync) when ARM_DMA_MEM_BUFFERABLE is enabled.\nThe patch disables ARM_DMA_MEM_BUFFERABLE for these boards.\n\nTested-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2503a5ecd86c002506001eba432c524ea009fe7f", "tree": "02f4646b29de1194154db5bd387298c222ffaf59", "parents": [ "00952d8f14447fccfb9560d98999f7489d4fd2df" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Thu Jul 01 13:21:47 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 02 10:10:09 2010 +0100" }, "message": "ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220\n\nRealView boards with certain revisions of the L220 cache controller (ARM11*\nprocessors only) may have issues (hardware deadlock) with the recent changes to\nthe mb() barrier implementation (DSB followed by an L2 cache sync). The patch\nredefines the RealView ARM11MPCore mandatory barriers without the outer_sync()\ncall.\n\nCc: \u003cstable@kernel.org\u003e\nTested-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "97e0214044d9f279a3d6286c9f859696ef0b7ebe", "tree": "628d2b834ab581f6db54367baddee4f86112d22c", "parents": [ "826456989f1e9fe15daf2183c630ea9c7ab7c46d", "70565d00db6ef5735819db973fa8da95bd34a6ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:48:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:48:11 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:\n drm/i915: fix page flip finish vs. prepare on plane B\n drm/i915: change default panel fitting mode to preserve aspect ratio\n drm/i915: fix uninitialized variable warning in i915_setup_compression()\n drm/i915: take struct_mutex in i915_dma_cleanup()\n drm/i915: Fix CRT hotplug regression in 2.6.35-rc1\n i915: fix ironlake edp panel setup (v4)\n drm/i915: don\u0027t access FW_BLC_SELF on 965G\n drm/i915: Account for space on the ring buffer consumed whilst wrapping.\n drm/i915: gen3 page flipping fixes\n drm/i915: don\u0027t queue flips during a flip pending event\n drm/i915: Fix incorrect intel_ring_begin size in BSD ringbuffer.\n drm/i915: Turn on 945 self-refresh only if single CRTC is active\n drm/i915/gen4: Fix interrupt setup ordering\n drm/i915: Use RSEN instead of HTPLG for tfp410 monitor detection.\n drm/i915: Move non-phys cursors into the GTT\n Revert \"drm/i915: Don\u0027t enable pipe/plane/VCO early (wait for DPMS on).\"\n\n(Included the \"fix page flip finish vs. prepare on plane B\" patch from\nJesse on top of the pull request from Eric. -- Linus)\n" }, { "commit": "70565d00db6ef5735819db973fa8da95bd34a6ab", "tree": "5249f6aed139b46986c040831db3676f4024e648", "parents": [ "dd1ea37d9257bdf118693235dc74003901c55204" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@jbarnes-acer.localdomain", "time": "Thu Jul 01 04:45:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:47:12 2010 -0700" }, "message": "drm/i915: fix page flip finish vs. prepare on plane B\n\nThe refreshed patch had a copy \u0026 paste bug.\n\nReported-by: Simon Farnsworth \u003csimon.farnsworth@onelan.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "826456989f1e9fe15daf2183c630ea9c7ab7c46d", "tree": "fa5dec62b73dfad09ad49f1e2797a0e303bd194b", "parents": [ "980533b018fda7ae4c4fb6863b75a0e282d2ffd2", "1529c69adce1e95f7ae72f0441590c226bbac7fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:40:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:40:54 2010 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1\n ahci,ata_generic: let ata_generic handle new MBP w/ MCP89\n libahci: Fix bug in storing EM messages\n" }, { "commit": "980533b018fda7ae4c4fb6863b75a0e282d2ffd2", "tree": "5f89735bc2fef0be17902118f74a6a9e9f470974", "parents": [ "985b823b919273fe1327d56d2196b4f92e5d0fae" ], "author": { "name": "Daniel J Blueman", "email": "daniel.blueman@gmail.com", "time": "Thu Jul 01 23:27:11 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:40:29 2010 -0700" }, "message": "correct console log level when ERST ACPI table is not found\n\nWhen booting 2.6.35-rc3 on a x86 system without an ERST ACPI table with\nthe \u0027quiet\u0027 option, we still observe an \"ERST: Table is not found!\"\nwarning.\n\nQuiesce it to the same info log level as the other \u0027table not found\u0027\nwarnings.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "985b823b919273fe1327d56d2196b4f92e5d0fae", "tree": "43c6e7b44cb0cc893088895604a667c135e28e62", "parents": [ "9fbd7f9d112e50dc7649d13de37bc92cb50c3905" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 10:04:42 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:37:01 2010 -0700" }, "message": "drm/i915: fix hibernation since i915 self-reclaim fixes\n\nSince commit 4bdadb9785696439c6e2b3efe34aa76df1149c83 (\"drm/i915:\nSelectively enable self-reclaim\"), we\u0027ve been passing GFP_MOVABLE to the\ni915 page allocator where we weren\u0027t before due to some over-eager\nremoval of the page mapping gfp_flags games the code used to play.\n\nThis caused hibernate on Intel hardware to result in a lot of memory\ncorruptions on resume. See for example\n\n http://bugzilla.kernel.org/show_bug.cgi?id\u003d13811\n\nReported-by: Evengi Golov (in bugzilla)\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nTested-by: M. Vefa Bicakci \u003cbicave@superonline.com\u003e\nCc: stable@kernel.org\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dd1ea37d9257bdf118693235dc74003901c55204", "tree": "74fe4d78d2147490f64c0c2c9c68266285b7d033", "parents": [ "132b6aab90d2673af67c414878da241a197e00fb" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jun 24 11:05:10 2010 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Jul 01 16:05:47 2010 -0700" }, "message": "drm/i915: change default panel fitting mode to preserve aspect ratio\n\nWe did this a long time ago in the DDX driver, but now this fix belongs\nin the kernel.\n\nPreserving the aspect ratio is a nicer default.\n\nFixes https://bugs.freedesktop.org/show_bug.cgi?id\u003d18033.\n\nTested-by: Josh Triplett \u003cjosh@freedesktop.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "132b6aab90d2673af67c414878da241a197e00fb", "tree": "fc3771f1aa71a7b085c3ce643a04f078de524c4b", "parents": [ "ee0c6bfbd602cdad2ab1780061b3b1a9108cbd6c" ], "author": { "name": "Prarit Bhargava", "email": "prarit@redhat.com", "time": "Thu May 27 13:37:56 2010 -0400" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Jul 01 15:57:51 2010 -0700" }, "message": "drm/i915: fix uninitialized variable warning in i915_setup_compression()\n\nFixes:\n\ndrivers/gpu/drm/i915/i915_dma.c: In function ‘i915_setup_compression’:\ndrivers/gpu/drm/i915/i915_dma.c:1311: error: ‘compressed_llb’ may be used uninitialized in this function\n\nSigned-off-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "ee0c6bfbd602cdad2ab1780061b3b1a9108cbd6c", "tree": "30fb8739a7197b2c499aec88f4585e7ecabcd9d3", "parents": [ "2d1c9752eaa4c0b38f6fb1ab79a6addc146cd64e" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Jun 23 13:19:55 2010 +0200" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Jul 01 15:41:37 2010 -0700" }, "message": "drm/i915: take struct_mutex in i915_dma_cleanup()\n\nintel_cleanup_ring_buffer() calls drm_gem_object_unreference() (as\nopposed to drm_gem_object_unreference_unlocked()) so it needs to be\ncalled with \"struct_mutex\" held. If we don\u0027t hold the lock, it triggers\na BUG_ON(!mutex_is_locked(\u0026dev-\u003estruct_mutex));\n\nI also audited the other places that call intel_cleanup_ring_buffer()\nand they all hold the lock so they\u0027re OK.\n\nThis was introduced in: 8187a2b70e3 \"drm/i915: introduce\nintel_ring_buffer structure (V2)\" and it\u0027s a regression from v2.6.34.\n\nAddresses: https://bugzilla.kernel.org/show_bug.cgi?id\u003d16247\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nReported-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\nTested-by: Benny Halevy \u003cbhalevy@panasas.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "2d1c9752eaa4c0b38f6fb1ab79a6addc146cd64e", "tree": "75d84be3c00a5be1a80fd90935c7c9294c8eaf3a", "parents": [ "fe27d53e5c597ee5ba5d72a29d517091f244e974" ], "author": { "name": "Andy Lutomirski", "email": "luto@MIT.EDU", "time": "Sat Jun 12 05:21:18 2010 -0400" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Jul 01 15:35:57 2010 -0700" }, "message": "drm/i915: Fix CRT hotplug regression in 2.6.35-rc1\n\nCommit 7a772c492fcfffae812ffca78a628e76fa57fe58 has two bugs which\nmade the hotplug problems on my laptop worse instead of better.\n\nFirst, it did not, in fact, disable the CRT plug interrupt -- it\ndisabled all the other hotplug interrupts. It seems rather doubtful\nthat that bit of the patch fixed anything, so let\u0027s just remove it.\n(If you want to add it back, you probably meant ~CRT_HOTPLUG_INT_EN.)\n\nSecond, on at least my GM45, setting CRT_HOTPLUG_ACTIVATION_PERIOD_64\nand CRT_HOTPLUG_VOLTAGE_COMPARE_50 (when they were previously unset)\ncauses a hotplug interrupt about three seconds later. The old code\nnever restored PORT_HOTPLUG_EN so this could only happen once, but\nthey new code restores those registers. So just set those bits when\nwe set up the interrupt in the first place.\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "fe27d53e5c597ee5ba5d72a29d517091f244e974", "tree": "4c29d58dc8fa06ffbf12c35ea570328ffa4736d0", "parents": [ "adcdbc6651a7086b99827cf50623a02d941261f1" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 30 11:46:17 2010 +1000" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Jul 01 15:33:19 2010 -0700" }, "message": "i915: fix ironlake edp panel setup (v4)\n\nThe eDP spec claims a 20% overhead for the 8:10 encoding scheme used\non the wire. Take this into account when picking the lane/clock speed\nfor the panel.\n\nv3: some panels are out of spec, try our best to deal with them, don\u0027t\nrefuse modes on eDP panels, and try the largest allowed settings if\nall else fails on eDP.\nv4: fix stupid typo, forgot to git add before amending.\n\nFixes several reports in bugzilla:\n\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28070\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "adcdbc6651a7086b99827cf50623a02d941261f1", "tree": "91cb2cfed63506b7e37761b3b96d83f20f5a6041", "parents": [ "43ed340ad93dcefe00a8f116b7e1b9dab2958543" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Jun 30 13:49:37 2010 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Jul 01 15:30:12 2010 -0700" }, "message": "drm/i915: don\u0027t access FW_BLC_SELF on 965G\n\nThe register offset for FW_BLC_SELF is a totally different set of bits\non Broadwater (it\u0027s actually MI_RDRET_STATE), so don\u0027t treat it like\nFW_BLC_SELF on 965G chips.\n\nFixes bug https://bugs.freedesktop.org/show_bug.cgi?id\u003d26874.\n\nCc: stable@kernel.org\nTested-by: Norman Yarvin \u003cyarvin@yarchive.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "43ed340ad93dcefe00a8f116b7e1b9dab2958543", "tree": "cd904adb6ed4a965cfaee97162e52555a7be19f2", "parents": [ "1afe3e9d4335bf3bc5615e37243dc8fef65dac8f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jul 01 17:53:00 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Jul 01 15:28:08 2010 -0700" }, "message": "drm/i915: Account for space on the ring buffer consumed whilst wrapping.\n\nIf we fill the tail of the physical ring buffer with NOOP when wrapping,\nwe need to account for the reduction in available space.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "1529c69adce1e95f7ae72f0441590c226bbac7fc", "tree": "25ada3429120228a4bba08f0ef47a033e503e7c8", "parents": [ "c6353b4520788e34098bbf61c73fb9618ca7fdd6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jun 22 12:27:26 2010 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Jul 01 15:34:48 2010 -0400" }, "message": "ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1\n\nIDE mode of MCP89 on MBP 7,1 doesn\u0027t set DMA enable bits in the BMDMA\nstatus register. Make the following changes to work around the problem.\n\n* Instead of using hard coded 1 in id-\u003edriver_data as class code\n match, use ATA_GEN_CLASS_MATCH and carry the matched id in\n host-\u003eprivate_data.\n\n* Instead of matching PCI_VENDOR_ID_CENATEK, use ATA_GEN_FORCE_DMA\n flag in id instead.\n\n* Add ATA_GEN_FORCE_DMA to the id entry of MBP 7,1.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Peer Chen \u003cpchen@nvidia.com\u003e\nCc: stable@kernel.org\nReported-by: Anders Østhus \u003cgrapz666@gmail.com\u003e\nReported-by: Andreas Graf \u003candreas_graf@csgraf.de\u003e\nReported-by: Benoit Gschwind \u003cgschwind@gnu-log.net\u003e\nReported-by: Damien Cassou \u003cdamien.cassou@gmail.com\u003e\nReported-by: tixetsal@juno.com\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "c6353b4520788e34098bbf61c73fb9618ca7fdd6", "tree": "89146e7b8e282b907021bae657b4bf18c74d9858", "parents": [ "f9ce889b8f8384ee29e1be4b34091a932e6e40f3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jun 17 11:42:22 2010 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Jul 01 15:34:46 2010 -0400" }, "message": "ahci,ata_generic: let ata_generic handle new MBP w/ MCP89\n\nFor yet unknown reason, MCP89 on MBP 7,1 doesn\u0027t work w/ ahci under\nlinux but the controller doesn\u0027t require explicit mode setting and\nworks fine with ata_generic. Make ahci ignore the controller on MBP\n7,1 and let ata_generic take it for now.\n\nReported in bko#15923.\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d15923\n\nNVIDIA is investigating why ahci mode doesn\u0027t work.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Peer Chen \u003cpchen@nvidia.com\u003e\nCc: stable@kernel.org\nReported-by: Anders Østhus \u003cgrapz666@gmail.com\u003e\nReported-by: Andreas Graf \u003candreas_graf@csgraf.de\u003e\nReported-by: Benoit Gschwind \u003cgschwind@gnu-log.net\u003e\nReported-by: Damien Cassou \u003cdamien.cassou@gmail.com\u003e\nReported-by: tixetsal@juno.com\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "f9ce889b8f8384ee29e1be4b34091a932e6e40f3", "tree": "ed9b189cf639e2dcfa144cd840c0e0efa55f838a", "parents": [ "984bc9601f64fd341b8573021d7c999f1f1499a9" ], "author": { "name": "Harry Zhang", "email": "harry.zhang@amd.com", "time": "Thu Jun 24 11:34:23 2010 +0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Jul 01 15:34:15 2010 -0400" }, "message": "libahci: Fix bug in storing EM messages\n\nIn function ahci_store_em_buffer(), if the input (signed char*) buffer\ncontains negative data, the constructed 32-bit long message data may\nbe wrong.\n\nSigned-off-by: Harry Zhang \u003charry.zhang@amd.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "c214909b36efec632432acdcbfacdd46a6e11370", "tree": "dec6f8d89bf32b387de5312ed5d0354aad6468e6", "parents": [ "a1e80fafc9f0742a1776a0490258cb64912411b0" ], "author": { "name": "Gui Jianfeng", "email": "guijianfeng@cn.fujitsu.com", "time": "Wed Jun 16 13:21:44 2010 +0800" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Thu Jul 01 14:02:38 2010 -0300" }, "message": "perf tools: Fix find tids routine by excluding \".\" and \"..\"\n\nIntroduce a filter function to skip \".\" and \"..\" directories when calculating\ntid number, otherwise tid 0 will be included in the all_tid result array.\n\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nLKML-Reference: \u003c4C185F68.1020505@cn.fujitsu.com\u003e\nSigned-off-by: Gui Jianfeng \u003cguijianfeng@cn.fujitsu.com\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "9fbd7f9d112e50dc7649d13de37bc92cb50c3905", "tree": "68a0c7cbe30731c52f7842d09bbf50b3c30a02e7", "parents": [ "bf4f42b441919417386beb2f9c58e802e7de89df", "476099a1b3950285013dd8df0869df6fceaf6579" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:37:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:37:12 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:\n watchdog: docs: add an entry for imx2_wdt\n" }, { "commit": "bf4f42b441919417386beb2f9c58e802e7de89df", "tree": "39fce2e84056f6c2d7cb1966289bfb52cd6ffdab", "parents": [ "1e31b0ffbb3b10133044e9c4bec4bd4b3f278229", "2f9c6b0a91a050669dd6df487174de6b96c2774a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)\n drm/radeon/kms: remove rv100 bios connector quirk\n drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode\n DRM / radeon / KMS: Fix hibernation regression related to radeon PM (was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300)\n drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)\n drm/radeon: add quirk to make HP nx6125 laptop resume.\n drm/radeon/kms: add some missing regs to evergreen gpu init\n drm/radeon/kms: fix typos in evergreen command checker\n drm/radeon/kms: avoid oops on mac r4xx cards\n fb: fix colliding defines for fb flags.\n drm/radeon/kms: Force HDP_NONSURF to maximum size\n drm/radeon/kms: disable frac fb dividers for rs6xx\n drm/radeon/kms: don\u0027t read attempt to read bios from VRAM on unposted GPU.\n drm/radeon/kms: fix typo in evergreen_gpu_init\n drm/radeon/kms: return ret in cursor_set failure path\n drm/ttm: non pooled page allocation should have GFP_USER set\n drm/radeon/r100/r200: fix calculation of compressed cube maps\n drm/radeon/r200: handle more hw tex coord types\n drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx\n drm/radeon: add fake RN50 table for powerpc\n drm/fb: Fix video\u003d mode computation\n ...\n" }, { "commit": "1e31b0ffbb3b10133044e9c4bec4bd4b3f278229", "tree": "a7b30dd35e1321b93e44ae107e7fe4c43ad8c20b", "parents": [ "980019d74e4b2428362b36a0506519d6d9460800", "b70f4e85bfc4d7000036355b714a92d5c574f1be" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:15 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] Fix spinaphore down_spin()\n" }, { "commit": "476099a1b3950285013dd8df0869df6fceaf6579", "tree": "afafd8ca1456f5b2057f2b827117aa5aa4a9ba16", "parents": [ "980019d74e4b2428362b36a0506519d6d9460800" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Thu Jun 24 09:43:25 2010 -0700" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Thu Jul 01 16:02:55 2010 +0000" }, "message": "watchdog: docs: add an entry for imx2_wdt\n\nAdd an entry for imx2_wdt in watchdog-parameters.txt\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n\n" }, { "commit": "00952d8f14447fccfb9560d98999f7489d4fd2df", "tree": "f57079c7ebaab24980249ea7cc23bc38db0f1425", "parents": [ "fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5", "4d5d85906ad109987504033fa04991f1b0a2e552" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 11:01:33 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 11:01:33 2010 +0100" }, "message": "Merge branch \u0027imx-for-2.6.35\u0027 of git://git.pengutronix.de/git/imx/linux-2.6\n" }, { "commit": "fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5", "tree": "1d3f38534ab1ac7672d0c33e5c7328f4f2c07f6b", "parents": [ "8954bb0da99b76c7ce5edf2f314807cff68b6ea8", "cdb4acc0568f4f6e10e778f0c2cd04fcd4786c09" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:16:00 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:16:04 2010 +0100" }, "message": "Merge branch \u0027fix\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6\n" }, { "commit": "8954bb0da99b76c7ce5edf2f314807cff68b6ea8", "tree": "e49721e0ff9e451fad2550d4aad4b38e176a0c85", "parents": [ "534be1d5a2da940ecc5e528992ea4ace8658157a" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Mon Jun 21 15:32:54 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:13:58 2010 +0100" }, "message": "ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU\n\nCPU performance event counters on v7 cores will only operate\nif either the NIDEN or DBGEN signals are driven high.\n\nFor the OMAP3 platform, these signals are driven low by default\nbut DBGEN can be asserted by selecting the OMAP3_EMU Kconfig option,\nwhich enables the virtual clock for hardware debugging peripherals.\n\nAcked-by: Jean Pihet \u003cjpihet@mvista.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "534be1d5a2da940ecc5e528992ea4ace8658157a", "tree": "8b6f7a75efd167ec05ee70ee3e0e900ce4e3ea4d", "parents": [ "cc9897df72ddea33762f9d24ecaa2b23ef0ad1b4" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Mon Jun 21 15:29:03 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:13:52 2010 +0100" }, "message": "ARM: 6194/1: change definition of cpu_relax() for ARM11MPCore\n\nLinux expects that if a CPU modifies a memory location, then that\nmodification will eventually become visible to other CPUs in the system.\n\nOn an ARM11MPCore processor, loads are prioritised over stores so it is\npossible for a store operation to be postponed if a polling loop immediately\nfollows it. If the variable being polled indirectly depends on the outstanding\nstore [for example, another CPU may be polling the variable that is pending\nmodification] then there is the potential for deadlock if interrupts are\ndisabled. This deadlock occurs in the KGDB testsuire when executing on an\nSMP ARM11MPCore configuration.\n\nThis patch changes the definition of cpu_relax() to smp_mb() for ARMv6 cores,\nforcing a flushing of the write buffer on SMP systems before the next load\ntakes place. If the Kernel is not compiled for SMP support, this will expand\nto a barrier() as before.\n\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "cc9897df72ddea33762f9d24ecaa2b23ef0ad1b4", "tree": "5a1cc9301837476230b5dbb9331562da2f892b7b", "parents": [ "cf0bb91b3ce7e42142ccea46232da19a9bbf28d5" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jun 21 15:12:40 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:13:46 2010 +0100" }, "message": "ARM: 6193/1: RealView: Align the machine_desc.phys_io to 1MB section\n\nWhen not aligned, random bits could be written in the initial page table\nby the __create_page_tables() function.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "cf0bb91b3ce7e42142ccea46232da19a9bbf28d5", "tree": "45c8c9403b519212211ee5bd5dd24040f3545617", "parents": [ "ad642d9f58f1af6e96efccb5f84e52c6d01db5c4" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jun 21 15:12:09 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:13:41 2010 +0100" }, "message": "ARM: 6192/1: VExpress: Align the machine_desc.phys_io to 1MB section\n\nWhen not aligned, random bits could be written in the initial page table\nby the __create_page_tables() function.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ad642d9f58f1af6e96efccb5f84e52c6d01db5c4", "tree": "4319ed1e81f50c7035457cc0fa1cf4bcdf760abb", "parents": [ "ca57926d53580f7c950496cb7ef6d7930610e1dd" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jun 21 15:10:07 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:12:31 2010 +0100" }, "message": "ARM: 6188/1: Add a config option for the ARM11MPCore DMA cache maintenance workaround\n\nCommit f4d6477f introduced a workaround for the lack of hardware\nbroadcasting of the cache maintenance operations on ARM11MPCore.\nHowever, the workaround is only valid on CPUs that do not do speculative\nloads into the D-cache.\n\nThis patch adds a Kconfig option with the corresponding help to make the\nabove clear. When the DMA_CACHE_RWFO option is disabled, the kernel\nbehaviour is that prior to the f4d6477f commit. This also allows ARMv6\nUP processors with speculative loads to work correctly.\n\nFor other processors, a different workaround may be needed.\n\nCc: Ronen Shitrit \u003crshitrit@marvell.com\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ca57926d53580f7c950496cb7ef6d7930610e1dd", "tree": "93a559372fcc905726c6e253e463d101a5916837", "parents": [ "a5e9d38b226686c89fd78413456535d5b66e8b1f" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jun 21 15:09:36 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:12:14 2010 +0100" }, "message": "ARM: 6187/1: The v6_dma_inv_range() function must preserve data on SMP\n\nA recent patch for DMA cache maintenance on ARM11MPCore added a write\nfor ownership trick to the v6_dma_inv_range() function. Such operation\ndestroys data already present in the buffer. However, this function is\nused with with dma_sync_single_for_device() which is supposed to\npreserve the existing data transfered into the buffer. This patch adds a\ncombination of read/write for ownership to preserve the original data.\n\nReported-by: Ronen Shitrit \u003crshitrit@marvell.com\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a5e9d38b226686c89fd78413456535d5b66e8b1f", "tree": "48a58b3a8630a8a436f3f4b57580ced6685ceaec", "parents": [ "980019d74e4b2428362b36a0506519d6d9460800" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jun 21 15:09:06 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 01 10:12:07 2010 +0100" }, "message": "ARM: 6186/1: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds\n\nThis macro is not defined when !CONFIG_MMU so this patch moves the\nCONSISTENT_* definitions to the CONFIG_MMU section.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4d5d85906ad109987504033fa04991f1b0a2e552", "tree": "10fe346842c54264637022f849208263d369db31", "parents": [ "980019d74e4b2428362b36a0506519d6d9460800" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Tue May 25 16:46:55 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu Jul 01 09:52:39 2010 +0200" }, "message": "ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI\n\narch/arm/mach-mx3/built-in.o: In function `mx31lilly_board_init\u0027:\nmach-kzm_arm11_01.c:(.init.text+0x674): undefined reference to `otg_ulpi_create\u0027\nmach-kzm_arm11_01.c:(.init.text+0x68c): undefined reference to `otg_ulpi_create\u0027\nmach-kzm_arm11_01.c:(.init.text+0x744): undefined reference to `mxc_ulpi_access_ops\u0027\nmake: *** [.tmp_vmlinux1] Error 1\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "8c215bd3890c347dfb6a2db4779755f8b9c298a9", "tree": "e6bd5de8a028babe9ec75f744977bd1424df106c", "parents": [ "9715856922bf8475f5428c29b6f4a9eebc97d391" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Thu Jul 01 09:07:17 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jul 01 09:39:48 2010 +0200" }, "message": "sched: Cure nr_iowait_cpu() users\n\nCommit 0224cf4c5e (sched: Intoduce get_cpu_iowait_time_us())\nbroke things by not making sure preemption was indeed disabled\nby the callers of nr_iowait_cpu() which took the iowait value of\nthe current cpu.\n\nThis resulted in a heap of preempt warnings. Cure this by making\nnr_iowait_cpu() take a cpu number and fix up the callers to pass\nin the right number.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arjan van de Ven \u003carjan@infradead.org\u003e\nCc: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: linux-pm@lists.linux-foundation.org\nLKML-Reference: \u003c1277968037.1868.120.camel@laptop\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "2f9c6b0a91a050669dd6df487174de6b96c2774a", "tree": "c46ac795d1d55720387a066ca45bdb6b5306840f", "parents": [ "773c3fa3a04bf6c9aa7147813beaab66f38e658f" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jun 30 13:04:08 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:47 2010 +1000" }, "message": "drm/radeon/kms: remove rv100 bios connector quirk\n\nSome RV100 cards with 2 VGA ports show up with DVI+VGA, however\nsome boards with DVI+VGA have the same subsystem ids. Better\nto have a VGA port show up as DVI than having a non-useable\nDVI port.\n\nreported by DHR in irc.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "773c3fa3a04bf6c9aa7147813beaab66f38e658f", "tree": "a7966c885cfecf8e9d5b2b1fa96fdd6a8a54f2cc", "parents": [ "3f53eb6f84545a7fc55a36657755371f42c63fca" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 25 16:21:27 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:46 2010 +1000" }, "message": "drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d28745\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nTested-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3f53eb6f84545a7fc55a36657755371f42c63fca", "tree": "2812536734e73a67a92e0b8755931b057ec6876d", "parents": [ "f892034a8ce80ed7098f667aae2eb6300e570603" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Jun 17 23:02:27 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:44 2010 +1000" }, "message": "DRM / radeon / KMS: Fix hibernation regression related to radeon PM (was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300)\n\nThere is a regression from 2.6.34 related to the recent radeon power\nmanagement changes, caused by attempting to cancel a delayed work\nitem that\u0027s never been scheduled. However, the code as is has some\nother issues potentially leading to visible problems.\n\nFirst, the mutex around cancel_delayed_work() in radeon_pm_suspend()\ndoesn\u0027t really serve any purpose, because cancel_delayed_work() only\ntries to delete the work\u0027s timer. Moreover, it doesn\u0027t prevent the\nwork handler from running, so the handler can do some wrong things if\nit wins the race and in that case it will rearm itself to do some\nmore wrong things going forward. So, I think it\u0027s better to wait for\nthe handler to return in case it\u0027s already been queued up for\nexecution. Also, it should be prevented from rearming itself in that\ncase.\n\nSecond, in radeon_set_pm_method() the cancel_delayed_work() is not\nsufficient to prevent the work handler from running and queing up\nitself for the next run (the failure scenario is that\ncancel_delayed_work() returns 0, so the handler is run, it waits on\nthe mutex and then rearms itself after the mutex has been released),\nso again the work handler should be prevented from rearming itself in\nthat case..\n\nFinally, there\u0027s a potential deadlock in radeon_pm_fini(), because\ncancel_delayed_work_sync() is called under rdev-\u003epm.mutex, but the\nwork handler tries to acquire the same mutex (if it wins the race).\n\nFix the issues described above.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f892034a8ce80ed7098f667aae2eb6300e570603", "tree": "0726b5dfb12cf3adfea88c5e9949c21528ff4ff2", "parents": [ "580b4fffbbdc3c899ee1f8189ba321bd60b48840" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jun 30 12:02:03 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:42 2010 +1000" }, "message": "drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)\n\nSome IGP systems specify the system memory clock in the Firmware\ntable rather than the IGP info table. Check both and make sure\nwe have a value system memory clock value.\n\nv2: make sure rs690_pm_info is called on rs780/rs880 as well.\n\nfixes a regression since 07d4190327b02ab3aaad25a2d168f79d92e8f8c2.\n\nReported-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nTested-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "580b4fffbbdc3c899ee1f8189ba321bd60b48840", "tree": "3d34858563fa16b53dcc1001600c3f1c7ae9e10a", "parents": [ "60a4a3e0ce0b575e8b4cb6bf39d2c40e403bdfc7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 30 13:26:11 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:41 2010 +1000" }, "message": "drm/radeon: add quirk to make HP nx6125 laptop resume.\n\nFor some reason on resume, executing the BIOS scripts locks up the whole chipset, by avoiding the dynclk table the machine resumes properly and seems to function okay.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "60a4a3e0ce0b575e8b4cb6bf39d2c40e403bdfc7", "tree": "af58938093ea63713691ebf264d6fd5a810248ee", "parents": [ "09d7e785f70e99abe4ec031c84f0a6a8b2d0be3a" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jun 29 17:03:35 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:39 2010 +1000" }, "message": "drm/radeon/kms: add some missing regs to evergreen gpu init\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "09d7e785f70e99abe4ec031c84f0a6a8b2d0be3a", "tree": "04df51aba838bf1f9f9ef05246373849b3259675", "parents": [ "07bb084c9306107204ef5691d4ce6f61213af6c2" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jun 23 18:27:11 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:38 2010 +1000" }, "message": "drm/radeon/kms: fix typos in evergreen command checker\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "07bb084c9306107204ef5691d4ce6f61213af6c2", "tree": "bcd6cf5bad2d19480972f0329ab4469cc5f54216", "parents": [ "b26c949755c06ec79e55a75817210083bd78fc9a" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jun 22 21:58:26 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:36 2010 +1000" }, "message": "drm/radeon/kms: avoid oops on mac r4xx cards\n\nThey don\u0027t have an atombios so don\u0027t attempt to use it for\neng/mem clocks.\n\nReported by spoonb on #radeon\nfixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d28671\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b26c949755c06ec79e55a75817210083bd78fc9a", "tree": "6ca63a7ca5f6f5130b223b6e4b1ae9606e4e940a", "parents": [ "46fcd2b3dbf58a448b621d3d2f492a0e90223a3a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 23 11:35:41 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:34 2010 +1000" }, "message": "fb: fix colliding defines for fb flags.\n\nWhen I added the flags I must have been using a 25 line terminal and missed the following flags.\n\nThe collided with flag has one user in staging despite being in-tree for 5 years.\n\nI\u0027m happy to push this via my drm tree unless someone really wants to do it.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "46fcd2b3dbf58a448b621d3d2f492a0e90223a3a", "tree": "7556faa44a723d7bf5a760139701fa3cadddcd6a", "parents": [ "2ff776cf77f1837a0397bc876e086e8a54274b09" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Jun 03 19:34:48 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:33 2010 +1000" }, "message": "drm/radeon/kms: Force HDP_NONSURF to maximum size\n\nHDP non surface should cover the whole VRAM but we were misscomputing\nthe size and we endup in some case not covering the VRAM at all (if\nVRAM size were \u003e 1G). Covering more than the VRAM size shouldn\u0027t be\nan issue.\n\nFix : https://bugs.freedesktop.org/show_bug.cgi?id\u003d28016\n\n[airlied: add evergreen fix]\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2ff776cf77f1837a0397bc876e086e8a54274b09", "tree": "a22a7e03e06059e379459bb77b2c7f82ff0b5be4", "parents": [ "8b5d8dec7c85b6f1a4ae9c57500f1378d79556bc" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jun 08 19:44:36 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:31 2010 +1000" }, "message": "drm/radeon/kms: disable frac fb dividers for rs6xx\n\nShould fix fdo bug 28331:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d28331\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8b5d8dec7c85b6f1a4ae9c57500f1378d79556bc", "tree": "96d21e708b964d0cc7f45c6c1d328265f487cceb", "parents": [ "f96b35cd6f499d1219e5c1aac95f818b3e566e67" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jun 21 13:31:38 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:30 2010 +1000" }, "message": "drm/radeon/kms: don\u0027t read attempt to read bios from VRAM on unposted GPU.\n\nSince the VGA switcheroo, we\u0027d attempt to read the BIOS from VRAM on startup\nbut on some unposted cards this can cause hangs/crashes.\n\nFixes: https://bugs.freedesktop.org/show_bug.cgi?id\u003d28592\n\n(further problem pointed out by agd5f on IGP systems)\n\nReported-by: Reilithion on #radeon\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f96b35cd6f499d1219e5c1aac95f818b3e566e67", "tree": "bae04a7de85f7918323645ddb510cefb14a0b0fb", "parents": [ "4cdb82b95a48a64e5c20bffd63a549675c0d4848" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jun 16 12:24:07 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:29 2010 +1000" }, "message": "drm/radeon/kms: fix typo in evergreen_gpu_init\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4cdb82b95a48a64e5c20bffd63a549675c0d4848", "tree": "079d3ecf29042df3483648b3f2b6b9cac1fb1662", "parents": [ "7c2a9acf856f150a9fc3efbaa0be44f97c30f6ca" ], "author": { "name": "Matt Turner", "email": "mattst88@gmail.com", "time": "Sat Jun 19 14:13:45 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:27 2010 +1000" }, "message": "drm/radeon/kms: return ret in cursor_set failure path\n\nWe were returning 0 in both the success and failure paths. Noticed while\ninvestigating FDO bug 26403.\n\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7c2a9acf856f150a9fc3efbaa0be44f97c30f6ca", "tree": "94813a39553bde0b645c988966ee244455c0035b", "parents": [ "37cf6b03f9f28c62dafb0b9ce5f1ba29c8baffa9" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Jun 16 10:45:22 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:25 2010 +1000" }, "message": "drm/ttm: non pooled page allocation should have GFP_USER set\n\nNon pooled page allocation should have GFP_USER set so allocation\ncan wait and reclaim page from other process (ie non atomic).\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "37cf6b03f9f28c62dafb0b9ce5f1ba29c8baffa9", "tree": "d2fa4e7498ea66e5ac62cf2a4f5fb419f5e9fa4f", "parents": [ "688acaa2897462e4c5e2482496e2868db0760809" ], "author": { "name": "Roland Scheidegger", "email": "sroland@vmware.com", "time": "Sat Jun 12 13:31:11 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:24 2010 +1000" }, "message": "drm/radeon/r100/r200: fix calculation of compressed cube maps\n\nThis needs similar handling to other compressed textures.\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d26428\n\nSigned-off-by: sroland@vmware.com\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "688acaa2897462e4c5e2482496e2868db0760809", "tree": "43ee073426a49f4a1b13c2509105412ed4052dc0", "parents": [ "f9da52d54eb0e8822b5e7f32ab1cfa6522533d6e" ], "author": { "name": "Roland Scheidegger", "email": "sroland@vmware.com", "time": "Sat Jun 12 13:31:10 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:22 2010 +1000" }, "message": "drm/radeon/r200: handle more hw tex coord types\n\nCode did not handle projected 2d and depth coordinates, meaning potentially\nset 3d or cube special handling might stick.\n(Not sure what depth coord actually does, but I guess handling it\nlike a normal coordinate is the right thing to do.)\nMight be related to https://bugs.freedesktop.org/show_bug.cgi?id\u003d26428\n\nSigned-off-by: sroland@vmware.com\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f9da52d54eb0e8822b5e7f32ab1cfa6522533d6e", "tree": "9d9dfaca731c0acea84e964467172e7f6b31496c", "parents": [ "76a7142a083434fe55b14f01aa2624733fea39b2" ], "author": { "name": "Roland Scheidegger", "email": "sroland@vmware.com", "time": "Sat Jun 12 12:12:37 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:21 2010 +1000" }, "message": "drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx\n\nfixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d28459\n\nagd5f: apply to r1xx/r2xx as well.\n\nSigned-off-by: Roland Scheidegger \u003csroland@vmware.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "76a7142a083434fe55b14f01aa2624733fea39b2", "tree": "efd249ee2112246fa2e8f7971133127326026fc4", "parents": [ "b829e011f6f9eed8c4dd41eaf02bdbb3a3ad837f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jun 11 01:09:05 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:19 2010 +1000" }, "message": "drm/radeon: add fake RN50 table for powerpc\n\nThis works well enough on a js21, but it would be nice if IBM could supply\nmore tables for the later Power6/7 machines.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b829e011f6f9eed8c4dd41eaf02bdbb3a3ad837f", "tree": "08040a57450e31d97452ffad9c0f18d389f0ed2d", "parents": [ "a5f798ce2b9de4b14c46cb68d58c488dc1b8e215" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Thu Jun 10 13:33:26 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:16 2010 +1000" }, "message": "drm/fb: Fix video\u003d mode computation\n\nReduced blanking is valid only when doing CVT modes. Also, generate GTF\nmodes unless CVT was requested; CVT devices are required to support GTF,\nbut the reverse is not true.\n\n[airlied: fix typo]\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a5f798ce2b9de4b14c46cb68d58c488dc1b8e215", "tree": "f6be58c946401b72f31341ee9412f5b66b88f5d5", "parents": [ "09bdf591f4724c7d0328d4d7b8808492addb5a28" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jun 10 17:06:01 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:14 2010 +1000" }, "message": "drm/radeon/kms: fix DP after DPMS cycle\n\nThe transmitter needs to be enabled before the link is trained.\n\nReported-By: Lars Doelle \u003clars.doelle@on-line.de\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "09bdf591f4724c7d0328d4d7b8808492addb5a28", "tree": "597042312ed210a01277f43e082b0bf15d085f4a", "parents": [ "0888e883ea5ff8fac27e813256d6c1eaede5a234" ], "author": { "name": "Cedric Godin", "email": "cedric.godin@skynet.be", "time": "Fri Jun 11 14:40:56 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:11 2010 +1000" }, "message": "drm/radeon/kms: fix dpms state on resume\n\nWhen suspending, we turn the display hw off, at resume the screen will stay black.\nThis patch turn it on. Fixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16180\n\nSigned-off-by: Cedric Godin \u003ccedric.godin@skynet.be\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0888e883ea5ff8fac27e813256d6c1eaede5a234", "tree": "1a1869ff70f3bfd5fc4d88dcd50dfbb18da5ab70", "parents": [ "1c48bc5f71cd7783e19fb8d9462be53f829be177" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Sat Jun 12 11:50:13 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:58:59 2010 +1000" }, "message": "drm/radeon/kms: fix bandwidth calculation when sideport is present\n\nFixes fdo bug 27529:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d27529\n\nReported-by: steckdenis@yahoo.fr\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "980019d74e4b2428362b36a0506519d6d9460800", "tree": "a71cc0452db76f6c5fdee2611d0d7d39f22f8e69", "parents": [ "9f2952dbcbc0a143cff19f2e44fc504901aad86f", "e10ac155828324c475637827d4c3525012391f02" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:45:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:45:59 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:\n Staging: rtl8192u_usb: Add LG device ID 043e:7a01\n Staging: rtl8192s_usb: Remove duplicate device ID\n Staging: rt2870: add device id for Zyxel NWD-270N\n Staging: comedi: fix read past end of array in cb_pcidda_attach()\n Staging: rtl8192su: add device ids\n Staging: rtl8192su: remove device ids\n Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2\n Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set\n Staging: wlags49_h2: add missing \u003clinux/string.h\u003e for strlen\n Staging: hv: fix hv_utils module to properly autoload\n staging: hv: Fix race condition on vmbus channel initialization\n Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case\n Staging: mrst-touchscreen: fix dereferencing free memory\n Staging: batman-adv: fix function prototype\n Staging: batman-adv: return -EFAULT on copy_to_user errors\n staging: usbip: usbip_common: kill rx thread on tx thread creation error.\n" }, { "commit": "9f2952dbcbc0a143cff19f2e44fc504901aad86f", "tree": "2294abc07403646fbb75d99e174be0f1edd62e52", "parents": [ "59e7648644d114094525081c3614acefffae8de4", "b894f60a232d552fc18b018271c2893f0b0c1c15" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:45:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:45:28 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits)\n USB: gadget: f_mass_storage: stale common-\u003efsg value bug fix\n USB: gadget: f_mass_storage: fixed fs descriptors not being updated\n USB: musb: Enable the maximum supported burst mode for DMA\n USB: musb: fix Blackfin ulpi stubs\n USB: MUSB: make non-OMAP platforms build with CONFIG_PM\u003dy\n USB: musb_core: make disconnect and suspend interrupts work again\n USB: obey the sysfs power/wakeup setting\n USB: gadget eth: Fix calculate CRC32 in EEM\n USB: qcserial: fix a memory leak in qcprobe error path\n USB: gadget/printer, fix sleep inside atomic\n USB: isp1362-hcd, fix double lock\n USB: serial: ftdi: correct merge conflict with CONTEC id\n USB: fix oops in usb_sg_init()\n USB: s3c2410: deactivate endpoints before gadget unbinding\n USB: ehci-mxc: bail out on transceiver problems\n USB: otg/ulpi: bail out on read errors\n usb: musb: Fix a bug by making suspend interrupt available in device mode\n USB: r8a66597: Fix failure in change of status\n USB: xHCI: Fix bug in link TRB activation change.\n USB: gadget: g_fs: possible invalid pointer reference bug fixed\n ...\n" }, { "commit": "59e7648644d114094525081c3614acefffae8de4", "tree": "6de8404f55b9655841ede013ca1c46f6c14c1ab5", "parents": [ "c01ec7b1ea61b1c7febfe09d7751a4d916194aaf", "8cd774ad30c22b9d89823f1f05d845f4cdaba9e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:45:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:45:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: cpm_uart: implement the cpm_uart_early_write() function for console poll\n" }, { "commit": "c01ec7b1ea61b1c7febfe09d7751a4d916194aaf", "tree": "0cb86fd908d91cfc78858e003de9eb43f0508cb0", "parents": [ "5e9772b95ba848516b2c76c11cf6f4aa4aa232a5", "41bd03ba0758a076671e5de35ed084535984143d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:44:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:44:21 2010 -0700" }, "message": "Merge branch \u0027omap-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6\n\n* \u0027omap-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:\n OMAP: hwmod: Fix the missing braces\n OMAP4: clock: Fix multi-omap boot with reset un-used clocks\n OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg\n omap: GPIO: fix auto-disable of debounce clock\n omap: DMTIMER: Ack pending interrupt always when stopping a timer\n omap: Stalker board: switch over to gpio_set_debounce\n omap: fix build failure due to missing include dma-mapping.h\n omap iommu: Fix Memory leak\n" }, { "commit": "5e9772b95ba848516b2c76c11cf6f4aa4aa232a5", "tree": "dd9ecb039d71448ddc597f6c01385f1ff644817f", "parents": [ "7a0ea09ad5352efce8fe79ed853150449903b9f5" ], "author": { "name": "Jes Sorensen", "email": "Jes.Sorensen@redhat.com", "time": "Wed Jun 30 15:37:38 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:43:44 2010 -0700" }, "message": "Add mdr as maintainer of qla1280 driver.\n\nAs discussed with Mike Reed, add him as the maintainer of the qla1280\ndriver as I no longer have any hardware and he is actively looking\nafter it.\n\nSigned-off-by: Jes Sorensen \u003cJes.Sorensen@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7a0ea09ad5352efce8fe79ed853150449903b9f5", "tree": "939829793ffb34a78f83b694a725e66dfc50cc16", "parents": [ "f4985dc714d7ab1920c5aa502b7f4073fa1b4177" ], "author": { "name": "Michal Hocko", "email": "mhocko@suse.cz", "time": "Wed Jun 30 09:51:19 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 30 15:43:44 2010 -0700" }, "message": "futex: futex_find_get_task remove credentails check\n\nfutex_find_get_task is currently used (through lookup_pi_state) from two\ncontexts, futex_requeue and futex_lock_pi_atomic. None of the paths\nlooks it needs the credentials check, though. Different (e)uids\nshouldn\u0027t matter at all because the only thing that is important for\nshared futex is the accessibility of the shared memory.\n\nThe credentail check results in glibc assert failure or process hang (if\nglibc is compiled without assert support) for shared robust pthread\nmutex with priority inheritance if a process tries to lock already held\nlock owned by a process with a different euid:\n\npthread_mutex_lock.c:312: __pthread_mutex_lock_full: Assertion `(-(e)) !\u003d 3 || !robust\u0027 failed.\n\nThe problem is that futex_lock_pi_atomic which is called when we try to\nlock already held lock checks the current holder (tid is stored in the\nfutex value) to get the PI state. It uses lookup_pi_state which in turn\ngets task struct from futex_find_get_task. ESRCH is returned either\nwhen the task is not found or if credentials check fails.\n\nfutex_lock_pi_atomic simply returns if it gets ESRCH. glibc code,\nhowever, doesn\u0027t expect that robust lock returns with ESRCH because it\nshould get either success or owner died.\n\nSigned-off-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: Darren Hart \u003cdvhltc@us.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Alexey Kuznetsov \u003ckuznet@ms2.inr.ac.ru\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b70f4e85bfc4d7000036355b714a92d5c574f1be", "tree": "284c14c836412acdd0572ef020499749bca602d8", "parents": [ "984bc9601f64fd341b8573021d7c999f1f1499a9" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Jun 30 10:46:16 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Jun 30 10:46:16 2010 -0700" }, "message": "[IA64] Fix spinaphore down_spin()\n\nTypo in down_spin() meant it only read the low 32 bits of the\n\"serve\" value, instead of the full 64 bits. This results in the\nsystem hanging when the values in ticket/serve get larger than\n32-bits. A big enough system running the right test can hit this\nin a just a few hours.\n\nBroken since 883a3acf5b0d4782ac35981227a0d094e8b44850\n [IA64] Re-implement spinaphores using ticket lock concepts\n\nReported via IRC by Bjorn Helgaas\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "e10ac155828324c475637827d4c3525012391f02", "tree": "68557f5cbcce2cb6fc588ee45d28594fa9230711", "parents": [ "081a52924623df3e550be8cd124b1416fc77b4f1" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Jun 25 01:35:49 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: rtl8192u_usb: Add LG device ID 043e:7a01\n\nAdd another device ID as listed in the vendor driver version\n0003.0825.2009.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "081a52924623df3e550be8cd124b1416fc77b4f1", "tree": "f400f5732ded47be9319fa6ea8048a258395796e", "parents": [ "9674e57a4fa9686c3ef4df5c194a4c445745d03f" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Jun 25 01:35:01 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: rtl8192s_usb: Remove duplicate device ID\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9674e57a4fa9686c3ef4df5c194a4c445745d03f", "tree": "8d53b016d4bdc3cb55cb7773b423922a5c9306e3", "parents": [ "821e67a135d8773c8e9c0b97088b2e64c3d0d631" ], "author": { "name": "Ozan Çağlayan", "email": "ozan@pardus.org.tr", "time": "Mon Jun 21 14:00:56 2010 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: rt2870: add device id for Zyxel NWD-270N\n\nAdd device id for Zyxel NWD-270N USB dongle.\n\nSigned-off-by: Ozan Çağlayan \u003cozan@pardus.org.tr\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "821e67a135d8773c8e9c0b97088b2e64c3d0d631", "tree": "ae5f85c583220fd2432a5d9f162143b2d0e1d309", "parents": [ "15d93ed070125d51693f102a0f94045dcaf30d9b" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Jun 21 08:49:25 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: comedi: fix read past end of array in cb_pcidda_attach()\n\nThere are only 6 elements in the cb_pcidda_boards[] array so the\noriginal code read past the end. After this change nothing uses N_BOARDS\nso I removed the definition.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "15d93ed070125d51693f102a0f94045dcaf30d9b", "tree": "8de4ec74d5a26f4f0c988541ce295adae001931b", "parents": [ "60b42de30ad6fb131dc8e9dbd11a8a9ea0ab394c" ], "author": { "name": "Florian Schilhabel", "email": "florian.c.schilhabel@googlemail.com", "time": "Tue Jun 08 03:47:13 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: rtl8192su: add device ids\n\nThis patch adds some device ids.\nThe list of supported devices was extracted from realteks driver package.\n(0x050d, 0x815F) and (0x0df6, 0x004b) are not in the official list of\nsupported devices and may not work correctly.\nIn case of problems with these, they should probably be removed from the list.\n\nSigned-off-by: Florian Schilhabel \u003cflorian.c.schilhabel@googlemail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "60b42de30ad6fb131dc8e9dbd11a8a9ea0ab394c", "tree": "0b0604142cb0e5b827da9dfa8db40ce19435ff54", "parents": [ "f84f927e081e16e1a4fcd92d28c3bc81c7b1864b" ], "author": { "name": "Florian Schilhabel", "email": "florian.c.schilhabel@googlemail.com", "time": "Tue Jun 08 03:46:26 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: rtl8192su: remove device ids\n\nThis patch removes some device-ids.\nThe list of unsupported devices was extracted from realteks driver package.\nremoved IDs are:\n(0x0bda, 0x8192)\n(0x0bda, 0x8709)\n(0x07aa, 0x0043)\n(0x050d, 0x805E)\n(0x0df6, 0x0031)\n(0x1740, 0x9201)\n(0x2001, 0x3301)\n(0x5a57, 0x0290)\nThese devices are _not_ rtl819su based.\n\nSigned-off-by: Florian Schilhabel \u003cflorian.c.schilhabel@googlemail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f84f927e081e16e1a4fcd92d28c3bc81c7b1864b", "tree": "6047b45b367c5a6911f126b6e886dd0e2044995b", "parents": [ "d268e0d28165340c3799a8a4944bc40f444f49fd" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Jun 07 12:00:44 2010 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2\n\nIn commit bbfb5652, the spacing in the definitions of eqMacAddr and cpMacAddr\nin drivers/staging/rtl8187se/r8180_core.c were changed to conform to kernel\nstandards. These definitions were duplicates of lines found in\ndrivers/staging/rtl8187se/ieee80211/dot11d.h. Once the change was made, the\nfollowing warnings were emitted:\n\n CC [M] drivers/staging/rtl8187se/r8180_core.o\ndrivers/staging/rtl8187se/r8180_core.c:69:0: warning: \"eqMacAddr\" redefined\ndrivers/staging/rtl8187se/ieee80211/dot11d.h:39:0: note: this is the location of the previous definition\ndrivers/staging/rtl8187se/r8180_core.c:70:0: warning: \"cpMacAddr\" redefined\ndrivers/staging/rtl8187se/ieee80211/dot11d.h:40:0: note: this is the location of the previous definition\n\nThe fix is to keep only the difinition in the header file.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "d268e0d28165340c3799a8a4944bc40f444f49fd", "tree": "756535d6d02bfc1a408a3c05f25fdc080095a825", "parents": [ "8174fc04e8e71b3969a45c9be288f6535d6b90d3" ], "author": { "name": "Javier Martinez Canillas", "email": "martinez.javier@gmail.com", "time": "Thu Jun 17 01:17:44 2010 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set\n\nI got a wlags49_h2 driver build error in linux-next when CONFIG_SYSFS is not set.\n\nCC [M] drivers/staging/wlags49_h2/wl_cs.o\nIn file included from drivers/staging/wlags49_h2/wl_cs.c:104:\ndrivers/staging/wlags49_h2/wl_sysfs.h: In function ‘register_wlags_sysfs’:\ndrivers/staging/wlags49_h2/wl_sysfs.h:5: error: parameter name omitted\ndrivers/staging/wlags49_h2/wl_sysfs.h: In function ‘unregister_wlags_sysfs’:\ndrivers/staging/wlags49_h2/wl_sysfs.h:6: error: parameter name omitted\nmake[1]: *** [drivers/staging/wlags49_h2/wl_cs.o] Error 1\nmake: *** [_module_drivers/staging/wlags49_h2] Error 2\n\nThis is due a wrong function definition (it does not include parameters names).\n\nSigned-off-by: Javier Martinez Canillas \u003cmartinez.javier@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "8174fc04e8e71b3969a45c9be288f6535d6b90d3", "tree": "677b4eec4f3f24afc4edba80e0ec16716ba22e9f", "parents": [ "d750785f305e03669757678c24cb4e6e8761edf0" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Wed Jun 09 16:01:10 2010 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: wlags49_h2: add missing \u003clinux/string.h\u003e for strlen\n\nOn ia64, the build fails with incompatible implicit definition of strlen.\nThis patch adds the \u003clinux/string.h\u003e include to get the real prototype.\n\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "d750785f305e03669757678c24cb4e6e8761edf0", "tree": "f38f08861ca00dcc5e2f4177920905f3315b3d02", "parents": [ "8b5d6d3bd3e34e4cc67d875c8c88007c1c9aa960" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Wed May 19 15:56:28 2010 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:15 2010 -0700" }, "message": "Staging: hv: fix hv_utils module to properly autoload\n\nAdded autoloading based on pci id and dmi strings.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nSigned-off-by: Hank Janssen \u003chjanssen@microsoft.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "8b5d6d3bd3e34e4cc67d875c8c88007c1c9aa960", "tree": "2f923d8299574a31799c14bfd9ecc10520ed9b02", "parents": [ "6c2fd308045ba902fbe9f4408daa7b949fa8f5a1" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Fri May 28 23:22:44 2010 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:14 2010 -0700" }, "message": "staging: hv: Fix race condition on vmbus channel initialization\n\nThere is a possible race condition when hv_utils starts to load immediately\nafter hv_vmbus is loading - null pointer error could happen.\nThis patch added wait/completion to ensure all channels are ready before\nvmbus loading completes. So another module won\u0027t have any uninitialized channel.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nSigned-off-by: Hank Janssen \u003chjanssen@microsoft.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "6c2fd308045ba902fbe9f4408daa7b949fa8f5a1", "tree": "f09e672e7f07666e217ae067c5ba043fbfdbe66e", "parents": [ "44176d9f8265de799512f833ca4d9785aa016b3a" ], "author": { "name": "Ian Abbott", "email": "abbotti@mev.co.uk", "time": "Fri Jun 18 12:11:28 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:14 2010 -0700" }, "message": "Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case\n\nI received a report that AI streaming acquisitions do not work properly\nfor the adl_pci9111 driver when convert_src is TRIG_TIMER and\nscan_begin_src is TRIG_FOLLOW (and scan_begin_arg is therefore 0). This\nseems to be down to the incorrect setting of dev_private-\u003escan_delay in\npci9111_ai_do_cmd(). Under the previously stated conditions,\ndev_private-\u003escan_delay ends up set to (unsigned int)-1, but it ought to\nbe set to 0. The function sets it to 0 initially, and it only makes\nsense to change it if both convert_src and scan_begin_src are set to\nTRIG_TIMER.\n\nNote: \u0027scan_delay\u0027 is the number of unwanted scans to discard after each\nvalid scan. The hardware does not support \u0027scan\u0027 timing as such, just a\nregularly paced conversion timer (with automatic channel switching\nbetween conversions). The driver simulates a scan period that is some\n(\u003e1) multiple of the conversion period times the scan length\n(chanlist_len samples) by reading chanlist_len samples and discarding\nthe next scan_delay times chanlist_len samples.\n\nSigned-off-by: Ian Abbott \u003cabbotti@mev.co.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "44176d9f8265de799512f833ca4d9785aa016b3a", "tree": "27a9f4c4ae81529e8cf2b1090dfca2d17e11869f", "parents": [ "eb169d1cc7fb219cc42c584f7a195f71913e6b6a" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Jun 05 19:16:42 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:14 2010 -0700" }, "message": "Staging: mrst-touchscreen: fix dereferencing free memory\n\nI moved the kfree() down a couple lines after the dereference.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" } ], "next": "eb169d1cc7fb219cc42c584f7a195f71913e6b6a" }