)]}' { "log": [ { "commit": "61be7fdec2f51b99570cd5dcc30c7848c8e56513", "tree": "4a73ee635bc3e35dc54f75caddd26ffb6238bb5c", "parents": [ "12a81c8df13c60904febcafcf6b90ca1acb67122", "eb703f98191a505f78d0066712ad67d5dedc4c90" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Aug 05 08:45:05 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Aug 05 08:45:05 2010 +0200" }, "message": "Merge branch \u0027perf/nmi\u0027 into perf/core\n\nConflicts:\n\tkernel/Makefile\n\nMerge reason: Add the now complete topic, fix the conflict.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01", "tree": "a1a8cc85948c086aa12a1d8014151a7ca7c04ea8", "parents": [ "9fc3af467d0749989518a23f7289a6f44e5cb214", "9fe6206f400646a2322096b56c59891d530e8d51" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 02 08:29:56 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 02 08:31:54 2010 +0200" }, "message": "Merge commit \u0027v2.6.35\u0027 into perf/core\n\nConflicts:\n\ttools/perf/Makefile\n\ttools/perf/util/hist.c\n\nMerge reason: Resolve the conflicts and update to latest upstream.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "819ce45afebd77a9de736fa5304ba8352d11dff9", "tree": "6e63ac0ac561c85f241efe0656995464fc012a8e", "parents": [ "669336e4cf3e1cb95800f3f5924558a76d723c21" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Jul 20 18:41:24 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Mon Aug 02 01:31:28 2010 +0200" }, "message": "tracing: Drop cpparg() macro\n\nDrop the cpparg() macro that wraps CPP parameters. We already have\nthe PARAM() macro for that, no need to have several versions.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5", "tree": "f08c0c2dab44348919ec296254c3cc39d34e9f85", "parents": [ "a63ecd835f075b21d7d5cef9580447f5fbb36263" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Aug 01 13:40:40 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 01 15:10:01 2010 -0700" }, "message": "NFS: Fix a typo in include/linux/nfs_fs.h\n\nnfs_commit_inode() needs to be defined irrespectively of whether or not\nwe are supporting NFSv3 and NFSv4.\n\nAllow the compiler to optimise away code in the NFSv2-only case by\nconverting it into an inlined stub function.\n\nReported-and-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b608b283a962caaa280756bc8563016a71712acf", "tree": "217a745ab305219fab676d4a215c1a709004bd57", "parents": [ "674b2222920012244ca59978b356b25412a8dcc7" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Jul 30 15:31:54 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Jul 30 15:38:42 2010 -0400" }, "message": "NFS: kswapd must not block in nfs_release_page\n\nSee https://bugzilla.kernel.org/show_bug.cgi?id\u003d16056\n\nIf other processes are blocked waiting for kswapd to free up some memory so\nthat they can make progress, then we cannot allow kswapd to block on those\nprocesses.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "8f92054e7ca1d3a3ae50fb42d2253ac8730d9b2a", "tree": "29d1bcf78bf04fe41c7e811f806f58d655c41f9f", "parents": [ "de09a9771a5346029f4d11e4ac886be7f9bfdd75" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jul 29 12:45:55 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 29 15:16:18 2010 -0700" }, "message": "CRED: Fix __task_cred()\u0027s lockdep check and banner comment\n\nFix __task_cred()\u0027s lockdep check by removing the following validation\ncondition:\n\n\tlockdep_tasklist_lock_is_held()\n\nas commit_creds() does not take the tasklist_lock, and nor do most of the\nfunctions that call it, so this check is pointless and it can prevent\ndetection of the RCU lock not being held if the tasklist_lock is held.\n\nInstead, add the following validation condition:\n\n\ttask-\u003eexit_state \u003e\u003d 0\n\nto permit the access if the target task is dead and therefore unable to change\nits own credentials.\n\nFix __task_cred()\u0027s comment to:\n\n (1) discard the bit that says that the caller must prevent the target task\n from being deleted. That shouldn\u0027t need saying.\n\n (2) Add a comment indicating the result of __task_cred() should not be passed\n directly to get_cred(), but rather than get_task_cred() should be used\n instead.\n\nAlso put a note into the documentation to enforce this point there too.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de09a9771a5346029f4d11e4ac886be7f9bfdd75", "tree": "ccce9e75753c98a9f38075d54ab98aa4b89e66c7", "parents": [ "540ad6b62b3a188a53b51cac81d8a60d40e29fbd" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jul 29 12:45:49 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 29 15:16:17 2010 -0700" }, "message": "CRED: Fix get_task_cred() and task_state() to not resurrect dead credentials\n\nIt\u0027s possible for get_task_cred() as it currently stands to \u0027corrupt\u0027 a set of\ncredentials by incrementing their usage count after their replacement by the\ntask being accessed.\n\nWhat happens is that get_task_cred() can race with commit_creds():\n\n\tTASK_1\t\t\tTASK_2\t\t\tRCU_CLEANER\n\t--\u003eget_task_cred(TASK_2)\n\trcu_read_lock()\n\t__cred \u003d __task_cred(TASK_2)\n\t\t\t\t--\u003ecommit_creds()\n\t\t\t\told_cred \u003d TASK_2-\u003ereal_cred\n\t\t\t\tTASK_2-\u003ereal_cred \u003d ...\n\t\t\t\tput_cred(old_cred)\n\t\t\t\t call_rcu(old_cred)\n\t\t[__cred-\u003eusage \u003d\u003d 0]\n\tget_cred(__cred)\n\t\t[__cred-\u003eusage \u003d\u003d 1]\n\trcu_read_unlock()\n\t\t\t\t\t\t\t--\u003eput_cred_rcu()\n\t\t\t\t\t\t\t[__cred-\u003eusage \u003d\u003d 1]\n\t\t\t\t\t\t\tpanic()\n\nHowever, since a tasks credentials are generally not changed very often, we can\nreasonably make use of a loop involving reading the creds pointer and using\natomic_inc_not_zero() to attempt to increment it if it hasn\u0027t already hit zero.\n\nIf successful, we can safely return the credentials in the knowledge that, even\nif the task we\u0027re accessing has released them, they haven\u0027t gone to the RCU\ncleanup code.\n\nWe then change task_state() in procfs to use get_task_cred() rather than\ncalling get_cred() on the result of __task_cred(), as that suffers from the\nsame problem.\n\nWithout this change, a BUG_ON in __put_cred() or in put_cred_rcu() can be\ntripped when it is noticed that the usage count is not zero as it ought to be,\nfor example:\n\nkernel BUG at kernel/cred.c:168!\ninvalid opcode: 0000 [#1] SMP\nlast sysfs file: /sys/kernel/mm/ksm/run\nCPU 0\nPid: 2436, comm: master Not tainted 2.6.33.3-85.fc13.x86_64 #1 0HR330/OptiPlex\n745\nRIP: 0010:[\u003cffffffff81069881\u003e] [\u003cffffffff81069881\u003e] __put_cred+0xc/0x45\nRSP: 0018:ffff88019e7e9eb8 EFLAGS: 00010202\nRAX: 0000000000000001 RBX: ffff880161514480 RCX: 00000000ffffffff\nRDX: 00000000ffffffff RSI: ffff880140c690c0 RDI: ffff880140c690c0\nRBP: ffff88019e7e9eb8 R08: 00000000000000d0 R09: 0000000000000000\nR10: 0000000000000001 R11: 0000000000000040 R12: ffff880140c690c0\nR13: ffff88019e77aea0 R14: 00007fff336b0a5c R15: 0000000000000001\nFS: 00007f12f50d97c0(0000) GS:ffff880007400000(0000) knlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\nCR2: 00007f8f461bc000 CR3: 00000001b26ce000 CR4: 00000000000006f0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess master (pid: 2436, threadinfo ffff88019e7e8000, task ffff88019e77aea0)\nStack:\n ffff88019e7e9ec8 ffffffff810698cd ffff88019e7e9ef8 ffffffff81069b45\n\u003c0\u003e ffff880161514180 ffff880161514480 ffff880161514180 0000000000000000\n\u003c0\u003e ffff88019e7e9f28 ffffffff8106aace 0000000000000001 0000000000000246\nCall Trace:\n [\u003cffffffff810698cd\u003e] put_cred+0x13/0x15\n [\u003cffffffff81069b45\u003e] commit_creds+0x16b/0x175\n [\u003cffffffff8106aace\u003e] set_current_groups+0x47/0x4e\n [\u003cffffffff8106ac89\u003e] sys_setgroups+0xf6/0x105\n [\u003cffffffff81009b02\u003e] system_call_fastpath+0x16/0x1b\nCode: 48 8d 71 ff e8 7e 4e 15 00 85 c0 78 0b 8b 75 ec 48 89 df e8 ef 4a 15 00\n48 83 c4 18 5b c9 c3 55 8b 07 8b 07 48 89 e5 85 c0 74 04 \u003c0f\u003e 0b eb fe 65 48 8b\n04 25 00 cc 00 00 48 3b b8 58 04 00 00 75\nRIP [\u003cffffffff81069881\u003e] __put_cred+0xc/0x45\n RSP \u003cffff88019e7e9eb8\u003e\n---[ end trace df391256a100ebdd ]---\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8785eb1e7ca0292c04007fc7768e1599e0c6cef3", "tree": "8016acc3d90f4af72940ce3b85beaeb25fe8326d", "parents": [ "a6f80fb7b5986fda663d94079d3bba0937a6b6ff", "8b24599e72c9aee1ea1187e29cb9c5de9f449cce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 28 19:59:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 28 19:59:55 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:\n davinci: da850/omap-l138 evm: account for DEFDCDC{2,3} being tied high\n regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register\n wm8350-regulator: fix wm8350_register_regulator error handling\n ab3100: fix off-by-one value range checking for voltage selector\n" }, { "commit": "7d14831e21060fbfbfe8453460ac19205f4ce1c2", "tree": "f62423f7c13f9cfe1b555638dda8ab17fbca4777", "parents": [ "e9a1c5129de1caf4526b8df5f200ff628b2ffab4" ], "author": { "name": "Anuj Aggarwal", "email": "anuj.aggarwal@ti.com", "time": "Mon Jul 12 17:54:06 2010 +0530" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Wed Jul 28 15:09:26 2010 +0100" }, "message": "regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register\n\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n\nIn TPS6507x, depending on the status of DEFDCDC{2,3} pin either\nDEFDCDC{2,3}_LOW or DEFDCDC{2,3}_HIGH register needs to be read or\nprogrammed to change the output voltage.\n\nThe current driver assumes DEFDCDC{2,3} pins are always tied low\nand thus operates only on DEFDCDC{2,3}_LOW register. This need\nnot always be the case (as is found on OMAP-L138 EVM).\n\nUnfortunately, software cannot read the status of DEFDCDC{2,3} pins.\nSo, this information is passed through platform data depending on\nhow the board is wired.\n\nSigned-off-by: Anuj Aggarwal \u003canuj.aggarwal@ti.com\u003e\nSigned-off-by: Sekhar Nori \u003cnsekhar@ti.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "a376bca61096c7a79393e8125b7ad4757ccff19c", "tree": "87bb6aeff773e334a620b3a9aed6b2771cfb9bca", "parents": [ "1a041a23da7c77b53c71fe11b4f940388bee37b1", "5447080cfa3c77154498dfbf225367ac85b4c2b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 27 09:21:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 27 09:21:00 2010 -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 s2io: fixing DBG_PRINT() macro\n ath9k: fix dma direction for map/unmap in ath_rx_tasklet\n net: dev_forward_skb should call nf_reset\n net sched: fix race in mirred device removal\n tun: avoid BUG, dump packet on GSO errors\n bonding: set device in RLB ARP packet handler\n wimax/i2400m: Add PID \u0026 VID for Intel WiMAX 6250\n ipv6: Don\u0027t add routes to ipv6 disabled interfaces.\n net: Fix skb_copy_expand() handling of -\u003ecsum_start\n net: Fix corruption of skb csum field in pskb_expand_head() of net/core/skbuff.c\n macvtap: Limit packet queue length\n ixgbe/igb: catch invalid VF settings\n bnx2x: Advance a module version\n bnx2x: Protect statistics ramrod and sequence number\n bnx2x: Protect a SM state change\n wireless: use netif_rx_ni in ieee80211_send_layer2_update\n" }, { "commit": "dbbe4649d683577de1063dbd9f6da7d4b8de2fed", "tree": "039ff36f35190cbbf235afdaf90d66d4e78fbd07", "parents": [ "24b1442d01ae155ea716dfb94ed21605541c317d", "0e1cf38889110a7188999388614aef17a84d9d25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 26 08:10:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 26 08:10:00 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI / Sleep: Allow the NVS saving to be skipped during suspend to RAM\n ACPI: create \"processor.bm_check_disable\" boot param\n ACPI: skip checking BM_STS if the BIOS doesn\u0027t ask for it\n ACPI: fix unused function warning\n ACPI: processor: fix processor_physically_present on UP\n ACPI video: fix string mismatch for Sony SR290 laptop\n ACPI battery: don\u0027t invoke power_supply_changed twice when battery is hot-added\n ACPI: handle systems which asynchoronously enable ACPI mode\n" }, { "commit": "3b87956ea645fb4de7e59c7d0aa94de04be72615", "tree": "0dde04e6dfad7cd76afbb31eff72a8f08a574a9c", "parents": [ "76ac21f5ef30e46397e405695eb1240ff0955209" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jul 22 18:45:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 24 21:04:20 2010 -0700" }, "message": "net sched: fix race in mirred device removal\n\nThis fixes hang when target device of mirred packet classifier\naction is removed.\n\nIf a mirror or redirection action is configured to cause packets\nto go to another device, the classifier holds a ref count, but was assuming\nthe adminstrator cleaned up all redirections before removing. The fix\nis to add a notifier and cleanup during unregister.\n\nThe new list is implicitly protected by RTNL mutex because\nit is held during filter add/delete as well as notifier.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0e1cf38889110a7188999388614aef17a84d9d25", "tree": "828ba587fc124a2c28cb52d2b6a8ea07e4b57079", "parents": [ "bbac30edb39a80426e4a3420a5ec635eb4466f63", "72ad5d77fb981963edae15eee8196c80238f5ed0" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jul 24 23:26:22 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jul 24 23:26:22 2010 -0400" }, "message": "Merge branch \u0027bugzilla-16396\u0027 into release\n" }, { "commit": "72ad5d77fb981963edae15eee8196c80238f5ed0", "tree": "a6fa9a0b9ba924fd2dd91debf3e8ab04e8084338", "parents": [ "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jul 23 22:59:09 2010 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jul 24 23:26:09 2010 -0400" }, "message": "ACPI / Sleep: Allow the NVS saving to be skipped during suspend to RAM\n\nCommit 2a6b69765ad794389f2fc3e14a0afa1a995221c2\n(ACPI: Store NVS state even when entering suspend to RAM) caused the\nACPI suspend code save the NVS area during suspend and restore it\nduring resume unconditionally, although it is known that some systems\nneed to use acpi_sleep\u003ds4_nonvs for hibernation to work. To allow\nthe affected systems to avoid saving and restoring the NVS area\nduring suspend to RAM and resume, introduce kernel command line\noption acpi_sleep\u003dnonvs and make acpi_sleep\u003ds4_nonvs work as its\nalias temporarily (add acpi_sleep\u003ds4_nonvs to the feature removal\nfile).\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16396 .\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-and-tested-by: tomas m \u003ctmezzadra@gmail.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "86c65a7857896b1de99628ad392556965c4841e6", "tree": "8cb153af048348261f7244600076a44354ec94c9", "parents": [ "20a52d4f5998f4804af7c27651490647da62fd08", "7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 23 13:26:16 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 23 13:26:16 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)\n powerpc: Fix erroneous lmb-\u003ememblock conversions\n powerpc/mm: Add some debug output when hash insertion fails\n powerpc/mm: Fix bugs in huge page hashing\n powerpc/mm: Move around testing of _PAGE_PRESENT in hash code\n powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge\n powerpc/kexec: Fix boundary case for book-e kexec memory limits\n" }, { "commit": "339a2afcaafb16d6a07a859d7cc6078f9bfeca91", "tree": "bc0555929c2ea50a7716ef980f197d76585527b8", "parents": [ "b37fa16e78d6f9790462b3181602a26b5af36260", "8a4fd31e0e8dc33f00b8949a12ac56310bac57bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 23 13:24:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 23 13:24:02 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf tools: Fix fallback to cplus_demangle() when bfd_demangle() is not available\n perf annotate: Fix handling of goto labels that are valid hex numbers\n tracing: Properly align linker defined symbols\n perf symbols: Fix directory descriptor leaking\n perf: Fix various display bugs with parent filtering\n" }, { "commit": "3a01736e70a7d629140695ba46a901266b4460cc", "tree": "49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253", "parents": [ "4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb", "24a461d537f49f9da6533d83100999ea08c6c755" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jul 23 09:10:29 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jul 23 09:10:29 2010 +0200" }, "message": "Merge branch \u0027tip/perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core\n" }, { "commit": "da5e37efe8704fc2b354626467f80f73c5e3c020", "tree": "093fdbf2ef2d30e6405ceaaa2ccfbe658a7fdd7b", "parents": [ "3fdfd99051fbc210464378cd44a4b8914282bac3" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Tue Jul 13 11:39:42 2010 +0200" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jul 23 13:45:12 2010 +1000" }, "message": "vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)\n\nThe .data..init_task output section was missing\na load offset causing a popwerpc target to fail to boot.\n\nSean MacLennan tracked it down to the definition of\nINIT_TASK_DATA_SECTION().\n\nThere are only two users of INIT_TASK_DATA_SECTION()\nin the kernel today: cris and popwerpc.\ncris do not support relocatable kernels and is thus not\nimpacted by this change.\n\nFix INIT_TASK_DATA_SECTION() to specify load offset like\nall other output sections.\n\nReported-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "4a973f2495fba8775d1c408b3ee7f2c19b19f13f", "tree": "302484851e44029a208cce8c79294a82f25561d9", "parents": [ "be48b11573952b467676b24de87d637e33339e7d", "d3e7e99f2faf9f44ec0a3379f735b41c9173dfa1" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Thu Jul 22 18:18:28 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Thu Jul 22 18:18:28 2010 -0400" }, "message": "Merge branch \u0027bugzilla-15886\u0027 into release\n" }, { "commit": "718be4aaf3613cf7c2d097f925abc3d3553c0605", "tree": "feaf57a034684a6742198a5cf10e8e05ed1cb10f", "parents": [ "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Thu Jul 22 16:54:27 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Thu Jul 22 16:54:27 2010 -0400" }, "message": "ACPI: skip checking BM_STS if the BIOS doesn\u0027t ask for it\n\nIt turns out that there is a bit in the _CST for Intel FFH C3\nthat tells the OS if we should be checking BM_STS or not.\n\nLinux has been unconditionally checking BM_STS.\nIf the chip-set is configured to enable BM_STS,\nit can retard or completely prevent entry into\ndeep C-states -- as illustrated by turbostat:\n\nhttp://userweb.kernel.org/~lenb/acpi/utils/pmtools/turbostat/\n\nref: Intel Processor Vendor-Specific ACPI Interface Specification\ntable 4 \"_CST FFH GAS Field Encoding\"\nBit 1: Set to 1 if OSPM should use Bus Master avoidance for this C-state\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d15886\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "8a35747a5d13b99e076b0222729e0caa48cb69b6", "tree": "387e2840fe46edd9cc36027cf188778f2c5ab1ff", "parents": [ "bded64a7ff82f6af56426a4ff2483888e5ad5fe9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jul 21 21:44:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:08:56 2010 -0700" }, "message": "macvtap: Limit packet queue length\n\nMark Wagner reported OOM symptoms when sending UDP traffic over\na macvtap link to a kvm receiver.\n\nThis appears to be caused by the fact that macvtap packet queues\nare unlimited in length. This means that if the receiver can\u0027t\nkeep up with the rate of flow, then we will hit OOM. Of course\nit gets worse if the OOM killer then decides to kill the receiver.\n\nThis patch imposes a cap on the packet queue length, in the same\nway as the tuntap driver, using the device TX queue length.\n\nPlease note that macvtap currently has no way of giving congestion\nnotification, that means the software device TX queue cannot be\nused and packets will always be dropped once the macvtap driver\nqueue fills up.\n\nThis shouldn\u0027t be a great problem for the scenario where macvtap\nis used to feed a kvm receiver, as the traffic is most likely\nexternal in origin so congestion notification can\u0027t be applied\nanyway.\n\nOf course, if anybody decides to complain about guest-to-guest\nUDP packet loss down the track, then we may have to revisit this.\n\nIncidentally, this patch also fixes a real memory leak when\nmacvtap_get_queue fails.\n\nChris Wright noticed that for this patch to work, we need a\nnon-zero TX queue length. This patch includes his work to change\nthe default macvtap TX queue length to 500.\n\nReported-by: Mark Wagner \u003cmwagner@redhat.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e916beab22e00d95345bfa4f48981f2c88885f61", "tree": "8a50022d6ad51fe3d328f6987adf61a210fd3b08", "parents": [ "4c0c03ca54f72fdd5912516ad0a23ec5cf01bda7", "edd63cb6b91024332d6983fc51058ac1ef0c081e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:44:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:44:26 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:\n sysrq,kdb: Use __handle_sysrq() for kdb\u0027s sysrq function\n debug_core,kdb: fix kgdb_connected bit set in the wrong place\n Fix merge regression from external kdb to upstream kdb\n repair gdbstub to match the gdbserial protocol specification\n kdb: break out of kdb_ll() when command is terminated\n" }, { "commit": "4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb", "tree": "f01c367d4cca879d39fe42704c6a9f047518dfdf", "parents": [ "23c2875725ebb03e58e598754309e198648f608a" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Tue Jul 20 16:59:34 2010 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jul 22 12:08:27 2010 +0200" }, "message": "x86 cpufreq, perf: Make trace_power_frequency cpufreq driver independent\n\nand fix the broken case if a core\u0027s frequency depends on others.\n\ntrace_power_frequency was only implemented in a rather ungeneric\nway in acpi-cpufreq driver\u0027s target() function only.\n\n-\u003e Move the call to trace_power_frequency to\n cpufreq.c:cpufreq_notify_transition() where CPUFREQ_POSTCHANGE\n notifier is triggered.\n This will support power frequency tracing by all cpufreq\n drivers.\n\ntrace_power_frequency did not trace frequency changes correctly\nwhen the userspace governor was used or when CPU cores\u0027\nfrequency depend on each other.\n\n-\u003e Moving this into the CPUFREQ_POSTCHANGE notifier and pass the cpu\n which gets switched automatically fixes this.\n\nRobert Schoene provided some important fixes on top of my\ninitial quick shot version which are integrated in this patch:\n- Forgot some changes in power_end trace (TP_printk/variable names)\n- Variable dummy in power_end must now be cpu_id\n- Use static 64 bit variable instead of unsigned int for cpu_id\n\n[akpm@linux-foundation.org: build fix]\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nCc: davej@codemonkey.org.uk\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Dave Jones \u003cdavej@codemonkey.org.uk\u003e\nAcked-by: Arjan van de Ven \u003carjan@infradead.org\u003e\nCc: Robert Schoene \u003crobert.schoene@tu-dresden.de\u003e\nTested-by: Robert Schoene \u003crobert.schoene@tu-dresden.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "edd63cb6b91024332d6983fc51058ac1ef0c081e", "tree": "2df04fc5dc35899aa7d4f4c52197f7b492c16c8b", "parents": [ "b0679c63db655fa12007558e267bc0eb1d486fdb" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "message": "sysrq,kdb: Use __handle_sysrq() for kdb\u0027s sysrq function\n\nThe kdb code should not toggle the sysrq state in case an end user\nwants to try and resume the normal kernel execution.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "23c2875725ebb03e58e598754309e198648f608a", "tree": "35f9ffe9e7b52624642cb651687dea5faf5dc6a3", "parents": [ "9dcdbf7a33d9018ac5d45debcf261be648bdd56a", "b444786f1a797a7f84e2561346a670649f9c7b3c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:44:18 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:44:18 2010 +0200" }, "message": "Merge branch \u0027perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core\n" }, { "commit": "9dcdbf7a33d9018ac5d45debcf261be648bdd56a", "tree": "bbcc1a018f11ff76cd7ce174ef3ffe2c02da07ee", "parents": [ "cc5edb0eb9ce892b530e34a5d110382483587942", "cd5b8f8755a89a57fc8c408d284b8b613f090345" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:43:03 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:43:06 2010 +0200" }, "message": "Merge branch \u0027linus\u0027 into perf/core\n\nMerge reason: Pick up the latest perf fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "95977d0ef23ee37990ce8704dfd6c61eab02a548", "tree": "d3bb7133f8f51f8e48c0c74ee28c14deb45fedbe", "parents": [ "a4ce96ac356e7024a7724ade9d18ba1bdf3c5c06", "f8324e20f8289dffc646d64366332e05eaacab25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n math-emu: correct test for downshifting fraction in _FP_FROM_INT()\n perf: Add DWARF register lookup for sparc\n MAINTAINERS: Add SBUS driver path to sparc entry.\n drivers/sbus: Remove unnecessary casts of private_data\n sparc: remove homegrown L1_CACHE_ALIGN macro\n sparc64: fix the build error due to smp_kgdb_capture_client()\n sparc64: Fix maybe_change_configuration() PCR setting.\n arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference\n sparc64: Update defconfig.\n sunsu: Fix use after free in su_remove().\n sunserial: Don\u0027t call add_preferred_console() when console\u003d is specified.\n sparc32: Kill none_mask, it\u0027s bogus.\n" }, { "commit": "9849ed4d72251d273524efb8b70be0be9aecb1df", "tree": "8162927a3f8a35e543cc1937e07c2354b34a9e96", "parents": [ "ef710e100c1068d3dd5774d2b34c5485219e06ce" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue Jul 20 03:13:35 2010 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Wed Jul 21 11:00:25 2010 -0400" }, "message": "tracing/documentation: Document dynamic ftracer internals\n\nAdd more details to the dynamic function tracing design implementation.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nLKML-Reference: \u003c1279610015-10250-1-git-send-email-vapier@gentoo.org\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "bc289ae98b75d93228d24f521ef02a076e506e94", "tree": "50d151d0fbde1b106932c0f80a2639839d261ca3", "parents": [ "985023dee6e212493831431ba2e3ce8918f001b2" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Thu Jun 03 18:26:24 2010 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jul 20 22:05:34 2010 -0400" }, "message": "tracing: Reduce latency and remove percpu trace_seq\n\n__print_flags() and __print_symbolic() use percpu trace_seq:\n\n1) Its memory is allocated at compile time, it wastes memory if we don\u0027t use tracing.\n2) It is percpu data and it wastes more memory for multi-cpus system.\n3) It disables preemption when it executes its core routine\n \"trace_seq_printf(s, \"%s: \", #call);\" and introduces latency.\n\nSo we move this trace_seq to struct trace_iterator.\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4C078350.7090106@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "e870e9a1240bcef1157ffaaf71dac63362e71904", "tree": "b8f57a68ff45b35dab8cdfa474e17622d275bdc6", "parents": [ "cc5edb0eb9ce892b530e34a5d110382483587942" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Jul 02 11:07:32 2010 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jul 20 21:52:33 2010 -0400" }, "message": "tracing: Allow to disable cmdline recording\n\nWe found that even enabling a single trace event that will rarely be\ntriggered can add big overhead to context switch.\n\n(lmbench context switch test)\n -------------------------------------------------\n 2p/0K 2p/16K 2p/64K 8p/16K 8p/64K 16p/16K 16p/64K\n ctxsw ctxsw ctxsw ctxsw ctxsw ctxsw ctxsw\n------ ------ ------ ------ ------ ------- -------\n 2.19 2.3 2.21 2.56 2.13 2.54 2.07\n 2.39 2.51 2.35 2.75 2.27 2.81 2.24\n\nThe overhead is 6% ~ 11%.\n\nIt\u0027s because when a trace event is enabled 3 tracepoints (sched_switch,\nsched_wakeup, sched_wakeup_new) will be activated to map pid to cmdname.\n\nWe\u0027d like to avoid this overhead, so add a trace option \u0027(no)record-cmd\u0027\nto allow to disable cmdline recording.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4C2D57F4.2050204@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "f8324e20f8289dffc646d64366332e05eaacab25", "tree": "30e18d0e515f5dae2e8697f2df8174270ba2cb77", "parents": [ "1fa6ac379c6353faa628703b7ed1ee3e2023ef75" ], "author": { "name": "Mikael Pettersson", "email": "mikpe@it.uu.se", "time": "Tue Jul 20 18:45:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:45:14 2010 -0700" }, "message": "math-emu: correct test for downshifting fraction in _FP_FROM_INT()\n\nThe kernel\u0027s math-emu code contains a macro _FP_FROM_INT() which is\nused to convert an integer to a raw normalized floating-point value.\nIt does this basically in three steps:\n\n1. Compute the exponent from the number of leading zero bits.\n2. Downshift large fractions to put the MSB in the right position\n for normalized fractions.\n3. Upshift small fractions to put the MSB in the right position.\n\nThere is an boundary error in step 2, causing a fraction with its\nMSB exactly one bit above the normalized MSB position to not be\ndownshifted. This results in a non-normalized raw float, which when\npacked becomes a massively inaccurate representation for that input.\n\nThe impact of this depends on a number of arch-specific factors,\nbut it is known to have broken emulation of FXTOD instructions\non UltraSPARC III, which was originally reported as GCC bug 44631\n\u003chttp://gcc.gnu.org/bugzilla/show_bug.cgi?id\u003d44631\u003e.\n\nAny arch which uses math-emu to emulate conversions from integers to\nsame-size floats may be affected.\n\nThe fix is simple: the exponent comparison used to determine if the\nfraction should be downshifted must be \"\u003c\u003d\" not \"\u003c\".\n\nI\u0027m sending a kernel module to test this as a reply to this message.\nThere are also SPARC user-space test cases in the GCC bug entry.\n\nSigned-off-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96", "tree": "cadf0fd7e2bcb2d2d2402fcddbda3ec9b53b2c0c", "parents": [ "e0959371b4aaddb9b986019d5cfef93f9801d0ff", "c42750b0261274107ae85c894c088e618a3e38b9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 18:29:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 18:29:25 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/r600: fix possible NULL pointer derefernce\n drm/radeon/kms: add quirk for ASUS HD 3600 board\n include/linux/vgaarb.h: add missing part of include guard\n drm/nouveau: Fix crashes during fbcon init on single head cards.\n drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch\n drm/radeon/kms: fix shared ddc harder\n drm/i915: enable low power render writes on GEN3 hardware.\n drm/i915: Define MI_ARB_STATE bits\n vmwgfx: return -EFAULT if copy_to_user fails\n fb: handle allocation failure in alloc_apertures()\n drm: radeon: check kzalloc() result\n drm/ttm: Fix build on architectures without AGP\n drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics\n drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740\n drm/radeon/kms: fix legacy tv-out pal mode\n" }, { "commit": "a6a1a095ec8ace2912fc280d371eee8ff5da5736", "tree": "35aa89867cddb3480f83aacd0c90f2fee1ab5c94", "parents": [ "7173aeff025a7fed3fa903e362bf773e6258dd47" ], "author": { "name": "Doug Goldstein", "email": "cardoe@gentoo.org", "time": "Tue Jul 20 15:22:25 2010 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 09:51:15 2010 +1000" }, "message": "include/linux/vgaarb.h: add missing part of include guard\n\nvgaarb.h was missing the #define of the #ifndef at the top for the guard\nto prevent multiple #include\u0027s from causing re-define errors\n\nSigned-off-by: Doug Goldstein \u003ccardoe@gentoo.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "516bd664153d76f5c814633cee6500e2ff8e861b", "tree": "f67a1c70b013961849d3491ef22596cd0b0d9af9", "parents": [ "844b9a8707f1fcf0482e0c52f44a555e799ccda6", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -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: (24 commits)\n bridge: Partially disable netpoll support\n tcp: fix crash in tcp_xmit_retransmit_queue\n IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())\n ibmveth: lost IRQ while closing/opening device leads to service loss\n rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()\n vhost: avoid pr_err on condition guest can trigger\n ipmr: Don\u0027t leak memory if fib lookup fails.\n vhost-net: avoid flush under lock\n net: fix problem in reading sock TX queue\n net/core: neighbour update Oops\n net: skb_tx_hash() fix relative to skb_orphan_try()\n rfs: call sock_rps_record_flow() in tcp_splice_read()\n xfrm: do not assume that template resolving always returns xfrms\n hostap_pci: set dev-\u003ebase_addr during probe\n axnet_cs: use spin_lock_irqsave in ax_interrupt\n dsa: Fix Kconfig dependencies.\n act_nat: not all of the ICMP packets need an IP header payload\n r8169: incorrect identifier for a 8168dp\n Phonet: fix skb leak in pipe endpoint accept()\n Bluetooth: Update sec_level/auth_type for already existing connections\n ...\n" }, { "commit": "844b9a8707f1fcf0482e0c52f44a555e799ccda6", "tree": "c9c095c123c2988b014e39b461eb04411b3a197d", "parents": [ "9d51a6b2487724e8713cd2794cf09ffeee5f6932" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Jul 20 13:24:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:41 2010 -0700" }, "message": "vfs: fix RCU-lockdep false positive due to /proc\n\nIf a single-threaded process does a file-descriptor operation, and some\nother process accesses that same file descriptor via /proc, the current\nrcu_dereference_check_fdtable() can give a false-positive RCU-lockdep\nsplat due to the reference count being increased by the /proc access after\nthe reference-count check in fget_light() but before the check in\nrcu_dereference_check_fdtable().\n\nThis commit prevents this false positive by checking for a single-threaded\nprocess. To avoid #include hell, this commit uses the wrapper for\nthread_group_empty(current) defined by rcu_my_thread_group_empty()\nprovided in a separate commit.\n\nLocated-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nLocated-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "07fca0e57fca925032526349f4370f97ed580cc9", "tree": "04d8d6cbc89936c877cb385b300a6a1bacf57ae6", "parents": [ "74534341c1214ac5993904680616afe698dde3b6" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Jul 10 08:35:00 2010 +0200" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jul 20 19:02:52 2010 -0400" }, "message": "tracing: Properly align linker defined symbols\n\nWe define a number of symbols in the linker scipt like this:\n\n __start_syscalls_metadata \u003d .;\n *(__syscalls_metadata)\n\nBut we do not know the alignment of \".\" when we assign\nthe __start_syscalls_metadata symbol.\ngcc started to uses bigger alignment for structs (32 bytes),\nso we saw situations where the linker due to alignment\nconstraints increased the value of \".\" after the symbol assignment.\n\nThis resulted in boot fails.\n\nFix this by forcing a 32 byte alignment of \".\" before the\nassignment.\n\nThis patch introduces the forced alignment for\nftrace_events and syscalls_metadata.\nIt may be required in more places.\n\nReported-by: Zeev Tarantov \u003czeev.tarantov@gmail.com\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nLKML-Reference: \u003c20100710063459.GA14596@merkur.ravnborg.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "eb7beb5c09af75494234ea6acd09d0a647cf7338", "tree": "ab76cb3a6c1f1ea9befbbc72d0f997c03423dd57", "parents": [ "f376bf5ffbad863d4bc3b2586b7e34cdf756ad17" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Jul 16 00:50:03 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Jul 20 14:31:07 2010 +0200" }, "message": "tracing: Remove special traces\n\nSpecial traces type was only used by sysprof. Lets remove it now\nthat sysprof ftrace plugin has been dropped.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Soeren Sandmann \u003csandmann@daimi.au.dk\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "772a2f9b488f4d27c314da5eeabde750b9ead41b", "tree": "2cb96edb617d659b26cad8c603d664cfa0cd1373", "parents": [ "bbb642f9c9a43dbe45ffe14935397a2a34100263" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu Jul 15 10:39:47 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 15:24:09 2010 +1000" }, "message": "fb: handle allocation failure in alloc_apertures()\n\nIf the kzalloc() fails we should return NULL. All the places that call\nalloc_apertures() check for this already.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: James Simmons \u003cjsimmons@infradead.org\u003e\nAcked-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7f8275d0d660c146de6ee3017e1e2e594c49e820", "tree": "884db927118b44102750b5168ee36ef4b8b5cb4e", "parents": [ "d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Mon Jul 19 14:56:17 2010 +1000" }, "committer": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Mon Jul 19 14:56:17 2010 +1000" }, "message": "mm: add context argument to shrinker callback\n\nThe current shrinker implementation requires the registered callback\nto have global state to work from. This makes it difficult to shrink\ncaches that are not global (e.g. per-filesystem caches). Pass the shrinker\nstructure to the callback so that users can embed the shrinker structure\nin the context the shrinker needs to operate on and get back to it in the\ncallback via container_of().\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "2044f2282d7558c765270d78e19dbdcf6190ca71", "tree": "03b2c4d211fa8e7e2ef8c489d28a16442f030d57", "parents": [ "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d", "58c84eda07560a6b75b03e8d3b26d6eddfc14011" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: fall back to original BIOS BAR addresses\n" }, { "commit": "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d", "tree": "39f23bd918c4dcda4359ebd9b8f188b9cb5e25b1", "parents": [ "cd9f040df6ce46573760a507cb88192d05d27d86", "5453258d532e72731b0829e4fefd36dd611a2fff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 10:09:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 10:09:25 2010 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:\n ocfs2: Silence gcc warning in ocfs2_write_zero_page().\n jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions\n ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node\n ocfs2: Don\u0027t duplicate pages past i_size during CoW.\n ocfs2: tighten up strlen() checking\n ocfs2: Make xattr reflink work with new local alloc reservation.\n ocfs2: make xattr extension work with new local alloc reservation.\n ocfs2: Remove the redundant cpu_to_le64.\n ocfs2/dlm: don\u0027t access beyond bitmap size\n ocfs2: No need to zero pages past i_size.\n ocfs2: Zero the tail cluster when extending past i_size.\n ocfs2: When zero extending, do it by page.\n ocfs2: Limit default local alloc size within bitmap range.\n ocfs2: Move orphan scan work to ocfs2_wq.\n fs/ocfs2/dlm: Add missing spin_unlock\n" }, { "commit": "58c84eda07560a6b75b03e8d3b26d6eddfc14011", "tree": "0104345d24d5fb79842ffd563ea69fdf2906931d", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe" ], "author": { "name": "Bjorn Helgaas", "email": "bjorn.helgaas@hp.com", "time": "Thu Jul 15 09:41:42 2010 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 16 11:39:48 2010 -0700" }, "message": "PCI: fall back to original BIOS BAR addresses\n\nIf we fail to assign resources to a PCI BAR, this patch makes us try the\noriginal address from BIOS rather than leaving it disabled.\n\nLinux tries to make sure all PCI device BARs are inside the upstream\nPCI host bridge or P2P bridge apertures, reassigning BARs if necessary.\nWindows does similar reassignment.\n\nBefore this patch, if we could not move a BAR into an aperture, we left\nthe resource unassigned, i.e., at address zero. Windows leaves such BARs\nat the original BIOS addresses, and this patch makes Linux do the same.\n\nThis is a bit ugly because we disable the resource long before we try to\nreassign it, so we have to keep track of the BIOS BAR address somewhere.\nFor lack of a better place, I put it in the struct pci_dev.\n\nI think it would be cleaner to attempt the assignment immediately when the\nclaim fails, so we could easily remember the original address. But we\ncurrently claim motherboard resources in the middle, after attempting to\nclaim PCI resources and before assigning new PCI resources, and changing\nthat is a fairly big job.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16263\n\nReported-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nTested-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nSigned-off-by: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "f469461df6ff822f71b8737bda86eea20f16ff93", "tree": "d7605dd5846725ed6949621084a5652782d9b02d", "parents": [ "79140bc486fac016249f3d1d67ec9a39ebed9ad9", "44a54f787c0abcf75a2ed49b8ec8b2b512468f73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 11:26:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 11:26:33 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing: Add alignment to syscall metadata declarations\n perf: Sync callchains with period based hits\n perf: Resurrect flat callchains\n perf: Version String fix, for fallback if not from git\n perf: Version String fix, using kernel version\n" }, { "commit": "cc10b6ffd39ef982f86de68d95e5811df82cf819", "tree": "cb6f24f40d0211513321b5230b87efc022aeed1f", "parents": [ "042bd1ff6cf255e71689db913786dbb6bb79542d", "5b39187fad6faefae5ce1a1e997651d4e382b135" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: w90p910_ts - fix call to setup_timer()\n Input: synaptics - fix wrong dimensions check\n Input: i8042 - mark stubs in i8042.h \"static inline\"\n" }, { "commit": "13ceef099edd2b70c5a6f3a9ef5d6d97cda2e096", "tree": "5d65c397e9e85abe11a6fb0ebf3a69e8a4e91e0d", "parents": [ "a39953dd95ff10e311083d94f4f95c348cb22464" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Jul 14 07:56:33 2010 +0200" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 15 15:17:47 2010 -0700" }, "message": "jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions\n\nOCFS2 uses t_commit trigger to compute and store checksum of the just\ncommitted blocks. When a buffer has b_frozen_data, checksum is computed\nfor it instead of b_data but this can result in an old checksum being\nwritten to the filesystem in the following scenario:\n\n1) transaction1 is opened\n2) handle1 is opened\n3) journal_access(handle1, bh)\n - This sets jh-\u003eb_transaction to transaction1\n4) modify(bh)\n5) journal_dirty(handle1, bh)\n6) handle1 is closed\n7) start committing transaction1, opening transaction2\n8) handle2 is opened\n9) journal_access(handle2, bh)\n - This copies off b_frozen_data to make it safe for transaction1 to commit.\n jh-\u003eb_next_transaction is set to transaction2.\n10) jbd2_journal_write_metadata() checksums b_frozen_data\n11) the journal correctly writes b_frozen_data to the disk journal\n12) handle2 is closed\n - There was no dirty call for the bh on handle2, so it is never queued for\n any more journal operation\n13) Checkpointing finally happens, and it just spools the bh via normal buffer\nwriteback. This will write b_data, which was never triggered on and thus\ncontains a wrong (old) checksum.\n\nThis patch fixes the problem by calling the trigger at the moment data is\nfrozen for journal commit - i.e., either when b_frozen_data is created by\ndo_get_write_access or just before we write a buffer to the log if\nb_frozen_data does not exist. We also rename the trigger to t_frozen as\nthat better describes when it is called.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Mark Fasheh \u003cmfasheh@suse.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "eb878b3bc0349344dbf70c51bf01fc734d5cf2d3", "tree": "c992bdac23f36de39930cd8c7fae0275ed9143a0", "parents": [ "5d550467b9770042e9699690907babc32104a8d4" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 15 23:52:45 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 15 23:59:34 2010 +0200" }, "message": "tracing: Remove letfover markers section\n\nMarkers have been removed, but we forgot to remove their\nsection.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\n" }, { "commit": "b0f77d0eae0c58a5a9691a067ada112ceeae2d00", "tree": "2bab159a95f51e32dbb4eb2d554328de3190c678", "parents": [ "91a72a70594e5212c97705ca6a694bd307f7a26b" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "message": "net: fix problem in reading sock TX queue\n\nFix problem in reading the tx_queue recorded in a socket. In\ndev_pick_tx, the TX queue is read by doing a check with\nsk_tx_queue_recorded on the socket, followed by a sk_tx_queue_get.\nThe problem is that there is not mutual exclusion across these\ncalls in the socket so it it is possible that the queue in the\nsock can be invalidated after sk_tx_queue_recorded is called so\nthat sk_tx_queue get returns -1, which sets 65535 in queue_index\nand thus dev_pick_tx returns 65536 which is a bogus queue and\ncan cause crash in dev_queue_xmit.\n\nWe fix this by only calling sk_tx_queue_get which does the proper\nchecks. The interface is that sk_tx_queue_get returns the TX queue\nif the sock argument is non-NULL and TX queue is recorded, else it\nreturns -1. sk_tx_queue_recorded is no longer used so it can be\ncompletely removed.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95f72d1ed41a66f1c1c29c24d479de81a0bea36f", "tree": "bd92b3804ff0bea083d69af0ede52f99ab34c0af", "parents": [ "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Jul 12 14:36:09 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 14 17:14:00 2010 +1000" }, "message": "lmb: rename to memblock\n\nvia following scripts\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/lmb/memblock/g\u0027 \\\n -e \u0027s/LMB/MEMBLOCK/g\u0027 \\\n $FILES\n\n for N in $(find . -name lmb.[ch]); do\n M\u003d$(echo $N | sed \u0027s/lmb/memblock/g\u0027)\n mv $N $M\n done\n\nand remove some wrong change like lmbench and dlmb etc.\n\nalso move memblock.c from lib/ to mm/\n\nSuggested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "9f71963702764243d0835b07660ae505b66ca09f", "tree": "cb6b4d3ea8c796fe00d309601c7279aded078906", "parents": [ "293ffa8faa21bbc5e77d3f779d95c4146ee8f709", "5d9955f8a978c1992a0f9966d22c43471214d43b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:19 2010 -0700" }, "message": "Merge branch \u0027v4l_for_2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers\n V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference\n V4L/DVB: uvcvideo: Power line frequency control doesn\u0027t support GET_MIN/MAX/RES\n V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen\n V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner\n V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner\n V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner\n V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs\n V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig\n V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes\n" }, { "commit": "44a54f787c0abcf75a2ed49b8ec8b2b512468f73", "tree": "debbf5656caf6260aa4d6fc276dd043624527822", "parents": [ "108553e1f3c45a92d23681a378ad9e4c3230eebc" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Jul 09 15:41:44 2010 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Jul 09 15:53:04 2010 -0400" }, "message": "tracing: Add alignment to syscall metadata declarations\n\nFor some reason if we declare a static variable and then assign it\nlater, and the assignment contains a __attribute__((__aligned__(#))),\nsome versions of gcc will ignore it.\n\nThis caused the syscall meta data to not be compact in its section\nand caused a kernel oops when the section was being read.\n\nThe fix for these versions of gcc seems to be to add the aligned\nattribute to the declaration as well.\n\nThis fixes the BZ regression:\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d16353\n\nReported-by: Zeev Tarantov \u003czeev.tarantov@gmail.com\u003e\nTested-by: Zeev Tarantov \u003czeev.tarantov@gmail.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003cAANLkTinkKVmB0fpVeqUkMeqe3ZYeXJdI8xDuzJEOjYwh@mail.gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "095c24710aa508a303edff86709637007113fbbf", "tree": "d74e8cc8fbbe6e704b4dabf12a206b8be7ab6e3f", "parents": [ "691d38451c466e931a629c17836b19dd615c8a75" ], "author": { "name": "Andy Walls", "email": "awalls@md.metrocast.net", "time": "Sat Jun 12 20:20:36 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:49:53 2010 -0300" }, "message": "V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner\n\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "c77e9e68269bf50573ce130b5d95ff6e539dbcf8", "tree": "99edc1b070717e18f5958f934bc3921cfed2ce1f", "parents": [ "31016e9941be85e8c487b1f3c45d253eda356715", "83ba7b071f30f7c01f72518ad72d5cd203c27502" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:06:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:06:40 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n writeback: simplify the write back thread queue\n writeback: split writeback_inodes_wb\n writeback: remove writeback_inodes_wbc\n fs-writeback: fix kernel-doc warnings\n splice: check f_mode for seekable file\n splice: direct_splice_actor() should not use pos in sd\n" }, { "commit": "2aa72f612144a0a7d4b0b22ae7c122692ac6a013", "tree": "8af2d2ac975887a04b4e4109de3d785f7046979b", "parents": [ "78178c7d6e127fff6dba027315fd6914304b05cf", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -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: (35 commits)\n NET: SB1250: Initialize .owner\n vxge: show startup message with KERN_INFO\n ll_temac: Fix missing iounmaps\n bridge: Clear IPCB before possible entry into IP stack\n bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference\n net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n net/ne: fix memory leak in ne_drv_probe()\n xfrm: fix xfrm by MARK logic\n virtio_net: fix oom handling on tx\n virtio_net: do not reschedule rx refill forever\n s2io: resolve statistics issues\n linux/net.h: fix kernel-doc warnings\n net: decreasing real_num_tx_queues needs to flush qdisc\n sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n qlge: fix a eeh handler to not add a pending timer\n qlge: Replacing add_timer() to mod_timer()\n usbnet: Set parent device early for netdev_printk()\n net: Revert \"rndis_host: Poll status channel before control channel\"\n netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT\n drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h\n ...\n" }, { "commit": "78178c7d6e127fff6dba027315fd6914304b05cf", "tree": "9b207197911feb57753bd9f1a9371851c8ca0991", "parents": [ "140236b4b1c749c9b795ea3d11558a0eb5a3a080", "023eb571a1d0eae738326042dcffa974257eb8c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 11:43:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 11:43:28 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm: correctly update connector DPMS status in drm_fb_helper\n drm/radeon/kms: fix shared ddc handling\n drm/ttm: Allocate the page pool manager in the heap.\n" }, { "commit": "5870a4d97da136908ca477e3a21bc9f4c2705161", "tree": "3030a0ee387f3187a5a30f8f4cc745788c7d69e7", "parents": [ "123f94f22e3d283dfe68742b269c245b0501ad82" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sun Jul 04 04:03:07 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:14:11 2010 +1000" }, "message": "drm/ttm: Allocate the page pool manager in the heap.\n\nRepeated ttm_page_alloc_init/fini fails noisily because the pool\nmanager kobj isn\u0027t zeroed out between uses (we could do just that but\nstatically allocated kobjects are generally considered a bad thing).\nMove it to kzalloc\u0027ed memory.\n\nNote that this patch drops the refcounting behavior of the pool\nallocator init/fini functions: it would have led to a race condition\nin its current form, and anyway it was never exploited.\n\nThis fixes a regression with reloading kms modules at runtime, since\npage allocator was introduced.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "140236b4b1c749c9b795ea3d11558a0eb5a3a080", "tree": "b720aa99ca2fc8bc012777c98d321b994c1730d7", "parents": [ "47a716cf0ca981b9549ec9815122ada7a0ff707c" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Thu Jun 10 13:56:33 2010 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 06 17:32:07 2010 -0700" }, "message": "VFS: introduce s_dirty accessors\n\nThis patch introduces 3 VFS accessors: \u0027sb_mark_dirty()\u0027,\n\u0027sb_mark_clean()\u0027, and \u0027sb_is_dirty()\u0027. They simply\nset \u0027sb-\u003es_dirt\u0027 or test \u0027sb-\u003es_dirt\u0027. The plan is to make\nevery FS use these accessors later instead of manipulating\nthe \u0027sb-\u003es_dirt\u0027 flag directly.\n\nUltimately, this change is a preparation for the periodic\nsuperblock synchronization optimization which is about\npreventing the \"sync_supers\" kernel thread from waking up\neven if there is nothing to synchronize.\n\nThis patch does not do any functional change, just adds\naccessor functions.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "47a716cf0ca981b9549ec9815122ada7a0ff707c", "tree": "9b949cce3f111c41478b6bbe404b7fdf525ef45f", "parents": [ "1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd", "b945d6b2554d550fe95caadc61e521c0ad71fb9c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 06 17:16:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 06 17:16:09 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rbtree: Undo augmented trees performance damage and regression\n x86, Calgary: Limit the max PHB number to 256\n" }, { "commit": "83ba7b071f30f7c01f72518ad72d5cd203c27502", "tree": "4737320dcce72cfff4d87d835e4f78428eca7ef5", "parents": [ "edadfb10ba35da7253541e4155aa92eff758ebe6" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Jul 06 08:59:53 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 06 08:59:53 2010 +0200" }, "message": "writeback: simplify the write back thread queue\n\nFirst remove items from work_list as soon as we start working on them. This\nmeans we don\u0027t have to track any pending or visited state and can get\nrid of all the RCU magic freeing the work items - we can simply free\nthem once the operation has finished. Second use a real completion for\ntracking synchronous requests - if the caller sets the completion pointer\nwe complete it, otherwise use it as a boolean indicator that we can free\nthe work item directly. Third unify struct wb_writeback_args and struct\nbdi_work into a single data structure, wb_writeback_work. Previous we\nset all parameters into a struct wb_writeback_args, copied it into\nstruct bdi_work, copied it again on the stack to use it there. Instead\nof just allocate one structure dynamically or on the stack and use it\nall the way through the stack.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "edadfb10ba35da7253541e4155aa92eff758ebe6", "tree": "a3c676f7b2c9b301d7e1948febeaba76ea1c5850", "parents": [ "9c3a8ee8a1d72c5c0d7fbdf426d80e270ddfa54c" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Thu Jun 10 12:07:54 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 06 08:54:08 2010 +0200" }, "message": "writeback: split writeback_inodes_wb\n\nThe case where we have a superblock doesn\u0027t require a loop here as we scan\nover all inodes in writeback_sb_inodes. Split it out into a separate helper\nto make the code simpler. This also allows to get rid of the sb member in\nstruct writeback_control, which was rather out of place there.\n\nAlso update the comments in writeback_sb_inodes that explain the handling\nof inodes from wrong superblocks.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "9c3a8ee8a1d72c5c0d7fbdf426d80e270ddfa54c", "tree": "fa131760a61f66afeede852622ede0d716965489", "parents": [ "06d738fa9155ff16dba3d7e501ba4581d01a98cb" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Thu Jun 10 12:07:27 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 06 08:54:03 2010 +0200" }, "message": "writeback: remove writeback_inodes_wbc\n\nThis was just an odd wrapper around writeback_inodes_wb. Removing this\nalso allows to get rid of the bdi member of struct writeback_control\nwhich was rather out of place there.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "bcfcc450baaaa44afc1d3c51ef96a53338ff0eb2", "tree": "123a988524aec67145c9b6becfdd6d5993525e87", "parents": [ "3390712a474abdcd3de10024dd1062e5928d381c" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 02 07:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 20:08:05 2010 -0700" }, "message": "net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n\nnetif_vdbg() was originally defined as entirely equivalent to\nnetdev_vdbg(), but I assume that it was intended to take the same\nparameters as netif_dbg() etc. (Currently it is only used by the\nsfc driver, in which I worked on that assumption.)\n\nIn commit a4ed89c I changed the definition used when VERBOSE_DEBUG is\nnot defined, but I failed to notice that the definition used when\nVERBOSE_DEBUG is defined was also not as I expected. Change that to\nmatch netif_dbg() as well.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b945d6b2554d550fe95caadc61e521c0ad71fb9c", "tree": "0b76cdb978bead82188de40cae6d24bd88d71b7d", "parents": [ "d596043d71ff0d7b3d0bead19b1d68c55f003093" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Sat May 29 15:31:43 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 05 14:43:50 2010 +0200" }, "message": "rbtree: Undo augmented trees performance damage and regression\n\nReimplement augmented RB-trees without sprinkling extra branches\nall over the RB-tree code (which lives in the scheduler hot path).\n\nThis approach is \u0027borrowed\u0027 from Fabio\u0027s BFQ implementation and\nrelies on traversing the rebalance path after the RB-tree-op to\ncorrect the heap property for insertion/removal and make up for\nthe damage done by the tree rotations.\n\nFor insertion the rebalance path is trivially that from the new\nnode upwards to the root, for removal it is that from the deepest\nnode in the path from the to be removed node that will still\nbe around after the removal.\n\n[ This patch also fixes a video driver regression reported by\n Ali Gholami Rudi - the memtype-\u003esubtree_max_end was updated\n incorrectly. ]\n\nAcked-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nAcked-by: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nTested-by: Ali Gholami Rudi \u003cali@rudi.ir\u003e\nCc: Fabio Checconi \u003cfabio@gandalf.sssup.it\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003c1275414172.27810.27961.camel@twins\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "08f8ba07998ab1b9efcdd3f28dadf6866a605ddb", "tree": "8e09855446f7b0312bb729d4b539090756e57927", "parents": [ "0879b100f3c187257729f36cba33d96ec2875766", "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 05 08:30:55 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 05 08:30:58 2010 +0200" }, "message": "Merge commit \u0027v2.6.35-rc4\u0027 into perf/core\n\nMerge reason: Pick up the latest perf fixes\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ff49d74ad383f54041378144ca1a229ee9aeaa59", "tree": "6f37335e313c9a680db8d4e4ce00d17aa11a099b", "parents": [ "e3668dd83ba5958429984286efbc3055be5344c4" ], "author": { "name": "Yehuda Sadeh", "email": "yehuda@hq.newdream.net", "time": "Sat Jul 03 13:07:35 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:17:22 2010 -0700" }, "message": "module: initialize module dynamic debug later\n\nWe should initialize the module dynamic debug datastructures\nonly after determining that the module is not loaded yet. This\nfixes a bug that introduced in 2.6.35-rc2, where when a trying\nto load a module twice, we also load it\u0027s dynamic printing data\ntwice which causes all sorts of nasty issues. Also handle\nthe dynamic debug cleanup later on failure.\n\nSigned-off-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (removed a #ifdef)\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e2aec372ff4b7e78e79c308104a860ae0ed20950", "tree": "0a399810f9a506121bc7effb0a9127792527ea36", "parents": [ "f0796d5c73e59786d09a1e617689d1d415f2db44" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu Jul 01 13:18:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:08 2010 -0700" }, "message": "linux/net.h: fix kernel-doc warnings\n\nFix kernel-doc warnings in linux/net.h:\n\nWarning(include/linux/net.h:151): No description found for parameter \u0027wq\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027fasync_list\u0027 description in \u0027socket\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027wait\u0027 description in \u0027socket\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403", "tree": "0982d46258047f208c26068252457179f5f13bdf", "parents": [ "7ae80abdba0644e12ac17da567a2db1efc1bf8a8" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n\nWhen calling qdisc_reset() the qdisc lock needs to be held. In\nthis case there is at least one driver i4l which is using this\nwithout holding the lock. Add the locking here.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "123f94f22e3d283dfe68742b269c245b0501ad82", "tree": "1d40043b0909f309cf77204ea87be9e61f143e79", "parents": [ "4b78c119f0ba715b4e29b190bf4d7bce810ea0d6", "8c215bd3890c347dfb6a2db4779755f8b9c298a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:58 2010 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Cure nr_iowait_cpu() users\n init: Fix comment\n init, sched: Fix race between init and kthreadd\n" }, { "commit": "826456989f1e9fe15daf2183c630ea9c7ab7c46d", "tree": "fa5dec62b73dfad09ad49f1e2797a0e303bd194b", "parents": [ "980533b018fda7ae4c4fb6863b75a0e282d2ffd2", "1529c69adce1e95f7ae72f0441590c226bbac7fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:40:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:40:54 2010 -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 ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1\n ahci,ata_generic: let ata_generic handle new MBP w/ MCP89\n libahci: Fix bug in storing EM messages\n" }, { "commit": "c6353b4520788e34098bbf61c73fb9618ca7fdd6", "tree": "89146e7b8e282b907021bae657b4bf18c74d9858", "parents": [ "f9ce889b8f8384ee29e1be4b34091a932e6e40f3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jun 17 11:42:22 2010 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Jul 01 15:34:46 2010 -0400" }, "message": "ahci,ata_generic: let ata_generic handle new MBP w/ MCP89\n\nFor yet unknown reason, MCP89 on MBP 7,1 doesn\u0027t work w/ ahci under\nlinux but the controller doesn\u0027t require explicit mode setting and\nworks fine with ata_generic. Make ahci ignore the controller on MBP\n7,1 and let ata_generic take it for now.\n\nReported in bko#15923.\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d15923\n\nNVIDIA is investigating why ahci mode doesn\u0027t work.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Peer Chen \u003cpchen@nvidia.com\u003e\nCc: stable@kernel.org\nReported-by: Anders Østhus \u003cgrapz666@gmail.com\u003e\nReported-by: Andreas Graf \u003candreas_graf@csgraf.de\u003e\nReported-by: Benoit Gschwind \u003cgschwind@gnu-log.net\u003e\nReported-by: Damien Cassou \u003cdamien.cassou@gmail.com\u003e\nReported-by: tixetsal@juno.com\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "bf4f42b441919417386beb2f9c58e802e7de89df", "tree": "39fce2e84056f6c2d7cb1966289bfb52cd6ffdab", "parents": [ "1e31b0ffbb3b10133044e9c4bec4bd4b3f278229", "2f9c6b0a91a050669dd6df487174de6b96c2774a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)\n drm/radeon/kms: remove rv100 bios connector quirk\n drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode\n DRM / radeon / KMS: Fix hibernation regression related to radeon PM (was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300)\n drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)\n drm/radeon: add quirk to make HP nx6125 laptop resume.\n drm/radeon/kms: add some missing regs to evergreen gpu init\n drm/radeon/kms: fix typos in evergreen command checker\n drm/radeon/kms: avoid oops on mac r4xx cards\n fb: fix colliding defines for fb flags.\n drm/radeon/kms: Force HDP_NONSURF to maximum size\n drm/radeon/kms: disable frac fb dividers for rs6xx\n drm/radeon/kms: don\u0027t read attempt to read bios from VRAM on unposted GPU.\n drm/radeon/kms: fix typo in evergreen_gpu_init\n drm/radeon/kms: return ret in cursor_set failure path\n drm/ttm: non pooled page allocation should have GFP_USER set\n drm/radeon/r100/r200: fix calculation of compressed cube maps\n drm/radeon/r200: handle more hw tex coord types\n drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx\n drm/radeon: add fake RN50 table for powerpc\n drm/fb: Fix video\u003d mode computation\n ...\n" }, { "commit": "8c215bd3890c347dfb6a2db4779755f8b9c298a9", "tree": "e6bd5de8a028babe9ec75f744977bd1424df106c", "parents": [ "9715856922bf8475f5428c29b6f4a9eebc97d391" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Thu Jul 01 09:07:17 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jul 01 09:39:48 2010 +0200" }, "message": "sched: Cure nr_iowait_cpu() users\n\nCommit 0224cf4c5e (sched: Intoduce get_cpu_iowait_time_us())\nbroke things by not making sure preemption was indeed disabled\nby the callers of nr_iowait_cpu() which took the iowait value of\nthe current cpu.\n\nThis resulted in a heap of preempt warnings. Cure this by making\nnr_iowait_cpu() take a cpu number and fix up the callers to pass\nin the right number.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arjan van de Ven \u003carjan@infradead.org\u003e\nCc: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: linux-pm@lists.linux-foundation.org\nLKML-Reference: \u003c1277968037.1868.120.camel@laptop\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b26c949755c06ec79e55a75817210083bd78fc9a", "tree": "6ca63a7ca5f6f5130b223b6e4b1ae9606e4e940a", "parents": [ "46fcd2b3dbf58a448b621d3d2f492a0e90223a3a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 23 11:35:41 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:34 2010 +1000" }, "message": "fb: fix colliding defines for fb flags.\n\nWhen I added the flags I must have been using a 25 line terminal and missed the following flags.\n\nThe collided with flag has one user in staging despite being in-tree for 5 years.\n\nI\u0027m happy to push this via my drm tree unless someone really wants to do it.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439", "tree": "705bd91dafd562a38d3833edb30297abf0516459", "parents": [ "08e554b17bfdc2682599c8c2770b088a0187a405" ], "author": { "name": "Saeed Bishara", "email": "saeed@marvell.com", "time": "Sun Jun 27 00:26:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:01:11 2010 -0700" }, "message": "mv643xx_eth: use sw csum for big packets\n\nSome controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size.\n\nSigned-off-by: Saeed Bishara \u003csaeed@marvell.com\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4efd7e833591721bec21cc4730a7f6261417840f", "tree": "9982ea86ad73f1142842070f4d9d1bf83ba318a0", "parents": [ "d3ead2413cb99d3e6265577b12537434e229d8c2" ], "author": { "name": "Andreas Steffen", "email": "andreas.steffen@strongswan.org", "time": "Wed Jun 30 10:41:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:43:31 2010 -0700" }, "message": "xfrm: fix XFRMA_MARK extraction in xfrm_mark_get\n\nDetermine the size of the xfrm_mark struct, not of its pointer.\n\nSigned-off-by: Andreas Steffen \u003candreas.steffen@strongswan.org\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c59690fa484c04ab96fe932241b569a09755a4d2", "tree": "ebc009b73b806007868a2a6f13357dfe90d89132", "parents": [ "3267a87f9dc38d036571ff0880533d9ae8989f01" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Wed Jun 30 00:53:53 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jun 30 01:21:38 2010 -0700" }, "message": "Input: i8042 - mark stubs in i8042.h \"static inline\"\n\nOtherwise we may run into following:\n\ndrivers/platform/built-in.o: In function `i8042_lock_chip\u0027:\n/home/test/ws2/projects/linux-2.6/include/linux/i8042.h:50: multiple definition of `i8042_lock_chip\u0027\ndrivers/input/serio/built-in.o:/home/test/ws2/projects/linux-2.6/include/linux/i8042.h:50: first defined here\n...\nmake[1]: *** [drivers/built-in.o] Error 1\nmake: *** [drivers] Error 2\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "9c695203a7ddbe49dba5f22f4c941d24f47475df", "tree": "0dcfa624ecb7c5810f7062fe950bf3f0de2e55b2", "parents": [ "2952095c6b2eefd068dda0dee6317cf95155a304" ], "author": { "name": "Mikael Pettersson", "email": "mikpe@it.uu.se", "time": "Tue Jun 29 15:05:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "compiler-gcc.h: gcc-4.5 needs noclone and noinline on __naked functions\n\nA __naked function is defined in C but with a body completely implemented\nby asm(), including any prologue and epilogue. These asm() bodies expect\nstandard calling conventions for parameter passing. Older GCCs implement\nthat correctly, but 4.[56] currently do not, see GCC PR44290. In the\nLinux kernel this breaks ARM, causing most arch/arm/mm/copypage-*.c\nmodules to get miscompiled, resulting in kernel crashes during bootup.\n\nPart of the kernel fix is to augment the __naked function attribute to\nalso imply noinline and noclone. This patch implements that, and has been\nverified to fix boot failures with gcc-4.5 compiled 2.6.34 and 2.6.35-rc1\nkernels. The patch is a no-op with older GCCs.\n\nSigned-off-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: Khem Raj \u003craj.khem@gmail.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "984bc9601f64fd341b8573021d7c999f1f1499a9", "tree": "06c616a6285b00d1e577902face3e8a986370b34", "parents": [ "57439f878afafefad8836ebf5c49da2a0a746105", "1b99973f1c82707e46e8cb9416865a1e955e8f8c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:42:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:42:52 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n block: Don\u0027t count_vm_events for discard bio in submit_bio.\n cfq: fix recursive call in cfq_blkiocg_update_completion_stats()\n cfq-iosched: Fixed boot warning with BLK_CGROUP\u003dy and CFQ_GROUP_IOSCHED\u003dn\n cfq: Don\u0027t allow queue merges for queues that have no process references\n block: fix DISCARD_BARRIER requests\n cciss: set SCSI max cmd len to 16, as default is wrong\n cpqarray: fix two more wrong section type\n cpqarray: fix wrong __init type on pci probe function\n drbd: Fixed a race between disk-attach and unexpected state changes\n writeback: fix pin_sb_for_writeback\n writeback: add missing requeue_io in writeback_inodes_wb\n writeback: simplify and split bdi_start_writeback\n writeback: simplify wakeup_flusher_threads\n writeback: fix writeback_inodes_wb from writeback_inodes_sb\n writeback: enforce s_umount locking in writeback_inodes_sb\n writeback: queue work on stack in writeback_inodes_sb\n writeback: fix writeback completion notifications\n" }, { "commit": "57439f878afafefad8836ebf5c49da2a0a746105", "tree": "ec11dd35704aa37d77a5fd8404fda57f297a3834", "parents": [ "5904b3b81d25166e5e39b9727645bb47937618e3" ], "author": { "name": "npiggin@suse.de", "email": "npiggin@suse.de", "time": "Thu Jun 24 13:02:14 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:38:22 2010 -0700" }, "message": "fs: fix superblock iteration race\n\nlist_for_each_entry_safe is not suitable to protect against concurrent\nmodification of the list. 6754af6 introduced a race in sb walking.\n\nlist_for_each_entry can use the trick of pinning the current entry in\nthe list before we drop and retake the lock because it subsequently\nfollows cur-\u003enext. However list_for_each_entry_safe saves n\u003dcur-\u003enext\nfor following before entering the loop body, so when the lock is\ndropped, n may be deleted.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Frank Mayhar \u003cfmayhar@google.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bf988435bd5b53529f4408a8efb1f433f6ddfda9", "tree": "7805f577d019f587146b4fd1cf642faacfec2f14", "parents": [ "db048b69037e7fa6a7d9e95a1271a50dc08ae233" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 28 08:45:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 01:00:29 2010 -0700" }, "message": "ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH\n\nstruct ethtool_rxnfc was originally defined in 2.6.27 for the\nETHTOOL_{G,S}RXFH command with only the cmd, flow_type and data\nfields. It was then extended in 2.6.30 to support various additional\ncommands. These commands should have been defined to use a new\nstructure, but it is too late to change that now.\n\nSince user-space may still be using the old structure definition\nfor the ETHTOOL_{G,S}RXFH commands, and since they do not need the\nadditional fields, only copy the originally defined fields to and\nfrom user-space.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a1d0ce8213e9ddf4046ef5ba95c55762d075f541", "tree": "c72fb18588de555c8fa0c61452ae14ffe37dbf8a", "parents": [ "d62f85d1e22e537192ce494c89540e1ac0d8bfc7" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Jun 08 11:22:06 2010 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jun 28 21:13:14 2010 -0400" }, "message": "tracing: Use class-\u003ereg() for all registering of events\n\nBecause kprobes and syscalls need special processing to register\nevents, the class-\u003ereg() method was created to handle the differences.\n\nBut instead of creating a default -\u003ereg for perf and ftrace events,\nthe code was scattered with:\n\n\tif (class-\u003ereg)\n\t\tclass-\u003ereg();\n\telse\n\t\tdefault_reg();\n\nThis is messy and can also lead to bugs.\n\nThis patch cleans up this code and creates a default reg() entry for\nthe events allowing for the code to directly call the class-\u003ereg()\nwithout the condition.\n\nReported-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "210f766915207636acccba7bec42248bfe882998", "tree": "bac8057eabc86111242c4725b485b84825429343", "parents": [ "363d0f6490f319d0dd69b7ec7503c5f6cbab36d9" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon May 24 16:23:35 2010 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jun 28 17:12:50 2010 -0400" }, "message": "tracing: Convert more sched events to DEFINE_EVENT\n\nConvert sched_wait_task to DEFINE_EVENT, and save ~1K:\n\n text data bss dec hex filename\n 104595 9424 4992 119011 1d0e3 kernel/sched.o.orig\n 103619 9344 4992 117955 1ccc3 kernel/sched.o\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4BFA3787.2040800@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "363d0f6490f319d0dd69b7ec7503c5f6cbab36d9", "tree": "296c3759da30cedc9d05ef129dfa6c21538ed36b", "parents": [ "8728fe501ed562c1b46dde3c195eadec77bca033" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon May 24 16:23:15 2010 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jun 28 17:12:48 2010 -0400" }, "message": "tracing: Convert some timer events to DEFINE_EVENT\n\nUse DECLARE_EVENT_CLASS, and save ~2.3K:\n\n text data bss dec hex filename\n7018823 2031888 7251132 16301843 f8bf13 vmlinux.o.orig\n7016727 2031696 7251132 16299555 f8b623 vmlinux.o\n\n5 events are converted:\n\n timer_class: timer_init, timer_expire_exit, timer_cancel\n hrtimer_class: hrtimer_init, hrtimer_cancel\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4BFA3773.3060200@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "c9642c49aae1272d7c24008a40ae614470b957a6", "tree": "dd42bf76ad9652bc952c0332b14e0b3b7ea38d3c", "parents": [ "f384c954c9fe3d3c6fce5ae66b67f2ddd947d098" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon May 24 16:22:30 2010 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jun 28 17:12:44 2010 -0400" }, "message": "tracing: Use a global field list for all syscall exit events\n\nAll syscall exit events have the same fields.\n\nThe kernel size drops 2.5K:\n\n text data bss dec hex filename\n7018612 2034376 7251132 16304120 f8c7f8 vmlinux.o.orig\n7018612 2031888 7251132 16301632 f8be40 vmlinux.o\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4BFA3746.8070100@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "f384c954c9fe3d3c6fce5ae66b67f2ddd947d098", "tree": "a38541b8083a2304435e9a153d408bd7cd44116e", "parents": [ "9a15a07fe2175dc25cd928a354b3839f562ac8cc", "5904b3b81d25166e5e39b9727645bb47937618e3" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jun 28 22:33:13 2010 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jun 28 22:33:24 2010 +0200" }, "message": "Merge branch \u0027linus\u0027 into perf/core\n\nReason: Further changes conflict with upstream fixes\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "5904b3b81d25166e5e39b9727645bb47937618e3", "tree": "2a306f8b0cdea354b3ebc157623dededcf471091", "parents": [ "f3866db8f7534ba8bbb342bebcf5ede542035528", "b70e4f0529c089b00d0a6da13106db4de1ada4c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:24:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:24:43 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing: Fix undeclared ENOSYS in include/linux/tracepoint.h\n perf record: prevent kill(0, SIGTERM);\n perf session: Remove threads from tree on PERF_RECORD_EXIT\n perf/tracing: Fix regression of perf losing kprobe events\n perf_events: Fix Intel Westmere event constraints\n perf record: Don\u0027t call newt functions when not initialized\n" }, { "commit": "f014d937d61f47761f961eba903feb2ffa1793aa", "tree": "4a6a9441b21711e34d567a8066950548935b9b3a", "parents": [ "cf91b415c8419513ada650a932bfb32a526d4d98", "0d98bb2656e9bd2dfda2d089db1fe1dbdab41504" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:18:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:18:30 2010 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Prevent compiler from optimising the sched_avg_update() loop\n sched: Fix over-scheduling bug\n sched: Fix PROVE_RCU vs cpu_cgroup\n" }, { "commit": "31cafd958932a90174118ad062fdc37ffb6bf31c", "tree": "21f04c11d9e759c1f65cfaa1e4fbd79ee1e60753", "parents": [ "e7865c234fff2db474f21a62b2f906a70317c972", "e2f5b04563786d4b7d7648868de7e941a0649372" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 11:28:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 11:28:02 2010 -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: (52 commits)\n phylib: Add autoload support for the LXT973 phy.\n ISDN: hysdn, fix potential NULL dereference\n vxge: fix memory leak in vxge_alloc_msix() error path\n isdn/gigaset: correct CAPI connection state storage\n isdn/gigaset: encode HLC and BC together\n isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation\n isdn/gigaset: correct CAPI voice connection encoding\n isdn/gigaset: honor CAPI application\u0027s buffer size request\n cpmac: do not leak struct net_device on phy_connect errors\n smc91c92_cs: fix the problem that lan \u0026 modem does not work simultaneously\n ipv6: fix NULL reference in proxy neighbor discovery\n Bluetooth: Bring back var \u0027i\u0027 increment\n xfrm: check bundle policy existance before dereferencing it\n sky2: enable rx/tx in sky2_phy_reinit()\n cnic: Disable statistics initialization for eth clients that do not support statistics\n net: add dependency on fw class module to qlcnic and netxen_nic\n snmp: fix SNMP_ADD_STATS()\n hso: remove setting of low_latency flag\n udp: Fix bogus UFO packet generation\n lasi82596: fix netdev_mc_count conversion\n ...\n" }, { "commit": "5cfaf214856eb934759ae500a0b812dd06a00bd9", "tree": "19086470461bd457278324bad16c5718b7bda3ea", "parents": [ "45a73372efe4a63f44aa2e1125d4a777c2fdc8d8" ], "author": { "name": "Nobuhiro Iwamatsu", "email": "nobuhiro.iwamatsu.yj@renesas.com", "time": "Wed Jun 23 09:17:53 2010 +0900" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jun 24 23:34:58 2010 +0200" }, "message": "perf: Fix argument of perf_arch_fetch_caller_regs\n\n\"struct regs\" was set to argument of perf_arch_fetch_caller_regs\noff-case. It should be \"struct pt_regs\".\n\nThis fixes various build errors in archs that have CONFIG_PERF_EVENTS\u003dy\nbut no overriden implementation of perf_arch_fetch_caller_regs.\n\ncc1: warnings being treated as errors\nIn file included from include/linux/ftrace_event.h:8,\n from include/trace/syscall.h:6,\n from include/linux/syscalls.h:75,\n from arch/sh/kernel/sys_sh32.c:9:\ninclude/linux/perf_event.h:937: error: \u0027struct regs\u0027 declared inside parameter list\ninclude/linux/perf_event.h:937: error: its scope is only this definition or declaration, which is probably not what you want\ninclude/linux/perf_event.h: In function \u0027perf_fetch_caller_regs\u0027:\ninclude/linux/perf_event.h:952: error: passing argument 1 of \u0027perf_arch_fetch_caller_regs\u0027 from incompatible pointer type\n\nSigned-off-by: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003cAANLkTinKKFKEBQrZ3Hkj-XCaMwaTqulb-XnFzqEYiFRr@mail.gmail.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "45a73372efe4a63f44aa2e1125d4a777c2fdc8d8", "tree": "d8fbdb1447ec7caac75c73101cf941ba90ed9ced", "parents": [ "c882e0feb937af4e5b991cbd1c81536f37053e86" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Jun 23 23:00:37 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jun 24 23:33:40 2010 +0200" }, "message": "hw_breakpoints: Fix per task breakpoint tracking\n\nFreeing a perf event can happen in several ways. A task\ncalls perf_event_exit_task() right before exiting. This helper\nwill detach all the events from the task context and queue their\nremoval through free_event() if they are child tasks. The task\nalso loses its context reference there.\n\nReleasing the breakpoint slot from the constraint table is made\nfrom free_event() that calls release_bp_slot(). We count the number\nof breakpoints this task is running by looking at the task\u0027s\nperf_event_ctxp and iterating through its attached events.\nBut at this time, the reference to this context has been cleaned up\nalready.\n\nSo looking at the event-\u003ectx instead of task-\u003eperf_event_ctxp\nto count the remaining breakpoints should solve the problem.\nAt least it would for child breakpoints, but not for parent ones.\nIf the parent exits before the child, it will remove all its\nevents from the context but free_event() will be called later,\non fd release time. And checking the number of breakpoints the\ntask has attached to its context at this time is unreliable as all\nevents have been removed from the context.\n\nTo solve this, we keep track of the list of per task breakpoints.\nOn top of it, we maintain our array of numbers of breakpoints used\nby the tasks. We use the context address as a task id.\n\nSo, instead of looking at the number of events attached to a context,\nwe walk through our list of per task breakpoints and count the number\nof breakpoints that use the same ctx than the one to be reserved or\nreleased from the constraint table, and update the count on top of this\nresult.\n\nIn the meantime it solves a bad refcounting, it also solves a warning,\nreported by Paul.\n\nBadness at /home/paulus/kernel/perf/kernel/hw_breakpoint.c:114\nNIP: c0000000000cb470 LR: c0000000000cb46c CTR: c00000000032d9b8\nREGS: c000000118e7b570 TRAP: 0700 Not tainted (2.6.35-rc3-perf-00008-g76b0f13\n)\nMSR: 9000000000029032 \u003cEE,ME,CE,IR,DR\u003e CR: 44004424 XER: 000fffff\nTASK \u003d c0000001187dcad0[3143] \u0027perf\u0027 THREAD: c000000118e78000 CPU: 1\nGPR00: c0000000000cb46c c000000118e7b7f0 c0000000009866a0 0000000000000020\nGPR04: 0000000000000000 000000000000001d 0000000000000000 0000000000000001\nGPR08: c0000000009bed68 c00000000086dff8 c000000000a5bf10 0000000000000001\nGPR12: 0000000024004422 c00000000ffff200 0000000000000000 0000000000000000\nGPR16: 0000000000000000 0000000000000000 0000000000000018 00000000101150f4\nGPR20: 0000000010206b40 0000000000000000 0000000000000000 00000000101150f4\nGPR24: c0000001199090c0 0000000000000001 0000000000000000 0000000000000001\nGPR28: 0000000000000000 0000000000000000 c0000000008ec290 0000000000000000\nNIP [c0000000000cb470] .task_bp_pinned+0x5c/0x12c\nLR [c0000000000cb46c] .task_bp_pinned+0x58/0x12c\nCall Trace:\n[c000000118e7b7f0] [c0000000000cb46c] .task_bp_pinned+0x58/0x12c (unreliable)\n[c000000118e7b8a0] [c0000000000cb584] .toggle_bp_task_slot+0x44/0xe4\n[c000000118e7b940] [c0000000000cb6c8] .toggle_bp_slot+0xa4/0x164\n[c000000118e7b9f0] [c0000000000cbafc] .release_bp_slot+0x44/0x6c\n[c000000118e7ba80] [c0000000000c4178] .bp_perf_event_destroy+0x10/0x24\n[c000000118e7bb00] [c0000000000c4aec] .free_event+0x180/0x1bc\n[c000000118e7bbc0] [c0000000000c54c4] .perf_event_release_kernel+0x14c/0x170\n\nReported-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Mahesh Salgaonkar \u003cmahesh@linux.vnet.ibm.com\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\n" }, { "commit": "8f1c14b2e3b1805d3e9e6a306d07f5371ea703a7", "tree": "ad5d96e60d1ff4e91f5b23d7ae13884581ae2441", "parents": [ "8ceedea7c2600a1018d20f67e766c0773b59391a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 23 00:32:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:48:19 2010 -0700" }, "message": "snmp: fix SNMP_ADD_STATS()\n\ncommit aa2ea0586d9d (tcp: fix outsegs stat for TSO segments) incorrectly\nassumed SNMP_ADD_STATS() was used from BH context.\n\nFix this using mib[!in_softirq()] instead of mib[0]\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b70e4f0529c089b00d0a6da13106db4de1ada4c7", "tree": "d0c8fdf2272966d5c5db97c7456bb2919afd78ff", "parents": [ "5ffc88819c84098e3f39185a38f8f7f7f8b210df" ], "author": { "name": "Wu Zhangjin", "email": "wuzhangjin@gmail.com", "time": "Mon Jun 21 19:09:09 2010 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jun 21 12:23:36 2010 -0400" }, "message": "tracing: Fix undeclared ENOSYS in include/linux/tracepoint.h\n\nThe header file include/linux/tracepoint.h may be included without\ninclude/linux/errno.h and then the compiler will fail on building for\nundelcared ENOSYS. This patch fixes this problem via including \u003clinux/errno.h\u003e\nto include/linux/tracepoint.h.\n\nSigned-off-by: Wu Zhangjin \u003cwuzhangjin@gmail.com\u003e\nLKML-Reference: \u003c1277118549-622-1-git-send-email-wuzhangjin@gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "646b1db4956ba8bf748b835b5eba211133d91c2e", "tree": "061166d873d9da9cf83044a7593ad111787076c5", "parents": [ "0f2c3de2ba110626515234d5d584fb1b0c0749a2", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 18 10:53:12 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 18 10:53:19 2010 +0200" }, "message": "Merge commit \u0027v2.6.35-rc3\u0027 into perf/core\n\nMerge reason: Go from -rc1 base to -rc3 base, merge in fixes.\n" }, { "commit": "da931a931da85218add949266238c54b5fecd37f", "tree": "63f4e081715b00b403bf45d705a636a29d80a7e9", "parents": [ "f5c5f040b565435e9a85898dc87ab365395e0603" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 09:52:37 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 09:56:01 2010 +1000" }, "message": "agp: drop vmalloc flag.\n\nSince the code that was too ugly to live is upstream, we can use it now,\ninstead of rolling our own.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "575f552012ec0cd6591fd85ee996d5a5ad1a669a", "tree": "86b9882f04e75e2fb1046f9c82f8c82c86810c80", "parents": [ "29cb48594b873f6193d6327097e504bd3e2314de", "dc66c74de6f4238020db3e2041d4aca5c5b3e9bc" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 12:54:57 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 12:54:57 2010 +0200" }, "message": "Merge branch \u0027for-jens\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "dc66c74de6f4238020db3e2041d4aca5c5b3e9bc", "tree": "8df9cdd2f1672217a210e624f4613744e57450e0", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Jun 02 14:31:29 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon Jun 14 12:19:41 2010 +0200" }, "message": "drbd: Fixed a race between disk-attach and unexpected state changes\n\nThis was a very hard to trigger race condition.\n\nIf we got a state packet from the peer, after drbd_nl_disk() has\nalready changed the disk state to D_NEGOTIATING but\nafter_state_ch() was not yet run by the worker, then receive_state()\nmight called drbd_sync_handshake(), which in turn crashed\nwhen accessing p_uuid.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "42de5532f4a58a52a60bdd8bd4f80f9f210dd65b", "tree": "f624579c4c27e1ffcba5e4141fcc0877c3a6ae56", "parents": [ "e9e8b4dd142da3b6cbf301ba922804d6cdc31a17", "2a6b69765ad794389f2fc3e14a0afa1a995221c2" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 01:15:40 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 01:15:40 2010 -0400" }, "message": "Merge branch \u0027bugzilla-13931-sleep-nvs\u0027 into release\n\nConflicts:\n\tdrivers/acpi/sleep.c\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab", "tree": "e4100a27d05d5fc9286a3bb8e7ebe5b8d9618e66", "parents": [ "a48ecc771852158eb7b9ace242f0a6226a3907b7", "b681f7d9ab4d697a214fa4428795790c3a937a89" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 00:56:15 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 00:56:15 2010 -0400" }, "message": "Merge branch \u0027acpica-cherry-pick\u0027 into release\n" }, { "commit": "b681f7d9ab4d697a214fa4428795790c3a937a89", "tree": "c5653b6da518198ca3d7fd13f5f8442428955e1f", "parents": [ "9cbfa18e8a7b34a32eddbd914a07f085962f50a8" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed May 26 11:50:48 2010 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 00:55:50 2010 -0400" }, "message": "ACPICA: Truncate I/O addresses to 16 bits for Windows compatibility\n\nThis feature is optional and is enabled if the BIOS requests any\nWindows OSI strings. It can also be enabled by the host OS.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Bob Moore \u003crobert.moore@intel.com\u003e\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d70326689b70b35527765bd3decbb1229459e928", "tree": "044ac0677e262fc0669e75732487456f3358db41", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Bob Moore", "email": "robert.moore@intel.com", "time": "Wed May 26 11:06:12 2010 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 00:54:36 2010 -0400" }, "message": "ACPICA: Fix namestring associated with AE_NO_HANDLER exception\n\nWas incorrectly AE_WAKE_ONLY_GPE.\n\nSigned-off-by: Bob Moore \u003crobert.moore@intel.com\u003e\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" } ], "next": "92634825571d86417941855a8e3189c07aa3c706" }