)]}' { "log": [ { "commit": "a536877e77f73ea22d12d94a019fedd9671b6acd", "tree": "c51a455049a372f6e28ef366eafdb30e649a41e9", "parents": [ "b7798d28ec15d20fd34b70fa57eb13f0cf6d1ecd" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Jul 21 11:22:21 2011 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Jul 21 11:47:17 2011 -0700" }, "message": "x86: Make Dell Latitude E6420 use reboot\u003dpci\n\nYet another variant of the Dell Latitude series which requires\nreboot\u003dpci.\n\nFrom the E5420 bug report by Daniel J Blueman:\n\n\u003e The E6420 is affected also (same platform, different casing and\n\u003e features), which provides an external confirmation of the issue; I can\n\u003e submit a patch for that later or include it if you prefer:\n\u003e http://linux.koolsolutions.com/2009/08/04/howto-fix-linux-hangfreeze-during-reboots-and-restarts/\n\nReported-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: \u003cstable@kernel.org\u003e\n" }, { "commit": "b7798d28ec15d20fd34b70fa57eb13f0cf6d1ecd", "tree": "431db58bbc05fc13bc2ce9fc88113cf51856d3c3", "parents": [ "cf6ace16a3cd8b728fb0afa68368fd40bbeae19f" ], "author": { "name": "Daniel J Blueman", "email": "daniel.blueman@gmail.com", "time": "Fri May 13 09:04:59 2011 +0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Jul 21 11:45:49 2011 -0700" }, "message": "x86: Make Dell Latitude E5420 use reboot\u003dpci\n\nRebooting on the Dell E5420 often hangs with the keyboard or ACPI\nmethods, but is reliable via the PCI method.\n\n[ hpa: this was deferred because we believed for a long time that the\n recent reshuffling of the boot priorities in commit\n 660e34cebf0a11d54f2d5dd8838607452355f321 fixed this platform.\n Unfortunately that turned out to be incorrect. ]\n\nSigned-off-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1305248699-2347-1-git-send-email-daniel.blueman@gmail.com\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: \u003cstable@kernel.org\u003e\n\n" }, { "commit": "3628c3f5c818cfc6e588d1ccb31f19aa12345c02", "tree": "748370df4faf909c5d2f223d0ab88dd551186ba0", "parents": [ "11e48feebe8b5d2ae348893a6e0d47c46204bee2" ], "author": { "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com", "time": "Tue Jun 28 15:57:31 2011 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Jul 12 21:42:48 2011 -0700" }, "message": "x86. reboot: Make Dell Latitude E6320 use reboot\u003dpci\n\nThe Dell Latitude E6320 doesn\u0027t reboot unless reboot\u003dpci is set.\nForce it thanks to DMI.\n\nSigned-off-by: Maxime Ripard \u003cmaxime.ripard@free-electrons.com\u003e\nLink: http://lkml.kernel.org/r/1309269451-4966-1-git-send-email-maxime.ripard@free-electrons.com\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "7a3136666bc0f0419f7aaa7b1fabb4b0e0a7fb76", "tree": "9d9e9f1de8ab1306b8b9d26aadb4a7f401323e69", "parents": [ "b49c78d4827be8d7e67e5b94adac6b30a4a9ad14" ], "author": { "name": "Kees Cook", "email": "kees.cook@canonical.com", "time": "Wed Jul 06 18:10:34 2011 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Jul 06 20:09:34 2011 -0700" }, "message": "x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup\n\nSome BIOSes will reset the Intel MISC_ENABLE MSR (specifically the\nXD_DISABLE bit) when resuming from S3, which can interact poorly with\nebba638ae723d8a8fc2f7abce5ec18b688b791d7. In 32bit PAE mode, this can\nlead to a fault when EFER is restored by the kernel wakeup routines,\ndue to it setting the NX bit for a CPU that (thanks to the BIOS reset)\nnow incorrectly thinks it lacks the NX feature. (64bit is not affected\nbecause it uses a common CPU bring-up that specifically handles the\nXD_DISABLE bit.)\n\nThe need for MISC_ENABLE being restored so early is specific to the S3\nresume path. Normally, MISC_ENABLE is saved in save_processor_state(),\nbut this happens after the resume header is created, so just reproduce\nthe logic here. (acpi_suspend_lowlevel() creates the header, calls\ndo_suspend_lowlevel, which calls save_processor_state(), so the saved\nprocessor context isn\u0027t available during resume header creation.)\n\n[ hpa: Consider for stable if OK in mainline ]\n\nSigned-off-by: Kees Cook \u003ckees.cook@canonical.com\u003e\nLink: http://lkml.kernel.org/r/20110707011034.GA8523@outflux.net\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: \u003cstable@kernel.org\u003e 2.6.38+\n" }, { "commit": "b49c78d4827be8d7e67e5b94adac6b30a4a9ad14", "tree": "7f17b670d14f9f579fd9d78194161116308a6eb4", "parents": [ "a26474e8649643e82d71e3a386d5c4bcc0b207ef" ], "author": { "name": "Peter Chubb", "email": "peter.chubb@nicta.com.au", "time": "Wed Jul 06 10:56:30 2011 +1000" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Jul 05 19:43:23 2011 -0700" }, "message": "x86, reboot: Acer Aspire One A110 reboot quirk\n\nSince git commit\n 660e34cebf0a11d54f2d5dd8838607452355f321 x86: reorder reboot method\n preferences,\nmy Acer Aspire One hangs on reboot. It appears that its ACPI method\nfor rebooting is broken. The attached patch adds a quirk so that the\nmachine will reboot via the BIOS.\n\n[ hpa: verified that the ACPI control on this machine is just plain broken. ]\n\nSigned-off-by: Peter Chubb \u003cpeter.chubb@nicta.com.au\u003e\nLink: http://lkml.kernel.org/r/w439iki5vl.wl%25peter@chubb.wattle.id.au\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "60b8b1de0dd2bf246f0e074d287bb3f0bc42a755", "tree": "8ade86fd1209fe789c4022db0f17d4c7292c1a6d", "parents": [ "3a2289a4a317e0290a8bc7af28c62c9830cb12e5" ], "author": { "name": "Andy Whitcroft", "email": "apw@canonical.com", "time": "Tue Jun 14 12:45:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 14 13:42:20 2011 -0700" }, "message": "x86 idle: APM requires pm_idle/default_idle unconditionally when a module\n\n[ Also from Ben Hutchings \u003cben@decadent.org.uk\u003e and Vitaliy Ivanov\n \u003cvitalivanov@gmail.com\u003e ]\n\nCommit 06ae40ce073d (\"x86 idle: EXPORT_SYMBOL(default_idle, pm_idle)\nonly when APM demands it\") removed the export for pm_idle/default_idle\nunless the apm module was modularised and CONFIG_APM_CPU_IDLE was set.\n\nBut the apm module uses pm_idle/default_idle unconditionally,\nCONFIG_APM_CPU_IDLE only affects the bios idle threshold. Adjust the\nexport accordingly.\n\n[ Used #ifdef instead of #if defined() as it\u0027s shorter, and what both\n Ben and Vitaliy used.. Andy, you\u0027re out-voted ;) - Linus ]\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Len Brown \u003clen.brown@intel.com\u003e\nSigned-off-by: Andy Whitcroft \u003capw@canonical.com\u003e\nSigned-off-by: Vitaliy Ivanov \u003cvitalivanov@gmail.com\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f39e8409955fad210a9a7169cc53c4c18daaef3a", "tree": "c2ebaa508062410e8f3a9de6ee8704dc1bc615c7", "parents": [ "6211b3e1bba952fcd16d477b5dafb1904bac0e48", "66aa6962ff520804f9874e57ea97995153f499d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 14 11:25:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 14 11:25:32 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm: Compare only lower 32 bits of framebuffer map offsets\n drm/i915: Don\u0027t leak in i915_gem_shmem_pread_slow()\n drm/radeon/kms: do bounds checking for 3D_LOAD_VBPNTR and bump array limit\n drm/radeon/kms: fix mac g5 quirk\n x86/uv/x2apic: update for change in pci bridge handling.\n alpha, drm: Remove obsolete Alpha support in MGA DRM code\n alpha/drm: Cleanup Alpha support in DRM generic code\n savage: remove unnecessary if statement\n drm/radeon: fix GUI idle IH debug statements\n drm/radeon/kms: check modes against max pixel clock\n drm: fix fbs in DRM_IOCTL_MODE_GETRESOURCES ioctl\n" }, { "commit": "7ad35cf288fd63a19bf50e490440a992de808b2b", "tree": "a240c3487926ebe62d8c10e0d1ae75db38f025e6", "parents": [ "83533c132a55aac735028f6fb9b956e8c078db1f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 25 14:00:49 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 14 09:50:12 2011 +1000" }, "message": "x86/uv/x2apic: update for change in pci bridge handling.\n\nWhen I added 3448a19da479b6bd1e28e2a2be9fa16c6a6feb39\nI forgot about the special uv handling code for this, so this\npatch fixes it up.\n\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nAcked-by: Ingo Molnar\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c78a9b9b8e36b8de302eddbe7a1688af3d9650ff", "tree": "3857996cf30ae6a60b5afe2e1e3e30f75fbca05e", "parents": [ "842c895d140a75e5d67fa346213deb3ca2b460f8", "5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 13 10:45:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 13 10:45:49 2011 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n ftrace: Revert 8ab2b7efd ftrace: Remove unnecessary disabling of irqs\n kprobes/trace: Fix kprobe selftest for gcc 4.6\n ftrace: Fix possible undefined return code\n oprofile, dcookies: Fix possible circular locking dependency\n oprofile: Fix locking dependency in sync_start()\n oprofile: Free potentially owned tasks in case of errors\n oprofile, x86: Add comments to IBS LVT offset initialization\n" }, { "commit": "842c895d140a75e5d67fa346213deb3ca2b460f8", "tree": "dcf4a61907e96739ab97de7592f8cc68fd508d3c", "parents": [ "562d1ffed2082fc59fb72173b856822ffe781559", "977cb76d52e7aa040e18a84b29fe6fd80d79319b", "13863a66c9c8a663665445cf05d68de96ff31830" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 13 10:45:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 13 10:45:10 2011 -0700" }, "message": "Merge branches \u0027x86-urgent-for-linus\u0027 and \u0027irq-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: devicetree: Add missing early_init_dt_setup_initrd_arch stub\n x86: cpu-hotplug: Prevent softirq wakeup on wrong CPU\n\n* \u0027irq-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n genirq: Prevent potential NULL dereference in irq_set_irq_wake()\n" }, { "commit": "dac853ae89043f1b7752875300faf614de43c74b", "tree": "2f5732cd1197a1930a32eaa1ece1446ea73f1625", "parents": [ "06e86849cf4019945a106913adb9ff0abcc01770" ], "author": { "name": "Mathias Krause", "email": "minipli@googlemail.com", "time": "Thu Jun 09 20:05:18 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 09 12:50:05 2011 -0700" }, "message": "exec: delay address limit change until point of no return\n\nUnconditionally changing the address limit to USER_DS and not restoring\nit to its old value in the error path is wrong because it prevents us\nusing kernel memory on repeated calls to this function. This, in fact,\nbreaks the fallback of hard coded paths to the init program from being\never successful if the first candidate fails to load.\n\nWith this patch applied switching to USER_DS is delayed until the point\nof no return is reached which makes it possible to have a multi-arch\nrootfs with one arch specific init binary for each of the (hard coded)\nprobed paths.\n\nSince the address limit is already set to USER_DS when start_thread()\nwill be invoked, this redundancy can be safely removed.\n\nSigned-off-by: Mathias Krause \u003cminipli@googlemail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "977cb76d52e7aa040e18a84b29fe6fd80d79319b", "tree": "262c08efd514943efa26bd2e53f932a124f86971", "parents": [ "fd8a7de177b6f56a0fc59ad211c197a7df06b1ad" ], "author": { "name": "Florian Fainelli", "email": "ffainelli@freebox.fr", "time": "Mon Jun 06 10:15:49 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 09 15:39:43 2011 +0200" }, "message": "x86: devicetree: Add missing early_init_dt_setup_initrd_arch stub\n\nThis patch fixes the following build failure:\n\ndrivers/built-in.o: In function `early_init_dt_check_for_initrd\u0027:\n/home/florian/dev/kernel/x86/linux-2.6-x86/drivers/of/fdt.c:571:\nundefined reference to `early_init_dt_setup_initrd_arch\u0027\nmake: *** [.tmp_vmlinux1] Error 1\n\nwhich happens as soon as we enable initrd support on a x86 devicetree\nplatform such as Intel CE4100.\n\nSigned-off-by: Florian Fainelli \u003cffainelli@freebox.fr\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nAcked-by: Sebastian Andrzej Siewior \u003csebastian@breakpoint.cc\u003e\nCc: stable@kernel.org # 2.6.39\nLink: http://lkml.kernel.org/r/201106061015.50039.ffainelli@freebox.fr\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "86dd7909c2c4ae3f219a9233bf0f095b05632ecf", "tree": "1808de2a661434cc8a930bc8f8a248c5cf70ca2c", "parents": [ "d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb", "cbf74cea070fa1f705de4712e25d9e56ae6543c7" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 08 15:49:03 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 08 15:49:03 2011 +0200" }, "message": "Merge branch \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent\n" }, { "commit": "fd8a7de177b6f56a0fc59ad211c197a7df06b1ad", "tree": "1223a807a97118e1158ef293f8a835e82d00120c", "parents": [ "cb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 20 14:34:50 2010 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jun 08 11:21:19 2011 +0200" }, "message": "x86: cpu-hotplug: Prevent softirq wakeup on wrong CPU\n\nAfter a newly plugged CPU sets the cpu_online bit it enables\ninterrupts and goes idle. The cpu which brought up the new cpu waits\nfor the cpu_online bit and when it observes it, it sets the cpu_active\nbit for this cpu. The cpu_active bit is the relevant one for the\nscheduler to consider the cpu as a viable target.\n\nWith forced threaded interrupt handlers which imply forced threaded\nsoftirqs we observed the following race:\n\ncpu 0 cpu 1\n\nbringup(cpu1);\n set_cpu_online(smp_processor_id(), true);\n\t\t local_irq_enable();\nwhile (!cpu_online(cpu1));\n timer_interrupt()\n -\u003e wake_up(softirq_thread_cpu1);\n -\u003e enqueue_on(softirq_thread_cpu1, cpu0);\n\n ^^^^\n\ncpu_notify(CPU_ONLINE, cpu1);\n -\u003e sched_cpu_active(cpu1)\n -\u003e set_cpu_active((cpu1, true);\n\nWhen an interrupt happens before the cpu_active bit is set by the cpu\nwhich brought up the newly onlined cpu, then the scheduler refuses to\nenqueue the woken thread which is bound to that newly onlined cpu on\nthat newly onlined cpu due to the not yet set cpu_active bit and\nselects a fallback runqueue. Not really an expected and desirable\nbehaviour.\n\nSo far this has only been observed with forced hard/softirq threading,\nbut in theory this could happen without forced threaded hard/softirqs\nas well. It\u0027s probably unobservable as it would take a massive\ninterrupt storm on the newly onlined cpu which causes the softirq loop\nto wake up the softirq thread and an even longer delay of the cpu\nwhich waits for the cpu_online bit.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReviewed-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: stable@kernel.org # 2.6.39\n\n" }, { "commit": "26018874e3584f1658570d41d57d4c34f6a53aa0", "tree": "cc59523e0e25e6212cae86a93f90e2023f334633", "parents": [ "27c2127a15d340706c0aa84e311188a14468d841" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jun 06 16:50:14 2011 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Jun 07 10:06:59 2011 +0200" }, "message": "x86/amd-iommu: Fix boot crash with hidden PCI devices\n\nSome PCIe cards ship with a PCI-PCIe bridge which is not\nvisible as a PCI device in Linux. But the device-id of the\nbridge is present in the IOMMU tables which causes a boot\ncrash in the IOMMU driver.\nThis patch fixes by removing these cards from the IOMMU\nhandling. This is a pure -stable fix, a real fix to handle\nthis situation appriatly will follow for the next merge\nwindow.\n\nCc: stable@kernel.org\t# \u003e 2.6.32\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "27c2127a15d340706c0aa84e311188a14468d841", "tree": "ff9d621106b5dadbd56702e4c5c4af910e14f3e4", "parents": [ "0de66d5b35ee148455e268b2782873204ffdef4b" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon May 30 15:56:24 2011 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jun 06 17:37:27 2011 +0200" }, "message": "x86/amd-iommu: Use only per-device dma_ops\n\nUnfortunatly there are systems where the AMD IOMMU does not\ncover all devices. This breaks with the current driver as it\ninitializes the global dma_ops variable. This patch limits\nthe AMD IOMMU to the devices listed in the IVRS table fixing\nDMA for devices not covered by the IOMMU.\n\nCc: stable@kernel.org\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "0de66d5b35ee148455e268b2782873204ffdef4b", "tree": "536f0c7ef7d7378e4482903b932502c463e3fc2e", "parents": [ "59c5f46fbe01a00eedf54a23789634438bb80603" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jun 06 16:04:02 2011 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jun 06 16:10:15 2011 +0200" }, "message": "x86/amd-iommu: Fix 3 possible endless loops\n\nThe driver contains several loops counting on an u16 value\nwhere the exit-condition is checked against variables that\ncan have values up to 0xffff. In this case the loops will\nnever exit. This patch fixed 3 such loops.\n\nCc: stable@kernel.org\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "af0d6a0a3a30946f7df69c764791f1b0643f7cd6", "tree": "ccf9310a7d8ab00d7677d06d5f2bde48368a43ac", "parents": [ "07ef3c3b44896bc0432a901fe6ae0d0deaca47ce", "4f3c125c7420c85eaff627145557e392a871922d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 02:07:22 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 02:07:22 2011 +0900" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Fix mwait_play_dead() faulting on mwait-incapable cpus\n x86 idle: Fix mwait deprecation warning message\n\nEvil merge to remove extra quote noticed by Joe Perches\n" }, { "commit": "643d2d7992f4ce4f983d455b579f77b1e9c0af0c", "tree": "ebd1421f10881ba0da431a3c05fc0f31feb15176", "parents": [ "89c122236e60747f920008c9cf4e9cbde3333e50", "89e1be50c68eb5e58b873dce87bbac627ee18d1f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 31 20:32:54 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 31 20:32:54 2011 +0900" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.o\n" }, { "commit": "cbf74cea070fa1f705de4712e25d9e56ae6543c7", "tree": "dce39e94a735df4953415720d85d7ed106f71075", "parents": [ "b76a06e08d94b2a63e47837dfe46bbbf0a3af6c2" ], "author": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Mon May 30 16:31:11 2011 +0200" }, "committer": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Mon May 30 16:36:54 2011 +0200" }, "message": "oprofile, x86: Add comments to IBS LVT offset initialization\n\nAdding a comment in the code as IBS LVT setup is not obvious at all ...\n\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\n" }, { "commit": "4f3c125c7420c85eaff627145557e392a871922d", "tree": "d8e664f6e30e034bd81a595f09f1a33618da9cbb", "parents": [ "598e887d8b01655780c81cc86a9e7820ed091580" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Mon May 30 08:23:57 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 30 14:37:54 2011 +0200" }, "message": "x86: Fix mwait_play_dead() faulting on mwait-incapable cpus\n\nA logic error in mwait_play_dead() causes the kernel to use\nmwait even on cpus which don\u0027t support it, such as KVM virtual\ncpus.\n\nIntroduced by:\n\n 349c004e3d31: x86: A fast way to check capabilities of the current cpu\n\nFixes: https://bugzilla.kernel.org/show_bug.cgi?id\u003d36222\nReported-by: Török Edwin \u003cedwintorok@gmail.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1306758237-9327-1-git-send-email-avi@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "598e887d8b01655780c81cc86a9e7820ed091580", "tree": "e4b310f5c6b3c882f86ae4174fd08dfe6803c317", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Borislav Petkov", "email": "bp@alien8.de", "time": "Mon May 30 11:38:06 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 30 13:02:04 2011 +0200" }, "message": "x86 idle: Fix mwait deprecation warning message\n\nFix:\n\n arch/x86/kernel/process.c:645:1: warning: unknown escape sequence \u0027\\i\u0027\n\ndue to missing escape backslash, introduced by this commit:\n\n 5d4c47e0195b: x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n\nSigned-off-by: Borislav Petkov \u003cbp@alien8.de\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/1306748286-24701-1-git-send-email-bp@alien8.de\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f310642123e0d32d919c60ca3fab5acd130c4ba3", "tree": "f3844152e2e8c0fdd01621a400f84c8a159252a0", "parents": [ "ef1d57599dc904fdb31b8e9b5336350d21a1fde1", "5d4c47e0195b989f284907358bd5c268a44b91c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "message": "Merge branch \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6\n\n* \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:\n x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n x86 idle: deprecate \"no-hlt\" cmdline param\n x86 idle APM: deprecate CONFIG_APM_CPU_IDLE\n x86 idle floppy: deprecate disable_hlt()\n x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it\n x86 idle: clarify AMD erratum 400 workaround\n idle governor: Avoid lock acquisition to read pm_qos before entering idle\n cpuidle: menu: fixed wrapping timers at 4.294 seconds\n" }, { "commit": "5d4c47e0195b989f284907358bd5c268a44b91c7", "tree": "3a7c81ff3b3f5a5eb6199044a72c0145b58db413", "parents": [ "cdaab4a0d330f70c0e5ad8c3f7c65c2e375ea180" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:46:09 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:17 2011 -0400" }, "message": "x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n\nmwait_idle() is a C1-only idle loop intended to be more efficient\nthan HLT on SMP hardware that supports it.\n\nBut mwait_idle() has been replaced by the more general\nmwait_idle_with_hints(), which handles both C1 and deeper C-states.\nACPI uses only mwait_idle_with_hints(), and never uses mwait_idle().\n\nDeprecate mwait_idle() and the \"idle\u003dmwait\" cmdline param\nto simplify the x86 idle code.\n\nAfter this change, kernels configured with\n(!CONFIG_ACPI\u003dn \u0026\u0026 !CONFIG_INTEL_IDLE\u003dn) when run on hardware\nthat support MWAIT will simply use HLT. If MWAIT is desired\non those systems, cpuidle and the cpuidle drivers above\ncan be used.\n\ncc: x86@kernel.org\ncc: stable@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "cdaab4a0d330f70c0e5ad8c3f7c65c2e375ea180", "tree": "c0737c6c9106f858df5e223b168d548de1c1990e", "parents": [ "99c63221435963e0cee2402686ba99293c2ffa9e" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:41:17 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:16 2011 -0400" }, "message": "x86 idle: deprecate \"no-hlt\" cmdline param\n\nWe\u0027d rather that modern machines not check if HLT works on\nevery entry into idle, for the benefit of machines that had\nmarginal electricals 15-years ago. If those machines are still running\nthe upstream kernel, they can use \"idle\u003dpoll\". The only difference\nwill be that they\u0027ll now invoke HLT in machine_hlt().\n\ncc: x86@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "99c63221435963e0cee2402686ba99293c2ffa9e", "tree": "7c73900db0eafed36291257494c1e084de6ad034", "parents": [ "3b70b2e5fcf6315eb833a1bcc2b810bdc75484ff" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:19:23 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:15 2011 -0400" }, "message": "x86 idle APM: deprecate CONFIG_APM_CPU_IDLE\n\nWe don\u0027t want to export the pm_idle function pointer to modules.\nCurrently CONFIG_APM_CPU_IDLE w/ CONFIG_APM_MODULE forces us to.\n\nCONFIG_APM_CPU_IDLE is of dubious value, it runs only on 32-bit\nuniprocessor laptops that are over 10 years old. It calls into\nthe BIOS during idle, and is known to cause a number of machines\nto fail.\n\nRemoving CONFIG_APM_CPU_IDLE and will allow us to stop exporting\npm_idle. Any systems that were calling into the APM BIOS\nat run-time will simply use HLT instead.\n\ncc: x86@kernel.org\ncc: Jiri Kosina \u003cjkosina@suse.cz\u003e\ncc: stable@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "06ae40ce073daf233607a3c54a489f2c1e44683e", "tree": "50069eb65a46f343512b55c7de0cc74f6eadc2bd", "parents": [ "02c68a02018669d1817c43c42de800975cbec467" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:28:09 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:14 2011 -0400" }, "message": "x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it\n\nIn the long run, we don\u0027t want default_idle() or (pm_idle)() to\nbe exported outside of process.c. Start by not exporting them\nto modules, unless the APM build demands it.\n\ncc: x86@kernel.org\ncc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "02c68a02018669d1817c43c42de800975cbec467", "tree": "9e02b7913f650492fcdbb78cd6e8d3ff3160e43c", "parents": [ "333c5ae9948194428fe6c5ef5c088304fc98263b" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 16:59:53 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:38:57 2011 -0400" }, "message": "x86 idle: clarify AMD erratum 400 workaround\n\nThe workaround for AMD erratum 400 uses the term \"c1e\" falsely suggesting:\n1. Intel C1E is somehow involved\n2. All AMD processors with C1E are involved\n\nUse the string \"amd_c1e\" instead of simply \"c1e\" to clarify that\nthis workaround is specific to AMD\u0027s version of C1E.\nUse the string \"e400\" to clarify that the workaround is specific\nto AMD processors with Erratum 400.\n\nThis patch is text-substitution only, with no functional change.\n\ncc: x86@kernel.org\nAcked-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "a947e23a8ec04bccbfe98c5a2d64cd1f88b612d5", "tree": "d64bfae3af141014e93b32036ee8cb3202655ecc", "parents": [ "08a8b79600101fd6e13dcf05409b330e7f5b0478", "9a3865b185e77d1a4ca2d8356e37c19b78168961" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:57:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:57:01 2011 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, asm: Clean up desc.h a bit\n x86, amd: Do not enable ARAT feature on AMD processors below family 0x12\n x86: Move do_page_fault()\u0027s error path under unlikely()\n x86, efi: Retain boot service code until after switching to virtual mode\n x86: Remove unnecessary check in detect_ht()\n x86: Reorder mm_context_t to remove x86_64 alignment padding and thus shrink mm_struct\n x86, UV: Clean up uv_tlb.c\n x86, UV: Add support for SGI UV2 hub chip\n x86, cpufeature: Update CPU feature RDRND to RDRAND\n" }, { "commit": "c4a227d89f758e582fd167bb15245f2704de99ef", "tree": "f5b6e0091e6543c14d1cd7cf1f93e097a96bbd64", "parents": [ "87367a0b71a5188e34a913c05673b5078f71a64d", "f506b3dc0ec454a16d40cab9ee5d75435b39dc50" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:55:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:55:55 2011 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)\n perf: Fix SIGIO handling\n perf top: Don\u0027t stop if no kernel symtab is found\n perf top: Handle kptr_restrict\n perf top: Remove unused macro\n perf events: initialize fd array to -1 instead of 0\n perf tools: Make sure kptr_restrict warnings fit 80 col terms\n perf tools: Fix build on older systems\n perf symbols: Handle /proc/sys/kernel/kptr_restrict\n perf: Remove duplicate headers\n ftrace: Add internal recursive checks\n tracing: Update btrfs\u0027s tracepoints to use u64 interface\n tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine\n ftrace: Set ops-\u003eflag to enabled even on static function tracing\n tracing: Have event with function tracer check error return\n ftrace: Have ftrace_startup() return failure code\n jump_label: Check entries limit in __jump_label_update\n ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM\n scripts/tags.sh: Add magic for trace-events for etags too\n scripts/tags.sh: Fix ctags for DEFINE_EVENT()\n x86/ftrace: Fix compiler warning in ftrace.c\n ...\n" }, { "commit": "571503e10045c89af951962ea0bb783482663aad", "tree": "b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a", "parents": [ "29a6ccca3869bbe33879dae0cd7df2a1559eff54", "7b21fddd087678a70ad64afc0f632e0f1071b092" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:51:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:51:01 2011 -0700" }, "message": "Merge branch \u0027setns\u0027\n\n* setns:\n ns: Wire up the setns system call\n\nDone as a merge to make it easier to fix up conflicts in arm due to\naddition of sendmmsg system call\n" }, { "commit": "7b21fddd087678a70ad64afc0f632e0f1071b092", "tree": "c3ee152ab9b57b6cbc1ee3c6fd495c704ec47f66", "parents": [ "14d74e0cab7a7779a7ff0c3863c04c8a8e507106" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri May 27 19:28:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:48:39 2011 -0700" }, "message": "ns: Wire up the setns system call\n\n32bit and 64bit on x86 are tested and working. The rest I have looked\nat closely and I can\u0027t find any problems.\n\nsetns is an easy system call to wire up. It just takes two ints so I\ndon\u0027t expect any weird architecture porting problems.\n\nWhile doing this I have noticed that we have some architectures that are\nvery slow to get new system calls. cris seems to be the slowest where\nthe last system calls wired up were preadv and pwritev. avr32 is weird\nin that recvmmsg was wired up but never declared in unistd.h. frv is\nbehind with perf_event_open being the last syscall wired up. On h8300\nthe last system call wired up was epoll_wait. On m32r the last system\ncall wired up was fallocate. mn10300 has recvmmsg as the last system\ncall wired up. The rest seem to at least have syncfs wired up which was\nnew in the 2.6.39.\n\nv2: Most of the architecture support added by Daniel Lezcano \u003cdlezcano@fr.ibm.com\u003e\nv3: ported to v2.6.36-rc4 by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nv4: Moved wiring up of the system call to another patch\nv5: ported to v2.6.39-rc6\nv6: rebased onto parisc-next and net-next to avoid syscall conflicts.\nv7: ported to Linus\u0027s latest post 2.6.39 tree.\n\n\u003e  arch/blackfin/include/asm/unistd.h     |    3 ++-\n\u003e  arch/blackfin/mach-common/entry.S      |    1 +\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\n\nOh - ia64 wiring looks good.\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "89e1be50c68eb5e58b873dce87bbac627ee18d1f", "tree": "c34f3e5c37b706accec93a2dab629a1b96d57a58", "parents": [ "f23a5e1405e47df6cdc86568ea75df266b9e151f" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri May 27 23:11:24 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri May 27 23:47:16 2011 -0400" }, "message": "x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.o\n\nThe commit 44259b1abfaa8bb819d25d41d71e8e33e25dd36a\n Author: Andy Lutomirski \u003cluto@MIT.EDU\u003e\n x86-64: Move vread_tsc into a new file with sensible options\n\nRemoved the -pg from tsc.o which caused the function graph tracer\nto go into an infinite function call recursion as it uses the tsc\ninternally outside its recursion protection, thus tracing the tsc\nbreaks the function graph tracer.\n\nThis commit also added the file vread_tsc_64.c that gets used\nby vdso but failed to prevent GCOV from monkeying with it,\ncausing userspace to try to access kernel data when GCOV was\nenabled.\n\nThanks to Thomas Gleixner for pointing out GCOV as the likely\nculprit that added strange kernel accesses into the vread_tsc()\ncall.\n\nCc: Author: Andy Lutomirski \u003cluto@MIT.EDU\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "d6a72fe465f4c54654a1d5488daeb820b4ecf275", "tree": "1b581d3b3452b47ba35e1ee3c96d05c030ed9726", "parents": [ "b1d2dc3c06d8da7d58fb43d7123a91c1d6a4f576", "b1cff0ad1062621ae63cb6c5dc4165191fe2e9f1" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 27 14:28:09 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 27 14:28:09 2011 +0200" }, "message": "Merge branch \u0027tip/perf/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent\n" }, { "commit": "14587a2a25447813996e6fb9e48d48627cb75a5d", "tree": "fb2a16f31297a8e85a1f6678231d50e2d389a1a0", "parents": [ "fce637e392a762e4d4f0fc41ac3d3f557187ac21", "e9d35946c84c44e33e007123d3d595ccbd21d1a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:19:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:19:31 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: vdso: Remove unused variable\n x86-64: Optimize vDSO time()\n x86-64: Add time to vDSO\n x86-64: Turn off -pg and turn on -foptimize-sibling-calls for vDSO\n x86-64: Move vread_tsc into a new file with sensible options\n x86-64: Vclock_gettime(CLOCK_MONOTONIC) can\u0027t ever see nsec \u003c 0\n x86-64: Don\u0027t generate cmov in vread_tsc\n x86-64: Remove unnecessary barrier in vread_tsc\n x86-64: Clean up vdso/kernel shared variables\n" }, { "commit": "fce637e392a762e4d4f0fc41ac3d3f557187ac21", "tree": "1604486289418bf35ae4ba9bddb35bb4c6f83ba7", "parents": [ "8b29336fe01dab3541ebb283daddf9d0168c3f05", "c4dbe54ed7296ac3249c415d512dd6d649f66f4b", "def945eeb920b94e710574454043f080831aefe5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:19:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:19:11 2011 -0700" }, "message": "Merge branches \u0027core-fixes-for-linus\u0027 and \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n seqlock: Get rid of SEQLOCK_UNLOCKED\n\n* \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n irq: Remove smp_affinity_list when unregister irq proc\n" }, { "commit": "e9cdd343a5e42c43bcda01e609fa23089e026470", "tree": "cc814236d5dfc6c8555c3c630a493a85d23fbd93", "parents": [ "b80ef10e84d85a06bcd0b3a24a752ec32d0e0e40" ], "author": { "name": "Boris Ostrovsky", "email": "ostr@amd64.org", "time": "Thu May 26 11:19:52 2011 -0400" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu May 26 10:38:30 2011 -0700" }, "message": "x86, amd: Do not enable ARAT feature on AMD processors below family 0x12\n\nCommit b87cf80af3ba4b4c008b4face3c68d604e1715c6 added support for\nARAT (Always Running APIC timer) on AMD processors that are not\naffected by erratum 400. This erratum is present on certain processor\nfamilies and prevents APIC timer from waking up the CPU when it\nis in a deep C state, including C1E state.\n\nDetermining whether a processor is affected by this erratum may\nhave some corner cases and handling these cases is somewhat\ncomplicated. In the interest of simplicity we won\u0027t claim ARAT\nsupport on processor families below 0x12 and will go back to\nbroadcasting timer when going idle.\n\nSigned-off-by: Boris Ostrovsky \u003costr@amd64.org\u003e\nLink: http://lkml.kernel.org/r/1306423192-19774-1-git-send-email-ostr@amd64.org\nTested-by: Boris Petkov \u003cborislav.petkov@amd.com\u003e\nCc: Hans Rosenfeld \u003cHans.Rosenfeld@amd.com\u003e\nCc: Andreas Herrmann \u003cAndreas.Herrmann3@amd.com\u003e\nCc: Chuck Ebbert \u003ccebbert@redhat.com\u003e\nCc: stable@kernel.org # 32.x, 38.x, 39.x\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "de66ee979d0ea45171cc2501750e9f9f22f5a690", "tree": "5ab1a5c6b596b9b786902fb380274e1e1f4ceb13", "parents": [ "916f676f8dc016103f983c7ec54c18ecdbb6e349", "4db70f73e56961b9bcdfd0c36c62847a18b7dbb5" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 26 13:51:31 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 26 13:51:35 2011 +0200" }, "message": "Merge branch \u0027linus\u0027 into x86/urgent\n\nMerge reason: we want to queue up a dependent patch.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "916f676f8dc016103f983c7ec54c18ecdbb6e349", "tree": "e7ad675e225c0314191d4fe3e4dc23920bfcad5f", "parents": [ "8b27f2ff7a24f0735c96055e676872f05398d99b" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 25 09:53:13 2011 -0400" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Wed May 25 17:03:53 2011 -0700" }, "message": "x86, efi: Retain boot service code until after switching to virtual mode\n\nUEFI stands for \"Unified Extensible Firmware Interface\", where \"Firmware\"\nis an ancient African word meaning \"Why do something right when you can\ndo it so wrong that children will weep and brave adults will cower before\nyou\", and \"UEI\" is Celtic for \"We missed DOS so we burned it into your\nROMs\". The UEFI specification provides for runtime services (ie, another\nway for the operating system to be forced to depend on the firmware) and\nwe rely on these for certain trivial tasks such as setting up the\nbootloader. But some hardware fails to work if we attempt to use these\nruntime services from physical mode, and so we have to switch into virtual\nmode. So far so dreadful.\n\nThe specification makes it clear that the operating system is free to do\nwhatever it wants with boot services code after ExitBootServices() has been\ncalled. SetVirtualAddressMap() can\u0027t be called until ExitBootServices() has\nbeen. So, obviously, a whole bunch of EFI implementations call into boot\nservices code when we do that. Since we\u0027ve been charmingly naive and\ntrusted that the specification may be somehow relevant to the real world,\nwe\u0027ve already stuffed a picture of a penguin or something in that address\nspace. And just to make things more entertaining, we\u0027ve also marked it\nnon-executable.\n\nThis patch allocates the boot services regions during EFI init and makes\nsure that they\u0027re executable. Then, after SetVirtualAddressMap(), it\ndiscards them and everyone lives happily ever after. Except for the ones\nwho have to work on EFI, who live sad lives haunted by the knowledge that\nsomeone\u0027s eventually going to write yet another firmware specification.\n\n[ hpa: adding this to urgent with a stable tag since it fixes currently-broken\n hardware. However, I do not know what the dependencies are and so I do\n not know which -stable versions this may be a candidate for. ]\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nLink: http://lkml.kernel.org/r/1306331593-28715-1-git-send-email-mjg@redhat.com\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: \u003cstable@kernel.org\u003e\n" }, { "commit": "0d098a7d1e39553e8a3f638b923551edec4868a7", "tree": "15f4b9ab0338a23b8a005d00e6c2bb3e05ffbe19", "parents": [ "f29c50419c8d1998edd759f1990c4243a248f469" ], "author": { "name": "Rakib Mullick", "email": "rakib.mullick@gmail.com", "time": "Thu May 12 23:33:40 2011 +0600" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Wed May 25 19:56:26 2011 -0400" }, "message": "x86/ftrace: Fix compiler warning in ftrace.c\n\n Due to commit dc326fca2b64 (x86, cpu: Clean up and unify the NOP selection infrastructure), we get the following warning:\n\narch/x86/kernel/ftrace.c: In function ‘ftrace_make_nop’:\narch/x86/kernel/ftrace.c:308:6: warning: assignment discards qualifiers from pointer target type\narch/x86/kernel/ftrace.c: In function ‘ftrace_make_call’:\narch/x86/kernel/ftrace.c:318:6: warning: assignment discards qualifiers from pointer target type\n\nftrace_nop_replace() now returns const unsigned char *, so change its associated function/variable to its compatible type to keep compiler clam.\n\nSigned-off-by: Rakib Mullick \u003crakib.mullick@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1305221620.7986.4.camel@localhost.localdomain\n\n[ updated for change of const void *src in probe_kernel_write() ]\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "8b27f2ff7a24f0735c96055e676872f05398d99b", "tree": "0625fa8ee1323e78cdde3588d04b62a2fce2107c", "parents": [ "af6a25f0e1ec0265c267e6ee4513925eaba6d0ed" ], "author": { "name": "Nikhil P Rao", "email": "nikhil.rao@intel.com", "time": "Wed May 25 10:18:41 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed May 25 23:01:08 2011 +0200" }, "message": "x86: Remove unnecessary check in detect_ht()\n\nThis patch removes a check that causes incorrect scheduler\ndomain setup (SMP instead of SMT) and bootlog warning messages\nwhen cpuid extensions for topology enumeration are not supported\nand the number of processors reported to the OS is smaller than\nsmp_num_siblings.\n\nAcked-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: Nikhil P Rao \u003cnikhil.rao@intel.com\u003e\nLink: http://lkml.kernel.org/r/1306343921.19325.1.camel@fedora13\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "162a7e7500f9664636e649ba59defe541b7c2c60", "tree": "f44d4e480975d7f2c4bd4fd8625dbdb81eb04ade", "parents": [ "95dde501907b06e7203c74f8435acfdab9eb2659" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Tue May 24 17:13:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:48 2011 -0700" }, "message": "printk: allocate kernel log buffer earlier\n\nOn larger systems, because of the numerous ACPI, Bootmem and EFI messages,\nthe static log buffer overflows before the larger one specified by the\nlog_buf_len param is allocated. Minimize the overflow by allocating the\nnew log buffer as soon as possible.\n\nOn kernels without memblock, a later call to setup_log_buf from\nkernel/init.c is the fallback.\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: fix CONFIG_PRINTK\u003dn build]\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nCc: Yinghai Lu \u003cyhlu.kernel@gmail.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de03c72cfce5b263a674d04348b58475ec50163c", "tree": "e2b035234440bcd1aa88078c3f9c8457d461ef9c", "parents": [ "692e0b35427a088bf75d9363788c61c7edbe93a5" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue May 24 17:12:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:21 2011 -0700" }, "message": "mm: convert mm-\u003ecpu_vm_cpumask into cpumask_var_t\n\ncpumask_t is very big struct and cpu_vm_mask is placed wrong position.\nIt might lead to reduce cache hit ratio.\n\nThis patch has two change.\n1) Move the place of cpumask into last of mm_struct. Because usually cpumask\n is accessed only front bits when the system has cpu-hotplug capability\n2) Convert cpu_vm_mask into cpumask_var_t. It may help to reduce memory\n footprint if cpumask_size() will use nr_cpumask_bits properly in future.\n\nIn addition, this patch change the name of cpu_vm_mask with cpu_vm_mask_var.\nIt may help to detect out of tree cpu_vm_mask users.\n\nThis patch has no functional change.\n\n[akpm@linux-foundation.org: build fix]\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2a919596c16b4333af851ff473ebf96e289ab90c", "tree": "c42043cf772205fe4dfb0ea8d208886ea055a013", "parents": [ "7ccafc5f75c87853f3c49845d5a884f2376e03ce" ], "author": { "name": "Jack Steiner", "email": "steiner@sgi.com", "time": "Wed May 11 12:50:28 2011 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed May 25 14:20:13 2011 +0200" }, "message": "x86, UV: Add support for SGI UV2 hub chip\n\nThis patch adds support for a new version of the SGI UV hub\nchip. The hub chip is the node controller that connects multiple\nblades into a larger coherent SSI.\n\nFor the most part, UV2 is compatible with UV1. The majority of\nthe changes are in the addresses of MMRs and in a few cases, the\ncontents of MMRs. These changes are the result in changes in the\nsystem topology such as node configuration, processor types,\nmaximum nodes, physical address sizes, etc.\n\nSigned-off-by: Jack Steiner \u003csteiner@sgi.com\u003e\nLink: http://lkml.kernel.org/r/20110511175028.GA18006@sgi.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f", "tree": "799e309a7db032cb7abe9f0fa910c2989c3fdab5", "parents": [ "4d429480352c63db2228489f0db9fd381cdc3c9c", "6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:53:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:53:42 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-2.6.40\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: Unify input section names\n percpu: Avoid extra NOP in percpu_cmpxchg16b_double\n percpu: Cast away printk format warning\n percpu: Always align percpu output section to PAGE_SIZE\n\nFix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun\n" }, { "commit": "2f344d2e51888785be551a756d8a8aa58269aaa8", "tree": "e594aed350730f13874967b2765d21a7f515ea18", "parents": [ "1b4ac2a935aaf194241a2f4165d6407ba9650e1a" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Tue May 24 10:45:31 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 24 20:32:41 2011 +0200" }, "message": "x86, ioapic: Restore ioapic entries during resume properly\n\nIn mask/restore_ioapic_entries() we should be restoring ioapic\nentries when ioapics[apic].saved_registers is not NULL.\n\nFix the typo and address the resume hang regression reported by\nLinus.\n\nThis was not found sooner because the systems where these\nchanges were tested on kept the IO-APIC entries intact over\nresume.\n\nReported-and-tested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1306259131.7171.7.camel@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c4dbe54ed7296ac3249c415d512dd6d649f66f4b", "tree": "7dcbce1bceccb31963869b347afbb86dfd11e709", "parents": [ "d762f4383100c2a87b1a3f2d678cd3b5425655b4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue May 24 14:08:08 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 24 15:22:17 2011 +0200" }, "message": "seqlock: Get rid of SEQLOCK_UNLOCKED\n\nAll static seqlock should be initialized with the lockdep friendly\n__SEQLOCK_UNLOCKED() macro.\n\nRemove legacy SEQLOCK_UNLOCKED() macro.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nLink: http://lkml.kernel.org/r/%3C1306238888.3026.31.camel%40edumazet-laptop%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "44259b1abfaa8bb819d25d41d71e8e33e25dd36a", "tree": "6255324c0bf2fef17ec3f7d92cdc88d9bbed44a3", "parents": [ "0f51f2852ccf0fe38a02d340d0ba625e8e32a863" ], "author": { "name": "Andy Lutomirski", "email": "luto@MIT.EDU", "time": "Mon May 23 09:31:28 2011 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 24 14:51:29 2011 +0200" }, "message": "x86-64: Move vread_tsc into a new file with sensible options\n\nvread_tsc is short and hot, and it\u0027s userspace code so the usual\nreasons to enable -pg and turn off sibling calls don\u0027t apply.\n\n(OK, turning off sibling calls has no effect. But it might\nsomeday...)\n\nAs an added benefit, tsc.c is profilable now.\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nLink: http://lkml.kernel.org/r/%3C99c6d7f5efa3ccb65b4ac6eb443e1ab7bad47d7b.1306156808.git.luto%40mit.edu%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "3729db5ca2b2000c660e5a5d0eb68b1053212cab", "tree": "a8b038145eadd067f92798adb4292532eccedfba", "parents": [ "057e6a8c660e95c3f4e7162e00e2fee1fc90c50d" ], "author": { "name": "Andy Lutomirski", "email": "luto@MIT.EDU", "time": "Mon May 23 09:31:26 2011 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 24 14:51:28 2011 +0200" }, "message": "x86-64: Don\u0027t generate cmov in vread_tsc\n\nvread_tsc checks whether rdtsc returns something less than\ncycle_last, which is an extremely predictable branch. GCC likes\nto generate a cmov anyway, which is several cycles slower than\na predicted branch. This saves a couple of nanoseconds.\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nLink: http://lkml.kernel.org/r/%3C561280649519de41352fcb620684dfb22bad6bac.1306156808.git.luto%40mit.edu%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "057e6a8c660e95c3f4e7162e00e2fee1fc90c50d", "tree": "5c0a81327964affd44137754b64fbaf93ceba6fa", "parents": [ "8c49d9a74bac5ea3f18480307057241b808fcc0c" ], "author": { "name": "Andy Lutomirski", "email": "luto@MIT.EDU", "time": "Mon May 23 09:31:25 2011 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 24 14:51:28 2011 +0200" }, "message": "x86-64: Remove unnecessary barrier in vread_tsc\n\nRDTSC is completely unordered on modern Intel and AMD CPUs. The\nIntel manual says that lfence;rdtsc causes all previous instructions\nto complete before the tsc is read, and the AMD manual says to use\nmfence;rdtsc to do the same thing.\n\nFrom a decent amount of testing [1] this is enough to make rdtsc\nbe ordered with respect to subsequent loads across a wide variety\nof CPUs.\n\nOn Sandy Bridge (i7-2600), this improves a loop of\nclock_gettime(CLOCK_MONOTONIC) by more than 5 ns/iter.\n\n[1] https://lkml.org/lkml/2011/4/18/350\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nLink: http://lkml.kernel.org/r/%3C1c158b9d74338aa5361f96dd473d0e6a58235302.1306156808.git.luto%40mit.edu%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "8c49d9a74bac5ea3f18480307057241b808fcc0c", "tree": "a9d2d8160ca37e9292e605cf3cdd85b29646c4b7", "parents": [ "d762f4383100c2a87b1a3f2d678cd3b5425655b4" ], "author": { "name": "Andy Lutomirski", "email": "luto@MIT.EDU", "time": "Mon May 23 09:31:24 2011 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 24 14:51:28 2011 +0200" }, "message": "x86-64: Clean up vdso/kernel shared variables\n\nVariables that are shared between the vdso and the kernel are\ncurrently a bit of a mess. They are each defined with their own\nmagic, they are accessed differently in the kernel, the vsyscall page,\nand the vdso, and one of them (vsyscall_clock) doesn\u0027t even really\nexist.\n\nThis changes them all to use a common mechanism. All of them are\ndelcared in vvar.h with a fixed address (validated by the linker\nscript). In the kernel (as before), they look like ordinary\nread-write variables. In the vsyscall page and the vdso, they are\naccessed through a new macro VVAR, which gives read-only access.\n\nThe vdso is now loaded verbatim into memory without any fixups. As a\nside bonus, access from the vdso is faster because a level of\nindirection is removed.\n\nWhile we\u0027re at it, pack jiffies and vgetcpu_mode into the same\ncacheline.\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nLink: http://lkml.kernel.org/r/%3C7357882fbb51fa30491636a7b6528747301b7ee9.1306156808.git.luto%40mit.edu%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "1b4ac2a935aaf194241a2f4165d6407ba9650e1a", "tree": "f92e0154dda7640657b9cf65986ea305fa99ca0f", "parents": [ "3a3679078aed2c451ebc32836bbd3b8219a65e01" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Tue May 24 00:18:05 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 24 14:33:35 2011 +0200" }, "message": "x86: Get rid of asmregparm\n\nAs UML does no longer need asmregparm we can remove it.\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nCc: namhyung@gmail.com\nCc: davem@davemloft.net\nCc: fweisbec@gmail.com\nCc: dhowells@redhat.com\nLink: http://lkml.kernel.org/r/%3C1306189085-29896-1-git-send-email-richard%40nod.at%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0", "tree": "c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9", "parents": [ "0415b00d175e0d8945e6785aad21b5f157976ce0", "6ea0c34dac89611126455537552cffe6c7e832ad" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue May 24 09:59:36 2011 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue May 24 09:59:36 2011 +0200" }, "message": "Merge branch \u0027fixes-2.6.39\u0027 into for-2.6.40\n" }, { "commit": "5e152b4c9e0fce6149c74406346a7ae7e7a17727", "tree": "12503a50142797c1babfd87099c193b3e4d54f93", "parents": [ "a77febbef105554c5a37241cf903f48ab7bc03c7", "9251bac97d47fdaea406ea0595c2d0aa50022f12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)\n PCI: Don\u0027t use dmi_name_in_vendors in quirk\n PCI: remove unused AER functions\n PCI/sysfs: move bus cpuaffinity to class dev_attrs\n PCI: add rescan to /sys/.../pci_bus/.../\n PCI: update bridge resources to get more big ranges when allocating space (again)\n KVM: Use pci_store/load_saved_state() around VM device usage\n PCI: Add interfaces to store and load the device saved state\n PCI: Track the size of each saved capability data area\n PCI/e1000e: Add and use pci_disable_link_state_locked()\n x86/PCI: derive pcibios_last_bus from ACPI MCFG\n PCI: add latency tolerance reporting enable/disable support\n PCI: add OBFF enable/disable support\n PCI: add ID-based ordering enable/disable support\n PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.\n PCI: Set PCIE maxpayload for card during hotplug insertion\n PCI/ACPI: Report _OSC control mask returned on failure to get control\n x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs\n PCI: handle positive error codes\n PCI: check pci_vpd_pci22_wait() return\n PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio\n ...\n\nFix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be4461\nmoved the intel SMBUS ID definitons to the i2c-i801.c driver.\n" }, { "commit": "ea2b50ef4c9e030749ae473e95258f477c3a68ca", "tree": "a8dcfd287a6fd2c497eaf2bbf3a83f6ae80dfebe", "parents": [ "15a3d11b0f2ebdfb3591e411e268aa81998d4723", "b18bf0948e1037e7ed33378c80f1ecb8c77c30e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:54:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:54:15 2011 -0700" }, "message": "Merge branch \u0027x86-apic-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-apic-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, apic: Include module.h header in apic_flat_64.c\n x86, apic: Make apic drivers static\n x86, apic: Clean up bigsmp apic selection code\n x86, apic: Use .apicdrivers section for the apic drivers list\n x86, apic: Introduce .apicdrivers section to find the list of apic drivers\n x86, x2apic: Move the common bits to x2apic.h\n x86, x2apic: Minimize IPI register writes using cluster groups\n x86, x2apic: Track the x2apic cluster sibling map\n x86, x2apic: Remove duplicate code for IPI mask routines\n x86, apic: Use probe routines to simplify apic selection\n x86, ioapic: Consolidate mp_ioapic_routing[] into \u0027struct ioapic\u0027\n x86, ioapic: Consolidate gsi routing info into \u0027struct ioapic\u0027\n x86, ioapic: Consolidate mp_ioapics[] into \u0027struct ioapic\u0027\n x86, ioapic: Consolidate ioapic_saved_data[] into \u0027struct ioapic\u0027\n x86, ioapic: Add struct ioapic\n x86, ioapic: Remove duplicate code for saving/restoring RTEs\n x86, ioapic: Use ioapic_saved_data while enabling intr-remapping\n x86, ioapic: Allocate ioapic_saved_data early\n x86, ioapic: Fix potential resume deadlock\n" }, { "commit": "b18bf0948e1037e7ed33378c80f1ecb8c77c30e9", "tree": "c1147d6f39ef0efdc102021ef10434584bf5be84", "parents": [ "1a8880a14270814dae0d226a2ad065d30587e60a" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon May 23 10:43:00 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 23 21:27:35 2011 +0200" }, "message": "x86, apic: Include module.h header in apic_flat_64.c\n\napic_flat_64.c needs to include module.h because it uses\nEXPORT_SYMBOL_GPL().\n\nThis fixes these warnings on some !SMP randconfigs:\n\n arch/x86/kernel/apic/apic_flat_64.c:31: warning: data definition has no type or storage class\n arch/x86/kernel/apic/apic_flat_64.c:31: warning: type defaults to \u0027int\u0027 in declaration of \u0027EXPORT_SYMBOL_GPL\u0027\n arch/x86/kernel/apic/apic_flat_64.c:31: warning: parameter names (without types) in function declaration\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nLink: http://lkml.kernel.org/r/20110523104300.dd532a99.randy.dunlap@oracle.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "19504828b4bee5e471bcd35e214bc6fd0d380692", "tree": "30d4ffb6783daf9fadd47548c035646d3f0f073e", "parents": [ "57d19e80f459dd845fb3cfeba8e6df8471bac142", "3cb6d1540880e767d911b79eb49578de2190f428" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:25:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:25:52 2011 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf tools: Fix sample size bit operations\n perf tools: Fix ommitted mmap data update on remap\n watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh\n watchdog: Disable watchdog when thresh is zero\n watchdog: Only disable/enable watchdog if neccessary\n watchdog: Fix rounding bug in get_sample_period()\n perf tools: Propagate event parse error handling\n perf tools: Robustify dynamic sample content fetch\n perf tools: Pre-check sample size before parsing\n perf tools: Move evlist sample helpers to evlist area\n perf tools: Remove junk code in mmap size handling\n perf tools: Check we are able to read the event size on mmap\n" }, { "commit": "d7ef64a9f9987b29e3d911369a9d40122d5be2dd", "tree": "c674cbed424876b95ddb23ec99344574be0dab39", "parents": [ "ff2a9941ca27ab18169d17b3803aca68b154951c", "6ec5ff4bc3a90b7716eadc4c8a686e904131f03a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 08:51:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 08:51:55 2011 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Eliminate various \u0027set but not used\u0027 warnings\n x86, SMEP: Fix section mismatch warnings\n x86, amd: Use _safe() msr access for GartTlbWlk disable code\n" }, { "commit": "4eec42f392043063d0f019640b4ccc2a45570002", "tree": "32db1c354f9c12d1275093efed8101a2bd5db232", "parents": [ "586692a5a5fc5740c8a46abc0f2365495c2d7c5f" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Sun May 22 22:10:23 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 23 11:58:59 2011 +0200" }, "message": "watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh\n\nBefore the conversion of the NMI watchdog to perf event, the\nwatchdog timeout was 5 seconds. Now it is 60 seconds. For my\nparticular application, netbooks, 5 seconds was a better\ntimeout. With a short timeout, we catch faults earlier and are\nable to send back a panic. With a 60 second timeout, the user is\nunlikely to wait and will instead hit the power button, causing\nus to lose the panic info.\n\nThis change configures the NMI period to watchdog_thresh and\nsets the softlockup_thresh to watchdog_thresh * 2. In addition,\nwatchdog_thresh was reduced to 10 seconds as suggested by Ingo\nMolnar.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nCc: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Don Zickus \u003cdzickus@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1306127423-3347-4-git-send-email-msb@chromium.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nLKML-Reference: \u003c20110517071642.GF22305@elte.hu\u003e\n" }, { "commit": "82da65dab5f438ac7df28eeb43e2f5b742aa00ef", "tree": "0b2a579d9385c516f6fbb3e2689f6611c9228aa7", "parents": [ "a1e4891fd48d298870b704c6eb48cba0da5ed6b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:37:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:44:13 2011 -0700" }, "message": "x86: setup_smep needs to be __cpuinit\n\nThe setup_smep function gets calle at resume time too, and is thus not a\npure __init function. When marked as __init, it gets thrown out after\nthe kernel has initialized, and when the kernel is suspended and\nresumed, the code will no longer be around, and we\u0027ll get a nice \"kernel\ntried to execute NX-protected page\" oops because the page is no longer\nmarked executable.\n\nReported-and-tested-by: Parag Warudkar \u003cparag.lkml@gmail.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@linux.intel.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a8880a14270814dae0d226a2ad065d30587e60a", "tree": "db42759ef2828202fd6933541d937885c2b6169e", "parents": [ "69c252ffce77f4e38347d536ee4eab4aa162dc67" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Fri May 20 17:51:20 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 22 11:48:04 2011 +0200" }, "message": "x86, apic: Make apic drivers static\n\nApic probe now looks at the apic drivers listed in the\n.apicdrivers section. Remove apic_probe[] and make each apic\ndriver static.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nTested-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: steiner@sgi.com\nCc: gorcunov@openvz.org\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110521005526.341718626@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "69c252ffce77f4e38347d536ee4eab4aa162dc67", "tree": "070307e0c400d5e4d98f07a8199cc5b62b42b4ce", "parents": [ "8b37e88061e229e78959fe3257649fd5ce05f8af" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Fri May 20 17:51:19 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 22 11:48:03 2011 +0200" }, "message": "x86, apic: Clean up bigsmp apic selection code\n\nMake generic_bigsmp_probe() return struct apic *. This will\navoid exporting apic_bigsmp, which will be consistent with\nothers.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nTested-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: steiner@sgi.com\nCc: gorcunov@openvz.org\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110521005526.252703851@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8b37e88061e229e78959fe3257649fd5ce05f8af", "tree": "4c58ea023a554c1bec8be80f7fd4045a4747a09f", "parents": [ "107e0e0cd85beeee05af7ea374fda14d037ee500" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Fri May 20 17:51:18 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 22 11:48:03 2011 +0200" }, "message": "x86, apic: Use .apicdrivers section for the apic drivers list\n\nThis will eliminate the need for apic_probe[], as the probing\nnow will happen based on the apic drivers order in the\n.apcidrivers section.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nTested-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: steiner@sgi.com\nCc: gorcunov@openvz.org\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110521005526.164277071@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "107e0e0cd85beeee05af7ea374fda14d037ee500", "tree": "bf39fe1f0e8cfc4ab0f8510859882537f96afcb7", "parents": [ "79deb8e511bd6fc8e40add4da75b19df085d9453" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Fri May 20 17:51:17 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 22 11:48:03 2011 +0200" }, "message": "x86, apic: Introduce .apicdrivers section to find the list of apic drivers\n\nThis will pave the way for each apic driver to be self-contained\nand eliminate the need for apic_probe[].\n\nOrder in which apic drivers are listed in the .apicdrivers\nsection is important, as this determines the apic probe order.\nAnd this is enforced by the ordering of apic driver files in the\nMakefile and the macros apic_driver()/apic_drivers().\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nTested-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: steiner@sgi.com\nCc: gorcunov@openvz.org\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110521005526.068775085@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6ec5ff4bc3a90b7716eadc4c8a686e904131f03a", "tree": "3646a4ce8405c8a8d50689ac5a5752becb052928", "parents": [ "1d487624fcc17a40aa67acaa9e8f3815fb7cd0f0" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri May 20 16:13:00 2011 -0300" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat May 21 19:10:33 2011 +0200" }, "message": "x86: Eliminate various \u0027set but not used\u0027 warnings\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nCc: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e (supporter:AMD IOMMU (AMD-VI))\nCc: iommu@lists.linux-foundation.org (open list:AMD IOMMU (AMD-VI))\nLink: http://lkml.kernel.org/r/1305918786-7239-3-git-send-email-padovan@profusion.mobi\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1d487624fcc17a40aa67acaa9e8f3815fb7cd0f0", "tree": "47a17a8174249b075080a043c4ab7f9963d08e1e", "parents": [ "d47cc0db8fd6011de2248df505fc34990b7451bf" ], "author": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Fri May 20 15:33:17 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat May 21 12:46:24 2011 +0200" }, "message": "x86, SMEP: Fix section mismatch warnings\n\nFix these kernel compilation warnings:\n\n WARNING: arch/x86/built-in.o(.cpuinit.text+0x1e07): Section mismatch ...\n WARNING: arch/x86/built-in.o(.cpuinit.text+0x1b10): Section mismatch ...\n\nintroduced by:\n\n de5397ad5b9a: x86, cpu: Enable/disable Supervisor Mode Execution Protection\n\nChange disable_smep from __initdata to __cpuinitdata.\nChange setup_smep() from __init to __cpuinit.\n\nReported-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Asit K Mallick \u003casit.k.mallick@intel.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/1305930797-11409-1-git-send-email-fenghua.yu@intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "06f4e926d256d902dd9a53dcb400fd74974ce087", "tree": "0b438b67f5f0eff6fd617bc497a9dace6164a488", "parents": [ "8e7bfcbab3825d1b404d615cb1b54f44ff81f981", "d93515611bbc70c2fe4db232e5feb448ed8e4cc9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)\n macvlan: fix panic if lowerdev in a bond\n tg3: Add braces around 5906 workaround.\n tg3: Fix NETIF_F_LOOPBACK error\n macvlan: remove one synchronize_rcu() call\n networking: NET_CLS_ROUTE4 depends on INET\n irda: Fix error propagation in ircomm_lmp_connect_response()\n irda: Kill set but unused variable \u0027bytes\u0027 in irlan_check_command_param()\n irda: Kill set but unused variable \u0027clen\u0027 in ircomm_connect_indication()\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_transport()\n be2net: Kill set but unused variable \u0027req\u0027 in lancer_fw_download()\n irda: Kill set but unused vars \u0027saddr\u0027 and \u0027daddr\u0027 in irlan_provider_connect_indication()\n atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_peer().\n rxrpc: Kill set but unused variable \u0027local\u0027 in rxrpc_UDP_error_handler()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_process_connection()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_rotate_tx_window()\n pkt_sched: Kill set but unused variable \u0027protocol\u0027 in tc_classify()\n isdn: capi: Use pr_debug() instead of ifdefs.\n tg3: Update version to 3.119\n tg3: Apply rx_discards fix to 5719/5720\n ...\n\nFix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c\nas per Davem.\n" }, { "commit": "3ed4c0583daa34dedb568b26ff99e5a7b58db612", "tree": "a531d4cc94acaa58fe0600cf83da9fb8b77f6e50", "parents": [ "ad9471752ebae25daa133b4e5d9299809c35e155", "bd715d9a4f13f87bad5526c2cd41370949473b16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:33:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:33:21 2011 -0700" }, "message": "Merge branch \u0027ptrace\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc\n\n* \u0027ptrace\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (41 commits)\n signal: trivial, fix the \"timespec declared inside parameter list\" warning\n job control: reorganize wait_task_stopped()\n ptrace: fix signal-\u003ewait_chldexit usage in task_clear_group_stop_trapping()\n signal: sys_sigprocmask() needs retarget_shared_pending()\n signal: cleanup sys_sigprocmask()\n signal: rename signandsets() to sigandnsets()\n signal: do_sigtimedwait() needs retarget_shared_pending()\n signal: introduce do_sigtimedwait() to factor out compat/native code\n signal: sys_rt_sigtimedwait: simplify the timeout logic\n signal: cleanup sys_rt_sigprocmask()\n x86: signal: sys_rt_sigreturn() should use set_current_blocked()\n x86: signal: handle_signal() should use set_current_blocked()\n signal: sigprocmask() should do retarget_shared_pending()\n signal: sigprocmask: narrow the scope of -\u003esiglock\n signal: retarget_shared_pending: optimize while_each_thread() loop\n signal: retarget_shared_pending: consider shared/unblocked signals only\n signal: introduce retarget_shared_pending()\n ptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/\n signal: Turn SIGNAL_STOP_DEQUEUED into GROUP_STOP_DEQUEUED\n signal: do_signal_stop: Remove the unneeded task_clear_group_stop_pending()\n ...\n" }, { "commit": "79deb8e511bd6fc8e40add4da75b19df085d9453", "tree": "6deaa403173d0501ee497237bea2e6e3f6e7cfe5", "parents": [ "9d0fa6c5f43f2d9c6966dcab7af96a717682fdec" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu May 19 16:45:50 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:41:11 2011 +0200" }, "message": "x86, x2apic: Move the common bits to x2apic.h\n\nTo eliminate code duplication.\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: steiner@sgi.com\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110519234637.591426753@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9d0fa6c5f43f2d9c6966dcab7af96a717682fdec", "tree": "e3fdd94ba55748fbfc41ad5e38c32169638f2091", "parents": [ "a39d1f3f67f6a3d72b24f0d8bf9a295a27ea448e" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu May 19 16:45:49 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:41:09 2011 +0200" }, "message": "x86, x2apic: Minimize IPI register writes using cluster groups\n\nIn the case of x2apic cluster mode we can group IPI register\nwrites based on the cluster group instead of individual per-cpu\ndestination messages.\n\nThis reduces the apic register writes and reduces the amount of\nIPI messages (in the best case we can reduce it by a factor of\n16).\n\nWith this change, the cost of flush_tlb_others(), with the flush\ntlb IPI being sent from a cpu in the socket-1 to all the logical\ncpus in socket-2 (on a Westmere-EX system that has 20 logical\ncpus in a socket) is 3x times better now (compared to the former\n\u0027send one-by-one\u0027 algorithm).\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: steiner@sgi.com\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110519234637.512271057@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a39d1f3f67f6a3d72b24f0d8bf9a295a27ea448e", "tree": "aa58b457692aae263f6ae701480f4ea094c6df82", "parents": [ "a27d0b5e7d913b38880678ac05690f1dc737c4fd" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu May 19 16:45:48 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:41:08 2011 +0200" }, "message": "x86, x2apic: Track the x2apic cluster sibling map\n\nIn the case of x2apic cluster mode, we can group IPI register\nwrites based on the cluster group instead of individual per-cpu\ndestination messages.\n\nFor this purpose, track the cpu\u0027s that belong to the same x2apic\ncluster.\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: steiner@sgi.com\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110519234637.421800999@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a27d0b5e7d913b38880678ac05690f1dc737c4fd", "tree": "56957d475688c61171b505200b3144c213b77c6e", "parents": [ "9ebd680bd029a9fc47399ca61c950f8b6730ac40" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Thu May 19 16:45:47 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:41:06 2011 +0200" }, "message": "x86, x2apic: Remove duplicate code for IPI mask routines\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nAcked-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: steiner@sgi.com\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110519234637.337024125@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9ebd680bd029a9fc47399ca61c950f8b6730ac40", "tree": "41b5c8ae4a13b51536ead20f6e4b4b380748072a", "parents": [ "8f18c9711ed31c257d4f00a094b2fdbe72a741da" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Thu May 19 16:45:46 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:41:04 2011 +0200" }, "message": "x86, apic: Use probe routines to simplify apic selection\n\nUse the unused probe routine in the apic driver to finalize the\napic model selection. This cleans up the\ndefault_setup_apic_routing() and this probe routine in future\ncan also be used for doing any apic model specific\ninitialisation.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nAcked-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: steiner@sgi.com\nCc: yinghai@kernel.org\nLink: http://lkml.kernel.org/r/20110519234637.247458931@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8f18c9711ed31c257d4f00a094b2fdbe72a741da", "tree": "d6a68835e26df4f4eb802e36b54fa719cadd075e", "parents": [ "c040aaeb86f66e956e147ce5f238d28308e06109" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:39 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:41:02 2011 +0200" }, "message": "x86, ioapic: Consolidate mp_ioapic_routing[] into \u0027struct ioapic\u0027\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: daniel.blueman@gmail.com\nLink: http://lkml.kernel.org/r/20110518233158.089978277@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c040aaeb86f66e956e147ce5f238d28308e06109", "tree": "18da3f866f94ef23f6216c100b12980c46bf4a0d", "parents": [ "d5371430840f3e8d3b8bdbc9c02867808f299449" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:38 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:41:01 2011 +0200" }, "message": "x86, ioapic: Consolidate gsi routing info into \u0027struct ioapic\u0027\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: daniel.blueman@gmail.com\nLink: http://lkml.kernel.org/r/20110518233157.994002011@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d5371430840f3e8d3b8bdbc9c02867808f299449", "tree": "49d9fafac8fa03714920aa242b766ed8c7895ea9", "parents": [ "57a6f74023c7fd943160d7635bbc8d9f66e2ab54" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:37 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:40:59 2011 +0200" }, "message": "x86, ioapic: Consolidate mp_ioapics[] into \u0027struct ioapic\u0027\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: daniel.blueman@gmail.com\nLink: http://lkml.kernel.org/r/20110518233157.909013179@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "57a6f74023c7fd943160d7635bbc8d9f66e2ab54", "tree": "36d084d8a479dbebfb4e2466161686bc08a638f1", "parents": [ "b69c6c3becc102f3eebc4ebba582abfe76be3f45" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:36 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:40:57 2011 +0200" }, "message": "x86, ioapic: Consolidate ioapic_saved_data[] into \u0027struct ioapic\u0027\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: daniel.blueman@gmail.com\nLink: http://lkml.kernel.org/r/20110518233157.830697056@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b69c6c3becc102f3eebc4ebba582abfe76be3f45", "tree": "3c31978e0dcdbe372208d6eaed691ab171f0ede3", "parents": [ "15bac20bd8a039e9acb274785be82772e1237eed" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:35 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:40:56 2011 +0200" }, "message": "x86, ioapic: Add struct ioapic\n\nIntroduce struct ioapic with nr_registers field.\n\nThis will pave way for consolidating different MAX_IO_APICS\narrays into it.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: daniel.blueman@gmail.com\nLink: http://lkml.kernel.org/r/20110518233157.744315519@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "15bac20bd8a039e9acb274785be82772e1237eed", "tree": "81ff9581d36a2fa078f2273c1f1dc67931995b4c", "parents": [ "31dce14a3269843f98ce1bc37d0c91b22f1991ee" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:34 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:40:54 2011 +0200" }, "message": "x86, ioapic: Remove duplicate code for saving/restoring RTEs\n\nCode flow for enabling interrupt-remapping has its own routines\nfor saving and restoring io-apic RTE\u0027s. ioapic suspend/resume\ncode flow also has similar routines. Remove the duplicate code.\n\nTested-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/20110518233157.673130611@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "31dce14a3269843f98ce1bc37d0c91b22f1991ee", "tree": "66a02547580d22cc31648fd27169940b50c01ce4", "parents": [ "4c79185cdb1425fb74241d0be772ff1a9913091a" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:33 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:40:52 2011 +0200" }, "message": "x86, ioapic: Use ioapic_saved_data while enabling intr-remapping\n\nCode flow for enabling interrupt-remapping was\nallocating/freeing buffers for saving/restoring io-apic RTE\u0027s.\nioapic suspend/resume code uses boot time allocated\nioapic_saved_data that is a perfect match for reuse here.\n\nThis will remove the unnecessary allocation/free of the\ntemporary buffers during suspend/resume of interrupt-remapping\nenabled platforms aswell as paving the way for further code\nconsolidation.\n\nTested-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/20110518233157.574469296@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4c79185cdb1425fb74241d0be772ff1a9913091a", "tree": "3e1201564d344469d8f7dae05f878e349f7cbd40", "parents": [ "b64ce24daffb634b5b3133a2e411bd4de50654e8" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 18 16:31:32 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:40:50 2011 +0200" }, "message": "x86, ioapic: Allocate ioapic_saved_data early\n\nThis allows re-using this buffer for enabling\ninterrupt-remapping during boot and resume. And thus allow for\nconsolidating the code between ioapic suspend/resume and\ninterrupt-remapping.\n\nTested-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/20110518233157.481404505@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b64ce24daffb634b5b3133a2e411bd4de50654e8", "tree": "f83c6d41c8a40e3f58a76eb97a001731b9393988", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Daniel J Blueman", "email": "daniel.blueman@gmail.com", "time": "Wed May 18 16:31:31 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 13:40:41 2011 +0200" }, "message": "x86, ioapic: Fix potential resume deadlock\n\nFix a potential deadlock when resuming; here the calling\nfunction has disabled interrupts, so we cannot sleep.\n\nChange the memory allocation flag from GFP_KERNEL to GFP_ATOMIC.\n\nTODO: We can do away with this memory allocation during resume\n by reusing the ioapic suspend/resume code that uses boot time\n allocated buffers, but we want to keep this -stable patch\n simple.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: \u003cstable@kernel.org\u003e # v2.6.38/39\nLink: http://lkml.kernel.org/r/20110518233157.385970138@sbsiddha-MOBL3.sc.intel.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d47cc0db8fd6011de2248df505fc34990b7451bf", "tree": "a019570daeba6e6f9ad3410b9adf2d0c2760223b", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Roedel, Joerg", "email": "Joerg.Roedel@amd.com", "time": "Thu May 19 11:13:39 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 12:57:18 2011 +0200" }, "message": "x86, amd: Use _safe() msr access for GartTlbWlk disable code\n\nThe workaround for Bugzilla:\n\n\thttps://bugzilla.kernel.org/show_bug.cgi?id\u003d33012\n\nintroduced a read and a write to the MC4 mask msr.\n\nUnfortunatly this MSR is not emulated by the KVM hypervisor\nso that the kernel will get a #GP and crashes when applying\nthis workaround when running inside KVM.\n\nThis issue was reported as:\n\n\thttps://bugzilla.kernel.org/show_bug.cgi?id\u003d35132\n\nand is fixed with this patch. The change just let the kernel\nignore any #GP it gets while accessing this MSR by using the\n_safe msr access methods.\n\nReported-by: Török Edwin \u003cedwintorok@gmail.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Maciej Rutecki \u003cmaciej.rutecki@gmail.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: \u003cstable@kernel.org\u003e # .39.x\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "39ab05c8e0b519ff0a04a869f065746e6e8c3d95", "tree": "e73f0ba74c4ea7a80dff9b2dd9445a3a74190e28", "parents": [ "1477fcc290b3d5c2614bde98bf3b1154c538860d", "c42d2237143fcf35cff642cefe2bcf7786aae312" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:24:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:24:11 2011 -0700" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)\n debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS\u003dy warning\n sysfs: remove \"last sysfs file:\" line from the oops messages\n drivers/base/memory.c: fix warning due to \"memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\"\n memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\n SYSFS: Fix erroneous comments for sysfs_update_group().\n driver core: remove the driver-model structures from the documentation\n driver core: Add the device driver-model structures to kerneldoc\n Translated Documentation/email-clients.txt\n RAW driver: Remove call to kobject_put().\n reboot: disable usermodehelper to prevent fs access\n efivars: prevent oops on unload when efi is not enabled\n Allow setting of number of raw devices as a module parameter\n Introduce CONFIG_GOOGLE_FIRMWARE\n driver: Google Memory Console\n driver: Google EFI SMI\n x86: Better comments for get_bios_ebda()\n x86: get_bios_ebda_length()\n misc: fix ti-st build issues\n params.c: Use new strtobool function to process boolean inputs\n debugfs: move to new strtobool\n ...\n\nFix up trivial conflicts in fs/debugfs/file.c due to the same patch\nbeing applied twice, and an unrelated cleanup nearby.\n" }, { "commit": "5765040ebfc9a28d9dcfaaaaf3d25840d922de96", "tree": "6fd0c9950beb3c9730ede405269c9a47bbcbf877", "parents": [ "08839ff8276bd1ba0ce8b2d595f9fe62a5b07210", "de5397ad5b9ad22e2401c4dacdf1bb3b19c05679" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:10:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:10:17 2011 -0700" }, "message": "Merge branch \u0027x86-smep-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-smep-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, cpu: Enable/disable Supervisor Mode Execution Protection\n x86, cpu: Add SMEP CPU feature in CR4\n x86, cpufeature: Add cpufeature flag for SMEP\n" }, { "commit": "08839ff8276bd1ba0ce8b2d595f9fe62a5b07210", "tree": "468a056d2039eb368f3e73c8bfd8124c81dff8bb", "parents": [ "08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86", "660e34cebf0a11d54f2d5dd8838607452355f321", "0c61227094b3ddaca2f847ee287c4a2e3762b5a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:09:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:09:45 2011 -0700" }, "message": "Merge branches \u0027x86-reboot-for-linus\u0027 and \u0027x86-setup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-reboot-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Reorder reboot method preferences\n\n* \u0027x86-setup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, setup: Fix EDD3.0 data verification.\n" }, { "commit": "08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86", "tree": "0d087f009b80bdf54f22fdb78437af790c1afc27", "parents": [ "13588209aa90d9c8e502750fc86160314555612f", "5d94e81f69d4b1d1102d3ab557ce0a817c11fbbb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:08:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:08:06 2011 -0700" }, "message": "Merge branch \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Introduce pci_map_biosrom()\n x86, olpc: Use device tree for platform identification\n" }, { "commit": "13588209aa90d9c8e502750fc86160314555612f", "tree": "91f5514aebf7244886070a6894c8e86c2b7ff4ce", "parents": [ "ac2941f59a38eeb535e1f227a8f90d7fe6b7828b", "dc382fd5bcca7098a984705ed6ac880f539d068e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:07:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:07:31 2011 -0700" }, "message": "Merge branch \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)\n x86, mm: Allow ZONE_DMA to be configurable\n x86, NUMA: Trim numa meminfo with max_pfn in a separate loop\n x86, NUMA: Rename setup_node_bootmem() to setup_node_data()\n x86, NUMA: Enable emulation on 32bit too\n x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit too\n x86, NUMA: Rename amdtopology_64.c to amdtopology.c\n x86, NUMA: Make numa_init_array() static\n x86, NUMA: Make 32bit use common NUMA init path\n x86, NUMA: Initialize and use remap allocator from setup_node_bootmem()\n x86-32, NUMA: Add @start and @end to init_alloc_remap()\n x86, NUMA: Remove long 64bit assumption from numa.c\n x86, NUMA: Enable build of generic NUMA init code on 32bit\n x86, NUMA: Move NUMA init logic from numa_64.c to numa.c\n x86-32, NUMA: Update numaq to use new NUMA init protocol\n x86-32, NUMA: Replace srat_32.c with srat.c\n x86-32, NUMA: implement temporary NUMA init shims\n x86, NUMA: Move numa_nodes_parsed to numa.[hc]\n x86-32, NUMA: Move get_memcfg_numa() into numa_32.c\n x86, NUMA: make srat.c 32bit safe\n x86, NUMA: rename srat_64.c to srat.c\n ...\n" }, { "commit": "ac2941f59a38eeb535e1f227a8f90d7fe6b7828b", "tree": "142bda3d1794da9c45e1327c30c7e5f6c5868fac", "parents": [ "016281880439a8665ecf37514865742da58131d4", "935a638241b0658b9749edd060f972575f9d4a78", "c387aa3a1a910ce00b86f3a85082d24f144db256", "983bbf1af0664b78689612b247acb514300f62c7", "dffa4b2f62ff28c982144c7033001b1ece4d3532" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:03:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:03:56 2011 -0700" }, "message": "Merge branches \u0027x86-efi-for-linus\u0027, \u0027x86-gart-for-linus\u0027, \u0027x86-irq-for-linus\u0027 and \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-efi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, efi: Ensure that the entirity of a region is mapped\n x86, efi: Pass a minimal map to SetVirtualAddressMap()\n x86, efi: Merge contiguous memory regions of the same type and attribute\n x86, efi: Consolidate EFI nx control\n x86, efi: Remove virtual-mode SetVirtualAddressMap call\n\n* \u0027x86-gart-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, gart: Don\u0027t enforce GART aperture lower-bound by alignment\n\n* \u0027x86-irq-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Don\u0027t unmask disabled irqs when migrating them\n x86: Skip migrating IRQF_PER_CPU irqs in fixup_irqs()\n\n* \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, mce: Drop the default decoding notifier\n x86, MCE: Do not taint when handling correctable errors\n" }, { "commit": "016281880439a8665ecf37514865742da58131d4", "tree": "2f6a757a581c71cfb8cd891e0583fbffb359830b", "parents": [ "17b141803c6c6e27fbade3f97c1c9d8d66c72866", "865be7a81071a77014c83cd01536c989eed362b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:55:12 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:55:12 2011 -0700" }, "message": "Merge branch \u0027x86-cpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-cpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, cpu: Fix detection of Celeron Covington stepping A1 and B0\n Documentation, ABI: Update L3 cache index disable text\n x86, AMD, cacheinfo: Fix L3 cache index disable checks\n x86, AMD, cacheinfo: Fix fallout caused by max3 conversion\n x86, cpu: Change NOP selection for certain Intel CPUs\n x86, cpu: Clean up and unify the NOP selection infrastructure\n x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4\n x86, cpu: Move AMD Elan Kconfig under \"Processor family\"\n\nFix up trivial conflicts in alternative handling (commit dc326fca2b64\n\"x86, cpu: Clean up and unify the NOP selection infrastructure\" removed\nsome hacky 5-byte instruction stuff, while commit d430d3d7e646 \"jump\nlabel: Introduce static_branch() interface\" renamed HAVE_JUMP_LABEL to\nCONFIG_JUMP_LABEL in the code that went away)\n" }, { "commit": "17b141803c6c6e27fbade3f97c1c9d8d66c72866", "tree": "23ecc0e41e4b742883ee800a4725beff234d2eaa", "parents": [ "78c4def67e8eebe602655a3dec9aa08f0e2f7c4b", "2b398bd9f8f73be706b41adcbb240ce95793049a", "15d6aba24d88231415f4e7e091c0f1e60c3e6fd5", "8fab6af2156c0100f953fd61f4e0b2f82c9776dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:49:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:49:35 2011 -0700" }, "message": "Merge branches \u0027x86-apic-for-linus\u0027, \u0027x86-asm-for-linus\u0027 and \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-apic-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, apic: Print verbose error interrupt reason on apic\u003ddebug\n\n* \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Demacro CONFIG_PARAVIRT cpu accessors\n\n* \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Fix mrst sparse complaints\n x86: Fix spelling error in the memcpy() source code comment\n x86, mpparse: Remove unnecessary variable\n" }, { "commit": "7e6628e4bcb3b3546c625ec63ca724f28ab14f0c", "tree": "111a94cefa9d800ec5c5e59520f4b5d1880965d0", "parents": [ "0f1bdc1815c4cb29b3cd71a7091b478e426faa0b", "ab0e08f15d23628dd8d50bf6ce1a935a8840c7dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:40 2011 -0700" }, "message": "Merge branch \u0027timers-clockevents-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-clockevents-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: hpet: Cleanup the clockevents init and register code\n x86: Convert PIT to clockevents_config_and_register()\n clockevents: Provide interface to reconfigure an active clock event device\n clockevents: Provide combined configure and register function\n clockevents: Restructure clock_event_device members\n clocksource: Get rid of the hardcoded 5 seconds sleep time limit\n clocksource: Restructure clocksource struct members\n" }, { "commit": "0f1bdc1815c4cb29b3cd71a7091b478e426faa0b", "tree": "b4d70c6a305d91bf7d1c8a6bbf87508587d55633", "parents": [ "80fe02b5daf176f99d3afc8f6c9dc9dece019836", "a18f22a968de17b29f2310cdb7ba69163e65ec15" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:13 2011 -0700" }, "message": "Merge branch \u0027timers-clocksource-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-clocksource-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n clocksource: convert mips to generic i8253 clocksource\n clocksource: convert x86 to generic i8253 clocksource\n clocksource: convert footbridge to generic i8253 clocksource\n clocksource: add common i8253 PIT clocksource\n blackfin: convert to clocksource_register_hz\n mips: convert to clocksource_register_hz/khz\n sparc: convert to clocksource_register_hz/khz\n alpha: convert to clocksource_register_hz\n microblaze: convert to clocksource_register_hz/khz\n ia64: convert to clocksource_register_hz/khz\n x86: Convert remaining x86 clocksources to clocksource_register_hz/khz\n Make clocksource name const\n" }, { "commit": "80fe02b5daf176f99d3afc8f6c9dc9dece019836", "tree": "970b90d56870e1b87b4c8efff7ec31fc454445a7", "parents": [ "df48d8716eab9608fe93924e4ae06ff110e8674f", "db670dac49b5423b39b5e523d28fe32045d71b10", "ec514c487c3d4b652943da7b0afbc094eee08cfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:41:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:41:22 2011 -0700" }, "message": "Merge branches \u0027sched-core-for-linus\u0027 and \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)\n sched: Fix and optimise calculation of the weight-inverse\n sched: Avoid going ahead if -\u003ecpus_allowed is not changed\n sched, rt: Update rq clock when unthrottling of an otherwise idle CPU\n sched: Remove unused parameters from sched_fork() and wake_up_new_task()\n sched: Shorten the construction of the span cpu mask of sched domain\n sched: Wrap the \u0027cfs_rq-\u003enr_spread_over\u0027 field with CONFIG_SCHED_DEBUG\n sched: Remove unused \u0027this_best_prio arg\u0027 from balance_tasks()\n sched: Remove noop in alloc_rt_sched_group()\n sched: Get rid of lock_depth\n sched: Remove obsolete comment from scheduler_tick()\n sched: Fix sched_domain iterations vs. RCU\n sched: Next buddy hint on sleep and preempt path\n sched: Make set_*_buddy() work on non-task entities\n sched: Remove need_migrate_task()\n sched: Move the second half of ttwu() to the remote cpu\n sched: Restructure ttwu() some more\n sched: Rename ttwu_post_activation() to ttwu_do_wakeup()\n sched: Remove rq argument from ttwu_stat()\n sched: Remove rq-\u003elock from the first half of ttwu()\n sched: Drop rq-\u003elock from sched_exec()\n ...\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Fix rt_rq runtime leakage bug\n" }, { "commit": "df48d8716eab9608fe93924e4ae06ff110e8674f", "tree": "0fe10733a414b3651e1dae29518b7960a4da0aa4", "parents": [ "acd30250d7d0f495685d1c7c6184636a22fcdf7f", "29510ec3b626c86de9707bb8904ff940d430289b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:36:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:36:08 2011 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (107 commits)\n perf stat: Add more cache-miss percentage printouts\n perf stat: Add -d -d and -d -d -d options to show more CPU events\n ftrace/kbuild: Add recordmcount files to force full build\n ftrace: Add self-tests for multiple function trace users\n ftrace: Modify ftrace_set_filter/notrace to take ops\n ftrace: Allow dynamically allocated function tracers\n ftrace: Implement separate user function filtering\n ftrace: Free hash with call_rcu_sched()\n ftrace: Have global_ops store the functions that are to be traced\n ftrace: Add ops parameter to ftrace_startup/shutdown functions\n ftrace: Add enabled_functions file\n ftrace: Use counters to enable functions to trace\n ftrace: Separate hash allocation and assignment\n ftrace: Create a global_ops to hold the filter and notrace hashes\n ftrace: Use hash instead for FTRACE_FL_FILTER\n ftrace: Replace FTRACE_FL_NOTRACE flag with a hash of ignored functions\n perf bench, x86: Add alternatives-asm.h wrapper\n x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limit\n x86, mem: memset_64.S: Optimize memset by enhanced REP MOVSB/STOSB\n x86, mem: memmove_64.S: Optimize memmove by enhanced REP MOVSB/STOSB\n ...\n" }, { "commit": "cbdad8dc18b8ddd6c8b48c4ef26d46f00b5af923", "tree": "6354f5685db502e748b801873ed07ba1a7fa1f09", "parents": [ "51509a283a908d73b20371addc67ee3ae7189934", "86b9523ab1517f6edeb87295329c901930d3732d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:28:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:28:58 2011 -0700" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, gart: Rename pci-gart_64.c to amd_gart_64.c\n x86/amd-iommu: Use threaded interupt handler\n arch/x86/kernel/pci-iommu_table.c: Convert sprintf_symbol to %pS\n x86/amd-iommu: Add support for invalidate_all command\n x86/amd-iommu: Add extended feature detection\n x86/amd-iommu: Add ATS enable/disable code\n x86/amd-iommu: Add flag to indicate IOTLB support\n x86/amd-iommu: Flush device IOTLB if ATS is enabled\n x86/amd-iommu: Select PCI_IOV with AMD IOMMU driver\n PCI: Move ATS declarations in seperate header file\n dma-debug: print information about leaked entry\n x86/amd-iommu: Flush all internal TLBs when IOMMUs are enabled\n x86/amd-iommu: Rename iommu_flush_device\n x86/amd-iommu: Improve handling of full command buffer\n x86/amd-iommu: Rename iommu_flush* to domain_flush*\n x86/amd-iommu: Remove command buffer resetting logic\n x86/amd-iommu: Cleanup completion-wait handling\n x86/amd-iommu: Cleanup inv_pages command handling\n x86/amd-iommu: Move inv-dte command building to own function\n x86/amd-iommu: Move compl-wait command building to own function\n" }, { "commit": "51509a283a908d73b20371addc67ee3ae7189934", "tree": "bb920f09799cc47d496f26f7deb78a315351150d", "parents": [ "75f5076b12924f53340209d2cde73b98ed3b3095", "6538df80194e305f1b78cafb556f4bb442f808b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 16:46:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 16:46:07 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: (34 commits)\n PM: Introduce generic prepare and complete callbacks for subsystems\n PM: Allow drivers to allocate memory from .prepare() callbacks safely\n PM: Remove CONFIG_PM_VERBOSE\n Revert \"PM / Hibernate: Reduce autotuned default image size\"\n PM / Hibernate: Add sysfs knob to control size of memory for drivers\n PM / Wakeup: Remove useless synchronize_rcu() call\n kmod: always provide usermodehelper_disable()\n PM / ACPI: Remove acpi_sleep\u003ds4_nonvs\n PM / Wakeup: Fix build warning related to the \"wakeup\" sysfs file\n PM: Print a warning if firmware is requested when tasks are frozen\n PM / Runtime: Rework runtime PM handling during driver removal\n Freezer: Use SMP barriers\n PM / Suspend: Do not ignore error codes returned by suspend_enter()\n PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset\n PM: Revert \"driver core: platform_bus: allow runtime override of dev_pm_ops\"\n OMAP1 / PM: Use generic clock manipulation routines for runtime PM\n PM: Remove sysdev suspend, resume and shutdown operations\n PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM\n PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM\n PM / AVR32: Use struct syscore_ops instead of sysdevs for PM\n ...\n" }, { "commit": "6b55b908458120a5f469aa87d11821be67fbd8e2", "tree": "948a82426d6edd7bbab72564cae4a6673d39a5b0", "parents": [ "f8223b17550c427ac249124ff7f25722221f4591", "bb0a56ecc4ba2a3db1b6ea6949c309886e3447d3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 15:59:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 15:59:24 2011 -0700" }, "message": "Merge branch \u0027move-drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq\n\n* \u0027move-drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:\n [CPUFREQ] Move x86 drivers to drivers/cpufreq/\n" }, { "commit": "f8223b17550c427ac249124ff7f25722221f4591", "tree": "741c45fec1c747cb7866f016865822b44105d6df", "parents": [ "98a38a5d60a6e79eaad7f4a9b68cc1bd306ac5c0", "1a8e1463a49aaa452da1cefe184a00d4df47f1ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 15:57:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 15:57:29 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:\n [CPUFREQ] remove redundant sprintf from request_module call.\n [CPUFREQ] cpufreq_stats.c: Fixed brace coding style issue\n [CPUFREQ] Fix memory leak in cpufreq_stat\n [CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.\n [CPUFREQ] use dynamic debug instead of custom infrastructure\n [CPUFREQ] CPU hotplug, re-create sysfs directory and symlinks\n [CPUFREQ] Fix _OSC UUID in pcc-cpufreq\n" }, { "commit": "bb0a56ecc4ba2a3db1b6ea6949c309886e3447d3", "tree": "680b1307d7d9c1a188b7483875f7a3287d8b51a0", "parents": [ "1a8e1463a49aaa452da1cefe184a00d4df47f1ef" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu May 19 18:51:07 2011 -0400" }, "committer": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu May 19 18:51:07 2011 -0400" }, "message": "[CPUFREQ] Move x86 drivers to drivers/cpufreq/\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\n" } ], "next": "983bbf1af0664b78689612b247acb514300f62c7" }