)]}' { "log": [ { "commit": "d7a62cd0332115d4c7c4689abea0d889a30d8349", "tree": "ced474d2ff1959576ac55f760bbafbe1073af11a", "parents": [ "fb62c00a6d8942775abc23d1621db1252e2d93d1" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Fri Mar 04 14:04:33 2011 +1030" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 06 10:44:13 2011 -0800" }, "message": "virtio: console: Don\u0027t access vqs if device was unplugged\n\nIf a virtio-console device gets unplugged while a port is open, a\nsubsequent close() call on the port accesses vqs to free up buffers.\nThis can lead to a crash.\n\nThe buffers are already freed up as a result of the call to\nunplug_ports() from virtcons_remove(). The fix is to simply not access\nvq information if port-\u003eportdev is NULL.\n\nReported-by: juzhang \u003cjuzhang@redhat.com\u003e\nCC: stable@kernel.org\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8d1dc20e8d689c7e6a0a4d2c94e36a99d5793ecb", "tree": "a25396484b9e824179bbc8f657f895b9540a38ae", "parents": [ "3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 01 13:23:27 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 01 13:23:27 2011 -0800" }, "message": "Revert \"TPM: Long default timeout fix\"\n\nThis reverts commit c4ff4b829ef9e6353c0b133b7adb564a68054979.\n\nTed Ts\u0027o reports:\n\n \"TPM is working for me so I can log into employer\u0027s network in 2.6.37.\n It broke when I tried 2.6.38-rc6, with the following relevant lines\n from my dmesg:\n\n [ 11.081627] tpm_tis 00:0b: 1.2 TPM (device-id 0x0, rev-id 78)\n [ 25.734114] tpm_tis 00:0b: Operation Timed out\n [ 78.040949] tpm_tis 00:0b: Operation Timed out\n\n This caused me to get suspicious, especially since the _other_ TPM\n commit in 2.6.38 had already been reverted, so I tried reverting\n commit c4ff4b829e: \"TPM: Long default timeout fix\". With this commit\n reverted, my TPM on my Lenovo T410 is once again working.\"\n\nRequested-and-tested-by: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fbf92bea68830c12da9099d7c8a60812194efc4e", "tree": "110e2c2476ac98ae298b90881de1fd015ff33739", "parents": [ "ef3242859fae47e728b50b7ce3d17b201a71779a", "c2e0eb167070a6e9dcb49c84c13c79a30d672431" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 24 12:19:43 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 24 12:19:43 2011 +1000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:\n drm/i915: fix corruptions on i8xx due to relaxed fencing\n drm/i915: skip FDI \u0026 PCH enabling for DP_A\n agp/intel: Experiment with a 855GM GWB bit\n drm/i915: don\u0027t enable FDI \u0026 transcoder interrupts after all\n drm/i915: Ignore a hung GPU when flushing the framebuffer prior to a switch\n" }, { "commit": "49495d44dfa4ba76cf7d1ed8fe84746dd9552255", "tree": "bce82f11cf9630f7774e051d557596f96fac225c", "parents": [ "45e4039c3aea597ede44a264cea322908cdedfe9" ], "author": { "name": "Florian Mickler", "email": "florian@mickler.org", "time": "Mon Feb 07 23:29:31 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 18:29:17 2011 +1000" }, "message": "amd64-agp: fix crash at second module load\n\nThe module forgot to sometimes unregister some resources.\n\nThis fixes Bug #22882.\n\n[Patch updated to 2.6.38-rc3 by Randy Dunlap.]\nTested-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Florian Mickler \u003cflorian@mickler.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d8204a37baf5474d3154eb536c936369be2bd5c0", "tree": "eb598882870e1e21356a015a3634c5b68fc75e6a", "parents": [ "571020df6fae18623498d70d3f2331d9eb7ad2be", "33619f0d3ff715a2a5499520967d526ad931d70d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 22 09:26:54 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 22 09:26:54 2011 -0800" }, "message": "Merge branch \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: re-enable Zoomed Video support\n cm4000_cs: Fix undefined ops warning\n pcmcia vs. MECR on pxa25x/sa1111\n drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region\n" }, { "commit": "bdb8b975fc66e081c3f39be6267701f8226d11aa", "tree": "e4ff3068ea0844121372a3f88fa4d1f1a48edc35", "parents": [ "a36dbec57e9a665d69cd2e1a673153ddb2d62785" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Dec 22 11:37:09 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Feb 22 15:52:41 2011 +0000" }, "message": "agp/intel: Experiment with a 855GM GWB bit\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d27187\nTested-by: Thorsten Vollmer \u003cthorsten@thvo.de\u003e (DFI-ACP G5M150-N w/852GME)\nTested-by: Moritz Brunner \u003c2points@gmx.org\u003e (Asus M2400N/i855GM)\nTested-by: Indan Zupancic \u003cindan@nul.nu\u003e (Thinkpad X40/855GM rev 02)\nTested-by: Eric Anholt \u003ceric@anholt.net\u003e (865G)\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e58713724059da7d2982d6ad945192c8fca5b729", "tree": "f22d77710dd461242e084ffbbfcf2fd4600cbd7b", "parents": [ "b4c9bfab2ec7389d42fdc39093959f533e7b4281" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 20 10:03:12 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 20 10:03:12 2011 -0800" }, "message": "Revert \"tpm_tis: Use timeouts returned from TPM\"\n\nThis reverts commit 9b29050f8f75916f974a2d231ae5d3cd59792296.\n\nIt has caused hibernate regressions, for example Juri Sladby\u0027s report:\n\n \"I\u0027m unable to hibernate 2.6.37.1 unless I rmmod tpm_tis:\n [10974.074587] Suspending console(s) (use no_console_suspend to debug)\n [10974.103073] tpm_tis 00:0c: Operation Timed out\n [10974.103089] legacy_suspend(): pnp_bus_suspend+0x0/0xa0 returns -62\n [10974.103095] PM: Device 00:0c failed to freeze: error -62\"\n\nand Rafael points out that some of the new conditionals in that commit\nseem to make no sense. This commit needs more work and testing, let\u0027s\nrevert it for now.\n\nReported-by: Norbert Preining \u003cpreining@logic.at\u003e\nReported-and-requested-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nCc: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "644e6e4a7fa6b11d59f24032997d90ea0d858d03", "tree": "25b41d2f2f8c7a2f125acd3a3ae0882b5b2cfe15", "parents": [ "5b703683b6cc3cb97bbe6b1b14898b273eb59279" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Feb 01 15:46:05 2011 +0000" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Feb 19 12:22:36 2011 +0100" }, "message": "cm4000_cs: Fix undefined ops warning\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "d5bb2923cfa0a29c5854f9618703ff60849b949e", "tree": "f18fe2fb2976d13885ed175e5d5ea7983a69b454", "parents": [ "85e2efbb1db9a18d218006706d6e4fbeb0216213" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sun Feb 13 13:12:10 2011 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Feb 19 12:22:16 2011 +0100" }, "message": "drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region\n\nRequest_region should be used with release_region, not release_resource.\n\nThis patch contains a number of changes, related to calls to request_region,\nrequest_mem_region, and the associated error handling code.\n\n1. For the call to request_region, the variable io_resource storing the\nresult is dropped. The call to release_resource at the end of the function\nis changed to a call to release_region with the first two arguments of\nrequest_region as its arguments. The same call to release_region is also\nadded to release_ipwireless.\n\n2. The first call to request_mem_region is now tested and ret is set to\n-EBUSY if the the call has failed. This call was associated with the\ninitialization of ipw-\u003eattr_memory. But the error handling code was\ntesting ipw-\u003ecommon_memory. The definition of release_ipwireless also\nsuggests that this call should be associated with ipw-\u003ecommon_memory, not\nipw-\u003eattr_memory.\n\n3. The second call to request_mem_region is now tested and ret is\nset to -EBUSY if the the call has failed.\n\n4. The various gotos to the error handling code is adjusted so that there\nis no need for ifs.\n\n5. Return the value stored in the ret variable rather than -1.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression x,E;\n@@\n(\n*x \u003d request_region(...)\n|\n*x \u003d request_mem_region(...)\n)\n... when !\u003d release_region(x)\n when !\u003d x \u003d E\n* release_resource(x);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "deabb19ba4bd8c06ae69bc262e3594b515e3a459", "tree": "abcc4d7204948bdbe304bb372339903078d277ce", "parents": [ "d2478521afc20227658a10a8c5c2bf1a2aa615b3", "9b29050f8f75916f974a2d231ae5d3cd59792296" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 11 17:34:47 2011 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 11 17:34:47 2011 +1100" }, "message": "Merge branch \u0027for-james\u0027 of git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd into for-linus\n" }, { "commit": "9b29050f8f75916f974a2d231ae5d3cd59792296", "tree": "e556ea7e22297756159a1c564ed576671c419fb8", "parents": [ "d3d373e0e3f51f335d8c722dd1340ab812fdf94b" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Tue Jan 11 14:37:29 2011 -0500" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Fri Feb 11 01:30:50 2011 -0200" }, "message": "tpm_tis: Use timeouts returned from TPM\n\nThe current TPM TIS driver in git discards the timeout values returned\nfrom the TPM. The check of the response packet needs to consider that\nthe return_code field is 0 on success and the size of the expected\npacket is equivalent to the header size + u32 length indicator for the\nTPM_GetCapability() result + 3 timeout indicators of type u32.\n\nI am also adding a sysfs entry \u0027timeouts\u0027 showing the timeouts that are\nbeing used.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "d2478521afc20227658a10a8c5c2bf1a2aa615b3", "tree": "4131c840f6a01061a3dd65264ed2497178960df8", "parents": [ "ee24aebffb75a7f940cf52c8cf6910947b3130c0" ], "author": { "name": "Corey Minyard", "email": "minyard@acm.org", "time": "Thu Feb 10 16:08:38 2011 -0600" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 18:00:21 2011 -0800" }, "message": "char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driver\n\nThis patch fixes an OOPS triggered when calling modprobe ipmi_si a\nsecond time after the first modprobe returned without finding any ipmi\ndevices. This can happen if you reload the module after having the\nfirst module load fail. The driver was not deregistering from PNP in\nthat case.\n\nPeter Huewe originally reported this patch and supplied a fix, I have a\ndifferent patch based on Linus\u0027 suggestion that cleans things up a bit\nmore.\n\nCc: stable@kernel.org\nCc: openipmi-developer@lists.sourceforge.net\nReviewed-by: Peter Huewe \u003cpeterhuewe@gmx.de\u003e\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ce86d35d2fd119d777fc72736732c8c9c3456698", "tree": "531b2077d9db6b44285ad75196672b4d102e8f20", "parents": [ "b477958314796f51c54829dbaea89b1f46dabd06", "0f66e50af53d39edebf4bc64ef90077e738c171f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:19:58 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:19:58 2011 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: bfin_5xx: split uart RX lock from uart port lock to avoid deadlock\n 68360serial: Plumb in rs_360_get_icount()\n n_gsm: copy mtu over when configuring via ioctl interface\n virtio: console: Move file back to drivers/char/\n" }, { "commit": "a70b95c017e8b518e1e069853355e4e497453dbb", "tree": "c4264dc861b449f83fc40d9fb942083c5d985870", "parents": [ "cecd1455bc9cbd9568036f502ee8ded0a64354a7" ], "author": { "name": "Stephen Kitt", "email": "steve@sk2.org", "time": "Mon Jan 31 14:25:43 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 09:43:57 2011 +1000" }, "message": "agp: ensure GART has an address before enabling it\n\nSome BIOSs (eg. the AMI BIOS on the Asus P4P800 motherboard) don\u0027t\ninitialise the GART address, and pcibios_assign_resources() can ignore it\nbecause it can be marked as a host bridge (see\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d24392#c5 for details). This\nwas handled correctly up to 2.6.35, but the pci_enable_device() cleanup in\n2.6.36 96576a9e1a0cdb8 (\"agp: intel-agp: do not use PCI resources before\npci_enable_device()\") means that the kernel tries to enable the GART\nbefore assigning it an address; in such cases the GART overlaps with other\ndevice assignments and ends up being disabled.\n\nThis patch fixes https://bugzilla.kernel.org/show_bug.cgi?id\u003d24392\n\nNote that I imagine efficeon-agp.c probably has the same problem, but\nI can\u0027t test that and I\u0027d like to make sure this patch is suitable for\n-stable (since 2.6.36 and 2.6.37 are affected).\n\nSigned-off-by: Stephen Kitt \u003csteve@sk2.org\u003e\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nCc: Maciej Rutecki \u003cmaciej.rutecki@gmail.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nCc: Florian Mickler \u003cflorian@mickler.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cecd1455bc9cbd9568036f502ee8ded0a64354a7", "tree": "213995f8c44b3cb854e95123297c5c3b381123ad", "parents": [ "4b863b3d3e9b11bb7588b88d13faed75f7711d09" ], "author": { "name": "Matt Turner", "email": "mattst88@gmail.com", "time": "Tue Feb 01 11:54:15 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 09:42:25 2011 +1000" }, "message": "Revert \"agp: AMD AGP is used on UP1100 \u0026 UP1500 alpha boxen\"\n\nThis reverts commit f191f144079b0083c6fa7d01a4acbd7263fb5032.\n\nThe AMD 751 and 761 chipsets are used on the UP1000, UP1100, and UP1500\nOEM motherboards, but they neglect to do anything to make AGP work.\n\nAccording to Ivan Kokshaysky:\nThere is quite fundamental conflict between the Alpha architecture and\nx86 AGP implementation - Alpha is entirely cache coherent by design,\nwhile x86 AGP is not (I mean native AGP DMA transactions, not a PCI over\nAGP). There are no such things as non-cacheable mappings or software\nsupport for cache flushing/invalidation on Alpha, so x86 AGP code won\u0027t\nwork on Nautilus.\n\nSo there\u0027s no point in allowing this driver to be configured on Alpha.\n\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4b863b3d3e9b11bb7588b88d13faed75f7711d09", "tree": "c5bae6bda0f2b494cba416224018c5cf37b724f0", "parents": [ "18ff84da29b3f0c073e0ce6e341663cc6bcb0ab7" ], "author": { "name": "Matt Turner", "email": "mattst88@gmail.com", "time": "Tue Feb 01 11:54:16 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 09:42:24 2011 +1000" }, "message": "amd-k7-agp: remove non-x86 code\n\namd-k7-agp can\u0027t be built on Alpha anymore, so remove now unnecessary\ncode.\n\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "51df0acc3d76cf41d5496ef044cc5717ab5c7f71", "tree": "414f9c3934d96213b0c092ad91f2c81469d84520", "parents": [ "ebf53826e105f488f4f628703a108e98940d1dc5" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Tue Feb 01 09:31:25 2011 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 14:43:12 2011 -0800" }, "message": "virtio: console: Move file back to drivers/char/\n\nCommit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c\nto drivers/tty/hvc/ under the perception of this being an hvc driver.\nIt was such once, but these days it has generic communication\ncapabilities as well, so move it to drivers/char/.\n\nIn the future, the hvc part from this file can be split off and moved\nunder drivers/tty/hvc/.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nCC: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff", "tree": "e2d3f799e20e2cbca80891ea17af7484f21d628f", "parents": [ "3689456b4bd36027022b3215eb2acba51cd0e6b5" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Tue Jan 25 15:07:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 10:50:06 2011 +1000" }, "message": "console: rename acquire/release_console_sem() to console_lock/unlock()\n\nThe -rt patches change the console_semaphore to console_mutex. As a\nresult, a quite large chunk of the patches changes all\nacquire/release_console_sem() to acquire/release_console_mutex()\n\nThis commit makes things use more neutral function names which dont make\nimplications about the underlying lock.\n\nThe only real change is the return value of console_trylock which is\ninverted from try_acquire_console_sem()\n\nThis patch also paves the way to switching console_sem from a semaphore to\na mutex.\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Thomas Gleixner \u003ctglx@tglx.de\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8a327f23e23fa509e6e3c2263ae1cc0a67dec387", "tree": "119abf09e1ec9babaf78e6889187f9d54864b118", "parents": [ "5a9a8d1a99c617df82339456fbdd30d6ed3a856b", "d315777b32a4696feb86f2a0c9e9f39c94683649" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 23 17:22:16 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:27:32 2011 +0000" }, "message": "Merge remote branch \u0027linus/master\u0027 into drm-intel-fixes\n\nMerge with Linus to resolve conflicting fixes for the reusing the stale\nHEAD value during intel_ring_wait().\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_ringbuffer.c\n" }, { "commit": "bee4a186c16bed0d7e91425ca9356c2e8c015f8d", "tree": "66d01e18c48fb0dfd9970c169d0f5baa0adaa0fe", "parents": [ "934f992c763ae1e5eefcce8af769c16444085df7" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 21 10:54:32 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:26:25 2011 +0000" }, "message": "drm/i915,agp/intel: Do not clear stolen entries\n\nWe can only utilize the stolen portion of the GTT if we are in sole\ncharge of the hardware. This is only true if using GEM and KMS,\notherwise VESA continues to access stolen memory.\n\nReported-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nReported-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nTested-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nTested-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e5cce6c13c25d9ac56955a3ae2fd562719848172", "tree": "29ed2e65da52bda2d16a77425102f3a8813fcef1", "parents": [ "c4ff4b829ef9e6353c0b133b7adb564a68054979" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 06 21:24:01 2011 -0600" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 24 11:29:55 2011 +1100" }, "message": "tpm: fix panic caused by \"tpm: Autodetect itpm devices\"\n\ncommit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 adds a check for\nPNP device id to the common tpm_tis_init() function, which in some\ncases (force\u003d1) will be called without the device being a member of\na pnp_dev. Oopsing and panics ensue.\n\nMove the test up to before the call to tpm_tis_init(), since it\njust modifies a global variable anyway.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c4ff4b829ef9e6353c0b133b7adb564a68054979", "tree": "0b32c7b91763144ea587e2965f5a401eea3d537c", "parents": [ "5403110943a2dcf1f96416d7a412a8b46895facd" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Fri Nov 12 22:30:02 2010 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 24 11:22:48 2011 +1100" }, "message": "TPM: Long default timeout fix\n\nIf duration variable value is 0 at this point, it\u0027s because\nchip-\u003evendor.duration wasn\u0027t filled by tpm_get_timeouts() yet.\nThis patch sets then the lowest timeout just to give enough\ntime for tpm_get_timeouts() to further succeed.\n\nThis fix avoids long boot times in case another entity attempts\nto send commands to the TPM when the TPM isn\u0027t accessible.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "8d99641f6c1af806cd5d9e6badce91910219a161", "tree": "ee841f807005a4a6234f6f502a13185d13a34870", "parents": [ "fc887b15d935ead2a00aef5779a18034e7c69ee1", "225c8e010f2d17a62aef131e24c6e7c111f36f9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:14 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:14 2011 -0800" }, "message": "Merge branch \u0027akpm\u0027\n\n* akpm:\n kernel/smp.c: consolidate writes in smp_call_function_interrupt()\n kernel/smp.c: fix smp_call_function_many() SMP race\n memcg: correctly order reading PCG_USED and pc-\u003emem_cgroup\n backlight: fix 88pm860x_bl macro collision\n drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking\n MAINTAINERS: update Atmel AT91 entry\n mm: fix truncate_setsize() comment\n memcg: fix rmdir, force_empty with THP\n memcg: fix LRU accounting with THP\n memcg: fix USED bit handling at uncharge in THP\n memcg: modify accounting function for supporting THP better\n fs/direct-io.c: don\u0027t try to allocate more than BIO_MAX_PAGES in a bio\n mm: compaction: prevent division-by-zero during user-requested compaction\n mm/vmscan.c: remove duplicate include of compaction.h\n memblock: fix memblock_is_region_memory()\n thp: keep highpte mapped until it is no longer needed\n kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc887b15d935ead2a00aef5779a18034e7c69ee1", "tree": "30daa1c9bafbf179047047c67d11ccd98e27d809", "parents": [ "466c19063b4b426d5c362572787cb249fbf4296b", "df6212529c646710502657b18d8f42927f3dda81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 16:39:23 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 16:39:23 2011 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n tty: update MAINTAINERS file due to driver movement\n tty: move drivers/serial/ to drivers/tty/serial/\n tty: move hvc drivers to drivers/tty/hvc/\n" }, { "commit": "891cc2283216bf76f387546f0e220caf8ce9fbf9", "tree": "b9ff8012a509fedf74834cee23adf9e0b3d8e5ad", "parents": [ "d73b388459b1ee2e80f8ff9c1916d75640d7d920", "22ab70d3262ddb6e69b3c246a34e2967ba5eb1e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 10:30:09 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 10:30:09 2011 -0800" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:\n drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS\n agp/intel: Fix device names of i845 and 845G\n drm/i915: Disable GPU semaphores on SandyBridge mobile\n drm/i915/execbuffer: Clear domains before beginning reloc processing\n drm/i915/execbuffer: Reorder relocations to match new object order\n drm/i915: Fix error handler to capture the first batch after the seqno\n drm/i915: Add a module option to override the use of SSC\n drm/i915/panel: The backlight is enabled if the current value is non-zero\n drm/i915/debugfs: Correct format after changing type of err object \u0027size\u0027\n" }, { "commit": "53371edaef692bef7eee8070bd680401ccf65706", "tree": "a3169f2beded4d250a19e674ea5ec46b5c29cd61", "parents": [ "1591192d3a17adeebd03be0ce5888b88bddfaf89" ], "author": { "name": "Oswald Buddenhagen", "email": "ossi@kde.org", "time": "Sat Jun 19 23:08:37 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 14 16:36:19 2011 +0000" }, "message": "agp/intel: Fix device names of i845 and 845G\n\nThey got mixed up when the switch was converted to a table in 2007.\n\nSigned-off-by: Oswald Buddenhagen \u003cossi@kde.org\u003e\n[ickle: minor changes for 2.6.37+]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "52cfd503ad7176d23a5dd7af3981744feb60622f", "tree": "0a8aeaaf4acbc86ac682f18632b8070c1c6b7ba1", "parents": [ "dc8e7e3ec60bd5ef7868aa88755e9d4c948dc5cc", "4263d9a3ae4d15785897d0543bb59316c84ee605" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 20:15:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 20:15:35 2011 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (59 commits)\n ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework\n ACPI: fix resource check message\n ACPI / Battery: Update information on info notification and resume\n ACPI: Drop device flag wake_capable\n ACPI: Always check if _PRW is present before trying to evaluate it\n ACPI / PM: Check status of power resources under mutexes\n ACPI / PM: Rename acpi_power_off_device()\n ACPI / PM: Drop acpi_power_nocheck\n ACPI / PM: Drop acpi_bus_get_power()\n Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()\n ACPI / Fan: Rework the handling of power resources\n ACPI / PM: Register power resource devices as soon as they are needed\n ACPI / PM: Register acpi_power_driver early\n ACPI / PM: Add function for updating device power state consistently\n ACPI / PM: Add function for device power state initialization\n ACPI / PM: Introduce __acpi_bus_get_power()\n ACPI / PM: Introduce function for refcounting device power resources\n ACPI / PM: Add functions for manipulating lists of power resources\n ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes\n ACPICA: Update version to 20101209\n ...\n" }, { "commit": "ab4382d27412e7e3e7c936e8d50d8888dfac3df8", "tree": "51d96dea2431140358784b6b426715f37f74fd53", "parents": [ "728674a7e466628df2aeec6d11a2ae1ef968fb67" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 13 12:10:18 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 13 12:10:18 2011 -0800" }, "message": "tty: move drivers/serial/ to drivers/tty/serial/\n\nThe serial drivers are really just tty drivers, so move them to\ndrivers/tty/ to make things a bit neater overall.\n\nThis is part of the tty/serial driver movement proceedure as proposed by\nArnd Bergmann and approved by everyone involved a number of months ago.\n\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Rogier Wolff \u003cR.E.Wolff@bitwizard.nl\u003e\nCc: Michael H. Warfield \u003cmhw@wittsend.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "728674a7e466628df2aeec6d11a2ae1ef968fb67", "tree": "83d2e44d05b257ab03230f5c95e0d6843f0ed2f9", "parents": [ "e691d24e9c5007486bef59c589c2a2d784e0c30b" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 13 12:03:00 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 13 12:03:00 2011 -0800" }, "message": "tty: move hvc drivers to drivers/tty/hvc/\n\nAs requested by Arnd Bergmann, the hvc drivers are now\nmoved to the drivers/tty/hvc/ directory. The virtio_console.c driver\nwas also moved, as it required the hvc_console.h file to be able to be\nbuilt, and it really is a hvc driver.\n\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "275220f0fcff1adf28a717076e00f575edf05fda", "tree": "d249bccc80c64443dab211639050c4fb14332648", "parents": [ "fe3c560b8a22cb28e54fe8950abef38e88d75831", "81c5e2ae33c4b19e53966b427e33646bf6811830" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:45:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:45:01 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.38/core\u0027 of git://git.kernel.dk/linux-2.6-block: (43 commits)\n block: ensure that completion error gets properly traced\n blktrace: add missing probe argument to block_bio_complete\n block cfq: don\u0027t use atomic_t for cfq_group\n block cfq: don\u0027t use atomic_t for cfq_queue\n block: trace event block fix unassigned field\n block: add internal hd part table references\n block: fix accounting bug on cross partition merges\n kref: add kref_test_and_get\n bio-integrity: mark kintegrityd_wq highpri and CPU intensive\n block: make kblockd_workqueue smarter\n Revert \"sd: implement sd_check_events()\"\n block: Clean up exit_io_context() source code.\n Fix compile warnings due to missing removal of a \u0027ret\u0027 variable\n fs/block: type signature of major_to_index(int) to major_to_index(unsigned)\n block: convert !IS_ERR(p) \u0026\u0026 p to !IS_ERR_NOR_NULL(p)\n cfq-iosched: don\u0027t check cfqg in choose_service_tree()\n fs/splice: Pull buf-\u003eops-\u003econfirm() from splice_from_pipe actors\n cdrom: export cdrom_check_events()\n sd: implement sd_check_events()\n sr: implement sr_check_events()\n ...\n" }, { "commit": "27d189c02ba25851973c8582e419c0bded9f7e5b", "tree": "be142d664bc4e3cec7ab2878a243343f46e897ee", "parents": [ "a1703154200c390ab03c10224c586e815d3e31e8", "55db8387a5e8d07407f0b7c6b2526417a2bc6243" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:58 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:58 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)\n hwrng: via_rng - Fix memory scribbling on some CPUs\n crypto: padlock - Move padlock.h into include/crypto\n hwrng: via_rng - Fix asm constraints\n crypto: n2 - use __devexit not __exit in n2_unregister_algs\n crypto: mark crypto workqueues CPU_INTENSIVE\n crypto: mv_cesa - dont return PTR_ERR() of wrong pointer\n crypto: ripemd - Set module author and update email address\n crypto: omap-sham - backlog handling fix\n crypto: gf128mul - Remove experimental tag\n crypto: af_alg - fix af_alg memory_allocated data type\n crypto: aesni-intel - Fixed build with binutils 2.16\n crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets\n net: Add missing lockdep class names for af_alg\n include: Install linux/if_alg.h for user-space crypto API\n crypto: omap-aes - checkpatch --file warning fixes\n crypto: omap-aes - initialize aes module once per request\n crypto: omap-aes - unnecessary code removed\n crypto: omap-aes - error handling implementation improved\n crypto: omap-aes - redundant locking is removed\n crypto: omap-aes - DMA initialization fixes for OMAP off mode\n ...\n" }, { "commit": "264b795fbd055f57b445eb3d58cfc51d6b10b22e", "tree": "7511840b71b0c5736b9d679f6adac632ecde64ce", "parents": [ "6f772fe65c7aa1a4679739d885775f07492a6eea" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Jan 12 17:01:11 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 08:03:23 2011 -0800" }, "message": "ramoops: fix types, remove typecasts\n\nCc: Ahmed S. Darwish \u003cdarwish.07@gmail.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Marco Stornelli \u003cmarco.stornelli@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": "cf8e9086de5daf14dbf0be9efef7d2793f256693", "tree": "19559f0e71a4c861141ae561719540ae62623fd8", "parents": [ "7637c9259f7b6dd841471ccf1120d484b7364f99" ], "author": { "name": "Andres Salomon", "email": "dilinger@queued.net", "time": "Wed Jan 12 17:00:12 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 08:03:13 2011 -0800" }, "message": "cs5535: deprecate older cs5535_gpio driver\n\nThe newer drivers/gpio/cs5535-gpio.c replaces drivers/misc/cs5535_gpio.c.\nThe new driver has been in the tree for a little while, and has received\nsome testing; it\u0027s time to mark the old one as deprecated. I\u0027m thinking\nremoval around 2.6.40 would be good, provided we\u0027re not missing critical\nfunctionality in the newer driver.\n\nSigned-off-by: Andres Salomon \u003cdilinger@queued.net\u003e\nCc: Daniel Drake \u003cdsd@laptop.org\u003e\nAcked-by: Ben Gardner \u003cbgardner@wabtec.com\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc2d557c74dc58294b9acc7231a2113ae59af97c", "tree": "b64baa29ab089936c7d11faa94d593b303d2d1cf", "parents": [ "0388fae4115dcfc310ac7327a8ac72786987c26e" ], "author": { "name": "Seiji Aguchi", "email": "seiji.aguchi@hds.com", "time": "Wed Jan 12 16:59:29 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 08:03:07 2011 -0800" }, "message": "kmsg_dump: constrain mtdoops and ramoops to perform their actions only for KMSG_DUMP_PANIC\n\nThis series aims to develop logging facility for enterprise use.\n\nIt is important to save kernel messages reliably on enterprise system\nbecause they are helpful for diagnosing system.\n\nThis series add kmsg_dump() to the paths loosing kernel messages. The use\ncase is the following.\n\n[Use case of reboot/poweroff/halt/emergency_restart]\n\n My company has often experienced the followings in our support service.\n - Customer\u0027s system suddenly reboots.\n - Customers ask us to investigate the reason of the reboot.\n\nWe recognize the fact itself because boot messages remain in\n/var/log/messages. However, we can\u0027t investigate the reason why the\nsystem rebooted, because the last messages don\u0027t remain. And off course\nwe can\u0027t explain the reason.\n\nWe can solve above problem with this patch as follows.\n\n Case1: reboot with command\n - We can see \"Restarting system with command:\" or \"\"Restarting system.\".\n\n Case2: halt with command\n - We can see \"System halted.\".\n\n Case3: poweroff with command\n - We can see \" Power down.\".\n\n Case4: emergency_restart with sysrq.\n - We can see \"Sysrq:\" outputted in __handle_sysrq().\n\n Case5: emergency_restart with softdog.\n - We can see \"Initiating system reboot\" in watchdog_fire().\n\nSo, we can distinguish the reason of reboot, poweroff, halt and emergency_restart.\n\nIf customer executed reboot command, you may think the customer should\nknow the fact. However, they often claim they don\u0027t execute the command\nwhen they rebooted system by mistake.\n\nNo message remains on the current Linux kernel, so we can\u0027t show the proof\nto the customer. This patch improves this situation.\n\nThis patch:\n\nAlters mtdoops and ramoops to perform their actions only for\nKMSG_DUMP_PANIC, KMSG_DUMP_OOPS and KMSG_DUMP_KEXEC because they would\nlike to log crashes only.\n\nSigned-off-by: Seiji Aguchi \u003cseiji.aguchi@hds.com\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nReviewed-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4b63bd35eb4e7959b0f7be17634689d34311524b", "tree": "2dad174e4ef8cbe5ef86541a8496b5f97dcf35d1", "parents": [ "03b6e6e58d9dd5f3068288653810db3c15fde929", "e92b297cc72ade7a58eaec7e01c906d856f8ab6e" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 12 05:03:13 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 12 05:03:13 2011 -0500" }, "message": "Merge branch \u0027ipmi\u0027 into release\n" }, { "commit": "8b6cd8ad18def34bfc5045b2a0234329bf94cf78", "tree": "659d2951081b7dd2c09fe63bc569da5555795bbd", "parents": [ "3a37898d507794cfc68a092303e02651d3f01308" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Mon Dec 13 13:38:46 2010 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 12 04:24:41 2011 -0500" }, "message": "ACPICA: New GPE handler callback definition\n\nThe new GPE handler callback has 2 additional parameters, gpe_device and\ngpe_number.\n\ntypedef\nu32 (*acpi_gpe_handler) (acpi_handle gpe_device, u32 gpe_number, void *context);\n\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d15eda5c6edff4987af6f4423af0bab0c3251e74", "tree": "87400cdc5f74d1258b6456b88beaf6fc3dc5f97a", "parents": [ "a46f3108b1cd8bf11d46ac8a5f30df6f6dbdf738" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 12 11:39:48 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 12 11:39:48 2011 +1000" }, "message": "i915/gtt: fix ordering causing DMAR errors on object teardown.\n\nPrevious to the last GTT rework we always rewrote the GTT then unmapped the\nobject, somehow this got reversed in the rework in 2.6.37-rc5 timeframe.\n\nThis fix needs to go to stable in an alternate form since the code changed.\n\nThis fixes DMAR reports on my Ironlake HP2540p.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a46f3108b1cd8bf11d46ac8a5f30df6f6dbdf738", "tree": "49d7731e7c1250f28a44aa8d3e62c43292e4bef3", "parents": [ "784fe39fa80d557847baeca2695915d17b09827f" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 12 11:38:37 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 12 11:38:37 2011 +1000" }, "message": "i915/gtt: fix ordering issues with status setup and DMAR\n\nThis code was setting up the status page before setting the DMAR-is-on-bit,\nso we were getting DMAR errors on the status page. Reverse the two bits\nof init code to the correct result.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "784fe39fa80d557847baeca2695915d17b09827f", "tree": "a258083fb42459b6f5415e397c0ce551713fc1ed", "parents": [ "4162cf64973df51fc885825bc9ca4d055891c49f", "6fe4f14044f181e146cdc15485428f95fa541ce8" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 12 10:49:03 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 12 10:49:03 2011 +1000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel\n\n* \u0027drm-intel-fixes\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: (37 commits)\n drm/i915/execbuffer: Reorder binding of objects to favour restrictions\n drm/i915: If we hit OOM when allocating GTT pages, clear the aperture\n drm/i915/evict: Ensure we completely cleanup on failure\n drm/i915/execbuffer: Correctly clear the current object list upon EFAULT\n drm/i915/debugfs: Show all objects in the gtt\n drm/i915: Record AGP memory type upon error\n drm/i915: Periodically flush the active lists and requests\n drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT\n drm/i915: Record the error batchbuffer on each ring\n drm/i915: Include TLB miss overhead for computing WM\n drm/i915: Propagate error from flushing the ring\n drm/i915: detect \u0026 report PCH display error interrupts\n drm/i915: cleanup rc6 code\n drm/i915: fix rc6 enabling around suspend/resume\n drm/i915: re-enable rc6 support for Ironlake+\n drm/i915: Make the ring IMR handling private\n drm/i915/ringbuffer: Simplify the ring irq refcounting\n drm/i915/debugfs: Show the per-ring IMR\n drm/i915: Mask USER interrupts on gen6 (until required)\n drm/i915: Handle ringbuffer stalls when flushing\n ...\n" }, { "commit": "5a62f995446be44811fefa48f91f9efb7ea172d7", "tree": "e297371f0d513dc6278bb67d582d2216eb7d74ed", "parents": [ "f1d6d6cd9029daa7e7d4a0b14347b5392320f22a", "5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:31:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:31:41 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)\n powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA\n powerpc/pseries: Fix VPHN build errors on non-SMP systems\n powerpc/83xx: add mpc8308_p1m DMA controller device-tree node\n powerpc/83xx: add DMA controller to mpc8308 device-tree node\n powerpc/512x: try to free dma descriptors in case of allocation failure\n powerpc/512x: add MPC8308 dma support\n powerpc/512x: fix the hanged dma transfer issue\n powerpc/512x: scatter/gather dma fix\n powerpc/powermac: Make auto-loading of therm_pm72 possible\n of/address: Use propper endianess in get_flags\n powerpc/pci: Use printf extension %pR for struct resource\n powerpc: Remove unnecessary casts of void ptr\n powerpc: Disable VPHN polling during a suspend operation\n powerpc/pseries: Poll VPA for topology changes and update NUMA maps\n powerpc: iommu: Add device name to iommu error printks\n powerpc: Record vma-\u003ephys_addr in ioremap()\n powerpc: Update compat_arch_ptrace\n powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S\n powerpc/time: printk time stamp init not correct\n powerpc: Minor cleanups for machdep.h\n ...\n" }, { "commit": "c97689d8860f086125e7ff9cd730027a0057ca4f", "tree": "019ab7330af6c975ffba0d7016e0ed6243fbf6b0", "parents": [ "55249baaa5cd188ebd9acdb047eeaed8092e4a93" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Dec 23 10:40:38 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 11 20:35:41 2011 +0000" }, "message": "agp/intel: Flush the chipset write buffers when changing GTT base\n\nFlush the chipset write buffers before and after adjusting the GTT base\nregister, just in case. We only modify this value upon initialisation\n(boot and resume) so there should be no outstanding writes, however\nthere are always those persistent PGTBL_ER that keep getting reported\nupon resume.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "42776163e13a56ea3096edff7a5df95408e80eb4", "tree": "92f17bb5dadc7261b2d9238244cd8d4cb6c1bfd7", "parents": [ "edb2877f4a62647e36e20839a786f94d688a06ed", "3d03e2ea74103a50c23d6ab1906cf73399c0dafb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 11:02:13 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 11:02:13 2011 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)\n perf session: Fix infinite loop in __perf_session__process_events\n perf evsel: Support perf_evsel__open(cpus \u003e 1 \u0026\u0026 threads \u003e 1)\n perf sched: Use PTHREAD_STACK_MIN to avoid pthread_attr_setstacksize() fail\n perf tools: Emit clearer message for sys_perf_event_open ENOENT return\n perf stat: better error message for unsupported events\n perf sched: Fix allocation result check\n perf, x86: P4 PMU - Fix unflagged overflows handling\n dynamic debug: Fix build issue with older gcc\n tracing: Fix TRACE_EVENT power tracepoint creation\n tracing: Fix preempt count leak\n tracepoint: Add __rcu annotation\n tracing: remove duplicate null-pointer check in skb tracepoint\n tracing/trivial: Add missing comma in TRACE_EVENT comment\n tracing: Include module.h in define_trace.h\n x86: Save rbp in pt_regs on irq entry\n x86, dumpstack: Fix unused variable warning\n x86, NMI: Clean-up default_do_nmi()\n x86, NMI: Allow NMI reason io port (0x61) to be processed on any CPU\n x86, NMI: Remove DIE_NMI_IPI\n x86, NMI: Add priorities to handlers\n ...\n" }, { "commit": "eed0ba0b4ab2d1668588219a8efa81bf8636a12d", "tree": "f5aa3c732e7830a1b24e6071f8bed0f799881187", "parents": [ "98b14d6b290d96b24ae993ceaccc59b2aa4b130c", "c9de9333f5a860cab82052bce6ac28bcac9b2c26" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jan 11 15:10:08 2011 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jan 11 15:10:08 2011 +1100" }, "message": "Merge remote branch \u0027gcl/next\u0027 into next\n" }, { "commit": "5b2eef966cb2ae307aa4ef1767f7307774bc96ca", "tree": "095a251e145903598dd8d90d5b2eb880f0d6ff93", "parents": [ "8adbf8d46718a8f110de55ec82c40d04d0c362cc", "56bec7c009872ef33fe452ea75fecba481351b44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 17:11:39 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 17:11:39 2011 -0800" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (390 commits)\n drm/radeon/kms: disable underscan by default\n drm/radeon/kms: only enable hdmi features if the monitor supports audio\n drm: Restore the old_fb upon modeset failure\n drm/nouveau: fix hwmon device binding\n radeon: consolidate asic-specific function decls for pre-r600\n vga_switcheroo: comparing too few characters in strncmp()\n drm/radeon/kms: add NI pci ids\n drm/radeon/kms: don\u0027t enable pcie gen2 on NI yet\n drm/radeon/kms: add radeon_asic struct for NI asics\n drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init\n drm/radeon/kms: add ucode loader for NI\n drm/radeon/kms: add support for DCE5 display LUTs\n drm/radeon/kms: add ni_reg.h\n drm/radeon/kms: add bo blit support for NI\n drm/radeon/kms: always use writeback/events for fences on NI\n drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5\n drm/radeon/kms: add backend map workaround for barts\n drm/radeon/kms: fill gpu init for NI asics\n drm/radeon/kms: add disabled vbios accessor for NI asics\n drm/radeon/kms: handle NI thermal controller\n ...\n" }, { "commit": "e0e736fc0d33861335e2a132e4f688f7fd380c61", "tree": "d9febe9ca1ef1e24efc5e6e1e34e412316d246bd", "parents": [ "a08948812b30653eb2c536ae613b635a989feb6f", "aeda4ac3efc29e4d55989abd0a73530453aa69ba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 11:18:59 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 11:18:59 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 commits)\n MAINTAINERS: Add tomoyo-dev-en ML.\n SELinux: define permissions for DCB netlink messages\n encrypted-keys: style and other cleanup\n encrypted-keys: verify datablob size before converting to binary\n trusted-keys: kzalloc and other cleanup\n trusted-keys: additional TSS return code and other error handling\n syslog: check cap_syslog when dmesg_restrict\n Smack: Transmute labels on specified directories\n selinux: cache sidtab_context_to_sid results\n SELinux: do not compute transition labels on mountpoint labeled filesystems\n This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running.\n SELinux: merge policydb_index_classes and policydb_index_others\n selinux: convert part of the sym_val_to_name array to use flex_array\n selinux: convert type_val_to_struct to flex_array\n flex_array: fix flex_array_put_ptr macro to be valid C\n SELinux: do not set automatic i_ino in selinuxfs\n selinux: rework security_netlbl_secattr_to_sid\n SELinux: standardize return code handling in selinuxfs.c\n SELinux: standardize return code handling in selinuxfs.c\n SELinux: standardize return code handling in policydb.c\n ...\n" }, { "commit": "0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281", "tree": "7d9732bcf5f2f646cb0c2c529c48b454b15d4ae2", "parents": [ "57cc7215b70856dc6bae8e55b00ecd7b1d7429b1", "a081748735c5feb96b1365e78a5ff0fb6ca7e3a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 08:57:03 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 08:57:03 2011 -0800" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (29 commits)\n of/flattree: forward declare struct device_node in of_fdt.h\n ipmi: explicitly include of_address.h and of_irq.h\n sparc: explicitly cast negative phandle checks to s32\n powerpc/405: Fix missing #{address,size}-cells in i2c node\n powerpc/5200: dts: refactor dts files\n powerpc/5200: dts: Change combatible strings on localbus\n powerpc/5200: dts: remove unused properties\n powerpc/5200: dts: rename nodes to prepare for refactoring dts files\n of/flattree: Update dtc to current mainline.\n of/device: Don\u0027t register disabled devices\n powerpc/dts: fix syntax bugs in bluestone.dts\n of: Fixes for OF probing on little endian systems\n of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF\n of/flattree: Add of_flat_dt_match() helper function\n of_serial: explicitly include of_irq.h\n of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree\n of/flattree: Reorder unflatten_dt_node\n of/flattree: Refactor unflatten_dt_node\n of/flattree: Add non-boottime device tree functions\n of/flattree: Add Kconfig for EARLY_FLATTREE\n ...\n\nFix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.\n" }, { "commit": "57cc7215b70856dc6bae8e55b00ecd7b1d7429b1", "tree": "f6dedefd41e6745a9b801166b99af7d830e41ef2", "parents": [ "37721e1b0cf98cb65895f234d8c500d270546529" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Jan 10 08:18:25 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 08:51:44 2011 -0800" }, "message": "headers: kobject.h redux\n\nRemove kobject.h from files which don\u0027t need it, notably,\nsched.h and fs.h.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d2e7ad19229f982fc1eb731827d82ceac90abfb3", "tree": "98a3741b4d4b27a48b3c7ea9babe331e539416a8", "parents": [ "d03a5d888fb688c832d470b749acc5ed38e0bc1d", "0c21e3aaf6ae85bee804a325aa29c325209180fd" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 10 09:46:24 2011 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 10 09:46:24 2011 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tsecurity/smack/smack_lsm.c\n\nVerified and added fix by Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nOk\u0027d by Casey Schaufler \u003ccasey@schaufler-ca.com\u003e\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "4385428a477559b26736cc3c80d8b68f31126c71", "tree": "8eb0cbc78e79c368687fa13a1e0674ae537f830f", "parents": [ "047a3772feaae8e43d81d790f3d3f80dae8ae676", "2d75af2f2a7a6103a6d539a492fe81deacabde44" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 09 10:42:21 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 09 10:42:21 2011 +0100" }, "message": "Merge branch \u0027tip/perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent\n" }, { "commit": "72eb6a791459c87a0340318840bb3bd9252b627b", "tree": "3bfb8ad99f9c7e511f37f72d57b56a2cea06d753", "parents": [ "23d69b09b78c4876e134f104a3814c30747c53f1", "55ee4ef30241a62b700f79517e6d5ef2ddbefa67" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 17:02:58 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 17:02:58 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits)\n gameport: use this_cpu_read instead of lookup\n x86: udelay: Use this_cpu_read to avoid address calculation\n x86: Use this_cpu_inc_return for nmi counter\n x86: Replace uses of current_cpu_data with this_cpu ops\n x86: Use this_cpu_ops to optimize code\n vmstat: User per cpu atomics to avoid interrupt disable / enable\n irq_work: Use per cpu atomics instead of regular atomics\n cpuops: Use cmpxchg for xchg to avoid lock semantics\n x86: this_cpu_cmpxchg and this_cpu_xchg operations\n percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support\n percpu,x86: relocate this_cpu_add_return() and friends\n connector: Use this_cpu operations\n xen: Use this_cpu_inc_return\n taskstats: Use this_cpu_ops\n random: Use this_cpu_inc_return\n fs: Use this_cpu_inc_return in buffer.c\n highmem: Use this_cpu_xx_return() operations\n vmstat: Use this_cpu_inc_return for vm statistics\n x86: Support for this_cpu_add, sub, dec, inc_return\n percpu: Generic support for this_cpu_add, sub, dec, inc_return\n ...\n\nFixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c}\nas per Tejun.\n" }, { "commit": "23d69b09b78c4876e134f104a3814c30747c53f1", "tree": "40744de4f4126c21027ce537264524095e0e7979", "parents": [ "e744070fd4ff9d3114277e52d77afa21579adce2", "569ff2de2e1c8ac67c8df3a7367d46d0d9460a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)\n usb: don\u0027t use flush_scheduled_work()\n speedtch: don\u0027t abuse struct delayed_work\n media/video: don\u0027t use flush_scheduled_work()\n media/video: explicitly flush request_module work\n ioc4: use static work_struct for ioc4_load_modules()\n init: don\u0027t call flush_scheduled_work() from do_initcalls()\n s390: don\u0027t use flush_scheduled_work()\n rtc: don\u0027t use flush_scheduled_work()\n mmc: update workqueue usages\n mfd: update workqueue usages\n dvb: don\u0027t use flush_scheduled_work()\n leds-wm8350: don\u0027t use flush_scheduled_work()\n mISDN: don\u0027t use flush_scheduled_work()\n macintosh/ams: don\u0027t use flush_scheduled_work()\n vmwgfx: don\u0027t use flush_scheduled_work()\n tpm: don\u0027t use flush_scheduled_work()\n sonypi: don\u0027t use flush_scheduled_work()\n hvsi: don\u0027t use flush_scheduled_work()\n xen: don\u0027t use flush_scheduled_work()\n gdrom: don\u0027t use flush_scheduled_work()\n ...\n\nFixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c\nas per Tejun.\n" }, { "commit": "56b85f32d530d09d6805488ad00775d4e0e3baab", "tree": "e7fbe69e338ef775d3b2dd822aa915d259b4bc94", "parents": [ "3e5b08cbbf78bedd316904ab0cf3b27119433ee5", "568389c257fa7d74ce36c2f78bad31965fded4cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 14:39:20 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 14:39:20 2011 -0800" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)\n serial: apbuart: Fixup apbuart_console_init()\n TTY: Add tty ioctl to figure device node of the system console.\n tty: add \u0027active\u0027 sysfs attribute to tty0 and console device\n drivers: serial: apbuart: Handle OF failures gracefully\n Serial: Avoid unbalanced IRQ wake disable during resume\n tty: fix typos/errors in tty_driver.h comments\n pch_uart : fix warnings for 64bit compile\n 8250: fix uninitialized FIFOs\n ip2: fix compiler warning on ip2main_pci_tbl\n specialix: fix compiler warning on specialix_pci_tbl\n rocket: fix compiler warning on rocket_pci_ids\n 8250: add a UPIO_DWAPB32 for 32 bit accesses\n 8250: use container_of() instead of casting\n serial: omap-serial: Add support for kernel debugger\n serial: fix pch_uart kconfig \u0026 build\n drivers: char: hvc: add arm JTAG DCC console support\n RS485 documentation: add 16C950 UART description\n serial: ifx6x60: fix memory leak\n serial: ifx6x60: free IRQ on error\n Serial: EG20T: add PCH_UART driver\n ...\n\nFixed up conflicts in drivers/serial/apbuart.c with evil merge that\nmakes the code look fairly sane (unlike either side).\n" }, { "commit": "673a6092ce5f5bec45619b7a7f89cfcf8bcf3c41", "tree": "db1ea99585f3744097e10b15f581ceb55e812eab", "parents": [ "1c7b74d46fed530cca22a9a54140cdac2815c797" ], "author": { "name": "Don Zickus", "email": "dzickus@redhat.com", "time": "Thu Jan 06 16:18:48 2011 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 07 15:08:52 2011 +0100" }, "message": "x86: Convert some devices to use DIE_NMIUNKNOWN\n\nThey are a handful of places in the code that register a die_notifier\nas a catch all in case no claims the NMI. Unfortunately, they trigger\non events like DIE_NMI and DIE_NMI_IPI, which depending on when they\nregistered may collide with other handlers that have the ability to\ndetermine if the NMI is theirs or not.\n\nThe function unknown_nmi_error() makes one last effort to walk the\ndie_chain when no one else has claimed the NMI before spitting out\nmessages that the NMI is unknown.\n\nThis is a better spot for these devices to execute any code without\ncolliding with the other handlers.\n\nThe two drivers modified are only compiled on x86 arches I believe, so\nthey shouldn\u0027t be affected by other arches that may not have\nDIE_NMIUNKNOWN defined.\n\nSigned-off-by: Don Zickus \u003cdzickus@redhat.com\u003e\nCc: Russ Anderson \u003crja@sgi.com\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nCc: openipmi-developer@lists.sourceforge.net\nCc: dann frazier \u003cdannf@hp.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1294348732-15030-3-git-send-email-dzickus@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "55db8387a5e8d07407f0b7c6b2526417a2bc6243", "tree": "389c3f6cc183f48765eabdc578e8609ea6449f95", "parents": [ "21493088733e6e09dac6f54595a1b6b8ab1e68fd" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 07 14:55:06 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 07 14:55:06 2011 +1100" }, "message": "hwrng: via_rng - Fix memory scribbling on some CPUs\n\nIt has been reported that on at least one Nano CPU the xstore\ninstruction will write as many as 16 bytes of data to the output\nbuffer.\n\nThis causes memory corruption as we use rng-\u003epriv which is only\n4-8 bytes long.\n\nThis patch fixes this by using an intermediate buffer on the stack\nwith at least 16 bytes and aligned to a 16-byte boundary.\n\nThe problem was observed on the following processor:\n\nprocessor\t: 0\nvendor_id\t: CentaurHauls\ncpu family\t: 6\nmodel\t\t: 15\nmodel name\t: VIA Nano processor U2250 (1.6GHz Capable)\nstepping\t: 3\ncpu MHz\t\t: 1600.000\ncache size\t: 1024 KB\nfdiv_bug\t: no\nhlt_bug\t\t: no\nf00f_bug\t: no\ncoma_bug\t: no\nfpu\t\t: yes\nfpu_exception\t: yes\ncpuid level\t: 10\nwp\t\t: yes\nflags\t\t: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush acpi mmx fxsr sse sse2 ss tm syscall nx lm constant_tsc up rep_good pni monitor vmx est tm2 ssse3 cx16 xtpr rng rng_en ace ace_en ace2 phe phe_en lahf_lm\nbogomips\t: 3192.08\nclflush size\t: 64\ncache_alignment\t: 128\naddress sizes\t: 36 bits physical, 48 bits virtual\npower management:\n\nTested-by: Mario \u0027BitKoenig\u0027 Holbe \u003cMario.Holbe@TU-Ilmenau.DE\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "0735ac1f2551d9f9d356126aaf3b1110150918e6", "tree": "4be8cf2b220bcd51053da2f67101f6ca4ceaf1aa", "parents": [ "dffa18449a334cf436c1fabfb2fcf7d4240c994b" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 07 14:48:57 2011 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Jan 07 14:48:57 2011 +1100" }, "message": "hwrng: via_rng - Fix asm constraints\n\nThe inline asm to invoke xstore did not specify the constraints\ncorrectly. In particular, dx/di should have been marked as output\nregisters as well as input as they\u0027re modified by xstore.\n\nThanks to Mario Holbe for creating this patch and testing it.\n\nTested-by: Mario \u0027BitKoenig\u0027 Holbe \u003cMario.Holbe@TU-Ilmenau.DE\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "42cbd8efb0746b55112de45173219f76c54390da", "tree": "3be21847ac861d36897bbb41de9478ddf5142c4d", "parents": [ "dda5f0a372873bca5f0b1d1866d7784dffd8b675", "f658bcfb2607bf0808966a69cf74135ce98e5c2d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 10:50:28 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 10:50:28 2011 -0800" }, "message": "Merge branch \u0027x86-amd-nb-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-amd-nb-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, cacheinfo: Cleanup L3 cache index disable support\n x86, amd-nb: Cleanup AMD northbridge caching code\n x86, amd-nb: Complete the rename of AMD NB and related code\n" }, { "commit": "4f125010d2d02c481a0fdf5aee23a9f937bc5de1", "tree": "dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57", "parents": [ "204663c48711ddceee09df46269cd34d49d1f7be", "989d873fc5b6a96695b97738dea8d9f02a60f8ab" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 05 08:31:08 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 05 08:31:08 2011 +1000" }, "message": "Merge branch \u0027master\u0027 of /home/airlied/kernel/linux-2.6 into drm-core-next\n" }, { "commit": "672d8eafe38e9324055b8c0d0ad6e95c43b6d52a", "tree": "c4dcfe9e042f2c57f05d8989173fd0c510ee7b94", "parents": [ "4a3a255289e7e322b8044286cce85031990f888a" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Nov 16 14:33:51 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jan 04 00:39:37 2011 -0700" }, "message": "ipmi: explicitly include of_address.h and of_irq.h\n\nof_address.h and of_irq.h are implicitly included on powerpc. Adding\nthem fixes builds on non-powerpc platforms.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "da81c3b9825c826bfb06a4dcc0524c671985eb68", "tree": "32729b9cb74cdaa0a39d2847675af02ff024fa89", "parents": [ "236cdc7bc718566a7e7cb9f763b51a8dcad88cbe" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Nov 16 14:33:50 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jan 03 14:08:18 2011 -0700" }, "message": "of: Fixes for OF probing on little endian systems\n\nFixes for sdhci-of and ipmi drivers.\n\nAuditing all drivers using of_get_property did not find other\noccurrences likely to be used on LE platforms.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "1873bb8115e678ad9fd0aac9dbbc68383bc36e06", "tree": "938017e949de036589035da33975257e68afed65", "parents": [ "ffc96d628b651b69b39909fc3e9e8f465df1eed3" ], "author": { "name": "Ahmed S. Darwish", "email": "darwish.07@gmail.com", "time": "Sat Dec 25 11:57:09 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 28 11:12:32 2010 -0800" }, "message": "RAMOOPS: Don\u0027t overflow over non-allocated regions\n\nThe current code mis-calculates the ramoops header size, leading to an\noverflow over the next record at best, or over a non-allocated region at\nworst. Fix that calculation.\n\nSigned-off-by: Ahmed S. Darwish \u003cdarwish.07@gmail.com\u003e\nAcked-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2e5c44c92046c41607794666ffc0d6945945acb0", "tree": "12e176d61db90d57d93318d020adc5e6fe543f47", "parents": [ "3514870f06a7907bc46361aebc3daf5ea4e97eeb" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "message": "tpm: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is deprecated and scheduled to be removed.\nDirectly flush chip-\u003ework instead.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "3514870f06a7907bc46361aebc3daf5ea4e97eeb", "tree": "f1ece815d9e42578086dc7648975674aa59761a2", "parents": [ "42565999d1e0b8a0c5b4a0d475c26cf3d567e85e" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "message": "sonypi: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is deprecated and scheduled to be removed.\nDirectly flush sonypi_device.input_work on removal instead.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Mattia Dongili \u003cmalattia@linux.it\u003e\n" }, { "commit": "42565999d1e0b8a0c5b4a0d475c26cf3d567e85e", "tree": "f4c5e7a670661328272ecf11c5cb1af0c16a767d", "parents": [ "30d65030fd14fd3696d927c5e452bee84c589b09" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:07 2010 +0100" }, "message": "hvsi: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is deprecated and scheduled to be removed.\nDirectly cancel hp-\u003ewriter and flush hp-\u003ehandshaker instead.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\n" }, { "commit": "404437efc713b6c6fc8e2dc02978624bf4586e2d", "tree": "2fd321c4df24f0dbf75a362ce728f6e21535a6db", "parents": [ "9b00a8182987e8b7028d97c2bee3319ef383b57a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:06 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 24 15:59:06 2010 +0100" }, "message": "pcmcia/ipwireless: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is deprecated and scheduled to be removed.\nDirectly flush the used works instead.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: David Sterba \u003cdsterba@suse.cz\u003e\n" }, { "commit": "b29c617af3b09d150d3889836c24d39564b39180", "tree": "17514cd85f64917e96d736b6dc5ac681dab93955", "parents": [ "ee1be8626355e6a1f3f8c44e2351ff2661c5998d" ], "author": { "name": "Christoph Lameter", "email": "cl@linux.com", "time": "Mon Dec 06 11:40:06 2010 -0600" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 17 15:18:05 2010 +0100" }, "message": "random: Use this_cpu_inc_return\n\n__this_cpu_inc can create a single instruction to do the same as\n__get_cpu_var()++.\n\nCc: Richard Kennedy \u003crichard@rsk.demon.co.uk\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "9097eef024db4f1850015e837a84aca0aa40a288", "tree": "0d2cf4b9ca5e1e58aa38c1225338925e675c4a02", "parents": [ "b13c2b96bf15b9dd0f1a45fd788f3a3025c5aec6", "71f4566084eb592fe545f05f7dff41fa9aa42e0b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Dec 14 11:34:51 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Dec 14 11:34:51 2010 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "71f4566084eb592fe545f05f7dff41fa9aa42e0b", "tree": "0fc813df2af7ebda8dea06b6d954eb4cc5bbccfa", "parents": [ "63abf3edaf42d0b9f278df90fe41c7ed4796b6b1" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Dec 14 11:29:23 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Dec 14 11:29:23 2010 +0000" }, "message": "agp/intel: Fix missed cached memory flags setting in i965_write_entry()\n\nThis fixes regression from a6963596a13e62f8e65b1cf3403a330ff2db407c,\nthat missed to set cached memory type in GTT entry.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "16f4232ce4d6855361b4eb56262f4a202295c978", "tree": "76edaaa76feab9876eb8b12b50d5660b6f4d434c", "parents": [ "cf7d7e5a1980d1116ee152d25dac382b112b9c17" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Wed Dec 08 10:10:16 2010 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Dec 14 00:21:51 2010 -0500" }, "message": "IPMI: Add one interface to get more info of low-level IPMI device\n\nThe IPMI smi_watcher will be used to catch the IPMI interface as they\ncome or go. In order to communicate with the correct IPMI device, it\nshould be confirmed whether it is what we wanted especially on the\nsystem with multiple IPMI devices. But the new_smi callback function\nof smi_watcher provides very limited info(only the interface number\nand dev pointer) and there is no detailed info about the low level\ninterface. For example: which mechansim registers the IPMI\ninterface(ACPI, PCI, DMI and so on).\n\nThis is to add one interface that can get more info of low-level IPMI\ndevice. For example: the ACPI device handle will be returned for the\npnp_acpi IPMI device.\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "53139e36cdd7bbc5efcbdc5e70fbff66e2da3c09", "tree": "122b5308def5bf103b6e114ef9c07bcc14aa523c", "parents": [ "fd0f5c54eeb66e3e89e3cdd34c5abf8d5fbcf61c" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Tue Dec 07 23:27:43 2010 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 10 15:20:15 2010 -0800" }, "message": "ip2: fix compiler warning on ip2main_pci_tbl\n\nAnnotate ip2main_pci_tbl as \u0027__used\u0027 to fix following warning:\n\n CC drivers/char/ip2/ip2main.o\ndrivers/char/ip2/ip2main.c:3227: warning: ‘ip2main_pci_tbl’ defined but not used\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: \"Michael H. Warfield\" \u003cmhw@wittsend.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "fd0f5c54eeb66e3e89e3cdd34c5abf8d5fbcf61c", "tree": "c66a5f59de5d989998947593cd6f1c63144a7027", "parents": [ "6835a209f6c24b3704aa58d8b558a513a5a08c52" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Tue Dec 07 23:27:42 2010 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 10 15:20:14 2010 -0800" }, "message": "specialix: fix compiler warning on specialix_pci_tbl\n\nAnnotate specialx_pci_tbl as \u0027__used\u0027 to fix following warning:\n\n CC drivers/char/specialix.o\ndrivers/char/specialix.c:2358: warning: ‘specialx_pci_tbl’ defined but not used\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Roger Wolff \u003cR.E.Wolff@BitWizard.nl\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "6835a209f6c24b3704aa58d8b558a513a5a08c52", "tree": "c502ff85e4e6a739884fa40f484e581c07b158e4", "parents": [ "a3ae0fc34f58e7163b7724feb3d77aa4603f0dc3" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Tue Dec 07 23:27:41 2010 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 10 15:20:14 2010 -0800" }, "message": "rocket: fix compiler warning on rocket_pci_ids\n\nAnnotate rocket_pci_ids as \u0027__used\u0027 to fix following warning:\n\n CC drivers/char/rocket.o\ndrivers/char/rocket.c:1767: warning: ‘rocket_pci_ids’ defined but not used\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "5aa7d52aebfc11760bbc5b081ed621227bb77981", "tree": "1bb2542ff9f8f58599325a68f3861f80be27bf26", "parents": [ "382ab78c0e4866eb9a812e9ba20d0f876d9634d6", "bbf0c6b3620b3872929ef7d3c392ce436889110f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Dec 05 10:43:39 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Dec 05 10:43:39 2010 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\nImmediate merge for the conflicting introduction of HAS_COHERENT_RINGS.\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_dma.c\n\tinclude/drm/i915_drm.h\n" }, { "commit": "136711be41ec97f7f1a9c3a5e8535eb7da5fea59", "tree": "3be7da8694869adbb894f02b9edc1eab298c77da", "parents": [ "49078f7d108f132582e5af46304c317b55f83948" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sat Dec 04 16:13:06 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Dec 05 10:40:17 2010 +0000" }, "message": "agp/intel: Fix wrong kunmap in i830_cleanup()\n\nAdd a missing NULL check and fix the wrong address passed to kunmap()\nin i830_cleanup().\n\nCc: stable@kernel.org\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n[danvet: added cc stable]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b9e68670cc3a13166b389ce847af19b0d0d33c67", "tree": "bb79d91266490fa5bfe77cfef53ead8a1f7a62f6", "parents": [ "60de2ba51eaba9eefcc355cb20c8582b1481e755", "5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Dec 02 23:36:21 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Dec 02 23:50:36 2010 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_drv.h\n" }, { "commit": "16c63f8ea49c3fcb9eac7ebc511f5c821d3c55c2", "tree": "4d27eb29e3563268e41cc40676cc1a46b5c128a1", "parents": [ "de6f86ce51341559dc3c9c9f5c562da12fcfcb31" ], "author": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Tue Nov 30 11:25:39 2010 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Nov 30 17:27:13 2010 -0800" }, "message": "drivers: char: hvc: add arm JTAG DCC console support\n\nThis driver adds a basic console that uses the arm JTAG\nDCC to transfer data back and forth. It has support for\nARMv6 and ARMv7.\n\nThis console is created under the HVC driver, and should be named\n/dev/hvcX (or /dev/hvc0 for example).\n\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "3f0d3d016d89a5efb8b926d4707eb21fa13f3d27", "tree": "9cf5a19b80d8c935db98110f2ac822c74f9ec9b9", "parents": [ "72083646528d4887b920deb71b37e09bc7d227bb" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Thu Oct 21 17:42:40 2010 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Nov 30 09:18:01 2010 +1100" }, "message": "tpm: Autodetect itpm devices\n\nSome Lenovos have TPMs that require a quirk to function correctly. This can\nbe autodetected by checking whether the device has a _HID of INTC0102. This\nis an invalid PNPid, and as such is discarded by the pnp layer - however\nit\u0027s still present in the ACPI code, so we can pull it out that way. This\nmeans that the quirk won\u0027t be automatically applied on non-ACPI systems,\nbut without ACPI we don\u0027t have any way to identify the chip anyway so I\ndon\u0027t think that\u0027s a great concern.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nAcked-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nTested-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nTested-by: Andy Isaacson \u003cadi@hexapodia.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5a71c61b7724ad0acedff254e07dc1a7dd05ee76", "tree": "0837332cdd60a61296a798f12eda1be9c3fa60d6", "parents": [ "56e640de12c4d9902493cd819c63cacf66515686" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Sep 13 09:47:42 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Nov 29 15:48:18 2010 +1100" }, "message": "drivers/char/hvc_vio: Use static const char arrays\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nReviewed-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "c749ba912e87ccebd674ae24b97462176c63732e", "tree": "72dff433660102d7eba7186f35bbd2aab21b1b6a", "parents": [ "a0e39349d80d8b5deeb264fb190bd064f7063252" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Nov 23 18:54:16 2010 -0500" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Nov 29 08:55:22 2010 +1100" }, "message": "key: add tpm_send command\n\nAdd internal kernel tpm_send() command used to seal/unseal keys.\n\nChangelog:\n- replaced module_put in tpm_send() with new tpm_chip_put() wrapper\n (suggested by David Howells)\n- Make tpm_send() cmd argument a \u0027void *\u0027 (suggested by David Howells)\n\nSigned-off-by: David Safford \u003csafford@watson.ibm.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "a0e39349d80d8b5deeb264fb190bd064f7063252", "tree": "51269aaf15b299c2afcb1bb53bf95580769fc22a", "parents": [ "dc88e46029486ed475c71fe1bb696d39511ac8fe" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Nov 23 17:50:32 2010 -0500" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Nov 29 08:55:19 2010 +1100" }, "message": "tpm: add module_put wrapper\n\nFor readability, define a tpm_chip_put() wrapper to call module_put().\nReplace existing module_put() calls with the wrapper.\n\n(Change based on trusted/encrypted patchset review by David Howells.)\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: David Safford \u003csafford@watson.ibm.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f30195c50245d8ace628e1978b1daa8df86e7224", "tree": "edf4f91c4356c41d50fb07f15cebd1e6442538ad", "parents": [ "d07335e51df0c6dec202d315fc4f1f7e100eec4e", "d4d77629953eabd3c14f6fa5746f6b28babfc55f" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Nov 27 19:49:18 2010 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Nov 27 19:49:18 2010 +0100" }, "message": "Merge branch \u0027cleanup-bd_claim\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.38/core\n" }, { "commit": "22e132ff2645aab1e1a25c45e9544a39ae1dc106", "tree": "2202ed81de7b2afd7f1ce568fc0222497e464de2", "parents": [ "7ae4b866f86f9ab7b99484b56dd303a860ad1cc9" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Sat Nov 06 10:06:50 2010 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 24 15:21:12 2010 +1030" }, "message": "Char: virtio_console, fix memory leak\n\nStanse found that in init_vqs, memory is leaked under certain\ncircumstanses (the fail path order is incorrect). Fix that by checking\nallocations in one turn and free all of them at once if some fails\n(some may be NULL, but this is OK).\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Amit Shah \u003camit.shah@redhat.com\u003e\nCc: virtualization@lists.linux-foundation.org\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7bdc9ab00b1b0fdbb490f41c5c7c2fbc66fed9ee", "tree": "148ac9c6b4c4cb6cf59c948e95d39a16f6d6a62e", "parents": [ "92b88aeb1ad67417c002fdd77409771ca7e5433a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 09 17:53:20 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:19:13 2010 +0000" }, "message": "agp/intel: Remove duplicate const\n\ndrivers/char/agp/intel-gtt.c:340:48: warning: duplicate const\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "4080775b60cc26044e7c4aba5e76e5041b0d7004", "tree": "46ee73a35bb1c99ff7e075e1c9b441faad98dc94", "parents": [ "7c2e6fdf452cddeff6a8ee5156edba39e53246fc" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Nov 06 11:18:58 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:47 2010 +0000" }, "message": "intel-gtt: export api for drm/i915\n\nJust some minor shuffling to get rid of any agp traces in the\nexported functions.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "cb16b67b5cb33b7d6732e0c416d29d933eea13ce", "tree": "b9e9abd539aea42c86bbc5c44a17456291512ccb", "parents": [ "76aaf22016caa7764f40e792aaca7b4918312b22" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 22:27:10 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:46 2010 +0000" }, "message": "agp: kill agp_rebind_memory\n\nIts only user, intel-gtt.c is now gone.\n\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "76aaf22016caa7764f40e792aaca7b4918312b22", "tree": "88ba0e64ed5c970969df5d70f2ae01fe641d6722", "parents": [ "93a37f20eabeea4039130527b07453038c07f471" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 22:23:30 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:46 2010 +0000" }, "message": "drm/i915: restore gtt on resume in the drm instead of in intel-gtt.ko\n\nThis still uses the agp functions to actually reinstate the mappings\n(with a gross hack to make agp cooperate), but it wires everything\nup correctly for the switchover.\n\nThe call to agp_rebind_memory can be dropped because all non-kms drivers\ndo all their rebinding on EnterVT.\n\nv2: Be more paranoid and flush the chipset cache after restoring gtt\nmappings.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f050a8abbda0efcd597c6b1825e3b9ce4d613383", "tree": "61421f0a7355f12babff81fb25c68470f4980f82", "parents": [ "4af72e2865a23ac090884a421bd1a8b19e247a22" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 18:40:56 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:45 2010 +0000" }, "message": "agp: kill agp_flush_chipset and corresponding ioctl\n\nThe intel drm calls the chipset functions now directly. Userspace\nnever called the corresponding ioctl, hence it can be killed, too.\n\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "40ce6575102b23e432932b5ce41c44bf7cc5023b", "tree": "c14bb9bf62a83e35f81d0aaef55536c324bdbb3b", "parents": [ "23ed992a5ebe6964ebe312b54142fbc5e8185cdc" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 18:12:18 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:44 2010 +0000" }, "message": "drm/i915/gtt: call chipset flush directly\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "23ed992a5ebe6964ebe312b54142fbc5e8185cdc", "tree": "c8ee2fa6f6a51fb1d0b43f19ec15dcc482b914ef", "parents": [ "ff26860fb53f2dcfaaaf1bf017b09dbdfddff5ee" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 18:04:52 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:43 2010 +0000" }, "message": "drm/i915|intel-gtt: consolidate intel-gtt.h headers\n\n... and a few other defines.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "ff26860fb53f2dcfaaaf1bf017b09dbdfddff5ee", "tree": "2e441a68f636f52f9c158febe23766e6841d1a75", "parents": [ "820647b97a9cbdd976c7177f1b6047fc1f6dd5c0" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 15:43:35 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:43 2010 +0000" }, "message": "intel-gtt: fold i81x-only dcache support into the generic driver\n\nNow the intel-gtt.c rewrite is complete!\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "820647b97a9cbdd976c7177f1b6047fc1f6dd5c0", "tree": "4d0ec4a52ac3daff3cf797b3578326bb2b27954f", "parents": [ "625dd9d331d8a1ce5ee4e9924a22f3e55b7ac615" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 13:30:14 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:42 2010 +0000" }, "message": "intel-gtt: switch i81x to the common initialization helpers\n\nStill a separate agp_bridge_driver because of the i81x-only\ndedicated vram support.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "625dd9d331d8a1ce5ee4e9924a22f3e55b7ac615", "tree": "bad37f7ecc7ef90134ea4eb9e51e788a946a654f", "parents": [ "24a6b387af7cd5d1e0e5d15b15104644a5105de7" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Nov 04 20:07:57 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:42 2010 +0000" }, "message": "intel-gtt: switch i81x to the write_entry helpers\n\nInitialization is still done with the old code with a few\nadded things sprinkled in to make the intel_fake_agp helper\nfunctions work.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "24a6b387af7cd5d1e0e5d15b15104644a5105de7", "tree": "d8b6af7385d0667fb3469eb454217eb35dd8f50f", "parents": [ "b47cf66f315a258c458ed4345c443dba396fb787" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Nov 04 20:14:15 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:42 2010 +0000" }, "message": "intel-gtt: kill unneeded sandybridge memory types\n\nUsed for the now dead agp type_to_mask stuff.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b47cf66f315a258c458ed4345c443dba396fb787", "tree": "1b602d3c6711e5e04922ce2d348003ff4c323cdf", "parents": [ "e384eafc1c2f4f10155fe25324afe51129ec3e6a" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Nov 04 18:41:50 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:41 2010 +0000" }, "message": "intel-gtt: drop dcache support for i830 and later\n\ni830_check_flags already disallows it, so no need to implement it\nin the write_entry function. Seems to be a remnant from i810 support.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "c64f7ba5f1006d8c20eacafecf98d4d00a6902a0", "tree": "0309e263e05be06e718d6a07169802ac026aef68", "parents": [ "1b6064d79b9a1c5e5aa6fcc6855f3da5e639ff73" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 14:24:24 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 15:43:18 2010 +0000" }, "message": "agp/intel: Remove confusion of stolen entries not stolen memory\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "1b6064d79b9a1c5e5aa6fcc6855f3da5e639ff73", "tree": "948c4ed0770504cb80482333fa708823eddc88f0", "parents": [ "fe669bf88e9108b96a847385df08c9b1e98c1420" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 12:33:54 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 15:42:59 2010 +0000" }, "message": "agp/intel: Remove the artificial cap on stolen size\n\nNow that the stolen memory does not also steal entries from the GTT, we\ncan use all the memory the BIOS set aside for the GPU.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e624ae8e0d4243e71daedce7570e91290438eaca", "tree": "e2b9804379a6aab3d2471898d257fe5590feb70c", "parents": [ "c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287", "4ab0fbd3a29067e1540f05093ae4ed07645d18c8" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 22 08:51:36 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 22 08:51:36 2010 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem.c\n" }, { "commit": "9653a5c76c8677b05b45b3b999d3b39988d2a064", "tree": "9224748c69296fc6ac50beae72f20e6e2ae16aca", "parents": [ "eec1d4fa00c6552ae2fdf71d59f1eded7c88dd89" ], "author": { "name": "Hans Rosenfeld", "email": "hans.rosenfeld@amd.com", "time": "Fri Oct 29 17:14:31 2010 +0200" }, "committer": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Thu Nov 18 15:53:05 2010 +0100" }, "message": "x86, amd-nb: Cleanup AMD northbridge caching code\n\nSupport more than just the \"Misc Control\" part of the northbridges.\nSupport more flags by turning \"gart_supported\" into a single bit flag\nthat is stored in a flags member. Clean up related code by using a set\nof functions (amd_nb_num(), amd_nb_has_feature() and node_to_amd_nb())\ninstead of accessing the NB data structures directly. Reorder the\ninitialization code and put the GART flush words caching in a separate\nfunction.\n\nSigned-off-by: Hans Rosenfeld \u003chans.rosenfeld@amd.com\u003e\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\n" }, { "commit": "eec1d4fa00c6552ae2fdf71d59f1eded7c88dd89", "tree": "ee2c918694e1a01e0826e98c89b703916488bedd", "parents": [ "e53beacd23d9cb47590da6a7a7f6d417b941a994" ], "author": { "name": "Hans Rosenfeld", "email": "hans.rosenfeld@amd.com", "time": "Fri Oct 29 17:14:30 2010 +0200" }, "committer": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Thu Nov 18 15:53:04 2010 +0100" }, "message": "x86, amd-nb: Complete the rename of AMD NB and related code\n\nNot only the naming of the files was confusing, it was even more so for\nthe function and variable names.\n\nRenamed the K8 NB and NUMA stuff that is also used on other AMD\nplatforms. This also renames the CONFIG_K8_NUMA option to\nCONFIG_AMD_NUMA and the related file k8topology_64.c to\namdtopology_64.c. No functional changes intended.\n\nSigned-off-by: Hans Rosenfeld \u003chans.rosenfeld@amd.com\u003e\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\n" }, { "commit": "451a3c24b0135bce54542009b5fde43846c7cf67", "tree": "f0fbbcc155aef2a1ffcb8aa593fe7a966d0e6900", "parents": [ "55f6561c6941713ab5ae9180525b026dd40b7d14" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 17 16:26:55 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 08:59:32 2010 -0800" }, "message": "BKL: remove extraneous #include \u003csmp_lock.h\u003e\n\nThe big kernel lock has been removed from all these files at some point,\nleaving only the #include.\n\nRemove this too as a cleanup.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "22d3243de86bc92d874abb7c5b185d5c47aba323" }