)]}' { "log": [ { "commit": "9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0", "tree": "b04c93fa9d41db9802c576f8dfaf74edb42ebc60", "parents": [ "3f259d092c7a2fdf217823e8f1838530adb0cdb0" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Sep 30 15:15:38 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:59 2010 -0700" }, "message": "reiserfs: fix unwanted reiserfs lock recursion\n\nPrevent from recursively locking the reiserfs lock in reiserfs_unpack()\nbecause we may call journal_begin() that requires the lock to be taken\nonly once, otherwise it won\u0027t be able to release the lock while taking\nother mutexes, ending up in inverted dependencies between the journal\nmutex and the reiserfs lock for example.\n\nThis fixes:\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\n [ INFO: possible circular locking dependency detected ]\n 2.6.35.4.4a #3\n -------------------------------------------------------\n lilo/1620 is trying to acquire lock:\n (\u0026journal-\u003ej_mutex){+.+...}, at: [\u003cd0325bff\u003e] do_journal_begin_r+0x7f/0x340 [reiserfs]\n\n but task is already holding lock:\n (\u0026REISERFS_SB(s)-\u003elock){+.+.+.}, at: [\u003cd032a278\u003e] reiserfs_write_lock+0x28/0x40 [reiserfs]\n\n which lock already depends on the new lock.\n\n the existing dependency chain (in reverse order) is:\n\n -\u003e #1 (\u0026REISERFS_SB(s)-\u003elock){+.+.+.}:\n [\u003cc10562b7\u003e] lock_acquire+0x67/0x80\n [\u003cc12facad\u003e] __mutex_lock_common+0x4d/0x410\n [\u003cc12fb0c8\u003e] mutex_lock_nested+0x18/0x20\n [\u003cd032a278\u003e] reiserfs_write_lock+0x28/0x40 [reiserfs]\n [\u003cd0325c06\u003e] do_journal_begin_r+0x86/0x340 [reiserfs]\n [\u003cd0325f77\u003e] journal_begin+0x77/0x140 [reiserfs]\n [\u003cd0315be4\u003e] reiserfs_remount+0x224/0x530 [reiserfs]\n [\u003cc10b6a20\u003e] do_remount_sb+0x60/0x110\n [\u003cc10cee25\u003e] do_mount+0x625/0x790\n [\u003cc10cf014\u003e] sys_mount+0x84/0xb0\n [\u003cc12fca3d\u003e] syscall_call+0x7/0xb\n\n -\u003e #0 (\u0026journal-\u003ej_mutex){+.+...}:\n [\u003cc10560f6\u003e] __lock_acquire+0x1026/0x1180\n [\u003cc10562b7\u003e] lock_acquire+0x67/0x80\n [\u003cc12facad\u003e] __mutex_lock_common+0x4d/0x410\n [\u003cc12fb0c8\u003e] mutex_lock_nested+0x18/0x20\n [\u003cd0325bff\u003e] do_journal_begin_r+0x7f/0x340 [reiserfs]\n [\u003cd0325f77\u003e] journal_begin+0x77/0x140 [reiserfs]\n [\u003cd0326271\u003e] reiserfs_persistent_transaction+0x41/0x90 [reiserfs]\n [\u003cd030d06c\u003e] reiserfs_get_block+0x22c/0x1530 [reiserfs]\n [\u003cc10db9db\u003e] __block_prepare_write+0x1bb/0x3a0\n [\u003cc10dbbe6\u003e] block_prepare_write+0x26/0x40\n [\u003cd030b738\u003e] reiserfs_prepare_write+0x88/0x170 [reiserfs]\n [\u003cd03294d6\u003e] reiserfs_unpack+0xe6/0x120 [reiserfs]\n [\u003cd0329782\u003e] reiserfs_ioctl+0x272/0x320 [reiserfs]\n [\u003cc10c3188\u003e] vfs_ioctl+0x28/0xa0\n [\u003cc10c3bbd\u003e] do_vfs_ioctl+0x32d/0x5c0\n [\u003cc10c3eb3\u003e] sys_ioctl+0x63/0x70\n [\u003cc12fca3d\u003e] syscall_call+0x7/0xb\n\n other info that might help us debug this:\n\n 2 locks held by lilo/1620:\n #0: (\u0026sb-\u003es_type-\u003ei_mutex_key#8){+.+.+.}, at: [\u003cd032945a\u003e] reiserfs_unpack+0x6a/0x120 [reiserfs]\n #1: (\u0026REISERFS_SB(s)-\u003elock){+.+.+.}, at: [\u003cd032a278\u003e] reiserfs_write_lock+0x28/0x40 [reiserfs]\n\n stack backtrace:\n Pid: 1620, comm: lilo Not tainted 2.6.35.4.4a #3\n Call Trace:\n [\u003cc10560f6\u003e] __lock_acquire+0x1026/0x1180\n [\u003cc10562b7\u003e] lock_acquire+0x67/0x80\n [\u003cc12facad\u003e] __mutex_lock_common+0x4d/0x410\n [\u003cc12fb0c8\u003e] mutex_lock_nested+0x18/0x20\n [\u003cd0325bff\u003e] do_journal_begin_r+0x7f/0x340 [reiserfs]\n [\u003cd0325f77\u003e] journal_begin+0x77/0x140 [reiserfs]\n [\u003cd0326271\u003e] reiserfs_persistent_transaction+0x41/0x90 [reiserfs]\n [\u003cd030d06c\u003e] reiserfs_get_block+0x22c/0x1530 [reiserfs]\n [\u003cc10db9db\u003e] __block_prepare_write+0x1bb/0x3a0\n [\u003cc10dbbe6\u003e] block_prepare_write+0x26/0x40\n [\u003cd030b738\u003e] reiserfs_prepare_write+0x88/0x170 [reiserfs]\n [\u003cd03294d6\u003e] reiserfs_unpack+0xe6/0x120 [reiserfs]\n [\u003cd0329782\u003e] reiserfs_ioctl+0x272/0x320 [reiserfs]\n [\u003cc10c3188\u003e] vfs_ioctl+0x28/0xa0\n [\u003cc10c3bbd\u003e] do_vfs_ioctl+0x32d/0x5c0\n [\u003cc10c3eb3\u003e] sys_ioctl+0x63/0x70\n [\u003cc12fca3d\u003e] syscall_call+0x7/0xb\n\nReported-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nTested-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Jeff Mahoney \u003cjeffm@suse.com\u003e\nCc: All since 2.6.32 \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": "3f259d092c7a2fdf217823e8f1838530adb0cdb0", "tree": "3cb2d34157e14b209f47e458be919144780974a0", "parents": [ "f556cb078a3a11f6bcb203040fe014caaa6710c4" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Sep 30 15:15:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:59 2010 -0700" }, "message": "reiserfs: fix dependency inversion between inode and reiserfs mutexes\n\nThe reiserfs mutex already depends on the inode mutex, so we can\u0027t lock\nthe inode mutex in reiserfs_unpack() without using the safe locking API,\nbecause reiserfs_unpack() is always called with the reiserfs mutex locked.\n\nThis fixes:\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\n [ INFO: possible circular locking dependency detected ]\n 2.6.35c #13\n -------------------------------------------------------\n lilo/1606 is trying to acquire lock:\n (\u0026sb-\u003es_type-\u003ei_mutex_key#8){+.+.+.}, at: [\u003cd0329450\u003e] reiserfs_unpack+0x60/0x110 [reiserfs]\n\n but task is already holding lock:\n (\u0026REISERFS_SB(s)-\u003elock){+.+.+.}, at: [\u003cd032a268\u003e] reiserfs_write_lock+0x28/0x40 [reiserfs]\n\n which lock already depends on the new lock.\n\n the existing dependency chain (in reverse order) is:\n\n -\u003e #1 (\u0026REISERFS_SB(s)-\u003elock){+.+.+.}:\n [\u003cc1056347\u003e] lock_acquire+0x67/0x80\n [\u003cc12f083d\u003e] __mutex_lock_common+0x4d/0x410\n [\u003cc12f0c58\u003e] mutex_lock_nested+0x18/0x20\n [\u003cd032a268\u003e] reiserfs_write_lock+0x28/0x40 [reiserfs]\n [\u003cd0329e9a\u003e] reiserfs_lookup_privroot+0x2a/0x90 [reiserfs]\n [\u003cd0316b81\u003e] reiserfs_fill_super+0x941/0xe60 [reiserfs]\n [\u003cc10b7d17\u003e] get_sb_bdev+0x117/0x170\n [\u003cd0313e21\u003e] get_super_block+0x21/0x30 [reiserfs]\n [\u003cc10b74ba\u003e] vfs_kern_mount+0x6a/0x1b0\n [\u003cc10b7659\u003e] do_kern_mount+0x39/0xe0\n [\u003cc10cebe0\u003e] do_mount+0x340/0x790\n [\u003cc10cf0b4\u003e] sys_mount+0x84/0xb0\n [\u003cc12f25cd\u003e] syscall_call+0x7/0xb\n\n -\u003e #0 (\u0026sb-\u003es_type-\u003ei_mutex_key#8){+.+.+.}:\n [\u003cc1056186\u003e] __lock_acquire+0x1026/0x1180\n [\u003cc1056347\u003e] lock_acquire+0x67/0x80\n [\u003cc12f083d\u003e] __mutex_lock_common+0x4d/0x410\n [\u003cc12f0c58\u003e] mutex_lock_nested+0x18/0x20\n [\u003cd0329450\u003e] reiserfs_unpack+0x60/0x110 [reiserfs]\n [\u003cd0329772\u003e] reiserfs_ioctl+0x272/0x320 [reiserfs]\n [\u003cc10c3228\u003e] vfs_ioctl+0x28/0xa0\n [\u003cc10c3c5d\u003e] do_vfs_ioctl+0x32d/0x5c0\n [\u003cc10c3f53\u003e] sys_ioctl+0x63/0x70\n [\u003cc12f25cd\u003e] syscall_call+0x7/0xb\n\n other info that might help us debug this:\n\n 1 lock held by lilo/1606:\n #0: (\u0026REISERFS_SB(s)-\u003elock){+.+.+.}, at: [\u003cd032a268\u003e] reiserfs_write_lock+0x28/0x40 [reiserfs]\n\n stack backtrace:\n Pid: 1606, comm: lilo Not tainted 2.6.35c #13\n Call Trace:\n [\u003cc1056186\u003e] __lock_acquire+0x1026/0x1180\n [\u003cc1056347\u003e] lock_acquire+0x67/0x80\n [\u003cc12f083d\u003e] __mutex_lock_common+0x4d/0x410\n [\u003cc12f0c58\u003e] mutex_lock_nested+0x18/0x20\n [\u003cd0329450\u003e] reiserfs_unpack+0x60/0x110 [reiserfs]\n [\u003cd0329772\u003e] reiserfs_ioctl+0x272/0x320 [reiserfs]\n [\u003cc10c3228\u003e] vfs_ioctl+0x28/0xa0\n [\u003cc10c3c5d\u003e] do_vfs_ioctl+0x32d/0x5c0\n [\u003cc10c3f53\u003e] sys_ioctl+0x63/0x70\n [\u003cc12f25cd\u003e] syscall_call+0x7/0xb\n\nReported-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nTested-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Jeff Mahoney \u003cjeffm@suse.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.32 and later]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f556cb078a3a11f6bcb203040fe014caaa6710c4", "tree": "71ebd8441cd2a6fb20b150903c22c671bd9c0727", "parents": [ "52653199d7b02e4c3d4b6ac430de68b83116af0e" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Thu Sep 30 15:15:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:59 2010 -0700" }, "message": "MAINTAINERS: update maintainer for S5P ARM ARCHITECTURES\n\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nAcked-by: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Kyungmin Park \u003ckmpark@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": "52653199d7b02e4c3d4b6ac430de68b83116af0e", "tree": "32f72df5944e125d52762e7bc63045b6e1a92e52", "parents": [ "3036e7b490bf7878c6dae952eec5fb87b1106589" ], "author": { "name": "Petr Vandrovec", "email": "petr@vandrovec.name", "time": "Thu Sep 30 15:15:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:59 2010 -0700" }, "message": "MAINTAINERS: update matroxfb \u0026 ncpfs status\n\nI moved couple years ago, so let\u0027s update my email and snail mail.\n\nAnd I do not have any access to Matrox hardware anymore, and I\u0027m quite\nunresponsive to matroxfb bug reports (sorry Alan), so saying that I\u0027m\nmaintainer is a bit far fetched.\n\nFor ncpfs I do not use ncpfs in my daily life either, but at least I can\ntest that one, so I can stay listed here for odd fixes.\n\nSigned-off-by: Petr Vandrovec \u003cpetr@vandrovec.name\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3036e7b490bf7878c6dae952eec5fb87b1106589", "tree": "559270d71bd6e920bc39a8af360b54fb5753984d", "parents": [ "f015ac3edd84ad72f88e08a4d83c56c360aae404" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Thu Sep 30 15:15:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:59 2010 -0700" }, "message": "proc: make /proc/pid/limits world readable\n\nHaving the limits file world readable will ease the task of system\nmanagement on systems where root privileges might be restricted.\n\nHaving admin restricted with root priviledges, he/she could not check\nother users process\u0027 limits.\n\nAlso it\u0027d align with most of the /proc stat files.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Eugene Teo \u003ceugene@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": "f015ac3edd84ad72f88e08a4d83c56c360aae404", "tree": "87f88c4e502d69752776dd36451d0ece5416f9f1", "parents": [ "982f7c2b2e6a28f8f266e075d92e19c0dd4c6e56" ], "author": { "name": "Don Mullis", "email": "don.mullis@gmail.com", "time": "Thu Sep 30 15:15:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:58 2010 -0700" }, "message": "lib/list_sort: do not pass bad pointers to cmp callback\n\nIf the original list is a POT in length, the first callback from line 73\nwill pass a\u003d\u003db both pointing to the original list_head. This is dangerous\nbecause the \u0027list_sort()\u0027 user can use \u0027container_of()\u0027 and accesses the\n\"containing\" object, which does not necessary exist for the list head. So\nthe user can access RAM which does not belong to him. If this is a write\naccess, we can end up with memory corruption.\n\nSigned-off-by: Don Mullis \u003cdon.mullis@gmail.com\u003e\nTested-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.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": "982f7c2b2e6a28f8f266e075d92e19c0dd4c6e56", "tree": "a25ab8534b9f43cb90292ed125dfb9d72fee9858", "parents": [ "64aab720bdf8771214a7c88872bd8e3194c2d279" ], "author": { "name": "Dan Rosenberg", "email": "drosenberg@vsecurity.com", "time": "Thu Sep 30 15:15:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:58 2010 -0700" }, "message": "sys_semctl: fix kernel stack leakage\n\nThe semctl syscall has several code paths that lead to the leakage of\nuninitialized kernel stack memory (namely the IPC_INFO, SEM_INFO,\nIPC_STAT, and SEM_STAT commands) during the use of the older, obsolete\nversion of the semid_ds struct.\n\nThe copy_semid_to_user() function declares a semid_ds struct on the stack\nand copies it back to the user without initializing or zeroing the\n\"sem_base\", \"sem_pending\", \"sem_pending_last\", and \"undo\" pointers,\nallowing the leakage of 16 bytes of kernel stack memory.\n\nThe code is still reachable on 32-bit systems - when calling semctl()\nnewer glibc\u0027s automatically OR the IPC command with the IPC_64 flag, but\ninvoking the syscall directly allows users to use the older versions of\nthe struct.\n\nSigned-off-by: Dan Rosenberg \u003cdan.j.rosenberg@gmail.com\u003e\nCc: Manfred Spraul \u003cmanfred@colorfullife.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "64aab720bdf8771214a7c88872bd8e3194c2d279", "tree": "3fd3007baee0fb26df7c887d2b7dfacdb4bd6df7", "parents": [ "c044391bd82f3b165f9d93937fdc2740da0bab34" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Thu Sep 30 15:15:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:58 2010 -0700" }, "message": "i7core_edac: fix panic in udimm sysfs attributes registration\n\nArray of udimm sysfs attributes was not ended with NULL marker, leading to\ndereference of random memory.\n\n EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm0\n EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm1\n EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm2\n BUG: unable to handle kernel NULL pointer dereference at 00000000000001a4\n IP: [\u003cffffffff81330b36\u003e] edac_create_mci_instance_attributes+0x148/0x1f1\n Pid: 1, comm: swapper Not tainted 2.6.36-rc3-nv+ #483 P6T SE/System Product Name\n RIP: 0010:[\u003cffffffff81330b36\u003e] [\u003cffffffff81330b36\u003e] edac_create_mci_instance_attributes+0x148/0x1f1\n (...)\n Call Trace:\n [\u003cffffffff81330b86\u003e] edac_create_mci_instance_attributes+0x198/0x1f1\n [\u003cffffffff81330c9a\u003e] edac_create_sysfs_mci_device+0xbb/0x2b2\n [\u003cffffffff8132f533\u003e] edac_mc_add_mc+0x46b/0x557\n [\u003cffffffff81428901\u003e] i7core_probe+0xccf/0xec0\n RIP [\u003cffffffff81330b36\u003e] edac_create_mci_instance_attributes+0x148/0x1f1\n ---[ end trace 20de320855b81d78 ]---\n Kernel panic - not syncing: Attempted to kill init!\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Doug Thompson \u003cdougthompson@xmission.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": "c044391bd82f3b165f9d93937fdc2740da0bab34", "tree": "542a8ae1e206a85e4a3041e1053697d90228536b", "parents": [ "e53ced1b02a18fb006fc13c1658bb454ed6cf63c" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Sep 30 15:15:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:58 2010 -0700" }, "message": "drivers/serial/mrst_max3110.c needs linux/irq.h\n\nsparc64 allmodconfig:\n\n drivers/serial/mrst_max3110.c: In function `serial_m3110_startup\u0027:\n drivers/serial/mrst_max3110.c:470: error: `IRQ_TYPE_EDGE_FALLING\u0027 undeclared (first use in this function)\n\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e53ced1b02a18fb006fc13c1658bb454ed6cf63c", "tree": "dd4f433515cb0b9c07f094216f92c36ca7344c6b", "parents": [ "63d66cab4755edc86ddc5b78cae657a3fda908e1" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Sep 30 15:15:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:58 2010 -0700" }, "message": "arch/m68k/mac/macboing.c: use unsigned long for irqflags\n\nFix the warnings\n\n arch/m68k/mac/macboing.c: In function \u0027mac_mksound\u0027:\n arch/m68k/mac/macboing.c:189: warning: comparison of distinct pointer types lacks a cast\n arch/m68k/mac/macboing.c:211: warning: comparison of distinct pointer types lacks a cast\n arch/m68k/mac/macboing.c: In function \u0027mac_quadra_start_bell\u0027:\n arch/m68k/mac/macboing.c:241: warning: comparison of distinct pointer types lacks a cast\n arch/m68k/mac/macboing.c:263: warning: comparison of distinct pointer types lacks a cast\n arch/m68k/mac/macboing.c: In function \u0027mac_quadra_ring_bell\u0027:\n arch/m68k/mac/macboing.c:283: warning: comparison of distinct pointer types lacks a cast\n\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "63d66cab4755edc86ddc5b78cae657a3fda908e1", "tree": "88543405c166053e72be4046f89f224e9ce46dcf", "parents": [ "399f1e30ac17b77d383444aff480c7390f5adf2a" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Sep 30 15:15:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:58 2010 -0700" }, "message": "drivers/serial/mfd.c needs slab.h\n\nalpha allmodconfig:\n\n drivers/serial/mfd.c:144: error: implicit declaration of function \u0027kzalloc\u0027\n drivers/serial/mfd.c:144: warning: assignment makes pointer from integer without a cast\n\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "399f1e30ac17b77d383444aff480c7390f5adf2a", "tree": "da24eab64af0bef6fa4f8fba1c3fedb435a65418", "parents": [ "87400e5406e215e9a1b43cf67794fbb34c15c342" ], "author": { "name": "Ira W. Snyder", "email": "iws@ovro.caltech.edu", "time": "Thu Sep 30 15:15:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 01 10:50:58 2010 -0700" }, "message": "kfifo: fix scatterlist usage\n\nThe kfifo_dma family of functions use sg_mark_end() on the last element in\ntheir scatterlist. This forces use of a fresh scatterlist for each DMA\noperation, which makes recycling a single scatterlist impossible.\n\nChange the behavior of the kfifo_dma functions to match the usage of the\ndma_map_sg function. This means that users must respect the returned\nnents value. The sample code is updated to reflect the change.\n\nThis bug is trivial to cause: call kfifo_dma_in_prepare() such that it\nprepares a scatterlist with a single entry comprising the whole fifo.\nThis is the case when you map the entirety of a newly created empty fifo.\nThis causes the setup_sgl() function to mark the first scatterlist entry\nas the end of the chain, no matter what comes after it.\n\nAfterwards, add and remove some data from the fifo such that another call\nto kfifo_dma_in_prepare() will create two scatterlist entries. It returns\nnents\u003d2. However, due to the previous sg_mark_end() call, sg_is_last()\nwill now return true for the first scatterlist element. This causes the\nsample code to print a single scatterlist element when it should print\ntwo.\n\nBy removing the call to sg_mark_end(), we make the API as similar as\npossible to the DMA mapping API. All users are required to respect the\nreturned nents.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nCc: Stefani Seibold \u003cstefani@seibold.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "87400e5406e215e9a1b43cf67794fbb34c15c342", "tree": "cdce4a7566ced27a5cf77c65338ed1507e79b580", "parents": [ "0d4911081ce201f3e44bc8b32ac0f862d1260332" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 30 08:37:38 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 30 08:37:38 2010 -0700" }, "message": "Fix up more fallout form alpha signal cleanups\n\nCommit c52c2ddc1dfa (\"alpha: switch osf_sigprocmask() to use of\nsigprocmask()\") had several problems. The more obvious compile issues\ngot fixed in commit 0f44fbd297e1 (\"alpha: fix compile problem in\narch/alpha/kernel/signal.c\"), but it also caused a regression.\n\nSince _BLOCKABLE is already the set of signals that can be blocked, the\ncode should do \"newmask \u0026 _BLOCKABLE\" rather than inverting _BLOCKABLE\nbefore masking.\n\nReported-by: Michael Cree \u003cmcree@orcon.net.nz\u003e\nPatch-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nPatch-by: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d4911081ce201f3e44bc8b32ac0f862d1260332", "tree": "e6071b5ec945d05c1083d375c40688b29460e97c", "parents": [ "77f890223338c890fc33972673d2bd3a53061570", "1fc8a117865b54590acd773a55fbac9221b018f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 20:38:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 20:38:07 2010 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:\n ocfs2: Don\u0027t walk off the end of fast symlinks.\n" }, { "commit": "77f890223338c890fc33972673d2bd3a53061570", "tree": "c2ed6ee220adc2c69816feaf4bcd6273f3dcdd97", "parents": [ "4193d9163582b05e33aca3392e46649e5c3da8d1", "cc60f8878eab892c03d06b10f389232b9b66bd83" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 18:41:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 18:41:19 2010 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n dmaengine: fix interrupt clearing for mv_xor\n missing inline keyword for static function in linux/dmaengine.h\n dma/shdma: move dereference below the NULL check\n" }, { "commit": "1fc8a117865b54590acd773a55fbac9221b018f0", "tree": "b086c52bcc77ab3816653719f0c6ad4e33c5c74c", "parents": [ "899611ee7d373e5eeda08e9a8632684e1ebbbf00" ], "author": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Wed Sep 29 17:33:05 2010 -0700" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Wed Sep 29 17:33:05 2010 -0700" }, "message": "ocfs2: Don\u0027t walk off the end of fast symlinks.\n\nocfs2 fast symlinks are NUL terminated strings stored inline in the\ninode data area. However, disk corruption or a local attacker could, in\ntheory, remove that NUL. Because we\u0027re using strlen() (my fault,\nintroduced in a731d1 when removing vfs_follow_link()), we could walk off\nthe end of that string.\n\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "4193d9163582b05e33aca3392e46649e5c3da8d1", "tree": "55da4e30804f7f49770dd99b9e894e9cdb786e84", "parents": [ "9d457c60ba783c709c750b851d07f0ac8af78ce9", "80168676ebfe4af51407d30f336d67f082d45201" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 14:58:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 14:58:11 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: force background CIL push under sustained load\n" }, { "commit": "9d457c60ba783c709c750b851d07f0ac8af78ce9", "tree": "9e28956058607759b3ef63c0fb6fc9a0e3d9a810", "parents": [ "f12f662f29d5801e598c6bb4a71e54b2de218f72", "90182317a9e383474613aa60e9d61d57bdf17c3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 14:57:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 14:57:53 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Fix max8925 irq control bit incorrect setting\n mfd: Ignore non-GPIO IRQs when setting wm831x IRQ types\n" }, { "commit": "f12f662f29d5801e598c6bb4a71e54b2de218f72", "tree": "591c389ec99d992cb3b9b093ddc0463c929b7b1e", "parents": [ "899611ee7d373e5eeda08e9a8632684e1ebbbf00" ], "author": { "name": "Daniel J Blueman", "email": "daniel.blueman@gmail.com", "time": "Wed Sep 29 21:01:55 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 29 13:17:56 2010 -0700" }, "message": "fix OMAP2 MTD build failure\n\nFix build failure from recent interface change and merge.\n\nTested on OMAP3430.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "80168676ebfe4af51407d30f336d67f082d45201", "tree": "30f12022ffadd153cec05f460bdaa620690d7b12", "parents": [ "899611ee7d373e5eeda08e9a8632684e1ebbbf00" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Fri Sep 24 18:13:44 2010 +1000" }, "committer": { "name": "Alex Elder", "email": "aelder@sgi.com", "time": "Wed Sep 29 07:51:03 2010 -0500" }, "message": "xfs: force background CIL push under sustained load\n\nI have been seeing occasional pauses in transaction throughput up to\n30s long under heavy parallel workloads. The only notable thing was\nthat the xfsaild was trying to be active during the pauses, but\nmaking no progress. It was running exactly 20 times a second (on the\n50ms no-progress backoff), and the number of pushbuf events was\nconstant across this time as well. IOWs, the xfsaild appeared to be\nstuck on buffers that it could not push out.\n\nFurther investigation indicated that it was trying to push out inode\nbuffers that were pinned and/or locked. The xfsbufd was also getting\nwoken at the same frequency (by the xfsaild, no doubt) to push out\ndelayed write buffers. The xfsbufd was not making any progress\nbecause all the buffers in the delwri queue were pinned. This scan-\nand-make-no-progress dance went one in the trace for some seconds,\nbefore the xfssyncd came along an issued a log force, and then\nthings started going again.\n\nHowever, I noticed something strange about the log force - there\nwere way too many IO\u0027s issued. 516 log buffers were written, to be\nexact. That added up to 129MB of log IO, which got me very\ninterested because it\u0027s almost exactly 25% of the size of the log.\nHe delayed logging code is suppose to aggregate the minimum of 25%\nof the log or 8MB worth of changes before flushing. That\u0027s what\nreally puzzled me - why did a log force write 129MB instead of only\n8MB?\n\nEssentially what has happened is that no CIL pushes had occurred\nsince the previous tail push which cleared out 25% of the log space.\nThat caused all the new transactions to block because there wasn\u0027t\nlog space for them, but they kick the xfsaild to push the tail.\nHowever, the xfsaild was not making progress because there were\nbuffers it could not lock and flush, and the xfsbufd could not flush\nthem because they were pinned. As a result, both the xfsaild and the\nxfsbufd could not move the tail of the log forward without the CIL\nfirst committing.\n\nThe cause of the problem was that the background CIL push, which\nshould happen when 8MB of aggregated changes have been committed, is\nbeing held off by the concurrent transaction commit load. The\nbackground push does a down_write_trylock() which will fail if there\nis a concurrent transaction commit holding the push lock in read\nmode. With 8 CPUs all doing transactions as fast as they can, there\nwas enough concurrent transaction commits to hold off the background\npush until tail-pushing could no longer free log space, and the halt\nwould occur.\n\nIt should be noted that there is no reason why it would halt at 25%\nof log space used by a single CIL checkpoint. This bug could\ndefinitely violate the \"no transaction should be larger than half\nthe log\" requirement and hence result in corruption if the system\ncrashed under heavy load. This sort of bug is exactly the reason why\ndelayed logging was tagged as experimental....\n\nThe fix is to start blocking background pushes once the threshold\nhas been exceeded. Rework the threshold calculations to keep the\namount of log space a CIL checkpoint can use to below that of the\nAIL push threshold to avoid the problem completely.\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nReviewed-by: Alex Elder \u003caelder@sgi.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "90182317a9e383474613aa60e9d61d57bdf17c3e", "tree": "82c15105db4f388ad06656789e565f7a8f5315da", "parents": [ "c9d66d3515bbb0ad8062721487de7ade02d2b936" ], "author": { "name": "Kevin Liu", "email": "kliu5@marvell.com", "time": "Wed Sep 08 09:44:36 2010 -0400" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Sep 29 10:14:53 2010 +0200" }, "message": "mfd: Fix max8925 irq control bit incorrect setting\n\nIn max8925_irq_sync_unlock(), irq control bit is set at the same time.\nZero means enabling irq, and one means disabling irq.\n\nThe original code is:\n\tirq_chg[0] \u0026\u003d irq_data-\u003eenable;\n\nIt should be changed to:\n\tirq_chg[0] \u0026\u003d ~irq_data-\u003eenable;\n\nOtherwise, irq control bit is mess.\n\nSigned-off-by: Kevin Liu \u003ckliu5@marvell.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "c9d66d3515bbb0ad8062721487de7ade02d2b936", "tree": "d5738f96fff1005af6627cb068d853d2efb4551f", "parents": [ "899611ee7d373e5eeda08e9a8632684e1ebbbf00" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Aug 16 20:26:51 2010 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Sep 29 10:14:52 2010 +0200" }, "message": "mfd: Ignore non-GPIO IRQs when setting wm831x IRQ types\n\nThe driver was originally tested with an additional patch which\nmade this unneeded but that patch had issuges and got lost on the\nway to mainline, causing problems when the errors are reported.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "899611ee7d373e5eeda08e9a8632684e1ebbbf00", "tree": "fbc3e0ec24d5657d3356df8264227cfd3ea374b2", "parents": [ "62bdb288bf464862a2801b2e53aadc6c4d100fab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 18:01:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 18:01:22 2010 -0700" }, "message": "Linux 2.6.36-rc6\n" }, { "commit": "62bdb288bf464862a2801b2e53aadc6c4d100fab", "tree": "35f321df2ab9091d2f4a1f788b609ad36fed03db", "parents": [ "0f44fbd297e1cda5d9ecc9f5321a86fe647c7d4a" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Sep 29 01:57:02 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 18:01:14 2010 -0700" }, "message": "MN10300: Handle missing sys_cacheflush() when caching disabled\n\nWhen caching is disabled on the MN10300 arch, the sys_cacheflush()\nfunction is removed by conditional stuff in the makefiles, but is still\nreferred to by the syscall table.\n\nProvide a null version that just returns 0 when caching is disabled (or\n-EINVAL if the arguments are silly).\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0f44fbd297e1cda5d9ecc9f5321a86fe647c7d4a", "tree": "9f3bd3eb11181cd3874bdd2a66361765522337b4", "parents": [ "7268e3c4b5eb8e3206a467d664c6e17773f2d19e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 13:26:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 13:26:57 2010 -0700" }, "message": "alpha: fix compile problem in arch/alpha/kernel/signal.c\n\nTssk. Apparently Al hadn\u0027t checked commit c52c2ddc1dfa (\"alpha: switch\nosf_sigprocmask() to use of sigprocmask()\") at all. It doesn\u0027t compile.\n\nFixed as per suggestions from Michael Cree.\n\nReported-by: Michael Cree \u003cmcree@orcon.net.nz\u003e\nCc: Al Viro \u003cviro@ftp.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7268e3c4b5eb8e3206a467d664c6e17773f2d19e", "tree": "2b935d680e2a2d65d679b8633d11529dae225c0f", "parents": [ "b4d32648c190711177a664af7d51149a8950555e", "fad16e7a7f67eef8d33f8ad58850db89382b09ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:38:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:38:52 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 ahci: fix module refcount breakage introduced by libahci split\n" }, { "commit": "fad16e7a7f67eef8d33f8ad58850db89382b09ce", "tree": "09afb3e939cd4cc85e6aec76965c16fcc03c5798", "parents": [ "050026feae5bd4fe2db4096b63b15abce7c47faa" ], "author": { "name": "Tejun Heo", "email": "htejun@gmail.com", "time": "Tue Sep 21 09:25:48 2010 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Sep 28 15:14:51 2010 -0400" }, "message": "ahci: fix module refcount breakage introduced by libahci split\n\nlibata depends on scsi_host_template for module reference counting and\nsht\u0027s should be owned by each low level driver. During libahci split,\nthe sht was left with libahci.ko leaving the actual low level drivers\nnot reference counted. This made ahci and ahci_platform always\nunloadable even while they\u0027re being actively used.\n\nFix it by defining AHCI_SHT() macro in ahci.h and defining a sht for\neach low level ahci driver.\n\nstable: only applicable to 2.6.35.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Pedro Francisco \u003cpedrogfrancisco@gmail.com\u003e\nTested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: stable@kernel.org\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "b4d32648c190711177a664af7d51149a8950555e", "tree": "122bebbb0a1a150eee3e13a0f1689f1e8155f933", "parents": [ "0d70397bc72f2122f9702093cce3039ec3ae7575", "fff2017354a3a9906862aabbf2a1cae5b4330e40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:13:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:13:13 2010 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:\n hwmon (coretemp): Fix build breakage if SMP is undefined\n" }, { "commit": "0d70397bc72f2122f9702093cce3039ec3ae7575", "tree": "777ed3793d6fa999cbe700ae09181efec8d076a4", "parents": [ "a2724f28d9f99b7b42e800b528902f0e3321873b", "0e52247a2ed1f211f0c4f682dc999610a368903f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:02:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:02:22 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: fix pci_resource_alignment prototype\n" }, { "commit": "a2724f28d9f99b7b42e800b528902f0e3321873b", "tree": "b4431876af950c16ea6af3a8f2864a4ae494bc62", "parents": [ "050026feae5bd4fe2db4096b63b15abce7c47faa", "01db403cf99f739f86903314a489fb420e0e254f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:01:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:01:26 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: (47 commits)\n tcp: Fix \u003e4GB writes on 64-bit.\n net/9p: Mount only matching virtio channels\n de2104x: fix ethtool\n tproxy: check for transparent flag in ip_route_newports\n ipv6: add IPv6 to neighbour table overflow warning\n tcp: fix TSO FACK loss marking in tcp_mark_head_lost\n 3c59x: fix regression from patch \"Add ethtool WOL support\"\n ipv6: add a missing unregister_pernet_subsys call\n s390: use free_netdev(netdev) instead of kfree()\n sgiseeq: use free_netdev(netdev) instead of kfree()\n rionet: use free_netdev(netdev) instead of kfree()\n ibm_newemac: use free_netdev(netdev) instead of kfree()\n smsc911x: Add MODULE_ALIAS()\n net: reset skb queue mapping when rx\u0027ing over tunnel\n br2684: fix scheduling while atomic\n de2104x: fix TP link detection\n de2104x: fix power management\n de2104x: disable autonegotiation on broken hardware\n net: fix a lockdep splat\n e1000e: 82579 do not gate auto config of PHY by hardware during nominal use\n ...\n" }, { "commit": "fff2017354a3a9906862aabbf2a1cae5b4330e40", "tree": "eb95c35c86cd364794b3e77886770831469bd6ee", "parents": [ "56162badadb91aae93843d8d6558c7d7780e3cb2" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Mon Sep 27 18:01:49 2010 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Tue Sep 28 04:18:51 2010 -0700" }, "message": "hwmon (coretemp): Fix build breakage if SMP is undefined\n\nCommit e40cc4bdfd4b89813f072f72bd9c7055814d3f0f introduced\na build breakage if CONFIG_SMP is undefined. This commit\nfixes the problem.\n\nThis fix is only a workaround. For a real fix, cpu_sibling_mask() should\nbe defined in UP include code, eg in linux/smp.h, and asm/smp.h should not be\nincluded directly. This fix is currently not possible because asm/smp.h defines\ncpu_sibling_mask() unconditionally and is included directly from many source\nfiles.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nTested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "050026feae5bd4fe2db4096b63b15abce7c47faa", "tree": "6d826f7548e16c949b51f257f7c5d4d85318e602", "parents": [ "252a52aa4fa22a668f019e55b3aac3ff71ec1c29", "c9e2fbd909c20b165b2b9ffb59f8b674cf0a55b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 21:19:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 21:19:27 2010 -0700" }, "message": "Merge branch \u0027x86/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Avoid \u0027constant_test_bit()\u0027 misoptimization due to cast to non-volatile\n" }, { "commit": "01db403cf99f739f86903314a489fb420e0e254f", "tree": "bf04fbfb3ed88d6cf7abeea1ab5209be36907882", "parents": [ "0b20406cda621c2495d10baab1e87127ceb43337" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 20:24:54 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 20:24:54 2010 -0700" }, "message": "tcp: Fix \u003e4GB writes on 64-bit.\n\nFixes kernel bugzilla #16603\n\ntcp_sendmsg() truncates iov_len to an \u0027int\u0027 which a 4GB write to write\nzero bytes, for example.\n\nThere is also the problem higher up of how verify_iovec() works. It\nwants to prevent the total length from looking like an error return\nvalue.\n\nHowever it does this using \u0027int\u0027, but syscalls return \u0027long\u0027 (and\nthus signed 64-bit on 64-bit machines). So it could trigger\nfalse-positives on 64-bit as written. So fix it to use \u0027long\u0027.\n\nReported-by: Olaf Bonorden \u003cbono@onlinehome.de\u003e\nReported-by: Daniel Büse \u003cdbuese@gmx.de\u003e\nReported-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "252a52aa4fa22a668f019e55b3aac3ff71ec1c29", "tree": "93e0def0cef2ba85c203f2c20b86cda4b6190843", "parents": [ "95929eff2cb01e9858779283795f4e3943ee020d" ], "author": { "name": "Dan Rosenberg", "email": "drosenberg@vsecurity.com", "time": "Mon Sep 27 12:30:28 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 16:29:06 2010 -0700" }, "message": "Fix pktcdvd ioctl dev_minor range check\n\nThe PKT_CTRL_CMD_STATUS device ioctl retrieves a pointer to a\npktcdvd_device from the global pkt_devs array. The index into this\narray is provided directly by the user and is a signed integer, so the\ncomparison to ensure that it falls within the bounds of this array will\nfail when provided with a negative index.\n\nThis can be used to read arbitrary kernel memory or cause a crash due to\nan invalid pointer dereference. This can be exploited by users with\npermission to open /dev/pktcdvd/control (on many distributions, this is\nreadable by group \"cdrom\").\n\nSigned-off-by: Dan Rosenberg \u003cdan.j.rosenberg@gmail.com\u003e\n[ Rather than add a cast, just make the function take the right type -Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "95929eff2cb01e9858779283795f4e3943ee020d", "tree": "2049459662ec89991de985dfd8dce056e9a85dd7", "parents": [ "d6f74be08d4388222ac83eeba0ade72659e7d247" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Sep 27 13:12:33 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 16:29:06 2010 -0700" }, "message": "MN10300: Default config choice GDBSTUB_TTYSM0 should be GDBSTUB_ON_TTYSM0\n\nThe configuration choice for the port on which the GDB stub listens has\na default of GDBSTUB_TTYSM0, but this should be GDBSTUB_ON_TTYSM0 to\nmatch the option.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0b20406cda621c2495d10baab1e87127ceb43337", "tree": "10befc92130dbe19406b781b16bf312c77c03f89", "parents": [ "387a85628782690b56492dae4bbf544639f5d4a9" ], "author": { "name": "Sven Eckelmann", "email": "sven.eckelmann@gmx.de", "time": "Mon Sep 27 15:54:44 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 15:54:44 2010 -0700" }, "message": "net/9p: Mount only matching virtio channels\n\np9_virtio_create will only compare the the channel\u0027s tag characters\nagainst the device name till the end of the channel\u0027s tag but not till\nthe end of the device name. This means that if a user defines channels\nwith the tags foo and foobar then he would mount foo when he requested\nfoonot and may mount foo when he requested foobar.\n\nThus it is necessary to check both string lengths against each other in\ncase of a successful partial string match.\n\nSigned-off-by: Sven Eckelmann \u003csven.eckelmann@gmx.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "387a85628782690b56492dae4bbf544639f5d4a9", "tree": "537e5ecdeed9d630134cd25dffe502541db51c7d", "parents": [ "824044c19552e8a5f345781ccd1c2062673a41ad" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Mon Sep 27 11:41:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 15:40:29 2010 -0700" }, "message": "de2104x: fix ethtool\n\nWhen the interface is up, using ethtool breaks it because:\na) link is put down but media_timer interval is not shortened to NO_LINK\nb) rxtx is stopped but not restarted\n\nAlso manual 10baseT-HD (and probably FD too - untested) mode does not work -\nthe link is forced up, packets are transmitted but nothing is received.\nChanging CSR14 value to match documentation (not disabling link check) fixes this.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "824044c19552e8a5f345781ccd1c2062673a41ad", "tree": "1ab93ca25dec188c69151b51cdd3164612e3394a", "parents": [ "fb0c5f0bc8b69b40549449ee7fc65f3706f12062", "5786aee8bf6d747ea59595601a19e78ad33d6929" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 15:04:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 15:04:23 2010 -0700" }, "message": "Merge branch \u0027vhost-net\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n" }, { "commit": "fb0c5f0bc8b69b40549449ee7fc65f3706f12062", "tree": "f77a3ed449da953e65f919114c5ea1d4b2c85e88", "parents": [ "7e1b33e5ea392dfc984fc63b76ca75acbf249dcd" ], "author": { "name": "Ulrich Weber", "email": "uweber@astaro.com", "time": "Mon Sep 27 03:31:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 15:03:33 2010 -0700" }, "message": "tproxy: check for transparent flag in ip_route_newports\n\nas done in ip_route_connect()\n\nSigned-off-by: Ulrich Weber \u003cuweber@astaro.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e1b33e5ea392dfc984fc63b76ca75acbf249dcd", "tree": "00fbab440aabca3123b999da42901a7261203c11", "parents": [ "b3de7559afbb7a8a35b4be975a6adf6c5e3cdca0" ], "author": { "name": "Ulrich Weber", "email": "uweber@astaro.com", "time": "Mon Sep 27 15:02:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 15:02:18 2010 -0700" }, "message": "ipv6: add IPv6 to neighbour table overflow warning\n\nIPv4 and IPv6 have separate neighbour tables, so\nthe warning messages should be distinguishable.\n\n[ Add a suitable message prefix on the ipv4 side as well -DaveM ]\n\nSigned-off-by: Ulrich Weber \u003cuweber@astaro.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3de7559afbb7a8a35b4be975a6adf6c5e3cdca0", "tree": "b387ee28cbb0c577943e87ddc7d87c3d7c65b99c", "parents": [ "3fd6c88ef875a14740801ebfc6b6e4e064a1cdd4" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Fri Sep 24 13:22:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 14:55:57 2010 -0700" }, "message": "tcp: fix TSO FACK loss marking in tcp_mark_head_lost\n\nWhen TCP uses FACK algorithm to mark lost packets in\ntcp_mark_head_lost(), if the number of packets in the (TSO) skb is\ngreater than the number of packets that should be marked lost, TCP\nincorrectly exits the loop and marks no packets lost in the skb. This\nunderestimates tp-\u003elost_out and affects the recovery/retransmission.\nThis patch fargments the skb and marks the correct amount of packets\nlost.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6f74be08d4388222ac83eeba0ade72659e7d247", "tree": "610e1a3a063d16673e57620e862e9d9905987c97", "parents": [ "6e029fe3737b022610ededf9e70ee84fb2bdc045", "bec658ff31453a5726b1c188674d587a5d40c482" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:33:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:33:54 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n RDMA/cxgb3: Turn off RX coalescing for iWARP connections\n" }, { "commit": "6e029fe3737b022610ededf9e70ee84fb2bdc045", "tree": "0fc7a86e17014907d32e1b6dcb3b8b310b495870", "parents": [ "26d1e7ced7a51c9ebcff058a9671513fe1fe05b1", "2de59fea8b3095d1df4c729fda041625930aab4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:32:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:32:36 2010 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)\n ARM: 6411/1: vexpress: set RAM latencies to 1 cycle for PL310 on ct-ca9x4 tile\n ARM: 6409/1: davinci: map sram using MT_MEMORY_NONCACHED instead of MT_DEVICE\n ARM: 6408/1: omap: Map only available sram memory\n ARM: 6407/1: mmu: Setup MT_MEMORY and MT_MEMORY_NONCACHED L1 entries\n ARM: pxa: remove pr_\u003clevel\u003e uses of KERN_\u003clevel\u003e\n ARM: pxa168fb: clear enable bit when not active\n ARM: pxa: fix cpu_is_pxa*() not expanding to zero when not configured\n ARM: pxa168: fix corrected reset vector\n ARM: pxa: Use PIO for PI2C communication on Palm27x\n ARM: pxa: Fix Vpac270 gpio_power for MMC\n ARM: 6401/1: plug a race in the alignment trap handler\n ARM: 6406/1: at91sam9g45: fix i2c bus speed\n leds: leds-ns2: fix locking\n ARM: dove: fix __io() definition to use bus based offset\n dmaengine: fix interrupt clearing for mv_xor\n ARM: kirkwood: Unbreak PCIe I/O port\n ARM: Fix build error when using KCONFIG_CONFIG\n ARM: 6383/1: Implement phys_mem_access_prot() to avoid attributes aliasing\n ARM: 6400/1: at91: fix arch_gettimeoffset fallout\n ARM: 6398/1: add proc info for ARM11MPCore/Cortex-A9 from ARM\n ...\n" }, { "commit": "26d1e7ced7a51c9ebcff058a9671513fe1fe05b1", "tree": "b9de75e16489b88bd600c51c1df94bacb7a64e48", "parents": [ "befd1c7aae617fe6ea3d78f77773d171a8413b15", "1d6400c7c9cfd38976b25d55b357200ad3ff1be9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:32:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:32:00 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 net/9p: fix memory handling/allocation in rdma_request()\n" }, { "commit": "befd1c7aae617fe6ea3d78f77773d171a8413b15", "tree": "0a2b90a0c7bde67caa376c9424f124858136acc6", "parents": [ "a11377e47cf3f0174ea97a699a8ae0929b179aef", "00740c58541b6087d78418cebca1fcb86dc6077d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:31:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:31:12 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:\n amd64_edac: Fix driver module removal\n" }, { "commit": "a11377e47cf3f0174ea97a699a8ae0929b179aef", "tree": "d73d0c41bc4f0ce8213cf575d7a105a252cc9ec4", "parents": [ "381ba329e578755bc974b46c6a6f2ac286e89b40", "c8da96e87d349e9035345293093ecc74792fb96a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:29:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:29:39 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n TOMOYO: Don\u0027t abuse sys_getpid(), sys_getppid()\n" }, { "commit": "381ba329e578755bc974b46c6a6f2ac286e89b40", "tree": "899079aae0472b74087e9c5bec2f7283117d8fdb", "parents": [ "65097561b91c4f8ce92a2905f150900f1779ccd1", "cf9a2f3afc75d41a61cbc91e725b9ce0746c400a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:28:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:28:19 2010 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:\n drm/i915/sdvo: Handle unsupported GET_SUPPORTED_ENHANCEMENTS gracefully\n drm/i915/sdvo: Cleanup connector on error path\n drm/i915: Fix 945GM regression in e259befd\n" }, { "commit": "65097561b91c4f8ce92a2905f150900f1779ccd1", "tree": "10928f1396e077b96dbba1f93417248145561e23", "parents": [ "9a457a524762edc1bb1ded65b7a75c01738632d5", "9320f7cbbdd5febf013b0e91db29189724057738" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:27:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:27:00 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove\n mmc: sdhci-s3c: fix incorrect spinlock usage after merge\n mmc: MAINTAINERS: add myself as MMC maintainer\n" }, { "commit": "9a457a524762edc1bb1ded65b7a75c01738632d5", "tree": "19b8b7584abd26f1b3d2390fd5523af0182fad42", "parents": [ "bc5fbd9cc8b72ea591557c1277237a43c65ce775", "40d24ff9b4309d37999bc0ae91a271f57651d9dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:26:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:26:33 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: pd6729: Fix error path\n pcmcia: preserve configuration information if request_io fails partly\n" }, { "commit": "bc5fbd9cc8b72ea591557c1277237a43c65ce775", "tree": "804e63e1ac08c4e3324cc1b456f71cf286db98e4", "parents": [ "6a6aa2b7e47c725b5256ff0f7462fe1247cabf5a", "eecfd57f6429d9d8e10be186566ef99fced55163" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:25:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:25:10 2010 -0700" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6:\n intel-iommu: Use symbolic values instead of magic numbers in Lenovo w/a\n intel-iommu: Abort IOMMU setup for igfx if BIOS gave no shadow GTT space\n" }, { "commit": "6a6aa2b7e47c725b5256ff0f7462fe1247cabf5a", "tree": "dcd8e549193e7aedcdcfb34c13177eceda5b29f4", "parents": [ "f0619343ce782a731f55b8ba06d9a7e7d28a0fb8", "7329cf0201f48695862e334828a108aa7175e955" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:22:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:22:21 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86/amd-iommu: Fix rounding-bug in __unmap_single\n x86/amd-iommu: Work around S3 BIOS bug\n x86/amd-iommu: Set iommu configuration flags in enable-loop\n x86, setup: Fix earlyprintk\u003dserial,0x3f8,115200\n x86, setup: Fix earlyprintk\u003dserial,ttyS0,115200\n" }, { "commit": "f0619343ce782a731f55b8ba06d9a7e7d28a0fb8", "tree": "a2a1e23cdfd640b65d09afd826adf28cd0a208fe", "parents": [ "60bdb72e3c2e808228612f672bd8d18e82872de3", "63e6be6d98e1a2bcdca86872b67052e51ab6afa1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:21:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:21:48 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf, x86: Catch spurious interrupts after disabling counters\n tracing/x86: Don\u0027t use mcount in kvmclock.c\n tracing/x86: Don\u0027t use mcount in pvclock.c\n" }, { "commit": "60bdb72e3c2e808228612f672bd8d18e82872de3", "tree": "71f0946e38d8a6bf4893e9cf9951ad88e4736b99", "parents": [ "8e87354d01b3046aa5e1080419178191f3dce8f0" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 26 19:29:12 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:19:53 2010 -0700" }, "message": "mn10300: check __get_user/__put_user results...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8e87354d01b3046aa5e1080419178191f3dce8f0", "tree": "f31863458958296dbbf54cf779afe9f5ca3a547a", "parents": [ "c05628b49b19187841d635dddd3e47caab33242b" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 26 19:29:02 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:19:53 2010 -0700" }, "message": "mn10300: get rid of set_fs(USER_DS) in sigframe setup\n\nIt really has no business being there; short of a serious kernel bug\nwe should already have USER_DS at that point. It shouldn\u0027t have been\ndone on x86 either...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c05628b49b19187841d635dddd3e47caab33242b", "tree": "d624d95c154ee59589f166b84e4dc178e7723d46", "parents": [ "00cbf6080c7d60b999864afcd9010e0bbc7c5db6" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 26 19:28:52 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:19:53 2010 -0700" }, "message": "mn10300: -\u003erestart_block.fn needs to be reset on sigreturn\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "00cbf6080c7d60b999864afcd9010e0bbc7c5db6", "tree": "19ee4371be3b21d3de8cf1cfb539776ce8387c54", "parents": [ "e46924d246e028c94689087db0699438343a344e" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 26 19:28:42 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:19:53 2010 -0700" }, "message": "mn10300: prevent double syscall restarts\n\nset -\u003eorig_d0 to -1, same as what sigreturn does\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e46924d246e028c94689087db0699438343a344e", "tree": "e2ed72422868d684e2f62b9265e60f40ed3ebe14", "parents": [ "18e6bfa96d4d810ad9a69e17f08e0d0089379f22" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 26 19:28:32 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:19:53 2010 -0700" }, "message": "mn10300: avoid SIGSEGV delivery loop\n\nforce_sigsegv() is there for purpose...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "18e6bfa96d4d810ad9a69e17f08e0d0089379f22", "tree": "cd89c2ca672f78d073f0bfb352b8f8e3360c8997", "parents": [ "c52c2ddc1dfa6fe85ffd5e4c57cf91f6982639fe" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 26 19:28:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:19:53 2010 -0700" }, "message": "alpha: __get_user/__put_user results need to be checked...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c52c2ddc1dfa6fe85ffd5e4c57cf91f6982639fe", "tree": "25f44cf6ce5fbd50109935978821ec76e3d51393", "parents": [ "32163f4b2cef28a5aab8b226ffecfc6379a53786" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 26 19:28:12 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 27 12:19:53 2010 -0700" }, "message": "alpha: switch osf_sigprocmask() to use of sigprocmask()\n\nget rid of a useless wrapper, while we are at it\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3fd6c88ef875a14740801ebfc6b6e4e064a1cdd4", "tree": "ae2cc67aeea8939dc2bdc8546235c488cc1906f1", "parents": [ "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3" ], "author": { "name": "Jan Beulich", "email": "jbeulich@novell.com", "time": "Mon Sep 27 11:07:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 11:07:00 2010 -0700" }, "message": "3c59x: fix regression from patch \"Add ethtool WOL support\"\n\nThis patch (commit 690a1f2002a3091bd18a501f46c9530f10481463) added a\nnew call site for acpi_set_WOL() without checking that the function is\nactually suitable to be called via\n\n vortex_set_wol+0xcd/0xe0 [3c59x]\n dev_ethtool+0xa5a/0xb70\n dev_ioctl+0x2e0/0x4b0\n T.961+0x49/0x50\n sock_ioctl+0x47/0x290\n do_vfs_ioctl+0x7f/0x340\n sys_ioctl+0x80/0xa0\n system_call_fastpath+0x16/0x1b\n\ni.e. outside of code paths run when the device is not yet enabled or\nalready disabled. In particular, putting the device into D3hot is a\npretty bad idea when it was already brought up.\n\nFurthermore, all prior callers of the function made sure they\u0027re\nactually dealing with a PCI device, while the newly added one didn\u0027t.\n\nIn the same spirit, the .get_wol handler shouldn\u0027t indicate support\nfor WOL for non-PCI devices.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bec658ff31453a5726b1c188674d587a5d40c482", "tree": "68a8a1977e100e4f4fb2f7631eff79fefe463a13", "parents": [ "32163f4b2cef28a5aab8b226ffecfc6379a53786" ], "author": { "name": "Steve Wise", "email": "swise@opengridcomputing.com", "time": "Sat Sep 18 19:38:21 2010 -0500" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Mon Sep 27 09:28:55 2010 -0700" }, "message": "RDMA/cxgb3: Turn off RX coalescing for iWARP connections\n\nThe HW by default has RX coalescing on. For iWARP connections, this\ncauses a 100ms delay in connection establishement due to the ingress\nMPA Start message being stalled in HW. So explicitly turn RX\ncoalescing off when setting up iWARP connections.\n\nThis was causing very bad performance for NP64 gather operations using\nOpen MPI, due to the way it sets up connections on larger jobs.\n\nSigned-off-by: Steve Wise \u003cswise@opengridcomputing.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "2de59fea8b3095d1df4c729fda041625930aab4f", "tree": "b7d5e28e4da11607c74a7ed99c3bd2f93473a8fd", "parents": [ "2de5c00ac06c8983ab33ad51a8341584f1cf42c3" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Mon Sep 27 14:55:15 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Sep 27 14:57:36 2010 +0100" }, "message": "ARM: 6411/1: vexpress: set RAM latencies to 1 cycle for PL310 on ct-ca9x4 tile\n\nThe PL310 on the ct-ca9x4 tile for the Versatile Express does not need\nto add additional latency when accessing its cache RAMs. Unfortunately,\nthe boot monitor sets this up for an 8-cycle delay on reads and writes,\nresulting in greatly reduced memory performance when the L2 cache is\nenabled.\n\nThis patch sets the L2 RAM latencies to the correct value of 1 cycle\non the ct-ca9x4 tile before enabling the L2 cache.\n\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1d6400c7c9cfd38976b25d55b357200ad3ff1be9", "tree": "e7da3e64ec02493282e76a55f2f0025e358049b3", "parents": [ "32163f4b2cef28a5aab8b226ffecfc6379a53786" ], "author": { "name": "Davidlohr Bueso", "email": "dave@gnu.org", "time": "Mon Sep 13 15:53:18 2010 +0000" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Sep 27 07:52:50 2010 -0500" }, "message": "net/9p: fix memory handling/allocation in rdma_request()\n\nReturn -ENOMEM when erroring on kmalloc and fix memory leaks when returning on error.\n\nSigned-off-by: Davidlohr Bueso \u003cdave@gnu.org\u003e\nReviewed-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "00740c58541b6087d78418cebca1fcb86dc6077d", "tree": "0d66f4d50dac7ad66997429e1f6ed702ec74afa5", "parents": [ "b30a3f6257ed2105259b404d419b4964e363928c" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Sun Sep 26 12:42:23 2010 +0200" }, "committer": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Mon Sep 27 12:52:58 2010 +0200" }, "message": "amd64_edac: Fix driver module removal\n\nf4347553b30ec66530bfe63c84530afea3803396 removed the edac polling\nmechanism in favor of using a notifier chain for conveying MCE\ninformation to edac. However, the module removal path didn\u0027t test\nwhether the driver had setup the polling function workqueue at all and\nthe rmmod process was hanging in the kernel at try_to_del_timer_sync()\nin the cancel_delayed_work() path, trying to cancel an uninitialized\nwork struct.\n\nFix that by adding a balancing check to the workqueue removal path.\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\n" }, { "commit": "c9e2fbd909c20b165b2b9ffb59f8b674cf0a55b0", "tree": "29b4f977e3a1fa4b0b85057c35652ee5fe58949e", "parents": [ "7329cf0201f48695862e334828a108aa7175e955" ], "author": { "name": "Alexander Chumachenko", "email": "ledest@gmail.com", "time": "Thu Apr 01 15:34:52 2010 +0300" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Sun Sep 26 22:43:07 2010 -0700" }, "message": "x86: Avoid \u0027constant_test_bit()\u0027 misoptimization due to cast to non-volatile\n\nWhile debugging bit_spin_lock() hang, it was tracked down to gcc-4.4\nmisoptimization of non-inlined constant_test_bit() due to non-volatile\naddr when \u0027const volatile unsigned long *addr\u0027 cast to \u0027unsigned long *\u0027\nwith subsequent unconditional jump to pause (and not to the test) leading\nto hang.\n\nCompiling with gcc-4.3 or disabling CONFIG_OPTIMIZE_INLINING yields inlined\nconstant_test_bit() and correct jump, thus working around the kernel bug.\n\nOther arches than asm-x86 may implement this slightly differently;\n2.6.29 mitigates the misoptimization by changing the function prototype\n(commit c4295fbb6048d85f0b41c5ced5cbf63f6811c46c) but probably fixing the issue\nitself is better.\n\nSigned-off-by: Alexander Chumachenko \u003cledest@gmail.com\u003e\nSigned-off-by: Michael Shigorin \u003cmike@osdn.org.ua\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3", "tree": "6fbbaa255617783eda308a00a21065bc99ad0d21", "parents": [ "bc68580d41b131396054a1a04a7df4948555ed97" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Sep 24 09:55:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 19:09:25 2010 -0700" }, "message": "ipv6: add a missing unregister_pernet_subsys call\n\nClean up a missing exit path in the ipv6 module init routines. In\naddrconf_init we call ipv6_addr_label_init which calls register_pernet_subsys\nfor the ipv6_addr_label_ops structure. But if module loading fails, or if the\nipv6 module is removed, there is no corresponding unregister_pernet_subsys call,\nwhich leaves a now-bogus address on the pernet_list, leading to oopses in\nsubsequent registrations. This patch cleans up both the failed load path and\nthe unload path. Tested by myself with good results.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\n\n include/net/addrconf.h | 1 +\n net/ipv6/addrconf.c | 11 ++++++++---\n net/ipv6/addrlabel.c | 5 +++++\n 3 files changed, 14 insertions(+), 3 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc68580d41b131396054a1a04a7df4948555ed97", "tree": "b2f78691199167967e694dccec273afa29ba0a0c", "parents": [ "8d879de89807d82bc4cc3e9d73609b874fa9458c" ], "author": { "name": "Vasiliy Kulikov", "email": "segooon@gmail.com", "time": "Sun Sep 26 18:56:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:56:06 2010 -0700" }, "message": "s390: use free_netdev(netdev) instead of kfree()\n\nFreeing netdev without free_netdev() leads to net, tx leaks.\nI might lead to dereferencing freed pointer.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n@@\nstruct net_device* dev;\n@@\n\n-kfree(dev)\n+free_netdev(dev)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d879de89807d82bc4cc3e9d73609b874fa9458c", "tree": "4c654cab6a0dc46f4e5f7e0330bc22c4747acbc2", "parents": [ "22138d307329e1968fc698821095b87c2fd5de12" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sat Sep 25 23:58:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:54:34 2010 -0700" }, "message": "sgiseeq: use free_netdev(netdev) instead of kfree()\n\nFreeing netdev without free_netdev() leads to net, tx leaks.\nI might lead to dereferencing freed pointer.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n@@\nstruct net_device* dev;\n@@\n\n-kfree(dev)\n+free_netdev(dev)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22138d307329e1968fc698821095b87c2fd5de12", "tree": "6c1a822fd4fbbda87cb64644920adb0923f51a23", "parents": [ "52933f052186877afd218aef7a1b2dbdb010939f" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sat Sep 25 23:58:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:54:33 2010 -0700" }, "message": "rionet: use free_netdev(netdev) instead of kfree()\n\nFreeing netdev without free_netdev() leads to net, tx leaks.\nI might lead to dereferencing freed pointer.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n@@\nstruct net_device* dev;\n@@\n\n-kfree(dev)\n+free_netdev(dev)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52933f052186877afd218aef7a1b2dbdb010939f", "tree": "f2411bac21bebb47f105bb5237baba1ac16b7b16", "parents": [ "62038e4a146b97352d5911e6ede36c58d4187c3e" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sat Sep 25 23:58:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:54:32 2010 -0700" }, "message": "ibm_newemac: use free_netdev(netdev) instead of kfree()\n\nFreeing netdev without free_netdev() leads to net, tx leaks.\nI might lead to dereferencing freed pointer.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n@@\nstruct net_device* dev;\n@@\n\n-kfree(dev)\n+free_netdev(dev)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62038e4a146b97352d5911e6ede36c58d4187c3e", "tree": "63dfdb1d8adf00c4d805b480657c2ac7fe0718b0", "parents": [ "693019e90ca45d881109d32c0c6d29adf03f6447" ], "author": { "name": "Vincent Stehlé", "email": "vincent.stehle@laposte.net", "time": "Sun Sep 26 18:50:05 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:50:05 2010 -0700" }, "message": "smsc911x: Add MODULE_ALIAS()\n\nThis enables auto loading for the smsc911x ethernet driver.\n\nSigned-off-by: Vincent Stehlé \u003cvincent.stehle@laposte.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "693019e90ca45d881109d32c0c6d29adf03f6447", "tree": "76142f67118da6998584172d609a32d989bfccc8", "parents": [ "a3d6713fbd2ccb50898a6f88664da96a7857c039" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Thu Sep 23 11:19:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:48:40 2010 -0700" }, "message": "net: reset skb queue mapping when rx\u0027ing over tunnel\n\nReset queue mapping when an skb is reentering the stack via a tunnel.\nOn second pass, the queue mapping from the original device is no\nlonger valid.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a3d6713fbd2ccb50898a6f88664da96a7857c039", "tree": "e772805828ad8c862c10b1845878baffbb11248e", "parents": [ "ca9a783575d2affed30ef27a3427a7705527ddac" ], "author": { "name": "Karl Hiramoto", "email": "karl@hiramoto.org", "time": "Thu Sep 23 01:50:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:29:18 2010 -0700" }, "message": "br2684: fix scheduling while atomic\n\nYou can\u0027t call atomic_notifier_chain_unregister() while in atomic context.\n\nFix, call un/register_atmdevice_notifier in module __init and __exit.\n\nBug report:\nhttp://comments.gmane.org/gmane.linux.network/172603\n\nReported-by: Mikko Vinni \u003cmmvinni@yahoo.com\u003e\nTested-by: Mikko Vinni \u003cmmvinni@yahoo.com\u003e\nSigned-off-by: Karl Hiramoto \u003ckarl@hiramoto.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8da96e87d349e9035345293093ecc74792fb96a", "tree": "738b017e4fa8547feb2741969decd749ea6e98e1", "parents": [ "91e71c12c506e15028c252a5a097723f41c518dd" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sun Sep 26 05:55:13 2010 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Sep 27 10:53:18 2010 +1000" }, "message": "TOMOYO: Don\u0027t abuse sys_getpid(), sys_getppid()\n\nSystem call entry functions sys_*() are never to be called from\ngeneral kernel code. The fact that they aren\u0027t declared in header\nfiles should have been a clue. These functions also don\u0027t exist on\nAlpha since it has sys_getxpid() instead.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nAcked-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ca9a783575d2affed30ef27a3427a7705527ddac", "tree": "cf4fb6545c85f1d7411877dadbab4db04eb3ec2c", "parents": [ "b0255a02351b00ca55f4eb2588d05a5db9dd1a58" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Sat Sep 25 10:39:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 15:51:55 2010 -0700" }, "message": "de2104x: fix TP link detection\n\nCompex FreedomLine 32 PnP-PCI2 cards have only TP and BNC connectors but the\nSROM contains AUI port too. When TP loses link, the driver switches to\nnon-existing AUI port (which reports that carrier is always present).\n\nConnecting TP back generates LinkPass interrupt but de_media_interrupt() is\nbroken - it only updates the link state of currently connected media, ignoring\nthe fact that LinkPass and LinkFail bits of MacStatus register belong to the\nTP port only (the chip documentation says that).\n\nThis patch changes de_media_interrupt() to switch media to TP when link goes\nup (and media type is not locked) and also to update the link state only when\nthe TP port is used.\n\nAlso the NonselPortActive (and also SelPortActive) bits of SIAStatus register\nneed to be cleared (by writing 1) after reading or they\u0027re useless.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0255a02351b00ca55f4eb2588d05a5db9dd1a58", "tree": "a0e12e378089350e8d75d77ca70809e7603525e8", "parents": [ "e0f9c4f332c99b213d4a0b7cd21dc0781ceb3d86" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Fri Sep 24 23:57:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 15:49:38 2010 -0700" }, "message": "de2104x: fix power management\n\nAt least my 21041 cards come out of suspend with bus mastering disabled so\nthey did not work after resume(no data transferred).\nAfter adding pci_set_master(), the driver oopsed immediately on resume -\nbecause de_clean_rings() is called on suspend but de_init_rings() call\nwas missing in resume.\n\nAlso disable link (reset SIA) before sleep (de4x5 does this too).\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9320f7cbbdd5febf013b0e91db29189724057738", "tree": "8ba7a24a1c7dfe696bfadf4035f39011eba8d49a", "parents": [ "06fe577f841f383b2d4f743cfb74fac7f6468353" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu Sep 23 16:22:05 2010 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sun Sep 26 16:27:05 2010 -0400" }, "message": "mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove\n\nIf not all clocks have been defined in platform data, the driver will\ncause a null pointer dereference when it is removed. This patch fixes\nthis issue.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "06fe577f841f383b2d4f743cfb74fac7f6468353", "tree": "8e2a54b3e99e2eb30617f7d5803038d66c89aa2e", "parents": [ "245feaa61dbdabffafd47b973595e06abb1288f4" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon Sep 20 15:03:42 2010 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sun Sep 26 16:27:02 2010 -0400" }, "message": "mmc: sdhci-s3c: fix incorrect spinlock usage after merge\n\nIn the commit f522886e202a34a2191dd5d471b3c4d46410a9a0 a merge conflict\nin the sdhci-s3c driver been fixed. However the fix used incorrect\nspinlock operation - it caused a race with sdhci interrupt service. The\ncorrect way to solve it is to use spin_lock_irqsave/irqrestore() calls.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "245feaa61dbdabffafd47b973595e06abb1288f4", "tree": "5f84663655a8c0ed94ffd3e409df0389b577cef2", "parents": [ "32163f4b2cef28a5aab8b226ffecfc6379a53786" ], "author": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Fri Sep 10 12:05:24 2010 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sun Sep 26 16:26:59 2010 -0400" }, "message": "mmc: MAINTAINERS: add myself as MMC maintainer\n\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\nCc: Pierre Ossman \u003cpierre-list@ossman.eu\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "40d24ff9b4309d37999bc0ae91a271f57651d9dd", "tree": "07b3664ec20fa3fe20a518f0cb8a00de0dc781fb", "parents": [ "7cdffc86528ec9c55c83c649b6d64cadeb558136" ], "author": { "name": "Rahul Ruikar", "email": "rahul.ruikar@gmail.com", "time": "Sun Sep 26 17:00:29 2010 +0530" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Sep 26 15:54:25 2010 +0200" }, "message": "pcmcia: pd6729: Fix error path\n\nIn error return path\ncall pci_disable_device() which was enabled earlier.\n\nSigned-off-by: Rahul Ruikar \u003crahul.ruikar@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "32163f4b2cef28a5aab8b226ffecfc6379a53786", "tree": "c4e1412c1aba536551b4ff5f30cbe788e524694c", "parents": [ "77edffb652b33a565e099ff0a1687762f03eb46a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Sep 25 21:07:51 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 25 14:38:13 2010 -0700" }, "message": "alpha: fix usp value in multithreaded coredumps\n\nrdusp() gives us the right value only for the current thread...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "77edffb652b33a565e099ff0a1687762f03eb46a", "tree": "1e6e9586fc563d867c8737feb855575314deaff7", "parents": [ "56162badadb91aae93843d8d6558c7d7780e3cb2" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Sep 25 21:07:14 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 25 14:38:13 2010 -0700" }, "message": "alpha: fix hae_cache race in RESTORE_ALL\n\nWe want interrupts disabled on all paths leading to RESTORE_ALL;\notherwise, we are risking an IRQ coming between the updates of\nalpha_mv-\u003ehae_cache and *alpha_mv-\u003ehae_register and set_hae()\nwithin the IRQ getting badly confused.\n\nRESTORE_ALL used to play with disabling IRQ itself, but that got\nremoved back in 2002, without making sure we had them disabled\non all paths. It\u0027s cheaper to make sure we have them disabled than\nto revert to original variant...\n\nRemove the detritus left from that commit back in 2002; we used to\nneed a reload of $0 and $1 since swpipl would change those, but\ndoing that had become pointless when we stopped doing swpipl in\nthere...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "56162badadb91aae93843d8d6558c7d7780e3cb2", "tree": "6ec96e5b1e41672b45cacf9080d5f3f0db97118a", "parents": [ "e7553b19da07fffbefe83119f25738e2cc90c426", "f281fb5fe54e15a7ab802945e42f8e24fceb56b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 25 09:51:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 25 09:51:54 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n block: prevent merges of discard and write requests\n" }, { "commit": "e7553b19da07fffbefe83119f25738e2cc90c426", "tree": "e8d069cd621a1dfe7a3528c98855f0f3b86cc04b", "parents": [ "5ec1055aa5632dd7a8283cdb5fa9be3c535eaa06", "3b23cd28751c70a3d9d4f5c9e1d2f6dbbe04f4e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 25 09:51:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 25 09:51:31 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: sound/pci/rme9652: prevent reading uninitialized stack memory\n ALSA: hda - Fix auto-parse of SPDIF input of Realtek codecs\n ASoC: Fix multi-componentism\n ASoC: Fix soc-cache buffer overflow bug\n ALSA: oxygen: fix analog capture on Claro halo cards\n ALSA: hda - Add Dell Latitude E6400 model quirk\n ASoC: fix clkdev API usage in sh/migor.c\n" }, { "commit": "5ec1055aa5632dd7a8283cdb5fa9be3c535eaa06", "tree": "231fa9a989433ee7fab796342f7ebc2c3e167342", "parents": [ "8ae09259ffe2402e956efd5a36220b6161e9ecb3" ], "author": { "name": "Larry Woodman", "email": "lwoodman@redhat.com", "time": "Fri Sep 24 12:04:48 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 25 09:34:58 2010 -0700" }, "message": "Avoid pgoff overflow in remap_file_pages\n\nThomas Pollet noticed that the remap_file_pages() system call in\nfremap.c has a potential overflow in the first part of the if statement\nbelow, which could cause it to process bogus input parameters.\nSpecifically the pgoff + size parameters could be wrap thereby\npreventing the system call from failing when it should.\n\nReported-by: Thomas Pollet \u003cthomas.pollet@gmail.com\u003e\nSigned-off-by: Larry Woodman \u003clwoodman@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b23cd28751c70a3d9d4f5c9e1d2f6dbbe04f4e8", "tree": "082c40f8157305147ac57b895246bf2e5e9b554c", "parents": [ "b614e38e78ec1aacf80fd6124cfcc6e45925647c", "01fdf1801e349302fce5d9865470a7100a2d9b74" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sat Sep 25 17:57:53 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sat Sep 25 17:57:53 2010 +0200" }, "message": "Merge branch \u0027fix/hda\u0027 into for-linus\n" }, { "commit": "b614e38e78ec1aacf80fd6124cfcc6e45925647c", "tree": "1a76b07ef87fbfe1e62ac8989071a811ddfd90ec", "parents": [ "e68d3b316ab7b02a074edc4f770e6a746390cb7d", "0077ca0b5c986477e33451b797b6e7dc92a8bbc0" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sat Sep 25 17:57:49 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sat Sep 25 17:57:49 2010 +0200" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n" }, { "commit": "e68d3b316ab7b02a074edc4f770e6a746390cb7d", "tree": "6dddc80b93622ba0bfe626ae1f0b0fddd9395072", "parents": [ "0873a5ae747847ee55a63db409dff3476e45bcd9" ], "author": { "name": "Dan Rosenberg", "email": "drosenberg@vsecurity.com", "time": "Sat Sep 25 11:07:27 2010 -0400" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sat Sep 25 17:46:22 2010 +0200" }, "message": "ALSA: sound/pci/rme9652: prevent reading uninitialized stack memory\n\nThe SNDRV_HDSP_IOCTL_GET_CONFIG_INFO and\nSNDRV_HDSP_IOCTL_GET_CONFIG_INFO ioctls in hdspm.c and hdsp.c allow\nunprivileged users to read uninitialized kernel stack memory, because\nseveral fields of the hdsp{m}_config_info structs declared on the stack\nare not altered or zeroed before being copied back to the user. This\npatch takes care of it.\n\nSigned-off-by: Dan Rosenberg \u003cdan.j.rosenberg@gmail.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "2de5c00ac06c8983ab33ad51a8341584f1cf42c3", "tree": "b3d73b315c0bf3fa809e9382b9368b5f02917c51", "parents": [ "e546f21b4b7af012d9f18edad6237339adfeb681" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Fri Sep 24 07:21:05 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 25 15:58:40 2010 +0100" }, "message": "ARM: 6409/1: davinci: map sram using MT_MEMORY_NONCACHED instead of MT_DEVICE\n\nOn Davinci SRAM is mapped as MT_DEVICE becasue of the section\nmapping pre-requisite instead of intended MT_MEMORY_NONCACHED\n\nSince the section mapping limitation gets fixed with first\npatch in this series, the MT_MEMORY_NONCACHED can be used now.\n\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e546f21b4b7af012d9f18edad6237339adfeb681", "tree": "8c425960cc8e2fce8f35a294c00f2c97852696a7", "parents": [ "f1a2481c0ad3aebd94d11b317c488deaadc25002" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Fri Sep 24 07:19:49 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 25 15:58:40 2010 +0100" }, "message": "ARM: 6408/1: omap: Map only available sram memory\n\nCurrently we map 1 MB section while setting up SRAM on OMAPs\nRegardless of the actual memory. The physical OCM RAM available\non OMAP SOCs is in order of KBs. This patch maps only available\nsram and cleans up some un-necessary cpu_is_xxx checks.\n\nMapping un-available or non-accessible(secure) memory on the newer ARM\nprocessor is dangerous. Because ARM CPUs can now speculatively prefetch,\nwe should avoid mapping any no-existing or secure memory.\n\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f1a2481c0ad3aebd94d11b317c488deaadc25002", "tree": "34835ebb681604635db2f8b44c2fa7d2d0f75933", "parents": [ "f933b87e6f06fcce5988fd5e8ebf3a97858a7155" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Fri Sep 24 07:18:22 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 25 15:58:39 2010 +0100" }, "message": "ARM: 6407/1: mmu: Setup MT_MEMORY and MT_MEMORY_NONCACHED L1 entries\n\nThis patch populates the L1 entries for MT_MEMORY and MT_MEMORY_NONCACHED\ntypes so that at boot-up, we can map memories outside system memory\nat page level granularity\n\nPreviously the mapping was limiting to section level, which creates\nunnecessary additional mapping for which physical memory may not\npresent. On the newer ARM with speculation, this is dangerous and can\nresult in untraceable aborts.\n\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f281fb5fe54e15a7ab802945e42f8e24fceb56b2", "tree": "51a7dd2e900b8ce4118d1357ab6e187edfc12e25", "parents": [ "a850ea30374ebed32a0724742601861853fde869" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Sat Sep 25 12:42:55 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Sep 25 12:42:55 2010 +0200" }, "message": "block: prevent merges of discard and write requests\n\nAdd logic to prevent two I/O requests being merged if\nonly one of them is a discard. Ditto secure discard.\n\nWithout this fix, it is possible for write requests\nto transform into discard requests. For example:\n\n Submit bio 1 to discard 8 sectors from sector n\n Submit bio 2 to write 8 sectors from sector n + 16\n Submit bio 3 to write 8 sectors from sector n + 8\n\nBio 1 becomes request 1. Bio 2 becomes request 2.\nBio 3 is merged with request 2, and then subsequently\nrequest 2 is merged with request 1 resulting in just\none I/O request which discards all 24 sectors.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\n\n(Moved the checks above the position checks /Jens)\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "f933b87e6f06fcce5988fd5e8ebf3a97858a7155", "tree": "eb334347814e930bd0fd39b2f8291655280a597c", "parents": [ "2f27bf834e1d0a06e83d7458b535891c552271aa", "d42028060dfe1b9b65a387a849e82fd5c86359fb" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 25 10:27:50 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 25 10:27:50 2010 +0100" }, "message": "Merge branch \u0027fix\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6\n" }, { "commit": "e0f9c4f332c99b213d4a0b7cd21dc0781ceb3d86", "tree": "189fc0166e486bba8090374515d4506b9734f451", "parents": [ "f064af1e500a2bf4607706f0f458163bdb2a6ea5" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Thu Sep 23 10:59:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 24 22:40:46 2010 -0700" }, "message": "de2104x: disable autonegotiation on broken hardware\n\nAt least on older 21041-AA chips (mine is rev. 11), TP duplex autonegotiation\ncauses the card not to work at all (link is up but no packets are transmitted).\n\nde4x5 disables autonegotiation completely. But it seems to work on newer\n(21041-PA rev. 21) so disable it only on rev\u003c20 chips.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f064af1e500a2bf4607706f0f458163bdb2a6ea5", "tree": "ebbbd1c3c00030c70cab6fe587a5c03252a46ebc", "parents": [ "605c82bab5abe0816e5e32716875c245f89f39da" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 22 12:43:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 24 22:26:10 2010 -0700" }, "message": "net: fix a lockdep splat\n\nWe have for each socket :\n\nOne spinlock (sk_slock.slock)\nOne rwlock (sk_callback_lock)\n\nPossible scenarios are :\n\n(A) (this is used in net/sunrpc/xprtsock.c)\nread_lock(\u0026sk-\u003esk_callback_lock) (without blocking BH)\n\u003cBH\u003e\nspin_lock(\u0026sk-\u003esk_slock.slock);\n...\nread_lock(\u0026sk-\u003esk_callback_lock);\n...\n\n(B)\nwrite_lock_bh(\u0026sk-\u003esk_callback_lock)\nstuff\nwrite_unlock_bh(\u0026sk-\u003esk_callback_lock)\n\n(C)\nspin_lock_bh(\u0026sk-\u003esk_slock)\n...\nwrite_lock_bh(\u0026sk-\u003esk_callback_lock)\nstuff\nwrite_unlock_bh(\u0026sk-\u003esk_callback_lock)\nspin_unlock_bh(\u0026sk-\u003esk_slock)\n\nThis (C) case conflicts with (A) :\n\nCPU1 [A] CPU2 [C]\nread_lock(callback_lock)\n\u003cBH\u003e spin_lock_bh(slock)\n\u003cwait to spin_lock(slock)\u003e\n \u003cwait to write_lock_bh(callback_lock)\u003e\n\nWe have one problematic (C) use case in inet_csk_listen_stop() :\n\nlocal_bh_disable();\nbh_lock_sock(child); // spin_lock_bh(\u0026sk-\u003esk_slock)\nWARN_ON(sock_owned_by_user(child));\n...\nsock_orphan(child); // write_lock_bh(\u0026sk-\u003esk_callback_lock)\n\nlockdep is not happy with this, as reported by Tetsuo Handa\n\nIt seems only way to deal with this is to use read_lock_bh(callbacklock)\neverywhere.\n\nThanks to Jarek for pointing a bug in my first attempt and suggesting\nthis solution.\n\nReported-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nTested-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nTested-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ae09259ffe2402e956efd5a36220b6161e9ecb3", "tree": "05445becce71e6dac507bcc15f55487bbf3e2f17", "parents": [ "fd194e6493be47bd491931d19f563f59b54fd769", "0eae7799000cdf0c2ed596c39bfb71030809fc71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 24 19:09:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 24 19:09:20 2010 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:\n x86/hwmon: pkgtemp has no dependency on PCI\n MAINTAINERS: Update hwmon entry\n x86/hwmon: register alternate sibling upon CPU removal\n x86/hwmon: fix initialization of pkgtemp\n x86/hwmon: fix initialization of coretemp\n x86/hwmon: don\u0027t leak device attribute file from pkgtemp_probe() and pkgtemp_remove()\n x86/hwmon: avoid deadlock on CPU removal in pkgtemp\n x86/hwmon: fix module init for hotplug-but-no-device-found case\n hwmon: (lis3) Fix Oops with NULL platform data\n" }, { "commit": "fd194e6493be47bd491931d19f563f59b54fd769", "tree": "e38e18522cd522599f3e5dc57acf232d08099894", "parents": [ "e92b05dec8865619ea2608c5c11a54b01467482f", "ea44e06e79a393fb577272399ef7521a143b6b59" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 24 19:08:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 24 19:08:39 2010 -0700" }, "message": "Merge branch \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: remove dead code from intvec_32.S\n" }, { "commit": "d42028060dfe1b9b65a387a849e82fd5c86359fb", "tree": "a36fa9c0527d18a9207c130f2c9d567d3966a042", "parents": [ "07a5d146c80b7caa9e754b51f64d3fcbbc74e9c0" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sat Sep 11 22:10:49 2010 -0700" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Sat Sep 25 09:47:04 2010 +0800" }, "message": "ARM: pxa: remove pr_\u003clevel\u003e uses of KERN_\u003clevel\u003e\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "07a5d146c80b7caa9e754b51f64d3fcbbc74e9c0", "tree": "c55095cdb8a1d846c85c55a74dbde535b7d5ccc6", "parents": [ "cfc6a554d7a364997a43964b4b1290487f890447" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Wed Sep 08 09:42:39 2010 -0400" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Sat Sep 25 09:47:04 2010 +0800" }, "message": "ARM: pxa168fb: clear enable bit when not active\n\nWhile fb isn\u0027t active, we should clear CFG_GRA_ENA bit. The existing code\ncan\u0027t clear this bit.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "cfc6a554d7a364997a43964b4b1290487f890447", "tree": "f9e780f3ec8b791f98085ee82832e11a1d0ba0a4", "parents": [ "32c4dad8f872fadb0ae3caa15d26e73934982217" ], "author": { "name": "Eric Miao", "email": "eric.miao@canonical.com", "time": "Tue Sep 07 15:10:14 2010 +0800" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Sat Sep 25 09:47:03 2010 +0800" }, "message": "ARM: pxa: fix cpu_is_pxa*() not expanding to zero when not configured\n\nWhen CONFIG_PXA3xx is not selected, cpu_is_pxa3xx() doesn\u0027t expand to\nzero, which in some places doesn\u0027t result in correct optimization.\n\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nReported-and-tested-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\n" } ], "next": "32c4dad8f872fadb0ae3caa15d26e73934982217" }