)]}' { "log": [ { "commit": "d9e1b6c45059ccfff647a120769ae86da78dfdc4", "tree": "fb88b38cd37a47419edfcc0cf55b0f25c05cbe1f", "parents": [ "e5149cc44cf9c5e23fbe34515fc6b4b91c0e48c4" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Aug 09 17:18:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 20:44:53 2010 -0700" }, "message": "ipmi: fix ACPI detection with regspacing\n\nAfter the commit that changed ipmi_si detecting sequence from SMBIOS/ACPI\nto ACPI/SMBIOS,\n\n| commit 754d453185275951d39792865927ec494fa1ebd8\n| Author: Matthew Garrett \u003cmjg@redhat.com\u003e\n| Date: Wed May 26 14:43:47 2010 -0700\n|\n| ipmi: change device discovery order\n|\n| The ipmi spec provides an ordering for si discovery. Change the driver to\n| match, with the exception of preferring smbios to SPMI as HPs (at least)\n| contain accurate information in the former but not the latter.\n\nipmi_si can not be initialized.\n\n[ 138.799739] calling init_ipmi_devintf+0x0/0x109 @ 1\n[ 138.805050] ipmi device interface\n[ 138.818131] initcall init_ipmi_devintf+0x0/0x109 returned 0 after 12797 usecs\n[ 138.822998] calling init_ipmi_si+0x0/0xa90 @ 1\n[ 138.840276] IPMI System Interface driver.\n[ 138.846137] ipmi_si: probing via ACPI\n[ 138.849225] ipmi_si 00:09: [io 0x0ca2] regsize 1 spacing 1 irq 0\n[ 138.864438] ipmi_si: Adding ACPI-specified kcs state machine\n[ 138.870893] ipmi_si: probing via SMBIOS\n[ 138.880945] ipmi_si: Adding SMBIOS-specified kcs state machineipmi_si: duplicate interface\n[ 138.896511] ipmi_si: probing via SPMI\n[ 138.899861] ipmi_si: Adding SPMI-specified kcs state machineipmi_si: duplicate interface\n[ 138.917095] ipmi_si: Trying ACPI-specified kcs state machine at i/o address 0xca2, slave address 0x0, irq 0\n[ 138.928658] ipmi_si: Interface detection failed\n[ 138.953411] initcall init_ipmi_si+0x0/0xa90 returned 0 after 110847 usecs\n\nin smbios has\nDMI/SMBIOS\nHandle 0x00C5, DMI type 38, 18 bytes\nIPMI Device Information\n Interface Type: KCS (Keyboard Control Style)\n Specification Version: 2.0\n I2C Slave Address: 0x00\n NV Storage Device: Not Present\n Base Address: 0x0000000000000CA2 (I/O)\n Register Spacing: 32-bit Boundaries\nin DSDT has\n Device (BMC)\n {\n\n Name (_HID, EisaId (\"IPI0001\"))\n Method (_STA, 0, NotSerialized)\n {\n If (LEqual (OSN, Zero))\n {\n Return (Zero)\n }\n\n Return (0x0F)\n }\n\n Name (_STR, Unicode (\"IPMI_KCS\"))\n Name (_UID, Zero)\n Name (_CRS, ResourceTemplate ()\n {\n IO (Decode16,\n 0x0CA2, // Range Minimum\n 0x0CA2, // Range Maximum\n 0x00, // Alignment\n 0x01, // Length\n )\n IO (Decode16,\n 0x0CA6, // Range Minimum\n 0x0CA6, // Range Maximum\n 0x00, // Alignment\n 0x01, // Length\n )\n })\n Method (_IFT, 0, NotSerialized)\n {\n Return (One)\n }\n\n Method (_SRV, 0, NotSerialized)\n {\n Return (0x0200)\n }\n }\n\nso the reg spacing should be 4 instead of 1.\n\nTry to calculate regspacing for this kind of system.\n\nObserved on a Sun Fire X4800. Other OSes work and pass certification.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nAcked-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Myron Stowe \u003cmyron.stowe@hp.com\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "45d7f32c7a43cbb9592886d38190e379e2eb2226", "tree": "ea68b67b1d2127527d856248c0485f2ed7e50088", "parents": [ "53bcef60633086ad73683d01a4ef9ca678484d2d", "ab11b487402f97975f3ac1eeea09c82f4431481e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:10:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:10:11 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: check kmalloc() result\n arch/tile: catch up on various minor cleanups.\n arch/tile: avoid erroneous error return for PTRACE_POKEUSR.\n tile: set ARCH_KMALLOC_MINALIGN\n tile: remove homegrown L1_CACHE_ALIGN macro\n arch/tile: Miscellaneous cleanup changes.\n arch/tile: Split the icache flush code off to a generic \u003carch\u003e header.\n arch/tile: Fix bug in support for atomic64_xx() ops.\n arch/tile: Shrink the tile-opcode files considerably.\n arch/tile: Add driver to enable access to the user dynamic network.\n arch/tile: Enable more sophisticated IRQ model for 32-bit chips.\n Move list types from \u003clinux/list.h\u003e to \u003clinux/types.h\u003e.\n Add wait4() back to the set of \u003casm-generic/unistd.h\u003e syscalls.\n Revert adding some arch-specific signal syscalls to \u003clinux/syscalls.h\u003e.\n arch/tile: Do not use GFP_KERNEL for dma_alloc_coherent(). Feedback from fujita.tomonori@lab.ntt.co.jp.\n arch/tile: core support for Tilera 32-bit chips.\n Fix up the \"generic\" unistd.h ABI to be more useful.\n" }, { "commit": "1685e633b396b0f3dabbc9fa5d65dfefe6435250", "tree": "ee83e26e2468ca1518a1b065c690159e12c8def9", "parents": [ "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "127c03cdbad9bd5af5d7f33bd31a1015a90cb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq\n pcmcia: do not request windows if you don\u0027t need to\n pcmcia: insert PCMCIA device resources into resource tree\n pcmcia: export resource information to sysfs\n pcmcia: use struct resource for PCMCIA devices, part 2\n pcmcia: remove memreq_t\n pcmcia: move local definitions out of include/pcmcia/cs.h\n pcmcia: do not use io_req_t when calling pcmcia_request_io()\n pcmcia: do not use io_req_t after call to pcmcia_request_io()\n pcmcia: use struct resource for PCMCIA devices\n pcmcia: clean up cs.h\n pcmcia: use pcmica_{read,write}_config_byte\n pcmcia: remove cs_types.h\n pcmcia: remove unused flag, simplify headers\n pcmcia: remove obsolete CS_EVENT_ definitions\n pcmcia: split up central event handler\n pcmcia: simplify event callback\n pcmcia: remove obsolete ioctl\n\nConflicts in:\n - drivers/staging/comedi/drivers/*\n - drivers/staging/wlags49_h2/wl_cs.c\ndue to dev_info_t and whitespace changes\n" }, { "commit": "31d1d48e199e99077fb30f6fb9a793be7bec756f", "tree": "7f9dddbd89030765f6544e5820c401849193dca8", "parents": [ "1e456a124353a753e9d1fadfbf5cd459c2f197ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Aug 06 16:34:43 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:17:02 2010 -0700" }, "message": "Fix init ordering of /dev/console vs callers of modprobe\n\nMake /dev/console get initialised before any initialisation routine that\ninvokes modprobe because if modprobe fails, it\u0027s going to want to open\n/dev/console, presumably to write an error message to.\n\nThe problem with that is that if the /dev/console driver is not yet\ninitialised, the chardev handler will call request_module() to invoke\nmodprobe, which will fail, because we never compile /dev/console as a\nmodule.\n\nThis will lead to a modprobe loop, showing the following in the kernel\nlog:\n\n\trequest_module: runaway loop modprobe char-major-5-1\n\trequest_module: runaway loop modprobe char-major-5-1\n\trequest_module: runaway loop modprobe char-major-5-1\n\trequest_module: runaway loop modprobe char-major-5-1\n\trequest_module: runaway loop modprobe char-major-5-1\n\nThis can happen, for example, when the built in md5 module can\u0027t find\nthe built in cryptomgr module (because the latter fails to initialise).\nThe md5 module comes before the call to tty_init(), presumably because\n\u0027crypto\u0027 comes before \u0027drivers\u0027 alphabetically.\n\nFix this by calling tty_init() from chrdev_init().\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ab11b487402f97975f3ac1eeea09c82f4431481e", "tree": "86337c5cbbd2b0c4bd07c0847a1dc7de3d898147", "parents": [ "1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1", "fc1caf6eafb30ea185720e29f7f5eccca61ecd60" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 06 10:37:02 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 06 10:37:02 2010 -0400" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "fc1caf6eafb30ea185720e29f7f5eccca61ecd60", "tree": "666dabc25a9b02e5c05f9eba32fa6b0d8027341a", "parents": [ "9779714c8af09d57527f18d9aa2207dcc27a8687", "96576a9e1a0cdb8a43d3af5846be0948f52b4460" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:02:01 2010 -0700" }, "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: (204 commits)\n agp: intel-agp: do not use PCI resources before pci_enable_device()\n agp: efficeon-agp: do not use PCI resources before pci_enable_device()\n drm: kill BKL from common code\n drm/kms: Simplify setup of the initial I2C encoder config.\n drm,io-mapping: Specify slot to use for atomic mappings\n drm/radeon/kms: only expose underscan on avivo chips\n drm/radeon: add new pci ids\n drm: Cleanup after failing to create master-\u003eunique and dev-\u003ename\n drm/radeon: tone down overchatty acpi debug messages.\n drm/radeon/kms: enable underscan option for digital connectors\n drm/radeon/kms: fix calculation of h/v scaling factors\n drm/radeon/kms/igp: sideport is AMD only\n drm/radeon/kms: handle the case of no active displays properly in the bandwidth code\n drm: move ttm global code to core drm\n drm/i915: Clear the Ironlake dithering flags when the pipe doesn\u0027t want it.\n drm/radeon/kms: make sure HPD is set to NONE on analog-only connectors\n drm/radeon/kms: make sure rio_mem is valid before unmapping it\n drm/agp/i915: trim stolen space to 32M\n drm/i915: Unset cursor if out-of-bounds upon mode change (v4)\n drm/i915: Unreference object not handle on creation\n ...\n" }, { "commit": "9779714c8af09d57527f18d9aa2207dcc27a8687", "tree": "52182f2289d9b7a77fbe119f4cd5726ef6494e66", "parents": [ "89a6c8cb9e6e11b6e3671dce7e037789b8f7cf62", "65b5ac1479840a3e87f086d68e5ef91f3002e8e2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:00:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:00:44 2010 -0700" }, "message": "Merge branch \u0027kms-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb\n\n* \u0027kms-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:\n kgdb,docs: Update the kgdb docs to include kms\n drm_fb_helper: Preserve capability to use atomic kms\n i915: when kgdb is active display compression should be off\n drm/i915: use new fb debug hooks\n drm: add KGDB/KDB support\n fb: add hooks to handle KDB enter/exit\n kgdboc: Add call backs to allow kernel mode switching\n vt,console,kdb: automatically set kdb LINES variable\n vt,console,kdb: implement atomic console enter/leave functions\n" }, { "commit": "03c0c29aff7e56b722eb6c47eace222b140d0377", "tree": "47267a19b523159cf36a050ef3c35f4dbdb33016", "parents": [ "c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4", "7fb8f881c54beb05dd4d2c947dada1c636581d87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "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: (63 commits)\n of/platform: Register of_platform_drivers with an \"of:\" prefix\n of/address: Clean up function declarations\n of/spi: call of_register_spi_devices() from spi core code\n of: Provide default of_node_to_nid() implementation.\n of/device: Make of_device_make_bus_id() usable by other code.\n of/irq: Fix endian issues in parsing interrupt specifiers\n of: Fix phandle endian issues\n of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string\n of: remove of_default_bus_ids\n of: make of_find_device_by_node generic\n microblaze: remove references to of_device and to_of_device\n sparc: remove references to of_device and to_of_device\n powerpc: remove references to of_device and to_of_device\n of/device: Replace of_device with platform_device in includes and core code\n of/device: Protect against binding of_platform_drivers to non-OF devices\n of: remove asm/of_device.h\n of: remove asm/of_platform.h\n of/platform: remove all of_bus_type and of_platform_bus_type references\n of: Merge of_platform_bus_type with platform_bus_type\n drivercore/of: Add OF style matching to platform bus\n ...\n\nFix up trivial conflicts in arch/microblaze/kernel/Makefile due to just\nsome obj-y removals by the devicetree branch, while the microblaze\nupdates added a new file.\n" }, { "commit": "cdd854bc42b5e6c79bbbc40c6600d995ffe6e747", "tree": "18c4dcc07bbb8aeb2b23bc812cd60cc293f36cd8", "parents": [ "bbc4fd12a635492ad9d12bb418124fa2d5f0d734", "42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 09:03:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 09:03:46 2010 -0700" }, "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: (79 commits)\n powerpc/8xx: Add support for the MPC8xx based boards from TQC\n powerpc/85xx: Introduce support for the Freescale P1022DS reference board\n powerpc/85xx: Adding DTS for the STx GP3-SSA MPC8555 board\n powerpc/85xx: Change deprecated binding for 85xx-based boards\n powerpc/tqm85xx: add a quirk for ti1520 PCMCIA bridge\n powerpc/tqm85xx: update PCI interrupt-map attribute\n powerpc/mpc8308rdb: support for MPC8308RDB board from Freescale\n powerpc/fsl_pci: add quirk for mpc8308 pcie bridge\n powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards\n powerpc/85xx: Fix booting for P1021MDS boards\n powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards\n powerpc/85xx: kexec for SMP 85xx BookE systems\n powerpc/5200/i2c: improve i2c bus error recovery\n of/xilinxfb: update tft compatible versions\n powerpc/fsl-diu-fb: Support setting display mode using EDID\n powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings\n powerpc/5121: shared DIU framebuffer support\n powerpc/5121: move fsl-diu-fb.h to include/linux\n powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor\n powerpc/512x: add clock structure for Video-IN (VIU) unit\n ...\n" }, { "commit": "81d4450732c68aa728f2c86c0c2993c6cfc3d032", "tree": "c332675648080d38e9f461286274534a16e7346b", "parents": [ "b45cfba4e9005d64d419718e7ff7f7cab44c1994" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Aug 05 09:22:30 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Aug 05 09:22:30 2010 -0500" }, "message": "vt,console,kdb: automatically set kdb LINES variable\n\nThe kernel console interface stores the number of lines it is\nconfigured to use. The kdb debugger can greatly benefit by knowing how\nmany lines there are on the console for the pager functionality\nwithout having the end user compile in the setting or have to\nrepeatedly change it at run time.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCC: David Airlie \u003cairlied@linux.ie\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "b45cfba4e9005d64d419718e7ff7f7cab44c1994", "tree": "2d454a67c9a87ffc01579d958f9d95dd5e13170e", "parents": [ "3fa43aba08c5b5a4b407e402606fbe463239b14a" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Aug 05 09:22:30 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Aug 05 09:22:30 2010 -0500" }, "message": "vt,console,kdb: implement atomic console enter/leave functions\n\nThese functions allow the kernel debugger to save and restore the\nstate of the system console.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCC: David Airlie \u003cairlied@linux.ie\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "96576a9e1a0cdb8a43d3af5846be0948f52b4460", "tree": "2a1a58c5862b3c790b36ce44867c9f5d1f758352", "parents": [ "46cfc58a77de5fc8385ad87077f4dc14633e57a7" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Tue Aug 03 19:42:34 2010 +0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 05 12:28:25 2010 +1000" }, "message": "agp: intel-agp: do not use PCI resources before pci_enable_device()\n\nIRQ and resource[] may not have correct values until\nafter PCI hotplug setup occurs at pci_enable_device() time.\n\nThe semantic match that finds this problem is as follows:\n\n// \u003csmpl\u003e\n@@\nidentifier x;\nidentifier request ~\u003d \"pci_request.*|pci_resource.*\";\n@@\n\n(\n* x-\u003eirq\n|\n* x-\u003eresource\n|\n* request(x, ...)\n)\n ...\n*pci_enable_device(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "46cfc58a77de5fc8385ad87077f4dc14633e57a7", "tree": "43f85886cea7113741f9bb6cd1cf5fa3001f12e5", "parents": [ "58374713c9dfb4d231f8c56cac089f6fbdedc2ec" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Tue Aug 03 19:42:30 2010 +0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 05 12:28:21 2010 +1000" }, "message": "agp: efficeon-agp: do not use PCI resources before pci_enable_device()\n\nIRQ and resource[] may not have correct values until\nafter PCI hotplug setup occurs at pci_enable_device() time.\n\nThe semantic match that finds this problem is as follows:\n\n// \u003csmpl\u003e\n@@\nidentifier x;\nidentifier request ~\u003d \"pci_request.*|pci_resource.*\";\n@@\n\n(\n* x-\u003eirq\n|\n* x-\u003eresource\n|\n* request(x, ...)\n)\n ...\n*pci_enable_device(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4", "tree": "5adc1ff2eaf64d450bf28bb6b2ce890db2567288", "parents": [ "5cf65713f87775c548e3eb48dbafa32e12f28000", "0ea6e61122196509af82cc4f36cbdaacbefb8227" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)\n Documentation: update broken web addresses.\n fix comment typo \"choosed\" -\u003e \"chosen\"\n hostap:hostap_hw.c Fix typo in comment\n Fix spelling contorller -\u003e controller in comments\n Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -\u003e Fault\n fs/Kconfig: Fix typo Userpace -\u003e Userspace\n Removing dead MACH_U300_BS26\n drivers/infiniband: Remove unnecessary casts of private_data\n fs/ocfs2: Remove unnecessary casts of private_data\n libfc: use ARRAY_SIZE\n scsi: bfa: use ARRAY_SIZE\n drm: i915: use ARRAY_SIZE\n drm: drm_edid: use ARRAY_SIZE\n synclink: use ARRAY_SIZE\n block: cciss: use ARRAY_SIZE\n comment typo fixes: charater \u003d\u003e character\n fix comment typos concerning \"challenge\"\n arm: plat-spear: fix typo in kerneldoc\n reiserfs: typo comment fix\n update email address\n ...\n" }, { "commit": "b7c8e55db7141dcbb9d5305a3260fa0ed62a1bcc", "tree": "59fbd52d8e80e5a83d9747961d28aaf4d400613a", "parents": [ "ffd386a9a8273dcfa61705d0b349eebc7525ef87", "4015d9a865e3bcc42d88bedc8ce1551000bab664" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:23:14 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:23:14 2010 -0700" }, "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: (39 commits)\n random: Reorder struct entropy_store to remove padding on 64bits\n padata: update API documentation\n padata: Remove padata_get_cpumask\n crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier\n crypto: pcrypt - Rename pcrypt_instance\n padata: Pass the padata cpumasks to the cpumask_change_notifier chain\n padata: Rearrange set_cpumask functions\n padata: Rename padata_alloc functions\n crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask\n padata: Check for valid cpumasks\n padata: Allocate cpumask dependend recources in any case\n padata: Fix cpu index counting\n crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)\n pcrypt: Added sysfs interface to pcrypt\n padata: Added sysfs primitives to padata subsystem\n padata: Make two separate cpumasks\n padata: update documentation\n padata: simplify serialization mechanism\n padata: make padata_do_parallel to return zero on success\n padata: Handle empty padata cpumasks\n ...\n" }, { "commit": "fe445c6e2cb62a566e1a89f8798de11459975710", "tree": "db1f2c0c19f488992fb5b9371476b4e7701c49a0", "parents": [ "f63b759c44b0561c76a67894c734157df3313b42", "d01d0756f75e7a5b4b43764ad45b83c4340f11d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 10:41:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 10:41:52 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)\n Input: adp5588-keypad - fix NULL dereference in adp5588_gpio_add()\n Input: cy8ctmg110 - capacitive touchscreen support\n Input: keyboard - also match braille-only keyboards\n Input: adp5588-keys - export unused GPIO pins\n Input: xpad - add product ID for Hori Fighting Stick EX2\n Input: adxl34x - fix leak and use after free\n Input: samsung-keypad - Add samsung keypad driver\n Input: i8042 - reset keyboard controller wehen resuming from S2R\n Input: synaptics - set min/max for finger width\n Input: synaptics - only report width on hardware that supports it\n Input: evdev - signal that device is writable in evdev_poll()\n Input: mousedev - signal that device is writable in mousedev_poll()\n Input: change input handlers to use bool when possible\n Input: document the MT event slot protocol\n Input: introduce MT event slots\n Input: usbtouchscreen - implement reset_resume\n Input: usbtouchscreen - implement runtime power management\n Input: usbtouchscreen - implement basic suspend/resume\n Input: Add ATMEL QT602240 touchscreen driver\n Input: fix signedness warning in input_set_keycode()\n ...\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "412a4ac5e9cf7fdeb6af562c25547a9b9da7674f", "tree": "a8ce13cbc9c47c99799e5e3e3ad26ba78274ee73", "parents": [ "e8e5c2155b0035b6e04f29be67f6444bc914005b", "0c2daaafcdec726e89cbccca61d576de8429c537" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 10:26:03 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 10:26:03 2010 +1000" }, "message": "Merge commit \u0027gcl/next\u0027 into next\n" }, { "commit": "0ca724d37af370dbf2d55dc4d6359ead558e5756", "tree": "994685118202d9bf54f11ec9b39a654f6fb4f21f", "parents": [ "b5cb259e7fac5536c4ddf350af6a3d6cc950e47e" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Jul 24 19:03:02 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Aug 03 09:04:16 2010 +0200" }, "message": "pcmcia: use struct resource for PCMCIA devices, part 2\n\nUse struct resource * also for iomem resources.\n\nCC: linux-mtd@lists.infradead.org\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "b5cb259e7fac5536c4ddf350af6a3d6cc950e47e", "tree": "fd752edd9a19ad9592fdabc87465ba17019465f6", "parents": [ "a3d0d4d8dd45779b6e174a8567ffb9b485e472af" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Jul 24 18:46:42 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Aug 03 09:04:14 2010 +0200" }, "message": "pcmcia: remove memreq_t\n\nPage already had to be set to 0; Offset can easily be passed as\nparameter to pcmcia_map_mem_page.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: linux-bluetooth@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Michael Buesch \u003cmb@bu3sch.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "90abdc3b973229bae98dd96649d9f7106cc177a4", "tree": "5c1a7a131b65560dd73b5103118d8c7631bd76a4", "parents": [ "9a017a910346afd88ec2e065989903bf211a7d37" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Jul 24 17:23:51 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Aug 03 09:04:11 2010 +0200" }, "message": "pcmcia: do not use io_req_t when calling pcmcia_request_io()\n\nInstead of io_req_t, drivers are now requested to fill out\nstruct pcmcia_device *p_dev-\u003eresource[0,1] for up to two ioport\nranges. After a call to pcmcia_request_io(), the ports found there\nare reserved, after calling pcmcia_request_configuration(), they may\nbe used.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Michael Buesch \u003cmb@bu3sch.de\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "9a017a910346afd88ec2e065989903bf211a7d37", "tree": "b407945c6e762f252bb81ae0fd64c745bba2ad11", "parents": [ "2ce4905e4da9f512b38f56a53ece9da2072dd164" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Jul 24 15:58:54 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Aug 03 09:03:59 2010 +0200" }, "message": "pcmcia: do not use io_req_t after call to pcmcia_request_io()\n\nAfter pcmcia_request_io(), do not make use of the values stored in\nio_req_t, but instead use those found in struct pcmcia_device-\u003eresource[].\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "d01d0756f75e7a5b4b43764ad45b83c4340f11d6", "tree": "90db2ff7ccb35a8fdcf98366e6404afe1f845bc4", "parents": [ "b326b853dca2f410b254198ee89abad71a2f4668", "0d87c7228a49e8342d60dd552892e470e0b291fa" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Aug 02 18:35:17 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Aug 02 18:35:17 2010 -0700" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "d1d6ca73ef548748e141747e7260798327d6a2c1", "tree": "0a69cbfb66f2b30d707f24861baf3399d77c350b", "parents": [ "cda4b7d3a5b1dcbc0d8e7bad52134347798e9047" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 08 09:22:46 2010 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Aug 01 19:58:57 2010 -0700" }, "message": "drm/agp/i915: trim stolen space to 32M\n\nSome BIOSes will claim a large chunk of stolen space. Unless we\nreclaim it, our aperture for remapping buffer objects will be\nconstrained. So clamp the stolen space to 32M and ignore the rest.\n\nFixes https://bugzilla.kernel.org/show_bug.cgi?id\u003d15469 among others.\n\nAdding the ignored stolen memory back into the general pool using the\nmemory hotplug code is left as an exercise for the reader.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Simon Farnsworth \u003csimon.farnsworth@onelan.com\u003e\nTested-by: Artem S. Tashkinov \u003ct.artem@mailcity.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "831cd4453598b2c8e193f077023910c6b0c39558", "tree": "242d8e619cf40f3f760f4a26b16e6344f3ca6cfc", "parents": [ "2bd34f6ca86b5a5f9b749624f73310820e7a93fd" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Jul 24 18:29:37 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Aug 01 19:35:14 2010 -0700" }, "message": "agp/intel: Destroy the scatterlist on allocation failure\n\nA side-effect of being able to use custom page allocations with the\nsg_table is that it cannot reap the partially constructed scatterlist if\nfails to allocate a page. So we need to call sg_free_table() ourselves\nif sg_alloc_table() fails.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "2bd34f6ca86b5a5f9b749624f73310820e7a93fd", "tree": "9e42100423e78f400412dfa974a6a13bac94d2c0", "parents": [ "a2757b6fab6dee3dbf43bdb7d7226d03747fbdb1", "9fe6206f400646a2322096b56c59891d530e8d51" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Aug 01 19:23:53 2010 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Aug 01 19:34:47 2010 -0700" }, "message": "Merge remote branch \u0027origin/master\u0027 into drm-intel-next\n\nThis resolves the conflict in the EDP code, which has been rather\npopular to hack on recently.\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_dp.c\n" }, { "commit": "a2757b6fab6dee3dbf43bdb7d7226d03747fbdb1", "tree": "f3f30e2921f93fc6bfbcf0a8a13fba872b40de3e", "parents": [ "3869d4a8afd3ce97770e66d6a96672af93984cc2" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Fri Jul 09 10:45:17 2010 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Aug 01 19:03:48 2010 -0700" }, "message": "agp/intel: Add actual definitions of the Sandybridge PTE caching bits.\n" }, { "commit": "3869d4a8afd3ce97770e66d6a96672af93984cc2", "tree": "4b30002a2a55f2a74fcaf809ff58a0d8a37b286b", "parents": [ "6103da0d03d5f185070be50a0cb8813f6bf30dc1" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Fri Jul 09 10:40:58 2010 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Aug 01 19:03:48 2010 -0700" }, "message": "agp/intel: Support the extended physical addressing bits on Sandybridge.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\n[anholt: Split this patch out of a larger patch for Sandybridge fixes]\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "8699be3ef1d71d1c5e11eee239f53573d72515a3", "tree": "bf099cadccc715115b7e7b9f83a58a337a544dc9", "parents": [ "43b27f40ebc40758a4acad03ea9fa717ba65d76e" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Wed Jun 16 10:13:52 2010 +0200" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Aug 01 19:03:42 2010 -0700" }, "message": "intel_agp: Don\u0027t oops with zero stolen memory\n\nWhen \"onboard video memory\" is set do \"disabled\" in BIOS on Asus P4P800-VM\nboard (i865G), kernel oopses with memory corruption:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d28430\n\nFix that by cleanly aborting the initialization.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "22ae782f86b726f9cea752c0f269ff6dcdf2f6e1", "tree": "9458a01b24d65fa2eab27ad5bdb2fa399b3c389f", "parents": [ "12b15e83289bc7cf2ec9a342412e0c955beeb395" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jul 29 11:49:01 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Aug 01 01:42:42 2010 -0600" }, "message": "of/address: Clean up function declarations\n\nThis patch moves the declaration of of_get_address(), of_get_pci_address(),\nand of_pci_address_to_resource() out of arch code and into the common\nlinux/of_address header file.\n\nThis patch also fixes some of the asm/prom.h ordering issues. It still\nincludes some header files that it ideally shouldn\u0027t be, but at least the\nordering is consistent now so that of_* overrides work.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4015d9a865e3bcc42d88bedc8ce1551000bab664", "tree": "0bec23a1ae5c2c95b99360ff4ddb51b34212f446", "parents": [ "313910d3b98029a867bb4aa3ee552ae573db0458" ], "author": { "name": "Richard Kennedy", "email": "richard@rsk.demon.co.uk", "time": "Sat Jul 31 19:58:00 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Jul 31 19:58:00 2010 +0800" }, "message": "random: Reorder struct entropy_store to remove padding on 64bits \n\nRe-order structure entropy_store to remove 8 bytes of padding on\n64 bit builds, so shrinking this structure from 72 to 64 bytes\nand allowing it to fit into one cache line.\n\nSigned-off-by: Richard Kennedy \u003crichard@rsk.demon.co.uk\u003e\nSigned-off-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "53c1f764022337d7168b1344d6700b3d98e4acec", "tree": "63263e19f4aedaec80964c93526992d544e4a592", "parents": [ "ba9f507a1bea5ca2fc4a19e227c56b60fd5faca3" ], "author": { "name": "Samuel Thibault", "email": "samuel.thibault@ens-lyon.org", "time": "Sat Jul 31 02:28:51 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Jul 31 02:29:31 2010 -0700" }, "message": "Input: keyboard - also match braille-only keyboards\n\ndrivers/char/keyboard.c also handles braille keys, so it should also match\nbraille-only keyboards.\n\nSigned-off-by: Samuel Thibault \u003csamuel.thibault@ens-lyon.org\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "ac8b422838046ffc26be4874a3cbae0d313f4209", "tree": "936c8fc9a45ca7a2973c878fc0e20bbae288e5f0", "parents": [ "ce3f9d71bd9c4268698109ad425625a2a8f51e22" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Jul 21 22:38:13 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 21:07:39 2010 +0200" }, "message": "pcmcia: remove cs_types.h\n\nRemove cs_types.h which is no longer needed: Most definitions aren\u0027t\nused at all, a few can be made away with, and two remaining definitions\n(typedefs, unfortunatley) may be moved to more specific places.\n\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "225aa01173b271a3802b716e14176eb7d11dcce4", "tree": "1a0fbb1abcc925aedbbf0d6b778d58e604a660a0", "parents": [ "6aa033d7efb85830535bb83cf6713d6025ae6e59", "b690e96cf9e6a6cde6f0393de47bdd6317ddb5de" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 26 13:04:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 26 13:04:25 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:\n drm/i915: add pipe A force quirks to i915 driver\n drm/i915: Fix panel fitting regression since 734b4157\n drm/i915: fix deadlock in fb teardown\n drm/i915: don\u0027t free non-existent compressed llb on ILK+\n agp/intel: Use the correct mask to detect i830 aperture size.\n drm/i915: disable FBC when more than one pipe is active\n drm/i915: Use the correct scanout alignment for fbcon.\n drm/i915: make sure eDP panel is turned on\n drm/i915: add PANEL_UNLOCK_REGS definition\n drm/i915: Make G4X-style PLL search more permissive\n drm/i915: Clear any existing dither mode prior to enabling spatial dithering\n drm/i915: handle shared framebuffers when flipping\n drm/i915: Explosion following OOM in do_execbuffer.\n gpu/drm/i915: Add a blacklist to omit modeset on LID open\n" }, { "commit": "e7b96f28c58ca09f15f6c2e8ccbb889a30fab4f7", "tree": "c18a4935e21c4d4f567489fed10899e2447a985c", "parents": [ "9c928d168d4030a230a7a5ee1764721d173f1153" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Fri Jul 09 14:48:50 2010 -0600" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Jul 26 11:27:07 2010 -0700" }, "message": "agp/intel: Use the correct mask to detect i830 aperture size.\n\nBugLink: https://bugs.launchpad.net/bugs/597075\n\ncommit f1befe71fa7a79ab733011b045639d8d809924ad introduced a\nregression when detecting aperture size of some i915 adapters, e.g.,\nthose on the Intel Q35 chipset.\n\nThe original report: https://bugzilla.kernel.org/show_bug.cgi?id\u003d15733\nThe regression report: https://bugzilla.kernel.org/show_bug.cgi?id\u003d16294\n\nAccording to the specification found at\nhttp://intellinuxgraphics.org/VOL_1_graphics_core.pdf, the PCI config\nspace register I830_GMCH_CTRL is a mirror of GMCH Graphics\nControl. The correct macro for isolating the aperture size bits is\ntherefore I830_GMCH_GMS_MASK along with the attendant changes to the\ncase statement.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nTested-by: Kees Cook \u003ckees.cook@canonical.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Eric Anholt \u003ceric@anholt.net\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "59f6fbe4291fcc078ba26ce4edf8373a7620a13a", "tree": "1ca4be1a5cb996ace569fccded07e502a70bd32e", "parents": [ "86c65a7857896b1de99628ad392556965c4841e6" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Wed Jun 23 12:18:56 2010 -0700" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jul 26 10:25:45 2010 +1000" }, "message": "tpm_tis: fix subsequent suspend failures\n\nFix subsequent suspends by issuing tpm_continue_selftest during resume.\nOtherwise, the tpm chip seems to be not fully initialized and will reject\nthe save state command during suspend, thus preventing the whole system\nto suspend.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16256\n\nSigned-off-by: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Debora Velarde \u003cdebora@linux.vnet.ibm.com\u003e\nCc: David Safford \u003csafford@watson.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "1ab1d63a85cee2545272f63a7644e9f855cb65d0", "tree": "089afe8c03370cdfaf3eeb30d09e1bcac8a67898", "parents": [ "eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 24 15:14:37 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:52 2010 -0600" }, "message": "of/platform: remove all of_bus_type and of_platform_bus_type references\n\nBoth of_bus_type and of_platform_bus_type are just #define aliases\nfor the platform bus. This patch removes all references to them and\nswitches to the of_register_platform_driver()/of_unregister_platform_driver()\nAPI for registering.\n\nSubsequent patches will convert each user of of_register_platform_driver()\ninto plain platform_drivers without the of_platform_driver shim. At which\npoint the of_register_platform_driver()/of_unregister_platform_driver()\nfunctions can be removed.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edd63cb6b91024332d6983fc51058ac1ef0c081e", "tree": "2df04fc5dc35899aa7d4f4c52197f7b492c16c8b", "parents": [ "b0679c63db655fa12007558e267bc0eb1d486fdb" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "message": "sysrq,kdb: Use __handle_sysrq() for kdb\u0027s sysrq function\n\nThe kdb code should not toggle the sysrq state in case an end user\nwants to try and resume the normal kernel execution.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "7ea7c6d51ecf6010381fcb8ff67b0fcd6f34c255", "tree": "30a3ac24c3240b47233d4016f6f5ce985cce7698", "parents": [ "0e4a9d03df0a7ba516bbd94d2ec17d26859e46ba" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Mon Jun 28 15:54:48 2010 +0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Jul 20 17:04:11 2010 +0200" }, "message": "synclink: use ARRAY_SIZE\n\nChange sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nAcked-by: Paul Fulghum \u003cpaulkf@microgate.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "4455b1191cabbf7ecada800b7cfeccddb0af2b3a", "tree": "3c9ddd34f60718085050f63b59a51a90b596d806", "parents": [ "32d8ad4e621d6620e925cf540ef1d35aa6fa5a7b" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Jul 06 08:03:16 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jul 09 11:28:24 2010 +1000" }, "message": "hvc_console: use \"*_console\" nomenclature to avoid modpost warning.\n\nThe use of \"hvc_con_driver\" as the name for a file-static \"struct\nconsole\" with a \".setup\" field pointing to an __init function causes\na modpost warning, since a non-initdata structure points to init code.\nUsing \"hvc_console\" as the name triggers the hacky \"*_console\"\nworkaround in modpost to silence the warning, and is the same thing\nthat most of the other console drivers already do.\n\nI made the same change in hvsi.c since I happened to notice it was\nlikely to suffer from the same problem.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "a2262d8a231e92742651859a10c9a4430a5e899a", "tree": "b5a823e3f6a3f60e1dd995f113caf0b350228d84", "parents": [ "ef06f55a5c936a395f3ee2e1237bbebdb4396c65", "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Jul 06 13:45:24 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Jul 06 13:45:24 2010 -0400" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "ef06f55a5c936a395f3ee2e1237bbebdb4396c65", "tree": "fce333d35dc147020a773ec36cfdb17690e2f00a", "parents": [ "bcd97c3f9a385e8e658a416cd72dd65ca0eeb544" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Jul 02 14:19:35 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Jul 06 13:42:15 2010 -0400" }, "message": "arch/tile: catch up on various minor cleanups.\n\nNone of these changes fix any actual bugs, but are just various cleanups\nthat fell out along the way. In particular, some unused #defines and\nincludes are removed, PREFETCH_STRIDE is added (the default is right for\nour shipping chips, but wrong for our next generation), our tile-specific\nprefetching code is removed so the (identical) generic prefetching code\ncan be used instead, a comment is fixed to be proper GPL and not just a\n\"paste GPL here\" token, a \"//\" comment is converted to \"/* */\", etc.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "8b9cfdca9c52f7d39c3ccfac1668e31c20c9f42e", "tree": "7e15589f629ca63edf91470d1cd676c96c933d4f", "parents": [ "5e833bc4166ea524c00a95e777e4344844ed189f" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Mon Jul 05 21:25:06 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 05 21:25:06 2010 +0800" }, "message": "hwrng: n2-drv - remove casts from void*\n\nRemove unnesessary casts from void*.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "bf4f42b441919417386beb2f9c58e802e7de89df", "tree": "39fce2e84056f6c2d7cb1966289bfb52cd6ffdab", "parents": [ "1e31b0ffbb3b10133044e9c4bec4bd4b3f278229", "2f9c6b0a91a050669dd6df487174de6b96c2774a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)\n drm/radeon/kms: remove rv100 bios connector quirk\n drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode\n DRM / radeon / KMS: Fix hibernation regression related to radeon PM (was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300)\n drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)\n drm/radeon: add quirk to make HP nx6125 laptop resume.\n drm/radeon/kms: add some missing regs to evergreen gpu init\n drm/radeon/kms: fix typos in evergreen command checker\n drm/radeon/kms: avoid oops on mac r4xx cards\n fb: fix colliding defines for fb flags.\n drm/radeon/kms: Force HDP_NONSURF to maximum size\n drm/radeon/kms: disable frac fb dividers for rs6xx\n drm/radeon/kms: don\u0027t read attempt to read bios from VRAM on unposted GPU.\n drm/radeon/kms: fix typo in evergreen_gpu_init\n drm/radeon/kms: return ret in cursor_set failure path\n drm/ttm: non pooled page allocation should have GFP_USER set\n drm/radeon/r100/r200: fix calculation of compressed cube maps\n drm/radeon/r200: handle more hw tex coord types\n drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx\n drm/radeon: add fake RN50 table for powerpc\n drm/fb: Fix video\u003d mode computation\n ...\n" }, { "commit": "8d1f66dc9b4f80a1441bc1c33efa98aca99e8813", "tree": "0876484c740e90568f9f0300f012e674622679c9", "parents": [ "5c0c165490e763eddcbb0b6c8c41ab5cc11ddea0" ], "author": { "name": "Martin Wilck", "email": "martin.wilck@ts.fujitsu.com", "time": "Tue Jun 29 15:05:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "ipmi: set schedule_timeout_wait() value back to one\n\nFix a regression introduced by ae74e823cb7d (\"ipmi: add parameter to limit\nCPU usage in kipmid\").\n\nSome systems were seeing CPU usage go up dramatically with the recent\nchanges to try to reduce timer usage in the IPMI driver. This was traced\ndown to schedule_timeout_interruptible(1) being changed to\nschedule_timeout_interruptbile(0). Revert that part of the change.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16147\n\nReported-by: Thomas Jarosch \u003cthomas.jarosch@intra2net.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nTested-by: Thomas Jarosch \u003cthomas.jarosch@intra2net.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.34.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "56480287f9776adc5b1a7a335ef62a9b9879ad7f", "tree": "74d6962b3e056fdf6303f7fc12f9e50b514faf11", "parents": [ "e05bd3367bd3d88715b53766f95bb3a8ec7ab59e" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Tue Jun 29 15:05:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "ipmi: make sure drivers were registered before unregistering them\n\nThe ipmi code will never register a PCI or Open Firmware driver if a\nhardcoded device is provided by the user by providing device addresses via\nthe module parameters. This can cause us to attempt to unregister a\ndriver that was never registered, resulting in an oops. Keep track of\nregistration in order to avoid this.\n\nFixes a post-2.6.34 regression.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nAcked-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a5f20fe197f814fc0b29173894a706f478db821", "tree": "f09735a5265639f40f3cfb6e2187b4239c9ae3eb", "parents": [ "55982d94009c8fb1ea79855dba0c079c36224c38", "3267a87f9dc38d036571ff0880533d9ae8989f01" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 08:03:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 08:03:00 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n MAINTAINERS - Add an entry for the input MT protocol\n Input: wacom - fix serial number handling on Cintiq 21UX2\n Input: fixup X86_MRST selects\n Input: sysrq - fix \"stuck\" SysRq mode\n Input: ad7877 - fix spi word size to 16 bit\n Input: pcf8574_keypad - fix off by one in pcf8574_kp_irq_handler()\n" }, { "commit": "9c78965ca18594fe0a34a1a1b13781b10f85e4bc", "tree": "60c9e83d3c2b56e3c7f5169b63577a72bf7ddb57", "parents": [ "139ef32b0e6b88b00b5e3e74d052d938f178dc9b", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Jun 25 14:38:16 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Jun 25 14:38:16 2010 -0400" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "0e789314f8c0b50bd19bf08dc5624b9604d60183", "tree": "64b6b9655e944284937f5eeff643f0754f35d0af", "parents": [ "f5dec51172b81db226a23f309bc737ad021af35b", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jun 22 11:32:04 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jun 22 11:32:04 2010 -0700" }, "message": "Merge commit \u0027v2.6.35-rc3\u0027 into for-linus\n" }, { "commit": "1c48bc5f71cd7783e19fb8d9462be53f829be177", "tree": "e3ed0d8125dd6b30911dd4445fc5b3ff423a26f3", "parents": [ "da931a931da85218add949266238c54b5fecd37f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 11:02:05 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 11:02:32 2010 +1000" }, "message": "agp: add no warn since we have a fallback to vmalloc paths\n\nalso drop the NORETRY we can probably nearly always satisfy order 1 allocs now,\nand again the vmalloc path is there.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "da931a931da85218add949266238c54b5fecd37f", "tree": "63f4e081715b00b403bf45d705a636a29d80a7e9", "parents": [ "f5c5f040b565435e9a85898dc87ab365395e0603" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 09:52:37 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 09:56:01 2010 +1000" }, "message": "agp: drop vmalloc flag.\n\nSince the code that was too ugly to live is upstream, we can use it now,\ninstead of rolling our own.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "02a077c52ef7631275a79862ffd9f3dbe9d38bc2", "tree": "e7101d617847953dbf28f8658251b7401c4135b3", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Mon Jun 14 13:58:22 2010 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Jun 15 09:26:28 2010 +1000" }, "message": "TPM: ReadPubEK output struct fix\n\nThis patch adds a missing element of the ReadPubEK command output,\nthat prevents future overflow of this buffer when copying the\nTPM output result into it.\n\nPrevents a kernel panic in case the user tries to read the\npubek from sysfs.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f5dec51172b81db226a23f309bc737ad021af35b", "tree": "06fa3d4fbd4a9fc347d355151b0bf9fefcf5f41e", "parents": [ "cd9b6fdf798841eb15253f928e762eee5260d347" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jun 09 08:13:06 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jun 09 08:13:56 2010 -0700" }, "message": "Input: sysrq - fix \"stuck\" SysRq mode\n\nThis shoud fix the problem with SysRq mode staying half-way enabled\nand interfereing with normal PrtScrn operation after user presses ALT\nfor the first time.\n\nReported-and-tested-by: Éric Piel \u003cE.A.B.Piel@tudelft.nl\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "386f40c86d6c8d5b717ef20620af1a750d0dacb4", "tree": "6cd79f6dba461948b2cbaa0ca1e725a36ffd1d63", "parents": [ "e44a21b7268a022c7749f521c06214145bd161e4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 06 20:44:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 06 20:44:04 2010 -0700" }, "message": "Revert \"tty: fix a little bug in scrup, vt.c\"\n\nThis reverts commit 962400e8fd29981a7b166e463dd143b6ac6a3e76, which was\nentirely bogus.\n\nThe code used to multiply the character offset by \"vc-\u003evc_cols\", and\nthat\u0027s actually correct, because \u0027d\u0027 itself is an \u0027unsigned short\u0027. So\nthe pointer arithmetic already takes the size of a VGA character into\naccount. Changing it to use vc_size_row (which is just \"vc_cols\"\nshifted up to take the size of the character into account) ends up\nmultiplying with the VGA character size twice.\n\nThis got reported as bugs for various other subsystems, because what it\nactually results in is writing the 16-bit vc_video_erase_char pattern\n(usually 0x0720: 0x07 is the default attribute, 0x20 is ASCII space)\ninto some random other allocation.\n\nSo Markus ended up reporting this as a ext4 bug, while to Torsten Kaiser\nit looked like a problem with KMS or libata. Jeff Chua saw it in\ndifferent places.\n\nAnd finally - Justin Mattock had slab poisoning enabled, and saw it as a\nslab poison overwritten. And bisected and reverted this to verify the\nbuggy commit.\n\nReported-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nReported-by: Torsten Kaiser \u003cjust.for.lkml@googlemail.com\u003e\nReported-by: Jeff Chua \u003cjeff.chua.linux@gmail.com\u003e\nReported-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nReported-bisected-and-tested-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Frank Pan \u003cfrankpzh@gmail.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cc44826a26b12b2489bc7dbb597fcdf107f2cc01", "tree": "98a7958212ac61345300944f512a949e5ee3e513", "parents": [ "482e6f8466ab1066f1a969bcdbe916b56439622c", "7f0d384cafabfbb56663ee6944c18fc0450fc5d6" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sat Jun 05 10:35:29 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sat Jun 05 10:35:29 2010 -0400" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "bf4282cbcf7f53c23e87fb0cef945591cdc8d631", "tree": "ce1844209ec623c1ed661405ffd8f8f37a319aa8", "parents": [ "d7940b04fa441b06b69f05faef43c5fb2156ab72", "66169ad17d9c67a33608830dd83dcef55c85a756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:23:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:23:07 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: add support for various Titan PCI cards\n vt_ioctl: return -EFAULT on copy_from_user errors\n serial: altera_uart: Proper section for altera_uart_remove\n tty: fix a little bug in scrup, vt.c\n altera_uart: Simplify altera_uart_console_putc\n altera_uart: Don\u0027t take spinlock in already protected functions\n TTY/n_gsm: potential double lock\n serial: bfin_5xx: fix typo in IER check\n serial: bfin_5xx: IRDA is not affected by anomaly 05000230\n serial_cs: add and sort IDs for serial and modem cards\n msm_serial: fix serial on trout\n" }, { "commit": "b7e5d1f04104d98895945ecb463d750320dcd6cf", "tree": "6d85743bed9c9644d05b622795788cc9730340e5", "parents": [ "7cbe17701a0379c7b05a79a6df4f24e41d2afde8" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Fri Jun 04 14:14:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:21:44 2010 -0700" }, "message": "ramoops: add HAS_IOMEM dependency\n\nThe driver fails to compile on s390:\n\ndrivers/char/ramoops.c: In function \u0027ramoops_init\u0027:\ndrivers/char/ramoops.c:122: error: implicit declaration of function \u0027ioremap\u0027\n\nSince we won\u0027t make use of the driver anyway on s390 just let it depend on\nHAS_IOMEM.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.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": "867e359b97c970a60626d5d76bbe2a8fadbf38fb", "tree": "c5ccbb7f5172e8555977119608ecb1eee3cc37e3", "parents": [ "5360bd776f73d0a7da571d72a09a03f237e99900" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri May 28 23:09:12 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Jun 04 17:11:18 2010 -0400" }, "message": "arch/tile: core support for Tilera 32-bit chips.\n\nThis change is the core kernel support for TILEPro and TILE64 chips.\nNo driver support (except the console driver) is included yet.\n\nThis includes the relevant Linux headers in asm/; the low-level\nlow-level \"Tile architecture\" headers in arch/, which are\nshared with the hypervisor, etc., and are build-system agnostic;\nand the relevant hypervisor headers in hv/.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nReviewed-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "3fde85df5421eb01f563fef6f111ba73ab0d120e", "tree": "d22a55a611627b1985019af69e2740a452e5e97d", "parents": [ "c1bfffa94e0ca951ed450788991c9310adb8e823" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri Jun 04 12:20:46 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jun 04 13:37:18 2010 -0700" }, "message": "vt_ioctl: return -EFAULT on copy_from_user errors\n\ncopy_from_user() returns the number of bytes remaining but we want to\nreturn a negative error code here.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "962400e8fd29981a7b166e463dd143b6ac6a3e76", "tree": "9606786cc3ebd557d24e3e36f487a0c241fb3d9b", "parents": [ "fadf34f0f05ca5ea02ffcd89544cd372bbdb739b" ], "author": { "name": "Frank Pan", "email": "frankpzh@gmail.com", "time": "Wed May 26 15:37:43 2010 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jun 04 13:37:18 2010 -0700" }, "message": "tty: fix a little bug in scrup, vt.c\n\nThe code uses vc-\u003evc_cols instead of vc-\u003evc_size_row by mistake, it\nwill cause half of the region which is going to clear remain\nuncleared.\nThe issue happens in background consoles, so it\u0027s hard to observe.\n\nFrank Pan\n\nSigned-off-by: Frank Pan \u003cfrankpzh@gmail.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "328be395a396b1333b56e04571365dc614c96e46", "tree": "e4266351b4641c44f43747e776964d6321f10d3d", "parents": [ "e59e2bd9e85604ad601ec7dd056baffcd6ad56a0" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Tue May 25 11:37:17 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jun 04 13:37:17 2010 -0700" }, "message": "TTY/n_gsm: potential double lock\n\nIn gsm_dlci_data_kick() we call gsm_dlci_data_sweep() with the\n\"gsm-\u003etx_lock\" held so we can\u0027t lock it again inside\ngsm_dlci_data_sweep(). I removed that lock from and added one to\ngsmld_write_wakeup() instead. The sweep function is only called from\nthose two places.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "39059cceeda478cd040d521b9541d1113035c908", "tree": "56adf04d6766a4346160aacd709468e5b2f1b879", "parents": [ "b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2", "c2cdf6aba0dfcfb54be646ab630c1bccd180e890" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/macio: Fix probing of macio devices by using the right of match table\n agp/uninorth: Fix oops caused by flushing too much\n powerpc/pasemi: Update MAINTAINERS file\n powerpc/cell: Fix integer constant warning\n powerpc/kprobes: Remove resume_execution() in kprobes\n powerpc/macio: Don\u0027t dereference pointer before null check\n" }, { "commit": "60e5e0b84045ce0f6ab07a02c7fcd6627b53d2d3", "tree": "10ce932b6087da2cb0d118b871b4044fbace7299", "parents": [ "0047634d3daebca9e99a22eb89167bf77f35cdfa" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Thu May 27 13:24:40 2010 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jun 03 22:39:19 2010 +0930" }, "message": "virtio: console: Fix crash when port is unplugged and blocked for write\n\nWhen a program that has a virtio port opened and blocked for a write\noperation, a port hot-unplug event will later led to a crash when\nSIGTERM was sent to the program. Fix that.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "0047634d3daebca9e99a22eb89167bf77f35cdfa", "tree": "f3331e990777369228ea8a68b81cecd773e6157c", "parents": [ "a5b365a652206ca300256974ed9301a7d241a6ed" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Thu May 27 13:24:39 2010 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jun 03 22:39:18 2010 +0930" }, "message": "virtio: console: Fix crash when hot-unplugging a port and read is blocked\n\nWhen removing a port we don\u0027t check if a program was blocked for read.\nThis leads to a crash when SIGTERM is sent to the program after\nhot-unplugging the port.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "79905ad50bcf025deb81382413719ed600734941", "tree": "20e5b02a6accf2bc73bf19f3ec2fc4a42f70eb26", "parents": [ "92e197095e0aa59273decbeaa4b63de58e342355" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Tue Jun 01 19:33:08 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:50:37 2010 +1000" }, "message": "agp/uninorth: Fix oops caused by flushing too much\n\nThis fixes a sporadic oops at boot on G5 Power Macs. The table_end\nvariable has the address of the last byte of the table. Adding on\nPAGE_SIZE means we flush too much, and if the page after the table\nis not mapped for any reason, the kernel will oops. Instead we add\non 1 because flush_dcache_range() interprets its second argument as\nthe first byte past the range to be flushed.\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "709d015bb810a3377feaee3093d110a17e919019", "tree": "7a003395ddf648950de114f1da6968c879d8c164", "parents": [ "08a66859e69264f3223560d06b88e80c1a6a6387", "e3a815fcd38043b8f1bb526123d8ab6ae01deb77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 01 14:12:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 01 14:12:27 2010 -0700" }, "message": "Merge branch \u0027drm-intel-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel\n\n* \u0027drm-intel-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (41 commits)\n drm/i915: add HAS_BSD check to i915_getparam\n drm/i915: Honor sync polarity from VBT panel timing descriptors\n drm/i915: Unmask interrupt for render engine on Sandybridge\n drm/i915: Fix PIPE_CONTROL command on Sandybridge\n drm/i915: Fix up address spaces in slow_kernel_write()\n drm/i915: Use non-atomic kmap for slow copy paths\n drm/i915: Avoid moving from CPU domain during pwrite\n drm/i915: Cleanup after failed initialization of ringbuffers\n drm/i915: Reject bind_to_gtt() early if object \u003e aperture\n drm/i915: Check error code whilst moving buffer to GTT domain.\n drm/i915: Remove spurious warning \"Failure to install fence\"\n drm/i915: Rebind bo if currently bound with incorrect alignment.\n drm/i915: Include pitch in set_base debug statement.\n drm/i915: Only print \"nothing to do\" debug message as required.\n drm/i915: Propagate error from unbinding an unfenceable object.\n drm/i915: Avoid nesting of domain changes when setting display plane\n drm/i915: Hold the spinlock whilst resetting unpin_work along error path\n drm/i915: Only print an message if there was an error\n drm/i915: Clean up leftover bits from hws move to ring structure.\n drm/i915: Add CxSR support on Pineview DDR3\n ...\n" }, { "commit": "7ea8085910ef3dd4f3cad6845aaa2b580d39b115", "tree": "d9c1edb5906f943f7d70bfb4b65106e29772d379", "parents": [ "cc967be54710d97c05229b2e5ba2d00df84ddd64" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed May 26 17:53:25 2010 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu May 27 22:05:02 2010 -0400" }, "message": "drop unused dentry argument to -\u003efsync\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a9a0aff5b56d4c40288c000ff09c3f238b6b6fec", "tree": "496cce8240689a61b4c76a4318ac53487287c74b", "parents": [ "ade61088bc77dd209f8edadbe544f1e5dad6c287", "0779c862e43e052c58a350a8bd2bf97e6908de04" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 10:19:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 10:19:19 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)\n m68k: amiga - RTC platform device conversion\n m68k: amiga - Parallel port platform device conversion\n m68k: amiga - Serial port platform device conversion\n m68k: amiga - Mouse platform device conversion\n m68k: amiga - Keyboard platform device conversion\n m68k: amiga - Amiga Gayle IDE platform device conversion\n m68k: amiga - A4000T SCSI platform device conversion\n m68k/scsi: a3000 - Do not use legacy Scsi_Host.base\n m68k: amiga - A3000 SCSI platform device conversion\n m68k/scsi: gvp11 - Do not use legacy Scsi_Host.base\n m68k: amiga - GVP Series II SCSI zorro_driver conversion\n m68k/scsi: a2091 - Do not use legacy Scsi_Host.base\n m68k: amiga - A2091/A590 SCSI zorro_driver conversion\n m68k/scsi: mvme147 - Kill obsolete HOSTS_C logic\n m68k/scsi: a3000 - Kill a3000_scsiregs typedef\n m68k/scsi: gvp11 - Kill gvp11_scsiregs typedef\n m68k/scsi: a2091 - Kill a2091_scsiregs typedef\n m68k/scsi: gvp11 - Extract check_wd33c93()\n m68k/scsi: a3000 - Kill static global a3000_host\n m68k/scsi: mvme147 - Kill static global mvme147_host\n ...\n" }, { "commit": "f67231f80126f4e08c79c7b2056989c5c89ad4c6", "tree": "49f4ed99e843ac6987291dda45f76e7017e27195", "parents": [ "87575437d8173c7da48a4dee25399807c7bec9cb" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed May 26 14:43:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "drivers/char/applicom.c: use memdup_user\n\nUse memdup_user when user data is immediately copied into the\nallocated region.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nposition p;\nidentifier l1,l2;\n@@\n\n- to \u003d \\(kmalloc@p\\|kzalloc@p\\)(size,flag);\n+ to \u003d memdup_user(from,size);\n if (\n- to\u003d\u003dNULL\n+ IS_ERR(to)\n || ...) {\n \u003c+... when !\u003d goto l1;\n- -ENOMEM\n+ PTR_ERR(to)\n ...+\u003e\n }\n- if (copy_from_user(to, from, size) !\u003d 0) {\n- \u003c+... when !\u003d goto l2;\n- -EFAULT\n- ...+\u003e\n- }\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "87575437d8173c7da48a4dee25399807c7bec9cb", "tree": "38937f38ab2ad2ea5105c689f2924db4f61e0de2", "parents": [ "56d611a04fb2db77334e06274de4daed92e2c626" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed May 26 14:43:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "drivers/char/ppdev.c: use kasprintf\n\nkasprintf combines kmalloc and sprintf, and takes care of the size\ncalculation itself.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression a,flag;\nexpression list args;\nstatement S;\n@@\n\n a \u003d\n- \\(kmalloc\\|kzalloc\\)(...,flag)\n+ kasprintf(flag,args)\n \u003c... when !\u003d a\n if (a \u003d\u003d NULL || ...) S\n ...\u003e\n- sprintf(a,args);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: Michael Buesch \u003cmb@bu3sch.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "56d611a04fb2db77334e06274de4daed92e2c626", "tree": "49ee40b22419ba36ffc6d94d9b66649b6d42ea52", "parents": [ "a747c5abc329611220f16df0bb4cf0ca4a7fdf0c" ], "author": { "name": "Marco Stornelli", "email": "marco.stornelli@gmail.com", "time": "Wed May 26 14:43:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "char drivers: RAM oops/panic logger\n\nRamoops, like mtdoops, can log oops/panic information but in RAM. It can\nbe used with persistent RAM for systems without flash support. In\naddition, for this systems, with this driver, it\u0027s no more needed add to\nthe kernel the mtd subsystem with advantage in footprint.\n\nIt can be used in a very easy way with persistent RAM for systems without\nflash support. For these systems, with this driver, it is no longer\nrequired to cinlude mtd subsystem with an advantage in footprint. In\naddition, you can save flash space and store this information only in RAM.\n\nSigned-off-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: Simon Kagstrom \u003csimon.kagstrom@netinsight.net\u003e\nCc: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nCc; Anders Grafstrom \u003canders.grafstrom@netinsight.net\u003e\nCc: Yuasa Yoichi \u003cyuasa@linux-mips.org\u003e\nCc: Jamie Lokier \u003cjamie@shareable.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a747c5abc329611220f16df0bb4cf0ca4a7fdf0c", "tree": "f34b59f7208a7d320138ed0807474ee351534b4e", "parents": [ "279fbd0c5daa60c76e59df33f436ca2300f2b603" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed May 26 14:43:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "ipmi: handle run_to_completion properly in deliver_recv_msg()\n\nIf run_to_completion flag is set, it means that we are running in a\nsingle-threaded mode, and thus no locks are held.\n\nThis fixes a deadlock when IPMI notifier is being called during panic.\n\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: Corey Minyard \u003cminyard@acm.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "279fbd0c5daa60c76e59df33f436ca2300f2b603", "tree": "d6907cdc8be44070ef79b82ddcc1c05cdf72804e", "parents": [ "8c8eae2742d5ad05ef6e5b53c88e70a5231d7d9a" ], "author": { "name": "Myron Stowe", "email": "myron.stowe@hp.com", "time": "Wed May 26 14:43:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "ipmi: update driver to use dev_printk and its constructs\n\nUpdate core IPMI driver printk()\u0027s with dev_printk(), and its constructs,\nto provide additional device topology information.\n\nAn example of the additional device topology for a PNP device -\n ipmi_si 00:02: probing via ACPI\n ipmi_si 00:02: [io 0x0ca2-0x0ca3] regsize 1 spacing 1 irq 0\n ipmi_si 00:02: Found new BMC (man_id: 0x00000b, prod_id: 0x0000, ...\n ipmi_si 00:02: IPMI kcs interface initialized\n\nand for a PCI device -\n ipmi_si 0000:01:04.6: probing via PCI\n ipmi_si 0000:01:04.6: PCI INT A -\u003e GSI 21 (level, low) -\u003e IRQ 21\n ipmi_si 0000:01:04.6: [mem 0xf1ef0000-0xf1ef00ff] regsize 1 spaci...\n ipmi_si 0000:01:04.6: IPMI kcs interface initialized\n\n[minyard@acm.org: rework to fix rejects, extended it a bit]\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Myron Stowe \u003cmyron.stowe@hp.com\u003e\nSigned-off-by: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8c8eae2742d5ad05ef6e5b53c88e70a5231d7d9a", "tree": "a45d86d1183f236c1b779d675ae0c32199319325", "parents": [ "ddac44b7b21b72c0d9d6882ac8d7027afc25138c" ], "author": { "name": "Myron Stowe", "email": "myron.stowe@hp.com", "time": "Wed May 26 14:43:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "ipmi: convert tracking of the ACPI device pointer to a PNP device\n\nConvert PNP patch (git 9e368fa011d4e0aa050db348d69514900520e40b) to\nmaintain a pointer to a PNP device, \u0027pnp_dev\u0027, instead of the ACPI device,\n\u0027acpi_dev\u0027, that is currently being tracked with PNP based IPMI device\ndiscovery.\n\nSigned-off-by: Myron Stowe \u003cmyron.stowe@hp.com\u003e\nAcked-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nAcked-by: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ddac44b7b21b72c0d9d6882ac8d7027afc25138c", "tree": "bfdd1c8fdd569563918f0b57f922a53934d2d7ee", "parents": [ "06ee459402434aabed0c6d03c4cc10bfe4a3a65b" ], "author": { "name": "Corey Minyard", "email": "cminyard@mvista.com", "time": "Wed May 26 14:43:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "ipmi: change timeout and event poll to one second\n\nThe timeouts in IPMI are in the 1-5 second range in message handling, so a\n1 second timeout is a reasonable thing to do. This should help with\nreducing power consumption on idle systems.\n\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "06ee459402434aabed0c6d03c4cc10bfe4a3a65b", "tree": "810654dc80af9bcf1cfd11d0bad4bf21c500e736", "parents": [ "3326f4f2276791561af1fd5f2020be0186459813" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 14:43:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:50 2010 -0700" }, "message": "ipmi: attempt to register multiple SIs of the same type\n\nSome odd systems may have multiple BMCs, and we want to be able to support\nthem. Let\u0027s make the assumption that if a system legitimately has\nmultiple BMCs then each BMC\u0027s SI will be of the same type, and also that\nwe won\u0027t see multiple SIs of the same type unless we have multiple BMCs.\nIf these hold true then we should register all SIs of the same type.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3326f4f2276791561af1fd5f2020be0186459813", "tree": "1a448dae09ae046e30be294085699cd40dd054a7", "parents": [ "ea4078ca1a7a3a198e519c2a7a2ed6126e40b130" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 14:43:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:49 2010 -0700" }, "message": "ipmi: reduce polling\n\nWe can reasonably alter the poll rate depending on whether we\u0027re\nperforming a transaction or merely waiting for an event.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ea4078ca1a7a3a198e519c2a7a2ed6126e40b130", "tree": "8b53cbda0032c2eb5eac6f2c0bad563d2217bfdc", "parents": [ "754d453185275951d39792865927ec494fa1ebd8" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 14:43:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:49 2010 -0700" }, "message": "ipmi: reduce polling when interrupts are available\n\nIf we\u0027re not currently in the middle of a transaction, and if we have\ninterrupts, there\u0027s no real reason to poll the controller more frequently\nthan the core IPMI code does. Set the interrupt_disabled flag\nappropriately as the interrupt state changes, and make the timeout code\nreset itself only if the transaction is incomplete or we have no\ninterrupts.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "754d453185275951d39792865927ec494fa1ebd8", "tree": "4f987571383aa87efe1ddf8eaf14e91d7850dee0", "parents": [ "d8cc5267b802003e2c67ac5254788044852ccfa9" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 14:43:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:49 2010 -0700" }, "message": "ipmi: change device discovery order\n\nThe ipmi spec provides an ordering for si discovery. Change the driver to\nmatch, with the exception of preferring smbios to SPMI as HPs (at least)\ncontain accurate information in the former but not the latter.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8cc5267b802003e2c67ac5254788044852ccfa9", "tree": "3b45ebdb73cea591cfd162ca651d374723cf3fd8", "parents": [ "2407d77a1a013b88ee3b817f2b934e420e5376f5" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 14:43:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:49 2010 -0700" }, "message": "ipmi: only register one si per bmc\n\nOnly register one si per bmc. Use any user-provided devices first,\nfollowed by the first device with an irq, followed by the first device\ndiscovered.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2407d77a1a013b88ee3b817f2b934e420e5376f5", "tree": "bb7eeb2621dccc01964612e664de17d612a7aa11", "parents": [ "5fedc4a282f0c6f5be5e4bebc8840f6022153bb3" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 14:43:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:49 2010 -0700" }, "message": "ipmi: split device discovery and registration\n\nThe ipmi spec indicates that we should only make use of one si per bmc, so\nseparate device discovery and registration to make that possible.\n\n[thenzl@redhat.com: fix mutex use]\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Tomas Henzl \u003cthenzl@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5fedc4a282f0c6f5be5e4bebc8840f6022153bb3", "tree": "cdbfc893d5c98b106e22f7f0c3f81ea1b9023bcc", "parents": [ "4de85cd6d6018825e19f76f1208775f23ecc393f" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 14:43:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:49 2010 -0700" }, "message": "ipmi: change addr_source to an enum rather than strings\n\nSwitch from a char* to an enum to identify the address source of SIs,\nmaking it easier to handle them appropriately during registration.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9b71ca2005a93ad813b95d92578131ab899ccc5d", "tree": "9579c7b16e155de25c23ee227a11c62817e14ec4", "parents": [ "dc0fd7b56141999832a6bccda2f7e9765f0bc087" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed May 26 14:42:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "drivers/char/vt.c: use memdup_user\n\nUse memdup_user when user data is immediately copied into the\nallocated region.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nposition p;\nidentifier l1,l2;\n@@\n\n- to \u003d \\(kmalloc@p\\|kzalloc@p\\)(size,flag);\n+ to \u003d memdup_user(from,size);\n if (\n- to\u003d\u003dNULL\n+ IS_ERR(to)\n || ...) {\n \u003c+... when !\u003d goto l1;\n- -ENOMEM\n+ PTR_ERR(to)\n ...+\u003e\n }\n- if (copy_from_user(to, from, size) !\u003d 0) {\n- \u003c+... when !\u003d goto l2;\n- -EFAULT\n- ...+\u003e\n- }\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f1befe71fa7a79ab733011b045639d8d809924ad", "tree": "0855977ab676ad0f7ee4feb215e41ad29d30e371", "parents": [ "9a7e8492d17394a81d5534abf90b5b2ada7ea3c0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue May 18 12:24:51 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Wed May 26 14:10:27 2010 -0700" }, "message": "agp/intel: Restrict GTT mapping to valid range on i915 and i945\n\nReferences:\n\n Bug 15733 - Crash when accessing nonexistent GTT entries in i915\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d15733\n\nOn G33 and above, the size of the GTT space is determined by the GMCH\ncontrol register. Prior to this revision, the size is determined by the\nsize of the aperture. So we must careful to map and fill the appropriate\nrange depending on chipset.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "31f46717997a83bdf6db0dd04810c0a329eb3148", "tree": "e10ae643fb03226b639d31f07a7ad70a300d448d", "parents": [ "91803b499cca2fe558abad709ce83dc896b80950", "2101d6f7ac791e87a274371a07a408f74e40ec49" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 26 12:30:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 26 12:30:09 2010 -0700" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n agp: amd64, fix pci reference leaks\n drm/edid: Allow non-fatal checksum errors in CEA blocks\n drm/radeon/kms: suppress a build warning (unused variable)\n drm: Fixes linux-next \u0026 linux-2.6 checkstack warnings:\n nouveau: fix acpi_lid_open undefined\n drm/radeon/kms: release AGP bridge at suspend\n" }, { "commit": "826e8c8c804e5a38586c6b48ef38d1e755789f0c", "tree": "f71bbfbbe4edcc26e7e9cf470b0b506b20714da5", "parents": [ "314c926f64b345f153b9180a2c79333657dbec48" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 05 13:12:30 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed May 26 19:51:09 2010 +0200" }, "message": "m68k: amiga - Serial port platform device conversion\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "2101d6f7ac791e87a274371a07a408f74e40ec49", "tree": "c35ef331a11f6ae042e47c9cb8b2028562b42bb6", "parents": [ "4a638b4e38234233f5c7e6705662fbc0b58d80c2" ], "author": { "name": "Jiri Slaby", "email": "jirislaby@gmail.com", "time": "Mon May 24 12:14:15 2010 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 26 12:54:39 2010 +1000" }, "message": "agp: amd64, fix pci reference leaks\n\nStanse found pci reference leaks in uli_agp_init and nforce3_agp_init\ninitialization functions.\n\nThe PCI devices are bridges, so it\u0027s not critical, but still worth fixing.\n\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ec96e2fe954c23a54bfdf2673437a39e193a1822", "tree": "e4041c68ef20a3337c56aefc8db785156307edd1", "parents": [ "8e9815a0f8882aaa68645b001bb7538db8886802", "f949c0edd84101bfd30b3e7389c1a12b067e561d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:06:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:06:33 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)\n ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900\n ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline\n ARM: 6140/1: silence a bogus sparse warning in unwind.c\n ARM: mach-at91: duplicated include\n ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup\n ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup\n ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup\n ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup\n ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup\n ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup\n ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup\n ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup\n ARM: SPEAR6xx: remove duplicated #include\n ARM: s3c6400_defconfig: Add NAND driver\n ARM: s3c6400_defconfig: enable sound as modules\n ARM: s3c6400_defconfig: enable power management\n ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34\n ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34\n ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34\n ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34\n ...\n" }, { "commit": "fa1f68db6ca7ebb6fc4487ac215bffba06c01c28", "tree": "6682b0c8d27c0d0a377125215f54378be37c5b61", "parents": [ "6c5e303afdf2910e58aeda56c10506342545a5af" ], "author": { "name": "Samu Onkalo", "email": "samu.p.onkalo@nokia.com", "time": "Mon May 24 14:33:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "drivers: misc: pass miscdevice pointer via file private data\n\nFor misc devices, inode-\u003ei_cdev doesn\u0027t point to the device drivers own\ndata. Link between file operations and device driver internal data is\nlost. Pass pointer to misc device struct via file private data for driver\nopen function use.\n\nSigned-off-by: Samu Onkalo \u003csamu.p.onkalo@nokia.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "08a82c6872ac1d37cb993a52f1b35f97f48295bd", "tree": "43599b0869e8001e3e207e3498a5d510720070f2", "parents": [ "4be929be34f9bdeffa40d815d32d7d60d2c7f03b" ], "author": { "name": "Phil Carmody", "email": "ext-phil.2.carmody@nokia.com", "time": "Mon May 24 14:33:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "hvsi: fix messed up error checking getting state name\n\nHandle out-of-range indices before reading what they refer to. And don\u0027t\naccess the one-past-the-end element of the array either.\n\nSigned-off-by: Phil Carmody \u003cext-phil.2.carmody@nokia.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "940370fc86b920b51a34217a1facc3e9e97c2456", "tree": "6d53529bc158408c42df40d78ee728adb399f787", "parents": [ "b3b77c8caef1750ebeea1054e39e358550ea9f55" ], "author": { "name": "Yury Polyanskiy", "email": "ypolyans@princeton.edu", "time": "Mon May 24 14:33:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "hangcheck-timer: fix x86_32 bugs\n\ndrivers/char/hangcheck-timer.c is doubly broken. When the overflown value\nof TIMER_FREQ is abnormally low, it spams the syslog with KERN_CRIT\nmessages \"Hangcheck: hangcheck value past margin!\" But whether it happens\nor not depends on HZ and lpj in a complex way. People have hit it\noccasionally as far as google search can tell.\n\nFirst, the following line overflows unsigned long:\n\n# define TIMER_FREQ (HZ*loops_per_jiffy)\n\nSecond, and more importantly, loops_per_jiffy has little to do with the\ncon\u003d version from the the time scale of get_cycles() (aka rdtsc) to the\ntime scale of jiffies.\n\nThe attached patch resolves both of the problems.\n\nAcked-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: john stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Jan Glauber \u003cjan.glauber@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f13771187b9423b824f32518319f6da85d819003", "tree": "c431cf16c286065a302d5f3fb43fc1abac7e4047", "parents": [ "15953654cc312429740fd58fb37a5a3d63a54376", "9f37af654fda88a8dcca74c785f6c20e52758866" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "message": "Merge branch \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing\n\n* \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:\n uml: Pushdown the bkl from harddog_kern ioctl\n sunrpc: Pushdown the bkl from sunrpc cache ioctl\n sunrpc: Pushdown the bkl from ioctl\n autofs4: Pushdown the bkl from ioctl\n uml: Convert to unlocked_ioctls to remove implicit BKL\n ncpfs: BKL ioctl pushdown\n coda: Clean-up whitespace problems in pioctl.c\n coda: BKL ioctl pushdown\n drivers: Push down BKL into various drivers\n isdn: Push down BKL into ioctl functions\n scsi: Push down BKL into ioctl functions\n dvb: Push down BKL into ioctl functions\n smbfs: Push down BKL into ioctl function\n coda/psdev: Remove BKL from ioctl function\n um/mmapper: Remove BKL usage\n sn_hwperf: Kill BKL usage\n hfsplus: Push down BKL into ioctl function\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "1756ac3d3c41341297ea25b818b7fce505bb2a9a", "tree": "96382220afbb82fd5c576c4c08b3c3e13282851f", "parents": [ "98edb6ca4174f17a64890a02f44c211c8b44fb3c", "0643e4c6e4fd67778fa886a89e6ec2320e0ff4d3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:22:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:22:52 2010 -0700" }, "message": "Merge branch \u0027virtio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027virtio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)\n drivers/char: Eliminate use after free\n virtio: console: Accept console size along with resize control message\n virtio: console: Store each console\u0027s size in the console structure\n virtio: console: Resize console port 0 on config intr only if multiport is off\n virtio: console: Add support for nonblocking write()s\n virtio: console: Rename wait_is_over() to will_read_block()\n virtio: console: Don\u0027t always create a port 0 if using multiport\n virtio: console: Use a control message to add ports\n virtio: console: Move code around for future patches\n virtio: console: Remove config work handler\n virtio: console: Don\u0027t call hvc_remove() on unplugging console ports\n virtio: console: Return -EPIPE to hvc_console if we lost the connection\n virtio: console: Let host know of port or device add failures\n virtio: console: Add a __send_control_msg() that can send messages without a valid port\n virtio: Revert \"virtio: disable multiport console support.\"\n virtio: add_buf_gfp\n trans_virtio: use virtqueue_xxx wrappers\n virtio-rng: use virtqueue_xxx wrappers\n virtio_ring: remove a level of indirection\n virtio_net: use virtqueue_xxx wrappers\n ...\n\nFix up conflicts in drivers/net/virtio_net.c due to new virtqueue_xxx\nwrappers changes conflicting with some other cleanups.\n" }, { "commit": "2a8ba8f032160552a3beffab8aae9019ff477504", "tree": "b50f70a3c8f7c2e179e1587d33ea3542d68525f9", "parents": [ "ec2a7587e0a91d5c1afe23a0a73edfce06c5e4e0", "e954bc91bdd4bb08b8325478c5004b24a23a3522" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 14:46:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 14:46:51 2010 -0700" }, "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 random: simplify fips mode\n crypto: authenc - Fix cryptlen calculation\n crypto: talitos - add support for sha224\n crypto: talitos - add hash algorithms\n crypto: talitos - second prepare step for adding ahash algorithms\n crypto: talitos - prepare for adding ahash algorithms\n crypto: n2 - Add Niagara2 crypto driver\n crypto: skcipher - Add ablkcipher_walk interfaces\n crypto: testmgr - Add testing for async hashing and update/final\n crypto: tcrypt - Add speed tests for async hashing\n crypto: scatterwalk - Fix scatterwalk_done() test\n crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk\n padata: Use get_online_cpus/put_online_cpus in padata_free\n padata: Add some code comments\n padata: Flush the padata queues actively\n padata: Use a timer to handle remaining objects in the reorder queues\n crypto: shash - Remove usage of CRYPTO_MINALIGN\n crypto: mv_cesa - Use resource_size\n crypto: omap - OMAP macros corrected\n padata: Use get_online_cpus/put_online_cpus\n ...\n\nFix up conflicts in arch/arm/mach-omap2/devices.c\n" }, { "commit": "59534f7298c5e28aaa64e6ed550e247f64ee72ae", "tree": "b9fef7756abf897d9e1b10950cdf10bf6dfe5cb7", "parents": [ "ac3ee84c604502240122c47b52f0542ec8774f15", "b486787ee4797d6e42a9bd3a6f079385ad0f4472" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 11:14:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 11:14:52 2010 -0700" }, "message": "Merge branch \u0027drm-for-2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-for-2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (207 commits)\n drm/radeon/kms/pm/r600: select the mid clock mode for single head low profile\n drm/radeon: fix power supply kconfig interaction.\n drm/radeon/kms: record object that have been list reserved\n drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU.\n drm/radeon/kms: don\u0027t default display priority to high on rs4xx\n drm/edid: fix typo in 1600x1200@75 mode\n drm/nouveau: fix i2c-related init table handlers\n drm/nouveau: support init table i2c device identifier 0x81\n drm/nouveau: ensure we\u0027ve parsed i2c table entry for INIT_*I2C* handlers\n drm/nouveau: display error message for any failed init table opcode\n drm/nouveau: fix init table handlers to return proper error codes\n drm/nv50: support fractional feedback divider on newer chips\n drm/nv50: fix monitor detection on certain chipsets\n drm/nv50: store full dcb i2c entry from vbios\n drm/nv50: fix suspend/resume with DP outputs\n drm/nv50: output calculated crtc pll when debugging on\n drm/nouveau: dump pll limits entries when debugging is on\n drm/nouveau: bios parser fixes for eDP boards\n drm/nouveau: fix a nouveau_bo dereference after it\u0027s been destroyed\n drm/nv40: remove some completed ctxprog TODOs\n ...\n" }, { "commit": "0dbb5671921b6dad2396090ef81a3efee1ae7da1", "tree": "f4cc6f2e8a0868bdb81b685a24654db5457ccae9", "parents": [ "26e1e8d1d1cfa914b95b5dab001a6ed898872755" ], "author": { "name": "Christoph Egger", "email": "siccegge@cs.fau.de", "time": "Mon May 17 17:25:54 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri May 21 09:34:31 2010 -0700" }, "message": "serial: Tidy REMOTE_DEBUG\n\nREMOTE_DEBUG does already appear in 2.2 kernel sources but didn\u0027t\nappear as a config Option in the initial git import 2.6.12-rc. It\u0027s\ncurrently just used in one single place of the linux kernel and should\nprobably be dropped totally\n\nSigned-off-by: Christoph Egger \u003csiccegge@cs.fau.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "26e1e8d1d1cfa914b95b5dab001a6ed898872755", "tree": "c095b4c89c879f604c5cd9ba2f5968810bd1715a", "parents": [ "e114474cf5c7fe7ab94dd4f5938ffa51c9af77c4" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri May 07 10:30:41 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri May 21 09:34:30 2010 -0700" }, "message": "serial: isicomm: handle running out of slots\n\nThis patch makes it return -ENODEV if we run out of empty slots in the\nprobe function. It\u0027s unlikely to happen, but it makes the static\ncheckers happy.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "ccc5ca8d4cadc141d6c97ec0213cdd676616a11d", "tree": "d2b31bce400b211fb637f94fbe33903813cd2857", "parents": [ "6b7d8f8b5c43f7bedda750d8a9dab0658da1d2ba" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Fri May 07 19:58:32 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri May 21 09:34:30 2010 -0700" }, "message": "tty: fix obsolete comment on tty_insert_flip_string_fixed_flag\n\nComment was not updated when tty_insert_flip_string was generalised.\n\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" } ], "next": "972c196266d5982766ca03590d54e6a0d4de5664" }