)]}' { "log": [ { "commit": "e8c93fc7b7221b6ac7e7ddbd0e21e205bf9e801a", "tree": "e45d9f6e5f4a27a1472692699c7f0ffe908327e5", "parents": [ "8add570a70d2ea6e9e15fce001c6503589c833d1" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Nov 02 09:23:08 2009 -0800" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Nov 02 09:23:08 2009 -0800" }, "message": "Revert \"[IA64] fix percpu warnings\"\n\nThis reverts commit b94b08081fcecf83fa690d6c5664f6316fe72208.\n\ngenksyms currently cannot handle complicated types for exported\npercpu variables. Drop this patch for now as it prevents a\nmodule from being loaded on sn2 systems:\n\n xpc: no symbol version for per_cpu____sn_cnodeid_to_nasid\n xpc: Unknown symbol per_cpu____sn_cnodeid_to_nasid\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "8add570a70d2ea6e9e15fce001c6503589c833d1", "tree": "2d9c3e75bbd0a9673f9a82d5a8cb98ef67585752", "parents": [ "48fade6c5a96d29cd3d0e016557a3fd835fd4049", "883a3acf5b0d4782ac35981227a0d094e8b44850" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Oct 23 17:59:06 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Oct 23 17:59:06 2009 -0700" }, "message": "Pull ticket-spinaphore into release branch\n" }, { "commit": "48fade6c5a96d29cd3d0e016557a3fd835fd4049", "tree": "671554b43c2deed301dfe1a93acaab4766cf6fef", "parents": [ "b94b08081fcecf83fa690d6c5664f6316fe72208", "1502f08edc040b6ba4b986454416564088995e79" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Oct 23 17:58:54 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Oct 23 17:58:54 2009 -0700" }, "message": "Pull ticket4byte into release branch\n" }, { "commit": "b94b08081fcecf83fa690d6c5664f6316fe72208", "tree": "695e965d91fe76e83312fe1990d1210f9593e3ca", "parents": [ "54f8dd3c99052456a65bd26aa3313f57cd145a73" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Oct 14 15:10:03 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Thu Oct 15 13:29:37 2009 -0700" }, "message": "[IA64] fix percpu warnings\n\nFix percpu types warning in ia64/sn:\n\narch/ia64/sn/kernel/setup.c:74: error: conflicting types for \u0027__pcpu_scope___sn_cnodeid_to_nasid\u0027\narch/ia64/include/asm/sn/arch.h:74: error: previous declaration of \u0027__pcpu_scope___sn_cnodeid_to_nasid\u0027 was here\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Jes Sorensen \u003cjes@sgi.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "1502f08edc040b6ba4b986454416564088995e79", "tree": "c6bc0d0c01d9bbc5503b86db71ca977d1b89e0f1", "parents": [ "9d40ee200a527ce08ab8c793ba8ae3e242edbb0e" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Oct 12 09:51:41 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Oct 13 14:28:31 2009 -0700" }, "message": "[IA64] SMT friendly version of spin_unlock_wait()\n\nWe can be kinder to SMT systems in spin_unlock_wait.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "54f8dd3c99052456a65bd26aa3313f57cd145a73", "tree": "dadf2196339e4bd6cf217c251a941c9aad6e8e82", "parents": [ "adcd740341dbd58eb94a8c2885c171ce9eb8677c" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Fri Sep 18 12:48:12 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Oct 13 12:48:25 2009 -0700" }, "message": "[IA64] use printk_once() unaligned.c/io_common.c\n\nUse printk_once() in a couple of places.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "adcd740341dbd58eb94a8c2885c171ce9eb8677c", "tree": "99cbbea95dc9864b3d39e12180ad8dcdeeabc04c", "parents": [ "dec1798f81f7e8a299734bdc29197ae77bf08018" ], "author": { "name": "Matthew Wilcox", "email": "matthew@wil.cx", "time": "Mon Oct 12 08:24:30 2009 -0600" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Oct 13 10:44:42 2009 -0700" }, "message": "[IA64] Require SAL 3.2 in order to do extended config space ops\n\nWe had assumed that SAL firmware would return an error if it didn\u0027t\nunderstand extended config space. Unfortunately, the SAL on the SGI 750\ndoesn\u0027t do that, it panics the machine. So, condition the extended PCI\nconfig space accesses on SAL revision 3.2.\n\nSigned-off-by: Matthew Wilcox \u003cwilly@linux.intel.com\u003e\nTested-by: Brad Spengler \u003cspender@grsecurity.net\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "dec1798f81f7e8a299734bdc29197ae77bf08018", "tree": "308a3a3b50b79871c8d7c73ed25845ad6abcc640", "parents": [ "29e4e025be52c0619b9dfe6faba29bc3deac6272" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Sat Oct 10 22:21:59 2009 +0200" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Oct 13 10:40:00 2009 -0700" }, "message": "[IA64] unsigned cannot be less than 0 in sn_hwperf_ioctl()\n\nstruct sn_hwperf_ioctl_args member arg (u64) cannot be less than 0.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "29e4e025be52c0619b9dfe6faba29bc3deac6272", "tree": "b10738571f39f650f6646aab0f8ed889ef4fca21", "parents": [ "2caa731819a633bec5a56736e64c562b7e193666" ], "author": { "name": "Takao Indoh", "email": "indou.takao@jp.fujitsu.com", "time": "Thu Oct 01 17:55:16 2009 -0400" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Oct 13 10:37:14 2009 -0700" }, "message": "[IA64] Restore registers in the stack on INIT\n\nRegisters are not saved anywhere when INIT comes during fsys mode and\nwe cannot know what happened when we investigate vmcore captured by\nkdump. This patch adds new function finish_pt_regs() so registers can\nbe saved in such a case.\n\nSigned-off-by: Takao Indoh \u003cindou.takao@jp.fujitsu.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "883a3acf5b0d4782ac35981227a0d094e8b44850", "tree": "a5ad44c09e36298749f0b37dbd5695bad040620c", "parents": [ "36a07902c2134649c4af7f07980413ffb1a56085" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Oct 09 10:52:39 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Oct 09 10:52:39 2009 -0700" }, "message": "[IA64] Re-implement spinaphores using ticket lock concepts\n\nBound the wait time for the ptcg_sem by using similar idea to the\nticket spin locks. In this case we have only one instance of a\nspinaphore, so make it 8 bytes rather than try to squeeze it into\n4-bytes to keep the code simpler (and shorter).\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "9d40ee200a527ce08ab8c793ba8ae3e242edbb0e", "tree": "189b7dc9cde0ceb791bb3bdd1a1d9a22aee00336", "parents": [ "0eca52a92735f43462165efe00a7e394345fb38e" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Oct 07 10:54:19 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Oct 07 10:54:19 2009 -0700" }, "message": "[IA64] Squeeze ticket locks back into 4 bytes.\n\nLinus pointed out that other people have spent large amounts of time\nand effort to optimize the layout of frequently used structures. Often\nthese have embedded locks, and the assumption is that a lock takes\n4 bytes. Linus also pointed out how to work with the limited options\nfor atomic instructions on Itanium.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "f0f37e2f77731b3473fa6bd5ee53255d9a9cdb40", "tree": "3c26d3ed1a453156e9c208ccb5567a8954dba064", "parents": [ "6f5071020d5ec89b5d095aa488db604adb921aec" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sun Sep 27 22:29:37 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 27 11:39:25 2009 -0700" }, "message": "const: mark struct vm_struct_operations\n\n* mark struct vm_area_struct::vm_ops as const\n* mark vm_ops in AGP code\n\nBut leave TTM code alone, something is fishy there with global vm_ops\nbeing used.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "73964f6bc8e378715887592abe8a512f403db6a8", "tree": "c4aaab48d36ed06243542518ff644c654bdaf586", "parents": [ "9d98ece16f1a1df0f456a2ee9429d03e82e839a2", "e56d953d190061938b31cabbe01b7f3d76c60bd0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 27 10:38:48 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 27 10:38:48 2009 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI: IA64\u003dy ACPI\u003dn build fix\n ACPI: Kill overly verbose \"power state\" log messages\n ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression\n ACPI: Clarify resource conflict message\n thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem\n" }, { "commit": "e56d953d190061938b31cabbe01b7f3d76c60bd0", "tree": "a086109960584c7f88d8936eac76ad3c30274f4e", "parents": [ "3d5b6fb47a8e68fa311ca2c3447e7f8a7c3a9cf3" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Sep 27 04:17:21 2009 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Sep 27 04:17:21 2009 -0400" }, "message": "ACPI: IA64\u003dy ACPI\u003dn build fix\n\nia64\u0027s sim_defconfig uses CONFIG_ACPI\u003dn\nwhich now #define\u0027s acpi_disabled in \u003clinux/acpi.h\u003e\n\nSo we shouldn\u0027t re-define it here in \u003casm/acpi.h\u003e\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "2c86963b093c1a0887dfc6b32c6e5ea3a80f2922", "tree": "d1ed58dd0a644dd670e3724a575112fedd4b4250", "parents": [ "53cddfcc0e760d2b364878b6dadbd0c6d087cfae" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Sep 25 08:42:16 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Sep 25 08:42:16 2009 -0700" }, "message": "[IA64] implement ticket locks for Itanium\n\nBack in January 2008 Nick Piggin implemented \"ticket\" spinlocks\nfor X86 (See commit 314cdbefd1fd0a7acf3780e9628465b77ea6a836).\n\nIA64 implementation has a couple of differences because of the\navailable atomic operations ... e.g. we have no fetchadd2 instruction\nthat operates on a 16-bit quantity so we make ticket locks use\na 32-bit word for each of the current ticket and now-serving values.\n\nPerformance on uncontended locks is about 8% worse than the previous\nimplementation, but this seems a good trade for determinism in the\ncontended case. Performance impact on macro-level benchmarks is in\nthe noise.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "94a8d5caba74211ec76dac80fc6e2d5c391530df", "tree": "21d17d214a354ae00ae27217d82b67bfc5bff3a3", "parents": [ "2bcd57ab61e7cabed626226a3771617981c11ce1", "6ba2ef7baac23a5d9bb85e28b882d16b439a2293" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 18:14:11 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 18:14:11 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (39 commits)\n cpumask: Move deprecated functions to end of header.\n cpumask: remove unused deprecated functions, avoid accusations of insanity\n cpumask: use new-style cpumask ops in mm/quicklist.\n cpumask: use mm_cpumask() wrapper: x86\n cpumask: use mm_cpumask() wrapper: um\n cpumask: use mm_cpumask() wrapper: mips\n cpumask: use mm_cpumask() wrapper: mn10300\n cpumask: use mm_cpumask() wrapper: m32r\n cpumask: use mm_cpumask() wrapper: arm\n cpumask: Use accessors for cpu_*_mask: um\n cpumask: Use accessors for cpu_*_mask: powerpc\n cpumask: Use accessors for cpu_*_mask: mips\n cpumask: Use accessors for cpu_*_mask: m32r\n cpumask: remove arch_send_call_function_ipi\n cpumask: arch_send_call_function_ipi_mask: s390\n cpumask: arch_send_call_function_ipi_mask: powerpc\n cpumask: arch_send_call_function_ipi_mask: mips\n cpumask: arch_send_call_function_ipi_mask: m32r\n cpumask: arch_send_call_function_ipi_mask: alpha\n cpumask: remove obsolete topology_core_siblings and topology_thread_siblings: ia64\n ...\n" }, { "commit": "0748bd01773395003208996c4c0b3f80caf80976", "tree": "99abf2a49d66c4890f4cc6b114bfd47684bab68e", "parents": [ "630cd0460724e286d3c5cb2c33930b0ae9cd6645" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:46 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:47 2009 +0930" }, "message": "cpumask: remove arch_send_call_function_ipi\n\nNow everyone is converted to arch_send_call_function_ipi_mask, remove\nthe shim and the #defines.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "e50a6f19537362ed61f7f74af724345975e602ed", "tree": "1943a93d8b5600cead8050a7d25bc70f5fd15edd", "parents": [ "399d0682704144ddadb27164343a265774d8b301" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:42 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:43 2009 +0930" }, "message": "cpumask: remove obsolete topology_core_siblings and topology_thread_siblings: ia64\n\nThere were replaced by topology_core_cpumask and topology_thread_cpumask.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "da83a84b53296a2ea498be8a497c86fb4a1fd2d6", "tree": "7b90e7eea3f26f425a4a0d4b9c91bcb53aa93bca", "parents": [ "e0ad955680878998ff7dc51ce06ddad12260423a" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:39 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:40 2009 +0930" }, "message": "ia64: convert last user of smp_call_function_mask\n\nsmp_call_function_many is the new version: it takes a pointer. Also,\nuse mm accessor macro while we\u0027re changing this.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "29c337a034b5526e80a785409d15d3b7c7edecf4", "tree": "0fb68fdaa8ad12024181a1b7a8a2bc7b142a6dbf", "parents": [ "b966cd6b285d4cd6feaf8b06b21bc87adb907929" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:26 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Sep 24 09:34:34 2009 +0930" }, "message": "cpumask: remove obsolete node_to_cpumask now everyone uses cpumask_of_node\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "c37efa932598de5e30330a1414e34d9e082e0d9e", "tree": "1e3b782d257fa39a54f583af3dc7c32d7cffc67d", "parents": [ "9e12a7e7d89ad813d01092890010cf67d0f914bd", "abe1ee3a221d53778c3e58747bbec6e518e5471b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:37:02 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:37:02 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)\n Use macros for .data.page_aligned section.\n Use macros for .bss.page_aligned section.\n Use new __init_task_data macro in arch init_task.c files.\n kbuild: Don\u0027t define ALIGN and ENTRY when preprocessing linker scripts.\n arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0\n kbuild: add static to prototypes\n kbuild: fail build if recordmcount.pl fails\n kbuild: set -fconserve-stack option for gcc 4.5\n kbuild: echo the record_mcount command\n gconfig: disable \"typeahead find\" search in treeviews\n kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling\n checkincludes.pl: add option to remove duplicates in place\n markup_oops: use modinfo to avoid confusion with underscored module names\n checkincludes.pl: provide usage helper\n checkincludes.pl: close file as soon as we\u0027re done with it\n ctags: usability fix\n kernel hacking: move STRIP_ASM_SYMS from General\n gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma\n kbuild: Check if linker supports the -X option\n kbuild: introduce ld-option\n ...\n\nFix trivial conflict in scripts/basic/fixdep.c\n" }, { "commit": "b09a75fc5e77b7c58d097236f89b1ff72dcdb562", "tree": "8f818f1b3e44d9bc822b13dc7c368077981dd6ea", "parents": [ "cf63ff5fa4399e215cc5ef322ccd8bddfff9afa6", "b94996c99c8befed9cbbb8804a4625e203913318" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:06:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:06:10 2009 -0700" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6: (23 commits)\n intel-iommu: Disable PMRs after we enable translation, not before\n intel-iommu: Kill DMAR_BROKEN_GFX_WA option.\n intel-iommu: Fix integer wrap on 32 bit kernels\n intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()\n intel-iommu: Limit DOMAIN_MAX_PFN to fit in an \u0027unsigned long\u0027\n intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS\n intel-iommu: Disallow interrupt remapping if not all ioapics covered\n intel-iommu: include linux/dmi.h to use dmi_ routines\n pci/dmar: correct off-by-one error in dmar_fault()\n intel-iommu: Cope with yet another BIOS screwup causing crashes\n intel-iommu: iommu init error path bug fixes\n intel-iommu: Mark functions with __init\n USB: Work around BIOS bugs by quiescing USB controllers earlier\n ia64: IOMMU passthrough mode shouldn\u0027t trigger swiotlb init\n intel-iommu: make domain_add_dev_info() call domain_context_mapping()\n intel-iommu: Unify hardware and software passthrough support\n intel-iommu: Cope with broken HP DC7900 BIOS\n iommu\u003dpt is a valid early param\n intel-iommu: double kfree()\n intel-iommu: Kill pointless intel_unmap_single() function\n ...\n\nFixed up trivial include lines conflict in drivers/pci/intel-iommu.c\n" }, { "commit": "31bbb9b58d1e8ebcf2b28c95c2250a9f8e31e397", "tree": "6bb0c0490d66d32eca43e73abb28d8b3ab0e7b91", "parents": [ "ff830b8e5f999d1ccbd0282a666520f0b557daa4", "3f0a525ebf4b8ef041a332bbe4a73aee94bb064b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:46:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:46:15 2009 -0700" }, "message": "Merge branch \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n itimers: Add tracepoints for itimer\n hrtimer: Add tracepoint for hrtimers\n timers: Add tracepoints for timer_list timers\n cputime: Optimize jiffies_to_cputime(1)\n itimers: Simplify arm_timer() code a bit\n itimers: Fix periodic tics precision\n itimers: Merge ITIMER_VIRT and ITIMER_PROF\n\nTrivial header file include conflicts in kernel/fork.c\n" }, { "commit": "c11f6c82581e8be4e1829c677db54e7f55cebece", "tree": "1a116241b0831ded998aabe800bdc24104cbd826", "parents": [ "40aba218969914d1b225e742617adb921cf94eae", "193a6dec1c0246a80b6d0101e4f351ccf877bcac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:32:11 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:32:11 2009 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (119 commits)\n ACPI: don\u0027t pass handle for fixed hardware notifications\n ACPI: remove null pointer checks in deferred execution path\n ACPI: simplify deferred execution path\n acerhdf: additional BIOS versions\n acerhdf: convert to dev_pm_ops\n acerhdf: fix fan control for AOA150 model\n thermal: add missing Kconfig dependency\n acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file\n hp-wmi: fix rfkill memory leak on unload\n ACPI: remove unnecessary #ifdef CONFIG_DMI\n ACPI: linux/acpi.h should not include linux/dmi.h\n hwmon driver for ACPI 4.0 power meters\n topstar-laptop: add new driver for hotkeys support on Topstar N01\n thinkpad_acpi: fix rfkill memory leak on unload\n thinkpad-acpi: report brightness events when required\n thinkpad-acpi: don\u0027t poll by default any of the reserved hotkeys\n thinkpad-acpi: Fix procfs hotkey reset command\n thinkpad-acpi: deprecate hotkey_bios_mask\n thinkpad-acpi: hotkey poll fixes\n thinkpad-acpi: be more strict when detecting a ThinkPad\n ...\n" }, { "commit": "3089aa1b0c07fb7c48f9829c619f50198307789d", "tree": "63677c773c559458ba301bd448ecce6e007b6742", "parents": [ "908eedc6168bd92e89f90d89fa389065a36358fa" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Sep 22 16:45:48 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:41 2009 -0700" }, "message": "kcore: use registerd physmem information\n\nFor /proc/kcore, each arch registers its memory range by kclist_add().\nIn usual,\n\n\t- range of physical memory\n\t- range of vmalloc area\n\t- text, etc...\n\nare registered but \"range of physical memory\" has some troubles. It\ndoesn\u0027t updated at memory hotplug and it tend to include unnecessary\nmemory holes. Now, /proc/iomem (kernel/resource.c) includes required\nphysical memory range information and it\u0027s properly updated at memory\nhotplug. Then, it\u0027s good to avoid using its own code(duplicating\ninformation) and to rebuild kclist for physical memory based on\n/proc/iomem.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9492587cf35d370db33ef4b38375dfb35a105b61", "tree": "59daaf91e847d3c5cd6f542626da75db5814b06d", "parents": [ "a0614da88b67ffa3dbcc0d40b817e682c7c4a0ee" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Sep 22 16:45:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:41 2009 -0700" }, "message": "kcore: register text area in generic way\n\nSome 64bit arch has special segment for mapping kernel text. It should be\nentried to /proc/kcore in addtion to direct-linear-map, vmalloc area.\nThis patch unifies KCORE_TEXT entry scattered under x86 and ia64.\n\nI\u0027m not familiar with other archs (mips has its own even after this patch)\nbut range of [_stext ..._end) is a valid area of text and it\u0027s not in\ndirect-map area, defining CONFIG_ARCH_PROC_KCORE_TEXT is only a necessary\nthing to do.\n\nNote: I left mips as it is now.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a0614da88b67ffa3dbcc0d40b817e682c7c4a0ee", "tree": "ae4ca3a8553592af41f7c2cc1a64912d934f6baf", "parents": [ "c30bb2a25fcfde6157e6154a32c14686fb0bedbe" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Sep 22 16:45:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:41 2009 -0700" }, "message": "kcore: register vmalloc area in generic way\n\nFor /proc/kcore, vmalloc areas are registered per arch. But, all of them\nregisters same range of [VMALLOC_START...VMALLOC_END) This patch unifies\nthem. By this. archs which have no kclist_add() hooks can see vmalloc\narea correctly.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c30bb2a25fcfde6157e6154a32c14686fb0bedbe", "tree": "afa4811d46e5f9035a035b2c8c864bbb6c5af049", "parents": [ "2ef43ec772551e975a6ea7cf22b59c84955aadf9" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Sep 22 16:45:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:41 2009 -0700" }, "message": "kcore: add kclist types\n\nPresently, kclist_add() only eats start address and size as its arguments.\nConsidering to make kclist dynamically reconfigulable, it\u0027s necessary to\nknow which kclists are for System RAM and which are not.\n\nThis patch add kclist types as\n KCORE_RAM\n KCORE_VMALLOC\n KCORE_TEXT\n KCORE_OTHER\n\nThis \"type\" is used in a patch following this for detecting KCORE_RAM.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca", "tree": "1f967f283dade6e03897169bb29513354f49f910", "parents": [ "50223e486cabdcf7e540e519da1f26bab3084e5d", "24ed7a97464db44592495f98cff8bcee02f92bc2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:51:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:51:45 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)\n trivial: fix typo in aic7xxx comment\n trivial: fix comment typo in drivers/ata/pata_hpt37x.c\n trivial: typo in kernel-parameters.txt\n trivial: fix typo in tracing documentation\n trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c\n trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c\n trivial: remove unnecessary semicolons\n trivial: Fix duplicated word \"options\" in comment\n trivial: kbuild: remove extraneous blank line after declaration of usage()\n trivial: improve help text for mm debug config options\n trivial: doc: hpfall: accept disk device to unload as argument\n trivial: doc: hpfall: reduce risk that hpfall can do harm\n trivial: SubmittingPatches: Fix reference to renumbered step\n trivial: fix typos \"man[ae]g?ment\" -\u003e \"management\"\n trivial: media/video/cx88: add __init/__exit macros to cx88 drivers\n trivial: fix typo in CONFIG_DEBUG_FS in gcov doc\n trivial: fix missing printk space in amd_k7_smp_check\n trivial: fix typo s/ketymap/keymap/ in comment\n trivial: fix typo \"to to\" in multiple files\n trivial: fix typos in comments s/DGBU/DBGU/\n ...\n" }, { "commit": "6e17b17f1fc7b2f24383a693d63550d9e1460081", "tree": "146a9921760755dfd5398c3fd56df918e391fe0d", "parents": [ "94bf5ceac095c7d4cb5e4d40fa7e2dd81d722b75" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Sep 21 17:03:48 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:42 2009 -0700" }, "message": "mm: remove duplicate asm/mman.h files\n\nA number of architectures have identical asm/mman.h files so they can all\nbe merged by using the new generic file.\n\nThe remaining asm/mman.h files are substantially different from each\nother.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90f72aa58bbf076b68e289fbd71eb829bc505923", "tree": "992e5f59086cc77581fa10b52fb4a46fb3baf3f0", "parents": [ "6bfde05bf5c9682e255c6a2c669dc80f91af6296" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Sep 21 17:03:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:41 2009 -0700" }, "message": "mm: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions\n\nAdd a flag for mmap that will be used to request a huge page region that\nwill look like anonymous memory to user space. This is accomplished by\nusing a file on the internal vfsmount. MAP_HUGETLB is a modifier of\nMAP_ANONYMOUS and so must be specified with it. The region will behave\nthe same as a MAP_ANONYMOUS region using small pages.\n\nThe patch also adds the MAP_STACK flag, which was previously defined only\non some architectures but not on others. Since MAP_STACK is meant to be a\nhint only, architectures can define it without assigning a specific\nmeaning to it.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Eric B Munson \u003cebmunson@us.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cc013a88906bad9d2832d6316de1c7dbc1c2a794", "tree": "c47d1bc76cf9bbf94c328ca6e15ac99ddbab7603", "parents": [ "73d7c33e81aed92ac185950a20407c1a2ea65a83" ], "author": { "name": "Geert Uytterhoeven", "email": "Geert.Uytterhoeven@sonycom.com", "time": "Mon Sep 21 17:02:36 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:34 2009 -0700" }, "message": "arches: drop superfluous casts in nr_free_pages() callers\n\nCommit 96177299416dbccb73b54e6b344260154a445375 (\"Drop free_pages()\")\nmodified nr_free_pages() to return \u0027unsigned long\u0027 instead of \u0027unsigned\nint\u0027. This made the casts to \u0027unsigned long\u0027 in most callers superfluous,\nso remove them.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Geert Uytterhoeven \u003cGeert.Uytterhoeven@sonycom.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Zankel \u003czankel@tensilica.com\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fd589a8f0a13f53a2dd580b1fe170633cf6b095f", "tree": "942c50188ca58041b0453189e710eafcfebaea57", "parents": [ "4f37940d64a155c025968118849b596f6aaa8128" ], "author": { "name": "Anand Gadiyar", "email": "gadiyar@ti.com", "time": "Thu Jul 16 17:13:03 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Sep 21 15:14:55 2009 +0200" }, "message": "trivial: fix typo \"to to\" in multiple files\n\nSigned-off-by: Anand Gadiyar \u003cgadiyar@ti.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d200c922bc2b1ac88b8d33b6cfff2ed837af186a", "tree": "be5c04605d900380c935de58915787083667a8a2", "parents": [ "42f29a25207dc7b3051d299cc028d4b395d1328d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Sep 20 18:14:13 2009 -0400" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Sep 21 06:27:08 2009 +0200" }, "message": "Use new __init_task_data macro in arch init_task.c files.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "f86fd306605287d7c7f4f0f8e8e2a9d49d28b396", "tree": "8d6115f90c496ab3fc37de2b513e1857216cd92c", "parents": [ "4779105e03cdb6639706991081839451d709230b" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Sep 19 10:14:33 2009 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Sep 20 12:27:42 2009 +0200" }, "message": "kbuild: rename ld-option to cc-ldoption\n\nld-option is misnamed as it test options to gcc, not to ld.\nRenamed it to reflect this.\n\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "caa27b66bd7188fd063769eaf4b33533ef0709e6", "tree": "57d9f96ad40712f690763fb205006938885bbc1a", "parents": [ "78f28b7c555359c67c2a0d23f7436e915329421e" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Jul 20 21:37:11 2009 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Sep 20 12:18:14 2009 +0200" }, "message": "kbuild: use INSTALLKERNEL to select customized installkernel script\n\nReplace the use of CROSS_COMPILE to select a customized\ninstallkernel script with the possibility to set INSTALLKERNEL\nto select a custom installkernel script when running make:\n\n make INSTALLKERNEL\u003darm-installkernel install\n\nWith this patch we are now more consistent across\ndifferent architectures - they did not all support use\nof CROSS_COMPILE.\n\nThe use of CROSS_COMPILE was a hack as this really belongs\nto gcc/binutils and the installkernel script does not change\njust because we change toolchain.\n\nThe use of CROSS_COMPILE caused troubles with an upcoming patch\nthat saves CROSS_COMPILE when a kernel is built - it would no\nlonger be installable.\n[Thanks to Peter Z. for this hint]\n\nThis patch undos what Ian did in commit:\n\n 0f8e2d62fa04441cd12c08ce521e84e5bd3f8a46\n (\"use ${CROSS_COMPILE}installkernel in arch/*/boot/install.sh\")\n\nThe patch has been lightly tested on x86 only - but all changes\nlooks obvious.\n\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e [blackfin]\nAcked-by: Russell King \u003clinux@arm.linux.org.uk\u003e [arm]\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e [sh]\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e [x86]\nCc: Ian Campbell \u003cicampbell@arcom.com\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e [ia64]\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e [ia64]\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e [m32r]\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e [m68k]\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e [parisc]\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e [powerpc]\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e [s390]\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e [x86]\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e [x86]\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "985f38781d19101aba121df423f92c87b208c6df", "tree": "21b10413b6e24c0eaf5c3b2432e936749a672644", "parents": [ "d093d70a81b08673d1577ad73419998f02be9d29", "c9766237afa92e8d7f27bbcd4964f1b43fa0bce8" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Sep 19 01:45:22 2009 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Sep 19 01:45:22 2009 -0400" }, "message": "Merge branch \u0027acpica\u0027 into release\n" }, { "commit": "fa877c71e2136bd682b45022c96d5e073ced9f58", "tree": "f45a582fb31cb51dbe14ea24a13fb98f2798e04e", "parents": [ "9eead2a8115d2a6aecf267c292f751f7761fa5f8", "6ae86350857bf3e862f8dcd10039ccb45e056f85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 09:33:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 09:33:07 2009 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] Clean up linker script using standard macros.\n [IA64] Use standard macros for page-aligned data.\n [IA64] Use .ref.text, not .text.init for start_ap.\n [IA64] sgi-xp: fix printk format warnings\n [IA64] ioc4_serial: fix printk format warnings\n [IA64] mbcs: fix printk format warnings\n [IA64] pci_br, fix infinite loop in find_free_ate()\n [IA64] kdump: Short path to freeze CPUs\n [IA64] kdump: Try INIT regardless of\n [IA64] kdump: Mask INIT first in panic-kdump path\n [IA64] kdump: Don\u0027t return APs to SAL from kdump\n [IA64] kexec: Unregister MCA handler before kexec\n [IA64] kexec: Make INIT safe while transition to\n [IA64] kdump: Mask MCA/INIT on frozen cpus\n\nFix up conflict in arch/ia64/kernel/vmlinux.lds.S as per Tony\u0027s\nsuggestion.\n" }, { "commit": "dcbf77b9e86e1726f5fbd01bb98820dac06d456e", "tree": "2f0b728ce70c03e1d0e3461e8a3c3d1fbe68fb90", "parents": [ "ca043a66ae48c74fa628ec92178f7a54f5b9a106", "29cd8bae396583a2ee9a3340db8c5102acf9f6fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 21:00:02 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 21:00:02 2009 -0700" }, "message": "Merge branch \u0027sched-core-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: (37 commits)\n sched: Fix SD_POWERSAVING_BALANCE|SD_PREFER_LOCAL vs SD_WAKE_AFFINE\n sched: Stop buddies from hogging the system\n sched: Add new wakeup preemption mode: WAKEUP_RUNNING\n sched: Fix TASK_WAKING \u0026 loadaverage breakage\n sched: Disable wakeup balancing\n sched: Rename flags to wake_flags\n sched: Clean up the load_idx selection in select_task_rq_fair\n sched: Optimize cgroup vs wakeup a bit\n sched: x86: Name old_perf in a unique way\n sched: Implement a gentler fair-sleepers feature\n sched: Add SD_PREFER_LOCAL\n sched: Add a few SYNC hint knobs to play with\n sched: Fix sync wakeups again\n sched: Add WF_FORK\n sched: Rename sync arguments\n sched: Rename select_task_rq() argument\n sched: Feature to disable APERF/MPERF cpu_power\n x86: sched: Provide arch implementations using aperf/mperf\n x86: Add generic aperf/mperf code\n x86: Move APERF/MPERF into a X86_FEATURE\n ...\n\nFix up trivial conflict in arch/x86/include/asm/processor.h due to\nnearby addition of amd_get_nb_id() declaration from the EDAC merge.\n" }, { "commit": "f4c3f03838ae47a92f2d15d48ddf68deae5d7ebb", "tree": "10b7fe94c6b05e08f8260864f1bf9296f7a00703", "parents": [ "ab86e5765d41a5eb4239a1c04d613db87bea5ed8" ], "author": { "name": "Anirban Sinha", "email": "asinha@zeugmasystems.com", "time": "Wed Sep 16 10:16:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 16 12:28:52 2009 -0700" }, "message": "Fix ia64 build breakage in head.S\n\nThe \"cleanup console_print()\" patch in commit\n353f6dd2dec992ddd34620a94b051b0f76227379 introduced an \"extern\"\ndeclaration into an assembly language file. Remove it.\n\nSigned-off-by: Anirban Sinha \u003casinha@zeugmasystems.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4406c56d0a4da7a37b9180abeaece6cd00bcc874", "tree": "65a85fa73a25d24cbed6d163fdcf8df1b934a0be", "parents": [ "6b7b352f2102e21f9d8f38e932f01d9c5705c073", "5e3573db2bd5db6925159279d99576a4635bdb66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 16 07:49:54 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 16 07:49:54 2009 -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: (75 commits)\n PCI hotplug: clean up acpi_run_hpp()\n PCI hotplug: acpiphp: use generic pci_configure_slot()\n PCI hotplug: shpchp: use generic pci_configure_slot()\n PCI hotplug: pciehp: use generic pci_configure_slot()\n PCI hotplug: add pci_configure_slot()\n PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface\n PCI hotplug: acpiphp: don\u0027t cache hotplug_params in acpiphp_bridge\n PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation\n PCI: Clear saved_state after the state has been restored\n PCI PM: Return error codes from pci_pm_resume()\n PCI: use dev_printk in quirk messages\n PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset()\n PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle\n PCI Hotplug: acpiphp: find bridges the easy way\n PCI: pcie portdrv: remove unused variable\n PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support\n ACPI PM: Replace wakeup.prepared with reference counter\n PCI PM: Introduce device flag wakeup_prepared\n PCI / ACPI PM: Rework some debug messages\n PCI PM: Simplify PCI wake-up code\n ...\n\nFixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree\nscanning having been moved and merged for the 32- and 64-bit cases. The\n\u0027needs_freset\u0027 initialization added in 6e19314cc (\"PCI/powerpc: support\nPCIe fundamental reset\") is now in arch/powerpc/kernel/pci_of_scan.c.\n" }, { "commit": "182a85f8a119c789610a9d464f4129ded9f3c107", "tree": "ffc36e5049895bf85543ba8d0225805e15fe8d92", "parents": [ "5a9b86f647a56862cdc0a1362bfb015ae921af7f" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Sep 16 13:24:49 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Sep 16 16:44:33 2009 +0200" }, "message": "sched: Disable wakeup balancing\n\nSysbench thinks SD_BALANCE_WAKE is too agressive and kbuild doesn\u0027t\nreally mind too much, SD_BALANCE_NEWIDLE picks up most of the\nslack.\n\nOn a dual socket, quad core, dual thread nehalem system:\n\nsysbench (--num_threads\u003d16):\n\n SD_BALANCE_WAKE-: 13982 tx/s\n SD_BALANCE_WAKE+: 15688 tx/s\n\nkbuild (-j16):\n\n SD_BALANCE_WAKE-: 47.648295846 seconds time elapsed ( +- 0.312% )\n SD_BALANCE_WAKE+: 47.608607360 seconds time elapsed ( +- 0.026% )\n\n(same within noise)\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6ae86350857bf3e862f8dcd10039ccb45e056f85", "tree": "8a9c292da5c6db500897230946627898c61f02df", "parents": [ "ed7af3e63bd2458d5138c4b7e92fe4e1cdc97d9d" ], "author": { "name": "Nelson Elhage", "email": "nelhage@ksplice.com", "time": "Fri Jul 31 16:57:53 2009 -0400" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Sep 15 09:52:33 2009 -0700" }, "message": "[IA64] Clean up linker script using standard macros.\n\nAside from using fewer output sections and moving some data around,\nthe main side effect of this change is changing the alignment of some\nsections. In particular:\n\n* cachline-aligned and read_mostly data are now aligned to\n SMP_CACHE_BYTES. (Previously, they were laid out consecutively after\n a PAGE_SIZE alignment)\n* .init.ramfs is now page-aligned, per the INIT_RAM_FS\n macro. (Previously it had no explicit alignment).\n\nSigned-off-by: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "ed7af3e63bd2458d5138c4b7e92fe4e1cdc97d9d", "tree": "634908b68c9b50b7a33cbd88bec01519e75809b7", "parents": [ "f172468a142c6989144ccb827c1b57c69229e8ba" ], "author": { "name": "Nelson Elhage", "email": "nelhage@ksplice.com", "time": "Fri Jul 31 16:57:52 2009 -0400" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Sep 15 09:40:27 2009 -0700" }, "message": "[IA64] Use standard macros for page-aligned data.\n\nSigned-off-by: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "ada3fa15057205b7d3f727bba5cd26b5912e350f", "tree": "60962fc9e4021b92f484d1a58e72cd3906d4f3db", "parents": [ "2f82af08fcc7dc01a7e98a49a5995a77e32a2925", "5579fd7e6aed8860ea0c8e3f11897493153b10ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:39:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:39:44 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)\n powerpc64: convert to dynamic percpu allocator\n sparc64: use embedding percpu first chunk allocator\n percpu: kill lpage first chunk allocator\n x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA\n percpu: update embedding first chunk allocator to handle sparse units\n percpu: use group information to allocate vmap areas sparsely\n vmalloc: implement pcpu_get_vm_areas()\n vmalloc: separate out insert_vmalloc_vm()\n percpu: add chunk-\u003ebase_addr\n percpu: add pcpu_unit_offsets[]\n percpu: introduce pcpu_alloc_info and pcpu_group_info\n percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward\n percpu: add @align to pcpu_fc_alloc_fn_t\n percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()\n percpu: drop @static_size from first chunk allocators\n percpu: generalize first chunk allocator selection\n percpu: build first chunk allocators selectively\n percpu: rename 4k first chunk allocator to page\n percpu: improve boot messages\n percpu: fix pcpu_reclaim() locking\n ...\n\nFix trivial conflict as by Tejun Heo in kernel/sched.c\n" }, { "commit": "f172468a142c6989144ccb827c1b57c69229e8ba", "tree": "6284c835b8ca8088ee32d0c29fb024be4357b799", "parents": [ "f509e34a57086874a736db66d37ac0456fe455fe" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Fri Jul 31 16:57:51 2009 -0400" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Sep 15 09:29:31 2009 -0700" }, "message": "[IA64] Use .ref.text, not .text.init for start_ap.\n\nIt seems that start_ap doesn\u0027t need to be in a special location in the\nkernel, but it references some init code so it should be in .ref.text.\n\nSince this is the only thing in the .text.head section, eliminate\n.text.head from the linker script.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "227423904c709a8e60245c97081bbeb4fb500655", "tree": "97db1b8df1e4518334aea2fdf60363e0a691eb1e", "parents": [ "1aaf2e59135fd67321f47c11c64a54aac27014e9", "fa526d0d641b5365676a1fb821ce359e217c9b85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:19:38 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:19:38 2009 -0700" }, "message": "Merge branch \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, pat: Fix cacheflush address in change_page_attr_set_clr()\n mm: remove !NUMA condition from PAGEFLAGS_EXTENDED condition set\n x86: Fix earlyprintk\u003ddbgp for machines without NX\n x86, pat: Sanity check remap_pfn_range for RAM region\n x86, pat: Lookup the protection from memtype list on vm_insert_pfn()\n x86, pat: Add lookup_memtype to get the current memtype of a paddr\n x86, pat: Use page flags to track memtypes of RAM pages\n x86, pat: Generalize the use of page flag PG_uncached\n x86, pat: Add rbtree to do quick lookup in memtype tracking\n x86, pat: Add PAT reserve free to io_mapping* APIs\n x86, pat: New i/f for driver to request memtype for IO regions\n x86, pat: ioremap to follow same PAT restrictions as other PAT users\n x86, pat: Keep identity maps consistent with mmaps even when pat_disabled\n x86, mtrr: make mtrr_aps_delayed_init static bool\n x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init\n generic-ipi: Allow cpus not yet online to call smp_call_function with irqs disabled\n x86: Fix an incorrect argument of reserve_bootmem()\n x86: Fix system crash when loading with \"reservetop\" parameter\n" }, { "commit": "66a4fe0cb80a9fde8cb173289afb863fd279466a", "tree": "e1180ba7cbd123fb2f0bf510a955704725465776", "parents": [ "18240904960a39e582ced8ba8ececb10b8c22dd3", "121264827656f5f06328b17983c796af17dc5949" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:18:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:18:07 2009 -0700" }, "message": "Merge branch \u0027agp-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6\n\n* \u0027agp-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:\n agp/intel: remove restore in resume\n agp: fix uninorth build\n intel-agp: Set dma mask for i915\n agp: kill phys_to_gart() and gart_to_phys()\n intel-agp: fix sglist allocation to avoid vmalloc()\n intel-agp: Move repeated sglist free into separate function\n agp: Switch agp_{un,}map_page() to take struct page * argument\n agp: tidy up handling of scratch pages w.r.t. DMA API\n intel_agp: Use PCI DMA API correctly on chipsets new enough to have IOMMU\n agp: Add generic support for graphics dma remapping\n agp: Switch mask_memory() method to take address argument again, not page\n" }, { "commit": "9b6b93998a0d9c44d6701be5b472f3302c3a8596", "tree": "7cdea412d44e7b3ee507422df513f74c53d2430f", "parents": [ "0cced40e7c58b1105aef3ca446da7b158a18a9a6" ], "author": { "name": "Jiri Slaby", "email": "jirislaby@gmail.com", "time": "Tue Aug 25 20:54:10 2009 +0200" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Sep 15 08:40:49 2009 -0700" }, "message": "[IA64] pci_br, fix infinite loop in find_free_ate()\n\nWhen\n* there is almost out of ates\n* one asks for more than one ate\n* there are some available at the end of ate array\nthen the inner for loop will end without incrementing \u0027index\u0027. This\nmeans the outer loop will start at the same point finding it\u0027s available\nand runs the inner loop again from the same index. This repeats forever.\n\nHence make sure we check we were at the end of ate array and return\nan error in such case.\n\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nFound-by: Jeff Mahoney \u003cjeffm@novell.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "b8a543ea5a5896830a9969bacfd047f9d15940b2", "tree": "45bae76596f2a51f3cc79d55c9c4e0da064a7a2c", "parents": [ "0ec9fab3d186d9cbb00c0f694d4a260d07c198d9" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Sep 15 15:22:03 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 15 16:51:23 2009 +0200" }, "message": "sched: Reduce forkexec_idx\n\nIf we\u0027re looking to place a new task, we might as well find the\nidlest position _now_, not 1 tick ago.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0ec9fab3d186d9cbb00c0f694d4a260d07c198d9", "tree": "07773edcece2dd82a63265e027793fe8b2231960", "parents": [ "6bd7821f905a8d6c471f0d6675f5cb7ea448d791" ], "author": { "name": "Mike Galbraith", "email": "efault@gmx.de", "time": "Tue Sep 15 15:07:03 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 15 16:51:16 2009 +0200" }, "message": "sched: Improve latencies and throughput\n\nMake the idle balancer more agressive, to improve a\nx264 encoding workload provided by Jason Garrett-Glaser:\n\n NEXT_BUDDY NO_LB_BIAS\n encoded 600 frames, 252.82 fps, 22096.60 kb/s\n encoded 600 frames, 250.69 fps, 22096.60 kb/s\n encoded 600 frames, 245.76 fps, 22096.60 kb/s\n\n NO_NEXT_BUDDY LB_BIAS\n encoded 600 frames, 344.44 fps, 22096.60 kb/s\n encoded 600 frames, 346.66 fps, 22096.60 kb/s\n encoded 600 frames, 352.59 fps, 22096.60 kb/s\n\n NO_NEXT_BUDDY NO_LB_BIAS\n encoded 600 frames, 425.75 fps, 22096.60 kb/s\n encoded 600 frames, 425.45 fps, 22096.60 kb/s\n encoded 600 frames, 422.49 fps, 22096.60 kb/s\n\nPeter pointed out that this is better done via newidle_idx,\nnot via LB_BIAS, newidle balancing should look for where\nthere is load _now_, not where there was load 2 ticks ago.\n\nWorst-case latencies are improved as well as no buddies\nmeans less vruntime spread. (as per prior lkml discussions)\n\nThis change improves kbuild-peak parallelism as well.\n\nReported-by: Jason Garrett-Glaser \u003cdarkshikari@gmail.com\u003e\nSigned-off-by: Mike Galbraith \u003cefault@gmx.de\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1253011667.9128.16.camel@marge.simson.net\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "78e7ed53c9f42f04f9401ada6f7047db60781676", "tree": "24f45333ce4479b27c96b425c7d09c080a26609f", "parents": [ "d7c33c4930f569caf6b2ece597432853c4151a45" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Sep 03 13:16:51 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 15 16:01:07 2009 +0200" }, "message": "sched: Tweak wake_idx\n\nWhen merging select_task_rq_fair() and sched_balance_self() we lost\nthe use of wake_idx, restore that and set them to 0 to make wake\nbalancing more aggressive.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c88d5910890ad35af283344417891344604f0438", "tree": "4e2025d569c3e03a7ec5163f0a9bc159114ee14e", "parents": [ "e9c8431185d6c406887190519f6dbdd112641686" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Sep 10 13:50:02 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 15 16:01:05 2009 +0200" }, "message": "sched: Merge select_task_rq_fair() and sched_balance_self()\n\nThe problem with wake_idle() is that is doesn\u0027t respect things like\ncpu_power, which means it doesn\u0027t deal well with SMT nor the recent\nRT interaction.\n\nTo cure this, it needs to do what sched_balance_self() does, which\nleads to the possibility of merging select_task_rq_fair() and\nsched_balance_self().\n\nModify sched_balance_self() to:\n\n - update_shares() when walking up the domain tree,\n (it only called it for the top domain, but it should\n have done this anyway), which allows us to remove\n this ugly bit from try_to_wake_up().\n\n - do wake_affine() on the smallest domain that contains\n both this (the waking) and the prev (the wakee) cpu for\n WAKE invocations.\n\nThen use the top-down balance steps it had to replace wake_idle().\n\nThis leads to the dissapearance of SD_WAKE_BALANCE and\nSD_WAKE_IDLE_FAR, with SD_WAKE_IDLE replaced with SD_BALANCE_WAKE.\n\nSD_WAKE_AFFINE needs SD_BALANCE_WAKE to be effective.\n\nTouch all topology bits to replace the old with new SD flags --\nplatforms might need re-tuning, enabling SD_BALANCE_WAKE\nconditionally on a NUMA distance seems like a good additional\nfeature, magny-core and small nehalem systems would want this\nenabled, systems with slow interconnects would not.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f86054c24565d09d1997f03192761dabf6b8a9c9", "tree": "64a48fd9d03b39932c768ea28eb8edf6cecbeaf1", "parents": [ "c91d7d54ea9e75ec18c733969ba16dd7ab94fc99", "33f82d141c897f39cd8bce592d88cb3c5af58342" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 20:03:54 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 20:03:54 2009 -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: (23 commits)\n at_hdmac: Rework suspend_late()/resume_early()\n PM: Reset transition_started at dpm_resume_noirq\n PM: Update kerneldoc comments in drivers/base/power/main.c\n PM: Add convenience macro to make switching to dev_pm_ops less error-prone\n hp-wmi: Switch driver to dev_pm_ops\n floppy: Switch driver to dev_pm_ops\n PM: Trivial fixes\n PM / Hibernate / Memory hotplug: Always use for_each_populated_zone()\n PM/Hibernate: Do not try to allocate too much memory too hard (rev. 2)\n PM/Hibernate: Do not release preallocated memory unnecessarily (rev. 2)\n PM/Hibernate: Rework shrinking of memory\n PM: Fix typo in label name s/Platofrm_finish/Platform_finish/\n PM: Run-time PM platform device bus support\n PM: Introduce core framework for run-time PM of I/O devices (rev. 17)\n Driver Core: Make PM operations a const pointer\n PM: Remove platform device suspend_late()/resume_early() V2\n USB: Rework musb suspend()/resume_early()\n I2C: Rework i2c-s3c2410 suspend_late()/resume() V2\n I2C: Rework i2c-pxa suspend_late()/resume_early()\n DMA: Rework txx9dmac suspend_late()/resume_early()\n ...\n\nFix trivial conflict in drivers/base/platform.c (due to same\nconstification patch being merged in both sides, along with some other\nPM work in the PM branch)\n" }, { "commit": "69def9f05dfce3281bb06599057e6b8097385d39", "tree": "7d826b22924268ddbfad101993b248996d40e2ec", "parents": [ "353f6dd2dec992ddd34620a94b051b0f76227379", "8e616fc8d343bd7f0f0a0c22407fdcb77f6d22b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 17:43:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 17:43:43 2009 -0700" }, "message": "Merge branch \u0027kvm-updates/2.6.32\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.32\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (202 commits)\n MAINTAINERS: update KVM entry\n KVM: correct error-handling code\n KVM: fix compile warnings on s390\n KVM: VMX: Check cpl before emulating debug register access\n KVM: fix misreporting of coalesced interrupts by kvm tracer\n KVM: x86: drop duplicate kvm_flush_remote_tlb calls\n KVM: VMX: call vmx_load_host_state() only if msr is cached\n KVM: VMX: Conditionally reload debug register 6\n KVM: Use thread debug register storage instead of kvm specific data\n KVM guest: do not batch pte updates from interrupt context\n KVM: Fix coalesced interrupt reporting in IOAPIC\n KVM guest: fix bogus wallclock physical address calculation\n KVM: VMX: Fix cr8 exiting control clobbering by EPT\n KVM: Optimize kvm_mmu_unprotect_page_virt() for tdp\n KVM: Document KVM_CAP_IRQCHIP\n KVM: Protect update_cr8_intercept() when running without an apic\n KVM: VMX: Fix EPT with WP bit change during paging\n KVM: Use kvm_{read,write}_guest_virt() to read and write segment descriptors\n KVM: x86 emulator: Add adc and sbb missing decoder flags\n KVM: Add missing #include\n ...\n" }, { "commit": "353f6dd2dec992ddd34620a94b051b0f76227379", "tree": "38f48b57f8f0f1bb05983ec32205fac9b8bab14c", "parents": [ "bb193c986a7104f718c1b92709e1e6e22ac3f864" ], "author": { "name": "Anirban Sinha", "email": "asinha@zeugmasystems.com", "time": "Mon Sep 14 11:13:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 17:41:42 2009 -0700" }, "message": "cleanup console_print()\n\nconsole_print() is an old legacy interface mostly unused in the entire\nkernel tree. It\u0027s best to clean up its existing use and let developers\nuse their own implementation of it as they feel fit.\n\nSigned-off-by: Anirban Sinha \u003casinha@zeugmasystems.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0cced40e7c58b1105aef3ca446da7b158a18a9a6", "tree": "401e554f0e69375833e6ef70651eacb44ed50909", "parents": [ "5959906ee9dee602a46e49c868a7e543e050d605" ], "author": { "name": "Hidetoshi Seto", "email": "[seto.hidetoshi@jp.fujitsu.com]", "time": "Thu Aug 06 14:51:58 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Sep 14 16:19:24 2009 -0700" }, "message": "[IA64] kdump: Short path to freeze CPUs\n\nSetting monarch_cpu \u003d -1 to let slaves frozen might not work, because\nthere might be slaves being late, not entered the rendezvous yet.\nSuch slaves might be caught in while (monarch_cpu \u003d\u003d -1) loop.\n\nUse kdump_in_progress instead of monarch_cpus to break INIT rendezvous\nand let all slaves enter DIE_INIT_SLAVE_LEAVE smoothly.\n\nAnd monarch no longer need to manage rendezvous if once kdump_in_progress\nis set, catch the monarch in DIE_INIT_MONARCH_ENTER then.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Haren Myneni \u003chbabu@us.ibm.com\u003e\nCc: kexec@lists.infradead.org\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "5959906ee9dee602a46e49c868a7e543e050d605", "tree": "8fe75fa3461aa83d4185d126755a90aa4be4d68a", "parents": [ "1726b0883dd08636705ea55d577eb0ec314ba427" ], "author": { "name": "Hidetoshi Seto", "email": "[seto.hidetoshi@jp.fujitsu.com]", "time": "Thu Aug 06 14:51:57 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Sep 14 16:19:10 2009 -0700" }, "message": "[IA64] kdump: Try INIT regardless of\n\nkdump_on_init\n\nCPUs should be frozen if possible, otherwise it might hinder kdump.\nSo if there are CPUs not respond to IPI, try INIT to stop them.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Haren Myneni \u003chbabu@us.ibm.com\u003e\nCc: kexec@lists.infradead.org\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "1726b0883dd08636705ea55d577eb0ec314ba427", "tree": "9fea054fe26a2849865017fb5163aa944315e1b9", "parents": [ "68cb14c7c46d9204ba451a534f15a8bc12c88e28" ], "author": { "name": "Hidetoshi Seto", "email": "[seto.hidetoshi@jp.fujitsu.com]", "time": "Thu Aug 06 14:51:57 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Sep 14 16:18:54 2009 -0700" }, "message": "[IA64] kdump: Mask INIT first in panic-kdump path\n\nSummary:\n\n Asserting INIT might block kdump if the system is already going to\n start kdump via panic.\n\nDescription:\n\n INIT can interrupt anywhere in panic path, so it can interrupt in\n middle of kdump kicked by panic. Therefore there is a race if kdump\n is kicked concurrently, via Panic and via INIT.\n\n INIT could fail to invoke kdump if the system is already going to\n start kdump via panic. It could not restart kdump from INIT handler\n if some of cpus are already playing dead with INIT masked. It also\n means that INIT could block kdump\u0027s progress if no monarch is entered\n in the INIT rendezvous.\n\n Panic+INIT is a rare, but possible situation since it can be assumed\n that the kernel or an internal agent decides to panic the unstable\n system while another external agent decides to send an INIT to the\n system at same time.\n\nHow to reproduce:\n\n Assert INIT just after panic, before all other cpus have frozen\n\nExpected results:\n\n continue kdump invoked by panic, or restart kdump from INIT\n\nActual results:\n\n might be hang, crashdump not retrieved\n\nProposed Fix:\n\n This patch masks INIT first in panic path to take the initiative on\n kdump, and reuse atomic value kdump_in_progress to make sure there is\n only one initiator of kdump. All INITs asserted later should be used\n only for freezing all other cpus.\n\n This mask will be removed soon by rfi in relocate_kernel.S, before jump\n into kdump kernel, after all cpus are frozen and no-op INIT handler is\n registered. So if INIT was in the interval while it is masked, it will\n pend on the system and will received just after the rfi, and handled by\n the no-op handler.\n\n If there was a MCA event while psr.mc is 1, in theory the event will\n pend on the system and will received just after the rfi same as above.\n MCA handler is unregistered here at the time, so received MCA will not\n reach to OS_MCA and will result in warmboot by SAL.\n\n Note that codes in this masked interval are relatively simpler than\n that in MCA/INIT handler which also executed with the mask. So it can\n be said that probability of error in this interval is supposed not so\n higher than that in MCA/INIT handler.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Haren Myneni \u003chbabu@us.ibm.com\u003e\nCc: kexec@lists.infradead.org\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "68cb14c7c46d9204ba451a534f15a8bc12c88e28", "tree": "2bdf1a3a46960687eaa8b0768f8275c7577893f9", "parents": [ "6cc3efcdf01cf874ffe770919395918a3ee9365b" ], "author": { "name": "Hidetoshi Seto", "email": "[seto.hidetoshi@jp.fujitsu.com]", "time": "Thu Aug 06 14:51:57 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Sep 14 16:18:37 2009 -0700" }, "message": "[IA64] kdump: Don\u0027t return APs to SAL from kdump\n\nSummary:\n\n Asserting INIT on cpu going to be offline will result in unexpected\n behavior. It will be a real problem in kdump cases where INIT might\n be asserted to unstable APs going to be offline by returning to SAL.\n\nDescription:\n\n Since psr.mc is cleared when bits in psr are set to SAL_PSR_BITS_TO_SET\n in ia64_jump_to_sal(), there is a small window (~few msecs) that the\n cpu can receive INIT even if the cpu enter there via INIT handler.\n In this window we do restore of registers for SAL, so INIT asserted\n here will not work properly.\n\n It is hard to remove this window by masking INIT (i.e. setting psr.mc)\n because we have to unmask it later in OS, because we have to use branch\n instruction (br.ret, not rfi) to return SAL, due to OS_BOOT_RENDEZ to\n SAL return convention.\n\n I suppose this window will not be a real problem on cpu offline if we\n can educate people not to push INIT button during hotplug operation.\n However, only exception is a race in kdump and INIT. Now kdump returns\n APs to SAL before processing dump, but the kernel might receive INIT at\n that point in time. Such INIT might be asserted by kdump itself if an\n AP doesn\u0027t react IPI soon and kdump decided to use INIT to stop the AP.\n Or it might be asserted by operator or an external agent to start dump\n on the unstable system.\n\n Such panic+INIT or INIT+INIT cases should be rare, but it will be happy\n if we can retrieve crashdump even in such cases.\n\nHow to reproduce:\n\n panic+INIT or INIT+INIT, with kdump configured\n\nExpected results:\n\n crashdump is retrieved anyway\n\nActual results:\n\n panic, hang etc. (unexpected)\n\nProposed fix\n\n To avoid the window on the way to SAL, this patch stops returning APs\n to SAL in case of kdump. In other words, this patch makes APs spin\n in OS instead of spinning in SAL.\n\n (* Note: What impact would be there? If a cpu is spinning in SAL,\n the cpu is in BOOT_RENDEZ loop, as same as offlined cpu.\n In theory if an INIT is asserted there, cpus in the BOOT_RENDEZ loop\n should not invoke OS_INIT on it. So in either way, no matter where\n the cpu is spinning actually in, once cpu starts spin and act as\n \"frozen,\" INIT on the cpu have no effects.\n From another point of view, all debug information on the cpu should\n have stored to memory before the cpu start to be frozen. So no more\n action on the cpu is required.)\n\n I confirmed that the kdump sometime hangs by concurrent INITs (another\n INIT after an INIT), and it doesn\u0027t hang after applying this patch.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Haren Myneni \u003chbabu@us.ibm.com\u003e\nCc: kexec@lists.infradead.org\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "6cc3efcdf01cf874ffe770919395918a3ee9365b", "tree": "96a04f965ea57eaba6625f5d91e069563ad6ebbc", "parents": [ "07a6a4ae827b54cec4c1b1d92bed1cc9176b45ec" ], "author": { "name": "Hidetoshi Seto", "email": "[seto.hidetoshi@jp.fujitsu.com]", "time": "Thu Aug 06 14:51:57 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Sep 14 16:18:17 2009 -0700" }, "message": "[IA64] kexec: Unregister MCA handler before kexec\n\nSummary:\n\n MCA on the beginning of kdump/kexec kernel will result in unexpected\n behavior because MCA handler for previous kernel is invoked on the\n kdump kernel.\n\nDescription:\n\n Once a cpu is passed to new kernel, all resources in previous kernel\n should not be used from the cpu. Even the resources for MCA handler\n are no exception. So we cannot handle MCAs and its machine check\n errors during kernel transition, until new handler for new kernel is\n registered with new resources ready for handling the MCA.\n\nHow to reproduce:\n\n Assert MCA while kdump kernel is booting, before new MCA handler for\n kdump kernel is registered.\n\nExpected(Desirable) results:\n\n No recovery, cancel kdump and reboot the system.\n\nActual results:\n\n MCA handler for previous kernel is invoked on the kdump kernel.\n \u003d\u003e panic, hang etc. (unexpected)\n\nProposed fix:\n\n To avoid entering MCA handler from early stage of new kernel,\n unregister the entry point from SAL before leave from current\n kernel. Then SAL will make all MCAs to warmboot safely, without\n invoking OS_MCA.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Haren Myneni \u003chbabu@us.ibm.com\u003e\nCc: kexec@lists.infradead.org\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "07a6a4ae827b54cec4c1b1d92bed1cc9176b45ec", "tree": "2be2a4a567e0fbd672cac86ebd06d4411e583e67", "parents": [ "4295ab34883d2070b1145e14f4619478e9788807" ], "author": { "name": "Hidetoshi Seto", "email": "[seto.hidetoshi@jp.fujitsu.com]", "time": "Thu Aug 06 14:51:56 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Sep 14 16:18:02 2009 -0700" }, "message": "[IA64] kexec: Make INIT safe while transition to\n\nkdump/kexec kernel\n\nSummary:\n\n Asserting INIT on the beginning of kdump/kexec kernel will result\n in unexpected behavior because INIT handler for previous kernel is\n invoked on new kernel.\n\nDescription:\n\n In panic situation, we can receive INIT while kernel transition,\n i.e. from beginning of panic to bootstrap of kdump kernel.\n Since we initialize registers on leave from current kernel, no\n longer monarch/slave handlers of current kernel in virtual mode are\n called safely. (In fact system goes hang as far as I confirmed)\n\nHow to Reproduce:\n\n Start kdump\n # echo c \u003e /proc/sysrq-trigger\n Then assert INIT while kdump kernel is booting, before new INIT\n handler for kdump kernel is registered.\n\nExpected(Desirable) result:\n\n kdump kernel boots without any problem, crashdump retrieved\n\nActual result:\n\n INIT handler for previous kernel is invoked on kdump kernel\n \u003d\u003e panic, hang etc. (unexpected)\n\nProposed fix:\n\n We can unregister these init handlers from SAL before jumping into\n new kernel, however then the INIT will fallback to default behavior,\n result in warmboot by SAL (according to the SAL specification) and\n we cannot retrieve the crashdump.\n\n Therefore this patch introduces a NOP init handler and register it\n to SAL before leave from current kernel, to start kdump safely by\n preventing INITs from entering virtual mode and resulting in warmboot.\n\n On the other hand, in case of kexec that not for kdump, it also\n has same problem with INIT while kernel transition.\n This patch handles this case differently, because for kexec\n unregistering handlers will be preferred than registering NOP\n handler, since the situation \"no handlers registered\" is usual\n state for kernel\u0027s entry.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Haren Myneni \u003chbabu@us.ibm.com\u003e\nCc: kexec@lists.infradead.org\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "4295ab34883d2070b1145e14f4619478e9788807", "tree": "59a0060b2bd74abcc5e972bf8b4fe569fc137f62", "parents": [ "74fca6a42863ffacaf7ba6f1936a9f228950f657" ], "author": { "name": "Hidetoshi Seto", "email": "[seto.hidetoshi@jp.fujitsu.com]", "time": "Thu Aug 06 14:51:56 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Mon Sep 14 16:17:05 2009 -0700" }, "message": "[IA64] kdump: Mask MCA/INIT on frozen cpus\n\nSummary:\n\n INIT asserted on kdump kernel invokes INIT handler not only on a\n cpu that running on the kdump kernel, but also BSP of the panicked\n kernel, because the (badly) frozen BSP can be thawed by INIT.\n\nDescription:\n\n The kdump_cpu_freeze() is called on cpus except one that initiates\n panic and/or kdump, to stop/offline the cpu (on ia64, it means we\n pass control of cpus to SAL, or put them in spinloop). Note that\n CPU0(BSP) always go to spinloop, so if panic was happened on an AP,\n there are at least 2cpus (\u003d the AP and BSP) which not back to SAL.\n\n On the spinning cpus, interrupts are disabled (rsm psr.i), but INIT\n is still interruptible because psr.mc for mask them is not set unless\n kdump_cpu_freeze() is not called from MCA/INIT context.\n\n Therefore, assume that a panic was happened on an AP, kdump was\n invoked, new INIT handlers for kdump kernel was registered and then\n an INIT is asserted. From the viewpoint of SAL, there are 2 online\n cpus, so INIT will be delivered to both of them. It likely means\n that not only the AP (\u003d a cpu executing kdump) enters INIT handler\n which is newly registered, but also BSP (\u003d another cpu spinning in\n panicked kernel) enters the same INIT handler. Of course setting of\n registers in BSP are still old (for panicked kernel), so what happen\n with running handler with wrong setting will be extremely unexpected.\n I believe this is not desirable behavior.\n\nHow to Reproduce:\n\n Start kdump on one of APs (e.g. cpu1)\n # taskset 0x2 echo c \u003e /proc/sysrq-trigger\n Then assert INIT after kdump kernel is booted, after new INIT handler\n for kdump kernel is registered.\n\nExpected results:\n\n An INIT handler is invoked only on the AP.\n\nActual results:\n\n An INIT handler is invoked on the AP and BSP.\n\nSample of results:\n\n I got following console log by asserting INIT after prompt \"root:/\u003e\".\n It seems that two monarchs appeared by one INIT, and one panicked at\n last. And it also seems that the panicked one supposed there were\n 4 online cpus and no one did rendezvous:\n\n :\n [ 0 %]dropping to initramfs shell\n exiting this shell will reboot your system\n root:/\u003e Entered OS INIT handler. PSP\u003dfff301a0 cpu\u003d0 monarch\u003d0\n ia64_init_handler: Promoting cpu 0 to monarch.\n Delaying for 5 seconds...\n All OS INIT slaves have reached rendezvous\n Processes interrupted by INIT - 0 (cpu 0 task 0xa000000100af0000)\n :\n \u003c\u003csnip\u003e\u003e\n :\n Entered OS INIT handler. PSP\u003dfff301a0 cpu\u003d0 monarch\u003d1\n Delaying for 5 seconds...\n mlogbuf_finish: printing switched to urgent mode, MCA/INIT might be dodgy or fail.\n OS INIT slave did not rendezvous on cpu 1 2 3\n INIT swapper 0[0]: bugcheck! 0 [1]\n :\n \u003c\u003csnip\u003e\u003e\n :\n Kernel panic - not syncing: Attempted to kill the idle task!\n\nProposed fix:\n\n To avoid this problem, this patch inserts ia64_set_psr_mc() to mask\n INIT on cpus going to be frozen. This masking have no effect if the\n kdump_cpu_freeze() is called from INIT handler when kdump_on_init \u003d\u003d 1,\n because psr.mc is already turned on to 1 before entering OS_INIT.\n I confirmed that weird log like above are disappeared after applying\n this patch.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Haren Myneni \u003chbabu@us.ibm.com\u003e\nCc: kexec@lists.infradead.org\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "ac8d513a6801c8636922ccf4f30211810c9a56ce", "tree": "83ba584487a6a612c8fcf2563c28c0263df35ba2", "parents": [ "bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd", "99bc47067910f7070e65ee318a6dd79a2371f1e5" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 14 20:26:05 2009 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 14 20:26:05 2009 +0200" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "d7e9660ad9d5e0845f52848bce31bcf5cdcdea6b", "tree": "c6c67d145771187b194d79d603742b31090a59d6", "parents": [ "b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca", "13af7a6ea502fcdd4c0e3d7de6e332b102309491" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -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: (1623 commits)\n netxen: update copyright\n netxen: fix tx timeout recovery\n netxen: fix file firmware leak\n netxen: improve pci memory access\n netxen: change firmware write size\n tg3: Fix return ring size breakage\n netxen: build fix for INET\u003dn\n cdc-phonet: autoconfigure Phonet address\n Phonet: back-end for autoconfigured addresses\n Phonet: fix netlink address dump error handling\n ipv6: Add IFA_F_DADFAILED flag\n net: Add DEVTYPE support for Ethernet based devices\n mv643xx_eth.c: remove unused txq_set_wrr()\n ucc_geth: Fix hangs after switching from full to half duplex\n ucc_geth: Rearrange some code to avoid forward declarations\n phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs\n drivers/net/phy: introduce missing kfree\n drivers/net/wan: introduce missing kfree\n net: force bridge module(s) to be GPL\n Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded\n ...\n\nFixed up trivial conflicts:\n\n - arch/x86/include/asm/socket.h\n\n converted to \u003casm-generic/socket.h\u003e in the x86 tree. The generic\n header has the same new #define\u0027s, so that works out fine.\n\n - drivers/net/tun.c\n\n fix conflict between 89f56d1e9 (\"tun: reuse struct sock fields\") that\n switched over to using \u0027tun-\u003esocket.sk\u0027 instead of the redundantly\n available (and thus removed) \u0027tun-\u003esk\u0027, and 2b980dbd (\"lsm: Add hooks\n to the TUN driver\") which added a new \u0027tun-\u003esk\u0027 use.\n\n Noted in \u0027next\u0027 by Stephen Rothwell.\n" }, { "commit": "eee2775d9924b22643bd89b2e568cc5eed7e8a04", "tree": "095ad7851895c5d39596f3ff7ee1e078235a2501", "parents": [ "53e16fbd30005905168d9b75555fdc7e0a2eac58", "7db905e636f08ea5bc9825c1f73d77802e8ccad5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:20:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:20:18 2009 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)\n rcu: Move end of special early-boot RCU operation earlier\n rcu: Changes from reviews: avoid casts, fix/add warnings, improve comments\n rcu: Create rcutree plugins to handle hotplug CPU for multi-level trees\n rcu: Remove lockdep annotations from RCU\u0027s _notrace() API members\n rcu: Add #ifdef to suppress __rcu_offline_cpu() warning in !HOTPLUG_CPU builds\n rcu: Add CPU-offline processing for single-node configurations\n rcu: Add \"notrace\" to RCU function headers used by ftrace\n rcu: Remove CONFIG_PREEMPT_RCU\n rcu: Merge preemptable-RCU functionality into hierarchical RCU\n rcu: Simplify rcu_pending()/rcu_check_callbacks() API\n rcu: Use debugfs_remove_recursive() simplify code.\n rcu: Merge per-RCU-flavor initialization into pre-existing macro\n rcu: Fix online/offline indication for rcudata.csv trace file\n rcu: Consolidate sparse and lockdep declarations in include/linux/rcupdate.h\n rcu: Renamings to increase RCU clarity\n rcu: Move private definitions from include/linux/rcutree.h to kernel/rcutree.h\n rcu: Expunge lingering references to CONFIG_CLASSIC_RCU, optimize on !SMP\n rcu: Delay rcu_barrier() wait until beginning of next CPU-hotunplug operation.\n rcu: Fix typo in rcu_irq_exit() comment header\n rcu: Make rcupreempt_trace.c look at offline CPUs\n ...\n" }, { "commit": "a66a50054e46ec2a03244bc14c48b9125fcd75a7", "tree": "ab549e4762a89d76846f104162d8f65b52c41a69", "parents": [ "7193bea53f9d9730bbc859777c2f86c76349914d", "695a461296e5df148c99ac087b9e1cb380f4db15" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:16:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:16:37 2009 -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: (59 commits)\n x86/gart: Do not select AGP for GART_IOMMU\n x86/amd-iommu: Initialize passthrough mode when requested\n x86/amd-iommu: Don\u0027t detach device from pt domain on driver unbind\n x86/amd-iommu: Make sure a device is assigned in passthrough mode\n x86/amd-iommu: Align locking between attach_device and detach_device\n x86/amd-iommu: Fix device table write order\n x86/amd-iommu: Add passthrough mode initialization functions\n x86/amd-iommu: Add core functions for pd allocation/freeing\n x86/dma: Mark iommu_pass_through as __read_mostly\n x86/amd-iommu: Change iommu_map_page to support multiple page sizes\n x86/amd-iommu: Support higher level PTEs in iommu_page_unmap\n x86/amd-iommu: Remove old page table handling macros\n x86/amd-iommu: Use 2-level page tables for dma_ops domains\n x86/amd-iommu: Remove bus_addr check in iommu_map_page\n x86/amd-iommu: Remove last usages of IOMMU_PTE_L0_INDEX\n x86/amd-iommu: Change alloc_pte to support 64 bit address space\n x86/amd-iommu: Introduce increase_address_space function\n x86/amd-iommu: Flush domains if address space size was increased\n x86/amd-iommu: Introduce set_dte_entry function\n x86/amd-iommu: Add a gneric version of amd_iommu_flush_all_devices\n ...\n" }, { "commit": "a3c8b97396ef42edfb845788ba6f53b2a93ce980", "tree": "530c5bdbc534618311dab3e0af245835af56db0f", "parents": [ "74fca6a42863ffacaf7ba6f1936a9f228950f657", "9f0ab4a3f0fdb1ff404d150618ace2fa069bb2e1" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 11 08:04:49 2009 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 11 08:04:49 2009 +1000" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "27c238106862fb0dd3e229c48c1ef56502b0ec88", "tree": "4e14454376a58947e67b308a5e682bfaff64d349", "parents": [ "da18acffc3f13c4f187c20bc5dcfcb110b374b48" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Aug 16 15:31:11 2009 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 10:46:48 2009 +0300" }, "message": "KVM: Add __KERNEL__ guards to exported headers\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "a1b37100d9e29c1f8dc3e2f5490a205c80180e01", "tree": "0e1448e35c8da68b865816a1173540f8e05234e4", "parents": [ "0b71785dc05f1f66e6268022b9953c0d6a9985c6" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Thu Jul 09 15:33:52 2009 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:33:13 2009 +0300" }, "message": "KVM: Reduce runnability interface with arch support code\n\nRemove kvm_cpu_has_interrupt() and kvm_arch_interrupt_allowed() from\ninterface between general code and arch code. kvm_arch_vcpu_runnable()\nchecks for interrupts instead.\n\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "bda9020e2463ec94db9f97e8615f3bae22069838", "tree": "48125316d4c0f419a35aefdfbf665d30ad0c55ca", "parents": [ "6c474694530f377507f9aca438c17206e051e6e7" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon Jun 29 22:24:32 2009 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:33:05 2009 +0300" }, "message": "KVM: remove in_range from io devices\n\nThis changes bus accesses to use high-level kvm_io_bus_read/kvm_io_bus_write\nfunctions. in_range now becomes unused so it is removed from device ops in\nfavor of read/write callbacks performing range checks internally.\n\nThis allows aliasing (mostly for in-kernel virtio), as well as better error\nhandling by making it possible to pass errors up to userspace.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "2023a29cbe34139afcea8f65f8aef78c325c5dc0", "tree": "142223b88f59710a366321a1b47b54b33ba8e19c", "parents": [ "46f43c6ee022c3aeb9686b104234b9f27fac03c2" ], "author": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Jun 18 11:47:28 2009 -0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:33:03 2009 +0300" }, "message": "KVM: remove old KVMTRACE support code\n\nReturn EOPNOTSUPP for KVM_TRACE_ENABLE/PAUSE/DISABLE ioctls.\n\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "ec04b2604c3707a46db1d26d98f82b11d0844669", "tree": "a7332c98d61b08b95ff4dc769f87c5861845ffe5", "parents": [ "f340ca0f065ecf3e7549687e763370106dacb2c2" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Fri Jun 19 15:16:23 2009 +0200" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:33:02 2009 +0300" }, "message": "KVM: Prepare memslot data structures for multiple hugepage sizes\n\n[avi: fix build on non-x86]\n\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "988a2cae6a3c0dea6df59808a935a9a697bfc28c", "tree": "c1118d86c5d6f24fe738c608917b0affb311f26d", "parents": [ "73880c80aa9c8dc353cd0ad26579023213cd5314" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Tue Jun 09 15:56:29 2009 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:32:52 2009 +0300" }, "message": "KVM: Use macro to iterate over vcpus.\n\n[christian: remove unused variables on s390]\n\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "73880c80aa9c8dc353cd0ad26579023213cd5314", "tree": "d5bee5c87c3468feb941cc898e342f52c0adce19", "parents": [ "1ed0ce000a6c20c36ec649e32fc24393ef418ed8" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Tue Jun 09 15:56:28 2009 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:32:52 2009 +0300" }, "message": "KVM: Break dependency between vcpu index in vcpus array and vcpu_id.\n\nArchs are free to use vcpu_id as they see fit. For x86 it is used as\nvcpu\u0027s apic id. New ioctl is added to configure boot vcpu id that was\nassumed to be 0 till now.\n\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "c5af89b68abb26eea5e745f33228f4d672f115e5", "tree": "aad12571ebedea7b869adbeec27e614c498715f4", "parents": [ "d555c333aa544b222fe077adcd5dfea024b2c913" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Tue Jun 09 15:56:26 2009 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:32:51 2009 +0300" }, "message": "KVM: Introduce kvm_vcpu_is_bsp() function.\n\nUse it instead of open code \"vcpu_id zero is BSP\" assumption.\n\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "fa40a8214bb9bcae8d49c234c19d8b4a6c1f37ff", "tree": "6449f27072f128a1c39faaaeef1787f754345aaf", "parents": [ "60eead79ad8750f80384cbe48fc44edcc78a0305" ], "author": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Jun 04 15:08:24 2009 -0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:32:49 2009 +0300" }, "message": "KVM: switch irq injection/acking data structures to irq_lock\n\nProtect irq injection/acking data structures with a separate irq_lock\nmutex. This fixes the following deadlock:\n\nCPU A CPU B\nkvm_vm_ioctl_deassign_dev_irq()\n mutex_lock(\u0026kvm-\u003elock); worker_thread()\n -\u003e kvm_deassign_irq() -\u003e kvm_assigned_dev_interrupt_work_handler()\n -\u003e deassign_host_irq() mutex_lock(\u0026kvm-\u003elock);\n -\u003e cancel_work_sync() [blocked]\n\n[gleb: fix ia64 path]\n\nReported-by: Alex Williamson \u003calex.williamson@hp.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "3032b925f00ba2653f7695d356d6f8284c82038d", "tree": "8f9523d50b3afe8ed3d426964a26dd70e54c2e9a", "parents": [ "c5ff41ce66382d657a76bc06ba252d848826950f" ], "author": { "name": "Jes Sorensen", "email": "jes@sgi.com", "time": "Mon May 25 10:22:17 2009 +0200" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:32:42 2009 +0300" }, "message": "KVM: ia64: Correct itc_offset calculations\n\nInit the itc_offset for all possible vCPUs. The current code by\nmistake ends up only initializing the offset on vCPU 0.\n\nSpotted by Gleb Natapov.\n\nSigned-off-by: Jes Sorensen \u003cjes@sgi.com\u003e\nAcked-by : Xiantao Zhang \u003cxiantao.zhang@intel.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "0ba12d10817a8db1fd7d96d3283ec6c0b294aeab", "tree": "e99c7e1193c0b939becf39f440f3364ac3753e81", "parents": [ "787ff73637bbf34ef276cb04a127b421de71cc43" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu May 21 16:45:19 2009 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Sep 10 08:32:41 2009 +0300" }, "message": "KVM: Move common KVM Kconfig items to new file virt/kvm/Kconfig\n\nReduce Kconfig code duplication.\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd", "tree": "d67f525c76b66956ba7ca0d40bc0fcda0e414700", "parents": [ "9d7302299ee96ca954fe4ab8ca640333b6e19ad0", "7135a71b19be1faf48b7148d77844d03bc0717d6" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Sep 10 00:02:02 2009 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Sep 10 00:02:02 2009 +0200" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "a7db50405216610c8a0d62b8b400180b6f366733", "tree": "d86aeb344ce4966cf2f7b69c1ec1cd5111372545", "parents": [ "7135a71b19be1faf48b7148d77844d03bc0717d6" ], "author": { "name": "Alex Chiang", "email": "achiang@hp.com", "time": "Mon Jun 22 08:08:07 2009 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Sep 09 13:29:18 2009 -0700" }, "message": "PCI: remove pcibios_scan_all_fns()\n\nThis was #define\u0027d as 0 on all platforms, so let\u0027s get rid of it.\n\nThis change makes pci_scan_slot() slightly easier to read.\n\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nReviewed-by: Matthew Wilcox \u003cwilly@linux.intel.com\u003e\nAcked-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Alex Chiang \u003cachiang@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "695a461296e5df148c99ac087b9e1cb380f4db15", "tree": "951893036fdc0b7bae0e17bc739ac8ffe909781d", "parents": [ "c7084b35eb1a4d3353a501508baf9d3d82822c93", "2b681fafcc50fea6304ed418667c9d04282acb73" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Sep 04 14:44:16 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Sep 04 14:44:16 2009 +0200" }, "message": "Merge branch \u0027amd-iommu/2.6.32\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu\n" }, { "commit": "5afe18d2f58812f3924edbd215464e5e3e8545e7", "tree": "52d2b9272cce5b3343317c56ba408dd3c28d4331", "parents": [ "f2486f26692433ba27cc10991a085b503b0422a3" ], "author": { "name": "Jiri Bohac", "email": "jbohac@suse.cz", "time": "Wed Sep 02 11:00:46 2009 +0200" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Sep 02 09:14:48 2009 -0700" }, "message": "[IA64] fix csum_ipv6_magic()\n\nThe 32-bit parameters (len and csum) of csum_ipv6_magic() are passed in 64-bit\nregisters in2 and in4. The high order 32 bits of the registers were never\ncleared, and garbage was sometimes calculated into the checksum.\n\nFix this by clearing the high order 32 bits of these registers.\n\nSigned-off-by: Jiri Bohac \u003cjbohac@suse.cz\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "f2486f26692433ba27cc10991a085b503b0422a3", "tree": "cca05a34a2d647890c27ad609a8bf0f543e0a70c", "parents": [ "37d0892c5a94e208cf863e3b7bac014edee4346d" ], "author": { "name": "Luck, Tony", "email": "tony.luck@intel.com", "time": "Mon Aug 31 16:54:03 2009 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Sep 02 09:12:21 2009 -0700" }, "message": "[IA64] Fix warning in dma-mapping.c\n\narch/ia64/kernel/dma-mapping.c:14: warning: control reaches end of non-void function\narch/ia64/kernel/dma-mapping.c:14: warning: no return statement in function returning non-void\n\nThis warning was introduced by commit: 390bd132b2831a2ad0268e84bffbfc0680debfe5\n\tAdd dma_debug_init() for ia64\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "ee18d64c1f632043a02e6f5ba5e045bb26a5465f", "tree": "80b5a4d530ec7d5fd69799920f0db7b78aba6b9d", "parents": [ "d0420c83f39f79afb82010c2d2cafd150eef651b" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Sep 02 09:14:21 2009 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Sep 02 21:29:22 2009 +1000" }, "message": "KEYS: Add a keyctl to install a process\u0027s session keyring on its parent [try #6]\n\nAdd a keyctl to install a process\u0027s session keyring onto its parent. This\nreplaces the parent\u0027s session keyring. Because the COW credential code does\nnot permit one process to change another process\u0027s credentials directly, the\nchange is deferred until userspace next starts executing again. Normally this\nwill be after a wait*() syscall.\n\nTo support this, three new security hooks have been provided:\ncred_alloc_blank() to allocate unset security creds, cred_transfer() to fill in\nthe blank security creds and key_session_to_parent() - which asks the LSM if\nthe process may replace its parent\u0027s session keyring.\n\nThe replacement may only happen if the process has the same ownership details\nas its parent, and the process has LINK permission on the session keyring, and\nthe session keyring is owned by the process, and the LSM permits it.\n\nNote that this requires alteration to each architecture\u0027s notify_resume path.\nThis has been done for all arches barring blackfin, m68k* and xtensa, all of\nwhich need assembly alteration to support TIF_NOTIFY_RESUME. This allows the\nreplacement to be performed at the point the parent process resumes userspace\nexecution.\n\nThis allows the userspace AFS pioctl emulation to fully emulate newpag() and\nthe VIOCSETTOK and VIOCSETTOK2 pioctls, all of which require the ability to\nalter the parent process\u0027s PAG membership. However, since kAFS doesn\u0027t use\nPAGs per se, but rather dumps the keys into the session keyring, the session\nkeyring of the parent must be replaced if, for example, VIOCSETTOK is passed\nthe newpag flag.\n\nThis can be tested with the following program:\n\n\t#include \u003cstdio.h\u003e\n\t#include \u003cstdlib.h\u003e\n\t#include \u003ckeyutils.h\u003e\n\n\t#define KEYCTL_SESSION_TO_PARENT\t18\n\n\t#define OSERROR(X, S) do { if ((long)(X) \u003d\u003d -1) { perror(S); exit(1); } } while(0)\n\n\tint main(int argc, char **argv)\n\t{\n\t\tkey_serial_t keyring, key;\n\t\tlong ret;\n\n\t\tkeyring \u003d keyctl_join_session_keyring(argv[1]);\n\t\tOSERROR(keyring, \"keyctl_join_session_keyring\");\n\n\t\tkey \u003d add_key(\"user\", \"a\", \"b\", 1, keyring);\n\t\tOSERROR(key, \"add_key\");\n\n\t\tret \u003d keyctl(KEYCTL_SESSION_TO_PARENT);\n\t\tOSERROR(ret, \"KEYCTL_SESSION_TO_PARENT\");\n\n\t\treturn 0;\n\t}\n\nCompiled and linked with -lkeyutils, you should see something like:\n\n\t[dhowells@andromeda ~]$ keyctl show\n\tSession Keyring\n\t -3 --alswrv 4043 4043 keyring: _ses\n\t355907932 --alswrv 4043 -1 \\_ keyring: _uid.4043\n\t[dhowells@andromeda ~]$ /tmp/newpag\n\t[dhowells@andromeda ~]$ keyctl show\n\tSession Keyring\n\t -3 --alswrv 4043 4043 keyring: _ses\n\t1055658746 --alswrv 4043 4043 \\_ user: a\n\t[dhowells@andromeda ~]$ /tmp/newpag hello\n\t[dhowells@andromeda ~]$ keyctl show\n\tSession Keyring\n\t -3 --alswrv 4043 4043 keyring: hello\n\t340417692 --alswrv 4043 4043 \\_ user: a\n\nWhere the test program creates a new session keyring, sticks a user key named\n\u0027a\u0027 into it and then installs it on its parent.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f71bb0ac5e85410601b0db29d7b1635345ea61a4", "tree": "7c3ef70ef008db87d8b71e5de0632766ecd64d2f", "parents": [ "7285dd7fd375763bfb8ab1ac9cf3f1206f503c16", "a42548a18866e87092db93b771e6c5b060d78401" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Aug 29 10:34:18 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Aug 29 10:34:29 2009 +0200" }, "message": "Merge branch \u0027timers/posixtimers\u0027 into timers/tracing\n\nMerge reason: timer tracepoint patches depend on both branches\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "15b8dd53f5ffaf8e2d9095c423f713423f576c0f", "tree": "773f09435b14a810372642502352d46c29b6f148", "parents": [ "9c61b34cf7078da72cce276ff8cfae5d6e9955bc" ], "author": { "name": "Bob Moore", "email": "robert.moore@intel.com", "time": "Mon Jun 29 13:39:29 2009 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Thu Aug 27 10:17:15 2009 -0400" }, "message": "ACPICA: Major update for acpi_get_object_info external interface\n\nCompleted a major update for the acpi_get_object_info external interface.\nChanges include:\n - Support for variable, unlimited length HID, UID, and CID strings\n - Support Processor objects the same as Devices (HID,UID,CID,ADR,STA, etc.)\n - Call the _SxW power methods on behalf of a device object\n - Determine if a device is a PCI root bridge\n - Change the ACPI_BUFFER parameter to ACPI_DEVICE_INFO.\nThese changes will require an update to all callers of this interface.\nSee the ACPICA Programmer Reference for details.\n\nAlso, update all invocations of acpi_get_object_info interface\n\nSigned-off-by: Bob Moore \u003crobert.moore@intel.com\u003e\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "b855192c08fcb14adbc5d3a7cab182022d433cca", "tree": "3a10cafbfbf98cafacf667eb218c71300b351bfa", "parents": [ "d886c73cd4cf02a71e1650cbcb6176799d78aac1", "3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Aug 26 17:17:51 2009 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Aug 26 17:24:28 2009 -0700" }, "message": "Merge branch \u0027x86/urgent\u0027 into x86/pat\n\nReason: Change to is_new_memtype_allowed() in x86/urgent\n\nResolved semantic conflicts in:\n\n\t arch/x86/mm/pat.c\n\t arch/x86/mm/ioremap.c\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "46cf98cdaef5471926010b5bddf84c44ec177fdd", "tree": "e4be7eb533b1d6bb090ceaa8b1a50c0970bf0ef2", "parents": [ "335ef896d4c6639849d79367f0fef9abc06d121b" ], "author": { "name": "Venkatesh Pallipadi", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Jul 10 09:57:37 2009 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Aug 26 15:41:22 2009 -0700" }, "message": "x86, pat: Generalize the use of page flag PG_uncached\n\nOnly IA64 was using PG_uncached as of now. We now intend to use this bit\nin x86 as well, to keep track of memory type of those addresses that\nhave page struct for them. So, generalize the use of that bit across\nia64 and x86.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "a157229cabd6dd8cfa82525fc9bf730c94cc9ac2", "tree": "886013efc2f25dab915640acf46151fac7ae57b4", "parents": [ "22f00b69f6a7e1e18e821979a23e8307c2de9888" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sat Aug 22 13:56:51 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 23 10:32:39 2009 +0200" }, "message": "rcu: Simplify rcu_pending()/rcu_check_callbacks() API\n\nAll calls from outside RCU are of the form:\n\n\tif (rcu_pending(cpu))\n\t\trcu_check_callbacks(cpu, user);\n\nThis is silly, instead we put a call to rcu_pending() in\nrcu_check_callbacks(), and then make the outside calls be to\nrcu_check_callbacks(). This cuts down on the code a bit and\nalso gives the compiler a better chance of optimizing.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: laijs@cn.fujitsu.com\nCc: dipankar@in.ibm.com\nCc: akpm@linux-foundation.org\nCc: mathieu.desnoyers@polymtl.ca\nCc: josht@linux.vnet.ibm.com\nCc: dvhltc@us.ibm.com\nCc: niv@us.ibm.com\nCc: peterz@infradead.org\nCc: rostedt@goodmis.org\nLKML-Reference: \u003c125097461311-git-send-email-\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3e2bcad89814030ad6a369a97ad1481fd35938d3", "tree": "8d6b9b163dc9ed44ec377ca5b57be1a1fb80f923", "parents": [ "dcbf77cac640af0ab944d5cbb07934bf6708b4d9", "b2add73dbf93fd50f00564d7abc3e2b9aa9dd20c" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Aug 16 11:50:10 2009 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Aug 16 11:50:10 2009 +0200" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c", "tree": "04c93f391a1b65c8bf8d7ba8643c07d26c26590a", "parents": [ "a76761b621bcd8336065c4fe3a74f046858bc34c", "142d44b0dd6741a64a7bdbe029110e7c1dcf1d23" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 14:41:02 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 14:45:31 2009 +0900" }, "message": "Merge branch \u0027percpu-for-linus\u0027 into percpu-for-next\n\nConflicts:\n\tarch/sparc/kernel/smp_64.c\n\tarch/x86/kernel/cpu/perf_counter.c\n\tarch/x86/kernel/setup_percpu.c\n\tdrivers/cpufreq/cpufreq_ondemand.c\n\tmm/percpu.c\n\nConflicts in core and arch percpu codes are mostly from commit\ned78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many\nnum_possible_cpus() with nr_cpu_ids. As for-next branch has moved all\nthe first chunk allocators into mm/percpu.c, the changes are moved\nfrom arch code to mm/percpu.c.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "ba6c548701ef7a93b9ea05d1506d2b62f1628333", "tree": "da91ea24ed01a4c0214b743fe7dfd01344f1fbcb", "parents": [ "5fe60f4e5871b64e687229199fafd4ef13cd0886" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Aug 13 18:18:00 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Aug 13 18:18:00 2009 +0100" }, "message": "ia64: IOMMU passthrough mode shouldn\u0027t trigger swiotlb init\n\nSince commit 19943b0e30b05d42e494ae6fef78156ebc8c637e (\u0027intel-iommu:\nUnify hardware and software passthrough support\u0027), hardware passthrough\nmode will do the same as software passthrough mode was doing -- it\u0027ll\nstill use the IOMMU normally for devices which can\u0027t address all of\nmemory. This means that we don\u0027t need to bother with swiotlb.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "aa11d958d1a6572eda08214d7c6a735804fe48a5", "tree": "d025b05270ad1e010660d17eeadc6ac3c1abbd7d", "parents": [ "07f6642ee9418e962e54cbc07471cfe2e559c568", "9799218ae36910af50f002a5db1802d576fffb43" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tarch/microblaze/include/asm/socket.h\n" }, { "commit": "e7369e01eb85550ed60dd1b0e120b69dfb03dc23", "tree": "a833d98ed9388f3a1d1072fb73cea1ac529256f0", "parents": [ "5359dffd4396f281c5b77de1acbee6fb1b333b23" ], "author": { "name": "Roel Kluin", "email": "[roel.kluin@gmail.com]", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "message": "arch/ia64/kernel/iosapic: missing test after ioremap()\n\nMissing test after ioremap()\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "5359dffd4396f281c5b77de1acbee6fb1b333b23", "tree": "2f54bb01bc9c721636788a9ff5d4f47ee7c8fc9e", "parents": [ "bf2a4c7270b9a22243a91ab5efcc47aaf997c66b" ], "author": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "message": "ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails\n\nMake cache_add_dev exit sysfs when kobject_init_and_add returns an error.\n\nSigned-off-by: Xiaotian Feng \u003cdfeng@redhat.com\u003e\nSigned-off-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "bf2a4c7270b9a22243a91ab5efcc47aaf997c66b", "tree": "be5393189eccb6a3cc12268ec2bf26b047745c7c", "parents": [ "b5a8879347bbe68bd24c8870503bf6a0362da26b" ], "author": { "name": "Fenghua Yu", "email": "[fenghua.yu@intel.com]", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "message": "arch/ia64/Makefile: Remove -mtune\u003dmerced in IA64 kernel build\n\nBetween GCC version 3.4.0 and 4.3.3 (including 3.4.0 and 4.3.3), -mtune\u003dmerced\nis implemented in GCC. Starting from 4.4.0, -mtune\u003dmerced is deprecated.\n\nEven implemented in versions between 3.4.0 and 4.3.3, the -mtune\u003dmerced\nfeature has been broken in some of the versions. For example, GCC 4.1.2 reports\ninteranl tuning function errors during kernel building with -mtune\u003dmerced. Or\nGCC Bugzilla 16130 reports another -mtune\u003dmerced issue on GCC 3.4.1.\n\nSo I would remove the -mtune\u003dmerced from IA64 kernel build. Without this option,\nkernel on Merced will remain the same except losing an unstable and out-of-date\nperformance tunning feature.\n\nSince GCC version 3.4.0, -mtune\u003dmckinley has been implemented. The\n-mtune\u003dmckinley option functions the same as mtune\u003ditanium2. And mtune\u003ditanium2\nis the default option. So we don\u0027t need to add mtune\u003dmckinley either since its\nbeen the default option in any GCC version which implements this option.\n\nSigned-off-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "b5a8879347bbe68bd24c8870503bf6a0362da26b", "tree": "fb89816655d8a92e6701724943760fca3d3dde41", "parents": [ "cfa5f809e399c699974ba6018eefa022bbc2e16e" ], "author": { "name": "Jaswinder Singh Rajput", "email": "[jaswinder@kernel.org]", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Tue Aug 11 14:52:11 2009 -0700" }, "message": "IA64: includecheck fix: ia64, pgtable.h\n\nfix the following \u0027make includecheck\u0027 warning:\n\n arch/ia64/include/asm/pgtable.h: asm/processor.h is included more than once.\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "cfa5f809e399c699974ba6018eefa022bbc2e16e", "tree": "1667615979c8ca634f528c1e43566020874a1feb", "parents": [ "8d6f9af91959256244878cd801c1c969e66cd093" ], "author": { "name": "Jaswinder Singh Rajput", "email": "[jaswinder@kernel.org]", "time": "Tue Aug 11 14:52:10 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Tue Aug 11 14:52:10 2009 -0700" }, "message": "IA64: includecheck fix: ia64, ia64_ksyms.c\n\nfix the following \u0027make includecheck\u0027 warning:\n\n arch/ia64/kernel/ia64_ksyms.c: asm/page.h is included more than once.\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "8d6f9af91959256244878cd801c1c969e66cd093", "tree": "bd1dde34d4a3ef472d0a35d05b11320f762fd51f", "parents": [ "51b89f7a6615eca184aa0b85db5781d931e9c8d1" ], "author": { "name": "Johannes Weiner", "email": "[hannes@cmpxchg.org]", "time": "Tue Aug 11 14:52:10 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Tue Aug 11 14:52:10 2009 -0700" }, "message": "ia64: boolean __test_and_clear_bit\n\n__test_and_clear_bit() returns a bitfield with the tested-for bit set.\nMake it consistent with the other bitops - of ia64 but also every\nother architecture - and return a boolean value.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" } ], "next": "51b89f7a6615eca184aa0b85db5781d931e9c8d1" }