)]}' { "log": [ { "commit": "b75d91f7ca513f0a4d0d1ad0942fb90cf5a2bc88", "tree": "3ed9062637e769ab8bd89748baf2b167244bbda8", "parents": [ "ff05b6f7ae762b6eb464183eec994b28ea09f6dd" ], "author": { "name": "Corey Minyard", "email": "cminyard@mvista.com", "time": "Mon Dec 19 17:12:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 10:25:04 2011 -0800" }, "message": "ipmi_watchdog: restore settings when BMC reset\n\nIf the BMC gets reset, it will return 0x80 response errors.\n\nIn less than a week\n# grep \"Error 80 on cmd 22\" /var/log/kernel |wc -l\n378681\n\nIn this case, it is probably a good idea to restore the IPMI settings.\n\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nTested-by: Arkadiusz Miśkiewicz \u003ca.miskiewicz@gmail.com\u003e\nReported-by: Arkadiusz Miśkiewicz \u003ca.miskiewicz@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": "bd29e568a4cb6465f6e5ec7c1c1f3ae7d99cbec1", "tree": "1180a6d21950f2cd11992c724f5554c333dd2ee0", "parents": [ "869f8dfa52295e75e043af618e47305e4b109bc1" ], "author": { "name": "Luck, Tony", "email": "tony.luck@intel.com", "time": "Wed Nov 16 10:50:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 17 11:42:54 2011 -0200" }, "message": "fix typo/thinko in get_random_bytes()\n\nIf there is an architecture-specific random number generator we use it\nto acquire randomness one \"long\" at a time. We should put these random\nwords into consecutive words in the result buffer - not just overwrite\nthe first word again and again.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a08185a3eb658854b29c05bcbfac0f85038ffe9f", "tree": "9411bc4cd2dc3dd5e4f29654b7b32669fe1434bb", "parents": [ "35b09c9bf619c4fc6040c52dcea6bd5bd6af7679" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Oct 28 10:28:00 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 08 10:50:27 2011 +0000" }, "message": "agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is set\n\nKernels with no iommu support cannot ever need the Ironlake\nwork-around, so never enable it in that case.\n\nMight be better to completely remove the work-around from the kernel\nin this case?\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n" }, { "commit": "35b09c9bf619c4fc6040c52dcea6bd5bd6af7679", "tree": "27e9ec49a947d0a267c716a732eae58ac2b856ee", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Oct 28 14:42:41 2011 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 08 10:50:18 2011 +0000" }, "message": "drm/i915: fix if statement (bogus semi-colon)\n\nThe semi-colon is a typo here and it makes the if statement\nunconditional.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "f7e801172c53c4dc48b1f888a72eae069be6333a", "tree": "61d5243a48fe3640dbace0222054fc88dd0c6612", "parents": [ "092f4c56c1927e4b61a41ee8055005f1cb437009", "6b1c70b1ff6f800f081a6bbef662789135f7b398" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:52:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:52:17 2011 -0700" }, "message": "Merge branch \u0027misc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\n* \u0027misc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n MAINTAINERS: Update entry for IA64\n [IA64] gpio: GENERIC_GPIO default must be n\n [IA64[ add CONFIG_NET_VENDOR_INTEL\u003dy to default config files where needed\n [IA64] agp/hp-agp: Allow binding user memory to the AGP GART\n [IA64] sn2: add missing put_cpu()\n" }, { "commit": "80c2861672bbf000f6af838656959ee937e4ee4d", "tree": "78b361fd7278d461b1e664272f3b27660b64c642", "parents": [ "d211858837ff8d8e31942ca7d27e6e08b3b46f5e", "5087a50e66bd51b6e72c60bce4757a42b93f6b2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n virtio-blk: use ida to allocate disk index\n virtio: Add platform bus driver for memory mapped virtio device\n virtio: Dont add \"config\" to list for !per_vq_vector\n virtio: console: wait for first console port for early console output\n virtio: console: add port stats for bytes received, sent and discarded\n virtio: console: make discard_port_data() use get_inbuf()\n virtio: console: rename variable\n virtio: console: make get_inbuf() return port-\u003einbuf if present\n virtio: console: Fix return type for get_inbuf()\n virtio: console: Use wait_event_freezable instead of _interruptible\n virtio: console: Ignore port name update request if name already set\n virtio: console: Fix indentation\n virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx\n virtio.h: correct comment for struct virtio_driver\n virtio-net: Use virtio_config_val() for retrieving config\n virtio_config: Add virtio_config_val_len()\n virtio-console: Use virtio_config_val() for retrieving config\n" }, { "commit": "de0a5345a55b8dd5a4695181275df0e691176830", "tree": "17530e824f7f46ce0b1757657179fb5957a6add5", "parents": [ "994c0e992522c123298b4a91b72f5e67ba2d1123", "8535639810e578960233ad39def3ac2157b0c3ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 09:45:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 09:45:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://github.com/richardweinberger/linux\n\n* \u0027for-linus\u0027 of git://github.com/richardweinberger/linux: (90 commits)\n um: fix ubd cow size\n um: Fix kmalloc argument order in um/vdso/vma.c\n um: switch to use of drivers/Kconfig\n UserModeLinux-HOWTO.txt: fix a typo\n UserModeLinux-HOWTO.txt: remove ^H characters\n um: we need sys/user.h only on i386\n um: merge delay_{32,64}.c\n um: distribute exports to where exported stuff is defined\n um: kill system-um.h\n um: generic ftrace.h will do...\n um: segment.h is x86-only and needed only there\n um: asm/pda.h is not needed anymore\n um: hw_irq.h can go generic as well\n um: switch to generic-y\n um: clean Kconfig up a bit\n um: a couple of missing dependencies...\n um: kill useless argument of free_chan() and free_one_chan()\n um: unify ptrace_user.h\n um: unify KSTK_...\n um: fix gcov build breakage\n ...\n" }, { "commit": "3369465ed1a6a9aa9b885a6d7d8e074ecbd782da", "tree": "ac60be76e1d363caab63156c1390f1ab0c4ee96c", "parents": [ "c039aff672a540f8976770e74599d350de1805cb" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Thu Aug 18 20:11:59 2011 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Nov 02 14:15:41 2011 +0100" }, "message": "um: switch to use of drivers/Kconfig\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "d805a78603bb489d71a12466e8f29c5e9837e50a", "tree": "12d7273a3cbd4f28e833232e9d884b6c3b7f904e", "parents": [ "bad3118fcdeb4b7b5bf18cb40b2548cf891646b2" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Thu Aug 18 20:13:00 2011 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Nov 02 14:15:29 2011 +0100" }, "message": "um: clean Kconfig up a bit\n\n* kill duplicates with drivers/char/Kconfig\n* take watchdog one into drivers/watchdog/Kconfig\n* take mmapper to arch/um/Kconfig.um\n* rename Kconfig.char menu to \"UML Character Devices\"\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "25498e5b3df931a3d52a6e0642ae242e4ee19488", "tree": "5a627d71015fde644d8c61a04f7718c2f0a748db", "parents": [ "952414505f55afe5cd6dc004765076aa22b3ed7e", "995a0605a6665858d73f9e80053414909be33f27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:16:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:16:43 2011 -0700" }, "message": "Merge branch \u0027next/driver\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/driver\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n hw_random: add driver for atmel true hardware random number generator\n ARM: at91: at91sam9g45: add trng clock and platform device\n MX53 Enable the AHCI SATA on MX53 SMD board\n MX53 Enable the AHCI SATA on MX53 LOCO board\n MX53 Enable the AHCI SATA on MX53 ARD board\n AHCI Add the AHCI SATA feature on the MX53 platforms\n Fix pata imx resource\n ARM: imx: Define functions for registering PATA\n ARM: imx: Add PATA clock support\n ARM: imx: Add PATA resources for other i.MX processors\n imx: efika: Enable pata.\n imx51: add pata clock\n imx51: add pata device\n\nFix up trivial conflict (new selects next to each other from separate\nbranches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig\n" }, { "commit": "5e38483b350405542c8080134408fd8897394ba2", "tree": "34d746dadbec16fd33e4f08cf90561ee62a3014e", "parents": [ "17e5b4f20adbe286fdf14b4d08f296564e97e545" ], "author": { "name": "Christian Borntraeger", "email": "borntraeger@de.ibm.com", "time": "Thu Sep 22 23:44:23 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:01 2011 +1030" }, "message": "virtio: console: wait for first console port for early console output\n\nOn s390 I have seen some random\n\n\"Warning: unable to open an initial console\"\n\nboot failure. Turns out that tty_open fails, because the\nhvc_alloc was not yet done. In former times this could not happen,\nsince the probe function automatically called hvc_alloc. With newer\nversions (multiport) some host\u003c-\u003eguest interaction is required\nbefore hvc_alloc is called. This might be too late, especially if\nan initramfs is involved. Lets use a completion if we have\nmultiport and an early console.\n\n[Amit:\n * Use NULL instead of 0 for pointer comparison\n * Rename \u0027port_added\u0027 to \u0027early_console_added\u0027\n * Re-format, re-word commit message\n * Rebase patch on top of current queue]\n\nSigned-off-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nAcked-by: Chrstian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "17e5b4f20adbe286fdf14b4d08f296564e97e545", "tree": "c6634147e4a939213033cf8f5b622a686edd3968", "parents": [ "2d24cdaa6e389f85dad51eda39f1c2684a4f15b0" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:46 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:01 2011 +1030" }, "message": "virtio: console: add port stats for bytes received, sent and discarded\n\nThis commit adds port-specific stats for the number of bytes received,\nsent and discarded. They\u0027re exposed via the debugfs interface. This\ndata can be used to check for data loss bugs (or disprove such claims).\nIt can also be used for accounting, if there\u0027s such a need.\n\nThe stats remain valid throughout the lifetime of the port. Unplugging\na port will reset the stats. The numbers are not reset across port\nopens/closes.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "2d24cdaa6e389f85dad51eda39f1c2684a4f15b0", "tree": "88f02e92c459fa8d768c1ae6fbcfa8a4ccfcdc0e", "parents": [ "ce072a0cee420782ed0a079ac17c7ca26056fb95" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:45 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: make discard_port_data() use get_inbuf()\n\ndiscard_port_data() used virtqueue_get_buf() directly instead of using\nget_inbuf(). Fix this, so that we get accounting for all received\nbytes. This also simplifies the code a lot.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "ce072a0cee420782ed0a079ac17c7ca26056fb95", "tree": "678f0850a3a1fbeee88fb9e1d395141f8b61ac09", "parents": [ "d25a9ddae93ca97aa03fdab1363baf0e0c35d960" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:44 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: rename variable\n\n\u0027ret\u0027 is a misnomer in discard_port_data() since we don\u0027t return the\nvalue. Rename it to \u0027err\u0027.\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "d25a9ddae93ca97aa03fdab1363baf0e0c35d960", "tree": "fea9bd4041716248fdfd8db78bab715f1d907670", "parents": [ "defde66996476295dc7b1b60ea318965f8c3ad86" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:43 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: make get_inbuf() return port-\u003einbuf if present\n\nInstead of pulling in a buffer from the vq each time it\u0027s called,\nget_inbuf() now checks if the current active buffer, in port-\u003einbuf is\nvalid. If it is, just returns a pointer to it. This ends up\nsimplifying a lot of code calling get_inbuf() since the check for\nport-\u003einbuf being valid was done by all the callers.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "defde66996476295dc7b1b60ea318965f8c3ad86", "tree": "8dcf44f08a9287dec917e36808867e7943ea0b01", "parents": [ "a08fa92d16f2fa112e3400c6c513d23ae78b960a" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:42 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: Fix return type for get_inbuf()\n\nget_inbuf() returns void *. There\u0027s no reason to return void pointers\ninstead of the correct struct port_buffer *.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a08fa92d16f2fa112e3400c6c513d23ae78b960a", "tree": "045c57551c2193a6d387231938e7426eaa450faf", "parents": [ "291024ef351328e7b4ca6bae798abc816a43653c" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:41 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:00 2011 +1030" }, "message": "virtio: console: Use wait_event_freezable instead of _interruptible\n\nGet ready to support suspend/resume by using the freezable calls so that\nblocking read/write syscalls are handled properly across suspend/resume.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "291024ef351328e7b4ca6bae798abc816a43653c", "tree": "da54013a26d70be3136266692eea6ac95077f865", "parents": [ "286f9a226f11e4a05d08999417fd838c0ca91d7a" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:40 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:40:59 2011 +1030" }, "message": "virtio: console: Ignore port name update request if name already set\n\nWe don\u0027t allow port name changes dynamically for a port. So any\nrequests by the host to change the name are ignored.\n\nBefore this patch, if the hypervisor sent a port name while we had one\nset already, we would leak memory equivalent to the size of the old\nname.\n\nThis scenario wasn\u0027t expected so far, but with the suspend-resume\nsupport, we\u0027ll send the VIRTIO_CONSOLE_PORT_READY message after restore,\nwhich can get us into this situation.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "286f9a226f11e4a05d08999417fd838c0ca91d7a", "tree": "35f5e084944e6c7bf4db4dc6b048de1d2d372bc7", "parents": [ "00b894e874581f6b388c5817d4d5546c22cf9640" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Wed Sep 14 13:06:39 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:40:59 2011 +1030" }, "message": "virtio: console: Fix indentation\n\nConvert spaces to tabs and fix indentation for an if statement split\ninto multiple lines.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "51c6d61ac58844b5e3e0d28271084c06f6a15371", "tree": "d98c755facff356cfcf1205c5e5315f23379c58e", "parents": [ "b4beb4bf9934d151bf4581a54ae028927374cb2a" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Sun Aug 14 17:52:31 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:40:58 2011 +1030" }, "message": "virtio-console: Use virtio_config_val() for retrieving config\n\nThis patch modifies virtio-console to use virtio_config_val() instead\nof a \u0027if(virtio_has_feature()) vdev-\u003econfig-\u003eget()\u0027 construct to retrieve\noptional values from the config space.\n\nCc: Amit Shah \u003camit.shah@redhat.com\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: virtualization@lists.linux-foundation.org\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "c05aa8fbcc21b1863085dde5cb3c97b32c52ce40", "tree": "1488a18dc5ad8e7e911dbd61e853fba5b4e4a66d", "parents": [ "66300e66c680f7bcc43127627740f493ef0b05bc" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Jul 27 21:31:17 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:42 2011 -0400" }, "message": "drivers/char: Fix implicit use of err.h in ramoops.c\n\ndrivers/char/ramoops.c: In function \u0027ramoops_init\u0027:\ndrivers/char/ramoops.c:221: error: implicit declaration of function \u0027IS_ERR\u0027\ndrivers/char/ramoops.c:222: error: implicit declaration of function \u0027PTR_ERR\u0027\nmake[3]: *** [drivers/char/ramoops.o] Error 1\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "66300e66c680f7bcc43127627740f493ef0b05bc", "tree": "8f0e92c40063be1edf6727e5e9b09adb9102b5c7", "parents": [ "c22405c98d3ff7042e369370d2bf54f9607d0f09" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 10 12:14:53 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:41 2011 -0400" }, "message": "drivers/char: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required\n\nThey will need it called out explicitly in the near future due\nto a module.h usage cleanup that removes its implicit presence\neverywhere.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "c22405c98d3ff7042e369370d2bf54f9607d0f09", "tree": "d9eae01697a87fd4eda1c8a31ff4fcdfc00f9432", "parents": [ "aaf195444be47aa3d3776825b3b384a61f40dca4" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 03 13:35:48 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:40 2011 -0400" }, "message": "drivers/char: Add module.h to those who were using it implicitly\n\nA pending cleanup will mean that module.h won\u0027t be implicitly\neverywhere anymore. Make sure the modular drivers in char are\nactually calling out for \u003cmodule.h\u003e explicitly in advance.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "37be944a0270402f9cda291a930b0286f6dc92f5", "tree": "6a91a9eb86450f4a18a8871f04a1ef810e7b55d6", "parents": [ "ca836a25435ef1b9914840ed0a310c9b6ac261d1", "1717c0e23f411147490c7a3312b894f0ea9a5fb1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:54:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:54:23 2011 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (290 commits)\n Revert \"drm/ttm: add a way to bo_wait for either the last read or last write\"\n Revert \"drm/radeon/kms: add a new gem_wait ioctl with read/write flags\"\n vmwgfx: Don\u0027t pass unused arguments to do_dirty functions\n vmwgfx: Emulate depth 32 framebuffers\n drm/radeon: Lower the severity of the radeon lockup messages.\n drm/i915/dp: Fix eDP on PCH DP on CPT/PPT\n drm/i915/dp: Introduce is_cpu_edp()\n drm/i915: use correct SPD type value\n drm/i915: fix ILK+ infoframe support\n drm/i915: add DP test request handling\n drm/i915: read full receiver capability field during DP hot plug\n drm/i915/dp: Remove eDP special cases from bandwidth checks\n drm/i915/dp: Fix the math in intel_dp_link_required\n drm/i915/panel: Always record the backlight level again (but cleverly)\n i915: Move i915_read/write out of line\n drm/i915: remove transcoder PLL mashing from mode_set per specs\n drm/i915: if transcoder disable fails, say which\n drm/i915: set watermarks for third pipe on IVB\n drm/i915: export a CPT mode set verification function\n drm/i915: fix transcoder PLL select masking\n ...\n" }, { "commit": "8e6d539e0fd0c2124a20a207da70f2af7a9ae52c", "tree": "73016c1bdb5005125cdb5d60d48f73ab4300be64", "parents": [ "8237eb946a1a23c600fb289cf8dd3b399b10604e", "49d859d78c5aeb998b6936fcb5f288f78d713489" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:29:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 05:29:07 2011 -0700" }, "message": "Merge branch \u0027x86-rdrand-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-rdrand-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, random: Verify RDRAND functionality and allow it to be disabled\n x86, random: Architectural inlines to get random integers with RDRAND\n random: Add support for architectural random hooks\n\nFix up trivial conflicts in drivers/char/random.c: the architectural\nrandom hooks touched \"get_random_int()\" that was simplified to use MD5\nand not do the keyptr thing any more (see commit 6e5714eaf77d: \"net:\nCompute protocol sequence numbers and fragment IDs using MD5\").\n" }, { "commit": "7115e3fcf45514db7525a05365b10454ff7f345e", "tree": "17450e6337d559cc35dae6a7a73abab01ac63f00", "parents": [ "1f6e05171bb5cc32a4d6437ab2269fc21d169ca7", "c752d04066a36ae30b29795f3fa3f536292c1f8c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 17:03:38 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 17:03:38 2011 +0200" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits)\n perf symbols: Increase symbol KSYM_NAME_LEN size\n perf hists browser: Refuse \u0027a\u0027 hotkey on non symbolic views\n perf ui browser: Use libslang to read keys\n perf tools: Fix tracing info recording\n perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads\n perf hists: Don\u0027t consider filtered entries when calculating column widths\n perf hists: Don\u0027t decay total_period for filtered entries\n perf hists browser: Honour symbol_conf.show_{nr_samples,total_period}\n perf hists browser: Do not exit on tab key with single event\n perf annotate browser: Don\u0027t change selection line when returning from callq\n perf tools: handle endianness of feature bitmap\n perf tools: Add prelink suggestion to dso update message\n perf script: Fix unknown feature comment\n perf hists browser: Apply the dso and thread filters when merging new batches\n perf hists: Move the dso and thread filters from hist_browser\n perf ui browser: Honour the xterm colors\n perf top tui: Give color hints just on the percentage, like on --stdio\n perf ui browser: Make the colors configurable and change the defaults\n perf tui: Remove unneeded call to newtCls on startup\n perf hists: Don\u0027t format the percentage on hist_entry__snprintf\n ...\n\nFix up conflicts in arch/x86/kernel/kprobes.c manually.\n\nIngo\u0027s tree did the insane \"add volatile to const array\", which just\ndoesn\u0027t make sense (\"volatile const\"?). But we could remove the const\n*and* make the array volatile to make doubly sure that gcc doesn\u0027t\noptimize it away..\n\nAlso fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the\nreader_lock has been turned into a raw lock by the core locking merge,\nand there was a new user of it introduced in this perf core merge. Make\nsure that new use also uses the raw accessor functions.\n" }, { "commit": "982653009b883ef1529089e3e6f1ae2fee41cbe2", "tree": "eec3b1fe947d442ee204a2d648133bc5223e5c59", "parents": [ "37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec", "c020570138f5d9cb1fc0a853f9cf9e641178b5c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 16:11:53 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 16:11:53 2011 +0200" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, ioapic: Consolidate the explicit EOI code\n x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()\n x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC\n iommu: Rename the DMAR and INTR_REMAP config options\n x86, ioapic: Define irq_remap_modify_chip_defaults()\n x86, msi, intr-remap: Use the ioapic set affinity routine\n iommu: Cleanup ifdefs in detect_intel_iommu()\n iommu: No need to set dmar_disabled in check_zero_address()\n iommu: Move IOMMU specific code to intel-iommu.c\n intr_remap: Call dmar_dev_scope_init() explicitly\n x86, x2apic: Enable the bios request for x2apic optout\n" }, { "commit": "aa77677e0a288e08073620db5d2a31df83ca4788", "tree": "0d14b995a21c43f365d66b9ad101a334109fc4e4", "parents": [ "efb8d21b2c6db3497655cc6a033ae8a9883e4063", "43a3beb6da994549ec28a9f31727b997a025f958" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 15:39:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 26 15:39:02 2011 +0200" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)\n staging: et131x: Remove redundant check and return statement\n staging: et131x: Mainly whitespace changes to appease checkpatch\n staging: et131x: Remove last of the forward declarations\n staging: et131x: Remove even more forward declarations\n staging: et131x: Remove yet more forward declarations\n staging: et131x: Remove more forward declarations\n staging: et131x: Remove forward declaration of et131x_adapter_setup\n staging: et131x: Remove some forward declarations\n staging: et131x: Remove unused rx_ring.recv_packet_pool\n staging: et131x: Remove call to find pci pm capability\n staging: et131x: Remove redundant et131x_reset_recv() call\n staging: et131x: Remove unused rx_ring.recv_buffer_pool\n Staging: bcm: Fix three initialization errors in InterfaceDld.c\n Staging: bcm: Fix coding style issues in InterfaceDld.c\n staging:iio:dac: Add AD5360 driver\n staging:iio:trigger:bfin-timer: Fix compile error\n Staging: vt6655: add some range checks before memcpy()\n Staging: vt6655: whitespace fixes to iotcl.c\n Staging: vt6656: add some range checks before memcpy()\n Staging: vt6656: whitespace cleanups in ioctl.c\n ...\n\nFix up conflicts in:\n - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:\n\tvg driver movement\n - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:\n\tdriver removal vs now stale changes\n - drivers/staging/rtl8192e/r8192E_core.c:\n\tdriver removal vs now stale changes\n - drivers/staging/et131x/et131*:\n\tdriver consolidation into one file, tried to do fixups\n" }, { "commit": "59e52534172d845ebffb0d7e85fc56fb7b857051", "tree": "49552e03f1bdb413cd8b5f7542e91770688d7047", "parents": [ "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "0d89e54c8249645404283436d952afc261a04e1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)\n MAINTAINERS: linux-m32r is moderated for non-subscribers\n linux@lists.openrisc.net is moderated for non-subscribers\n Drop default from \"DM365 codec select\" choice\n parisc: Kconfig: cleanup Kernel page size default\n Kconfig: remove redundant CONFIG_ prefix on two symbols\n cris: remove arch/cris/arch-v32/lib/nand_init.S\n microblaze: add missing CONFIG_ prefixes\n h8300: drop puzzling Kconfig dependencies\n MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers\n tty: drop superfluous dependency in Kconfig\n ARM: mxc: fix Kconfig typo \u0027i.MX51\u0027\n Fix file references in Kconfig files\n aic7xxx: fix Kconfig references to READMEs\n Fix file references in drivers/ide/\n thinkpad_acpi: Fix printk typo \u0027bluestooth\u0027\n bcmring: drop commented out line in Kconfig\n btmrvl_sdio: fix typo \u0027btmrvl_sdio_sd6888\u0027\n doc: raw1394: Trivial typo fix\n CIFS: Don\u0027t free volume_info-\u003eUNC until we are entirely done with it.\n treewide: Correct spelling of successfully in comments\n ...\n" }, { "commit": "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "tree": "7a7b6cb22d1edaec10c3ae9d961b6e04c37d380c", "parents": [ "31dced41c6822ce751c033a53502ea4d8d399422", "1d927c3b5a4005a2ebc5356e7e1eec436e15fa22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:03:58 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:03:58 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:\n apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()\n" }, { "commit": "36b8d186e6cc8e32cb5227f5645a58e1bc0af190", "tree": "1000ad26e189e6ff2c53fb7eeff605f59c7ad94e", "parents": [ "cd85b557414fe4cd44ea6608825e96612a5fe2b2", "c45ed235abf1b0b6666417e3c394f18717976acd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:45:31 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 09:45:31 2011 +0200" }, "message": "Merge branch \u0027next\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027next\u0027 of git://selinuxproject.org/~jmorris/linux-security: (95 commits)\n TOMOYO: Fix incomplete read after seek.\n Smack: allow to access /smack/access as normal user\n TOMOYO: Fix unused kernel config option.\n Smack: fix: invalid length set for the result of /smack/access\n Smack: compilation fix\n Smack: fix for /smack/access output, use string instead of byte\n Smack: domain transition protections (v3)\n Smack: Provide information for UDS getsockopt(SO_PEERCRED)\n Smack: Clean up comments\n Smack: Repair processing of fcntl\n Smack: Rule list lookup performance\n Smack: check permissions from user space (v2)\n TOMOYO: Fix quota and garbage collector.\n TOMOYO: Remove redundant tasklist_lock.\n TOMOYO: Fix domain transition failure warning.\n TOMOYO: Remove tomoyo_policy_memory_lock spinlock.\n TOMOYO: Simplify garbage collector.\n TOMOYO: Fix make namespacecheck warnings.\n target: check hex2bin result\n encrypted-keys: check hex2bin result\n ...\n" }, { "commit": "43a3beb6da994549ec28a9f31727b997a025f958", "tree": "9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96", "68cf162a1af23c35db8e3b78659c99196c9882ff" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Oct 25 09:18:11 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Oct 25 09:18:11 2011 +0200" }, "message": "Merge branch \u0027staging-next\u0027 into Linux 3.1\n\nThis was done to resolve a conflict in the\ndrivers/staging/comedi/drivers/ni_labpc.c file that resolved a build\nbugfix in Linus\u0027s tree with a \"better\" bugfix that was in the\nstaging-next tree that resolved the issue in a more complete manner.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "9b553f72869584cc14d5724fbbc09f88de0f08de", "tree": "923d790483d32dd209bf1bf2cdfc7c7abbb68aa7", "parents": [ "c5c42360bc1cb14c7da3186683e9525b33b72656", "82d165557ef094d4b4dfc05871aee618ec7102b0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 24 05:48:39 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 24 05:48:39 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux into drm-core-next\n\n* \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux: (72 commits)\n drm/i915/dp: Fix eDP on PCH DP on CPT/PPT\n drm/i915/dp: Introduce is_cpu_edp()\n drm/i915: use correct SPD type value\n drm/i915: fix ILK+ infoframe support\n drm/i915: add DP test request handling\n drm/i915: read full receiver capability field during DP hot plug\n drm/i915/dp: Remove eDP special cases from bandwidth checks\n drm/i915/dp: Fix the math in intel_dp_link_required\n drm/i915/panel: Always record the backlight level again (but cleverly)\n i915: Move i915_read/write out of line\n drm/i915: remove transcoder PLL mashing from mode_set per specs\n drm/i915: if transcoder disable fails, say which\n drm/i915: set watermarks for third pipe on IVB\n drm/i915: export a CPT mode set verification function\n drm/i915: fix transcoder PLL select masking\n drm/i915: fix IVB cursor support\n drm/i915: fix debug output for 3 pipe configs\n drm/i915: add PLL sharing support to handle 3 pipes\n drm/i915: fix PCH PLL assertion check for 3 pipes\n drm/i915: use transcoder select bits on VGA and HDMI on CPT\n ...\n" }, { "commit": "5c0422878fcdc279ae9a8e8b66972a15b5efb67f", "tree": "13ed982427828e6a031dd5fd642f25b15c300d63", "parents": [ "f372b85463dac2fc696443d4c5063db2af5dcead" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Mon Oct 17 15:51:55 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Oct 20 15:26:39 2011 -0700" }, "message": "drm/i915: ILK + VT-d workaround\n\nIdle the GPU before doing any unmaps. We know if VT-d is in use through\nan exported variable from iommu code.\n\nThis should avoid a known HW issue.\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "677d3e2f07d1b3d6d2f76fd5552d16a53b9236a0", "tree": "b2619a068e98c755f6cefa1b22ac4880eaa7e23d", "parents": [ "237a62a1436eca94497476a9138baf795c16c97c" ], "author": { "name": "Peter Korsgaard", "email": "jacmet@sunsite.dk", "time": "Thu Oct 06 19:56:30 2011 +0200" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Oct 10 12:42:49 2011 +0200" }, "message": "hw_random: add driver for atmel true hardware random number generator\n\nFor the IP block on 9g45/9g46/9m10/9m11.\n\nSigned-off-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nReviewed-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "9c48f1c629ecfa114850c03f875c6691003214de", "tree": "5e454da487c90fc8399ce366aa2437597c9ff5e5", "parents": [ "c9126b2ee8adb9235941cedbf558d39a9e65642d" ], "author": { "name": "Don Zickus", "email": "dzickus@redhat.com", "time": "Fri Sep 30 15:06:21 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Oct 10 06:56:57 2011 +0200" }, "message": "x86, nmi: Wire up NMI handlers to new routines\n\nJust convert all the files that have an nmi handler to the new routines.\nMost of it is straight forward conversion. A couple of places needed some\ntweaking like kgdb which separates the debug notifier from the nmi handler\nand mce removes a call to notify_die.\n\n[Thanks to Ying for finding out the history behind that mce call\n\nhttps://lkml.org/lkml/2010/5/27/114\n\nAnd Boris responding that he would like to remove that call because of it\n\nhttps://lkml.org/lkml/2011/9/21/163]\n\nThe things that get converted are the registeration/unregistration routines\nand the nmi handler itself has its args changed along with code removal\nto check which list it is on (most are on one NMI list except for kgdb\nwhich has both an NMI routine and an NMI Unknown routine).\n\nSigned-off-by: Don Zickus \u003cdzickus@redhat.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Huang Ying \u003cying.huang@intel.com\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nLink: http://lkml.kernel.org/r/1317409584-23662-4-git-send-email-dzickus@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "395cf9691d72173d8cdaa613c5f0255f993af94b", "tree": "813be524794fe1c0850805d7faca90e45fd0e60b", "parents": [ "e060c38434b2caa78efe7cedaff4191040b65a15" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Mon Aug 15 02:02:26 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Sep 27 18:08:04 2011 +0200" }, "message": "doc: fix broken references\n\nThere are numerous broken references to Documentation files (in other\nDocumentation files, in comments, etc.). These broken references are\ncaused by typo\u0027s in the references, and by renames or removals of the\nDocumentation files. Some broken references are simply odd.\n\nFix these broken references, sometimes by dropping the irrelevant text\nthey were part of.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "3321c07ae5068568cd61ac9f4ba749006a7185c9", "tree": "bcd169e21c2f71651ab840ee77152094db0c3deb", "parents": [ "6b07d30aca7e52f2881b8c8c20c8a2cd28e8b3d3" ], "author": { "name": "Peter Huewe", "email": "huewe.external.infineon@googlemail.com", "time": "Thu Sep 15 14:47:42 2011 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:46:41 2011 +1000" }, "message": "TPM: Zero buffer after copying to userspace\n\nSince the buffer might contain security related data it might be a good idea to\nzero the buffer after we have copied it to userspace.\n\nThis got assigned CVE-2011-1162.\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Stable Kernel \u003cstable@kernel.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "6b07d30aca7e52f2881b8c8c20c8a2cd28e8b3d3", "tree": "58530bdef4c29cb4bf127942428190e9a2756b2c", "parents": [ "de69113ec1896443c732e8b812e8005fb44eeeeb" ], "author": { "name": "Peter Huewe", "email": "huewe.external.infineon@googlemail.com", "time": "Thu Sep 15 14:37:43 2011 -0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:46:29 2011 +1000" }, "message": "TPM: Call tpm_transmit with correct size\n\nThis patch changes the call of tpm_transmit by supplying the size of the\nuserspace buffer instead of TPM_BUFSIZE.\n\nThis got assigned CVE-2011-1161.\n\n[The first hunk didn\u0027t make sense given one could expect\n way less data than TPM_BUFSIZE, so added tpm_transmit boundary\n check over bufsiz instead\n The last parameter of tpm_transmit() reflects the amount\n of data expected from the device, and not the buffer size\n being supplied to it. It isn\u0027t ideal to parse it directly,\n so we just set it to the maximum the input buffer can handle\n and let the userspace API to do such job.]\n\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nCc: Stable Kernel \u003cstable@kernel.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "de69113ec1896443c732e8b812e8005fb44eeeeb", "tree": "9885a62b06d34dd407deb1c6c597a4f8ed73153a", "parents": [ "5ce5ed35939ece8a9c7e0f10c7f3d5bc000c6b64" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Thu Aug 04 07:58:07 2011 +0800" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:46:17 2011 +1000" }, "message": "TPM: tpm_nsc: Fix a double free of pdev in cleanup_nsc\n\nplatform_device_unregister() will release all resources\nand remove it from the subsystem, then drop reference count by\ncalling platform_device_put().\n\nWe should not call kfree(pdev) after platform_device_unregister(pdev).\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5ce5ed35939ece8a9c7e0f10c7f3d5bc000c6b64", "tree": "e6133feefe2935a5798c19c93ed8b2d8dac87bc9", "parents": [ "d93dc5c4478c1fd5de85a3e8aece9aad7bbae044" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon Aug 08 13:08:19 2011 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 23 09:45:57 2011 +1000" }, "message": "TPM: TCG_ATMEL should depend on HAS_IOPORT\n\nOn m68k, I get:\n\ndrivers/char/tpm/tpm_atmel.h: In function ‘atmel_get_base_addr’:\ndrivers/char/tpm/tpm_atmel.h:129: error: implicit declaration of function ‘ioport_map’\ndrivers/char/tpm/tpm_atmel.h:129: warning: return makes pointer from integer without a cast\n\nThe code in tpm_atmel.h supports PPC64 (using the device tree and ioremap())\nand \"anything else\" (using ioport_map()). However, ioportmap() is only\navailable on platforms that set HAS_IOPORT.\n\nAlthough PC64 seems to have HAS_IOPORT, a \"depends on HAS_IOPORT\" should work,\nbut I think it\u0027s better to expose the special PPC64 handling explicit using\n\"depends on PPC64 || HAS_IOPORT\".\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "d3f138106b4b40640dc667f0222fd9f137387b32", "tree": "2c5d51deff32ec0999493bbb73cb18a7e4a455c3", "parents": [ "c39d77ffa28c6e72702193df4fa53928c1b6f3e6" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Tue Aug 23 17:05:25 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Sep 21 10:22:03 2011 +0200" }, "message": "iommu: Rename the DMAR and INTR_REMAP config options\n\nChange the CONFIG_DMAR to CONFIG_INTEL_IOMMU to be consistent\nwith the other IOMMU options.\n\nRename the CONFIG_INTR_REMAP to CONFIG_IRQ_REMAP to match the\nirq subsystem name.\n\nAnd define the CONFIG_DMAR_TABLE for the common ACPI DMAR\nroutines shared by both CONFIG_INTEL_IOMMU and CONFIG_IRQ_REMAP.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: yinghai@kernel.org\nCc: youquan.song@intel.com\nCc: joerg.roedel@amd.com\nCc: tony.luck@intel.com\nCc: dwmw2@infradead.org\nLink: http://lkml.kernel.org/r/20110824001456.558630224@sbsiddha-desk.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e060c38434b2caa78efe7cedaff4191040b65a15", "tree": "407361230bf6733f63d8e788e4b5e6566ee04818", "parents": [ "10e4ac572eeffe5317019bd7330b6058a400dfc2", "cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:05 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:18 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nFast-forward merge with Linus to be able to merge patches\nbased on more recent version of the tree.\n" }, { "commit": "a28ee477e5e5e183fa0289841fd90f350a6e0415", "tree": "080031d352e9bfeae9a0c0c03495dde007935182", "parents": [ "5369fcc127622660b1d259fa732420e4a2aecf07" ], "author": { "name": "Christian Dietrich", "email": "christian.dietrich@informatik.uni-erlangen.de", "time": "Sat Jun 04 17:36:33 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 14:05:25 2011 +0200" }, "message": "drivers/char/rtc: use printk_ratelimited instead of printk_ratelimit\n\nSince printk_ratelimit() shouldn\u0027t be used anymore (see comment in\ninclude/linux/printk.h), replace it with printk_ratelimited.\n\nSigned-off-by: Christian Dietrich \u003cchristian.dietrich@informatik.uni-erlangen.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "8e03bd6525d3281068519d5f6059cdcc5a67af66", "tree": "12e4cecbdef7eb38c8ff4406774008509a70fc47", "parents": [ "57f3224c3f838844cdae5e4a9d63e03152013f9a" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sat May 28 10:36:25 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 13:55:03 2011 +0200" }, "message": "char: Convert vmalloc/memset to vzalloc\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6eafa4604cfa109a89524d35d93df11c37bd66b0", "tree": "de0eddca052ed01318df559d7cd80211dd57a0fd", "parents": [ "c6a389f123b9f68d605bb7e0f9b32ec1e3e14132", "b9c4decbd9530b0c4c6dc4ad0626af628b79cd53" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 29 08:47:46 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 29 08:47:46 2011 -0700" }, "message": "Merge 3.1-rc4 into staging-next\n\nThis resolves a conflict with:\n\tdrivers/staging/brcm80211/brcmsmac/types.h\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "7e8aa048989bf7e0604996a3e2068fb1a81f81bd", "tree": "58defa5a56ffa54b2a95fc857be487d318bf4dd3", "parents": [ "30ecad51849ae132dc6ef6ddb62d499c7257515b" ], "author": { "name": "Thomas Meyer", "email": "thomas@m3y3r.de", "time": "Thu Aug 25 15:59:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 25 16:25:33 2011 -0700" }, "message": "drivers/char/msm_smd_pkt.c: don\u0027t use IS_ERR()\n\nThe various basic memory allocation function return NULL, not an\nERR_PTR.\n\nThe semantic patch that makes this change is available in\nscripts/coccinelle/null/eno.cocci.\n\nMore information about semantic patching is available at\nhttp://coccinelle.lip6.fr/\n\nSigned-off-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nCc: Niranjana Vishwanathapura \u003cnvishwan@codeaurora.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1ec3ba93c5fad9dca0dab272491c625fe6a2f67d", "tree": "8f75977579dbb96c73c52d2373a91afa66aeecec", "parents": [ "b64aa655c2a74716c00f7ee60d86a3d715ba1ca6" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Aug 24 14:44:13 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Aug 24 14:44:13 2011 -0700" }, "message": "Staging: remove drivers/char/scc.h as it should have gone a while ago\n\nThis was needed by one of the generic serial drivers that was removed a\nwhile ago. No one even noticed that the driver could not be built\nproperly while it was in the staging directory.\n\nSo this removed the unneeded .h file.\n\nReported-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "403d1d0319ad73b5ccf251745af4c7000331a76b", "tree": "8f04137c79a0ab9c6e5104ba3bf439c6e9e6bb6a", "parents": [ "8ad346c62ae91e6376fb9d199ef8557b0c814209" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Tue Aug 23 08:52:10 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Aug 24 09:30:08 2011 +1000" }, "message": "tpm: suppress durations sysfs output if not read\n\nSuppress the output in the \u0027durations\u0027 sysfs entry if they were not read\nduring driver initialization. This is similar to other sysfs entries\nthat return nothing if for some reason sending the commands to the TPM\nfails.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "fc000154d7a63dee209aab1c13f2c19abdcf6b59", "tree": "1f76e42f6289fadb195e898eefec96d98017f329", "parents": [ "d5d4e02874537d65ed2f431d39bf2f6d2967bd1b" ], "author": { "name": "Émeric Maschino", "email": "emeric.maschino@gmail.com", "time": "Tue Aug 23 21:48:23 2011 +0200" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Aug 23 13:31:59 2011 -0700" }, "message": "[IA64] agp/hp-agp: Allow binding user memory to the AGP GART\n\ndmesg reports:\n[   29.365973] [TTM] AGP Bind memory failed.\n[   29.366015] radeon 0000:80:00.0: object_init failed for (4096, 0x00000002)\n[   29.366052] radeon 0000:80:00.0: (-22) create WB bo failed\n[   29.366087] radeon 0000:80:00.0: Disabling GPU acceleration\n[   29.366124] [drm] radeon: cp finalized\n[   29.366168] [drm] radeon: cp finalized\n[   29.366210] [TTM] Finalizing pool allocator.\n[   29.366924] [TTM] Zone  kernel: Used memory at exit: 0 kiB.\n[   29.366961] [TTM] Zone   dma32: Used memory at exit: 0 kiB.\n[   29.366996] [drm] radeon: ttm finalized\n[   29.367030] [drm] Forcing AGP to PCI mode\n\nThis patch allows binding user memory to the AGP GART on zx1-based\nsystems. dmesg thus no more complains about AGP bind memory failure,\ndisabled GPU acceleration or AGP mode forced to PCI.\n\nOriginal work from Francisco Jerez in agp/amd-k7\n(https://lkml.org/lkml/2010/10/15/469).\n\nTested-by: Émeric Maschino \u003cemeric.maschino@gmail.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "1d927c3b5a4005a2ebc5356e7e1eec436e15fa22", "tree": "86a97fc15d4ea1d4fcd5bf5d92c31bb130ba6d75", "parents": [ "51414d41084496aaefd06d7f19eb8206e8bfac2d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Aug 18 10:06:53 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Aug 23 09:16:29 2011 +0200" }, "message": "apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()\n\nvfork is moving away from freezer_[do_not_]count() one way or the\nother leaving apm_ioctl() as the only user. apm_ioctl() just wants to\nwait for suspend/resume cycle to complete without hindering the\nfreezer. Use wait_event_freezable() instead.\n\nThe only annoyance is that wait_event_freezable() wakes up with\n-ERESTART if there are pending signals while apm_ioctl() wants to\nignore all signals until suspend is complete. We can play with\n@current-\u003e[real_]blocked but this is hardly a performance or latency\ncritical path - simply chill a bit on each iteration until\nSUSPEND_DONE for unlikely cases where there are pending signals.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6e5714eaf77d79ae1c8b47e3e040ff5411b717ec", "tree": "30bd0d7a6a0a6ff0ace6da1835ae7b7167cce5e4", "parents": [ "bc0b96b54a21246e377122d54569eef71cec535f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 03 20:50:44 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 06 18:33:19 2011 -0700" }, "message": "net: Compute protocol sequence numbers and fragment IDs using MD5.\n\nComputers have become a lot faster since we compromised on the\npartial MD4 hash which we use currently for performance reasons.\n\nMD5 is a much safer choice, and is inline with both RFC1948 and\nother ISS generators (OpenBSD, Solaris, etc.)\n\nFurthermore, only having 24-bits of the sequence number be truly\nunpredictable is a very serious limitation. So the periodic\nregeneration and 8-bit counter have been removed. We compute and\nuse a full 32-bit sequence number.\n\nFor ipv6, DCCP was found to use a 32-bit truncated initial sequence\nnumber (it needs 43-bits) and that is fixed here as well.\n\nReported-by: Dan Kaminsky \u003cdan@doxpara.com\u003e\nTested-by: Willy Tarreau \u003cw@1wt.eu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1560ffe62a9d53a51faeec7417becfba4f2a0d18", "tree": "022ba94ddeab5087c8c0c34008c98e4a7f8638c1", "parents": [ "3dab1bce8e840606e76f1bad5a009328e2aa35c7" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Aug 03 16:21:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:21 2011 -1000" }, "message": "tpm_tis: fix build when ACPI is not enabled\n\nFix tpm_tis.c build when CONFIG_ACPI is not enabled by providing a stub\nfunction. Fixes many build errors/warnings:\n\n drivers/char/tpm/tpm_tis.c:89: error: dereferencing pointer to incomplete type\n drivers/char/tpm/tpm_tis.c:89: warning: type defaults to \u0027int\u0027 in declaration of \u0027type name\u0027\n drivers/char/tpm/tpm_tis.c:89: error: request for member \u0027list\u0027 in something not a structure or union\n ...\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Leendert van Doorn \u003cleendert@watson.ibm.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f7b9fcbbc3b8593ff7dc587f90c2fe90a2fd1e6f", "tree": "8f025aefd6cd80d5b1062b43668553c2a2296c5a", "parents": [ "f2d34fd9435c7e60cb5189d036efe9abfc911862" ], "author": { "name": "Sergiu Iordache", "email": "sergiu@chromium.org", "time": "Wed Aug 03 16:21:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:21 2011 -1000" }, "message": "ramoops: update module parameters\n\nUpdate the module parameters when platform data is used. This means\nthat they can be read from /sys/module/ramoops/parameters in order to\nparse the memory area.\n\nSigned-off-by: Sergiu Iordache \u003csergiu@chromium.org\u003e\nCc: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: Seiji Aguchi \u003cseiji.aguchi@hds.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1850536b93888e6cc3ee42e63e20e61f35f8b3e2", "tree": "7b78bf5196ca79f52f0fd7c932ea8062c91ff154", "parents": [ "ed8f37370d83e695c0a4fa5d5fc7a83ecb947526", "d1afa65ca59d4e6a5f1a8c1ab9bfa73f2fa8b777" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:16:11 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 02 21:16:11 2011 -1000" }, "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/mm/init.c: trivial: use BUG_ON\n arch/tile: remove useless set_fixmap_nocache() macro\n arch/tile: add hypervisor-based character driver for SPI flash ROM\n ioctl-number.txt: add the tile hardwall ioctl range\n tile: use generic-y format for one-line asm-generic headers\n clocksource: tile: convert to use clocksource_register_hz\n" }, { "commit": "3d071cd313643cf82b1ce1ce4fdf08d63ad53964", "tree": "874c1683f32f07614aa123f6ca5cf6c2bd443704", "parents": [ "cf8e98d15361f8c594da00a3f7a500787fc1a426", "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Aug 02 16:14:02 2011 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Aug 02 16:14:02 2011 -0400" }, "message": "Merge tag \u0027v3.0\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus\n" }, { "commit": "63d77173266c1791f1553e9e8ccea65dc87c4485", "tree": "81c69a2f30a9bd8302d690000215b474886d0152", "parents": [ "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Sun Jul 31 13:54:50 2011 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Sun Jul 31 13:54:50 2011 -0700" }, "message": "random: Add support for architectural random hooks\n\nAdd support for architecture-specific hooks into the kernel-directed\nrandom number generator interfaces. This patchset does not use the\narchitecture random number generator interfaces for the\nuserspace-directed interfaces (/dev/random and /dev/urandom), thus\neliminating the need to distinguish between them based on a pool\npointer.\n\nChanges in version 3:\n- Moved the hooks from extract_entropy() to get_random_bytes().\n- Changes the hooks to inlines.\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "83c1b31794a9e3cb30edabef7e57fbdbe129c5ce", "tree": "a23269345efe190925eb4bc045f19fcb5fc42178", "parents": [ "f85f19de90a9997583bb26e6f1f9297a4e152c18" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Fri Jul 29 17:11:32 2011 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 29 23:41:09 2011 -0700" }, "message": "ramoops: fix compile failure on parisc\n\nFixes this:\n\n drivers/char/ramoops.c: In function \u0027ramoops_init\u0027:\n drivers/char/ramoops.c:221: error: implicit declaration of function \u0027IS_ERR\u0027\n drivers/char/ramoops.c:222: error: implicit declaration of function \u0027PTR_ERR\u0027\n\nIf it actually builds on other platforms, it\u0027s probably getting\nlinux/err.h via some other #include.\n\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "24f146696184cbe4b440179064a45dfddaad4cc4", "tree": "b47f8a2a97d620e0542f90fd2dd620a87f4154ca", "parents": [ "4ba991d3eb379fbaa22049e7002341e97a673685" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 27 23:33:03 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 28 01:26:30 2011 -0700" }, "message": "n2rng: Attach on Niagara-T3.\n\nAnd stop referring to Victoria Falls, as the attribute we\u0027re\ntalking about is whether the rng is multi-unit capable which\napplies to several chip variants now.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95b6886526bb510b8370b625a49bc0ab3b8ff10f", "tree": "2862606224820d200be12d2092dcd26df1654b80", "parents": [ "22712200e175e0df5c7f9edfe6c6bf5c94c23b83", "29412f0f6a19e34336368f13eab848091c343952" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 27 19:26:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 27 19:26:38 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (54 commits)\n tpm_nsc: Fix bug when loading multiple TPM drivers\n tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block\n tpm: Fix compilation warning when CONFIG_PNP is not defined\n TOMOYO: Update kernel-doc.\n tpm: Fix a typo\n tpm_tis: Probing function for Intel iTPM bug\n tpm_tis: Fix the probing for interrupts\n tpm_tis: Delay ACPI S3 suspend while the TPM is busy\n tpm_tis: Re-enable interrupts upon (S3) resume\n tpm: Fix display of data in pubek sysfs entry\n tpm_tis: Add timeouts sysfs entry\n tpm: Adjust interface timeouts if they are too small\n tpm: Use interface timeouts returned from the TPM\n tpm_tis: Introduce durations sysfs entry\n tpm: Adjust the durations if they are too small\n tpm: Use durations returned from TPM\n TOMOYO: Enable conditional ACL.\n TOMOYO: Allow using argv[]/envp[] of execve() as conditions.\n TOMOYO: Allow using executable\u0027s realpath and symlink\u0027s target as conditions.\n TOMOYO: Allow using owner/group etc. of file objects as conditions.\n ...\n\nFix up trivial conflict in security/tomoyo/realpath.c\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3e5c4fadb9943c7539364d0c8425db071a2020e4", "tree": "34f1d5c4cbf2f330e9fd1210da6dabde3befa6bf", "parents": [ "6b4d2a2733b9a17112f746d498c9f9a0427dcdd8" ], "author": { "name": "Sergiu Iordache", "email": "sergiu@chromium.org", "time": "Tue Jul 26 16:08:59 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:46 2011 -0700" }, "message": "ramoops: make record_size a module parameter\n\nThe size of the dump is currently set using the RECORD_SIZE macro which\nis set to a page size. This patch makes the record size a module\nparameter and allows it to be set through platform data as well to allow\nlarger dumps if needed.\n\nSigned-off-by: Sergiu Iordache \u003csergiu@chromium.org\u003e\nAcked-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: \"Ahmed S. Darwish\" \u003cdarwish.07@gmail.com\u003e\nCc: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6b4d2a2733b9a17112f746d498c9f9a0427dcdd8", "tree": "c0c637da5ede8828728bad87fba41e7ca7f11ca1", "parents": [ "0169256e4bbf29e507cdd1df5812c093d610f1d5" ], "author": { "name": "Sergiu Iordache", "email": "sergiu@chromium.org", "time": "Tue Jul 26 16:08:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:45 2011 -0700" }, "message": "ramoops: move dump_oops into platform data\n\nThe platform driver currently allows setting the mem_size and\nmem_address.\n\nince dump_oops is also a module parameter it would be more consistent if\nit could be set through platform data as well.\n\nSigned-off-by: Sergiu Iordache \u003csergiu@chromium.org\u003e\nAcked-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: \"Ahmed S. Darwish\" \u003cdarwish.07@gmail.com\u003e\nCc: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0169256e4bbf29e507cdd1df5812c093d610f1d5", "tree": "9eb6a08580341cc4d8499217f89063577e604d3d", "parents": [ "13aefd7293e7a697bbf452fca65e69cc1fa8a31c" ], "author": { "name": "Marco Stornelli", "email": "marco.stornelli@gmail.com", "time": "Tue Jul 26 16:08:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:45 2011 -0700" }, "message": "ramoops: add new line to each print\n\nAdd new line to each print.\n\nSigned-off-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nReported-by: Stevie Trujillo \u003cstevie.trujillo@gmail.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Américo Wang \u003cxiyou.wangcong@gmail.com\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "13aefd7293e7a697bbf452fca65e69cc1fa8a31c", "tree": "2d8c2039904eda4b9079cae83145c541e8dc8c01", "parents": [ "beda94da38d2a3bf7f40c01f0a8e6d86067c91cc" ], "author": { "name": "Marco Stornelli", "email": "marco.stornelli@gmail.com", "time": "Tue Jul 26 16:08:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:45 2011 -0700" }, "message": "ramoops: use module parameters instead of platform data if not available\n\nUse generic module parameters instead of platform data, if platform data\nare not available. This limitation has been introduced with commit\nc3b92ce9e75 (\"ramoops: use the platform data structure instead of module\nparams\").\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Américo Wang \u003cxiyou.wangcong@gmail.com\u003e\nReported-by: Stevie Trujillo \u003cstevie.trujillo@gmail.com\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "29412f0f6a19e34336368f13eab848091c343952", "tree": "36c1c422022b4cfb4a98b60dd936ca4f98d24911", "parents": [ "968543100a75bef892f52eb86e92e83b3b7bc581" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Fri Jul 22 17:39:20 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Jul 26 10:34:34 2011 +1000" }, "message": "tpm_nsc: Fix bug when loading multiple TPM drivers\n\nThis patch fixes kernel bugzilla 34572.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d34572\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nTested-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "a23a334bd547e9462d9ca4a74608519a1e928848", "tree": "e3d4f4423130f0d74f141c9bbd0c0874690e38b3", "parents": [ "a642285014df03b8f320399d515bf3b779af07ac", "acdca31dba86c4f426460aa000d13930a00549b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 24 09:05:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 24 09:05:32 2011 -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: (34 commits)\n crypto: caam - ablkcipher support\n crypto: caam - faster aead implementation\n crypto: caam - structure renaming\n crypto: caam - shorter names\n crypto: talitos - don\u0027t bad_key in ablkcipher setkey\n crypto: talitos - remove unused giv from ablkcipher methods\n crypto: talitos - don\u0027t set done notification in hot path\n crypto: talitos - ensure request ordering within a single tfm\n crypto: gf128mul - fix call to memset()\n crypto: s390 - support hardware accelerated SHA-224\n crypto: algif_hash - Handle initial af_alg_make_sg error correctly\n crypto: sha1_generic - use SHA1_BLOCK_SIZE\n hwrng: ppc4xx - add support for ppc4xx TRNG\n crypto: crypto4xx - Perform read/modify/write on device control register\n crypto: caam - fix build warning when DEBUG_FS not configured\n crypto: arc4 - Fixed coding style issues\n crypto: crc32c - Fixed coding style issue\n crypto: omap-sham - do not schedule tasklet if there is no active requests\n crypto: omap-sham - clear device flags when finishing request\n crypto: omap-sham - irq handler must not clear error code\n ...\n" }, { "commit": "bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff", "tree": "12b2bb4202b05f6ae6a43c6ce830a0472043dbe5", "parents": [ "8e204874db000928e37199c2db82b7eb8966cc3c", "5a9a43646cf709312d71eca71cef90ad802f28f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 19:02:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 19:02:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (107 commits)\n vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp\n isofs: Remove global fs lock\n jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory\n fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.\n mm/truncate.c: fix build for CONFIG_BLOCK not enabled\n fs:update the NOTE of the file_operations structure\n Remove dead code in dget_parent()\n AFS: Fix silly characters in a comment\n switch d_add_ci() to d_splice_alias() in \"found negative\" case as well\n simplify gfs2_lookup()\n jfs_lookup(): don\u0027t bother with . or ..\n get rid of useless dget_parent() in btrfs rename() and link()\n get rid of useless dget_parent() in fs/btrfs/ioctl.c\n fs: push i_mutex and filemap_write_and_wait down into -\u003efsync() handlers\n drivers: fix up various -\u003ellseek() implementations\n fs: handle SEEK_HOLE/SEEK_DATA properly in all fs\u0027s that define their own llseek\n Ext4: handle SEEK_HOLE/SEEK_DATA generically\n Btrfs: implement our own -\u003ellseek\n fs: add SEEK_HOLE and SEEK_DATA flags\n reiserfs: make reiserfs default to barrier\u003dflush\n ...\n\nFix up trivial conflicts in fs/xfs/linux-2.6/xfs_super.c due to the new\nshrinker callout for the inode cache, that clashed with the xfs code to\nstart the periodic workers later.\n" }, { "commit": "8e204874db000928e37199c2db82b7eb8966cc3c", "tree": "eae66035cb761c3c5a79e98b92280b5156bc01ef", "parents": [ "3e0b8df79ddb8955d2cce5e858972a9cfe763384", "aafade242ff24fac3aabf61c7861dfa44a3c2445" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 17:05:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 17:05:15 2011 -0700" }, "message": "Merge branch \u0027x86-vdso-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-vdso-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86-64, vdso: Do not allocate memory for the vDSO\n clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG option\n x86, vdso: Drop now wrong comment\n Document the vDSO and add a reference parser\n ia64: Replace clocksource.fsys_mmio with generic arch data\n x86-64: Move vread_tsc and vread_hpet into the vDSO\n clocksource: Replace vread with generic arch data\n x86-64: Add --no-undefined to vDSO build\n x86-64: Allow alternative patching in the vDSO\n x86: Make alternative instruction pointers relative\n x86-64: Improve vsyscall emulation CS and RIP handling\n x86-64: Emulate legacy vsyscalls\n x86-64: Fill unused parts of the vsyscall page with 0xcc\n x86-64: Remove vsyscall number 3 (venosys)\n x86-64: Map the HPET NX\n x86-64: Remove kernel.vsyscall64 sysctl\n x86-64: Give vvars their own page\n x86-64: Document some of entry_64.S\n x86-64: Fix alignment of jiffies variable\n" }, { "commit": "431bf99d26157d56689e5de65bd27ce9f077fc3f", "tree": "b15e357039956fcdd0e0e6177d2fc99bb3cfa822", "parents": [ "72f96e0e38d7e29ba16dcfd824ecaebe38b8293e", "7ae033cc0dfce68d8e0c83aca60837cf2bf0d2e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:01:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:01:57 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (51 commits)\n PM: Improve error code of pm_notifier_call_chain()\n PM: Add \"RTC\" to PM trace time stamps to avoid confusion\n PM / Suspend: Export suspend_set_ops, suspend_valid_only_mem\n PM / Suspend: Add .suspend_again() callback to suspend_ops\n PM / OPP: Introduce function to free cpufreq table\n ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active\n PM / Domains: Take .power_off() error code into account\n ARM / shmobile: Use genpd_queue_power_off_work()\n ARM / shmobile: Use pm_genpd_poweroff_unused()\n PM / Domains: Introduce function to power off all unused PM domains\n OMAP: PM: disable idle on suspend for GPIO and UART\n OMAP: PM: omap_device: add API to disable idle on suspend\n OMAP: PM: omap_device: add system PM methods for PM domain handling\n OMAP: PM: omap_device: conditionally use PM domain runtime helpers\n PM / Runtime: Add new helper function: pm_runtime_status_suspended()\n PM / Domains: Queue up power off work only if it is not pending\n PM / Domains: Improve handling of wakeup devices during system suspend\n PM / Domains: Do not restore all devices on power off error\n PM / Domains: Allow callbacks to execute all runtime PM helpers\n PM / Domains: Do not execute device callbacks under locks\n ...\n" }, { "commit": "968543100a75bef892f52eb86e92e83b3b7bc581", "tree": "7a17de7337e3646641eed445532f0d71bc0f65c7", "parents": [ "6eb77b214985f8c2568f1f20f941790fbf8bf97b" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Sun Jul 17 01:04:24 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jul 22 17:33:24 2011 +1000" }, "message": "tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block\n\nThis patch moves the tpm_tis_reenable_interrupts function out of the\nCONFIG_PNP-surrounded #define block. This solves a compilation error in\ncase CONFIG_PNP is not defined.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "87c48fa3b4630905f98268dde838ee43626a060c", "tree": "1374b52ed0514682f836cfa0a6a683eb549c9613", "parents": [ "21efcfa0ff27776902a8a15e810147be4d937d69" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 21 21:25:58 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 21 21:25:58 2011 -0700" }, "message": "ipv6: make fragment identifications less predictable\n\nIPv6 fragment identification generation is way beyond what we use for\nIPv4 : It uses a single generator. Its not scalable and allows DOS\nattacks.\n\nNow inetpeer is IPv6 aware, we can use it to provide a more secure and\nscalable frag ident generator (per destination, instead of system wide)\n\nThis patch :\n1) defines a new secure_ipv6_id() helper\n2) extends inet_getid() to provide 32bit results\n3) extends ipv6_select_ident() with a new dest parameter\n\nReported-by: Fernando Gont \u003cfernando@gont.com.ar\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "02c24a82187d5a628c68edfe71ae60dc135cd178", "tree": "c8dbaba4d82e2b20ed4335910a564a1f7d90fcf6", "parents": [ "22735068d53c7115e384bc88dea95b17e76a6839" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Sat Jul 16 20:44:56 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 20 20:47:59 2011 -0400" }, "message": "fs: push i_mutex and filemap_write_and_wait down into -\u003efsync() handlers\n\nBtrfs needs to be able to control how filemap_write_and_wait_range() is called\nin fsync to make it less of a painful operation, so push down taking i_mutex and\nthe calling of filemap_write_and_wait() down into the -\u003efsync() handlers. Some\nfile systems can drop taking the i_mutex altogether it seems, like ext3 and\nocfs2. For correctness sake I just pushed everything down in all cases to make\nsure that we keep the current behavior the same for everybody, and then each\nindividual fs maintainer can make up their mind about what to do from there.\nThanks,\n\nAcked-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "22735068d53c7115e384bc88dea95b17e76a6839", "tree": "c531b0ca2ccf472c8abfede626535fcf07357624", "parents": [ "06222e491e663dac939f04b125c9dc52126a75c4" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jul 18 13:21:39 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 20 20:47:58 2011 -0400" }, "message": "drivers: fix up various -\u003ellseek() implementations\n\nFix up a few -\u003ellseek() implementations that won\u0027t deal with SEEK_HOLE/SEEK_DATA\nproperly. Make them future proof so that if we ever add new options they will\nreturn -EINVAL. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6eb77b214985f8c2568f1f20f941790fbf8bf97b", "tree": "52e34cb937b8f87585b354216e31c6c428c4f1b8", "parents": [ "0f2a55d5bb2372058275b0b343d90dd5d640d045" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Mon Jul 18 09:11:55 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jul 21 09:29:56 2011 +1000" }, "message": "tpm: Fix compilation warning when CONFIG_PNP is not defined\n\nThe is_itpm() function is only accessed from a block surrounded by\n#ifdef CONFIG_PNP. Therefore, also surround it with #ifdef CONFIG_PNP\nand remove the #else branch causing the warning.\n\nhttp://lxr.linux.no/#linux+v2.6.39/drivers/char/tpm/tpm_tis.c#L622\n\nv2:\n - fixes a previous typo\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f0c077a8b7f9dce590c760a7b2f3c417dffa52d1", "tree": "ef6d08aa3ca1d79000db7d7479d98bda04a11c78", "parents": [ "1d8047a6f7973470bb1de4606a6e00c0bbee3cc6" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Fri Jul 08 20:53:36 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jul 15 23:58:20 2011 +0200" }, "message": "PM: Improve error code of pm_notifier_call_chain()\n\nThis enables pm_notifier_call_chain() to get the actual error code\nin the callback rather than always assume -EINVAL by converting all\nPM notifier calls to return encapsulate error code with\nnotifier_from_errno().\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "574c44fa8fa6262ffd5939789ef51a6e98ed62d7", "tree": "4ae27eab58a2609beae88129bc3c2267b391dd9a", "parents": [ "98d0ac38ca7b1b7a552c9a2359174ff84decb600" ], "author": { "name": "Andy Lutomirski", "email": "luto@mit.edu", "time": "Wed Jul 13 09:24:15 2011 -0400" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Jul 14 17:57:09 2011 -0700" }, "message": "ia64: Replace clocksource.fsys_mmio with generic arch data\n\nNow that clocksource.archdata is available, use it for ia64-specific\ncode.\n\nCc: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nCc: linux-ia64@vger.kernel.org\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nLink: http://lkml.kernel.org/r/d31de0ee0842a0e322fb6441571c2b0adb323fa2.1310563276.git.luto@mit.edu\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "780d7cc44524cd396a34757127f51ecb8ccaf2da", "tree": "96675e90d59903523b282874ca77ce44aa585b50", "parents": [ "4171424e66e5525d7128a2c355215ca5c66f76d5" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jul 12 23:38:18 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 13 07:44:27 2011 +0100" }, "message": "agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M\n\nKonstantin Belousov found an error in the define of G4x_GMCH_SIZE_VT_2M\nrelative to the GMCH specs, and confirmed that indeed one of his users\nwith a Q45 reports 0xb not 0xc for a 2/2MiB GATT.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Konstantin Belousov \u003ckostikbel@gmail.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c9206693457a946698e1d67db2b424e1d101493d", "tree": "59a79652ef211a9a6a935b4942ff015ff2569e8f", "parents": [ "9519de3f265f112e992aa7f446d905196bd608e8" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:34 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:09 2011 -0300" }, "message": "tpm: Fix a typo\n\nThis patch fixes a typo.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "9519de3f265f112e992aa7f446d905196bd608e8", "tree": "112d43561d9ffb478ebce085d202d77d85ad3a1a", "parents": [ "a7b66822b20f67f106690d0acee3d0ba667fd9bb" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:33 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:09 2011 -0300" }, "message": "tpm_tis: Probing function for Intel iTPM bug\n\nThis patch introduces a function for automatic probing for the Intel iTPM\nSTS_DATA_EXPECT flaw.\n\nThe patch splits the current tpm_tis_send function into 2 parts where the 1st\npart is now called tpm_tis_send_data() and merely sends the data to the TPM.\nThis function is then used for probing. The new tpm_tis_send function now\nfirst calls tpm_tis_send_data and if that succeeds has the TPM process the\ncommand and waits until the response is there.\n\nThe probing for the Intel iTPM is only invoked if the user has not passed\nitpm\u003d1 as parameter for the module *or* if such a TPM was detected via ACPI.\nPreviously it was necessary to pass itpm\u003d1 when also passing force\u003d1 to the\nmodule when doing a \u0027modprobe\u0027. This function is more general than the ACPI\ntest function and the function relying on ACPI could probably be removed.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "a7b66822b20f67f106690d0acee3d0ba667fd9bb", "tree": "c9b0ae416b45ae1b4c6fc453265e42394d60e352", "parents": [ "20b87bbfada971ae917cc2ff9dbc9dae05b94d25" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:32 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Fix the probing for interrupts\n\nThis patch fixes several aspects of the probing for interrupts.\n\nThis patch reads the TPM\u0027s timeouts before probing for the interrupts. The\ntpm_get_timeouts() function is invoked in polling mode and gets the proper\ntimeouts from the TPM so that we don\u0027t need to fall back to 2 minutes timeouts\nfor short duration commands while the interrupt probing is happening.\n\nThis patch introduces a variable probed_irq into the vendor structure that gets\nthe irq number if an interrupt is received while the the tpm_gen_interrupt()\nfunction is run in polling mode during interrupt probing. Previously some\nparts of tpm_gen_interrupt() were run in polling mode, then the irq variable\nwas set in the interrupt handler when an interrupt was received and execution\nof tpm_gen_interrupt() ended up switching over to interrupt mode.\ntpm_gen_interrupt() execution ended up on an event queue where it eventually\ntimed out since the probing handler doesn\u0027t wake any queues.\n\nBefore calling into free_irq() clear all interrupt flags that may have\nbeen set by the TPM. The reason is that free_irq() will call into the probing\ninterrupt handler and may otherwise fool us into thinking that a real interrupt\nhappened (because we see the flags as being set) while the TPM\u0027s interrupt line\nis not even connected to anything on the motherboard. This solves a problem\non one machine I did testing on (Thinkpad T60).\n\nIf a TPM claims to use a specifc interrupt, the probing is done as well\nto verify that the interrupt is actually working. If a TPM indicates\nthat it does not use a specific interrupt (returns \u00270\u0027), probe all interrupts\nfrom 3 to 15.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "20b87bbfada971ae917cc2ff9dbc9dae05b94d25", "tree": "deacbb011383a6a95922b8c49cd3c8e77c34afd2", "parents": [ "45baa1d1fa3926510ead93c96e6b0baa5ad79bd3" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:31 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Delay ACPI S3 suspend while the TPM is busy\n\nThis patch delays the (ACPI S3) suspend while the TPM is busy processing a\ncommand and the TPM TIS driver is run in interrupt mode. This is the same\nbehavior as we already have it for the TPM TIS driver in polling mode.\n\nReasoning: Some of the TPM\u0027s commands advance the internal state of the TPM.\nAn example would be the extending of one of its PCR registers. Upper layers,\nsuch as IMA or TSS (TrouSerS), would certainly want to be sure that the\ncommand succeeded rather than getting an error code (-62 \u003d -ETIME) that may\nnot give a conclusive answer as for what reason the command failed. Reissuing\nsuch a command would put the TPM into the wrong state, so waiting for it to\nfinish is really the only option.\n\nThe downside is that some commands (key creation) can take a long time and\nactually prevent the machine from entering S3 at all before the 20 second\ntimeout of the power management subsystem arrives.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "45baa1d1fa3926510ead93c96e6b0baa5ad79bd3", "tree": "aa90dcb72b808efc5392aba368ad60a07f58d587", "parents": [ "5a79444f24cb169b79f0f346482a42ab28329bae" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:30 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Re-enable interrupts upon (S3) resume\n\nThis patch makes sure that if the TPM TIS interface is run in interrupt mode\n(rather than polling mode) that all interrupts are enabled in the TPM\u0027s\ninterrupt enable register after a resume from ACPI S3 suspend. The registers\nmay either have been cleared by the TPM loosing its state during device sleep\nor by the BIOS leaving the TPM in polling mode (after sending a command to\nthe TPM for starting it up again)\n\nYou may want to check if your TPM runs with interrupts by doing\n\ncat /proc/interrupts | grep -i tpm\n\nand see whether there is an entry or otherwise for it to use interrupts:\n\nmodprobe tpm_tis interrupts\u003d1 [add \u0027itpm\u003d1\u0027 for Intel TPM ]\n\nv2:\n - the patch was adapted to work with the pnp and platform driver\n implementations in tpm_tis.c\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "5a79444f24cb169b79f0f346482a42ab28329bae", "tree": "23c1731a7d74b7a067b2ea5e0f1be501a6b7eeae", "parents": [ "6259210176510c64251a314ffb74834a790f09a0" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:29 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm: Fix display of data in pubek sysfs entry\n\nThis patch fixes the TPM\u0027s pubek sysfs entry that is accessible as long\nas the TPM doesn\u0027t have an owner. It was necessary to shift the access to the\ndata by -10 -- the first byte immediately follows the 10 byte header. The\nline\n\n \tdata \u003d tpm_cmd.params.readpubek_out_buffer;\n\nsets it at the offset \u002710\u0027 in the packet, so we can read the data array\nstarting at offset \u00270\u0027.\n\nBefore:\n\nAlgorithm: 00 0C 00 00\nEncscheme: 08 00\nSigscheme: 00 00\nParameters: 00 00 00 00 01 00 AC E2 5E 3C A0 78\nModulus length: -563306801\nModulus:\n28 21 08 0F 82 CD F2 B1 E7 49 F7 74 70 BE 59 8C\n43 78 B1 24 EA 52 E2 FE 52 5C 3A 12 3B DC 61 71\n[...]\n\nAfter:\n\nAlgorithm: 00 00 00 01\nEncscheme: 00 03\nSigscheme: 00 01\nParameters: 00 00 08 00 00 00 00 02 00 00 00 00\nModulus length: 256\nModulus:\nAC E2 5E 3C A0 78 DE 6C 9E CF 28 21 08 0F 82 CD\nF2 B1 E7 49 F7 74 70 BE 59 8C 43 78 B1 24 EA 52\n[...]\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "6259210176510c64251a314ffb74834a790f09a0", "tree": "41cdcab9da0e98e93f1b30b31d58ca13abd3ca9b", "parents": [ "e3e1a1e169d4e7f73c60ded937ebe24526bc6427" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:28 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:08 2011 -0300" }, "message": "tpm_tis: Add timeouts sysfs entry\n\nDisplay the TPM\u0027s interface timeouts in a \u0027timeouts\u0027 sysfs entry. Display\nthe entries as having been adjusted when they were scaled due to their values\nbeing reported in milliseconds rather than microseconds.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "e3e1a1e169d4e7f73c60ded937ebe24526bc6427", "tree": "7851fd1700d3c40d5c03be60bb5c8942cb64b061", "parents": [ "829bf0675272d24ba0056f5f79e09544464f0c8d" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:27 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Adjust interface timeouts if they are too small\n\nAdjust the interface timeouts if they are found to be too small, i.e., if\nthey are returned in milliseconds rather than microseconds as we heared\nfrom Infineon that some (old) Infineon TPMs do.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "829bf0675272d24ba0056f5f79e09544464f0c8d", "tree": "7829db8e0f7ebff6596c0e0f2dd99aa82fa3de33", "parents": [ "04ab2293bbd36fc04060da93058cef7789414585" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:26 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Use interface timeouts returned from the TPM\n\nThe TPM driver currently discards the interface timeout values returned\nfrom the TPM. The check of the response packet needs to consider that\nthe return_code field is 0 on success and the size of the expected\npacket is equivalent to the header size + u32 length indicator for the\nTPM_GetCapability() result + 4 interface timeout indicators of type u32.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "04ab2293bbd36fc04060da93058cef7789414585", "tree": "051266e417a83140a7d2c80486f98e3c219d7eba", "parents": [ "e934acca1ee993e1d99d7dc203569a6e5cdfb392" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:25 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm_tis: Introduce durations sysfs entry\n\nDisplay the TPM\u0027s command timeouts in a \u0027durations\u0027 sysfs entry. Display\nthe entries as having been adjusted when they were scaled due to their values\nbeing reported in milliseconds rather than microseconds.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "e934acca1ee993e1d99d7dc203569a6e5cdfb392", "tree": "e0ac7a2305c0b2633a798721e5fe5b95c6d89d98", "parents": [ "979b140614a5459f340f5f8b1641ef77c863d899" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:24 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Adjust the durations if they are too small\n\nAdjust the durations if they are found to be too small, i.e., if they are\nreturned in milliseconds rather than microseconds as some Infineon TPMs are\nreported to do.\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "979b140614a5459f340f5f8b1641ef77c863d899", "tree": "187c508ee023f34e755a7416349c1936c03a31fe", "parents": [ "97fb35e413f256ded07b88c73b3d932ec31ea84e" ], "author": { "name": "Stefan Berger", "email": "stefanb@linux.vnet.ibm.com", "time": "Wed Mar 30 12:13:23 2011 -0400" }, "committer": { "name": "Rajiv Andrade", "email": "srajiv@linux.vnet.ibm.com", "time": "Tue Jul 12 18:53:07 2011 -0300" }, "message": "tpm: Use durations returned from TPM\n\nThe TPM driver currently discards the durations values returned\nfrom the TPM. The check of the response packet needs to consider that\nthe return_code field is 0 on success and the size of the expected\npacket is equivalent to the header size + u32 length indicator for the\nTPM_GetCapability() result + 3 timeout indicators of type u32.\n\nv4:\n- sysfs entry \u0027durations\u0027 is now a patch of its own\n- the work-around for TPMs reporting durations in milliseconds is now in a\n patch of its own\n\nv3:\n- sysfs entry now called \u0027durations\u0027 to resemble TPM-speak (previously\n was called \u0027timeouts\u0027)\n\nv2:\n- adjusting all timeouts for TPM devices reporting timeouts in msec rather\n than usec\n- also displaying in sysfs whether the timeouts are \u0027original\u0027 or \u0027adjusted\u0027\n\nSigned-off-by: Stefan Berger \u003cstefanb@linux.vnet.ibm.com\u003e\nTested-by: Guillaume Chazarain \u003cguichaz@gmail.com\u003e\nSigned-off-by: Rajiv Andrade \u003csrajiv@linux.vnet.ibm.com\u003e\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "eb032b9837a958e21ca000358a5bde5e17192ddb", "tree": "880af47c607f37f134510a32e3499ce0365e0ef5", "parents": [ "8072ba1ba7fe9f48ad9f424829863214484dfc2f" ], "author": { "name": "Michael Büsch", "email": "m@bues.ch", "time": "Mon Jul 04 20:50:05 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jul 07 15:18:01 2011 +0200" }, "message": "Update my e-mail address\n\nSigned-off-by: Michael Buesch \u003cm@bues.ch\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "52527cf3f95d437b02f54437d5c3d7fda06474d1", "tree": "f218c25e6cb3d1aefb6040a2d919829ae52744ce", "parents": [ "c5697462ae94693764e468b701c616bbbd6f951c" ], "author": { "name": "Josh Boyer", "email": "jwboyer@linux.vnet.ibm.com", "time": "Mon Jun 27 15:34:54 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 30 07:44:06 2011 +0800" }, "message": "hwrng: ppc4xx - add support for ppc4xx TRNG\n\nVarious PowerPC 4xx SoCs contain a TRNG embedded in the Security function.\nThis adds a device driver for that TRNG.\n\nSigned-off-by: Josh Boyer \u003cjwboyer@linux.vnet.ibm.com\u003e\nAcked-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "033590fc9d38bb82b904439daada78f930c070db", "tree": "7ecb229a5b81098c3be8095f7c32d1a9442986b2", "parents": [ "2725ae17591bf771608fe62c54f7b2badcf7492f" ], "author": { "name": "H Hartley Sweeten", "email": "hsweeten@visionengravers.com", "time": "Wed Jun 08 21:05:51 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 30 07:44:01 2011 +0800" }, "message": "hwrng: timeriomem - use resource_size\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "2725ae17591bf771608fe62c54f7b2badcf7492f", "tree": "fe3a1d7b446b229c0179ab381ecc69a92953d4b8", "parents": [ "6ba1a31ef146f25a457968c00c8c10bbe1a3ccfe" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 08 21:00:55 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 30 07:44:01 2011 +0800" }, "message": "hwrng: nomadik - add missing clk_put\n\nJump to the end of the function for the clk_disable and clk_put rather than\nreturning directly.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "6ba1a31ef146f25a457968c00c8c10bbe1a3ccfe", "tree": "b562defd5be29f7bae4874fcd759e285a7a86e55", "parents": [ "8af00860c913d5e814f3c10232a0f42e2a964b99" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 08 20:59:38 2011 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 30 07:44:01 2011 +0800" }, "message": "hwrng: omap - add missing clk_put\n\nConvert a return to a jump to an existing label that calls clk_put.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "273ef9509b7903e50f36aaf9f1d5dc9087fca506", "tree": "4d1800cadbb85647b4db5cf5cb855dc43465536c", "parents": [ "31b5f8eeece4c0d70b649bfac7759cf7e3f915dd" ], "author": { "name": "Nils Carlson", "email": "nils.carlson@ericsson.com", "time": "Wed Jun 15 15:08:54 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:04:02 2011 -0700" }, "message": "drivers/char/hpet.c: fix periodic-emulation for delayed interrupts\n\nWhen interrupts are delayed due to interrupt masking or due to other\ninterrupts being serviced the HPET periodic-emuation would fail. This\nhappened because given an interval t and a time for the current interrupt\nm we would compute the next time as t + m. This works until we are\ndelayed for \u003e t, in which case we would be writing a new value which is in\nfact in the past.\n\nThis can be solved by computing the next time instead as (k * t) + m where\nk is large enough to be in the future. The exact computation of k is\ndescribed in a comment to the code.\n\nMore detail:\n\nAssuming an interval of 5 between each expected interrupt we have a normal\ncase of\n\nt0: interrupt, read t0 from comparator, set next interrupt t0 + 5\nt5: interrupt, read t5 from comparator, set next interrupt t5 + 5\nt10: interrupt, read t10 from comparator, set next interrupt t10 + 5\n...\n\nSo, what happens when the interrupt is serviced too late?\n\nt0: interrupt, read t0 from comparator, set next interrupt t0 + 5\nt11: delayed interrupt serviced, read t5 from comparator, set next\ninterrupt t5 + 5, which is in the past!\n... counter loops ...\nt10: Much much later, get the next interrupt.\n\nThis can happen either because we have interrupts masked for too long\n(some stupid driver goes on a printk rampage) or just because we are\npushing the limits of the interval (too small a period), or both most\nprobably.\n\nMy solution is to read the main counter as well and set the next interrupt\nto occur at the right interval, for example:\n\nt0: interrupt, read t0 from comparator, set next interrupt t0 + 5\nt11: delayed interrupt serviced, read t5 from comparator, set next\ninterrupt t15 as t10 has been missed.\nt15: back on track.\n\nSigned-off-by: Nils Carlson \u003cnils.carlson@ericsson.com\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "93ea927eb15b736fa4a431f789b1097318129d2a", "tree": "b141a0e06c9d1616dc7f0c616a96655afd32f8b0", "parents": [ "dbcb4a1a3f16702918caa4d4ab7062965050a780", "59c5f46fbe01a00eedf54a23789634438bb80603" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Jun 10 13:12:02 2011 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Jun 10 13:12:02 2011 -0400" }, "message": "Merge tag \u0027v3.0-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus\n" } ], "next": "dbcb4a1a3f16702918caa4d4ab7062965050a780" }