)]}' { "log": [ { "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": "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": "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": "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": "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": "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": "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": "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": "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": "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" }, { "commit": "eb169d1cc7fb219cc42c584f7a195f71913e6b6a", "tree": "916b2f7cf698b016c98c28718455bab6664eacfc", "parents": [ "25477f2398f39a35f110e02f6c7d8dd1023c47c1" ], "author": { "name": "Javier Martinez Canillas", "email": "martinez.javier@gmail.com", "time": "Sun Jun 06 21:03:05 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:14 2010 -0700" }, "message": "Staging: batman-adv: fix function prototype\n\nIn today linux-next I got a compile warning in staging/batman-adv.\n\nThis is due a struct bin_attribute read function prototype change and the driver was not updated.\n\nThis patch solves the issue\n\nSigned-off-by: Javier Martinez Canillas \u003cmartinez.javier@gmail.com\u003e\nSigned-off-by: Sven Eckelmann \u003csven.eckelmann@gmx.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "25477f2398f39a35f110e02f6c7d8dd1023c47c1", "tree": "ad312a0b0e687624d72cc035ae09c265fa8c4072", "parents": [ "f2102d31de1f0ddb9ced62d65d2ed89a5149ea39" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sun Jun 06 21:03:04 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:14 2010 -0700" }, "message": "Staging: batman-adv: return -EFAULT on copy_to_user errors\n\ncopy_to_user() returns the number of bites remaining but we want to\nreturn a negative error code here.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Sven Eckelmann \u003csven.eckelmann@gmx.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f2102d31de1f0ddb9ced62d65d2ed89a5149ea39", "tree": "b045f523d4699d735b952fdf7aa4a7f103852247", "parents": [ "93416253073511716f7e70c06e32c3810c3deac4" ], "author": { "name": "Himanshu Chauhan", "email": "hschauhan@nulltrace.org", "time": "Fri Jun 04 23:16:27 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:18:14 2010 -0700" }, "message": "staging: usbip: usbip_common: kill rx thread on tx thread creation error.\n\nSigned-off-by: Himanshu Chauhan \u003chschauhan@nulltrace.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b894f60a232d552fc18b018271c2893f0b0c1c15", "tree": "bfe023045f34f7af982bbde73a90f7b562976a2a", "parents": [ "e5fd39d9b80aaa0b8a16dd570fa55009905d6af4" ], "author": { "name": "Michal Nazarewicz", "email": "m.nazarewicz@samsung.com", "time": "Fri Jun 25 16:29:28 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:07 2010 -0700" }, "message": "USB: gadget: f_mass_storage: stale common-\u003efsg value bug fix\n\nOn fsg_unbind the common-\u003efsg pointer was not NULLed if the\nunbound fsg_dev instance was the current one. As an effect,\nthe incorrect pointer was preserved in all further operations\nwhich caused do_set_interface to reference an invalid region.\n\nThis commit fixes this by raising an exception in fsg_bind\nwhich will change the common-\u003efsg pointer. This also requires\nan wait queue so that the thread in fsg_bind can wait till the\nworker thread handles the exception.\n\nThis commit removes also a config and new_config fields of\nfsg_common as they are no longer needed since fsg can be\nused to determine whether function is active or not.\n\nMoreover, this commit removes possible race condition where\nthe fsg field was modified in both the worker thread and\nform various other contexts. This is fixed by replacing\nprev_fsg with new_fsg. At this point, fsg is assigned only\nin worker thread.\n\nSigned-off-by: Michal Nazarewicz \u003cm.nazarewicz@samsung.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e5fd39d9b80aaa0b8a16dd570fa55009905d6af4", "tree": "e74ed16e930d8c8a78c1733a7ae4138b29c09e33", "parents": [ "c0f1f8e38fda8e345cad9269c559b4f036378120" ], "author": { "name": "Michal Nazarewicz", "email": "m.nazarewicz@samsung.com", "time": "Fri Jun 25 16:29:26 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:07 2010 -0700" }, "message": "USB: gadget: f_mass_storage: fixed fs descriptors not being updated\n\nThe full speed descriptors were copied to the usb_function structure\nin the fsg_bind_config function before call to the usb_ep_autoconfig.\nThe usb_ep_autoconfig was called in fsg_bind using the original\ndescriptors. In effect copied descriptors were not updated.\n\nThis patch changes the copy full speed descriptors after the call to\nusb_op_autoconfig is performed. This way, copied full speed\ndescriptors have updated values.\n\nSigned-off-by: Michal Nazarewicz \u003cm.nazarewicz@samsung.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReported-by: Dries Van Puymbroeck \u003cDries.VanPuymbroeck@dekimo.com\u003e\nTested-by: Dries Van Puymbroeck \u003cDries.VanPuymbroeck@dekimo.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "c0f1f8e38fda8e345cad9269c559b4f036378120", "tree": "6eef1ab9ae7769b74ecf703da59dd4b4ea9cc209", "parents": [ "f2263db74a66f1e341efb115e9f2420678c927b9" ], "author": { "name": "Hema HK", "email": "hemahk@ti.com", "time": "Thu Jun 24 23:07:09 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:07 2010 -0700" }, "message": "USB: musb: Enable the maximum supported burst mode for DMA\n\nSetting MUSB Burst Mode 3 automatically enables support for\nlower burst modes (BURST4, BURST8, BURST16 or bursts of unspecified\nlength). There is no need to set these burst modes based on the\npacket size. Also enable the burst mode for both mode1 and mode0.\n\nThis is a fix for buggy hardware - having the lower burst modes\nenabled can potentially cause lockups of the DMA engine used in\nOMAP2/3/4 chips.\n\nSigned-off-by: Hema HK \u003chemahk@ti.com\u003e\nSigned-off-by: Anand Gadiyar \u003cgadiyar@ti.com\u003e\nSigned-off-by: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nAcked-by: Felipe Balbi \u003cfelipe.balbi@nokia.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f2263db74a66f1e341efb115e9f2420678c927b9", "tree": "34175a04758dc4f5b8f64ae694597f6f04917209", "parents": [ "9297688a9257d73956d4bba484d9dd331ca72c25" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Thu Jun 24 23:07:08 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:07 2010 -0700" }, "message": "USB: musb: fix Blackfin ulpi stubs\n\nThe new ulpi code defines fallback stubs for the Blackfin arch, but does\nso incorrectly leading to a build failure:\ndrivers/usb/musb/musb_core.c:227: error: \u0027musb_ulpi_read\u0027 undeclared here (not in a function)\ndrivers/usb/musb/musb_core.c:228: error: \u0027musb_ulpi_write\u0027 undeclared here (not in a function)\n\nTweak the fallback stubs so that they do work as intended.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nAcked-by: Felipe Balbi \u003cfelipe.balbi@nokia.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9297688a9257d73956d4bba484d9dd331ca72c25", "tree": "bcedff6abbaa414016a154256a6b2975c7f2356f", "parents": [ "7d9645fdca444d53907b22a4b73e3967efe09781" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Thu Jun 24 23:07:07 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:07 2010 -0700" }, "message": "USB: MUSB: make non-OMAP platforms build with CONFIG_PM\u003dy\n\nAttempt to build MUSB driver with CONFIG_PM\u003dy (e.g. in the OTG mode) on DaVinci\nresults in these link errors:\n\ndrivers/built-in.o: In function `musb_restore_context\u0027:\nled-triggers.c:(.text+0x714d8): undefined reference to\n`musb_platform_restore_context\u0027\ndrivers/built-in.o: In function `musb_save_context\u0027:\nled-triggers.c:(.text+0x71788): undefined reference to\n`musb_platform_save_context\u0027\n\nThis turned out to be caused by commit 9957dd97ec5e98dd334f87ade1d9a0b24d1f86eb\n(usb: musb: Fix compile error for omaps for musb_hdrc). Revert it, taking into\naccount the rename of CONFIG_ARCH_OMAP34XX into CONFIG_ARCH_OMAP3 (which that\ncommit fixed in a completely inappropriate way) and the recent addition of\nOMAP4 support.\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nAcked-by: Felipe Balbi \u003cfelipe.balbi@nokia.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "7d9645fdca444d53907b22a4b73e3967efe09781", "tree": "97f867cae533d3d02d1655d030d6398f2f0dbf96", "parents": [ "48826626263d4a61d06fd8c5805da31f925aefa0" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Thu Jun 24 23:07:06 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: musb_core: make disconnect and suspend interrupts work again\n\nCommit 1c25fda4a09e8229800979986ef399401053b46e (usb: musb: handle irqs in the\norder dictated by programming guide) forgot to get rid of the old \u0027STAGE0_MASK\u0027\nfilter for calling musb_stage0_irq(), so now disconnect and suspend interrupts\nare effectively ignored...\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nAcked-by: Felipe Balbi \u003cfelipe.balbi@nokia.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "48826626263d4a61d06fd8c5805da31f925aefa0", "tree": "8d00f7a24db086eed136d05d2bf07e37029b35ef", "parents": [ "03ab7461df3c74c9418c3f5485ea1127ece1ff79" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Tue Jun 22 16:14:48 2010 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: obey the sysfs power/wakeup setting\n\nThis patch (as1403) is a partial reversion of an earlier change\n(commit 5f677f1d45b2bf08085bbba7394392dfa586fa8e \"USB: fix remote\nwakeup settings during system sleep\"). After hearing from a user, I\nrealized that remote wakeup should be enabled during system sleep\nwhenever userspace allows it, and not only if a driver requests it\ntoo.\n\nIndeed, there could be a device with no driver, that does nothing but\ngenerate a wakeup request when the user presses a button. Such a\ndevice should be allowed to do its job.\n\nThe problem fixed by the earlier patch -- device generating a wakeup\nrequest for no reason, causing system suspend to abort -- was also\naddressed by a later patch (\"USB: don\u0027t enable remote wakeup by\ndefault\", accepted but not yet merged into mainline). The device\nwon\u0027t be able to generate the bogus wakeup requests because it will be\ndisabled for remote wakeup by default. Hence this reversion will not\nre-introduce any old problems.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: stable \u003cstable@kernel.org\u003e [.34]\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "03ab7461df3c74c9418c3f5485ea1127ece1ff79", "tree": "d0394ffeeb19872c467ef24e2866818afe0acfb8", "parents": [ "0d152de56938361fa2b960db67657b20cdaa6d84" ], "author": { "name": "Jiri Pinkava", "email": "jiri.pinkava@vscht.cz", "time": "Sun Jun 20 20:05:52 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: gadget eth: Fix calculate CRC32 in EEM\n\nCRC should be calculated for Ethernet frame, not for whole recievede EEM data.\nThis bug shows rarely, because in many times len \u003d\u003d skb-\u003elen.\n\nSigned-off-by: Jiri Pinkava \u003cjiri.pinkava@vscht.cz\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "0d152de56938361fa2b960db67657b20cdaa6d84", "tree": "bb5c65990a747423ef283fd56e9ff40444e26f9f", "parents": [ "10ca4425714a6115c5d865718d64874a1e1ea09a" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Mon Jun 21 08:44:17 2010 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: qcserial: fix a memory leak in qcprobe error path\n\nThis patch adds missing kfree(data) before return -ENODEV.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "10ca4425714a6115c5d865718d64874a1e1ea09a", "tree": "eac8a90e3b0b9436efe5c969510b22d2cdb657b5", "parents": [ "1c815577823951ff082fe1201fdd5efec5e6e8ea" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Jun 21 17:02:40 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: gadget/printer, fix sleep inside atomic\n\nStanse found that sleep is called inside atomic context created by\nlock_printer_io spinlock in several functions. It\u0027s used in process\ncontext only and some functions sleep inside its critical section. As\nthis is not allowed for spinlocks, switch it to mutex.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Craig W. Nadler \u003ccraig@nadler.us\u003e\nAcked-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "1c815577823951ff082fe1201fdd5efec5e6e8ea", "tree": "c1778655d43eeca6b7dc140b32d2fcb033b50db3", "parents": [ "9a49a14da4afe2c4ab7d7025a2f7f0f99a1c90e0" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Jun 21 17:02:51 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: isp1362-hcd, fix double lock\n\nStanse found that isp1362_sw_reset tries to take a isp1362_hcd-\u003elock,\nbut it is already held in isp1362_hc_stop. Avoid that by introducing\n__isp1362_sw_reset which doesn\u0027t take the lock and call it from\nisp1362_hc_stop. isp1362_sw_reset is then as simple as lock --\n__isp1362_sw_reset -- unlock.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Lothar Wassmann \u003cLW@KARO-electronics.de\u003e\nCc: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nCc: Bryan Wu \u003ccooloney@kernel.org\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9a49a14da4afe2c4ab7d7025a2f7f0f99a1c90e0", "tree": "08f9a79995e4ec461def50eac47aad51b1b30263", "parents": [ "64d65872f96e2a754caa12ef48949c314384bd9f" ], "author": { "name": "Daniel Sangorrin", "email": "daniel.sangorrin@gmail.com", "time": "Fri Jun 18 15:30:02 2010 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: serial: ftdi: correct merge conflict with CONTEC id\n\nThis patch corrects a problem with the merge of a previous\npatch to add the CONTEC identifier.\n\nI believe the merge problem occurred with the commit:\ndee5658b482e9e2ac7d6205dc876fc11d4008138\n\nOriginally I submitted a patch and then they asked me to order the IDs\nand resubmit, so did I. But unfortunately in the end somehow both\npatches were merged.\n\nSigned-off-by: Daniel Sangorrin \u003cdaniel.sangorrin@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "64d65872f96e2a754caa12ef48949c314384bd9f", "tree": "1fbd174ef9b2df672a68f81c960599c39b238286", "parents": [ "3b49d2315c119b9ae8a9a33b07d4eb7d194c01a7" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Fri Jun 18 10:16:33 2010 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: fix oops in usb_sg_init()\n\nThis patch (as1401) fixes a bug in usb_sg_init() that can cause an\ninvalid pointer dereference. An inner loop reuses some local variables\nin an unsafe manner, so new variables are introduced.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nTested-by: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "3b49d2315c119b9ae8a9a33b07d4eb7d194c01a7", "tree": "e1c0ab9b91219a1719d52c6fc824799139df0f9d", "parents": [ "4c9715de52b9b6256bf1e9510917111a47b0c176" ], "author": { "name": "Vladimir Zapolskiy", "email": "vzapolskiy@gmail.com", "time": "Fri Jun 18 08:25:00 2010 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: s3c2410: deactivate endpoints before gadget unbinding\n\nGadget disconnect must be called before unbinding to avoid races.\nThe change fixes an oops on g_ether module unregistering.\n\nSigned-off-by: Vladimir Zapolskiy \u003cvzapolskiy@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4c9715de52b9b6256bf1e9510917111a47b0c176", "tree": "214fb9be24541a2182e744b6b3834449435bd1e3", "parents": [ "7b4a036722cfab2b3922685ad473fac35a55c3fa" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Tue Jun 15 12:34:23 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: ehci-mxc: bail out on transceiver problems\n\nThe old code registered the hcd even if there were no transceivers\ndetected, leading to oopses like this if we try to probe a non-existant\nULPI:\n\n[ 2.730000] mxc-ehci mxc-ehci.0: unable to init transceiver\n[ 2.740000] timeout polling for ULPI device\n[ 2.740000] timeout polling for ULPI device\n[ 2.750000] mxc-ehci mxc-ehci.0: unable to enable vbus on transceiver\n[ 2.750000] mxc-ehci mxc-ehci.0: Freescale On-Chip EHCI Host Controller\n[ 2.760000] mxc-ehci mxc-ehci.0: new USB bus registered, assigned bus number 2\n[ 2.770000] Unhandled fault: external abort on non-linefetch (0x808) at 0xc4876184\n[ 2.770000] Internal error: : 808 [#1] PREEMPT\n[ 2.770000] last sysfs file:\n[ 2.770000] Modules linked in:\n[ 2.770000] CPU: 0 Not tainted (2.6.33.5 #5)\n[ 2.770000] PC is at ehci_hub_control+0x4d4/0x8f8\n[ 2.770000] LR is at ehci_mxc_setup+0xbc/0xdc\n[ 2.770000] pc : [\u003cc0196dfc\u003e] lr : [\u003cc019bc8c\u003e] psr: 00000093\n[ 2.770000] sp : c3815e40 ip : 00000001 fp : 60000013\n[ 2.770000] r10: c4876184 r9 : 00000000 r8 : c3814000\n[ 2.770000] r7 : c391d2cc r6 : 00000001 r5 : 00000001 r4 : 00000000\n[ 2.770000] r3 : 80000000 r2 : 00000007 r1 : 80000000 r0 : c4876184\n[ 2.770000] Flags: nzcv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel\n[ 2.770000] Control: 0005317f Table: a0004000 DAC: 00000017\n[ 2.770000] Process swapper (pid: 1, stack limit \u003d 0xc3814270)\n...\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: stable \u003cstable@kernel.org\u003e\nAcked-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "7b4a036722cfab2b3922685ad473fac35a55c3fa", "tree": "0f3bb015fce2f925c9fb4107dad82c3f6d0380ce", "parents": [ "2bb14cbf04ded4b9e394a6ba9e4f06b82fbac8b2" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Tue Jun 15 12:34:22 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:06 2010 -0700" }, "message": "USB: otg/ulpi: bail out on read errors\n\notg_read may return errnos, so bail out correctly to prevent bogus\nID-numbers.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nAcked-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "2bb14cbf04ded4b9e394a6ba9e4f06b82fbac8b2", "tree": "27cec8ec131107c3c4bd9a642905d1b2730bed29", "parents": [ "a5797a686f4c7cbced782959509d735cfa1344b1" ], "author": { "name": "Maulik Mankad", "email": "x0082077@ti.com", "time": "Tue Jun 15 14:40:27 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:05 2010 -0700" }, "message": "usb: musb: Fix a bug by making suspend interrupt available in device mode\n\nAs a part of aligning the ISR code for MUSB with the specs, the\nISR code was re-written. \n\nSee Commit 1c25fda4a09e8229800979986ef399401053b46e (usb: musb: handle \nirqs in the order dictated by programming guide)\n\nWith this the suspend interrupt came accidently under CONFIG_USB_MUSB_HDRC_HCD.\n\nThe fix brings suspend interrupt handling outside \nCONFIG_USB_MUSB_HDRC_HCD.\n\nSigned-off-by: Maulik Mankad \u003cx0082077@ti.com\u003e\nCc: David Brownell \u003cdavid-b@pacbell.net\u003e\nAcked-by: Felipe Balbi \u003cfelipe.balbi@nokia.com\u003e\nCc: stable \u003cstable@kernel.org\u003e [.34]\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "a5797a686f4c7cbced782959509d735cfa1344b1", "tree": "ca93aa75a2e3c8a86524f6aa3dd58ac4df54073a", "parents": [ "6cc30d85a5bf61248ff0e1f0e0f15fe718bae378" ], "author": { "name": "Nobuhiro Iwamatsu", "email": "nobuhiro.iwamatsu.yj@renesas.com", "time": "Mon Jun 07 16:55:56 2010 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:05 2010 -0700" }, "message": "USB: r8a66597: Fix failure in change of status\n\nIn the change by 749da5f82fe33ff68dd4aa1a5e35cd9aa6246dab,\nThe change in the status when the USB device is connected is wrong.\nTherefore, the device is not recognized.\n\nAcked-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCC: Yoshihiro Shimoda \u003cshimoda.yoshihiro@renesas.com\u003e\nCC: Paul Mundt\" \u003clethal@linux-sh.org\u003e\nSigned-off-by: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "6cc30d85a5bf61248ff0e1f0e0f15fe718bae378", "tree": "e456498c6b9932e78a6d406095606427902d65e3", "parents": [ "f588c0db39ca35f69f815dabe5682759daa25098" ], "author": { "name": "Sarah Sharp", "email": "sarah.a.sharp@linux.intel.com", "time": "Thu Jun 10 12:25:28 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:05 2010 -0700" }, "message": "USB: xHCI: Fix bug in link TRB activation change.\n\nCommit 6c12db90f19727c76990e7f4801c67a148b30111 introduced a bug for\ncontrol transfers. The patch was supposed to change when the link TRBs at\nthe end of each ring segment were given to the hardware. If a transfer\ndescriptor (TD) ended just before the link TRB, the code wouldn\u0027t give\nback the link TRB to the hardware; instead it would be given back in\nprepare_ring() just before the next TD was enqueued at the top of the\nring.\n\nUnfortunately, the code relied on checking the chain bit of the TRB to\ndetermine whether the TD ended just before the link TRB. It assumed that\nthe ring enqueuing code would call prepare_ring() before enqueuing the\nnext TD. However, control transfers are made of multiple TDs, and\nprepare_ring() is only called once before enqueuing two or three TDs.\n\nIf the first or second TD of the control transfer ended just before the\nlink TRB, then the code in inc_enq() would not move the enqueue pointer\npast the link TRB, and the link TRB would get overwritten. This would\ncause the xHCI driver to start writing to memory past the ring segment,\nand eventually the system would crash or hang.\n\nThe fix is to add a flag to inc_enq() that says whether the caller will\nenqueue more TDs before calling prepare_ring(). If the chain bit is\ncleared (meaning this is the last TRB in a TD), and the caller will not\nenqueue more TDs, then we defer giving back the link TRB.\n\nSigned-off-by: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f588c0db39ca35f69f815dabe5682759daa25098", "tree": "6dc88e41bb71c04cc8d6a1f21affd7e827edd075", "parents": [ "b23097b793081358a6d943263c91bae4c955c4e3" ], "author": { "name": "Michal Nazarewicz", "email": "m.nazarewicz@samsung.com", "time": "Mon Jun 14 10:43:34 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:05 2010 -0700" }, "message": "USB: gadget: g_fs: possible invalid pointer reference bug fixed\n\nDuring __gfs_do_config() some invalid pointers may be left\nin usb_configuration::interfaces array from previous calls\nto the __gfs_do_config() for the same configuration. This\nwill always happen if an user space function which has\na fewer then the last user space function registers itself.\nComposite\u0027s set_config() function that a pointer after the\nlast interface in usb_configuration::interface is NULL\nunless the array is full.\n\nThis patch makes the __gfs_do_config() make sure that if the\nusb_configuration::interface is not full then a pointer\nafter the last interface is NULL.\n\nSigned-off-by: Michal Nazarewicz \u003cm.nazarewicz@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b23097b793081358a6d943263c91bae4c955c4e3", "tree": "10537604461025c9983974be9b201b2af15bf003", "parents": [ "44a0c0190b500ee6bcfc0976fe540f65dee2cd67" ], "author": { "name": "Jon Povey", "email": "jon.povey@racelogic.co.uk", "time": "Mon Jun 14 19:42:10 2010 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:05 2010 -0700" }, "message": "USB: g_serial: fix tty cleanup on unload\n\nCall put_tty_driver() in cleanup function, to fix Oops when trying to open\ngadget serial char device after module unload.\n\nSigned-off-by: Jon Povey \u003cjon.povey@racelogic.co.uk\u003e\nAcked-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "44a0c0190b500ee6bcfc0976fe540f65dee2cd67", "tree": "9e76a7878e2dd19423dacf0d95238726f06a8be7", "parents": [ "93416253073511716f7e70c06e32c3810c3deac4" ], "author": { "name": "Jon Povey", "email": "jon.povey@racelogic.co.uk", "time": "Mon Jun 14 19:41:04 2010 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:16:05 2010 -0700" }, "message": "USB: g_serial: don\u0027t set low_latency flag\n\nNo longer set low_latency flag as it causes this warning backtrace:\n\n WARNING: at kernel/mutex.c:207 __mutex_lock_slowpath+0x6c/0x288()\n\nFix associated locking and wakeups.\n\nSigned-off-by: Jon Povey \u003cjon.povey@racelogic.co.uk\u003e\nCc: Maulik Mankad \u003cx0082077@ti.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nAcked-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "8cd774ad30c22b9d89823f1f05d845f4cdaba9e8", "tree": "d7fd2b83386a5763ebc8651b43afb797a4a6d2c0", "parents": [ "93416253073511716f7e70c06e32c3810c3deac4" ], "author": { "name": "Dongdong Deng", "email": "dongdong.deng@windriver.com", "time": "Thu Jun 17 11:13:40 2010 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jun 30 08:15:17 2010 -0700" }, "message": "serial: cpm_uart: implement the cpm_uart_early_write() function for console poll\n\nThe cpm_uart_early_write() function which was used for console poll\nisn\u0027t implemented in the cpm uart driver.\n\nImplementing this function both fixes the build when CONFIG_CONSOLE_POLL\nis set and allows kgdboc to work via the cpm uart.\n\nSigned-off-by: Dongdong Deng \u003cdongdong.deng@windriver.com\u003e\nReviewed-by: Bruce Ashfield \u003cbruce.ashfield@windriver.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "032093bd44ac935ed3792ef592f94497d491cd8b", "tree": "cf1185920e42c9c0c3475ca5fe468f03d0af54fe", "parents": [ "46c23d7f520e315dde86881b38ba92ebdf34ced5" ], "author": { "name": "Wan ZongShun", "email": "mcuos.com@gmail.com", "time": "Tue Jun 29 15:05:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:32 2010 -0700" }, "message": "drivers/video/nuc900fb.c: fix lcd build error\n\nFix a nuc900 lcd build error.\n\nSince the \u0027nuc900_driver_clksrc_div()\u0027 API cannot be merged into mainline\nsuccessfully, I removed this clock source selection hook in this driver.\nThis means nuc900 lcd driver has to select default clock source from the\nexternal crystal now.\n\nSigned-off-by: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nCc: Qiang Wang \u003crurality.wq@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "926b1e2ca35ccb3cbe0ea9b322c5330869b95046", "tree": "ae40cd7229adbc7720aee12eeb96d3aa4e56d3b9", "parents": [ "96fc3a45ea073136566f3c2676cad52f8b39a7df" ], "author": { "name": "David Brownell", "email": "david-b@pacbell.net", "time": "Tue Jun 29 15:05:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:32 2010 -0700" }, "message": "drivers/gpio is platform-neutral\n\nUpdate Kconfig and Makefile in drivers/gpio to discourage inappropriate\naddition of platform-specific code.\n\n[akpm@linux-foundation.org: fix tpyo]\nSigned-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "96fc3a45ea073136566f3c2676cad52f8b39a7df", "tree": "ce7d4a880f7ed5ec64f515e7d100aa473c088678", "parents": [ "a02875a67d745322801bafb5fa2c5e4e62c3ceab" ], "author": { "name": "Joakim Tjernlund", "email": "Joakim.Tjernlund@transmode.se", "time": "Tue Jun 29 15:05:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "rtc: fix ds1388 time corruption\n\nThe ds1307 driver misreads the ds1388 registers when checking for 12 or 24\nhour mode. Instead of checking the hour register it reads the minute\nregister. Therefore the driver thinks minutes \u003e\u003d 40 has the 12HR bit set\nand resets the minute register by zeroing the high bits. This results in\nminutes are reset to 0-9, jumping back in time 40 or 50 minutes. The time\njump is also written back to the RTC.\n\nSigned-off-by: Joakim Tjernlund \u003cJoakim.Tjernlund@transmode.se\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Paul Gortmaker \u003cp_gortmaker@yahoo.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8d1f66dc9b4f80a1441bc1c33efa98aca99e8813", "tree": "0876484c740e90568f9f0300f012e674622679c9", "parents": [ "5c0c165490e763eddcbb0b6c8c41ab5cc11ddea0" ], "author": { "name": "Martin Wilck", "email": "martin.wilck@ts.fujitsu.com", "time": "Tue Jun 29 15:05:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "ipmi: set schedule_timeout_wait() value back to one\n\nFix a regression introduced by ae74e823cb7d (\"ipmi: add parameter to limit\nCPU usage in kipmid\").\n\nSome systems were seeing CPU usage go up dramatically with the recent\nchanges to try to reduce timer usage in the IPMI driver. This was traced\ndown to schedule_timeout_interruptible(1) being changed to\nschedule_timeout_interruptbile(0). Revert that part of the change.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16147\n\nReported-by: Thomas Jarosch \u003cthomas.jarosch@intra2net.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nTested-by: Thomas Jarosch \u003cthomas.jarosch@intra2net.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.34.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "56480287f9776adc5b1a7a335ef62a9b9879ad7f", "tree": "74d6962b3e056fdf6303f7fc12f9e50b514faf11", "parents": [ "e05bd3367bd3d88715b53766f95bb3a8ec7ab59e" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Tue Jun 29 15:05:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "ipmi: make sure drivers were registered before unregistering them\n\nThe ipmi code will never register a PCI or Open Firmware driver if a\nhardcoded device is provided by the user by providing device addresses via\nthe module parameters. This can cause us to attempt to unregister a\ndriver that was never registered, resulting in an oops. Keep track of\nregistration in order to avoid this.\n\nFixes a post-2.6.34 regression.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nAcked-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "12c46b336540b483df10d794bdee5d2f1aa8e33a", "tree": "fed145696f2b1fc2474956a6cf9664d8ba091f85", "parents": [ "500ebb82b50194f97a53d17a152cfb734ced9f21" ], "author": { "name": "Andres Salomon", "email": "dilinger@queued.net", "time": "Tue Jun 29 15:05:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "lxfb: fix incorrect __init annotation\n\nWARNING: vmlinux.o(.data+0x196e8): Section mismatch in reference from the\nvariable lxfb_driver to the function .init.text:lxfb_probe() The variable\nlxfb_driver references the function __init lxfb_probe()\n\nThis changes lxfb_probe and friends to use __devinit, and also adds\n__devexit to lxfb_remove.\n\nSigned-off-by: Andres Salomon \u003cdilinger@queued.net\u003e\nCc: Jordan Crouse \u003cjordan.crouse@amd.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "500ebb82b50194f97a53d17a152cfb734ced9f21", "tree": "c66f970773552da4f51c2033ecdb3b77e6947001", "parents": [ "4d845ebf4cf9e985b1704b1f08b37f744b4ede13" ], "author": { "name": "Andres Salomon", "email": "dilinger@queued.net", "time": "Tue Jun 29 15:05:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "gxfb: fix incorrect __init annotation\n\nWARNING: vmlinux.o(.data+0x195d8): Section mismatch in reference from the\nvariable gxfb_driver to the function .init.text:gxfb_probe() The variable\ngxfb_driver references the function __init gxfb_probe()\n\nThis changes gxfb_probe and friends to use __devinit, and also adds\n__devexit to gxfb_remove.\n\nSigned-off-by: Andres Salomon \u003cdilinger@queued.net\u003e\nCc: Jordan Crouse \u003cjordan.crouse@amd.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "984bc9601f64fd341b8573021d7c999f1f1499a9", "tree": "06c616a6285b00d1e577902face3e8a986370b34", "parents": [ "57439f878afafefad8836ebf5c49da2a0a746105", "1b99973f1c82707e46e8cb9416865a1e955e8f8c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:42:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:42:52 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n block: Don\u0027t count_vm_events for discard bio in submit_bio.\n cfq: fix recursive call in cfq_blkiocg_update_completion_stats()\n cfq-iosched: Fixed boot warning with BLK_CGROUP\u003dy and CFQ_GROUP_IOSCHED\u003dn\n cfq: Don\u0027t allow queue merges for queues that have no process references\n block: fix DISCARD_BARRIER requests\n cciss: set SCSI max cmd len to 16, as default is wrong\n cpqarray: fix two more wrong section type\n cpqarray: fix wrong __init type on pci probe function\n drbd: Fixed a race between disk-attach and unexpected state changes\n writeback: fix pin_sb_for_writeback\n writeback: add missing requeue_io in writeback_inodes_wb\n writeback: simplify and split bdi_start_writeback\n writeback: simplify wakeup_flusher_threads\n writeback: fix writeback_inodes_wb from writeback_inodes_sb\n writeback: enforce s_umount locking in writeback_inodes_sb\n writeback: queue work on stack in writeback_inodes_sb\n writeback: fix writeback completion notifications\n" }, { "commit": "8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0", "tree": "4f5f771f66a9b223b116742a8a04019cad287a4f", "parents": [ "93416253073511716f7e70c06e32c3810c3deac4", "e0fb8c418520b41d57667befdb8861c46cdf69e0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:06:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:06:00 2010 -0700" }, "message": "Merge branch \u0027fixes\u0027 of ssh://master.kernel.org/~sfr/next-fixes\n\n* \u0027fixes\u0027 of ssh://master.kernel.org/~sfr/next-fixes:\n acpi: update gfp/slab.h includes\n ocfs2: update gfp/slab.h includes\n davinci: update gfp/slab.h includes\n arm: update gfp/slab.h includes\n v4l-dvb: update gfp/slab.h includes\n" } ], "next": "93416253073511716f7e70c06e32c3810c3deac4" }