)]}' { "log": [ { "commit": "b2fa47e6bf5148aa6dbf22ec79f18141b421eeba", "tree": "8786785aefa2fbbc33fa590ac4b9a58947c2aac8", "parents": [ "2d42552d1c1659b014851cf449ad2fe458509128" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:40 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:31 2011 +0200" }, "message": "[S390] refactor page table functions for better pgste support\n\nRework the architecture page table functions to access the bits in the\npage table extension array (pgste). There are a number of changes:\n1) Fix missing pgste update if the attach_count for the mm is \u003c\u003d 1.\n2) For every operation that affects the invalid bit in the pte or the\n rcp byte in the pgste the pcl lock needs to be acquired. The function\n pgste_get_lock gets the pcl lock and returns the current pgste value\n for a pte pointer. The function pgste_set_unlock stores the pgste\n and releases the lock. Between these two calls the bits in the pgste\n can be shuffled.\n3) Define two software bits in the pte _PAGE_SWR and _PAGE_SWC to avoid\n calling SetPageDirty and SetPageReferenced from pgtable.h. If the\n host reference backup bit or the host change backup bit has been\n set the dirty/referenced state is transfered to the pte. The common\n code will pick up the state from the pte.\n4) Add ptep_modify_prot_start and ptep_modify_prot_commit for mprotect.\n5) Remove pgd_populate_kernel, pud_populate_kernel, pmd_populate_kernel\n pgd_clear_kernel, pud_clear_kernel, pmd_clear_kernel and ptep_invalidate.\n6) Rename kvm_s390_test_and_clear_page_dirty to\n ptep_test_and_clear_user_dirty and add ptep_test_and_clear_user_young.\n7) Define mm_exclusive() and mm_has_pgste() helper to improve readability.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "2d42552d1c1659b014851cf449ad2fe458509128", "tree": "b9ef22867ce52e23b5249a7ad38637eec40363b8", "parents": [ "c26001d4e9133fe45e47eee18cfd826219e71fb9" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:39 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:31 2011 +0200" }, "message": "[S390] merge page_test_dirty and page_clear_dirty\n\nThe page_clear_dirty primitive always sets the default storage key\nwhich resets the access control bits and the fetch protection bit.\nThat will surprise a KVM guest that sets non-zero access control\nbits or the fetch protection bit. Merge page_test_dirty and\npage_clear_dirty back to a single function and only clear the\ndirty bit from the storage key.\n\nIn addition move the function page_test_and_clear_dirty and\npage_test_and_clear_young to page.h where they belong. This\nrequires to change the parameter from a struct page * to a page\nframe number.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "c26001d4e9133fe45e47eee18cfd826219e71fb9", "tree": "d6a26a82dc436aa8e89a32b03e48bfb1a4e0cdff", "parents": [ "1b60f68f6674ecc5c86f7dfe7e87941bc4236b9b" ], "author": { "name": "Jan Glauber", "email": "jang@linux.vnet.ibm.com", "time": "Mon May 23 10:24:38 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:31 2011 +0200" }, "message": "[S390] qdio: prevent compile warning\n\nPrevent the following compile warning for !CONFIG_64BIT:\n\n CC drivers/s390/cio/qdio_main.o\ndrivers/s390/cio/qdio_main.c: In function ‘handle_outbound’:\ndrivers/s390/cio/qdio_main.c:1449: warning: ‘state’ may be used uninitialized in this function\n\nSigned-off-by: Jan Glauber \u003cjang@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "1b60f68f6674ecc5c86f7dfe7e87941bc4236b9b", "tree": "7e465e4a294f6f9cca5938d7b5865b7857a965ab", "parents": [ "0f1959f50646612b247d624bdbf8b0c8816f2a93" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:37 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:31 2011 +0200" }, "message": "[S390] sclp: remove unnecessary sendmask check\n\nThe sendmask check is not needed. Remove it.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "0f1959f50646612b247d624bdbf8b0c8816f2a93", "tree": "450c9765dc1fef51a35c1a389cdf26ed5ed89ee1", "parents": [ "7dd8fe1f910f9644167ef91ddab44107d0d668c5" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon May 23 10:24:36 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:31 2011 +0200" }, "message": "[S390] convert old cpumask API into new one\n\nAdapt new API.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "7dd8fe1f910f9644167ef91ddab44107d0d668c5", "tree": "4dea8d9be416c839f5270f5caefb8ed393267fa8", "parents": [ "f2db2e6cb3f5f766cbb3788af44705685ff2445a" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:35 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:30 2011 +0200" }, "message": "[S390] pfault: cleanup code\n\nSmall code cleanup.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "f2db2e6cb3f5f766cbb3788af44705685ff2445a", "tree": "11fbf5522f332e13f9bfb6cf4552513e4d865003", "parents": [ "b456d94a9757db54eca4677c1b3a13e7170c9bb3" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:34 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] pfault: cpu hotplug vs missing completion interrupts\n\nOn cpu hot remove a PFAULT CANCEL command is sent to the hypervisor\nwhich in turn will cancel all outstanding pfault requests that have\nbeen issued on that cpu (the same happens with a SIGP cpu reset).\n\nThe result is that we end up with uninterruptible processes where\nthe interrupt that would wake up these processes never arrives.\n\nIn order to solve this all processes which wait for a pfault\ncompletion interrupt get woken up after a cpu hot remove. The worst\ncase that could happen is that they fault again and in turn need to\nwait again.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "b456d94a9757db54eca4677c1b3a13e7170c9bb3", "tree": "9e7dbf5e0df6bbcd2d7c77a04efcc369138e0f61", "parents": [ "4c2241fd42298007d7c3a92318806a4a9490a93c" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:33 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] smp: add __noreturn attribute to cpu_die()\n\nAdd missing __noreturn attribute to cpu_die():\n\narch/s390/kernel/smp.c:691:6: error: symbol \u0027cpu_die\u0027 redeclared with different type\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "4c2241fd42298007d7c3a92318806a4a9490a93c", "tree": "13e9af56e8f0badae7c8a238901e542163c115e2", "parents": [ "add7490c273650c3aa8012f3e082aa64af86f17c" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:32 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] percpu: implement arch specific irqsafe_cpu_ops\n\nImplement arch specific irqsafe_cpu ops. The arch specific ops do not\ndisable/enable interrupts since that is an expensive operation. Instead\nwe disable preemption and perform a compare and swap loop.\nSince on server distros (the ones we care about) preemption is disabled\nthe preempt_disable()/preempt_enable() pair is a nop.\nIn the end this code should be faster than the generic one.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "add7490c273650c3aa8012f3e082aa64af86f17c", "tree": "80dbc7913434d8b56235f1f0fc4e172152fa13b0", "parents": [ "cf2d007bd43bc254d5254fe9d30af3e73ed5b98a" ], "author": { "name": "Peter Oberparleiter", "email": "peter.oberparleiter@de.ibm.com", "time": "Mon May 23 10:24:31 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] vdso: disable gcov profiling\n\nThe concepts of VDSO and gcov-based profiling don\u0027t mix: the former\nincludes kernel-provided code running in userspace, the latter adds\ninstructions that modify counters in kernel data segments. On s390\nthis has not been a problem so far due to VDSO code being written in\nall-assembler which is exempt from gcov-based profiling. This could\nchange in the future, so disable profiling excplicitly for VDSO code.\n\nSigned-off-by: Peter Oberparleiter \u003cpeter.oberparleiter@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "cf2d007bd43bc254d5254fe9d30af3e73ed5b98a", "tree": "f2aebec990dbfcd105380cde3ef81db8aafcdbcd", "parents": [ "89db4df160948d005b5efce82ef10f25ab5aac8b" ], "author": { "name": "Holger Dengler", "email": "hd@linux.vnet.ibm.com", "time": "Mon May 23 10:24:30 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] ap: skip device registration on type probe failure\n\nThe registration of an ap device will be skipped, if the device type\nprobing fails.\nAdd names of current crypto adapters to the Kconfig help.\n\nSigned-off-by: Holger Dengler \u003chd@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "89db4df160948d005b5efce82ef10f25ab5aac8b", "tree": "ce1baaf67ada08d9bb0395d923a368020084e7b7", "parents": [ "160fbf2e92cccbc1dccb4f837f5174808b2636d2" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] extmem: get rid of compile warning\n\nGet rid of these:\n\narch/s390/mm/extmem.c: In function \u0027segment_modify_shared\u0027:\narch/s390/mm/extmem.c:622:3: warning: \u0027end_addr\u0027 may be used uninitialized in this function [-Wuninitialized]\narch/s390/mm/extmem.c:627:18: warning: \u0027start_addr\u0027 may be used uninitialized in this function [-Wuninitialized]\narch/s390/mm/extmem.c: In function \u0027segment_load\u0027:\narch/s390/mm/extmem.c:481:11: warning: \u0027end_addr\u0027 may be used uninitialized in this function [-Wuninitialized]\narch/s390/mm/extmem.c:480:18: warning: \u0027start_addr\u0027 may be used uninitialized in this function [-Wuninitialized]\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "160fbf2e92cccbc1dccb4f837f5174808b2636d2", "tree": "a2106a49721a74711bb3015e6180ba80f522200f", "parents": [ "37fa9975b28a2d86a5b47ec17e6d845dbd899c60" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:28 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] tape: remove unused/not handled return codes\n\nReturn codes are on purpose not handled or used. So remove them.\n\nAcked-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "37fa9975b28a2d86a5b47ec17e6d845dbd899c60", "tree": "d3fe0ff79321e99daeda1533f847ec6026cdad43", "parents": [ "364c18d817a6beb3303e6b8f28ea37d9c06ff382" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:27 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:29 2011 +0200" }, "message": "[S390] monwriter: fix return code handling\n\nFix return code handling within monwrite_new_hdr(). Return code handling\nis everwhere implemented, the return code of the diagnose function was\njust not passed.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "364c18d817a6beb3303e6b8f28ea37d9c06ff382", "tree": "6089e8ee580db186bdb6f20d813deea2e8c3874d", "parents": [ "7712f83aa904fef0d7d6e5ba7684c3272bddbb19" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:26 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:28 2011 +0200" }, "message": "[S390] dasd: fix return code handling\n\nCheck return value of itcw_add_dcw() for error code and return it.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "7712f83aa904fef0d7d6e5ba7684c3272bddbb19", "tree": "39bf9b46fbe385eb7cb44118be12f6637b83659f", "parents": [ "66ceed5ad1318863c21710f316942bcefff8081c" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:25 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:28 2011 +0200" }, "message": "[S390] get rid of unused variables\n\nRemove trivially unused variables as detected with -Wunused-but-set-variable.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "66ceed5ad1318863c21710f316942bcefff8081c", "tree": "6d9e29f7ea129b1b599720ae7957ca364f3750b8", "parents": [ "043d07084b5347a26eab0a07aa13a4a929ad9e71" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon May 23 10:24:24 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:28 2011 +0200" }, "message": "[S390] Remove tape block device driver.\n\nRemove the tape block device driver. It\u0027s not of real use but has\nalready created some confusion when users wanted to access tape devices\nand used the block device nodes instead of the character device nodes.\n\nAlso remove the whole tape documentation since it\u0027s completely outdated\nand we have the device drivers book which is the place where everything\nis properly documented.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "043d07084b5347a26eab0a07aa13a4a929ad9e71", "tree": "13c2a902ccb2ecb779722c8b81ada32d242760c8", "parents": [ "9bf05098ce34e68a9e15f09ad6cdfea4ed64057a" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:23 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:24:28 2011 +0200" }, "message": "[S390] Remove data execution protection\n\nThe noexec support on s390 does not rely on a bit in the page table\nentry but utilizes the secondary space mode to distinguish between\nmemory accesses for instructions vs. data. The noexec code relies\non the assumption that the cpu will always use the secondary space\npage table for data accesses while it is running in the secondary\nspace mode. Up to the z9-109 class machines this has been the case.\nUnfortunately this is not true anymore with z10 and later machines.\nThe load-relative-long instructions lrl, lgrl and lgfrl access the\nmemory operand using the same addressing-space mode that has been\nused to fetch the instruction.\nThis breaks the noexec mode for all user space binaries compiled\nwith march\u003dz10 or later. The only option is to remove the current\nnoexec support.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "9bf05098ce34e68a9e15f09ad6cdfea4ed64057a", "tree": "57638d72b4f1543d9e17b17e85af5d8d59f5461e", "parents": [ "caebc160ce3f76761cc62ad96ef6d6f30f54e3dd" ], "author": { "name": "Sebastian Ott", "email": "sebott@linux.vnet.ibm.com", "time": "Mon May 23 10:23:32 2011 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon May 23 10:23:43 2011 +0200" }, "message": "[S390] cio: fix unreg race in set_online path\n\nIn ccw_device_set_online we basically start path verification and\nwait for the device to reach a final state. If it turns out that the\ndevice has no useable path we schedule the deregistration of the\ndevice (which is still in an non-final state) and wake up the waiting\nprocess. The deregistration process will set a final state, but if\nthe wake up happens to be prior to this, the device will hang forever\nin ccw_device_set_online.\n\nTo fix this just set the final NOT_OPER state prior to the scheduled\nderegistration of the device.\n\nSigned-off-by: Sebastian Ott \u003csebott@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "caebc160ce3f76761cc62ad96ef6d6f30f54e3dd", "tree": "6bedd4a62d65a4ba121a0c170d1ca657d922d352", "parents": [ "d798f7f080805ad7e15fc37a43d8c6f91edb6dda", "5fc7b14177b1a1c2f2511aed62a4ca870d0332e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:43:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:43:01 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:\n nilfs2: use mark_buffer_dirty to mark btnode or meta data dirty\n nilfs2: always set back pointer to host inode in mapping-\u003ehost\n nilfs2: get rid of NILFS_I_NILFS\n nilfs2: use list_first_entry\n nilfs2: use empty_aops for gc-inodes\n nilfs2: implement resize ioctl\n nilfs2: add truncation routine of segment usage file\n nilfs2: add routine to move secondary super block\n nilfs2: add ioctl which limits range of segment to be allocated\n nilfs2: zero fill unused portion of super root block\n nilfs2: super root size should change depending on inode size\n nilfs2: get rid of private page allocator\n nilfs2: merge list_del()/list_add_tail() to list_move_tail()\n" }, { "commit": "d798f7f080805ad7e15fc37a43d8c6f91edb6dda", "tree": "73e3783cb619d3a5dc40a5f32859f063b5cd0664", "parents": [ "e98bae7592a44bdce2e49ccd64f3c7ffe244a0f6", "db210f824c2f155703edf03bc2137da1bd76e27d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:08:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:08:32 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:\n ide/ide-scan-pci.c: Use for_each_pci_dev().\n ide: Use linux/mutex.h\n IDE: ide-floppy, remove unnecessary NULL check\n drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata\n ide: fix use after free in ide-acpi\n" }, { "commit": "e98bae7592a44bdce2e49ccd64f3c7ffe244a0f6", "tree": "1887da3331c5214c330226506d229222b454e960", "parents": [ "4b382d0643603819e8b48da58efc254cabc22574", "f400bdb1d6de4344980cf39041497b288090dd33" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:06:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:06:24 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (28 commits)\n sparc32: fix build, fix missing cpu_relax declaration\n SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI\n sparc32,leon: Remove unnecessary page_address calls in LEON DMA API.\n sparc: convert old cpumask API into new one\n sparc32, sun4d: Implemented SMP IPIs support for SUN4D machines\n sparc32, sun4m: Implemented SMP IPIs support for SUN4M machines\n sparc32,leon: Implemented SMP IPIs for LEON CPU\n sparc32: implement SMP IPIs using the generic functions\n sparc32,leon: SMP power down implementation\n sparc32,leon: added some SMP comments\n sparc: add {read,write}*_be routines\n sparc32,leon: don\u0027t rely on bootloader to mask IRQs\n sparc32,leon: operate on boot-cpu IRQ controller registers\n sparc32: always define boot_cpu_id\n sparc32: removed unused code, implemented by generic code\n sparc32: avoid build warning at mm/percpu.c:1647\n sparc32: always register a PROM based early console\n sparc32: probe for cpu info only during startup\n sparc: consolidate show_cpuinfo in cpu.c\n sparc32,leon: implement genirq CPU affinity\n ...\n" }, { "commit": "4b382d0643603819e8b48da58efc254cabc22574", "tree": "71ae8bc989af8a0137c065e4741a76dc4e4d4cb8", "parents": [ "bdfbe804c2303cb4b178bb4b5c3e855892472033", "b098636cf04c89db4036fedc778da0acc666ad1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:03:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:03:03 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://neil.brown.name/md\n\n* \u0027for-linus\u0027 of git://neil.brown.name/md:\n md: allow resync_start to be set while an array is active.\n md/raid10: reformat some loops with less indenting.\n md/raid10: remove unused variable.\n md/raid10: make more use of \u0027slot\u0027 in raid10d.\n md/raid10: some tidying up in fix_read_error\n md/raid1: improve handling of pages allocated for write-behind.\n md/raid1: try fix_sync_read_error before process_checks.\n md/raid1: tidy up new functions: process_checks and fix_sync_read_error.\n md/raid1: split out two sub-functions from sync_request_write\n md: make error_handler functions more uniform and correct.\n md/multipath: discard -\u003eworking_disks in favour of -\u003edegraded\n md/raid1: clean up read_balance.\n md: simplify raid10 read_balance\n md/bitmap: fix saving of events_cleared and other state.\n md: reject a re-add request that cannot be honoured.\n md: Fix race when creating a new md device.\n" }, { "commit": "bdfbe804c2303cb4b178bb4b5c3e855892472033", "tree": "48bf840490ced98ee7e30ae55826512625f22ec7", "parents": [ "82da65dab5f438ac7df28eeb43e2f5b742aa00ef" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Sun May 22 17:22:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:54:43 2011 -0700" }, "message": "wireless: fix fatal kernel-doc error + warning in mac80211.h\n\nFix new kernel-doc Error and Warning in \u003cnet/mac80211.h\u003e:\n\n Error(linux-2.6.39-git5/include/net/mac80211.h:550): cannot understand prototype: \u0027struct ieee80211_sched_scan_ies \u0027\n Warning(linux-2.6.39-git5/include/net/mac80211.h:2289): No description found for parameter \u0027sta\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "82da65dab5f438ac7df28eeb43e2f5b742aa00ef", "tree": "0b2a579d9385c516f6fbb3e2689f6611c9228aa7", "parents": [ "a1e4891fd48d298870b704c6eb48cba0da5ed6b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:37:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:44:13 2011 -0700" }, "message": "x86: setup_smep needs to be __cpuinit\n\nThe setup_smep function gets calle at resume time too, and is thus not a\npure __init function. When marked as __init, it gets thrown out after\nthe kernel has initialized, and when the kernel is suspended and\nresumed, the code will no longer be around, and we\u0027ll get a nice \"kernel\ntried to execute NX-protected page\" oops because the page is no longer\nmarked executable.\n\nReported-and-tested-by: Parag Warudkar \u003cparag.lkml@gmail.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@linux.intel.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1e4891fd48d298870b704c6eb48cba0da5ed6b1", "tree": "96fa29fd0c3803f1d1803e1b979c6ac8345fff5a", "parents": [ "70c71606190e9115e5f8363bfcd164c582eb314a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 16:51:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:43:41 2011 -0700" }, "message": "Remove prefetch() from \u003clinux/skbuff.h\u003e and \"netlabel_addrlist.h\"\n\nCommit e66eed651fd1 (\"list: remove prefetching from regular list\niterators\") removed the include of prefetch.h from list.h. The skbuff\nlist traversal still had them.\n\nQuoth David Miller:\n \"Please just remove the prefetches.\n\n Those are modelled after list.h as I intend to eventually convert\n SKB list handling to \"struct list_head\" but we\u0027re not there yet.\n\n Therefore if we kill prefetches from list.h we should kill it from\n these things in skbuff.h too.\"\n\nRequested-by: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "70c71606190e9115e5f8363bfcd164c582eb314a", "tree": "17c7f6b5df814b9ed319bc0d839969a0de741433", "parents": [ "281dc5c5ec0fb299514567cbc358562649c1af95" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun May 22 16:47:17 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:41:57 2011 -0700" }, "message": "Add appropriate \u003clinux/prefetch.h\u003e include for prefetch users\n\nAfter discovering that wide use of prefetch on modern CPUs\ncould be a net loss instead of a win, net drivers which were\nrelying on the implicit inclusion of prefetch.h via the list\nheaders showed up in the resulting cleanup fallout. Give\nthem an explicit include via the following $0.02 script.\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #!/bin/bash\n MANUAL\u003d\"\"\n for i in `git grep -l \u0027prefetch(.*)\u0027 .` ; do\n \tgrep -q \u0027\u003clinux/prefetch.h\u003e\u0027 $i\n \tif [ $? \u003d 0 ] ; then\n \t\tcontinue\n \tfi\n\n \t(\techo \u0027?^#include \u003clinux/?a\u0027\n \t\techo \u0027#include \u003clinux/prefetch.h\u003e\u0027\n \t\techo .\n \t\techo w\n \t\techo q\n \t) | ed -s $i \u003e /dev/null 2\u003e\u00261\n \tif [ $? !\u003d 0 ]; then\n \t\techo $i needs manual fixup\n \t\tMANUAL\u003d\"$i $MANUAL\"\n \tfi\n done\n echo ------------------- 8\\\u003c----------------------\n echo vi $MANUAL\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Paul \u003cpaul.gortmaker@windriver.com\u003e\n[ Fixed up some incorrect #include placements, and added some\n non-network drivers and the fib_trie.c case - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f400bdb1d6de4344980cf39041497b288090dd33", "tree": "b172b4b408ec9eae8e1497901882d54a4139b2fd", "parents": [ "17d9f311eca13a42bf950198a358be1420d19c5f" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat May 21 22:55:17 2011 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:41:35 2011 -0700" }, "message": "sparc32: fix build, fix missing cpu_relax declaration\n\nFix following sparc (32 bit) build error:\n\n CC arch/sparc/kernel/asm-offsets.s\nIn file included from include/linux/seqlock.h:29:0,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:57,\n from arch/sparc/kernel/asm-offsets.c:13:\ninclude/linux/spinlock.h: In function \u0027spin_unlock_wait\u0027:\ninclude/linux/spinlock.h:360:2: error: implicit declaration of function \u0027cpu_relax\u0027\n\nMost likely caused by commit e66eed651fd1 (\"list: remove\nprefetching from regular list iterators\") due to include\nchanges.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "281dc5c5ec0fb299514567cbc358562649c1af95", "tree": "2ecb019795e99147ce8d90b5e97c2bc3051f7855", "parents": [ "71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 14:30:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 14:30:36 2011 -0700" }, "message": "Give up on pushing CC_OPTIMIZE_FOR_SIZE\n\nI still happen to believe that I$ miss costs are a major thing, but\nsadly, -Os doesn\u0027t seem to be the solution. With or without it, gcc\nwill miss some obvious code size improvements, and with it enabled gcc\nwill sometimes make choices that aren\u0027t good even with high I$ miss\nratios.\n\nFor example, with -Os, gcc on x86 will turn a 20-byte constant memcpy\ninto a \"rep movsl\". While I sincerely hope that x86 CPU\u0027s will some day\ndo a good job at that, they certainly don\u0027t do it yet, and the cost is\nhigher than a L1 I$ miss would be.\n\nSome day I hope we can re-enable this.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14", "tree": "8ee9f7da07bb9461a41a8ded6f9da243db02b279", "parents": [ "17238005f377888b9d4583835205c77e3d781bb8", "8aa4d96fe3e4cda9a6469b22b3f017ed30996b10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 12:39:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 12:39:58 2011 -0700" }, "message": "Merge branch \u0027viafb-next\u0027 of git://github.com/schandinat/linux-2.6\n\n* \u0027viafb-next\u0027 of git://github.com/schandinat/linux-2.6: (24 commits)\n viafb: Automatic OLPC XO-1.5 configuration\n viafb: remove unused CEA mode\n viafb: try to map less memory in case of failure\n viafb: use write combining for video ram\n viafb: add X server compatibility mode\n viafb: reduce OLPC refresh a bit\n viafb: fix OLPC XO 1.5 device connection\n viafb: fix OLPC DCON refresh rate\n viafb: delete clock and PLL initialization\n viafb: replace custom return values\n viafb: some small cleanup for global variables\n viafb: gather common good, old VGA initialization in one place\n viafb: add engine clock support\n viafb: add VIA slapping capability\n viafb: split clock and PLL code to an extra file\n viafb: add primary/secondary clock on/off switches\n viafb: add clock source selection and PLL power management support\n viafb: prepare for PLL separation\n viafb: call viafb_get_clk_value only in viafb_set_vclock\n viafb: remove unused max_hres/vres\n ...\n" }, { "commit": "17238005f377888b9d4583835205c77e3d781bb8", "tree": "9cad40902138d08a2694f87736cfebd031dc9542", "parents": [ "34ea646c9f8c18fd2e4332ff3b2b509f878c56f1", "7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 12:38:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 12:38:40 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:\n [PARISC] wire up syncfs syscall\n [PARISC] wire up the fhandle syscalls\n [PARISC] wire up clock_adjtime syscall\n [PARISC] wire up fanotify syscalls\n [PARISC] prevent speculative re-read on cache flush\n [PARISC] only make executable areas executable\n [PARISC] fix pacache .size with new binutils\n" }, { "commit": "34ea646c9f8c18fd2e4332ff3b2b509f878c56f1", "tree": "45aad71cee86ae3ca5cf3423aedcef24bbee6253", "parents": [ "9ce6e0be0626a5de2aca8b769a4aa57086257156" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Sun May 22 18:55:10 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 11:26:02 2011 -0700" }, "message": "net: add missing prefetch.h include\n\nFixes build errors on s390 and probably other archs as well:\n\n In file included from net/ipv4/ip_forward.c:32:0:\n include/net/udp.h: In function \u0027udp_csum_outgoing\u0027:\n include/net/udp.h:141:2: error: implicit declaration of function \u0027prefetch\u0027\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9ce6e0be0626a5de2aca8b769a4aa57086257156", "tree": "a6c2d49e85c8aca4665d54f8a3629196d5f7fd23", "parents": [ "dcb4a1f0e0367efb813907e5083998bbb98b0456" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Sun May 22 18:54:21 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 11:26:02 2011 -0700" }, "message": "fs: add missing prefetch.h include\n\nFixes this build error on s390 and probably other archs as well:\n\n fs/inode.c: In function \u0027new_inode\u0027:\n fs/inode.c:894:2: error: implicit declaration of function \u0027spin_lock_prefetch\u0027\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n[ Happens on architectures that don\u0027t define their own prefetch\n functions in \u003casm/processor.h\u003e, and instead rely on the default\n ones in \u003clinux/prefetch.h\u003e - Linus]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03", "tree": "3358215354ae27d86411963ab33c2d8f07c5e427", "parents": [ "2e7bad5f34b5beed47542490c760ed26574e38ba", "b7d45818444a31948cfc7849136013a0ea54b2fb" ], "author": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Sun May 22 11:04:55 2011 +0400" }, "committer": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Sun May 22 11:04:55 2011 +0400" }, "message": "Merge branch \u0027flushing\u0027 into for-linus\n" }, { "commit": "dcb4a1f0e0367efb813907e5083998bbb98b0456", "tree": "80b1edb72dd20ed20917e6c835bd49a0c0b52df2", "parents": [ "c21fd1a8c68ce3f49b00caf10337169262cfb8ad", "105e53f863c04e1d9e5bb34bf753c9fdbce6a60c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 21 12:25:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 21 12:25:07 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:\n firewire: sbp2: parallelize login, reconnect, logout\n firewire: sbp2: octlet AT payloads can be stack-allocated\n firewire: sbp2: omit Scsi_Host lock from queuecommand\n firewire: core: use non-reentrant workqueue with rescuer\n firewire: optimize iso queueing by setting wake only after the last packet\n firewire: octlet AT payloads can be stack-allocated\n firewire: ohci: optimize find_branch_descriptor()\n firewire: ohci: avoid separate DMA mapping for small AT payloads\n firewire: ohci: do not start DMA contexts before link is enabled\n" }, { "commit": "c21fd1a8c68ce3f49b00caf10337169262cfb8ad", "tree": "37bb9c0511ece948cc3913f4df21166768379f5e", "parents": [ "1a4022f88d40e1255920b017556092ab926d7f66", "5d414521663295ce25c90164f4d41a07ac846468" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 21 00:13:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 21 00:13:03 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n sctp: Fix build failure.\n garp: use kfree_rcu()\n ipv6: copy prefsrc setting when copying route entry\n" }, { "commit": "1a4022f88d40e1255920b017556092ab926d7f66", "tree": "f4e54841dae0ecf1324a3002bc540f8b6ba441d5", "parents": [ "052497553e5dedc04c43800820c1d5788201cc71" ], "author": { "name": "Erez Zadok", "email": "ezk@fsl.cs.sunysb.edu", "time": "Sat May 21 01:19:59 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 21 00:12:16 2011 -0700" }, "message": "VFS: move BUG_ON test for symlink nd-\u003edepth after current-\u003elink_count test\n\nThis solves a serious VFS-level bug in nested_symlink (which was\nrewritten from do_follow_link), and follows the order of depth tests\nthat existed before.\n\nThe bug triggers a BUG_ON in fs/namei.c:1381, when running racer with\nsymlink and rename ops.\n\nSigned-off-by: Erez Zadok \u003cezk@cs.sunysb.edu\u003e\nAcked-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5d414521663295ce25c90164f4d41a07ac846468", "tree": "50a3175fe7292ab775cf8031eee510aec2356de4", "parents": [ "0a384b226f61b310586701669b573b49cfcbf436" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:10:23 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:10:23 2011 -0400" }, "message": "sctp: Fix build failure.\n\nCommit c182f90bc1f22ce5039b8722e45621d5f96862c2 (\"SCTP: fix race\nbetween sctp_bind_addr_free() and sctp_bind_addr_conflict()\") and\ncommit 1231f0baa547a541a7481119323b7f964dda4788 (\"net,rcu: convert\ncall_rcu(sctp_local_addr_free) to kfree_rcu()\"), happening in\ndifferent trees, introduced a build failure.\n\nSimply make the SCTP race fix use kfree_rcu() too.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a384b226f61b310586701669b573b49cfcbf436", "tree": "e1fb1a74d916b14f327cb01cbb02f2b45ae6cf35", "parents": [ "0f6c6392dca9c4825c98322a1bf74991e4f0f54d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri May 20 18:31:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:05:22 2011 -0400" }, "message": "garp: use kfree_rcu()\n\nUse kfree_rcu() instead of call_rcu(), remove garp_cleanup_module()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f6c6392dca9c4825c98322a1bf74991e4f0f54d", "tree": "6100a2d32a99b3f735bbb41d9749362ead92fb22", "parents": [ "557eed603159b4e007c57d97fad1333ecebd3c2e" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Fri May 20 11:27:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:05:22 2011 -0400" }, "message": "ipv6: copy prefsrc setting when copying route entry\n\ncommit c3968a857a6b6c3d2ef4ead35776b055fb664d74\n(\u0027ipv6: RTA_PREFSRC support for ipv6 route source address selection\u0027)\nadded support for ipv6 prefsrc as an alternative to ipv6 addrlabels,\nbut it did not work because the prefsrc entry was not copied.\n\nCc: Daniel Walter \u003csahne@0x90.at\u003e\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "052497553e5dedc04c43800820c1d5788201cc71", "tree": "952466fc0f0df2b44b8df6b087c944ddf890f709", "parents": [ "cae13fe4cc3f24820ffb990c09110626837e85d4", "4427b1b4ec111622071ec872c94594e05635c6e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 17:24:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 17:24:14 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (45 commits)\n crypto: caam - add support for sha512 variants of existing AEAD algorithms\n crypto: caam - remove unused authkeylen from caam_ctx\n crypto: caam - fix decryption shared vs. non-shared key setting\n crypto: caam - platform_bus_type migration\n crypto: aesni-intel - fix aesni build on i386\n crypto: aesni-intel - Merge with fpu.ko\n crypto: mv_cesa - make count_sgs() null-pointer proof\n crypto: mv_cesa - copy remaining bytes to SRAM only when needed\n crypto: mv_cesa - move digest state initialisation to a better place\n crypto: mv_cesa - fill inner/outer IV fields only in HMAC case\n crypto: mv_cesa - refactor copy_src_to_buf()\n crypto: mv_cesa - no need to save digest state after the last chunk\n crypto: mv_cesa - print a warning when registration of AES algos fail\n crypto: mv_cesa - drop this call to mv_hash_final from mv_hash_finup\n crypto: mv_cesa - the descriptor pointer register needs to be set just once\n crypto: mv_cesa - use ablkcipher_request_cast instead of the manual container_of\n crypto: caam - fix printk recursion for long error texts\n crypto: caam - remove unused keylen from session context\n hwrng: amd - enable AMD hw rnd driver for Maple PPC boards\n hwrng: amd - manage resource allocation\n ...\n" }, { "commit": "cae13fe4cc3f24820ffb990c09110626837e85d4", "tree": "db3722f6c3ffc142eb3b931fb41b34d8dab3eaa7", "parents": [ "e6c9366b2adb52cba64b359b3050200743c7568c" ], "author": { "name": "Timo Warns", "email": "Warns@pre-sense.de", "time": "Thu May 19 09:24:17 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 16:40:36 2011 -0700" }, "message": "Fix for buffer overflow in ldm_frag_add not sufficient\n\nAs Ben Hutchings discovered [1], the patch for CVE-2011-1017 (buffer\noverflow in ldm_frag_add) is not sufficient. The original patch in\ncommit c340b1d64000 (\"fs/partitions/ldm.c: fix oops caused by corrupted\npartition table\") does not consider that, for subsequent fragments,\npreviously allocated memory is used.\n\n[1] http://lkml.org/lkml/2011/5/6/407\n\nReported-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Timo Warns \u003cwarns@pre-sense.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e6c9366b2adb52cba64b359b3050200743c7568c", "tree": "8e092d9b865734f31116583a2db20971e1c352ee", "parents": [ "6de06f313a65d0ecabf055e708d082002b568866" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Fri May 20 15:47:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 16:23:19 2011 -0700" }, "message": "tmpfs: fix highmem swapoff crash regression\n\nCommit 778dd893ae78 (\"tmpfs: fix race between umount and swapoff\")\nforgot the new rules for strict atomic kmap nesting, causing\n\n WARNING: at arch/x86/mm/highmem_32.c:81\n\nfrom __kunmap_atomic(), then\n\n BUG: unable to handle kernel paging request at fffb9000\n\nfrom shmem_swp_set() when shmem_unuse_inode() is handling swapoff with\nhighmem in use. My disgrace again.\n\nSee\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d35352\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6de06f313a65d0ecabf055e708d082002b568866", "tree": "4d2d8196a9682a399790ea1ac86f24bcf1f4270d", "parents": [ "557eed603159b4e007c57d97fad1333ecebd3c2e" ], "author": { "name": "Josh Boyer", "email": "jwboyer@linux.vnet.ibm.com", "time": "Fri May 20 16:22:25 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 16:23:19 2011 -0700" }, "message": "powerpc: Fix 32-bit SMP build\n\nCommit 69e3cea8d5fd526 (\"powerpc/smp: Make start_secondary_resume\navailable to all CPU variants\") introduced start_secondary_resume to\nmisc_32.S, however it uses a 64-bit instruction which is not valid on\n32-bit platforms. Use \u0027stw\u0027 instead.\n\nReported-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nTested-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: Josh Boyer \u003cjwboyer@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "557eed603159b4e007c57d97fad1333ecebd3c2e", "tree": "ae784d4578da59617f87e36728ed2cafb2be50d6", "parents": [ "be84bfcc3ed8f824751ab79349779e50cc98aa01", "8a745f1f39b7a20047a362b67ce9151c07d14440" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 14:31:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 14:31:27 2011 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n libata: Power off empty ports\n libata-pmp: add support for Thermaltake BlackX Duet esata drive dock\n ATA: Don\u0027t powerdown Compaq Triflex IDE device on suspend\n libata: Use Maximum Write Same Length to report discard size limit\n drivers/ata/acard-ahci.c: fix enum warning\n pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY\n libata-sff: prevent irq descriptions for dummy ports\n pata_cm64x: fix boot crash on parisc\n" }, { "commit": "be84bfcc3ed8f824751ab79349779e50cc98aa01", "tree": "ca42d81fbc402405614cae288bf7600bee82cc21", "parents": [ "06f4e926d256d902dd9a53dcb400fd74974ce087" ], "author": { "name": "Kevin Cernekee", "email": "cernekee@gmail.com", "time": "Tue May 17 10:39:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:53:02 2011 -0700" }, "message": "ipc: Add missing sys_ni entries for ipc/compat.c functions\n\nWhen building with:\n\n CONFIG_64BIT\u003dy\n CONFIG_MIPS32_COMPAT\u003dy\n CONFIG_COMPAT\u003dy\n CONFIG_MIPS32_O32\u003dy\n CONFIG_MIPS32_N32\u003dy\n CONFIG_SYSVIPC is not set\n (and implicitly: CONFIG_SYSVIPC_COMPAT is not set)\n\nthe final link fails with unresolved symbols for:\n\n compat_sys_semctl, compat_sys_msgsnd, compat_sys_msgrcv,\n compat_sys_shmctl, compat_sys_msgctl, compat_sys_semtimedop\n\nThe fix is to add cond_syscall declarations for all syscalls in\nipc/compat.c\n\nSigned-off-by: Kevin Cernekee \u003ccernekee@gmail.com\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "06f4e926d256d902dd9a53dcb400fd74974ce087", "tree": "0b438b67f5f0eff6fd617bc497a9dace6164a488", "parents": [ "8e7bfcbab3825d1b404d615cb1b54f44ff81f981", "d93515611bbc70c2fe4db232e5feb448ed8e4cc9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)\n macvlan: fix panic if lowerdev in a bond\n tg3: Add braces around 5906 workaround.\n tg3: Fix NETIF_F_LOOPBACK error\n macvlan: remove one synchronize_rcu() call\n networking: NET_CLS_ROUTE4 depends on INET\n irda: Fix error propagation in ircomm_lmp_connect_response()\n irda: Kill set but unused variable \u0027bytes\u0027 in irlan_check_command_param()\n irda: Kill set but unused variable \u0027clen\u0027 in ircomm_connect_indication()\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_transport()\n be2net: Kill set but unused variable \u0027req\u0027 in lancer_fw_download()\n irda: Kill set but unused vars \u0027saddr\u0027 and \u0027daddr\u0027 in irlan_provider_connect_indication()\n atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_peer().\n rxrpc: Kill set but unused variable \u0027local\u0027 in rxrpc_UDP_error_handler()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_process_connection()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_rotate_tx_window()\n pkt_sched: Kill set but unused variable \u0027protocol\u0027 in tc_classify()\n isdn: capi: Use pr_debug() instead of ifdefs.\n tg3: Update version to 3.119\n tg3: Apply rx_discards fix to 5719/5720\n ...\n\nFix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c\nas per Davem.\n" }, { "commit": "8e7bfcbab3825d1b404d615cb1b54f44ff81f981", "tree": "5465eeb9c58af8dd8a26466c61de69b4b1df89dc", "parents": [ "102dc1bae12a20214c9ee2d33a7402dc5175e30d", "30f7276cb35a22743d709a460ae3639aad50366a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:39:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:39:00 2011 -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] define \"_sdata\" symbol\n pstore: Fix Kconfig dependencies for apei-\u003epstore\n pstore: fix potential logic issue in pstore read interface\n pstore: fix pstore filesystem mount/remount issue\n pstore: fix one type of return value in pstore\n [IA64] fix build warning in arch/ia64/oprofile/backtrace.c\n" }, { "commit": "102dc1bae12a20214c9ee2d33a7402dc5175e30d", "tree": "dbc2364c164db3743bd86ff02557369daac0fac4", "parents": [ "91444f47b2a0e50a15849f49db8c15382cd8de1b", "bbe7b8bef48c567f5ff3f6041c1fb011292e8f12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:38:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:38:28 2011 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n MAINTAINERS: Add drivers/clocksource to TIMEKEEPING\n clockevents/source: Use u64 to make 32bit happy\n" }, { "commit": "91444f47b2a0e50a15849f49db8c15382cd8de1b", "tree": "f565abed6640cc07607729969643551202f77e57", "parents": [ "bc091c93a0f60717aa99e25c406892cd8c0187dc", "156ecb2d8b06589098f6ce3012e6a10fef07c416" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:37:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:37:49 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (32 commits)\n [CIFS] Fix to problem with getattr caused by invalidate simplification patch\n [CIFS] Remove sparse warning\n [CIFS] Update cifs to version 1.72\n cifs: Change key name to cifs.idmap, misc. clean-up\n cifs: Unconditionally copy mount options to superblock info\n cifs: Use kstrndup for cifs_sb-\u003emountdata\n cifs: Simplify handling of submount options in cifs_mount.\n cifs: cifs_parse_mount_options: do not tokenize mount options in-place\n cifs: Add support for mounting Windows 2008 DFS shares\n cifs: Extract DFS referral expansion logic to separate function\n cifs: turn BCC into a static inlined function\n cifs: keep BCC in little-endian format\n cifs: fix some unused variable warnings in id_rb_search\n CIFS: Simplify invalidate part (try #5)\n CIFS: directio read/write cleanups\n consistently use smb_buf_length as be32 for cifs (try 3)\n cifs: Invoke id mapping functions (try #17 repost)\n cifs: Add idmap key and related data structures and functions (try #17 repost)\n CIFS: Add launder_page operation (try #3)\n Introduce smb2 mounts as vers\u003d2\n ...\n" }, { "commit": "bc091c93a0f60717aa99e25c406892cd8c0187dc", "tree": "66fc7f6c97a11327c3acb0aee5c346717672a9f3", "parents": [ "3ed4c0583daa34dedb568b26ff99e5a7b58db612", "a2d063ac216c1618bfc2b4d40b7176adffa63511" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:37:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:37:22 2011 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n extable, core_kernel_data(): Make sure all archs define _sdata\n core_kernel_data(): Fix architectures that do not define _sdata\n" }, { "commit": "3ed4c0583daa34dedb568b26ff99e5a7b58db612", "tree": "a531d4cc94acaa58fe0600cf83da9fb8b77f6e50", "parents": [ "ad9471752ebae25daa133b4e5d9299809c35e155", "bd715d9a4f13f87bad5526c2cd41370949473b16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:33:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:33:21 2011 -0700" }, "message": "Merge branch \u0027ptrace\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc\n\n* \u0027ptrace\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (41 commits)\n signal: trivial, fix the \"timespec declared inside parameter list\" warning\n job control: reorganize wait_task_stopped()\n ptrace: fix signal-\u003ewait_chldexit usage in task_clear_group_stop_trapping()\n signal: sys_sigprocmask() needs retarget_shared_pending()\n signal: cleanup sys_sigprocmask()\n signal: rename signandsets() to sigandnsets()\n signal: do_sigtimedwait() needs retarget_shared_pending()\n signal: introduce do_sigtimedwait() to factor out compat/native code\n signal: sys_rt_sigtimedwait: simplify the timeout logic\n signal: cleanup sys_rt_sigprocmask()\n x86: signal: sys_rt_sigreturn() should use set_current_blocked()\n x86: signal: handle_signal() should use set_current_blocked()\n signal: sigprocmask() should do retarget_shared_pending()\n signal: sigprocmask: narrow the scope of -\u003esiglock\n signal: retarget_shared_pending: optimize while_each_thread() loop\n signal: retarget_shared_pending: consider shared/unblocked signals only\n signal: introduce retarget_shared_pending()\n ptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/\n signal: Turn SIGNAL_STOP_DEQUEUED into GROUP_STOP_DEQUEUED\n signal: do_signal_stop: Remove the unneeded task_clear_group_stop_pending()\n ...\n" }, { "commit": "ad9471752ebae25daa133b4e5d9299809c35e155", "tree": "dfcc75d7ee75ef0465c109423885c4326ccf9b9f", "parents": [ "6c1b8d94bcc1882e451d0e7a28a4a5253f4970ab", "6ad11eaa8a689a27e0c99905bcf800a37cd432a0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:29:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:29:52 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (110 commits)\n [SCSI] qla2xxx: Refactor call to qla2xxx_read_sfp for thermal temperature.\n [SCSI] qla2xxx: Unify the read/write sfp mailbox command routines.\n [SCSI] qla2xxx: Clear complete initialization control block.\n [SCSI] qla2xxx: Allow an override of the registered maximum LUN.\n [SCSI] qla2xxx: Add host number in reset and quiescent message logs.\n [SCSI] qla2xxx: Correctly read sfp single byte mailbox register.\n [SCSI] qla2xxx: Add qla82xx_rom_unlock() function.\n [SCSI] qla2xxx: Log if qla82xx firmware fails to load from flash.\n [SCSI] qla2xxx: Use passed in host to initialize local scsi_qla_host in queuecommand function\n [SCSI] qla2xxx: Correct buffer start in edc sysfs debug print.\n [SCSI] qla2xxx: Update firmware version after flash update for ISP82xx.\n [SCSI] qla2xxx: Fix hang during driver unload when vport is active.\n [SCSI] qla2xxx: Properly set the dsd_list_len for dsd_chaining in cmd type 6.\n [SCSI] qla2xxx: Fix virtual port failing to login after chip reset.\n [SCSI] qla2xxx: Fix vport delete hang when logins are outstanding.\n [SCSI] hpsa: Change memset using sizeof(ptr) to sizeof(*ptr)\n [SCSI] ipr: Rate limit DMA mapping errors\n [SCSI] hpsa: add P2000 to list of shared SAS devices\n [SCSI] hpsa: do not attempt PCI power management reset method if we know it won\u0027t work.\n [SCSI] hpsa: remove superfluous sleeps around reset code\n ...\n" }, { "commit": "6c1b8d94bcc1882e451d0e7a28a4a5253f4970ab", "tree": "1e612ce2e7b5e2164ffa49ad6518ca2834a7f9bb", "parents": [ "82aff107f8c9194586f68e86412246629d05670a", "f2741d9898269e565c220ec295a8f5c3756c7585" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:28:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:28:45 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (32 commits)\n GFS2: Move all locking inside the inode creation function\n GFS2: Clean up symlink creation\n GFS2: Clean up mkdir\n GFS2: Use UUID field in generic superblock\n GFS2: Rename ops_inode.c to inode.c\n GFS2: Inode.c is empty now, remove it\n GFS2: Move final part of inode.c into super.c\n GFS2: Move most of the remaining inode.c into ops_inode.c\n GFS2: Move gfs2_refresh_inode() and friends into glops.c\n GFS2: Remove gfs2_dinode_print() function\n GFS2: When adding a new dir entry, inc link count if it is a subdir\n GFS2: Make gfs2_dir_del update link count when required\n GFS2: Don\u0027t use gfs2_change_nlink in link syscall\n GFS2: Don\u0027t use a try lock when promoting to a higher mode\n GFS2: Double check link count under glock\n GFS2: Improve bug trap code in -\u003ereleasepage()\n GFS2: Fix ail list traversal\n GFS2: make sure fallocate bytes is a multiple of blksize\n GFS2: Add an AIL writeback tracepoint\n GFS2: Make writeback more responsive to system conditions\n ...\n" }, { "commit": "82aff107f8c9194586f68e86412246629d05670a", "tree": "c4336e8bbd453235dafecba6b8dca24c8cbcb2e5", "parents": [ "d974d905cbfc1039a73ba0c7eea3f4d4e13c0624", "208b3a4c196e733b9cec006dc132cfc149b2810a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:28:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:28:01 2011 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)\n powerpc: Fix hard CPU IDs detection\n powerpc/pmac: Update via-pmu to new syscore_ops\n powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors\n powerpc/kvm: Fix kvmppc_core_pending_dec\n powerpc: Remove last piece of GEMINI\n powerpc: Fix for Pegasos keyboard and mouse\n powerpc: Make early memory scan more resilient to out of order nodes\n powerpc/pseries/iommu: Cleanup ddw naming\n powerpc/pseries/iommu: Find windows after kexec during boot\n powerpc/pseries/iommu: Remove ddw property when destroying window\n powerpc/pseries/iommu: Add additional checks when changing iommu mask\n powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created\n powerpc: Remove unused/obsolete CONFIG_XICS\n misc: Add CARMA DATA-FPGA Programmer support\n misc: Add CARMA DATA-FPGA Access Driver\n powerpc: Make IRQ_NOREQUEST last to clear, first to set\n powerpc: Integrated Flash controller device tree bindings\n powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB\n powerpc/85xx: Fix PCIe IDSEL for Px020RDB\n powerpc/85xx: P2020 DTS: re-organize dts files\n ...\n" }, { "commit": "17d9f311eca13a42bf950198a358be1420d19c5f", "tree": "2d1a77f66ccd607f6ab2cf304f8031724a82c7fc", "parents": [ "90d3ac15e5c637d45849e83c828ed78c62886737" ], "author": { "name": "Daniel Hellstrom", "email": "daniel@gaisler.com", "time": "Fri May 20 04:01:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 13:10:55 2011 -0700" }, "message": "SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI\n\nSigned-off-by: Daniel Hellstrom \u003cdaniel@gaisler.com\u003e\nReported-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "90d3ac15e5c637d45849e83c828ed78c62886737", "tree": "c5568365f32386559d2710e8981ed41e5fe0eb12", "parents": [ "9fafbd806198eb690c9a9f9fe35a879db93a1b8d", "317f394160e9beb97d19a84c39b7e5eb3d7815a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 13:10:22 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 13:10:22 2011 -0700" }, "message": "Merge commit \u0027317f394160e9beb97d19a84c39b7e5eb3d7815a8\u0027\n\nConflicts:\n\tarch/sparc/kernel/smp_32.c\n\nWith merge conflict help from Daniel Hellstrom.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9fafbd806198eb690c9a9f9fe35a879db93a1b8d", "tree": "a555f39102d51151d7f8461a4f575468cd52f33c", "parents": [ "d81f087f1f1c1aacdb4f17224a554237285ddd11", "21dccddf45aae2d9f973696ce06115da0d1012b6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 12:59:54 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 12:59:54 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6\n" }, { "commit": "d974d905cbfc1039a73ba0c7eea3f4d4e13c0624", "tree": "7eed7674e9510a192cca1b6a25411e4893e16bc3", "parents": [ "268bb0ce3e87872cb9290c322b0d35bce230d88f" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Fri May 20 15:48:17 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 12:51:07 2011 -0700" }, "message": "spinlock_up.h: include asm/processor.h in for cpu_relax\n\nCommit e66eed651fd1 (\"list: remove prefetching from regular list\niterators\") removed the include of prefetch.h from list.h and this was a\npath to including asm/processor.h. We need to include it excplicitly\nnow.\n\nFixes this build error on sparc32 (at least):\n\n In file included from include/linux/seqlock.h:29,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:57,\n from arch/sparc/kernel/asm-offsets.c:13:\n include/linux/spinlock.h: In function \u0027spin_unlock_wait\u0027:\n include/linux/spinlock.h:360: error: implicit declaration of function \u0027cpu_relax\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "268bb0ce3e87872cb9290c322b0d35bce230d88f", "tree": "c8331ade4a3e24fc589c4eb62731bc2312d35333", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 12:50:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 12:50:29 2011 -0700" }, "message": "sanitize \u003clinux/prefetch.h\u003e usage\n\nCommit e66eed651fd1 (\"list: remove prefetching from regular list\niterators\") removed the include of prefetch.h from list.h, which\nuncovered several cases that had apparently relied on that rather\nobscure header file dependency.\n\nSo this fixes things up a bit, using\n\n grep -L linux/prefetch.h $(git grep -l \u0027[^a-z_]prefetchw*(\u0027 -- \u0027*.[ch]\u0027)\n grep -L \u0027prefetchw*(\u0027 $(git grep -l \u0027linux/prefetch.h\u0027 -- \u0027*.[ch]\u0027)\n\nto guide us in finding files that either need \u003clinux/prefetch.h\u003e\ninclusion, or have it despite not needing it.\n\nThere are more of them around (mostly network drivers), but this gets\nmany core ones.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d93515611bbc70c2fe4db232e5feb448ed8e4cc9", "tree": "7db1c770bd3a7ac1f27a5e9ccc231719ae3aa6c5", "parents": [ "7196cd6c3d4863000ef88b09f34d6dd75610ec3e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri May 20 14:59:23 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 14:59:23 2011 -0400" }, "message": "macvlan: fix panic if lowerdev in a bond\n\ncommit a35e2c1b6d905 (macvlan: use rx_handler_data pointer to store\nmacvlan_port pointer V2) added a bug in macvlan_port_create()\n\nSteps to reproduce the bug:\n\n# ifenslave bond0 eth0 eth1\n\n# ip link add link eth0 up name eth0#1 type macvlan\n-\u003eerror EBUSY\n\n# ip link add link eth0 up name eth0#1 type macvlan\n-\u003epanic\n\n\nFix: Dont set IFF_MACVLAN_PORT in error case.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "30f7276cb35a22743d709a460ae3639aad50366a", "tree": "b9f15e4ca2bbfca83acdac87c168dad47aa8213f", "parents": [ "5e4de22bec1d78c009409200162da6a54631e9e4" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri May 20 10:38:53 2011 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri May 20 10:38:53 2011 -0700" }, "message": "[IA64] define \"_sdata\" symbol\n\ncore_kernel_data() wants to know if an address looks like kernel\ndata. IA64 has had _edata forever, but never needed _sdata until\nnow.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "5e4de22bec1d78c009409200162da6a54631e9e4", "tree": "3954fe13eee1edb9aef80bb4dfc6fd486417bfdf", "parents": [ "3935bb949f360b5c8fbf7da268deb81d225d7b93", "ff00c2a5b2308219ab952d01e5bb17b9ea772d7e" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri May 20 10:35:03 2011 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri May 20 10:35:03 2011 -0700" }, "message": "Pull misc-2.6.40 into release branch\n" }, { "commit": "3935bb949f360b5c8fbf7da268deb81d225d7b93", "tree": "26909a230ab28410720c845e834be8552b831d4c", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf", "5d2a8342f64e93c217fcbf3206ec9ae770b1413d" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri May 20 10:34:50 2011 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri May 20 10:34:50 2011 -0700" }, "message": "Pull pstore into release branch\n" }, { "commit": "5d2a8342f64e93c217fcbf3206ec9ae770b1413d", "tree": "2769c38bc58788989683aef6d1bab6455a1442c6", "parents": [ "f5ec25deb2471bd49e907ab2f9ef6f860eb7cf95" ], "author": { "name": "Luck, Tony", "email": "tony.luck@intel.com", "time": "Wed Apr 13 10:48:12 2011 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri May 20 10:34:35 2011 -0700" }, "message": "pstore: Fix Kconfig dependencies for apei-\u003epstore\n\nGeert Uytterhoeven ran a dependency checker which kicked out this warning:\n\n+ warning: (ACPI_APEI) selects PSTORE which has unmet direct dependencies (MISC_FILESYSTEMS): \u003d\u003e N/A\n\nRandy confirmed that the fix was to \"select MISC_FILESYSTEMS\" too.\n\nTested-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "156ecb2d8b06589098f6ce3012e6a10fef07c416", "tree": "4008ea00d8c49ff2361ebe784a1e757c8cad9986", "parents": [ "ceec1e0fae6eecac876ec28cfb97786f87dfb1c6" ], "author": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Fri May 20 17:00:01 2011 +0000" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Fri May 20 17:00:01 2011 +0000" }, "message": "[CIFS] Fix to problem with getattr caused by invalidate simplification patch\n\nFix to earlier \"Simplify invalidate part (try #6)\" patch\nThat patch caused problems with connectathon test 5.\n\nReviewed-by: Jeff Layton \u003cjlayton@samba.org\u003e\nSigned-off-by: Pavel Shilovsky \u003cpiastry@etersoft.ru\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "bbe7b8bef48c567f5ff3f6041c1fb011292e8f12", "tree": "c6efe0baebc2e79811b00bccaecb700bb7785756", "parents": [ "c0e299b1a91cbdb21ae08e382a4176200398bc36" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 11:38:24 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 11:39:13 2011 +0200" }, "message": "MAINTAINERS: Add drivers/clocksource to TIMEKEEPING\n\nIt\u0027s not a random dump ground and we care about it.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "c0e299b1a91cbdb21ae08e382a4176200398bc36", "tree": "096a6b082fcf1bd816d78654057d11af823361c5", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 10:50:52 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 10:50:52 2011 +0200" }, "message": "clockevents/source: Use u64 to make 32bit happy\n\nunsigned long is not 64bit on 32bit machine.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "208b3a4c196e733b9cec006dc132cfc149b2810a", "tree": "72f0a54c20389b0be3fc2b7d76f2e6d26bd627e2", "parents": [ "e83b906c99eb87a11cd731f6726e60cd8ac9ec4b" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 17:50:18 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 17:50:18 2011 +1000" }, "message": "powerpc: Fix hard CPU IDs detection\n\ncommit 9d07bc841c9779b4d7902e417f4e509996ce805d\n\"powerpc: Properly handshake CPUs going out of boot spin loop\"\n\nWould cause a miscalculation of the hard CPU ID. It removes breaking\nout of the loop when finding a match with a processor, thus the \"i\"\nused as an index in the intserv array is always incorrect\n\nThis broke interrupt on my PowerMac laptop.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "a2d063ac216c1618bfc2b4d40b7176adffa63511", "tree": "499d4cc67e296cb8b51f51215a49407c440c4690", "parents": [ "c16dbd54a3fe126b539a0ef149d80221c667bbd5" ], "author": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu May 19 21:34:58 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 08:56:56 2011 +0200" }, "message": "extable, core_kernel_data(): Make sure all archs define _sdata\n\nA new utility function (core_kernel_data()) is used to determine if a\npassed in address is part of core kernel data or not. It may or may not\nreturn true for RO data, but this utility must work for RW data.\n\nThus both _sdata and _edata must be defined and continuous,\nwithout .init sections that may later be freed and replaced by\nvolatile memory (memory that can be freed).\n\nThis utility function is used to determine if data is safe from\never being freed. Thus it should return true for all RW global\ndata that is not in a module or has been allocated, or false\notherwise.\n\nAlso change core_kernel_data() back to the more precise _sdata condition\nand document the function.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: JamesE.J.Bottomley \u003cjejb@parisc-linux.org\u003e\nLink: http://lkml.kernel.org/r/1305855298.1465.19.camel@gandalf.stny.rr.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n----\n arch/alpha/kernel/vmlinux.lds.S | 1 +\n arch/m32r/kernel/vmlinux.lds.S | 1 +\n arch/m68k/kernel/vmlinux-std.lds | 2 ++\n arch/m68k/kernel/vmlinux-sun3.lds | 1 +\n arch/mips/kernel/vmlinux.lds.S | 1 +\n arch/parisc/kernel/vmlinux.lds.S | 3 +++\n kernel/extable.c | 12 +++++++++++-\n 7 files changed, 20 insertions(+), 1 deletion(-)\n" }, { "commit": "c16dbd54a3fe126b539a0ef149d80221c667bbd5", "tree": "297a9b616ac100d8773373bd0cbf3fb4eb9d87a7", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051", "c5fc472171ec4f96d06d1ac039d88f9b89bb95db" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 08:54:05 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 20 08:54:08 2011 +0200" }, "message": "Merge branch \u0027perf/core\u0027 into perf/urgent\n\nMerge reason: One pending commit was left in perf/core after Linus merged\n perf/core - continue v2.6.40 work in the perf/urgent reason.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e83b906c99eb87a11cd731f6726e60cd8ac9ec4b", "tree": "31074cac87503e4d66e732ab9ca5ee2648ac8d39", "parents": [ "880102e78547c1db158a17e36cf0cdd98e7ad710" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 15:37:22 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 15:37:22 2011 +1000" }, "message": "powerpc/pmac: Update via-pmu to new syscore_ops\n\nThis was left as a sysdev, breaking the build\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "880102e78547c1db158a17e36cf0cdd98e7ad710", "tree": "3fff9cc54c44dafe275cfabefb96c589e08d971d", "parents": [ "3d07f0e83d4323d2cd45cc583f7cf1957aca3cac", "39ab05c8e0b519ff0a04a869f065746e6e8c3d95" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 15:36:52 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 15:36:52 2011 +1000" }, "message": "Merge remote branch \u0027origin/master\u0027 into merge\n\nManual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()\ncall to arch/powerpc/platforms/cell/interrupt.c\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "7196cd6c3d4863000ef88b09f34d6dd75610ec3e", "tree": "141cc329914450896b57eedda72268bc92a60082", "parents": [ "d542fe27c86ecf932f40c898881208ccdaef9dc5" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 16:02:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 00:33:19 2011 -0400" }, "message": "tg3: Add braces around 5906 workaround.\n\nCommit dabc5c670d3f86d15ee4f42ab38ec5bd2682487d, entitled\n\"tg3: Move TSO_CAPABLE assignment\", moved some TSO flagging code around.\nIn the process it failed to add braces around an exceptional 5906\ncondition. This patch fixes the problem.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d542fe27c86ecf932f40c898881208ccdaef9dc5", "tree": "8ee74f4e1e4c4a9f279939d2fa528a557e7458af", "parents": [ "449f4544267e73d5db372971da63634707c32299" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 16:02:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 00:33:18 2011 -0400" }, "message": "tg3: Fix NETIF_F_LOOPBACK error\n\nMahesh Bandewar noticed that the features cleanup in commit\n0da0606f493c5cdab74bdcc96b12f4305ad94085, entitled\n\"tg3: Consolidate all netdev feature assignments\", mistakenly sets\nNETIF_F_LOOPBACK by default. This patch corrects the error.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Mahesh Bandewar \u003cmaheshb@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "449f4544267e73d5db372971da63634707c32299", "tree": "acee6de13f34c179ec46ef7f8a49e66b229f4460", "parents": [ "034cfe48d0efc248ba4b725e3a94b95e76fbc5d3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 19 12:24:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 00:33:18 2011 -0400" }, "message": "macvlan: remove one synchronize_rcu() call\n\nWhen one macvlan device is dismantled, we can avoid one\nsynchronize_rcu() call done after deletion from hash list, since caller\nwill perform a synchronize_net() call after its ndo_stop() call.\n\nAdd a new netdev-\u003edismantle field to signal this dismantle intent.\n\nReduces RTNL hold time.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "257313b2a87795e07a0bdf58d0fffbdba8b31051", "tree": "ff5043526b0381cdc1f1f68d3c6f8ed3635e0ddb", "parents": [ "044aea9b83614948c98564000db07d1d32b2d29b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 21:22:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 21:22:53 2011 -0700" }, "message": "selinux: avoid unnecessary avc cache stat hit count\n\nThere is no point in counting hits - we can calculate it from the number\nof lookups and misses.\n\nThis makes the avc statistics a bit smaller, and makes the code\ngeneration better too.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3d07f0e83d4323d2cd45cc583f7cf1957aca3cac", "tree": "279203d24b3a366ed6da93a3f9664409eb1a8488", "parents": [ "593adf317cf165f7c66facf2285db9d4befbd1c0", "bbfff72ee3e76bd4712b87386af00bfe97114bc9" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 13:43:47 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 13:43:47 2011 +1000" }, "message": "Merge remote branch \u0027kumar/next\u0027 into next\n" }, { "commit": "593adf317cf165f7c66facf2285db9d4befbd1c0", "tree": "e0dad2d05ea04cc44048766e47a6e6ef78f8db2f", "parents": [ "44075d95e2567ce7b454bc1a4cf264ff6afebe65" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Wed May 11 00:39:50 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 13:43:41 2011 +1000" }, "message": "powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors\n\nCommits a5d4f3ad3a (\"powerpc: Base support for exceptions using\nHSRR0/1\") and 673b189a2e (\"powerpc: Always use SPRN_SPRG_HSCRATCH0\nwhen running in HV mode\") cause compile and link errors for 32-bit\nclassic Book 3S processors when KVM is enabled. This fixes these\nerrors.\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "44075d95e2567ce7b454bc1a4cf264ff6afebe65", "tree": "8d72f5a6c5cb2753cc335796ae1d04e3f6605d0a", "parents": [ "f38aa708776aefd9e3ba7ec1211c07efe9fa3227" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Wed May 11 00:38:50 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri May 20 13:43:41 2011 +1000" }, "message": "powerpc/kvm: Fix kvmppc_core_pending_dec\n\nThe vcpu-\u003earch.pending_exceptions field is a bitfield indexed by\ninterrupt priority number as returned by kvmppc_book3s_vec2irqprio.\nHowever, kvmppc_core_pending_dec was using an interrupt vector shifted\nby 7 as the bit index. Fix it to use the irqprio value for the\ndecrementer interrupt instead. This problem was found by code\ninspection.\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "044aea9b83614948c98564000db07d1d32b2d29b", "tree": "b1f13ed2f4bb0bd40f7915a89aafaf449b6145cd", "parents": [ "39ab05c8e0b519ff0a04a869f065746e6e8c3d95" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:59:47 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:59:47 2011 -0700" }, "message": "selinux: de-crapify avc cache stat code generation\n\nYou can turn off the avc cache stats, but distributions seem to not do\nthat (perhaps because several performance tuning how-to\u0027s talk about the\navc cache statistics).\n\nWhich is sad, because the code it generates is truly horrendous, with\nthe statistics update being sandwitched between get_cpu/put_cpu which in\nturn causes preemption disables etc. We\u0027re talking ten+ instructions\njust to increment a per-cpu variable in some pretty hot code.\n\nFix the craziness by just using \u0027this_cpu_inc()\u0027 instead. Suddenly we\nonly need a single \u0027inc\u0027 instruction to increment the statistics. This\nis quite noticeable in the incredibly hot avc_has_perm_noaudit()\nfunction (which triggers all the statistics by virtue of doing an\navc_lookup() call).\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "39ab05c8e0b519ff0a04a869f065746e6e8c3d95", "tree": "e73f0ba74c4ea7a80dff9b2dd9445a3a74190e28", "parents": [ "1477fcc290b3d5c2614bde98bf3b1154c538860d", "c42d2237143fcf35cff642cefe2bcf7786aae312" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:24:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:24:11 2011 -0700" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)\n debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS\u003dy warning\n sysfs: remove \"last sysfs file:\" line from the oops messages\n drivers/base/memory.c: fix warning due to \"memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\"\n memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\n SYSFS: Fix erroneous comments for sysfs_update_group().\n driver core: remove the driver-model structures from the documentation\n driver core: Add the device driver-model structures to kerneldoc\n Translated Documentation/email-clients.txt\n RAW driver: Remove call to kobject_put().\n reboot: disable usermodehelper to prevent fs access\n efivars: prevent oops on unload when efi is not enabled\n Allow setting of number of raw devices as a module parameter\n Introduce CONFIG_GOOGLE_FIRMWARE\n driver: Google Memory Console\n driver: Google EFI SMI\n x86: Better comments for get_bios_ebda()\n x86: get_bios_ebda_length()\n misc: fix ti-st build issues\n params.c: Use new strtobool function to process boolean inputs\n debugfs: move to new strtobool\n ...\n\nFix up trivial conflicts in fs/debugfs/file.c due to the same patch\nbeing applied twice, and an unrelated cleanup nearby.\n" }, { "commit": "1477fcc290b3d5c2614bde98bf3b1154c538860d", "tree": "3d0614dac48924dd8c47afbbf1fa867c3719dcd4", "parents": [ "eb04f2f04ed1227c266b3219c0aaeda525639718" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Fri May 20 11:11:53 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:22:20 2011 -0700" }, "message": "signal.h need a definition of struct task_struct\n\nThis fixes these build errors on powerpc:\n\n In file included from arch/powerpc/mm/fault.c:18:\n include/linux/signal.h:239: error: \u0027struct task_struct\u0027 declared inside parameter list\n include/linux/signal.h:239: error: its scope is only this definition or declaration, which is probably not what you want\n include/linux/signal.h:240: error: \u0027struct task_struct\u0027 declared inside parameter list\n ..\n\nExposed by commit e66eed651fd1 (\"list: remove prefetching from regular\nlist iterators\"), which removed the include of \u003clinux/prefetch.h\u003e from\n\u003clinux/list.h\u003e.\n\nWithout that, linux/signal.h no longer accidentally got the declaration\nof \u0027struct task_struct\u0027.\n\nFix by properly declaring the struct, rather than introducing any new\nheader file dependency.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eb04f2f04ed1227c266b3219c0aaeda525639718", "tree": "7f224483a3cd0e439cd64a8666ec9dc5ed178a3d", "parents": [ "5765040ebfc9a28d9dcfaaaaf3d25840d922de96", "80d02085d99039b3b7f3a73c8896226b0cb1ba07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:14:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:14:34 2011 -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: (78 commits)\n Revert \"rcu: Decrease memory-barrier usage based on semi-formal proof\"\n net,rcu: convert call_rcu(prl_entry_destroy_rcu) to kfree\n batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu\n batman,rcu: convert call_rcu(neigh_node_free_rcu) to kfree()\n batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcu\n net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()\n net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()\n net/mac80211,rcu: convert call_rcu(work_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(phonet_device_rcu_free) to kfree_rcu()\n perf,rcu: convert call_rcu(swevent_hlist_release_rcu) to kfree_rcu()\n perf,rcu: convert call_rcu(free_ctx) to kfree_rcu()\n net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()\n net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu()\n net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()\n security,rcu: convert call_rcu(sel_netif_free) to kfree_rcu()\n net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()\n net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()\n net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()\n ...\n" }, { "commit": "5765040ebfc9a28d9dcfaaaaf3d25840d922de96", "tree": "6fd0c9950beb3c9730ede405269c9a47bbcbf877", "parents": [ "08839ff8276bd1ba0ce8b2d595f9fe62a5b07210", "de5397ad5b9ad22e2401c4dacdf1bb3b19c05679" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:10:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:10:17 2011 -0700" }, "message": "Merge branch \u0027x86-smep-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-smep-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, cpu: Enable/disable Supervisor Mode Execution Protection\n x86, cpu: Add SMEP CPU feature in CR4\n x86, cpufeature: Add cpufeature flag for SMEP\n" }, { "commit": "08839ff8276bd1ba0ce8b2d595f9fe62a5b07210", "tree": "468a056d2039eb368f3e73c8bfd8124c81dff8bb", "parents": [ "08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86", "660e34cebf0a11d54f2d5dd8838607452355f321", "0c61227094b3ddaca2f847ee287c4a2e3762b5a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:09:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:09:45 2011 -0700" }, "message": "Merge branches \u0027x86-reboot-for-linus\u0027 and \u0027x86-setup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-reboot-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Reorder reboot method preferences\n\n* \u0027x86-setup-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, setup: Fix EDD3.0 data verification.\n" }, { "commit": "08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86", "tree": "0d087f009b80bdf54f22fdb78437af790c1afc27", "parents": [ "13588209aa90d9c8e502750fc86160314555612f", "5d94e81f69d4b1d1102d3ab557ce0a817c11fbbb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:08:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:08:06 2011 -0700" }, "message": "Merge branch \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Introduce pci_map_biosrom()\n x86, olpc: Use device tree for platform identification\n" }, { "commit": "13588209aa90d9c8e502750fc86160314555612f", "tree": "91f5514aebf7244886070a6894c8e86c2b7ff4ce", "parents": [ "ac2941f59a38eeb535e1f227a8f90d7fe6b7828b", "dc382fd5bcca7098a984705ed6ac880f539d068e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:07:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:07:31 2011 -0700" }, "message": "Merge branch \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)\n x86, mm: Allow ZONE_DMA to be configurable\n x86, NUMA: Trim numa meminfo with max_pfn in a separate loop\n x86, NUMA: Rename setup_node_bootmem() to setup_node_data()\n x86, NUMA: Enable emulation on 32bit too\n x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit too\n x86, NUMA: Rename amdtopology_64.c to amdtopology.c\n x86, NUMA: Make numa_init_array() static\n x86, NUMA: Make 32bit use common NUMA init path\n x86, NUMA: Initialize and use remap allocator from setup_node_bootmem()\n x86-32, NUMA: Add @start and @end to init_alloc_remap()\n x86, NUMA: Remove long 64bit assumption from numa.c\n x86, NUMA: Enable build of generic NUMA init code on 32bit\n x86, NUMA: Move NUMA init logic from numa_64.c to numa.c\n x86-32, NUMA: Update numaq to use new NUMA init protocol\n x86-32, NUMA: Replace srat_32.c with srat.c\n x86-32, NUMA: implement temporary NUMA init shims\n x86, NUMA: Move numa_nodes_parsed to numa.[hc]\n x86-32, NUMA: Move get_memcfg_numa() into numa_32.c\n x86, NUMA: make srat.c 32bit safe\n x86, NUMA: rename srat_64.c to srat.c\n ...\n" }, { "commit": "ac2941f59a38eeb535e1f227a8f90d7fe6b7828b", "tree": "142bda3d1794da9c45e1327c30c7e5f6c5868fac", "parents": [ "016281880439a8665ecf37514865742da58131d4", "935a638241b0658b9749edd060f972575f9d4a78", "c387aa3a1a910ce00b86f3a85082d24f144db256", "983bbf1af0664b78689612b247acb514300f62c7", "dffa4b2f62ff28c982144c7033001b1ece4d3532" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:03:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:03:56 2011 -0700" }, "message": "Merge branches \u0027x86-efi-for-linus\u0027, \u0027x86-gart-for-linus\u0027, \u0027x86-irq-for-linus\u0027 and \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-efi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, efi: Ensure that the entirity of a region is mapped\n x86, efi: Pass a minimal map to SetVirtualAddressMap()\n x86, efi: Merge contiguous memory regions of the same type and attribute\n x86, efi: Consolidate EFI nx control\n x86, efi: Remove virtual-mode SetVirtualAddressMap call\n\n* \u0027x86-gart-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, gart: Don\u0027t enforce GART aperture lower-bound by alignment\n\n* \u0027x86-irq-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Don\u0027t unmask disabled irqs when migrating them\n x86: Skip migrating IRQF_PER_CPU irqs in fixup_irqs()\n\n* \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, mce: Drop the default decoding notifier\n x86, MCE: Do not taint when handling correctable errors\n" }, { "commit": "016281880439a8665ecf37514865742da58131d4", "tree": "2f6a757a581c71cfb8cd891e0583fbffb359830b", "parents": [ "17b141803c6c6e27fbade3f97c1c9d8d66c72866", "865be7a81071a77014c83cd01536c989eed362b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:55:12 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:55:12 2011 -0700" }, "message": "Merge branch \u0027x86-cpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-cpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, cpu: Fix detection of Celeron Covington stepping A1 and B0\n Documentation, ABI: Update L3 cache index disable text\n x86, AMD, cacheinfo: Fix L3 cache index disable checks\n x86, AMD, cacheinfo: Fix fallout caused by max3 conversion\n x86, cpu: Change NOP selection for certain Intel CPUs\n x86, cpu: Clean up and unify the NOP selection infrastructure\n x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4\n x86, cpu: Move AMD Elan Kconfig under \"Processor family\"\n\nFix up trivial conflicts in alternative handling (commit dc326fca2b64\n\"x86, cpu: Clean up and unify the NOP selection infrastructure\" removed\nsome hacky 5-byte instruction stuff, while commit d430d3d7e646 \"jump\nlabel: Introduce static_branch() interface\" renamed HAVE_JUMP_LABEL to\nCONFIG_JUMP_LABEL in the code that went away)\n" }, { "commit": "8a745f1f39b7a20047a362b67ce9151c07d14440", "tree": "f8f08be7a284d195f30a8b2e6fc63b714e4f7f21", "parents": [ "0afc6f5ba95419fd505e60637f7645425f16e407" ], "author": { "name": "Kristen Carlson Accardi", "email": "kristen@linux.intel.com", "time": "Fri Mar 04 10:24:11 2011 -0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@pobox.com", "time": "Thu May 19 20:50:53 2011 -0400" }, "message": "libata: Power off empty ports\n\nGive users the option of completely powering off unoccupied\nSATA ports using the existing min_power link_power_management_policy\noption. When the use selects this option on an empty port, we\nwill power the port off by setting DET to off. For occupied ports,\nbehavior is unchanged.\n\nSigned-off-by: Kristen Carlson Accardi \u003ckristen@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@pobox.com\u003e\n" }, { "commit": "17b141803c6c6e27fbade3f97c1c9d8d66c72866", "tree": "23ecc0e41e4b742883ee800a4725beff234d2eaa", "parents": [ "78c4def67e8eebe602655a3dec9aa08f0e2f7c4b", "2b398bd9f8f73be706b41adcbb240ce95793049a", "15d6aba24d88231415f4e7e091c0f1e60c3e6fd5", "8fab6af2156c0100f953fd61f4e0b2f82c9776dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:49:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:49:35 2011 -0700" }, "message": "Merge branches \u0027x86-apic-for-linus\u0027, \u0027x86-asm-for-linus\u0027 and \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-apic-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, apic: Print verbose error interrupt reason on apic\u003ddebug\n\n* \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Demacro CONFIG_PARAVIRT cpu accessors\n\n* \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Fix mrst sparse complaints\n x86: Fix spelling error in the memcpy() source code comment\n x86, mpparse: Remove unnecessary variable\n" }, { "commit": "0afc6f5ba95419fd505e60637f7645425f16e407", "tree": "3c14a2e304cbd2e6b1ae2b9085cd70034499ea2d", "parents": [ "bfeec8ca15c9c06c1978a25248e2bd11c4a26d72" ], "author": { "name": "Pavel Herrmann", "email": "morpheus.ibis@gmail.com", "time": "Thu Apr 28 22:32:54 2011 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@pobox.com", "time": "Thu May 19 20:48:59 2011 -0400" }, "message": "libata-pmp: add support for Thermaltake BlackX Duet esata drive dock\n\nSome errors still show up, but the dock works, both drives can be\naccessed at the same time\n\nThe chip maker and designation is unknown - possibly jmicron JMB350?\n\nSigned-off-by: Pavel Herrmann \u003cmorpheus.ibis@gmail.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@pobox.com\u003e\n" }, { "commit": "bfeec8ca15c9c06c1978a25248e2bd11c4a26d72", "tree": "433899d620fbb5542ced276e7b467d915ccf2e64", "parents": [ "5f4e206666f834340b69ddb43f86de3851c8675a" ], "author": { "name": "Mikulas Patocka", "email": "mikulas@artax.karlin.mff.cuni.cz", "time": "Sun May 15 22:33:19 2011 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@pobox.com", "time": "Thu May 19 20:46:40 2011 -0400" }, "message": "ATA: Don\u0027t powerdown Compaq Triflex IDE device on suspend\n\nDon\u0027t powerdown Compaq Triflex IDE device on suspend\n\nThis fixes APM suspend on Compaq Armada 7400.\nAPM BIOS doesn\u0027t suspend if IDE is powered down when suspending.\nThe Triflex controller is found only on old Compaq boards,\nso this patch will hopefully have no side effects.\n\nSigned-off-by: Mikulas Patocka \u003cmikulas@artax.karlin.mff.cuni.cz\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@pobox.com\u003e\n" }, { "commit": "5f4e206666f834340b69ddb43f86de3851c8675a", "tree": "f3e2d1a4430cbd9353b2959e3f00b4a1906ad467", "parents": [ "f68b3afe45051d43e9f9277c6f1404670e1b99d2" ], "author": { "name": "Martin K. Petersen", "email": "martin.petersen@oracle.com", "time": "Tue May 17 22:13:23 2011 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@pobox.com", "time": "Thu May 19 20:46:01 2011 -0400" }, "message": "libata: Use Maximum Write Same Length to report discard size limit\n\nPreviously we used Maximum Unmap LBA Count in the Block Limits VPD to\nsignal the maximum number of sectors we could handle in a single Write\nSame command.\n\nStarting with SBC3r26 the Block Limits VPD has an explicit limit on the\nnumber of blocks in a Write Same. This means we can stop abusing a field\nrelated to the Unmap command and let our SAT use the proper value in the\nVPD (Maximum Write Same Length).\n\nSigned-off-by: Martin K. Petersen \u003cmartin.petersen@oracle.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@pobox.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "f68b3afe45051d43e9f9277c6f1404670e1b99d2", "tree": "39127c1a3e92e326c8169b905f51f6c5558950bd", "parents": [ "0144261fa677e9490eb112231de30c95af1679d2" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu May 19 20:45:15 2011 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@pobox.com", "time": "Thu May 19 20:45:15 2011 -0400" }, "message": "drivers/ata/acard-ahci.c: fix enum warning\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "78c4def67e8eebe602655a3dec9aa08f0e2f7c4b", "tree": "8c0c756bbff7325f5c2a773f8cc64d8390ebe5b5", "parents": [ "7e6628e4bcb3b3546c625ec63ca724f28ab14f0c", "942c3c5c329274fa6de5998cb911cf3d0a42d0b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:45:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:45:08 2011 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n hrtimer: Make lookup table const\n RTC: Disable CONFIG_RTC_CLASS from being built as a module\n timers: Fix alarmtimer build issues when CONFIG_RTC_CLASS\u003dn\n timers: Remove delayed irqwork from alarmtimers implementation\n timers: Improve alarmtimer comments and minor fixes\n timers: Posix interface for alarm-timers\n timers: Introduce in-kernel alarm-timer interface\n timers: Add rb_init_node() to allow for stack allocated rb nodes\n time: Add timekeeping_inject_sleeptime\n" }, { "commit": "7e6628e4bcb3b3546c625ec63ca724f28ab14f0c", "tree": "111a94cefa9d800ec5c5e59520f4b5d1880965d0", "parents": [ "0f1bdc1815c4cb29b3cd71a7091b478e426faa0b", "ab0e08f15d23628dd8d50bf6ce1a935a8840c7dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:40 2011 -0700" }, "message": "Merge branch \u0027timers-clockevents-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-clockevents-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: hpet: Cleanup the clockevents init and register code\n x86: Convert PIT to clockevents_config_and_register()\n clockevents: Provide interface to reconfigure an active clock event device\n clockevents: Provide combined configure and register function\n clockevents: Restructure clock_event_device members\n clocksource: Get rid of the hardcoded 5 seconds sleep time limit\n clocksource: Restructure clocksource struct members\n" }, { "commit": "0f1bdc1815c4cb29b3cd71a7091b478e426faa0b", "tree": "b4d70c6a305d91bf7d1c8a6bbf87508587d55633", "parents": [ "80fe02b5daf176f99d3afc8f6c9dc9dece019836", "a18f22a968de17b29f2310cdb7ba69163e65ec15" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:13 2011 -0700" }, "message": "Merge branch \u0027timers-clocksource-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-clocksource-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n clocksource: convert mips to generic i8253 clocksource\n clocksource: convert x86 to generic i8253 clocksource\n clocksource: convert footbridge to generic i8253 clocksource\n clocksource: add common i8253 PIT clocksource\n blackfin: convert to clocksource_register_hz\n mips: convert to clocksource_register_hz/khz\n sparc: convert to clocksource_register_hz/khz\n alpha: convert to clocksource_register_hz\n microblaze: convert to clocksource_register_hz/khz\n ia64: convert to clocksource_register_hz/khz\n x86: Convert remaining x86 clocksources to clocksource_register_hz/khz\n Make clocksource name const\n" }, { "commit": "80fe02b5daf176f99d3afc8f6c9dc9dece019836", "tree": "970b90d56870e1b87b4c8efff7ec31fc454445a7", "parents": [ "df48d8716eab9608fe93924e4ae06ff110e8674f", "db670dac49b5423b39b5e523d28fe32045d71b10", "ec514c487c3d4b652943da7b0afbc094eee08cfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:41:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:41:22 2011 -0700" }, "message": "Merge branches \u0027sched-core-for-linus\u0027 and \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)\n sched: Fix and optimise calculation of the weight-inverse\n sched: Avoid going ahead if -\u003ecpus_allowed is not changed\n sched, rt: Update rq clock when unthrottling of an otherwise idle CPU\n sched: Remove unused parameters from sched_fork() and wake_up_new_task()\n sched: Shorten the construction of the span cpu mask of sched domain\n sched: Wrap the \u0027cfs_rq-\u003enr_spread_over\u0027 field with CONFIG_SCHED_DEBUG\n sched: Remove unused \u0027this_best_prio arg\u0027 from balance_tasks()\n sched: Remove noop in alloc_rt_sched_group()\n sched: Get rid of lock_depth\n sched: Remove obsolete comment from scheduler_tick()\n sched: Fix sched_domain iterations vs. RCU\n sched: Next buddy hint on sleep and preempt path\n sched: Make set_*_buddy() work on non-task entities\n sched: Remove need_migrate_task()\n sched: Move the second half of ttwu() to the remote cpu\n sched: Restructure ttwu() some more\n sched: Rename ttwu_post_activation() to ttwu_do_wakeup()\n sched: Remove rq argument from ttwu_stat()\n sched: Remove rq-\u003elock from the first half of ttwu()\n sched: Drop rq-\u003elock from sched_exec()\n ...\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Fix rt_rq runtime leakage bug\n" } ], "next": "df48d8716eab9608fe93924e4ae06ff110e8674f" }