)]}' { "log": [ { "commit": "f262af3d08d3fffc4e11277d3a177b2d67ea2aba", "tree": "cf5e4ac1bc39fe46cfbf4d17a0e9c71ee43b9728", "parents": [ "1014cfe2fb4cdd663137aafb21448cb613dd6a7d", "72d5a9f7a9542f88397558c65bcfc3b115a65e34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:17:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:17:58 2010 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)\n rcu: remove all rcu head initializations, except on_stack initializations\n rcu head introduce rcu head init on stack\n Debugobjects transition check\n rcu: fix build bug in RCU_FAST_NO_HZ builds\n rcu: RCU_FAST_NO_HZ must check RCU dyntick state\n rcu: make SRCU usable in modules\n rcu: improve the RCU CPU-stall warning documentation\n rcu: reduce the number of spurious RCU_SOFTIRQ invocations\n rcu: permit discontiguous cpu_possible_mask CPU numbering\n rcu: improve RCU CPU stall-warning messages\n rcu: print boot-time console messages if RCU configs out of ordinary\n rcu: disable CPU stall warnings upon panic\n rcu: enable CPU_STALL_VERBOSE by default\n rcu: slim down rcutiny by removing rcu_scheduler_active and friends\n rcu: refactor RCU\u0027s context-switch handling\n rcu: rename rcutiny rcu_ctrlblk to rcu_sched_ctrlblk\n rcu: shrink rcutiny by making synchronize_rcu_bh() be inline\n rcu: fix now-bogus rcu_scheduler_active comments.\n rcu: Fix bogus CONFIG_PROVE_LOCKING in comments to reflect reality.\n rcu: ignore offline CPUs in last non-dyntick-idle CPU check\n ...\n" }, { "commit": "8123d8f17d8ba9d67e556688e4f025456ca97842", "tree": "1d15088a32644e464ad3536ad7bec775050065eb", "parents": [ "06ee772043c7ad125f2c2e6a08dc563706f39e8d", "795e74f7a69f9c08afa4fa7c86cc4f18a62bd630" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 07:22:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 07:22:37 2010 -0700" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86/amd-iommu: Add amd_iommu\u003doff command line option\n iommu-api: Remove iommu_{un}map_range functions\n x86/amd-iommu: Implement -\u003e{un}map callbacks for iommu-api\n x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes\n x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes\n x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes\n kvm: Change kvm_iommu_map_pages to map large pages\n VT-d: Change {un}map_range functions to implement {un}map interface\n iommu-api: Add -\u003e{un}map callbacks to iommu_ops\n iommu-api: Add iommu_map and iommu_unmap functions\n iommu-api: Rename -\u003e{un}map function pointers to -\u003e{un}map_range\n" }, { "commit": "ba2e1c5f25a99dec3873745031ad23ce3fd79bff", "tree": "ebcc8e9b0f395033e8ba1db8e30fb6ea78edc442", "parents": [ "7d32c0aca4fbd0319c860d12af5fae3e88c760e6", "92183b346f02773dae09182c65f16b013f295d80" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 13:54:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 13:54:29 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k: amiga - Floppy platform device conversion\n m68k: amiga - Sound platform device conversion\n m68k: amiga - Frame buffer platform device conversion\n m68k: amiga - Zorro host bridge platform device conversion\n m68k: amiga - Zorro bus modalias support\n platform: Make platform resource input parameters const\n m68k: invoke oom-killer from page fault\n serial167: Kill unused variables\n m68k: Implement generic_find_next_{zero_,}le_bit()\n m68k: hp300 - Checkpatch cleanup\n m68k: Remove trailing spaces in messages\n m68k: Simplify param.h by using \u003casm-generic/param.h\u003e\n m68k: Remove BKL from rtc implementations\n" }, { "commit": "0d305464aefff342c85b4db8b3d7a4345246e5a1", "tree": "c3cd06f58d7cf126500258d0a8fc531bd3ed4da2", "parents": [ "bf54a2b3c0dbf76136f00ff785bf6d8f6291311d" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 05 12:40:41 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon May 17 21:37:42 2010 +0200" }, "message": "m68k: amiga - Zorro host bridge platform device conversion\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "bf54a2b3c0dbf76136f00ff785bf6d8f6291311d", "tree": "918d2a181a90454a2893c2a86640ef72b3a164f4", "parents": [ "0b7f1a7efb38b551f5948a13d0b36e876ba536db" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 18 21:13:53 2008 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon May 17 21:37:41 2010 +0200" }, "message": "m68k: amiga - Zorro bus modalias support\n\nAdd Amiga Zorro bus modalias and uevent support\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "0b7f1a7efb38b551f5948a13d0b36e876ba536db", "tree": "a1982c30350b7be11b4db66e7c2bcd4983ed1998", "parents": [ "adbf6e6952e80ae42a403442dcae21438cae94b3" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jan 28 21:01:02 2009 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon May 17 21:37:40 2010 +0200" }, "message": "platform: Make platform resource input parameters const\n\nMake the platform resource input parameters of platform_device_add_resources()\nand platform_device_register_simple() const, as the resources are copied and\nnever modified.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "81880d603d00c645e0890d0a44d50711c503b72b", "tree": "69d4bb390d8d2595017192b51feb08e2fed3c26a", "parents": [ "f3d46f9d3194e0329216002a8724d4c0957abc79" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Mon May 17 14:34:57 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 07:57:27 2010 -0700" }, "message": "atomic_t: Remove volatile from atomic_t definition\n\nWhen looking at a performance problem on PowerPC, I noticed some awful code\ngeneration:\n\nc00000000051fc98: 3b 60 00 01 li r27,1\n...\nc00000000051fca0: 3b 80 00 00 li r28,0\n...\nc00000000051fcdc: 93 61 00 70 stw r27,112(r1)\nc00000000051fce0: 93 81 00 74 stw r28,116(r1)\nc00000000051fce4: 81 21 00 70 lwz r9,112(r1)\nc00000000051fce8: 80 01 00 74 lwz r0,116(r1)\nc00000000051fcec: 7d 29 07 b4 extsw r9,r9\nc00000000051fcf0: 7c 00 07 b4 extsw r0,r0\n\nc00000000051fcf4: 7c 20 04 ac lwsync\nc00000000051fcf8: 7d 60 f8 28 lwarx r11,0,r31\nc00000000051fcfc: 7c 0b 48 00 cmpw r11,r9\nc00000000051fd00: 40 c2 00 10 bne- c00000000051fd10\nc00000000051fd04: 7c 00 f9 2d stwcx. r0,0,r31\nc00000000051fd08: 40 c2 ff f0 bne+ c00000000051fcf8\nc00000000051fd0c: 4c 00 01 2c isync\n\nWe create two constants, write them out to the stack, read them straight back\nin and sign extend them. What a mess.\n\nIt turns out this bad code is a result of us defining atomic_t as a\nvolatile int.\n\nWe removed the volatile attribute from the powerpc atomic_t definition years\nago, but commit ea435467500612636f8f4fb639ff6e76b2496e4b (atomic_t: unify all\narch definitions) added it back in.\n\nTo dig up an old quote from Linus:\n\n\u003e The fact is, volatile on data structures is a bug. It\u0027s a wart in the C\n\u003e language. It shouldn\u0027t be used.\n\u003e\n\u003e Volatile accesses in *code* can be ok, and if we have \"atomic_read()\"\n\u003e expand to a \"*(volatile int *)\u0026(x)-\u003evalue\", then I\u0027d be ok with that.\n\u003e\n\u003e But marking data structures volatile just makes the compiler screw up\n\u003e totally, and makes code for initialization sequences etc much worse.\n\nAnd screw up it does :)\n\nWith the volatile removed, we see much more reasonable code generation:\n\nc00000000051f5b8: 3b 60 00 01 li r27,1\n...\nc00000000051f5c0: 3b 80 00 00 li r28,0\n...\n\nc00000000051fc7c: 7c 20 04 ac lwsync\nc00000000051fc80: 7c 00 f8 28 lwarx r0,0,r31\nc00000000051fc84: 7c 00 d8 00 cmpw r0,r27\nc00000000051fc88: 40 c2 00 10 bne- c00000000051fc98\nc00000000051fc8c: 7f 80 f9 2d stwcx. r28,0,r31\nc00000000051fc90: 40 c2 ff f0 bne+ c00000000051fc80\nc00000000051fc94: 4c 00 01 2c isync\n\nSix instructions less.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f3d46f9d3194e0329216002a8724d4c0957abc79", "tree": "6d9413e4a448d7b8d342c40297c4fbe0b9c4c2f0", "parents": [ "e40152ee1e1c7a63f4777791863215e3faa37a86" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Mon May 17 14:33:53 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 07:57:27 2010 -0700" }, "message": "atomic_t: Cast to volatile when accessing atomic variables\n\nIn preparation for removing volatile from the atomic_t definition, this\npatch adds a volatile cast to all the atomic read functions.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b5dbc858717113c823fe6bb058807c2cb67d1efa", "tree": "e82858156bf5d46b539455728ac1b8a7cd9feb02", "parents": [ "d34e14f690d611ffe3db09e4ed8123d86c89a831", "c02db8c6290bb992442fec1407643c94cc414375" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 11:11:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 16 11:11:53 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 rtnetlink: make SR-IOV VF interface symmetric\n sctp: delete active ICMP proto unreachable timer when free transport\n tcp: fix MD5 (RFC2385) support\n" }, { "commit": "c02db8c6290bb992442fec1407643c94cc414375", "tree": "05ec7bdd7efc005cd9e3905e0d6f6469bf08668b", "parents": [ "55fa0cfd7c3ac2ae34cac7dca2e3fbcfe661e6c3" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sun May 16 01:05:45 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 16 01:05:45 2010 -0700" }, "message": "rtnetlink: make SR-IOV VF interface symmetric\n\nNow we have a set of nested attributes:\n\n IFLA_VFINFO_LIST (NESTED)\n IFLA_VF_INFO (NESTED)\n IFLA_VF_MAC\n IFLA_VF_VLAN\n IFLA_VF_TX_RATE\n\nThis allows a single set to operate on multiple attributes if desired.\nAmong other things, it means a dump can be replayed to set state.\n\nThe current interface has yet to be released, so this seems like\nsomething to consider for 2.6.34.\n\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "35790c0421121364883a167bab8a2e37e1f67f78", "tree": "a3e032a9ba6bb77337176bef407d7408d6a10a4d", "parents": [ "d77f873fdd21912803836da78f627d2efd267082" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun May 16 00:34:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 16 00:34:04 2010 -0700" }, "message": "tcp: fix MD5 (RFC2385) support\n\nTCP MD5 support uses percpu data for temporary storage. It currently\ndisables preemption so that same storage cannot be reclaimed by another\nthread on same cpu.\n\nWe also have to make sure a softirq handler wont try to use also same\ncontext. Various bug reports demonstrated corruptions.\n\nFix is to disable preemption and BH.\n\nReported-by: Bhaskar Dutta \u003cbhaskie@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d83c49f3e36cecd2e8823b6c48ffba083b8a5704", "tree": "a304de4eb43652d2a9528d4b43f798ab821c8b93", "parents": [ "6a251b0ab67989f468f4cb65179e0cf40cf8c295" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 30 17:17:09 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 15 07:16:33 2010 -0400" }, "message": "Fix the regression created by \"set S_DEAD on unlink()...\" commit\n\n1) i_flags simply doesn\u0027t work for mount/unlink race prevention;\nwe may have many links to file and rm on one of those obviously\nshouldn\u0027t prevent bind on top of another later on. To fix it\nright way we need to mark _dentry_ as unsuitable for mounting\nupon; new flag (DCACHE_CANT_MOUNT) is protected by d_flags and\ni_mutex on the inode in question. Set it (with dont_mount(dentry))\nin unlink/rmdir/etc., check (with cant_mount(dentry)) in places\nin namespace.c that used to check for S_DEAD. Setting S_DEAD\nis still needed in places where we used to set it (for directories\ngetting killed), since we rely on it for readdir/rmdir race\nprevention.\n\n2) rename()/mount() protection has another bogosity - we unhash\nthe target before we\u0027d checked that it\u0027s not a mountpoint. Fixed.\n\n3) ancient bogosity in pivot_root() - we locked i_mutex on the\nright directory, but checked S_DEAD on the different (and wrong)\none. Noticed and fixed.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "34441427aab4bdb3069a4ffcda69a99357abcb2e", "tree": "3beebde910f25b0945e9105017fd743c9e5241a5", "parents": [ "3c904afd7358e9ef515eb5df36b6f25c2b7fc2da" ], "author": { "name": "Robin Holt", "email": "holt@sgi.com", "time": "Tue May 11 14:06:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 17:33:41 2010 -0700" }, "message": "revert \"procfs: provide stack information for threads\" and its fixup commits\n\nOriginally, commit d899bf7b (\"procfs: provide stack information for\nthreads\") attempted to introduce a new feature for showing where the\nthreadstack was located and how many pages are being utilized by the\nstack.\n\nCommit c44972f1 (\"procfs: disable per-task stack usage on NOMMU\") was\napplied to fix the NO_MMU case.\n\nCommit 89240ba0 (\"x86, fs: Fix x86 procfs stack information for threads on\n64-bit\") was applied to fix a bug in ia32 executables being loaded.\n\nCommit 9ebd4eba7 (\"procfs: fix /proc/\u003cpid\u003e/stat stack pointer for kernel\nthreads\") was applied to fix a bug which had kernel threads printing a\nuserland stack address.\n\nCommit 1306d603f (\u0027proc: partially revert \"procfs: provide stack\ninformation for threads\"\u0027) was then applied to revert the stack pages\nbeing used to solve a significant performance regression.\n\nThis patch nearly undoes the effect of all these patches.\n\nThe reason for reverting these is it provides an unusable value in\nfield 28. For x86_64, a fork will result in the task-\u003estack_start\nvalue being updated to the current user top of stack and not the stack\nstart address. This unpredictability of the stack_start value makes\nit worthless. That includes the intended use of showing how much stack\nspace a thread has.\n\nOther architectures will get different values. As an example, ia64\ngets 0. The do_fork() and copy_process() functions appear to treat the\nstack_start and stack_size parameters as architecture specific.\n\nI only partially reverted c44972f1 (\"procfs: disable per-task stack usage\non NOMMU\") . If I had completely reverted it, I would have had to change\nmm/Makefile only build pagewalk.o when CONFIG_PROC_PAGE_MONITOR is\nconfigured. Since I could not test the builds without significant effort,\nI decided to not change mm/Makefile.\n\nI only partially reverted 89240ba0 (\"x86, fs: Fix x86 procfs stack\ninformation for threads on 64-bit\") . I left the KSTK_ESP() change in\nplace as that seemed worthwhile.\n\nSigned-off-by: Robin Holt \u003cholt@sgi.com\u003e\nCc: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\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": "f33d7e2d2d113a63772bbc993cdec3b5327f0ef1", "tree": "1349305b4c3a39c87baab95beb05fa5b8dfc7750", "parents": [ "fc2a093e7ad23e935aa29e349bc27173c92f1a95" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue May 11 14:06:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 17:33:41 2010 -0700" }, "message": "dma-mapping: fix dma_sync_single_range_*\n\ndma_sync_single_range_for_cpu() and dma_sync_single_range_for_device() use\na wrong address with a partial synchronization.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\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": "72d5a9f7a9542f88397558c65bcfc3b115a65e34", "tree": "e46d3ad1948de45b9641d1a8b88f88bfb3809007", "parents": [ "4376030a54860dedab9d848dfa7cc700a6025c0b" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 17:12:17 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue May 11 16:10:47 2010 -0700" }, "message": "rcu: remove all rcu head initializations, except on_stack initializations\n\nRemove all rcu head inits. We don\u0027t care about the RCU head state before passing\nit to call_rcu() anyway. Only leave the \"on_stack\" variants so debugobjects can\nkeep track of objects on stack.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "9fc282baa8f743a7049e301d13cf9968ee95a91c", "tree": "d34e827ed35c21b98eb4e3d4c3731d1da54fa03a", "parents": [ "c61ea31dac0319ec64b33725917bda81fc293a25", "de02d72bb3cc5b3d4c873db4ca8291723dd48479" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 10:11:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 10:11:40 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 net: Fix FDDI and TR config checks in ipv4 arp and LLC.\n IPv4: unresolved multicast route cleanup\n mac80211: remove association work when processing deauth request\n ar9170: wait for asynchronous firmware loading\n ipv4: udp: fix short packet and bad checksum logging\n phy: Fix initialization in micrel driver.\n sctp: Fix a race between ICMP protocol unreachable and connect()\n veth: Dont kfree_skb() after dev_forward_skb()\n IPv6: fix IPV6_RECVERR handling of locally-generated errors\n net/gianfar: drop recycled skbs on MTU change\n iwlwifi: work around passive scan issue\n" }, { "commit": "795e74f7a69f9c08afa4fa7c86cc4f18a62bd630", "tree": "8448ece35101d8db945c49df50d0d5889687de9f", "parents": [ "a52357259680fe5368c2fabf5949209e231f2aa2", "12c7389abe5786349d3ea6da1961cf78d0c1c7cd" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue May 11 17:40:57 2010 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue May 11 17:40:57 2010 +0200" }, "message": "Merge branch \u0027iommu/largepages\u0027 into amd-iommu/2.6.35\n\nConflicts:\n\tarch/x86/kernel/amd_iommu.c\n" }, { "commit": "4376030a54860dedab9d848dfa7cc700a6025c0b", "tree": "b9817d81777636eaa882563d35fcd2cd31b7e678", "parents": [ "a5d8e467f83f6672104f276223a88e3b50cbd375" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@efficios.com", "time": "Sat Apr 17 08:48:39 2010 -0400" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 16:53:55 2010 -0700" }, "message": "rcu head introduce rcu head init on stack\n\nPEM:\no Would it be possible to make this bisectable as follows?\n\n a. Insert a new patch after current patch 4/6 that\n defines destroy_rcu_head_on_stack(),\n init_rcu_head_on_stack(), and init_rcu_head() with\n their !CONFIG_DEBUG_OBJECTS_RCU_HEAD definitions.\n\nThis patch performs this transition.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCC: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: akpm@linux-foundation.org\nCC: mingo@elte.hu\nCC: laijs@cn.fujitsu.com\nCC: dipankar@in.ibm.com\nCC: josh@joshtriplett.org\nCC: dvhltc@us.ibm.com\nCC: niv@us.ibm.com\nCC: tglx@linutronix.de\nCC: peterz@infradead.org\nCC: rostedt@goodmis.org\nCC: Valdis.Kletnieks@vt.edu\nCC: dhowells@redhat.com\nCC: eric.dumazet@gmail.com\nCC: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "a5d8e467f83f6672104f276223a88e3b50cbd375", "tree": "13f66a14b75735e5bbff450ae1f8975a0cb92543", "parents": [ "d822ed1094032ab524344a9a474c93128d9c2159" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@efficios.com", "time": "Sat Apr 17 08:48:38 2010 -0400" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 16:08:01 2010 -0700" }, "message": "Debugobjects transition check\n\nImplement a basic state machine checker in the debugobjects.\n\nThis state machine checker detects races and inconsistencies within the \"active\"\nlife of a debugobject. The checker only keeps track of the current state; all\nthe state machine logic is kept at the object instance level.\n\nThe checker works by adding a supplementary \"unsigned int astate\" field to the\ndebug_obj structure. It keeps track of the current \"active state\" of the object.\n\nThe only constraints that are imposed on the states by the debugobjects system\nis that:\n\n- activation of an object sets the current active state to 0,\n- deactivation of an object expects the current active state to be 0.\n\nFor the rest of the states, the state mapping is determined by the specific\nobject instance. Therefore, the logic keeping track of the state machine is\nwithin the specialized instance, without any need to know about it at the\ndebugobject level.\n\nThe current object active state is changed by calling:\n\ndebug_object_active_state(addr, descr, expect, next)\n\nwhere \"expect\" is the expected state and \"next\" is the next state to move to if\nthe expected state is found. A warning is generated if the expected is not\nfound.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nReviewed-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCC: akpm@linux-foundation.org\nCC: mingo@elte.hu\nCC: laijs@cn.fujitsu.com\nCC: dipankar@in.ibm.com\nCC: josh@joshtriplett.org\nCC: dvhltc@us.ibm.com\nCC: niv@us.ibm.com\nCC: peterz@infradead.org\nCC: rostedt@goodmis.org\nCC: Valdis.Kletnieks@vt.edu\nCC: dhowells@redhat.com\nCC: eric.dumazet@gmail.com\nCC: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "d14aada8e20bdf81ffd43f433b123972cf575b32", "tree": "ac8a7682eee53213b47e659d7f5a74a6306f6fa7", "parents": [ "f1d507beeab1d1d60a1c58eac7dc81522c6f4629" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon Apr 19 22:24:22 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 11:08:35 2010 -0700" }, "message": "rcu: make SRCU usable in modules\n\nAdd a #include for mutex.h to allow SRCU to be more easily used in\nkernel modules.\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "bbad937983147c017c25406860287cb94da9af7c", "tree": "57311598c360b92b189c7ec337146e4bc779c73d", "parents": [ "25502a6c13745f4650cc59322bd198194f55e796" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Fri Apr 02 16:17:17 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 11:08:34 2010 -0700" }, "message": "rcu: slim down rcutiny by removing rcu_scheduler_active and friends\n\nTINY_RCU does not need rcu_scheduler_active unless CONFIG_DEBUG_LOCK_ALLOC.\nSo conditionally compile rcu_scheduler_active in order to slim down\nrcutiny a bit more. Also gets rid of an EXPORT_SYMBOL_GPL, which is\nresponsible for most of the slimming.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "25502a6c13745f4650cc59322bd198194f55e796", "tree": "d76cc659d3ea797c5da4630e219ac363d17c44a6", "parents": [ "99652b54de1ee094236f7171485214071af4ef31" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Thu Apr 01 17:37:01 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 11:08:33 2010 -0700" }, "message": "rcu: refactor RCU\u0027s context-switch handling\n\nThe addition of preemptible RCU to treercu resulted in a bit of\nconfusion and inefficiency surrounding the handling of context switches\nfor RCU-sched and for RCU-preempt. For RCU-sched, a context switch\nis a quiescent state, pure and simple, just like it always has been.\nFor RCU-preempt, a context switch is in no way a quiescent state, but\nspecial handling is required when a task blocks in an RCU read-side\ncritical section.\n\nHowever, the callout from the scheduler and the outer loop in ksoftirqd\nstill calls something named rcu_sched_qs(), whose name is no longer\naccurate. Furthermore, when rcu_check_callbacks() notes an RCU-sched\nquiescent state, it ends up unnecessarily (though harmlessly, aside\nfrom the performance hit) enqueuing the current task if it happens to\nbe running in an RCU-preempt read-side critical section. This not only\nincreases the maximum latency of scheduler_tick(), it also needlessly\nincreases the overhead of the next outermost rcu_read_unlock() invocation.\n\nThis patch addresses this situation by separating the notion of RCU\u0027s\ncontext-switch handling from that of RCU-sched\u0027s quiescent states.\nThe context-switch handling is covered by rcu_note_context_switch() in\ngeneral and by rcu_preempt_note_context_switch() for preemptible RCU.\nThis permits rcu_sched_qs() to handle quiescent states and only quiescent\nstates. It also reduces the maximum latency of scheduler_tick(), though\nprobably by much less than a microsecond. Finally, it means that tasks\nwithin preemptible-RCU read-side critical sections avoid incurring the\noverhead of queuing unless there really is a context switch.\n\nSuggested-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\n" }, { "commit": "da848c47bc6e873a54a445ea1960423a495b6b32", "tree": "4c0eaef1a5990585730f00caca0cfcba21fe9f9f", "parents": [ "32c141a0a1dfa29e0a07d78bec0c0919fc4b9f88" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Mar 30 15:46:01 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 11:08:32 2010 -0700" }, "message": "rcu: shrink rcutiny by making synchronize_rcu_bh() be inline\n\nBecause synchronize_rcu_bh() is identical to synchronize_sched(),\nmake the former a static inline invoking the latter, saving the\noverhead of an EXPORT_SYMBOL_GPL() and the duplicate code.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "32c141a0a1dfa29e0a07d78bec0c0919fc4b9f88", "tree": "e85572d2d80f750ca8487e75fd63b9895c5c5db5", "parents": [ "d20200b591f59847ab6a5c23507084a7d29e23c5" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Mar 30 10:59:28 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 11:08:32 2010 -0700" }, "message": "rcu: fix now-bogus rcu_scheduler_active comments.\n\nThe rcu_scheduler_active check has been wrapped into the new\ndebug_lockdep_rcu_enabled() function, so update the comments to\nreflect this new reality.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "d20200b591f59847ab6a5c23507084a7d29e23c5", "tree": "565d6f26eae873ab7c1b4ee406e5e767dabd24f0", "parents": [ "5db356736acb9ba717df1aa9444e4e44cbb30a71" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Mar 30 10:52:21 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 11:08:32 2010 -0700" }, "message": "rcu: Fix bogus CONFIG_PROVE_LOCKING in comments to reflect reality.\n\nIt is CONFIG_DEBUG_LOCK_ALLOC rather than CONFIG_PROVE_LOCKING, so fix it.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "2b3fc35f6919344e3cf722dde8308f47235c0b70", "tree": "2bc2cfc9c1a032d51a3d99a10e309e100b9eea4a", "parents": [ "b57f95a38233a2e73b679bea4a5453a1cc2a1cc9" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Apr 20 16:23:07 2010 +0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon May 10 11:08:31 2010 -0700" }, "message": "rcu: optionally leave lockdep enabled after RCU lockdep splat\n\nThere is no need to disable lockdep after an RCU lockdep splat,\nso remove the debug_lockdeps_off() from lockdep_rcu_dereference().\nTo avoid repeated lockdep splats, use a static variable in the inlined\nrcu_dereference_check() and rcu_dereference_protected() macros so that\na given instance splats only once, but so that multiple instances can\nbe detected per boot.\n\nThis is controlled by a new config variable CONFIG_PROVE_RCU_REPEATEDLY,\nwhich is disabled by default. This provides the normal lockdep behavior\nby default, but permits people who want to find multiple RCU-lockdep\nsplats per boot to easily do so.\n\nRequested-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nTested-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7", "tree": "72f361fec4a8c81d5003b93344bf3eab3eb21775", "parents": [ "e2dbe06c271f3bb2a495627980aad3d1d8ccef2a", "8cfe92d683a0041ac8e016a0b0a487c99a78f6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 14:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 14:02:01 2010 -0700" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/ttm: Remove the ttm_bo_block_reservation() function.\n drm/ttm: Remove some leftover debug messages.\n drm/radeon: async event synchronization for drmWaitVblank\n" }, { "commit": "417a9ef1f488e3cf92bacc4999e1cbabc0e7cf1a", "tree": "f9ea61b81f7de18687466d5a9d510ad9b563b79e", "parents": [ "91bc482ec5a615e8ecebc106aaf7d0c267d511de", "a47f6be45670465d45a3d27f7ff71986bd35d6c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 13:58:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 13:58:56 2010 -0700" }, "message": "Merge branch \u0027v4l_for_2.6.34\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_2.6.34\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n V4L/DVB: pxa_camera: move fifo reset direct before dma start\n V4L/DVB: video: testing unsigned for less than 0\n V4L/DVB: mx1-camera: compile fix\n V4L/DVB: budget: Oops: \"BUG: unable to handle kernel NULL pointer \tdereference\"\n V4L/DVB: ngene: Workaround for stuck DiSEqC pin\n V4L/DVB: saa7146: fix regression of the av7110/budget-av driver\n V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1\n V4L/DVB: feature-removal: announce videotext.h removal\n V4L/DVB: V4L - vpfe capture - fix for kernel crash\n V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver\n V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver\n V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration\n V4L/DVB: saa7146: fix up bytesperline if it is an impossible value\n V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails\n V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci\n V4L/DVB: omap24xxcam: potential buffer overflow\n" }, { "commit": "91bc482ec5a615e8ecebc106aaf7d0c267d511de", "tree": "ad75789a5825fb2da75b2dbdc02d1969bad9b338", "parents": [ "e8e8fade7b351f131433fa44ca5d4e960e1c0f9c", "ee84b8243b07c33a5c8aed42b4b2da60cb16d1d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 13:58:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 13:58:21 2010 -0700" }, "message": "Merge branch \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rcu: create rcu_my_thread_group_empty() wrapper\n memcg: css_id() must be called under rcu_read_lock()\n cgroup: Check task_lock in task_subsys_state()\n sched: Fix an RCU warning in print_task()\n cgroup: Fix an RCU warning in alloc_css_id()\n cgroup: Fix an RCU warning in cgroup_path()\n KEYS: Fix an RCU warning in the reading of user keys\n KEYS: Fix an RCU warning\n" }, { "commit": "8cfe92d683a0041ac8e016a0b0a487c99a78f6c1", "tree": "5949c336ea881c9fb51aee811432125451fef45d", "parents": [ "5be6eff965aee22181d7f6210c2c463420e94e03" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Apr 28 11:33:25 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 07 09:21:28 2010 +1000" }, "message": "drm/ttm: Remove the ttm_bo_block_reservation() function.\n\nIt\u0027s unused and buggy in its current form, since it can place a bo\nin the reserved state without removing it from lru lists.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "03b1930efd3c2320b1dcba76c8af15f7e454919d", "tree": "436dfae66ed4444578bc7d14cc43600a4f5119e1", "parents": [ "d2f2d6d0a11e892263ea511e46af449113fd2081" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Wed Mar 24 19:09:55 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu May 06 19:20:50 2010 -0300" }, "message": "V4L/DVB: saa7146: fix regression of the av7110/budget-av driver\n\nAn earlier regression fix for the mxb driver (V4L/DVB: saa7146_vv: fix\nregression where v4l2_device was registered too late) caused a new\nregression in the av7110 driver.\n\nReverted the old fix and fixed the problem in the mxb driver instead.\nTested on mxb and budget-av cards.\n\nThe real problem is that the saa7146 framework has separate probe()\nand attach() driver callbacks which should be rolled into one. This\nis now done for the mxb driver, but others should do the same. Lack\nof hardware makes this hard to do, though. I hope to get hold of some\nhexium cards and then I can try to improve the framework to prevent\nthis from happening again.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ee84b8243b07c33a5c8aed42b4b2da60cb16d1d2", "tree": "a5b3cad55179fe8340c6422deaf6e11120222ad1", "parents": [ "ad4ba375373937817404fd92239ef4cadbded23b" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Thu May 06 09:28:41 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Thu May 06 09:28:41 2010 -0700" }, "message": "rcu: create rcu_my_thread_group_empty() wrapper\n\nSome RCU-lockdep splat repairs need to know whether they are running\nin a single-threaded process. Unfortunately, the thread_group_empty()\nprimitive is defined in sched.h, and can induce #include hell. This\ncommit therefore introduces a rcu_my_thread_group_empty() wrapper that\nis defined in rcupdate.c, thus avoiding the need to include sched.h\neverywhere.\n\nSigned-off-by: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "50b5d6ad63821cea324a5a7a19854d4de1a0a819", "tree": "a279d53880e3bdf144783598ad03bbaa33e2cd96", "parents": [ "6ec82562ffc6f297d0de36d65776cff8e5704867" ], "author": { "name": "Vlad Yasevich", "email": "vladislav.yasevich@hp.com", "time": "Thu May 06 00:56:07 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 06 00:56:07 2010 -0700" }, "message": "sctp: Fix a race between ICMP protocol unreachable and connect()\n\nICMP protocol unreachable handling completely disregarded\nthe fact that the user may have locked the socket. It proceeded\nto destroy the association, even though the user may have\nheld the lock and had a ref on the association. This resulted\nin the following:\n\nAttempt to release alive inet socket f6afcc00\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ BUG: held lock freed! ]\n-------------------------\nsomenu/2672 is freeing memory f6afcc00-f6afcfff, with a lock still held\nthere!\n (sk_lock-AF_INET){+.+.+.}, at: [\u003cc122098a\u003e] sctp_connect+0x13/0x4c\n1 lock held by somenu/2672:\n #0: (sk_lock-AF_INET){+.+.+.}, at: [\u003cc122098a\u003e] sctp_connect+0x13/0x4c\n\nstack backtrace:\nPid: 2672, comm: somenu Not tainted 2.6.32-telco #55\nCall Trace:\n [\u003cc1232266\u003e] ? printk+0xf/0x11\n [\u003cc1038553\u003e] debug_check_no_locks_freed+0xce/0xff\n [\u003cc10620b4\u003e] kmem_cache_free+0x21/0x66\n [\u003cc1185f25\u003e] __sk_free+0x9d/0xab\n [\u003cc1185f9c\u003e] sk_free+0x1c/0x1e\n [\u003cc1216e38\u003e] sctp_association_put+0x32/0x89\n [\u003cc1220865\u003e] __sctp_connect+0x36d/0x3f4\n [\u003cc122098a\u003e] ? sctp_connect+0x13/0x4c\n [\u003cc102d073\u003e] ? autoremove_wake_function+0x0/0x33\n [\u003cc12209a8\u003e] sctp_connect+0x31/0x4c\n [\u003cc11d1e80\u003e] inet_dgram_connect+0x4b/0x55\n [\u003cc11834fa\u003e] sys_connect+0x54/0x71\n [\u003cc103a3a2\u003e] ? lock_release_non_nested+0x88/0x239\n [\u003cc1054026\u003e] ? might_fault+0x42/0x7c\n [\u003cc1054026\u003e] ? might_fault+0x42/0x7c\n [\u003cc11847ab\u003e] sys_socketcall+0x6d/0x178\n [\u003cc10da994\u003e] ? trace_hardirqs_on_thunk+0xc/0x10\n [\u003cc1002959\u003e] syscall_call+0x7/0xb\n\nThis was because the sctp_wait_for_connect() would aqcure the socket\nlock and then proceed to release the last reference count on the\nassociation, thus cause the fully destruction path to finish freeing\nthe socket.\n\nThe simplest solution is to start a very short timer in case the socket\nis owned by user. When the timer expires, we can do some verification\nand be able to do the release properly.\n\nSigned-off-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7437e7d3672b6d23c08212c68752c9a9c25f8e9e", "tree": "809507a1d8c1cadce9a7cab87970da95aa772d2d", "parents": [ "38c9e91bc396672e9ea8013bad63ea4f59d9d31c", "7cff0943a1104479fc9fc2d6ced24c02ba81e73e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 05 07:55:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 05 07:55:07 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 FEC: Fix kernel panic in fec_set_mac_address.\n ipv6: Fix default multicast hops setting.\n net: ep93xx_eth stops receiving packets\n drivers/net/phy: micrel phy driver\n dm9601: fix phy/eeprom write routine\n ppp_generic: handle non-linear skbs when passing them to pppd\n ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid\n net: fix compile error due to double return type in SOCK_DEBUG\n net/usb: initiate sync sequence in sierra_net.c driver\n net/usb: remove default in Kconfig for sierra_net driver\n r8169: Fix rtl8169_rx_interrupt()\n e1000e: Fix oops caused by ASPM patch.\n net/sb1250: register mdio bus in probe\n sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)\n p54pci: fix bugs in p54p_check_tx_ring\n" }, { "commit": "1ce7e4ff24fe338438bc7837e02780f202bf202b", "tree": "3906643ba96ba8b3fda2291e5e40e48bbba9085f", "parents": [ "b629317e66fb1c6066c550dded45ab85a936163c" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Apr 23 10:35:52 2010 +0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue May 04 09:25:02 2010 -0700" }, "message": "cgroup: Check task_lock in task_subsys_state()\n\nExpand task_subsys_state()\u0027s rcu_dereference_check() to include the full\nlocking rule as documented in Documentation/cgroups/cgroups.txt by adding\na check for task-\u003ealloc_lock being held.\n\nThis fixes an RCU false positive when resuming from suspend. The warning\ncomes from freezer cgroup in cgroup_freezing_or_frozen().\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "6629dcff19470a894ce294d0adb9cbab94ee1fb9", "tree": "18f75a3f5ca83de96a0fe353fafa02bab174cd36", "parents": [ "b1d4b390ea4bb480e65974ce522a04022608a8df" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Tue May 04 11:09:28 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Tue May 04 11:09:28 2010 +0200" }, "message": "i2c-core: Use per-adapter userspace device lists\n\nUsing a single list for all userspace devices leads to a dead lock\non multiplexed buses in some circumstances (mux chip instantiated\nfrom userspace). This is solved by using a separate list for each\nbus segment.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Michael Lawnick \u003cml.lawnick@gmx.de\u003e\n" }, { "commit": "1183f3838c588545592c042c0ce15015661ce7f2", "tree": "24de17b69f9b2d83720a550af130d1dbddf067e8", "parents": [ "6f1464bf65fcaa57a4b32dae93de4e8bbdfaf7c5" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Sun May 02 13:42:39 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 13:42:39 2010 -0700" }, "message": "net: fix compile error due to double return type in SOCK_DEBUG\n\nFix this one:\ninclude/net/sock.h: error: two or more data types in declaration specifiers\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "073900a28d95c75a706bf40ebf092ea048c7b236", "tree": "01e8bb7856ebf1e989a1eb693704435fc4032118", "parents": [ "75181f386f9a80ed6f87763ac6cf05826e253ccd" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Mon Apr 12 13:17:25 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 30 09:25:12 2010 -0700" }, "message": "USB: rename usb_buffer_alloc() and usb_buffer_free()\n\nFor more clearance what the functions actually do,\n\n usb_buffer_alloc() is renamed to usb_alloc_coherent()\n usb_buffer_free() is renamed to usb_free_coherent()\n\nThey should only be used in code which really needs DMA coherency.\n\n[added compatibility macros so we can convert things easier - gregkh]\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: Pedro Ribeiro \u003cpedrib@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0", "tree": "25a8ca59a3743459bbd48674731becea89a16318", "parents": [ "f80a0ca6ad8f2800453e819dafa09a0ed9e56850", "9699eda6bc1f708a28acb716e1477aa351362fe2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 29 10:23:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 29 10:23:44 2010 -0700" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4\n nfs: fix some issues in nfs41_proc_reclaim_complete()\n NFS: Ensure that nfs_wb_page() waits for Pg_writeback to clear\n NFS: Fix an unstable write data integrity race\n nfs: testing for null instead of ERR_PTR()\n NFS: rsize and wsize settings ignored on v4 mounts\n NFSv4: Don\u0027t attempt an atomic open if the file is a mountpoint\n SUNRPC: Fix a bug in rpcauth_prune_expired\n" }, { "commit": "5fa782c2f5ef6c2e4f04d3e228412c9b4a4c8809", "tree": "38442b86f3c1b57dd9c660d7c551334e110f6d43", "parents": [ "e41c11ee0cc602bcde68916be85fb97d1a484324" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Wed Apr 28 10:30:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 28 14:22:01 2010 -0700" }, "message": "sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)\n\nOk, version 4\n\nChange Notes:\n1) Minor cleanups, from Vlads notes\n\nSummary:\n\nHey-\n\tRecently, it was reported to me that the kernel could oops in the\nfollowing way:\n\n\u003c5\u003e kernel BUG at net/core/skbuff.c:91!\n\u003c5\u003e invalid operand: 0000 [#1]\n\u003c5\u003e Modules linked in: sctp netconsole nls_utf8 autofs4 sunrpc iptable_filter\nip_tables cpufreq_powersave parport_pc lp parport vmblock(U) vsock(U) vmci(U)\nvmxnet(U) vmmemctl(U) vmhgfs(U) acpiphp dm_mirror dm_mod button battery ac md5\nipv6 uhci_hcd ehci_hcd snd_ens1371 snd_rawmidi snd_seq_device snd_pcm_oss\nsnd_mixer_oss snd_pcm snd_timer snd_page_alloc snd_ac97_codec snd soundcore\npcnet32 mii floppy ext3 jbd ata_piix libata mptscsih mptsas mptspi mptscsi\nmptbase sd_mod scsi_mod\n\u003c5\u003e CPU: 0\n\u003c5\u003e EIP: 0060:[\u003cc02bff27\u003e] Not tainted VLI\n\u003c5\u003e EFLAGS: 00010216 (2.6.9-89.0.25.EL)\n\u003c5\u003e EIP is at skb_over_panic+0x1f/0x2d\n\u003c5\u003e eax: 0000002c ebx: c033f461 ecx: c0357d96 edx: c040fd44\n\u003c5\u003e esi: c033f461 edi: df653280 ebp: 00000000 esp: c040fd40\n\u003c5\u003e ds: 007b es: 007b ss: 0068\n\u003c5\u003e Process swapper (pid: 0, threadinfo\u003dc040f000 task\u003dc0370be0)\n\u003c5\u003e Stack: c0357d96 e0c29478 00000084 00000004 c033f461 df653280 d7883180\ne0c2947d\n\u003c5\u003e 00000000 00000080 df653490 00000004 de4f1ac0 de4f1ac0 00000004\ndf653490\n\u003c5\u003e 00000001 e0c2877a 08000800 de4f1ac0 df653490 00000000 e0c29d2e\n00000004\n\u003c5\u003e Call Trace:\n\u003c5\u003e [\u003ce0c29478\u003e] sctp_addto_chunk+0xb0/0x128 [sctp]\n\u003c5\u003e [\u003ce0c2947d\u003e] sctp_addto_chunk+0xb5/0x128 [sctp]\n\u003c5\u003e [\u003ce0c2877a\u003e] sctp_init_cause+0x3f/0x47 [sctp]\n\u003c5\u003e [\u003ce0c29d2e\u003e] sctp_process_unk_param+0xac/0xb8 [sctp]\n\u003c5\u003e [\u003ce0c29e90\u003e] sctp_verify_init+0xcc/0x134 [sctp]\n\u003c5\u003e [\u003ce0c20322\u003e] sctp_sf_do_5_1B_init+0x83/0x28e [sctp]\n\u003c5\u003e [\u003ce0c25333\u003e] sctp_do_sm+0x41/0x77 [sctp]\n\u003c5\u003e [\u003cc01555a4\u003e] cache_grow+0x140/0x233\n\u003c5\u003e [\u003ce0c26ba1\u003e] sctp_endpoint_bh_rcv+0xc5/0x108 [sctp]\n\u003c5\u003e [\u003ce0c2b863\u003e] sctp_inq_push+0xe/0x10 [sctp]\n\u003c5\u003e [\u003ce0c34600\u003e] sctp_rcv+0x454/0x509 [sctp]\n\u003c5\u003e [\u003ce084e017\u003e] ipt_hook+0x17/0x1c [iptable_filter]\n\u003c5\u003e [\u003cc02d005e\u003e] nf_iterate+0x40/0x81\n\u003c5\u003e [\u003cc02e0bb9\u003e] ip_local_deliver_finish+0x0/0x151\n\u003c5\u003e [\u003cc02e0c7f\u003e] ip_local_deliver_finish+0xc6/0x151\n\u003c5\u003e [\u003cc02d0362\u003e] nf_hook_slow+0x83/0xb5\n\u003c5\u003e [\u003cc02e0bb2\u003e] ip_local_deliver+0x1a2/0x1a9\n\u003c5\u003e [\u003cc02e0bb9\u003e] ip_local_deliver_finish+0x0/0x151\n\u003c5\u003e [\u003cc02e103e\u003e] ip_rcv+0x334/0x3b4\n\u003c5\u003e [\u003cc02c66fd\u003e] netif_receive_skb+0x320/0x35b\n\u003c5\u003e [\u003ce0a0928b\u003e] init_stall_timer+0x67/0x6a [uhci_hcd]\n\u003c5\u003e [\u003cc02c67a4\u003e] process_backlog+0x6c/0xd9\n\u003c5\u003e [\u003cc02c690f\u003e] net_rx_action+0xfe/0x1f8\n\u003c5\u003e [\u003cc012a7b1\u003e] __do_softirq+0x35/0x79\n\u003c5\u003e [\u003cc0107efb\u003e] handle_IRQ_event+0x0/0x4f\n\u003c5\u003e [\u003cc01094de\u003e] do_softirq+0x46/0x4d\n\nIts an skb_over_panic BUG halt that results from processing an init chunk in\nwhich too many of its variable length parameters are in some way malformed.\n\nThe problem is in sctp_process_unk_param:\nif (NULL \u003d\u003d *errp)\n\t*errp \u003d sctp_make_op_error_space(asoc, chunk,\n\t\t\t\t\t ntohs(chunk-\u003echunk_hdr-\u003elength));\n\n\tif (*errp) {\n\t\tsctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM,\n\t\t\t\t WORD_ROUND(ntohs(param.p-\u003elength)));\n\t\tsctp_addto_chunk(*errp,\n\t\t\tWORD_ROUND(ntohs(param.p-\u003elength)),\n\t\t\t\t param.v);\n\nWhen we allocate an error chunk, we assume that the worst case scenario requires\nthat we have chunk_hdr-\u003elength data allocated, which would be correct nominally,\ngiven that we call sctp_addto_chunk for the violating parameter. Unfortunately,\nwe also, in sctp_init_cause insert a sctp_errhdr_t structure into the error\nchunk, so the worst case situation in which all parameters are in violation\nrequires chunk_hdr-\u003elength+(sizeof(sctp_errhdr_t)*param_count) bytes of data.\n\nThe result of this error is that a deliberately malformed packet sent to a\nlistening host can cause a remote DOS, described in CVE-2010-1173:\nhttp://cve.mitre.org/cgi-bin/cvename.cgi?name\u003d2010-1173\n\nI\u0027ve tested the below fix and confirmed that it fixes the issue. We move to a\nstrategy whereby we allocate a fixed size error chunk and ignore errors we don\u0027t\nhave space to report. Tested by me successfully\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "032b734d291e3532221b6cf7643a5f41c6261941", "tree": "bbfa57472cdf90a84730ade5d2358205d35b2a34", "parents": [ "3fb938b2a8bdbcf6086192d90fb7c73425e41fb9", "e41c11ee0cc602bcde68916be85fb97d1a484324" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 28 13:37:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 28 13:37:06 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: (27 commits)\n sfc: Change falcon_probe_board() to fail for unsupported boards\n sfc: Always close net device at the end of a disabling reset\n sfc: Wait at most 10ms for the MC to finish reading out MAC statistics\n sctp: Fix oops when sending queued ASCONF chunks\n sctp: fix to calc the INIT/INIT-ACK chunk length correctly is set\n sctp: per_cpu variables should be in bh_disabled section\n sctp: fix potential reference of a freed pointer\n sctp: avoid irq lock inversion while call sk-\u003esk_data_ready()\n Revert \"tcp: bind() fix when many ports are bound\"\n net/usb: add sierra_net.c driver\n cdc_ether: fix autosuspend for mbm devices\n bluetooth: handle l2cap_create_connless_pdu() errors\n gianfar: Wait for both RX and TX to stop\n ipheth: potential null dereferences on error path\n smc91c92_cs: spin_unlock_irqrestore before calling smc_interrupt()\n drivers/usb/net/kaweth.c: add device \"Allied Telesyn AT-USB10 USB Ethernet Adapter\"\n bnx2: Update version to 2.0.9.\n bnx2: Prevent \"scheduling while atomic\" warning with cnic, bonding and vlan.\n bnx2: Fix lost MSI-X problem on 5709 NICs.\n cxgb3: Wait longer for control packets on initialization\n ...\n" }, { "commit": "c0786693404cffd80ca3cb6e75ee7b35186b2825", "tree": "92a9026abbe71399c95330656af0f8c9d9c0019c", "parents": [ "a8170c35e738d62e9919ce5b109cf4ed66e95bde" ], "author": { "name": "Vlad Yasevich", "email": "vladislav.yasevich@hp.com", "time": "Wed Apr 28 08:47:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 28 12:16:34 2010 -0700" }, "message": "sctp: Fix oops when sending queued ASCONF chunks\n\nWhen we finish processing ASCONF_ACK chunk, we try to send\nthe next queued ASCONF. This action runs the sctp state\nmachine recursively and it\u0027s not prepared to do so.\n\nkernel BUG at kernel/timer.c:790!\ninvalid opcode: 0000 [#1] SMP\nlast sysfs file: /sys/module/ipv6/initstate\nModules linked in: sha256_generic sctp libcrc32c ipv6 dm_multipath\nuinput 8139too i2c_piix4 8139cp mii i2c_core pcspkr virtio_net joydev\nfloppy virtio_blk virtio_pci [last unloaded: scsi_wait_scan]\n\nPid: 0, comm: swapper Not tainted 2.6.34-rc4 #15 /Bochs\nEIP: 0060:[\u003cc044a2ef\u003e] EFLAGS: 00010286 CPU: 0\nEIP is at add_timer+0xd/0x1b\nEAX: cecbab14 EBX: 000000f0 ECX: c0957b1c EDX: 03595cf4\nESI: cecba800 EDI: cf276f00 EBP: c0957aa0 ESP: c0957aa0\n DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nProcess swapper (pid: 0, ti\u003dc0956000 task\u003dc0988ba0 task.ti\u003dc0956000)\nStack:\n c0957ae0 d1851214 c0ab62e4 c0ab5f26 0500ffff 00000004 00000005 00000004\n\u003c0\u003e 00000000 d18694fd 00000004 1666b892 cecba800 cecba800 c0957b14\n00000004\n\u003c0\u003e c0957b94 d1851b11 ceda8b00 cecba800 cf276f00 00000001 c0957b14\n000000d0\nCall Trace:\n [\u003cd1851214\u003e] ? sctp_side_effects+0x607/0xdfc [sctp]\n [\u003cd1851b11\u003e] ? sctp_do_sm+0x108/0x159 [sctp]\n [\u003cd1863386\u003e] ? sctp_pname+0x0/0x1d [sctp]\n [\u003cd1861a56\u003e] ? sctp_primitive_ASCONF+0x36/0x3b [sctp]\n [\u003cd185657c\u003e] ? sctp_process_asconf_ack+0x2a4/0x2d3 [sctp]\n [\u003cd184e35c\u003e] ? sctp_sf_do_asconf_ack+0x1dd/0x2b4 [sctp]\n [\u003cd1851ac1\u003e] ? sctp_do_sm+0xb8/0x159 [sctp]\n [\u003cd1863334\u003e] ? sctp_cname+0x0/0x52 [sctp]\n [\u003cd1854377\u003e] ? sctp_assoc_bh_rcv+0xac/0xe1 [sctp]\n [\u003cd1858f0f\u003e] ? sctp_inq_push+0x2d/0x30 [sctp]\n [\u003cd186329d\u003e] ? sctp_rcv+0x797/0x82e [sctp]\n\nTested-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: Yuansong Qiao \u003cysqiao@research.ait.ie\u003e\nSigned-off-by: Shuaijun Zhang \u003cszhang@research.ait.ie\u003e\nSigned-off-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "561b1733a465cf9677356b40c27653dd45f1ac56", "tree": "86d6720a6497a0b3faa9685596d4f85d3858b6fe", "parents": [ "8d238b25b1ec22a73b1c2206f111df2faaff8285" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Wed Apr 28 08:47:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 28 12:16:31 2010 -0700" }, "message": "sctp: avoid irq lock inversion while call sk-\u003esk_data_ready()\n\nsk-\u003esk_data_ready() of sctp socket can be called from both BH and non-BH\ncontexts, but the default sk-\u003esk_data_ready(), sock_def_readable(), can\nnot be used in this case. Therefore, we have to make a new function\nsctp_data_ready() to grab sk-\u003esk_data_ready() with BH disabling.\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ INFO: possible irq lock inversion dependency detected ]\n2.6.33-rc6 #129\n---------------------------------------------------------\nsctp_darn/1517 just changed the state of lock:\n (clock-AF_INET){++.?..}, at: [\u003cc06aab60\u003e] sock_def_readable+0x20/0x80\nbut this lock took another, SOFTIRQ-unsafe lock in the past:\n (slock-AF_INET){+.-...}\n\nand interrupts could create inverse lock ordering between them.\n\nother info that might help us debug this:\n1 lock held by sctp_darn/1517:\n #0: (sk_lock-AF_INET){+.+.+.}, at: [\u003ccdfe363d\u003e] sctp_sendmsg+0x23d/0xc00 [sctp]\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3fb938b2a8bdbcf6086192d90fb7c73425e41fb9", "tree": "3b273692ee6a34c603f83a645b29573c404ffc97", "parents": [ "970b06485ffee36aa3549dfe4c6b2a2c2118354d", "83bf6f11e82eba8533f8dbd241b2c2825e42ae5d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 28 07:58:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 28 07:58:36 2010 -0700" }, "message": "Merge branch \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: fix matching rules for pseudo-multi-function cards\n pcmcia: pcmcia_dev_present bugfix\n" }, { "commit": "970b06485ffee36aa3549dfe4c6b2a2c2118354d", "tree": "1b0f6f4182e73d19071addf8a209e5fb58483d08", "parents": [ "696e65c3606aa3f587eeb181766baf49ea750cfc", "33f60e9640b2f60dde6735293d4aa5ecc5b1d5d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 28 07:56:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 28 07:56:05 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 coda: move backing-dev.h kernel include inside __KERNEL__\n mtd: ensure that bdi entries are properly initialized and registered\n Move mtd_bdi_*mappable to mtdcore.c\n btrfs: convert to using bdi_setup_and_register()\n Catch filesystems lacking s_bdi\n drbd: Terminate a connection early if sending the protocol fails\n drbd: fix memory leak\n Fix JFFS2 sync silent failure\n smbfs: add bdi backing to mount session\n ncpfs: add bdi backing to mount session\n exofs: add bdi backing to mount session\n ecryptfs: add bdi backing to mount session\n coda: add bdi backing to mount session\n cifs: add bdi backing to mount session\n afs: add bdi backing to mount session.\n 9p: add bdi backing to mount session\n bdi: add helper function for doing init and register of a bdi for a file system\n block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer\n" }, { "commit": "33f60e9640b2f60dde6735293d4aa5ecc5b1d5d5", "tree": "9fc41444f93cd0e4c78fabd081b2d113fc917fc9", "parents": [ "0661b1ac5d48eb47c8a5948c0554fea25e0895ab" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Wed Apr 28 09:20:33 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Wed Apr 28 09:20:33 2010 +0200" }, "message": "coda: move backing-dev.h kernel include inside __KERNEL__\n\nOtherwise we must export backing-dev.h as well, which doesn\u0027t make\nany sense.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "5129a469a91a91427334c40e29e64c6d0ab68caf", "tree": "141a17cbea94c7c9c038187cc7081e1c688eac55", "parents": [ "7e2455c1a123ceadbb35150a610d61e8443fd340" ], "author": { "name": "Jörn Engel", "email": "joern@logfs.org", "time": "Sun Apr 25 08:54:42 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Sun Apr 25 08:54:42 2010 +0200" }, "message": "Catch filesystems lacking s_bdi\n\nnoop_backing_dev_info is used only as a flag to mark filesystems that\ndon\u0027t have any backing store, like tmpfs, procfs, spufs, etc.\n\nSigned-off-by: Joern Engel \u003cjoern@logfs.org\u003e\n\nChanged the BUG_ON() to a WARN_ON(). Note that adding dirty inodes\nto the noop_backing_dev_info is not legal and will not result in\nthem being flushed, but we already catch this condition in\n__mark_inode_dirty() when checking for a registered bdi.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "23be7468e8802a2ac1de6ee3eecb3ec7f14dc703", "tree": "2c01e547594b8d7f32ddda47b6bea284d8f19761", "parents": [ "9a6a1ecd9e9b5d046a236da2f7eb6b6812f04229" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Fri Apr 23 13:17:56 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 24 11:31:25 2010 -0700" }, "message": "hugetlb: fix infinite loop in get_futex_key() when backed by huge pages\n\nIf a futex key happens to be located within a huge page mapped\nMAP_PRIVATE, get_futex_key() can go into an infinite loop waiting for a\npage-\u003emapping that will never exist.\n\nSee https://bugzilla.redhat.com/show_bug.cgi?id\u003d552257 for more details\nabout the problem.\n\nThis patch makes page-\u003emapping a poisoned value that includes\nPAGE_MAPPING_ANON mapped MAP_PRIVATE. This is enough for futex to\ncontinue but because of PAGE_MAPPING_ANON, the poisoned value is not\ndereferenced or used by futex. No other part of the VM should be\ndereferencing the page-\u003emapping of a hugetlbfs page as its page cache is\nnot on the LRU.\n\nThis patch fixes the problem with the test case described in the bugzilla.\n\n[akpm@linux-foundation.org: mel cant spel]\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Darren Hart \u003cdarren@dvhart.com\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": "3a3076f4d6e2fa31338a0b007df42a3b32f079e0", "tree": "58bb9ec51a2e99baf7b28cebd0c9d3df2fc1c7a7", "parents": [ "1918ad77f7f908ed67cf37c505c6ad4ac52f1ecf" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Apr 23 12:17:17 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 23 10:39:48 2010 -0700" }, "message": "Cleanup generic block based fiemap\n\nThis cleans up a few of the complaints of __generic_block_fiemap. I\u0027ve\nfixed all the typing stuff, used inline functions instead of macros,\ngotten rid of a couple of variables, and made sure the size and block\nrequests are all block aligned. It also fixes a problem where sometimes\nFIEMAP_EXTENT_LAST wasn\u0027t being set properly.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cfc94b2c9ac603b20db54225408df6ed80188dcd", "tree": "6e5b21adac556242b89931c4d0929b66efb8c0b9", "parents": [ "4c6a3999651741419cd3cc4303cf0c2be07d89bc", "e1393667be574807a13bfaf1bb471f5fd1a5287b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 22 12:54:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 22 12:54:54 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:\n firewire: ohci: wait for local CSR lock access to finish\n firewire: ohci: prevent aliasing of locally handled register addresses\n firewire: core: fw_iso_resource_manage: return -EBUSY when out of resources\n firewire: core: fix retries calculation in iso manage_channel()\n firewire: cdev: fix cut+paste mistake in disclaimer\n" }, { "commit": "71d0a6112a363e703e383ae5b12c492485c39701", "tree": "fc22ab92565fb61a37a77f829a82fa9b8ea6497f", "parents": [ "cdd29ecfcb9554132cd94b82ae8b69ba37adb3b5" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 22 15:35:57 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 22 15:35:57 2010 -0400" }, "message": "NFS: Fix an unstable write data integrity race\n\nCommit 2c61be0a9478258f77b66208a0c4b1f5f8161c3c (NFS: Ensure that the WRITE\nand COMMIT RPC calls are always uninterruptible) exposed a race on file\nclose. In order to ensure correct close-to-open behaviour, we want to wait\nfor all outstanding background commit operations to complete.\n\nThis patch adds an inode flag that indicates if a commit operation is under\nway, and provides a mechanism to allow -\u003ewrite_inode() to wait for its\ncompletion if this is a data integrity flush.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "424264b7b220e8eee165dc3080ae48692af73dec", "tree": "f946baadbb45ae77e76807df3d394aff88dcd801", "parents": [ "f1970c73cbb6b884152207e4dfe90639f5029905" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 12:37:07 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 12:37:07 2010 +0200" }, "message": "smbfs: add bdi backing to mount session\n\nThis ensures that dirty data gets flushed properly.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "f1970c73cbb6b884152207e4dfe90639f5029905", "tree": "86f8e8c1dc149b46b01e6235eb3f01c7c6c3d5b5", "parents": [ "b3d0ab7e60d1865bb6f6a79a77aaba22f2543236" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 12:31:11 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 12:31:11 2010 +0200" }, "message": "ncpfs: add bdi backing to mount session\n\nThis ensures that dirty data gets flushed properly.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "5163d90076729413cb882d3dd5c3d3cfb5b9f035", "tree": "b2e3419e481f4373bb511642953f6faca5157a51", "parents": [ "8044f7f468469c80031611206d554f86fcdfe704" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 12:12:40 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 12:12:40 2010 +0200" }, "message": "coda: add bdi backing to mount session\n\nThis ensures that dirty data gets flushed properly.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "c3c532061e46156e8aab1268f38d66cfb63aeb2d", "tree": "8c5b027873b823b04f5564d442477e80e82e8edb", "parents": [ "a534dbe96e9929c7245924d8252d89048c23d569" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 11:37:01 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 22 11:39:36 2010 +0200" }, "message": "bdi: add helper function for doing init and register of a bdi for a file system\n\nPretty trivial helper, just sets up the bdi and registers it. An atomic\nsequence count is used to ensure that the registered sysfs names are\nunique.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "458f8c895beba63851281dcdac3773685f0fae09", "tree": "dd5b7af8b221bc5755e8ce94b7145f6f0589cac4", "parents": [ "255f41c59558a346d65a2012420a7573e36dc584", "58d57658834faa0c19da35e84632f7b78846f69f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 21 12:31:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 21 12:31:52 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 mc13783-regulator: fix a memory leak in mc13783_regulator_remove\n regulator: Let drivers know when they use the stub API\n" }, { "commit": "04de0816173c86948b75da93a6344a0a02bbec4d", "tree": "ed4b274c1ce5da03a9c37f5858a331529e5b150f", "parents": [ "05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Apr 20 14:49:01 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Apr 21 08:09:17 2010 +0200" }, "message": "pcmcia: pcmcia_dev_present bugfix\n\npcmcia_dev_present is in and by itself buggy. Add a note specifying\nwhy it is broken, and replace the broken locking -- taking a mutex\nis a bad idea in IRQ context, from which this function is rarely\ncalled -- by an atomic_t.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "e80e2a60ff7914dae691345a976c80bbbff3ec74", "tree": "ce9f6ce95d3b00f24a407982d52aca567866c0d8", "parents": [ "87bf6e7de1134f48681fd2ce4b7c1ec45458cb6d" ], "author": { "name": "Sridhar Samudrala", "email": "sri@us.ibm.com", "time": "Tue Mar 30 16:48:25 2010 -0700" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Tue Apr 20 13:08:30 2010 +0300" }, "message": "KVM: Increase NR_IOBUS_DEVS limit to 200\n\nThis patch increases the current hardcoded limit of NR_IOBUS_DEVS\nfrom 6 to 200. We are hitting this limit when creating a guest with more\nthan 1 virtio-net device using vhost-net backend. Each virtio-net\ndevice requires 2 such devices to service notifications from rx/tx queues.\n\nSigned-off-by: Sridhar Samudrala \u003csri@us.ibm.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "87bf6e7de1134f48681fd2ce4b7c1ec45458cb6d", "tree": "ae8ce63cecab98c036c0d76422de42cf78e042f4", "parents": [ "77662e0028c7c63e34257fda03ff9625c59d939d" ], "author": { "name": "Takuya Yoshikawa", "email": "yoshikawa.takuya@oss.ntt.co.jp", "time": "Mon Apr 12 19:35:35 2010 +0900" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Tue Apr 20 13:06:55 2010 +0300" }, "message": "KVM: fix the handling of dirty bitmaps to avoid overflows\n\nInt is not long enough to store the size of a dirty bitmap.\n\nThis patch fixes this problem with the introduction of a wrapper\nfunction to calculate the sizes of dirty bitmaps.\n\nNote: in mark_page_dirty(), we have to consider the fact that\n __set_bit() takes the offset as int, not long.\n\nSigned-off-by: Takuya Yoshikawa \u003cyoshikawa.takuya@oss.ntt.co.jp\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "85341c61361cc45a9cc0e11c01e8f4479ef460ac", "tree": "8d5e8e98aaef7f77f9749d851dd409ac356f0258", "parents": [ "375db4810b27306ea400ab39d3d6f7a063ac9ff6", "bc293d62b26ec590afc90a9e0a31c45d355b7bd8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 19 08:35:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 19 08:35:47 2010 -0700" }, "message": "Merge branch \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rcu: Make RCU lockdep check the lockdep_recursion variable\n rcu: Update docs for rcu_access_pointer and rcu_dereference_protected\n rcu: Better explain the condition parameter of rcu_dereference_check()\n rcu: Add rcu_access_pointer and rcu_dereference_protected\n" }, { "commit": "73c6c7fbb74d07a80fee41ce4ca3976547519e42", "tree": "2c2e2e5c7420054900a491bed70a2c766bd558c9", "parents": [ "eb3e5cce2b39a266a1a167fa4290939db20ef5d6", "79b9517a33a283c5d9db875c263670ed1e055f7e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 19 07:27:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 19 07:27:06 2010 -0700" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: add FireMV 2400 PCI ID.\n drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET\n drivers/gpu/radeon: Add MSPOS regs to safe list.\n drm/radeon/kms: disable the tv encoder when tv/cv is not in use\n drm/radeon/kms: adjust pll settings for tv\n drm/radeon/kms: fix tv dac conflict resolver\n drm/radeon/kms/evergreen: don\u0027t enable hdmi audio stuff\n drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0\n drm/radeon/kms: fix rs600 tlb flush\n drm/radeon/kms: print GPU family and device id when loading\n drm/radeon/kms: fix calculation of mipmapped 3D texture sizes\n drm/radeon/kms: only change mode when coherent value changes.\n drm/radeon/kms: more atom parser fixes (v2)\n" }, { "commit": "be1a50d4eba4cdb3ebf9d97a0a8693c153436775", "tree": "c4923c176186b9d1a596fd4274d05ddf8a5c2d49", "parents": [ "13bd8e4673d527a9e48f41956b11d391e7c2cfe0" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Apr 03 17:37:45 2010 +0200" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Mon Apr 19 13:17:10 2010 +0100" }, "message": "regulator: Let drivers know when they use the stub API\n\nHave the stub variant of regulator_get() return NULL, so that drivers\ncan (but still don\u0027t have to) handle this case specifically.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Jerome Oufella \u003cjerome.oufella@savoirfairelinux.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "79b9517a33a283c5d9db875c263670ed1e055f7e", "tree": "0a6c0fb95415864c0a1e1356a4dd26cb3f390ba0", "parents": [ "cae94b0ad9d147152af77b971a7234faf20027a9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 19 17:54:31 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 19 18:53:10 2010 +1000" }, "message": "drm/radeon/kms: add FireMV 2400 PCI ID.\n\nThis is an M24/X600 chip.\n\nFrom RH# 581927\n\ncc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bc293d62b26ec590afc90a9e0a31c45d355b7bd8", "tree": "4b61dee53e849f0ba1d5a7fef58522e224be836e", "parents": [ "50aec0024eccb1d5f540ab64a1958eebcdb9340c" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Thu Apr 15 12:50:39 2010 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 19 08:37:19 2010 +0200" }, "message": "rcu: Make RCU lockdep check the lockdep_recursion variable\n\nThe lockdep facility temporarily disables lockdep checking by\nincrementing the current-\u003elockdep_recursion variable. Such\ndisabling happens in NMIs and in other situations where lockdep\nmight expect to recurse on itself.\n\nThis patch therefore checks current-\u003elockdep_recursion, disabling RCU\nlockdep splats when this variable is non-zero. In addition, this patch\nremoves the \"likely()\", as suggested by Lai Jiangshan.\n\nReported-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReported-by: David Miller \u003cdavem@davemloft.net\u003e\nTested-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: laijs@cn.fujitsu.com\nCc: dipankar@in.ibm.com\nCc: mathieu.desnoyers@polymtl.ca\nCc: josh@joshtriplett.org\nCc: dvhltc@us.ibm.com\nCc: niv@us.ibm.com\nCc: peterz@infradead.org\nCc: rostedt@goodmis.org\nCc: Valdis.Kletnieks@vt.edu\nCc: dhowells@redhat.com\nCc: eric.dumazet@gmail.com\nLKML-Reference: \u003c20100415195039.GA22623@linux.vnet.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a2612cb16d4d8447793609cbdd2a2f4f156c0020", "tree": "bf1330080ff46175f535d76de6ca98bf2ad23d52", "parents": [ "19b3eecc21b65a24b0aae2684ca0c8e1b99ef802" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Apr 15 22:16:04 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Apr 15 22:18:36 2010 +0200" }, "message": "firewire: cdev: fix cut+paste mistake in disclaimer\n\nThis was supposed to be generic \"authors or copyright holders\";\nI mistakenly picked up text from a wrong file.\n\nReported-by: Daniel K. \u003cdk@uw.no\u003e\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "2fed94c032316d89422d4abfca2a882897489b94", "tree": "9381c79a351d2c13f6b87bae550c51689491ded6", "parents": [ "00eef7bd01c7598d195699983c5290d901df19ad", "19b3eecc21b65a24b0aae2684ca0c8e1b99ef802" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 15 11:56:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 15 11:56:20 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:\n firewire: cdev: change license of exported header files to MIT license\n firewire: cdev: comment fixlet\n firewire: cdev: iso packet documentation\n firewire: cdev: fix information leak\n firewire: cdev: require quadlet-aligned headers for transmit packets\n firewire: cdev: disallow receive packets without header\n" }, { "commit": "00eef7bd01c7598d195699983c5290d901df19ad", "tree": "14ba0178fc2c5e807282132e689236965b889e91", "parents": [ "250541fca717a5c9b0d3710e737b2ca32ebb6fbc", "014f61504af276ba9d9544d8a7401d8f8526eb73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 15 11:49:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 15 11:49:55 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: wacom - switch mode upon system resume\n Revert \"Input: wacom - merge out and in prox events\"\n Input: matrix_keypad - allow platform to disable key autorepeat\n Input: ALPS - add signature for HP Pavilion dm3 laptops\n Input: i8042 - spelling fix\n Input: sparse-keymap - implement safer freeing of the keymap\n Input: update the status of the Multitouch X driver project\n Input: clarify the no-finger event in multitouch protocol\n Input: bcm5974 - retract efi-broken suspend_resume\n Input: sparse-keymap - free the right keymap on error\n" }, { "commit": "19b3eecc21b65a24b0aae2684ca0c8e1b99ef802", "tree": "dc7d17175b47cd81fea937ddd4d933aa4871b9f4", "parents": [ "ca658b1e29d6be939207532e337fb640eb697f71" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Apr 11 11:52:12 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Apr 15 17:50:49 2010 +0200" }, "message": "firewire: cdev: change license of exported header files to MIT license\n\nAmong else, this allows projects like libdc1394 to carry copies of the\nABI related header files without them or distributors having to worry\nabout effects on the project\u0027s overall license terms. Switch to MIT\nlicense as suggested by Kristian. Also update the year in the\ncopyright statement according to source history.\n\nCc: Jay Fenlason \u003cfenlason@redhat.com\u003e\nAcked-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nSigned-off-by: Kristian Høgsberg \u003ckrh@bitplanet.net\u003e\n" }, { "commit": "c08c68dd76bd6b776bc0eb45a5e8f354ed772cdf", "tree": "5324c73474b1e73631392de814e8ecebd5956d5b", "parents": [ "b62730baea32f86fe91a7930e4b7ee8d82778b79" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Apr 09 15:39:11 2010 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 14 12:20:04 2010 +0200" }, "message": "rcu: Better explain the condition parameter of rcu_dereference_check()\n\nBetter explain the condition parameter of\nrcu_dereference_check() that describes the conditions under\nwhich the dereference is permitted to take place (and\nincorporate Yong Zhang\u0027s suggestion). This condition is only\nchecked under lockdep proving.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: laijs@cn.fujitsu.com\nCc: dipankar@in.ibm.com\nCc: mathieu.desnoyers@polymtl.ca\nCc: josh@joshtriplett.org\nCc: dvhltc@us.ibm.com\nCc: niv@us.ibm.com\nCc: peterz@infradead.org\nCc: rostedt@goodmis.org\nCc: Valdis.Kletnieks@vt.edu\nCc: eric.dumazet@gmail.com\nLKML-Reference: \u003c1270852752-25278-2-git-send-email-paulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b62730baea32f86fe91a7930e4b7ee8d82778b79", "tree": "97910bcb8a0790b10ff687dad901e158a2da63f4", "parents": [ "2ba3abd8186f24c7fb418927025b4e2120e3a362" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Fri Apr 09 15:39:10 2010 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 14 12:19:51 2010 +0200" }, "message": "rcu: Add rcu_access_pointer and rcu_dereference_protected\n\nThis patch adds variants of rcu_dereference() that handle\nsituations where the RCU-protected data structure cannot change,\nperhaps due to our holding the update-side lock, or where the\nRCU-protected pointer is only to be fetched, not dereferenced.\nThese are needed due to some performance concerns with using\nrcu_dereference() where it is not required, aside from the need\nfor lockdep/sparse checking.\n\nThe new rcu_access_pointer() primitive is for the case where the\npointer is be fetch and not dereferenced. This primitive may be\nused without protection, RCU or otherwise, due to the fact that\nit uses ACCESS_ONCE().\n\nThe new rcu_dereference_protected() primitive is for the case\nwhere updates are prevented, for example, due to holding the\nupdate-side lock. This primitive does neither ACCESS_ONCE() nor\nsmp_read_barrier_depends(), so can only be used when updates are\nsomehow prevented.\n\nSuggested-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: laijs@cn.fujitsu.com\nCc: dipankar@in.ibm.com\nCc: mathieu.desnoyers@polymtl.ca\nCc: josh@joshtriplett.org\nCc: dvhltc@us.ibm.com\nCc: niv@us.ibm.com\nCc: peterz@infradead.org\nCc: rostedt@goodmis.org\nCc: Valdis.Kletnieks@vt.edu\nCc: dhowells@redhat.com\nCc: eric.dumazet@gmail.com\nLKML-Reference: \u003c1270852752-25278-1-git-send-email-paulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42", "tree": "1358c7920438e090605695f6fb8e7989eb3f8998", "parents": [ "44d2d371d250b44cbe40f8d47e329c97668d7594", "0df5dd4aae211edeeeb84f7f84f6d093406d7c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 13 15:10:16 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 13 15:10:16 2010 -0700" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFSv4: fix delegated locking\n NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptible\n NFS: Fix a race with the new commit code\n NFS: Ensure that writeback_single_inode() calls write_inode() when syncing\n NFS: Fix the mode calculation in nfs_find_open_context\n NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR\n" }, { "commit": "0df5dd4aae211edeeeb84f7f84f6d093406d7c22", "tree": "6e58bc436b873cf582f20cf0dbd21461c0a56837", "parents": [ "2c61be0a9478258f77b66208a0c4b1f5f8161c3c" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Apr 11 16:48:44 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 12 07:55:15 2010 -0400" }, "message": "NFSv4: fix delegated locking\n\nArnaud Giersch reports that NFSv4 locking is broken when we hold a\ndelegation since commit 8e469ebd6dc32cbaf620e134d79f740bf0ebab79 (NFSv4:\nDon\u0027t allow posix locking against servers that don\u0027t support it).\n\nAccording to Arnaud, the lock succeeds the first time he opens the file\n(since we cannot do a delegated open) but then fails after we start using\ndelegated opens.\n\nThe following patch fixes it by ensuring that locking behaviour is\ngoverned by a per-filesystem capability flag that is initially set, but\ngets cleared if the server ever returns an OPEN without the\nNFS4_OPEN_RESULT_LOCKTYPE_POSIX flag being set.\n\nReported-by: Arnaud Giersch \u003carnaud.giersch@iut-bm.univ-fcomte.fr\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "4a1032faac94ebbf647460ae3e06fc21146eb280", "tree": "7f31b97beb0406faa1523e619289ad0ab07c9787", "parents": [ "ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06", "0eddb519b9127c73d53db4bf3ec1d45b13f844d1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 02:44:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 02:44:30 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "ca658b1e29d6be939207532e337fb640eb697f71", "tree": "f22c747e718d12b5be2bc37cfccd6d02aff9fcbe", "parents": [ "aa6fec3cdeb14ecc916eb78c4cd9ed79e4f7fe8d" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Apr 10 12:23:09 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Apr 10 16:51:13 2010 +0200" }, "message": "firewire: cdev: comment fixlet\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "aa6fec3cdeb14ecc916eb78c4cd9ed79e4f7fe8d", "tree": "4beee35aa9f9e31ec542d11075b822de9adbacc6", "parents": [ "9cac00b8f0079d5d3d54ec4dae453d58dec30e7c" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Wed Mar 31 16:26:52 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Apr 10 16:51:13 2010 +0200" }, "message": "firewire: cdev: iso packet documentation\n\nAdd the missing documentation for iso packets.\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "2f4084209adc77f9a1c9f38db3019a509e167882", "tree": "775657114c885505ecc46605e29ea1470e986f76", "parents": [ "2f10ffcfb28beb35137d9e86992c771b4a6c5f2a", "3440c49f5c5ecb4f29b0544aa87da71888404f8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 09 11:50:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 09 11:50:29 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: (34 commits)\n cfq-iosched: Fix the incorrect timeslice accounting with forced_dispatch\n loop: Update mtime when writing using aops\n block: expose the statistics in blkio.time and blkio.sectors for the root cgroup\n backing-dev: Handle class_create() failure\n Block: Fix block/elevator.c elevator_get() off-by-one error\n drbd: lc_element_by_index() never returns NULL\n cciss: unlock on error path\n cfq-iosched: Do not merge queues of BE and IDLE classes\n cfq-iosched: Add additional blktrace log messages in CFQ for easier debugging\n i2o: Remove the dangerous kobj_to_i2o_device macro\n block: remove 16 bytes of padding from struct request on 64bits\n cfq-iosched: fix a kbuild regression\n block: make CONFIG_BLK_CGROUP visible\n Remove GENHD_FL_DRIVERFS\n block: Export max number of segments and max segment size in sysfs\n block: Finalize conversion of block limits functions\n block: Fix overrun in lcm() and move it to lib\n vfs: improve writeback_inodes_wb()\n paride: fix off-by-one test\n drbd: fix al-to-on-disk-bitmap for 4k logical_block_size\n ...\n" }, { "commit": "ce82653d6cfcc95ba88c25908664878459fb1b8d", "tree": "ab80dd0055bcb4b9296c28c241f1d1fba229be1f", "parents": [ "d3e06e2b15590b70ea73733fc4612e4741ff46e0" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Apr 06 22:36:20 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 09 10:12:03 2010 -0700" }, "message": "radix_tree_tag_get() is not as safe as the docs make out [ver #2]\n\nradix_tree_tag_get() is not safe to use concurrently with radix_tree_tag_set()\nor radix_tree_tag_clear(). The problem is that the double tag_get() in\nradix_tree_tag_get():\n\n\t\tif (!tag_get(node, tag, offset))\n\t\t\tsaw_unset_tag \u003d 1;\n\t\tif (height \u003d\u003d 1) {\n\t\t\tint ret \u003d tag_get(node, tag, offset);\n\nmay see the value change due to the action of set/clear. RCU is no protection\nagainst this as no pointers are being changed, no nodes are being replaced\naccording to a COW protocol - set/clear alter the node directly.\n\nThe documentation in linux/radix-tree.h, however, says that\nradix_tree_tag_get() is an exception to the rule that \"any function modifying\nthe tree or tags (...) must exclude other modifications, and exclude any\nfunctions reading the tree\".\n\nThe problem is that the next statement in radix_tree_tag_get() checks that the\ntag doesn\u0027t vary over time:\n\n\t\t\tBUG_ON(ret \u0026\u0026 saw_unset_tag);\n\nThis has been seen happening in FS-Cache:\n\n\thttps://www.redhat.com/archives/linux-cachefs/2010-April/msg00013.html\n\nTo this end, remove the BUG_ON() from radix_tree_tag_get() and note in various\ncomments that the value of the tag may change whilst the RCU read lock is held,\nand thus that the return value of radix_tree_tag_get() may not be relied upon\nunless radix_tree_tag_set/clear() and radix_tree_delete() are excluded from\nrunning concurrently with it.\n\nReported-by: Romain DEGEZ \u003cromain.degez@smartjog.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc1c183353a113c71675fecd0485e5aa0fe68d72", "tree": "25fc50112c80402ab43bd86a3d6b6a99a0c3c128", "parents": [ "4dc86ae1f925b2121d4e75058675895f83e54c71" ], "author": { "name": "Pekka Enberg", "email": "penberg@cs.helsinki.fi", "time": "Wed Apr 07 19:23:40 2010 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 09 10:09:50 2010 -0700" }, "message": "slab: Generify kernel pointer validation\n\nAs suggested by Linus, introduce a kern_ptr_validate() helper that does some\nsanity checks to make sure a pointer is a valid kernel pointer. This is a\npreparational step for fixing SLUB kmem_ptr_validate().\n\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "45c4d015a92f72ec47acd0c7557abdc0c8a6499d", "tree": "8c71c959f3c7c04647336cca27dc18e3cd0bbe0b", "parents": [ "cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30" ], "author": { "name": "Mark Lord", "email": "kernel@teksavvy.com", "time": "Wed Apr 07 13:52:08 2010 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Apr 08 12:53:57 2010 -0400" }, "message": "libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)\n\nMost drives from Seagate, Hitachi, and possibly other brands,\ndo not allow LBA28 access to sector number 0x0fffffff (2^28 - 1).\nSo instead use LBA48 for such accesses.\n\nThis bug could bite a lot of systems, especially when the user has\ntaken care to align partitions to 4KB boundaries. On misaligned systems,\nit is less likely to be encountered, since a 4KB read would end at\n0x10000000 rather than at 0x0fffffff.\n\nSigned-off-by: Mark Lord \u003cmlord@pobox.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30", "tree": "d3e3f2067dc423721d698d154e15213aa5b0132d", "parents": [ "0a2851b9a837cb025d48bb8118f35ebd12bce4b5", "720fc22a7af79d91ec460c80efa92c65c12d105e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 08 07:45:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 08 07:45:36 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:\n ide: Fix IDE taskfile with cfq scheduler\n ide: Must hold queue lock when requeueing\n ide: Requeue request after DMA timeout\n" }, { "commit": "f5eb917b861828da18dc28854308068c66d1449a", "tree": "aa45d1a809abbe426b55dc89b8167e5a6609d418", "parents": [ "fd218cf9557b9bf7061365a8fe7020a56d3f767c" ], "author": { "name": "John Hughes", "email": "john@calva.com", "time": "Wed Apr 07 21:29:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 07 21:29:25 2010 -0700" }, "message": "x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet.\n\nHere is a patch to stop X.25 examining fields beyond the end of the packet.\n\nFor example, when a simple CALL ACCEPTED was received:\n\n\t10 10 0f\n\nx25_parse_facilities was attempting to decode the FACILITIES field, but this\npacket contains no facilities field.\n\nSigned-off-by: John Hughes \u003cjohn@calva.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7a413015d2986edf020fba765c906cc9cbcbfc9", "tree": "e7d65883c875ddb215e47c14aa3616e4bf1a80e3", "parents": [ "9ff4cfab82d27e9fda72315f911bbaa9516e04bc" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Wed Mar 31 21:56:42 2010 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Apr 08 09:46:19 2010 +0930" }, "message": "virtio: disable multiport console support.\n\nMove MULTIPORT feature and related config changes\nout of exported headers, and disable the feature\nat runtime.\n\nAt this point, it seems less risky to keep code around\nuntil we can enable it than rip it out completely.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "fb1ae635772d679eb312fa447290fc02cd0e4cf1", "tree": "45733f9820da1190cd58bfff080edbb02af961a8", "parents": [ "addb2d6c13993060ae75f5005815b19dd2abdd64", "472a474c6630efd195d3738339fd1bdc8aa3b1aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 11:02:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 11:02:23 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:\n x86: Fix double enable_IR_x2apic() call on SMP kernel on !SMP boards\n x86: Increase CONFIG_NODES_SHIFT max to 10\n ibft, x86: Change reserve_ibft_region() to find_ibft_region()\n x86, hpet: Fix bug in RTC emulation\n x86, hpet: Erratum workaround for read after write of HPET comparator\n bootmem, x86: Fix 32bit numa system without RAM on node 0\n nobootmem, x86: Fix 32bit numa system without RAM on node 0\n x86: Handle overlapping mptables\n x86: Make e820_remove_range to handle all covered case\n x86-32, resume: do a global tlb flush in S4 resume\n" }, { "commit": "84db18bbeb5c9c1a9c86e38a89d76ee526fd2c6f", "tree": "49d3959eb24cd7c0754ed50e05fb96b0fb8d04aa", "parents": [ "6948ec70355ae6cf6082519e3d76b280373dade1", "55b371d4ac5ed6f3338a398fbf9f2eb9ace78799" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:42:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:42:25 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: mixart: range checking proc file\n ALSA: hda - Fix a wrong array range check in patch_realtek.c\n ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream\n ALSA: hda - Enable amplifiers on Acer Inspire 6530G\n ASoC: Only do WM8994 bias off transition from standby\n ASoC: Don\u0027t use DCS_DATAPATH_BUSY for WM hubs devices\n ASoC: Don\u0027t do runtime wm_hubs DC servo updates if using offset correction\n ASoC: Support second DC servo readback method for wm_hubs\n ASoC: Avoid wraparound in wm_hubs DC servo correction\n ALSA: echoaudio - Eliminate use after free\n ALSA: i2c: cleanup: change parameter to pointer\n ALSA: hda - Add MSI blacklist for Aopen MZ915-M\n ASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent ALSA PCM code\n ALSA: hda - Update document about MSI and interrupts\n ALSA: hda: Fix 0 dB offset for Lenovo Thinkpad models using AD1981\n ALSA: hda - Add missing printk argument in previous patch\n ASoC: Fix passing platform_data to ac97 bus users and fix a leak\n ALSA: hda - Fix ADC/MUX assignment of ALC269 codec\n ALSA: hda - Fix invalid bit values passed to snd_hda_codec_amp_stereo()\n ASoC: wm8994: playback \u003d\u003e capture\n" }, { "commit": "8725d5416213a145ccc9c236dbd26830ba409e00", "tree": "aff10fc98874adfcb7755ec8bc1f2627036e8dc2", "parents": [ "116354d177ba2da37e91cf884e3d11e67f825efd" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Apr 06 14:35:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:05 2010 -0700" }, "message": "memcg: fix race in file_mapped accounting\n\nPresently, memcg\u0027s FILE_MAPPED accounting has following race with\nmove_account (happens at rmdir()).\n\n increment page-\u003emapcount (rmap.c)\n mem_cgroup_update_file_mapped() move_account()\n\t\t\t\t\t lock_page_cgroup()\n\t\t\t\t\t check page_mapped() if\n\t\t\t\t\t page_mapped(page)\u003e1 {\n\t\t\t\t\t\tFILE_MAPPED -1 from old memcg\n\t\t\t\t\t\tFILE_MAPPED +1 to old memcg\n\t\t\t\t\t }\n\t\t\t\t\t .....\n\t\t\t\t\t overwrite pc-\u003emem_cgroup\n\t\t\t\t\t unlock_page_cgroup()\n lock_page_cgroup()\n FILE_MAPPED + 1 to pc-\u003emem_cgroup\n unlock_page_cgroup()\n\nThen,\n\told memcg (-1 file mapped)\n\tnew memcg (+2 file mapped)\n\nThis happens because move_account see page_mapped() which is not guarded\nby lock_page_cgroup(). This patch adds FILE_MAPPED flag to page_cgroup\nand move account information based on it. Now, all checks are synchronous\nwith lock_page_cgroup().\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nReviewed-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Andrea Righi \u003carighi@develer.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "116354d177ba2da37e91cf884e3d11e67f825efd", "tree": "150227e8a5c9ce8b6dd9333593ed513c8c012686", "parents": [ "57119c34e53bbb8d244c3ff1335ef5145768538f" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Tue Apr 06 14:35:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:04 2010 -0700" }, "message": "pagemap: fix pfn calculation for hugepage\n\nWhen we look into pagemap using page-types with option -p, the value of\npfn for hugepages looks wrong (see below.) This is because pte was\nevaluated only once for one vma although it should be updated for each\nhugepage. This patch fixes it.\n\n $ page-types -p 3277 -Nl -b huge\n voffset offset len flags\n 7f21e8a00 11e400 1 ___U___________H_G________________\n 7f21e8a01 11e401 1ff ________________TG________________\n ^^^\n 7f21e8c00 11e400 1 ___U___________H_G________________\n 7f21e8c01 11e401 1ff ________________TG________________\n ^^^\n\nOne hugepage contains 1 head page and 511 tail pages in x86_64 and each\ntwo lines represent each hugepage. Voffset and offset mean virtual\naddress and physical address in the page unit, respectively. The\ndifferent hugepages should not have the same offset value.\n\nWith this patch applied:\n\n $ page-types -p 3386 -Nl -b huge\n voffset offset len flags\n 7fec7a600 112c00 1 ___UD__________H_G________________\n 7fec7a601 112c01 1ff ________________TG________________\n ^^^\n 7fec7a800 113200 1 ___UD__________H_G________________\n 7fec7a801 113201 1ff ________________TG________________\n ^^^\n OK\n\nMore info:\n\n- This patch modifies walk_page_range()\u0027s hugepage walker. But the\n change only affects pagemap_read(), which is the only caller of hugepage\n callback.\n\n- Without this patch, hugetlb_entry() callback is called per vma, that\n doesn\u0027t match the natural expectation from its name.\n\n- With this patch, hugetlb_entry() is called per hugepte entry and the\n callback can become much simpler.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bb1dc0bacb8ddd7ba6a5906c678a5a5a110cf695", "tree": "e3389ae1a09bba9cd84d6981a7e49edb449133bb", "parents": [ "2a7268abc48c8009b284bd88605d14fcb65772ec" ], "author": { "name": "Yong Zhang", "email": "yong.zhang@windriver.com", "time": "Tue Apr 06 14:35:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:04 2010 -0700" }, "message": "kernel.h: fix wrong usage of __ratelimit()\n\nWhen __ratelimit() returns 1 this means that we can go ahead.\n\nSigned-off-by: Yong Zhang \u003cyong.zhang@windriver.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b1dd3b2843b3b73b7fc2ee47d96310cd1c051371", "tree": "ab7d13e076d255dd2c598a3c819e114a854ae85f", "parents": [ "55ab3a1ff843e3f0e24d2da44e71bffa5d853010" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Apr 06 14:35:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:04 2010 -0700" }, "message": "vfs: rename block_fsync() to blkdev_fsync()\n\nRequested by hch, for consistency now it is exported.\n\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Anton Blanchard \u003canton@samba.org\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "55ab3a1ff843e3f0e24d2da44e71bffa5d853010", "tree": "092f383aab3dc57d6780348aa9638d01e99041cf", "parents": [ "da258016293f5e82b36db67ac3db3931a4fbbc4d" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Tue Apr 06 14:34:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:04 2010 -0700" }, "message": "raw: fsync method is now required\n\nCommit 148f948ba877f4d3cdef036b1ff6d9f68986706a (vfs: Introduce new\nhelpers for syncing after writing to O_SYNC file or IS_SYNC inode) broke\nthe raw driver.\n\nWe now call through generic_file_aio_write -\u003e generic_write_sync -\u003e\nvfs_fsync_range. vfs_fsync_range has:\n\n if (!fop || !fop-\u003efsync) {\n ret \u003d -EINVAL;\n goto out;\n }\n\nBut drivers/char/raw.c doesn\u0027t set an fsync method.\n\nWe have two options: fix it or remove the raw driver completely. I\u0027m\nhappy to do either, the fact this has been broken for so long suggests it\nis rarely used.\n\nThe patch below adds an fsync method to the raw driver. My knowledge of\nthe block layer is pretty sketchy so this could do with a once over.\n\nIf we instead decide to remove the raw driver, this patch might still be\nuseful as a backport to 2.6.33 and 2.6.32.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nReviewed-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nReviewed-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nTested-by: Jeff Moyer \u003cjmoyer@redhat.com\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": "530cd330dc3865e3107304a6e84fdc332aa72f7d", "tree": "414102f790dac9ad80af3c82935e5164b04a1b5e", "parents": [ "a3a2e76c77fa22b114e421ac11dec0c56c3503fb" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Tue Apr 06 14:34:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:02 2010 -0700" }, "message": "include/linux/kfifo.h: fix INIT_KFIFO()\n\nDECLARE_KFIFO creates a union with a struct kfifo and a buffer array with\nsize [size + sizeof(struct kfifo)].\n\nINIT_KFIFO then sets the buffer pointer in struct kfifo to point to the\nbeginning of the buffer array which means that the first call to kfifo_in\nwill overwrite members of the struct kfifo.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nAcked-by: Stefani Seibold \u003cstefani@seibold.net\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": "b01d0942c2b7a3026d2b7d38b5773d3d00420e06", "tree": "c4be20ad3896269075ca01c98ef7fd0962af4a50", "parents": [ "0fdf86754f70e813845af4abaa805165ce57a0bb" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Apr 06 14:34:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:01 2010 -0700" }, "message": "bitops: remove temporary for_each_bit()\n\nMigration has been completed so remove this now. There\u0027s one straggler in\nlinux-next\u0027s drivers/mtd/sm_ftl.c. A patch has been sent.\n\nCc: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7445c995b06f2a999541ccf127886d24a2a7d012", "tree": "940cb9cce2e2e3dcbbe3502bf720fd10481769af", "parents": [ "1172234cbe94658c16bc83e50ca57b5a47085209", "5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Apr 07 09:54:41 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Apr 07 09:54:41 2010 +0200" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n" }, { "commit": "ab195c58b864802c15e494f06ae109413e12d50b", "tree": "7b86a6c2a673323b0a90cae227f9fc023eb5b3ff", "parents": [ "cb4361c1dc29cd870f664c004b1817106fbce0fa", "445d211b0da4e9a6e6d576edff85085c2aaf53df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 06 08:36:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 06 08:36:31 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 libata: unlock HPA if device shrunk\n libata: disable NCQ on Crucial C300 SSD\n libata: don\u0027t whine on spurious IRQ\n" }, { "commit": "445d211b0da4e9a6e6d576edff85085c2aaf53df", "tree": "039ade5b49cb0bbd388babc369f28f541c76ec96", "parents": [ "68b0ddb289220b6d4d865be128939663be34959d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 10:33:13 2010 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Apr 06 10:55:33 2010 -0400" }, "message": "libata: unlock HPA if device shrunk\n\nSome BIOSes don\u0027t configure HPA during boot but do so while resuming.\nThis causes harddrives to shrink during resume making libata detach\nand reattach them. This can be worked around by unlocking HPA if old\nsize equals native size.\n\nAdd ATA_DFLAG_UNLOCK_HPA so that HPA unlocking can be controlled\nper-device and update ata_dev_revalidate() such that it sets\nATA_DFLAG_UNLOCK_HPA and fails with -EIO when the above condition is\ndetected.\n\nThis patch fixes the following bug.\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d15396\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Oleksandr Yermolenko \u003cyaa.bta@gmail.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "9d32c30542f9ecdb4b96a1a960924c9f403e3562", "tree": "accdc04a9b837b3531e4c53f4cd0dfe8b04ec0e0", "parents": [ "5e28d8eb68c12eab9c4a47b42ba993a6420d71d3" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Mon Apr 05 22:29:09 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Apr 05 23:02:00 2010 -0700" }, "message": "Input: matrix_keypad - allow platform to disable key autorepeat\n\nIn an embedded system the matrix_keypad driver might be used to\ninterface with an external control panel and not an actual keyboard.\nOn the control panel some of the keys could be used to turn on/off\nvarious functions. If key autorepeat is enabled this causes the\nfunction to quickly toggle between the on and off states and makes\noperation difficult.\n\nAdd an option in the platform-specific data to disable the key\nautorepeat.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "5fbfb18d7a5b846946d52c4a10e3aaa213ec31b6", "tree": "bcfa13dec8cb2527c3007b3e5f957cb50e571c64", "parents": [ "7da23b86e14b77c094b11a9fa5ef5b3758fc9193" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Thu Apr 01 19:09:40 2010 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 19:50:02 2010 -0700" }, "message": "Fix up possibly racy module refcounting\n\nModule refcounting is implemented with a per-cpu counter for speed.\nHowever there is a race when tallying the counter where a reference may\nbe taken by one CPU and released by another. Reference count summation\nmay then see the decrement without having seen the previous increment,\nleading to lower than expected count. A module which never has its\nactual reference drop below 1 may return a reference count of 0 due to\nthis race.\n\nModule removal generally runs under stop_machine, which prevents this\nrace causing bugs due to removal of in-use modules. However there are\nother real bugs in module.c code and driver code (module_refcount is\nexported) where the callers do not run under stop_machine.\n\nFix this by maintaining running per-cpu counters for the number of\nmodule refcount increments and the number of refcount decrements. The\nincrements are tallied after the decrements, so any decrement seen will\nalways have its corresponding increment counted. The final refcount is\nthe difference of the total increments and decrements, preventing a\nlow-refcount from being returned.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "749d229761ff0135cc4e16b8a28b41ae2f6b2c35", "tree": "25551c8cfb38319211f5ee59e78462a0f6fb85c4", "parents": [ "795d580baec0d5386b83a8b557df47c20810e86b", "3dc9fef67f6292692dba181a6d0fd0211bd0a607" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 13:42:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 13:42:54 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n 9p: saving negative to unsigned char\n 9p: return on mutex_lock_interruptible()\n 9p: Creating files with names too long should fail with ENAMETOOLONG.\n 9p: Make sure we are able to clunk the cached fid on umount\n 9p: drop nlink remove\n fs/9p: Clunk the fid resulting from partial walk of the name\n 9p: documentation update\n 9p: Fix setting of protocol flags in v9fs_session_info structure.\n" }, { "commit": "5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5", "tree": "0e7ab3cedba6b50cdf603c433b79ceebf23972b0", "parents": [ "d522ffbfb9fccf6eca283cd2e8b03cf3d21fb616" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Mon Mar 22 10:11:15 2010 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Apr 05 19:14:11 2010 +0100" }, "message": "ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream\n\nThis fixes a memory corruption when ASoC devices are used in\nfull-duplex mode. Specifically for pxa-ssp code, where this pointer\nis dynamically allocated for each direction and destroyed upon each\nstream start.\n\nAll other platforms are fixed blindly, I couldn\u0027t even compile-test\nthem. Sorry for any breakage I may have caused.\n\n[Note that this is a backported version for 2.6.34.\n Upstream commit is fd23b7dee]\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nReported-by: Sven Neumann \u003cs.neumann@raumfeld.com\u003e\nReported-by: Michael Hirsch \u003cm.hirsch@raumfeld.com\u003e\nAcked-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "b66696e3c0d8fc01efdbc701eba1276618332cb3", "tree": "3094ef42787b8e0c900bce1f2391ced081ed1ba4", "parents": [ "9e74e7c81a24aee66024fc477786bd1de84e293b", "a32f3926632e71c8aa23ce32fe2625f8d5f792c2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 09:39:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 09:39:11 2010 -0700" }, "message": "Merge branch \u0027slabh\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc\n\n* \u0027slabh\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:\n eeepc-wmi: include slab.h\n staging/otus: include slab.h from usbdrv.h\n percpu: don\u0027t implicitly include slab.h from percpu.h\n kmemcheck: Fix build errors due to missing slab.h\n include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n iwlwifi: don\u0027t include iwl-dev.h from iwl-devtrace.h\n x86: don\u0027t include slab.h from arch/x86/include/asm/pgtable_32.h\n\nFix up trivial conflicts in include/linux/percpu.h due to\nis_kernel_percpu_address() having been introduced since the slab.h\ncleanup with the percpu_up.c splitup.\n" }, { "commit": "9e74e7c81a24aee66024fc477786bd1de84e293b", "tree": "8f172b7e5a86fe6b51e46f1d219e9c0707beab60", "parents": [ "4946d54cb55e86a156216fcfeed5568514b0830f", "d5e50daf92df8afcb701fd717b301985691e802f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 09:16:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 09:16:37 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n module: add stub for is_module_percpu_address\n percpu, module: implement and use is_kernel/module_percpu_address()\n module: encapsulate percpu handling better and record percpu_size\n" } ], "next": "6d96d3ab7aea5f0e75205a0c97f8d1fdf82c5287" }