)]}' { "log": [ { "commit": "d80e731ecab420ddcb79ee9d0ac427acbc187b4b", "tree": "e96a660b75b5bee8ae2c315878ec917b9c0da446", "parents": [ "855a85f704026d5fe7de94fb1b765fe03404507f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Feb 24 20:07:11 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 24 11:42:50 2012 -0800" }, "message": "epoll: introduce POLLFREE to flush -\u003esignalfd_wqh before kfree()\n\nThis patch is intentionally incomplete to simplify the review.\nIt ignores ep_unregister_pollwait() which plays with the same wqh.\nSee the next change.\n\nepoll assumes that the EPOLL_CTL_ADD\u0027ed file controls everything\nf_op-\u003epoll() needs. In particular it assumes that the wait queue\ncan\u0027t go away until eventpoll_release(). This is not true in case\nof signalfd, the task which does EPOLL_CTL_ADD uses its -\u003esighand\nwhich is not connected to the file.\n\nThis patch adds the special event, POLLFREE, currently only for\nepoll. It expects that init_poll_funcptr()\u0027ed hook should do the\nnecessary cleanup. Perhaps it should be defined as EPOLLFREE in\neventpoll.\n\n__cleanup_sighand() is changed to do wake_up_poll(POLLFREE) if\n-\u003esignalfd_wqh is not empty, we add the new signalfd_cleanup()\nhelper.\n\nep_poll_callback(POLLFREE) simply does list_del_init(task_list).\nThis make this poll entry inconsistent, but we don\u0027t care. If you\nshare epoll fd which contains our sigfd with another process you\nshould blame yourself. signalfd is \"really special\". I simply do\nnot know how we can define the \"right\" semantics if it used with\nepoll.\n\nThe main problem is, epoll calls signalfd_poll() once to establish\nthe connection with the wait queue, after that signalfd_poll(NULL)\nreturns the different/inconsistent results depending on who does\nEPOLL_CTL_MOD/signalfd_read/etc. IOW: apart from sigmask, signalfd\nhas nothing to do with the file, it works with the current thread.\n\nIn short: this patch is the hack which tries to fix the symptoms.\nIt also assumes that nobody can take tasklist_lock under epoll\nlocks, this seems to be true.\n\nNote:\n\n\t- we do not have wake_up_all_poll() but wake_up_poll()\n\t is fine, poll/epoll doesn\u0027t use WQ_FLAG_EXCLUSIVE.\n\n\t- signalfd_cleanup() uses POLLHUP along with POLLFREE,\n\t we need a couple of simple changes in eventpoll.c to\n\t make sure it can\u0027t be \"lost\".\n\nReported-by: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "45196cee28a5bcfb6ddbe2bffa4270cbed66ae4b", "tree": "1ee61842ac03e05f5fa346b7e2095c7fd80ceabd", "parents": [ "e2d4370b78f52d78e21695abd610a7044268763c", "c6c1e4491dc8d1ed2509fa6aacffa7f34614fc38" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 22 13:00:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 22 13:00:53 2012 -0800" }, "message": "Merge tag \u0027usb-3.3-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nUSB bugfixes for 3.3-rc4\n\nA number of new device ids, and a cleanup/fix for some of the option\ndevice ids that shouldn\u0027t have been added in the first place.\n\nThere\u0027s also a few USB 3 fixes for problems that people have reported,\nand a usb-storage bugfix to round it out.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n* tag \u0027usb-3.3-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:\n USB: Added Kamstrup VID/PIDs to cp210x serial driver.\n USB: Serial: ti_usb_3410_5052: Add Abbot Diabetes Care cable id\n usb-storage: fix freezing of the scanning thread\n xhci: Fix encoding for HS bulk/control NAK rate.\n USB: Set hub depth after USB3 hub reset\n USB: Fix handoff when BIOS disables host PCI device.\n USB: option: cleanup zte 3g-dongle\u0027s pid in option.c\n USB: Don\u0027t fail USB3 probe on missing legacy PCI IRQ.\n xhci: Fix oops caused by more USB2 ports than USB3 ports.\n USB: Remove duplicate USB 3.0 hub feature #defines.\n" }, { "commit": "437cf4c7b7feeca29f74e1e6f8d458ea2623d5e2", "tree": "71ef02369cbbef4523a0cb426809e724b85b723a", "parents": [ "719741d9986572d64b47c35c09f5e7bb8d389400", "abe9a6d57b4544ac208401f9c0a4262814db2be4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 22 08:43:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 22 08:43:35 2012 -0800" }, "message": "Merge tag \u0027nfs-for-3.3-4\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nBugfixes for the NFS client.\n\nFix a nasty Oops in the NFSv4 getacl code, another source of infinite\nloops in the NFSv4 state recovery code, and a regression in NFSv4.1\nsession initialisation.\n\nAlso deal with an NFSv4.1 memory leak.\n\n* tag \u0027nfs-for-3.3-4\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4: fix server_scope memory leak\n NFSv4.1: Fix a NFSv4.1 session initialisation regression\n NFSv4: Ensure we throw out bad delegation stateids on NFS4ERR_BAD_STATEID\n NFSv4: Fix an Oops in the NFSv4 getacl code\n" }, { "commit": "faf309009e2e18d30c032b7d9479f29b91677c37", "tree": "09a22833eaf02886cc1de6ac513aad1143dcf822", "parents": [ "797a796a13df6b84a4791e57306737059b5b2384" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 21 17:24:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 21 17:24:20 2012 -0800" }, "message": "sys_poll: fix incorrect type for \u0027timeout\u0027 parameter\n\nThe \u0027poll()\u0027 system call timeout parameter is supposed to be \u0027int\u0027, not\n\u0027long\u0027.\n\nNow, the reason this matters is that right now 32-bit compat mode is\nbroken on at least x86-64, because the 32-bit code just calls\n\u0027sys_poll()\u0027 directly on x86-64, and the 32-bit argument will have been\nzero-extended, turning a signed \u0027int\u0027 into a large unsigned \u0027long\u0027\nvalue.\n\nWe could just introduce a \u0027compat_sys_poll()\u0027 function for this, and\nthat may eventually be what we have to do, but since the actual standard\npoll() semantics is *supposed* to be \u0027int\u0027, and since at least on x86-64\nglibc sign-extends the argument before invocing the system call (so\nnobody can actually use a 64-bit timeout value in user space _anyway_,\neven in 64-bit binaries), the simpler solution would seem to be to just\nfix the definition of the system call to match what it should have been\nfrom the very start.\n\nIf it turns out that somebody somehow circumvents the user-level libc\n64-bit sign extension and actually uses a large unsigned 64-bit timeout\ndespite that not being how poll() is supposed to work, we will need to\ndo the compat_sys_poll() approach.\n\nReported-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8ebbfb49574818f07a25bc119b1bbdf1c2853a39", "tree": "e7b1ea6c6a3ea522654c685f2f0c9f41466fdcf9", "parents": [ "39e255dab5a993cbebb35598015da1d4a0eb3727", "847c9db5cb50841589b8ebd3da0769b1b02fb3b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 20 16:13:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 20 16:13:58 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nAssorted fixes, sat in -next for a week or so...\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n ocfs2: deal with wraparounds of i_nlink in ocfs2_rename()\n vfs: fix compat_sys_stat() handling of overflows in st_nlink\n quota: Fix deadlock with suspend and quotas\n vfs: Provide function to get superblock and wait for it to thaw\n vfs: fix panic in __d_lookup() with high dentry hashtable counts\n autofs4 - fix lockdep splat in autofs\n vfs: fix d_inode_lookup() dentry ref leak\n" }, { "commit": "59cca653a601372e9b4a430d867377a3e4a36d76", "tree": "865c5d380ee4f6ca8ee146fc7f00273f357a109b", "parents": [ "b01543dfe67bb1d191998e90d20534dc354de059" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@intel.com", "time": "Thu Feb 02 10:46:49 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Feb 20 19:46:36 2012 +1100" }, "message": "digsig: changed type of the timestamp\n\ntime_t was used in the signature and key packet headers,\nwhich is typedef of long and is different on 32 and 64 bit architectures.\nSignature and key format should be independent of architecture.\nSimilar to GPG, I have changed the type to uint32_t.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@intel.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "a18d3afefa0104419b5e069af5922bb57a302426", "tree": "4bcc6010e2eb46d5d40454c4c9276f1ec6c7fd73", "parents": [ "34ddc81a230b15c0e345b6b253049db731499f7e", "f2ea0f5f04c97b48c88edccba52b0682fbe45087" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 18 15:24:05 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 18 15:24:05 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: sha512 - use standard ror64()\n" }, { "commit": "f2ea0f5f04c97b48c88edccba52b0682fbe45087", "tree": "53ee15dd4d1a2122d0e571dc8263353acb54f333", "parents": [ "3a92d687c8015860a19213e3c102cad6b722f83c" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sat Jan 14 21:44:49 2012 +0300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Feb 16 12:12:33 2012 +0800" }, "message": "crypto: sha512 - use standard ror64()\n\nUse standard ror64() instead of hand-written.\nThere is no standard ror64, so create it.\n\nThe difference is shift value being \"unsigned int\" instead of uint64_t\n(for which there is no reason). gcc starts to emit native ROR instructions\nwhich it doesn\u0027t do for some reason currently. This should make the code\nfaster.\n\nPatch survives in-tree crypto test and ping flood with hmac(sha512) on.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "6b6dc836a195e077e76977b6c020a73de411b46d", "tree": "59920a3aab6db4997f6b7a95c753219bdc12bd64", "parents": [ "074b85175a43a23fdbde60f55feea636e0bf0f85" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Feb 10 11:03:00 2012 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Feb 13 20:45:38 2012 -0500" }, "message": "vfs: Provide function to get superblock and wait for it to thaw\n\nIn quota code we need to find a superblock corresponding to a device and wait\nfor superblock to be unfrozen. However this waiting has to happen without\ns_umount semaphore because that is required for superblock to thaw. So provide\na function in VFS for this to keep dances with s_umount where they belong.\n\n[AV: implementation switched to saner variant]\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f9c2a0dc42a6938ff2a80e55ca2bbd1d5581c72e", "tree": "63eacf347f6e4ef5a9e573d9e972c5de3cd8c733", "parents": [ "18ee684b8ab666329e0a0a72d8b70f16fb0e2243" ], "author": { "name": "Seungwon Jeon", "email": "tgih.jun@samsung.com", "time": "Thu Feb 09 14:32:43 2012 +0900" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Mon Feb 13 20:39:05 2012 -0500" }, "message": "mmc: dw_mmc: Fix PIO mode with support of highmem\n\nCurrent PIO mode makes a kernel crash with CONFIG_HIGHMEM.\nHighmem pages have a NULL from sg_virt(sg).\nThis patch fixes the following problem.\n\nUnable to handle kernel NULL pointer dereference at virtual address 00000000\npgd \u003d c0004000\n[00000000] *pgd\u003d00000000\nInternal error: Oops: 817 [#1] PREEMPT SMP\nModules linked in:\nCPU: 0 Not tainted (3.0.15-01423-gdbf465f #589)\nPC is at dw_mci_pull_data32+0x4c/0x9c\nLR is at dw_mci_read_data_pio+0x54/0x1f0\npc : [\u003cc0358824\u003e] lr : [\u003cc035988c\u003e] psr: 20000193\nsp : c0619d48 ip : c0619d70 fp : c0619d6c\nr10: 00000000 r9 : 00000002 r8 : 00001000\nr7 : 00000200 r6 : 00000000 r5 : e1dd3100 r4 : 00000000\nr3 : 65622023 r2 : 0000007f r1 : eeb96000 r0 : e1dd3100\nFlags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment\nxkernel\nControl: 10c5387d Table: 61e2004a DAC: 00000015\nProcess swapper (pid: 0, stack limit \u003d 0xc06182f0)\nStack: (0xc0619d48 to 0xc061a000)\n9d40: e1dd3100 e1a4f000 00000000 e1dd3100 e1a4f000 00000200\n9d60: c0619da4 c0619d70 c035988c c03587e4 c0619d9c e18158f4 e1dd3100 e1dd3100\n9d80: 00000020 00000000 00000000 00000020 c06e8a84 00000000 c0619e04 c0619da8\n9da0: c0359b24 c0359844 e18158f4 e1dd3164 e1dd3168 e1dd3150 3d02fc79 e1dd3154\n9dc0: e1dd3178 00000000 00000020 00000000 e1dd3150 00000000 c10dd7e8 e1a84900\n9de0: c061e7cc 00000000 00000000 0000008d c06e8a84 c061e780 c0619e4c c0619e08\n9e00: c00c4738 c0359a34 3d02fc79 00000000 c0619e4c c05a1698 c05a1670 c05a165c\n9e20: c04de8b0 c061e780 c061e7cc e1a84900 ffffed68 0000008d c0618000 00000000\n9e40: c0619e6c c0619e50 c00c48b4 c00c46c8 c061e780 c00423ac c061e7cc ffffed68\n9e60: c0619e8c c0619e70 c00c7358 c00c487c 0000008d ffffee38 c0618000 ffffed68\n9e80: c0619ea4 c0619e90 c00c4258 c00c72b0 c00423ac ffffee38 c0619ecc c0619ea8\n9ea0: c004241c c00c4234 ffffffff f8810000 0000006d 00000002 00000001 7fffffff\n9ec0: c0619f44 c0619ed0 c0048bc0 c00423c4 220ae7a9 00000000 386f0d30 0005d3a4\n9ee0: c00423ac c10dd0b8 c06f2cd8 c0618000 c0594778 c003a674 7fffffff c0619f44\n9f00: 386f0d30 c0619f18 c00a6f94 c005be3c 80000013 ffffffff 386f0d30 0005d3a4\n9f20: 386f0d30 0005d2d1 c10dd0a8 c10dd0b8 c06f2cd8 c0618000 c0619f74 c0619f48\n9f40: c0345858 c005be00 c00a2440 c0618000 c0618000 c00410d8 c06c1944 c00410fc\n9f60: c0594778 c003a674 c0619f9c c0619f78 c004a7e8 c03457b4 c0618000 c06c18f8\n9f80: 00000000 c0039c70 c06c18d4 c003a674 c0619fb4 c0619fa0 c04ceafc c004a714\n9fa0: c06287b4 c06c18f8 c0619ff4 c0619fb8 c0008b68 c04cea68 c0008578 00000000\n9fc0: 00000000 c003a674 00000000 10c5387d c0628658 c003aa78 c062f1c4 4000406a\n9fe0: 413fc090 00000000 00000000 c0619ff8 40008044 c0008858 00000000 00000000\nBacktrace:\n[\u003cc03587d8\u003e] (dw_mci_pull_data32+0x0/0x9c) from [\u003cc035988c\u003e] (dw_mci_read_data_pio+0x54/0x1f0)\n r6:00000200 r5:e1a4f000 r4:e1dd3100\n [\u003cc0359838\u003e] (dw_mci_read_data_pio+0x0/0x1f0) from [\u003cc0359b24\u003e] (dw_mci_interrupt+0xfc/0x4a4)\n[\u003cc0359a28\u003e] (dw_mci_interrupt+0x0/0x4a4) from [\u003cc00c4738\u003e] (handle_irq_event_percpu+0x7c/0x1b4)\n[\u003cc00c46bc\u003e] (handle_irq_event_percpu+0x0/0x1b4) from [\u003cc00c48b4\u003e] (handle_irq_event+0x44/0x64)\n[\u003cc00c4870\u003e] (handle_irq_event+0x0/0x64) from [\u003cc00c7358\u003e] (handle_fasteoi_irq+0xb4/0x124)\n r7:ffffed68 r6:c061e7cc r5:c00423ac r4:c061e780\n [\u003cc00c72a4\u003e] (handle_fasteoi_irq+0x0/0x124) from [\u003cc00c4258\u003e] (generic_handle_irq+0x30/0x38)\n r7:ffffed68 r6:c0618000 r5:ffffee38 r4:0000008d\n [\u003cc00c4228\u003e] (generic_handle_irq+0x0/0x38) from [\u003cc004241c\u003e] (asm_do_IRQ+0x64/0xe0)\n r5:ffffee38 r4:c00423ac\n [\u003cc00423b8\u003e] (asm_do_IRQ+0x0/0xe0) from [\u003cc0048bc0\u003e] (__irq_svc+0x80/0x14c)\nException stack(0xc0619ed0 to 0xc0619f18)\n\nSigned-off-by: Seungwon Jeon \u003ctgih.jun@samsung.com\u003e\nAcked-by: Will Newton \u003cwill.newton@imgtec.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "3e73c36b4dc224529d0b0c0d5d69c0dacd793c42", "tree": "9c6df98a296ca4865db3621f0bc295d687272f66", "parents": [ "012e4671e445ac1dd04f40c0b974685280bedca3" ], "author": { "name": "Girish K S", "email": "girish.shivananjappa@linaro.org", "time": "Tue Jan 31 15:44:03 2012 +0530" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Mon Feb 13 20:39:02 2012 -0500" }, "message": "mmc: core: Fix PowerOff Notify suspend/resume\n\nModified the mmc_poweroff to resume before sending the poweroff\nnotification command. In sleep mode only AWAKE and RESET commands are\nallowed, so before sending the poweroff notification command resume from\nsleep mode and then send the notification command.\n\nPowerOff Notify is tested on a Synopsis Designware Host Controller\n(eMMC 4.5). The suspend to RAM and resume works fine.\n\nSigned-off-by: Girish K S \u003cgirish.shivananjappa@linaro.org\u003e\nTested-by: Girish K S \u003cgirish.shivananjappa@linaro.org\u003e\nReviewed-by: Saugata Das \u003csaugata.das@linaro.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "6e8201f57c9359c9c5dc8f9805c15a4392492a10", "tree": "c936936d165e2fd134d657e569754460acebb26e", "parents": [ "7488e924b55002e70f6d8d181f146edac3006b9f" ], "author": { "name": "Jaehoon Chung", "email": "jh80.chung@samsung.com", "time": "Mon Jan 16 17:49:01 2012 +0900" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Mon Feb 13 20:39:01 2012 -0500" }, "message": "mmc: core: add the capability for broken voltage\n\nThere is an understood mismatch between the voltage the host controller is\nset to and the voltage supplied to the card by a fixed voltage regulator.\nTeaching the driver to accept the mismatch is overly complicated. Instead\njust accept the regulator\u0027s voltage.\n\nThis patch adds MMC_CAP2_BROKEN_VOLTAGE.\n\nIf the voltage didn\u0027t satisfy between min_uV and max_uV, try to change\nthe voltage in core.c. When changing the voltage, maybe use\nregulator_set_voltage().\n\nIn regulator_set_voltage(), check the below condition.\n\n\t/* sanity check */\n\tif (!rdev-\u003edesc-\u003eops-\u003eset_voltage \u0026\u0026\n\t !rdev-\u003edesc-\u003eops-\u003eset_voltage_sel) {\n\t\tret \u003d -EINVAL;\n\t\tgoto out;\n\t}\n\nIf some board should use the fixed-regulator, always return -EINVAL.\nThen, eMMC didn\u0027t initialize always.\n\nSo if use a fixed-regulator, we need to add the MMC_CAP2_BROKEN_VOLTAGE.\n\nSigned-off-by: Jaehoon Chung \u003cjh80.chung@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "2c4967f741e87cdd63de7271b97807041dccbf3b", "tree": "e9792b49e457393d275db4ab3948fa95f1ef57d6", "parents": [ "b6bf30d912ddc9a3ac2ce264a04e3ec6d4e74a34" ], "author": { "name": "Sujit Reddy Thumma", "email": "sthumma@codeaurora.org", "time": "Sat Feb 04 16:14:50 2012 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Mon Feb 13 20:38:58 2012 -0500" }, "message": "mmc: core: Ensure clocks are always enabled before host interaction\n\nEnsure clocks are always enabled before any interaction with the\nhost controller driver. This makes sure that there is no race\nbetween host execution and the core layer turning off clocks\nin different context with clock gating framework.\n\nSigned-off-by: Sujit Reddy Thumma \u003csthumma@codeaurora.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Per Forlin \u003cper.forlin@stericsson.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "3ec1e88b33a3bdd852ce8e014052acec7a9da8b5", "tree": "4270f8f0de4e28f090cba6d6e4047aae939d6463", "parents": [ "8df54d622a120058ee8bec38743c9b8f091c8e58", "d8c66c5d59247e25a69428aced0b79d33b9c66d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nSays Jens:\n\n \"Time to push off some of the pending items. I really wanted to wait\n until we had the regression nailed, but alas it\u0027s not quite there yet.\n But I\u0027m very confident that it\u0027s \"just\" a missing expire on exit, so\n fix from Tejun should be fairly trivial. I\u0027m headed out for a week on\n the slopes.\n\n - Killing the barrier part of mtip32xx. It doesn\u0027t really support\n barriers, and it doesn\u0027t need them (writes are fully ordered).\n\n - A few fixes from Dan Carpenter, preventing overflows of integer\n multiplication.\n\n - A fixup for loop, fixing a previous commit that didn\u0027t quite solve\n the partial read problem from Dave Young.\n\n - A bio integer overflow fix from Kent Overstreet.\n\n - Improvement/fix of the door \"keep locked\" part of the cdrom shared\n code from Paolo Benzini.\n\n - A few cfq fixes from Shaohua Li.\n\n - A fix for bsg sysfs warning when removing a file it did not create\n from Stanislaw Gruszka.\n\n - Two fixes for floppy from Vivek, preventing a crash.\n\n - A few block core fixes from Tejun. One killing the over-optimized\n ioc exit path, cleaning that up nicely. Two others fixing an oops\n on elevator switch, due to calling into the scheduler merge check\n code without holding the queue lock.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: fix lockdep warning on io_context release put_io_context()\n relay: prevent integer overflow in relay_open()\n loop: zero fill bio instead of return -EIO for partial read\n bio: don\u0027t overflow in bio_get_nr_vecs()\n floppy: Fix a crash during rmmod\n floppy: Cleanup disk-\u003equeue before caling put_disk() if add_disk() was never called\n cdrom: move shared static to cdrom_device_info\n bsg: fix sysfs link remove warning\n block: don\u0027t call elevator callbacks for plug merges\n block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions\n mtip32xx: removed the irrelevant argument of mtip_hw_submit_io() and the unused member of struct driver_data\n block: strip out locking optimization in put_io_context()\n cdrom: use copy_to_user() without the underscores\n block: fix ioc locking warning\n block: fix NULL icq_cache reference\n block,cfq: change code order\n" }, { "commit": "d9f5343e35d9138432657202afa8e3ddb2ade360", "tree": "113835295efcfd8edbcb7dc052181deca7e4d8ff", "parents": [ "fe250923bbbbcbccc9aa7b84d05ee7a060450534" ], "author": { "name": "Sarah Sharp", "email": "sarah.a.sharp@linux.intel.com", "time": "Thu Jan 05 16:28:54 2012 -0800" }, "committer": { "name": "Sarah Sharp", "email": "sarah.a.sharp@linux.intel.com", "time": "Fri Feb 10 14:24:31 2012 -0800" }, "message": "USB: Remove duplicate USB 3.0 hub feature #defines.\n\nSomehow we ended up with duplicate hub feature #defines in ch11.h.\nTatyana Brokhman first created the USB 3.0 hub feature macros in 2.6.38\nwith commit 0eadcc09203349b11ca477ec367079b23d32ab91 \"usb: USB3.0 ch11\ndefinitions\". In 2.6.39, I modified a patch from John Youn that added\nsimilar macros in a different place in the same file, and committed\ndbe79bbe9dcb22cb3651c46f18943477141ca452 \"USB 3.0 Hub Changes\".\n\nSome of the #defines used different names for the same values. Others\nused exactly the same names with the same values, like these gems:\n\n #define USB_PORT_FEAT_BH_PORT_RESET 28\n...\n #define USB_PORT_FEAT_BH_PORT_RESET 28\n\nAccording to my very geeky husband (who looked it up in the C99 spec),\nit is allowed to have object-like macros with duplicate names as long as\nthe replacement list is exactly the same. However, he recalled that\nsome compilers will give warnings when they find duplicate macros. It\u0027s\nprobably best to remove the duplicates in the stable tree, so that the\ncode compiles for everyone.\n\nThe macros are now fixed to move the feature requests that are specific\nto USB 3.0 hubs into a new section (out of the USB 2.0 hub feature\nsection), and use the most common macro name.\n\nThis patch should be backported to 2.6.39.\n\nSigned-off-by: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\nCc: Tatyana Brokhman \u003ctlinder@codeaurora.org\u003e\nCc: John Youn \u003cjohnyoun@synopsys.com\u003e\nCc: Jamey Sharp \u003cjamey@minilop.net\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "8df54d622a120058ee8bec38743c9b8f091c8e58", "tree": "559dc9788cff370bed7b36d61f77708ff4efbaa7", "parents": [ "612b8507c5d545feed2437b3d2239929cac7688d", "70620c46ac2b45c24b0f22002fdf5ddd1f7daf81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 14:18:46 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 14:18:46 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nQuoth David:\n\n1) GRO MAC header comparisons were ethernet specific, breaking other\n link types. This required a multi-faceted fix to cure the originally\n noted case (Infiniband), because IPoIB was lying about it\u0027s actual\n hard header length. Thanks to Eric Dumazet, Roland Dreier, and\n others.\n\n2) Fix build failure when INET_UDP_DIAG is built in and ipv6 is modular.\n From Anisse Astier.\n\n3) Off by ones and other bug fixes in netprio_cgroup from Neil Horman.\n\n4) ipv4 TCP reset generation needs to respect any network interface\n binding from the socket, otherwise route lookups might give a\n different result than all the other segments received. From Shawn\n Lu.\n\n5) Fix unintended regression in ipv4 proxy ARP responses, from Thomas\n Graf.\n\n6) Fix SKB under-allocation bug in sh_eth, from Yoshihiro Shimoda.\n\n7) Revert skge PCI mapping changes that are causing crashes for some\n folks, from Stephen Hemminger.\n\n8) IPV4 route lookups fill in the wildcarded fields of the given flow\n lookup key passed in, which is fine most of the time as this is\n exactly what the caller\u0027s want. However there are a few cases that\n want to retain the original flow key values afterwards, so handle\n those cases properly. Fix from Julian Anastasov.\n\n9) IGB/IXGBE VF lookup bug fixes from Greg Rose.\n\n10) Properly null terminate filename passed to ethtool flash device\n method, from Ben Hutchings.\n\n11) S3 resume fix in via-velocity from David Lv.\n\n12) Fix double SKB free during xmit failure in CAIF, from Dmitry\n Tarnyagin.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (72 commits)\n net: Don\u0027t proxy arp respond if iif \u003d\u003d rt-\u003edst.dev if private VLAN is disabled\n ipv4: Fix wrong order of ip_rt_get_source() and update iph-\u003edaddr.\n netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP\u003dm\n netprio_cgroup: don\u0027t allocate prio table when a device is registered\n netprio_cgroup: fix an off-by-one bug\n bna: fix error handling of bnad_get_flash_partition_by_offset()\n isdn: type bug in isdn_net_header()\n net: Make qdisc_skb_cb upper size bound explicit.\n ixgbe: ethtool: stats user buffer overrun\n ixgbe: dcb: up2tc mapping lost on disable/enable CEE DCB state\n ixgbe: do not update real num queues when netdev is going away\n ixgbe: Fix broken dependency on MAX_SKB_FRAGS being related to page size\n ixgbe: Fix case of Tx Hang in PF with 32 VFs\n ixgbe: fix vf lookup\n igb: fix vf lookup\n e1000: add dropped DMA receive enable back in for WoL\n gro: more generic L2 header check\n IPoIB: Stop lying about hard_header_len and use skb-\u003ecb to stash LL addresses\n zd1211rw: firmware needs duration_id set to zero for non-pspoll frames\n net: enable TC35815 for MIPS again\n ...\n" }, { "commit": "af5feae3d7e821d8c4d38103a7f53146f2590892", "tree": "9017bb0661fb617177534f0617c3771d89e31afc", "parents": [ "ce2814f227d3adae8456f7cbd0bd5f922fd284f0", "977b7e3a52a7421ad33a393a38ece59f3d41c2fa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 09:05:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 09:05:52 2012 -0800" }, "message": "Merge tag \u0027writeback-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\nfix 1 mysterious divide error\nfix 3 NULL dereference bugs in writeback tracing, on SD card removal w/o umount\n\n* tag \u0027writeback-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: fix dereferencing NULL bdi-\u003edev on trace_writeback_queue\n lib: proportion: lower PROP_MAX_SHIFT to 32 on 64-bit kernel\n writeback: fix NULL bdi-\u003edev in trace writeback_single_inode\n backing-dev: fix wakeup timer races with bdi_unregister()\n" }, { "commit": "fe250923bbbbcbccc9aa7b84d05ee7a060450534", "tree": "ece7eb383ca568dd7480a50827ec6e65f4fbb562", "parents": [ "690d137f448d4c4da9001871e6569d5636f116c7", "90451e6973a5da155c6f315a409ca0a8d3ce6b76" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:50:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 09 13:50:54 2012 -0800" }, "message": "Merge tag \u0027usb-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nUSB fixes for 3.3-rc3\n\nHere are a few minor USB fixes and a bunch of device id updates for the\nUSB drivers.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n* tag \u0027usb-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:\n USB: usbserial: add new PID number (0xa951) to the ftdi driver\n usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()\n usb: musb: fix a build error on mips\n uwb \u0026 wusb \u0026 usb wireless controllers: fix kconfig error \u0026 build errors\n usb: Skip PCI USB quirk handling for Netlogic XLP\n powerpc/usb: fix issue of CPU halt when missing USB PHY clock\n usb: otg: mv_otg: Add dependence\n usb: host: Distinguish Kconfig text for Freescale controllers\n USB: add new zte 3g-dongle\u0027s pid to option.c\n usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()\n USB: qcserial: don\u0027t enable autosuspend\n USB: qcserial: add several new serial devices\n usb: otg: mv_otg: Add dependence\n usb: gadget: zero: fix bug in loopback autoresume handling\n" }, { "commit": "cdccaa9467b982d57b139818d15e1e994feca372", "tree": "573e6aa79bce8105b3a2508a462d03368ac5214c", "parents": [ "37b40adf2d1b4a5e51323be73ccf8ddcf3f15dd3" ], "author": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Wed Feb 08 20:03:14 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Feb 08 20:03:14 2012 +0100" }, "message": "cdrom: move shared static to cdrom_device_info\n\nThe keeplocked variable in the cdrom driver is shared across multiple\ndrives, but set in per-device ioctls. Move it to the per-device struct,\navoiding that the setting on one drive affects the driver\u0027s behavior\nwhen closing another.\n\n[ Impact: limit udev\u0027s confusion to one drive when a CD burning program\n unlocks the CD door at the end of burning. ]\n\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "07c2bd37350c9b1af71b35d05f16e300a6602948", "tree": "e45ee2952fb78d6d8f2372c8ea1f854da825fa90", "parents": [ "050c8ea80e3e90019d9e981c6a117ef614e882ed" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 08 09:19:42 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Feb 08 09:19:42 2012 +0100" }, "message": "block: don\u0027t call elevator callbacks for plug merges\n\nPlug merge calls two elevator callbacks outside queue lock -\nelevator_allow_merge_fn() and elevator_bio_merged_fn(). Although\nattempt_plug_merge() suggests that elevator is guaranteed to be there\nthrough the existing request on the plug list, nothing prevents plug\nmerge from calling into dying or initializing elevator.\n\nFor regular merges, bypass ensures elvpriv count to reach zero, which\nin turn prevents merges as all !ELVPRIV requests get REQ_SOFTBARRIER\nfrom forced back insertion. Plug merge doesn\u0027t check ELVPRIV, and, as\nthe requests haven\u0027t gone through elevator insertion yet, it doesn\u0027t\nhave SOFTBARRIER set allowing merges on a bypassed queue.\n\nThis, for example, leads to the following crash during elevator\nswitch.\n\n BUG: unable to handle kernel NULL pointer dereference at 0000000000000008\n IP: [\u003cffffffff813b34e9\u003e] cfq_allow_merge+0x49/0xa0\n PGD 112cbc067 PUD 115d5c067 PMD 0\n Oops: 0000 [#1] PREEMPT SMP\n CPU 1\n Modules linked in: deadline_iosched\n\n Pid: 819, comm: dd Not tainted 3.3.0-rc2-work+ #76 Bochs Bochs\n RIP: 0010:[\u003cffffffff813b34e9\u003e] [\u003cffffffff813b34e9\u003e] cfq_allow_merge+0x49/0xa0\n RSP: 0018:ffff8801143a38f8 EFLAGS: 00010297\n RAX: 0000000000000000 RBX: ffff88011817ce28 RCX: ffff880116eb6cc0\n RDX: 0000000000000000 RSI: ffff880118056e20 RDI: ffff8801199512f8\n RBP: ffff8801143a3908 R08: 0000000000000000 R09: 0000000000000000\n R10: 0000000000000001 R11: 0000000000000000 R12: ffff880118195708\n R13: ffff880118052aa0 R14: ffff8801143a3d50 R15: ffff880118195708\n FS: 00007f19f82cb700(0000) GS:ffff88011fc80000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 0000000000000008 CR3: 0000000112c6a000 CR4: 00000000000006e0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process dd (pid: 819, threadinfo ffff8801143a2000, task ffff880116eb6cc0)\n Stack:\n ffff88011817ce28 ffff880118195708 ffff8801143a3928 ffffffff81391bba\n ffff88011817ce28 ffff880118195708 ffff8801143a3948 ffffffff81391bf1\n ffff88011817ce28 0000000000000000 ffff8801143a39a8 ffffffff81398e3e\n Call Trace:\n [\u003cffffffff81391bba\u003e] elv_rq_merge_ok+0x4a/0x60\n [\u003cffffffff81391bf1\u003e] elv_try_merge+0x21/0x40\n [\u003cffffffff81398e3e\u003e] blk_queue_bio+0x8e/0x390\n [\u003cffffffff81396a5a\u003e] generic_make_request+0xca/0x100\n [\u003cffffffff81396b04\u003e] submit_bio+0x74/0x100\n [\u003cffffffff811d45c2\u003e] __blockdev_direct_IO+0x1ce2/0x3450\n [\u003cffffffff811d0dc7\u003e] blkdev_direct_IO+0x57/0x60\n [\u003cffffffff811460b5\u003e] generic_file_aio_read+0x6d5/0x760\n [\u003cffffffff811986b2\u003e] do_sync_read+0xe2/0x120\n [\u003cffffffff81199345\u003e] vfs_read+0xc5/0x180\n [\u003cffffffff81199501\u003e] sys_read+0x51/0x90\n [\u003cffffffff81aeac12\u003e] system_call_fastpath+0x16/0x1b\n\nThere are multiple ways to fix this including making plug merge check\nELVPRIV; however,\n\n* Calling into elevator outside queue lock is confusing and\n error-prone.\n\n* Requests on plug list aren\u0027t known to the elevator. They aren\u0027t on\n the elevator yet, so there\u0027s no elevator specific state to update.\n\n* Given the nature of plug merges - collecting bio\u0027s for the same\n purpose from the same issuer - elevator specific restrictions aren\u0027t\n applicable.\n\nSo, simply don\u0027t call into elevator methods from plug merge by moving\nelv_bio_merged() from bio_attempt_*_merge() to blk_queue_bio(), and\nusing blk_try_merge() in attempt_plug_merge().\n\nThis is based on Jens\u0027 patch to skip elevator_allow_merge_fn() from\nplug merge.\n\nNote that this makes per-cgroup merged stats skip plug merging.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLKML-Reference: \u003c4F16F3CA.90904@kernel.dk\u003e\nOriginal-patch-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "050c8ea80e3e90019d9e981c6a117ef614e882ed", "tree": "e1c53f17a93ba48b9aedb0c1560dfb022733845f", "parents": [ "4e8670e26135d8fbfd5e084fddc1a8ed9f8eb4cb" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 08 09:19:38 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Feb 08 09:19:38 2012 +0100" }, "message": "block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions\n\nblk_rq_merge_ok() is the elevator-neutral part of merge eligibility\ntest. blk_try_merge() determines merge direction and expects the\ncaller to have tested elv_rq_merge_ok() previously.\n\nelv_rq_merge_ok() now wraps blk_rq_merge_ok() and then calls\nelv_iosched_allow_merge(). elv_try_merge() is removed and the two\ncallers are updated to call elv_rq_merge_ok() explicitly followed by\nblk_try_merge(). While at it, make rq_merge_ok() functions return\nbool.\n\nThis is to prepare for plug merge update and doesn\u0027t introduce any\nbehavior change.\n\nThis is based on Jens\u0027 patch to skip elevator_allow_merge_fn() from\nplug merge.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLKML-Reference: \u003c4F16F3CA.90904@kernel.dk\u003e\nOriginal-patch-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "abaaf3e12c74ef39c8ba185c485f63274264cb0f", "tree": "72851a2095cadb38473c1460a31942403daa2e4b", "parents": [ "71ea4efe4fc3319ab577be00d1bbcb76d3ffaf63", "2bd05db718cf452fe235c7c08083b2e60f787f3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:05:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 07 14:05:49 2012 -0800" }, "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: Avoid twl6040-codec PLL reconfiguration when not needed\n mfd: Store twl6040-codec mclk configuration\n" }, { "commit": "11a3122f6cf2d988a77eb8883d0fc49cd013a6d5", "tree": "ded8ea8a2982754ff0c58448a7ed2e59487104cb", "parents": [ "822bfa51ce44f2c63c300fdb76dc99c4d5a5ca9f" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Feb 07 07:51:30 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Feb 07 07:51:30 2012 +0100" }, "message": "block: strip out locking optimization in put_io_context()\n\nput_io_context() performed a complex trylock dancing to avoid\ndeferring ioc release to workqueue. It was also broken on UP because\ntrylock was always assumed to succeed which resulted in unbalanced\npreemption count.\n\nWhile there are ways to fix the UP breakage, even the most\npathological microbench (forced ioc allocation and tight fork/exit\nloop) fails to show any appreciable performance benefit of the\noptimization. Strip it out. If there turns out to be workloads which\nare affected by this change, simpler optimization from the discussion\nthread can be applied later.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLKML-Reference: \u003c1328514611.21268.66.camel@sli10-conroe\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "96e02d1586782eadf051fa3d6bc4132d2447ac2c", "tree": "dd40e6302d2770d3c51cced64cfd3b8cf1355da4", "parents": [ "23783f817bceedd6d4e549385e3f400ea64059e5" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Sat Feb 04 10:47:10 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 06 15:15:20 2012 -0800" }, "message": "exec: fix use-after-free bug in setup_new_exec()\n\nSetting the task name is done within setup_new_exec() by accessing\nbprm-\u003efilename. However this happens after flush_old_exec().\nThis may result in a use after free bug, flush_old_exec() may\n\"complete\" vfork_done, which will wake up the parent which in turn\nmay free the passed in filename.\nTo fix this add a new tcomm field in struct linux_binprm which\ncontains the now early generated task name until it is used.\n\nFixes this bug on s390:\n\n Unable to handle kernel pointer dereference at virtual kernel address 0000000039768000\n Process kworker/u:3 (pid: 245, task: 000000003a3dc840, ksp: 0000000039453818)\n Krnl PSW : 0704000180000000 0000000000282e94 (setup_new_exec+0xa0/0x374)\n Call Trace:\n ([\u003c0000000000282e2c\u003e] setup_new_exec+0x38/0x374)\n [\u003c00000000002dd12e\u003e] load_elf_binary+0x402/0x1bf4\n [\u003c0000000000280a42\u003e] search_binary_handler+0x38e/0x5bc\n [\u003c0000000000282b6c\u003e] do_execve_common+0x410/0x514\n [\u003c0000000000282cb6\u003e] do_execve+0x46/0x58\n [\u003c00000000005bce58\u003e] kernel_execve+0x28/0x70\n [\u003c000000000014ba2e\u003e] ____call_usermodehelper+0x102/0x140\n [\u003c00000000005bc8da\u003e] kernel_thread_starter+0x6/0xc\n [\u003c00000000005bc8d4\u003e] kernel_thread_starter+0x0/0xc\n Last Breaking-Event-Address:\n [\u003c00000000002830f0\u003e] setup_new_exec+0x2fc/0x374\n\n Kernel panic - not syncing: Fatal exception: panic_on_oops\n\nReported-by: Sebastian Ott \u003csebott@linux.vnet.ibm.com\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "23783f817bceedd6d4e549385e3f400ea64059e5", "tree": "db770bd3d7b9264e0f5ed614d9c570d729caf8de", "parents": [ "d9142025f55973149a854c97e860fff61ed05b37", "d020283dc694c9ec31b410f522252f7a8397e67d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 15:21:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 15:21:39 2012 -0800" }, "message": "Merge tag \u0027pm-fixes-for-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPower management fixes for 3.3-rc3\n\nThree power management regression fixes, one for a recent regression introcuded\nby the freezer changes during the 3.3 merge window and two for regressions\nin cpuidle (resulting from PM QoS changes) and in the hibernate user space\ninterface, both introduced during the 3.2 development cycle.\n\nThey include:\n\n* Two hibernate (s2disk) regression fixes from Srivatsa S. Bhat (for\n regressions introduced during the 3.3 merge window and during the 3.2\n development cycle).\n\n* A cpuidle fix from Venki Pallipadi for a regression resulting from PM QoS\n changes during the 3.2 development cycle causing cpuidle to work incorrectly\n for CONFIG_PM unset.\n\n* tag \u0027pm-fixes-for-3.3-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / QoS: CPU C-state breakage with PM Qos change\n PM / Freezer: Thaw only kernel threads if freezing of kernel threads fails\n PM / Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path\n" }, { "commit": "d020283dc694c9ec31b410f522252f7a8397e67d", "tree": "50ffaf8d59d5f7951f09f7b61eac584f64b7ad96", "parents": [ "379e0be812ab8a2a351e784b0c987788f5123090" ], "author": { "name": "Venkatesh Pallipadi", "email": "venki@google.com", "time": "Fri Feb 03 22:22:25 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Feb 04 22:23:17 2012 +0100" }, "message": "PM / QoS: CPU C-state breakage with PM Qos change\n\nLooks like change \"PM QoS: Move and rename the implementation files\"\nmerged during the 3.2 development cycle made PM QoS depend on\nCONFIG_PM which depends on (PM_SLEEP || PM_RUNTIME).\n\nThat breaks CPU C-states with kernels not having these CONFIGs, causing CPUs\nto spend time in Polling loop idle instead of going into deep C-states,\nconsuming way way more power. This is with either acpi idle or intel idle\nenabled.\n\nEither CONFIG_PM should be enabled with any pm_qos users or\nthe !CONFIG_PM pm_qos_request() should return sane defaults not to break\nthe existing users. Here\u0027s is the patch for the latter option.\n\n[rjw: Modified the changelog slightly.]\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "31c150a11c867da233a7b5e13b45bcbd3a796bde", "tree": "58202fc8e93833f3ea3e52f9cb0093e61265d73d", "parents": [ "4554c135a0a017f4cd96f7c0612cb7ca78c68d08", "82b982c9a697e7be0745523a53334fe38a4582c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:57:42 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:57:42 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: i8042 - add Lenovo Ideapad U455 to \u0027reset\u0027 blacklist\n Input: serio_raw - return proper result when serio_raw_read fails\n Input: document device properties\n Input: twl4030_keypad - fix comment (trivial)\n Input: gpio_keys - fix struct device declared inside parameter list\n Input: evdev - fix variable initialisation\n" }, { "commit": "4554c135a0a017f4cd96f7c0612cb7ca78c68d08", "tree": "7233d0c493223fb3769c4dd0668bd8da4fd02241", "parents": [ "82bdc843c2be0ce199e8e247dfb2a17248cbd6c4", "94ac27a54be6a14948f0a9b3f542b4ff1faac232" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:54:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 10:54:26 2012 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n i.MX SDMA: Fix burstsize settings\n ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only\n dma: sh_dma: not all SH DMAC implementations support MEMCPY\n at_hdmac: bugfix for enabling channel irq\n dmaengine: fix missing \u0027cnt\u0027 in ?: in dmatest\n" }, { "commit": "71b1b20b8aea6ba4a1a15736409f1261d8dfe1da", "tree": "494acfa3fee2b77ee6104fc623f760c7253d3ccb", "parents": [ "d12566674c2d8d1275e197c01b44b481de42eda9", "500823195d0c9eec2a4637484f30cc93ec633d4a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 07:17:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 04 07:17:47 2012 -0800" }, "message": "Merge tag \u0027for-linus-3.3\u0027 of git://git.infradead.org/~dwmw2/mtd-3.3\n\n - Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1\n - Fix breakage with MTD suspend caused by the API rework\n - Fix a problem with resetting the MX28 BCH module\n - A couple of other trivial fixes\n\n* tag \u0027for-linus-3.3-20120204\u0027 of git://git.infradead.org/~dwmw2/mtd-3.3:\n Revert \"mtd: atmel_nand: optimize read/write buffer functions\"\n mtd: fix MTD suspend\n jffs2: do not initialize variable unnecessarily\n mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23\n mtd: nand: fix typo in comment\n" }, { "commit": "331818f1c468a24e581aedcbe52af799366a9dfe", "tree": "9bdbc52833c576e21e83d457d350b5db931ebade", "parents": [ "7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Feb 03 18:30:53 2012 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Feb 03 18:50:34 2012 -0500" }, "message": "NFSv4: Fix an Oops in the NFSv4 getacl code\n\nCommit bf118a342f10dafe44b14451a1392c3254629a1f (NFSv4: include bitmap\nin nfsv4 get acl data) introduces the \u0027acl_scratch\u0027 page for the case\nwhere we may need to decode multi-page data. However it fails to take\ninto account the fact that the variable may be NULL (for the case where\nwe\u0027re not doing multi-page decode), and it also attaches it to the\nencoding xdr_stream rather than the decoding one.\n\nThe immediate result is an Oops in nfs4_xdr_enc_getacl due to the\ncall to page_address() with a NULL page pointer.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Andy Adamson \u003candros@netapp.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "f8447d6c213273b444c81eaa2449f55510229d4f", "tree": "b5d7bcb01c892cfdf2b00215e12d2ad10b1d4003", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Sat Jan 14 20:58:43 2012 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Feb 03 19:03:44 2012 +0100" }, "message": "mfd: Store twl6040-codec mclk configuration\n\nStore the last used mclk configuration for the PLL.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "ff05f603c3238010769787f3ba54c48c290ed3e5", "tree": "7acaeb29f5d5b10c6fdb3727e61c42143de18737", "parents": [ "8cdb878dcb359fd1137e9abdee9322f5e9bcfdf8" ], "author": { "name": "Josh Triplett", "email": "josh@joshtriplett.org", "time": "Thu Feb 02 15:29:08 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 15:43:40 2012 -0800" }, "message": "include/linux/lp8727.h: Remove executable bit\n\nSigned-off-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8cdb878dcb359fd1137e9abdee9322f5e9bcfdf8", "tree": "146afc01f3c1d7cbc944328484d077032bc53bfd", "parents": [ "24b36da33c64368775f4ef9386d44dce1d2bc8cf" ], "author": { "name": "Christopher Yeoh", "email": "cyeoh@au1.ibm.com", "time": "Thu Feb 02 11:34:09 2012 +1030" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 12:55:17 2012 -0800" }, "message": "Fix race in process_vm_rw_core\n\nThis fixes the race in process_vm_core found by Oleg (see\n\n http://article.gmane.org/gmane.linux.kernel/1235667/\n\nfor details).\n\nThis has been updated since I last sent it as the creation of the new\nmm_access() function did almost exactly the same thing as parts of the\nprevious version of this patch did.\n\nIn order to use mm_access() even when /proc isn\u0027t enabled, we move it to\nkernel/fork.c where other related process mm access functions already\nare.\n\nSigned-off-by: Chris Yeoh \u003cyeohc@au1.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c31c151b1c4a29da4dc92212aa8648fb4f8557b9", "tree": "c61eb4b25fcac9f70cc381468b2365d85ca39ad6", "parents": [ "0a282538cc1977655004cdb2eb25dd2b63f20637" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Thu Feb 02 07:18:00 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 02 14:35:12 2012 -0500" }, "message": "net/hyperv: Fix the page buffer when an RNDIS message goes beyond page boundary\n\nThere is a possible data corruption if an RNDIS message goes beyond page\nboundary in the sending code path. This patch fixes the problem.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nSigned-off-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f2fde927243bde5fd106da692efef34be12f81c", "tree": "28e69ca8fa227b1ba53e3bf4ddd42340499e7fe7", "parents": [ "bd3ce7d57c380af110c86d19e256115d0e7053ca", "b0f4c4b32c8e3aa0d44fc4dd6c40a9a9a8d66b63", "45179fec946dd554f74e950d2278dabd5ad23fd3", "cb297a3e433dbdcf7ad81e0564e7b804c941ff0d", "e6d36a653becc7bbc643c399a77882e02bf552cb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:11:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 11:11:13 2012 -0800" }, "message": "Merge branches \u0027core-urgent-for-linus\u0027, \u0027perf-urgent-for-linus\u0027, \u0027sched-urgent-for-linus\u0027 and \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n bugs, x86: Fix printk levels for panic, softlockups and stack dumps\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf top: Fix number of samples displayed\n perf tools: Fix strlen() bug in perf_event__synthesize_event_type()\n perf tools: Fix broken build by defining _GNU_SOURCE in Makefile\n x86/dumpstack: Remove unneeded check in dump_trace()\n perf: Fix broken interrupt rate throttling\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched/rt: Fix task stack corruption under __ARCH_WANT_INTERRUPTS_ON_CTXSW\n sched: Fix ancient race in do_exit()\n sched/nohz: Fix nohz cpu idle load balancing state with cpu hotplug\n sched/s390: Fix compile error in sched/core.c\n sched: Fix rq-\u003enr_uninterruptible update race\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/reboot: Remove VersaLogic Menlow reboot quirk\n x86/reboot: Skip DMI checks if reboot set by user\n x86: Properly parenthesize cmpxchg() macro arguments\n" }, { "commit": "ce106ad31016b5da1168496cd0454a6290555f84", "tree": "07127240fcbe41ed0e2169ec2bbb79d67375b00d", "parents": [ "18d3e0d7507949d776e50667d0a4e44b13d3e1ac", "a99e7e5f36c55e561a64280f5099078c31839076" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 16:00:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 16:00:38 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n lib: Fix 32-bit sparc udiv_qrnnd() definition in mpilib\u0027s longlong.h\n lib: Fix multiple definitions of clz_tab\n lib/digsig: checks for NULL return value\n lib/mpi: added missing NULL check\n lib/mpi: added comment on divide by 0 case\n lib/mpi: check for possible zero length\n lib/digsig: pkcs_1_v1_5_decode_emsa cleanup\n lib/digsig: additional sanity checks against badly formated key payload\n lib/mpi: removed unused functions\n lib/mpi: checks for zero divisor length\n lib/mpi: return error code on dividing by zero\n lib/mpi: replaced MPI_NULL with normal NULL\n lib/mpi: added missing NULL check\n" }, { "commit": "504b61630ab65296b6c9113cce834574e8cc01de", "tree": "053bfc4357b97860f99e1b7eca097f920c687668", "parents": [ "0a365706f2d6062d3756806447c1bbcd7e315ffa" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Tue Jan 31 16:43:50 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Feb 01 15:56:19 2012 -0800" }, "message": "usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()\n\nThe usb/ch9.h will be installed to /usr/include/linux,\nand be used from user space.\nBut le16_to_cpu() is only defined for kernel code.\nWithout this patch, user space compile will be broken.\nSpecial thanks to Stefan Becker\n\nReported-by: Stefan Becker \u003cchemobejk@gmail.com\u003e\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "7d731019218e49a9811f6d0adec4b1cfcb752bed", "tree": "a90bf478f8fe36543ba586db5fa2760ba129a180", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Artem Bityutskiy", "email": "artem.bityutskiy@linux.intel.com", "time": "Wed Feb 01 11:10:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 01 11:10:24 2012 -0800" }, "message": "mtd: fix merge conflict resolution breakage\n\nThis patch fixes merge conflict resolution breakage introduced by merge\nd3712b9dfcf4 (\"Merge tag \u0027for-linus\u0027 of git://github.com/prasad-joshi/logfs_upstream\").\n\nThe commit changed \u0027mtd_can_have_bb()\u0027 function and made it always\nreturn zero, which is incorrect. Instead, we need it to return whether\nthe underlying flash device can have bad eraseblocks or not. UBI needs\nthis information because it affects how it handles the underlying flash.\nE.g., if the underlying flash is NOR, it cannot have bad blocks and any\nwrite or erase error is fatal, and all we can do is to switch to R/O\nmode. We do not need to reserve a pool of good eraseblocks for bad\neraseblocks handling, and so on.\n\nThis patch also removes \u0027mtd_can_have_bb()\u0027 invocations from Logfs to\nensure correct Logfs behavior.\n\nI\u0027ve tested that with this patch UBI works on top of NOR and NAND\nflashes emulated by mtdram and nandsim correspondingly.\n\nThis patch is based on patch from Linus Torvalds.\n\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nAcked-by: Jörn Engel \u003cjoern@logfs.org\u003e\nAcked-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\nAcked-by: Brian Norris \u003ccomputersforpeace@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b18db3d91234c03ad080d317878c7c77672ba326", "tree": "acaa0def1723509f0c77d772071bb0a783525b22", "parents": [ "42f578741bc59dc871bef03ff0f72dd197388409" ], "author": { "name": "Heiko Stübner", "email": "heiko@sntech.de", "time": "Wed Feb 01 09:12:24 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Feb 01 09:13:11 2012 -0800" }, "message": "Input: gpio_keys - fix struct device declared inside parameter list\n\nA struct device parameter is used in the enable and disable callbacks to\ndistinguish between different gpio_keys devices.\n\nPlatforms that don\u0027t use these callbacks may not include struct device\nat all, as seen on arch/arm/mach-s3c2410/mach-n30.c\n\nSigned-off-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "e9c8d7a03e69093e4c33c5056a45c1233a42e8a4", "tree": "b9a37c891db8e273bf9ff177d4be00ec5050393a", "parents": [ "a5044cddad2fba36c725a019a6cd0e3f286b13d0" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed Jan 18 10:14:25 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 01 22:23:53 2012 +0530" }, "message": "dma: sh_dma: not all SH DMAC implementations support MEMCPY\n\nAdd a flag to allow platforms to specify, whether a DMAC instance supports\nthe MEMCPY operation. To avoid regressions, preserve the current default.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "3cccd1543ab623a5065335bf08350e06ffc788ab", "tree": "e6f92704984d5390c22c3c0e165161ed2dc215ca", "parents": [ "c70c471c585a3fc1a10c792d5121b3803c83dde0" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@intel.com", "time": "Thu Jan 26 19:13:16 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Feb 02 00:23:14 2012 +1100" }, "message": "lib/mpi: replaced MPI_NULL with normal NULL\n\nMPI_NULL is replaced with normal NULL.\n\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@intel.com\u003e\nReviewed-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "3310225dfc71a35a2cc9340c15c0e08b14b3c754", "tree": "0475693eddb964dd8ea125e59f9e9efbcabd1dd0", "parents": [ "15eb77a07c714ac80201abd0a9568888bcee6276" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Mon Jan 09 11:53:50 2012 -0600" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Wed Feb 01 16:53:46 2012 +0800" }, "message": "lib: proportion: lower PROP_MAX_SHIFT to 32 on 64-bit kernel\n\nPROP_MAX_SHIFT should be set to \u003c\u003d32 on 64-bit box. This fixes two bugs\nin the below lines of bdi_dirty_limit():\n\n\tbdi_dirty *\u003d numerator;\n\tdo_div(bdi_dirty, denominator);\n\n1) divide error: do_div() only uses the lower 32 bit of the denominator,\n which may trimmed to be 0 when PROP_MAX_SHIFT \u003e 32.\n\n2) overflow: (bdi_dirty * numerator) could easily overflow if numerator\n used up to 48 bits, leaving only 16 bits to bdi_dirty\n\nCc: \u003cstable@kernel.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReported-by: Ilya Tumaykin \u003clibrarian_rus@yahoo.com\u003e\nTested-by: Ilya Tumaykin \u003clibrarian_rus@yahoo.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "d3712b9dfcf44ca145cf87e7f4096fa2d923471a", "tree": "d72aaaa845fb81c669093363a0a1cc6d9e96baf2", "parents": [ "c5d2bc11030568966f04a2af35bacf33d3e37af7", "f2933e86ad93a8d1287079d59e67afd6f4166a9d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 31 09:23:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 31 09:23:59 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/prasad-joshi/logfs_upstream\n\nThere are few important bug fixes for LogFS\n\n* tag \u0027for-linus\u0027 of git://github.com/prasad-joshi/logfs_upstream:\n Logfs: Allow NULL block_isbad() methods\n logfs: Grow inode in delete path\n logfs: Free areas before calling generic_shutdown_super()\n logfs: remove useless BUG_ON\n MAINTAINERS: Add Prasad Joshi in LogFS maintiners\n logfs: Propagate page parameter to __logfs_write_inode\n logfs: set superblock shutdown flag after generic sb shutdown\n logfs: take write mutex lock during fsync and sync\n logfs: Prevent memory corruption\n logfs: update page reference count for pined pages\n\nFix up conflict in fs/logfs/dev_mtd.c due to semantic change in what\n\"mtd-\u003eblock_isbad\" means in commit f2933e86ad93: \"Logfs: Allow NULL\nblock_isbad() methods\" clashing with the abstraction changes in the\ncommits 7086c19d0742: \"mtd: introduce mtd_block_isbad interface\" and\nd58b27ed58a3: \"logfs: do not use \u0027mtd-\u003eblock_isbad\u0027 directly\".\n\nThis resolution takes the semantics from commit f2933e86ad93, and just\nmakes mtd_block_isbad() return zero (false) if the \u0027block_isbad\u0027\nfunction is NULL. But that also means that now \"mtd_can_have_bb()\"\nalways returns 0.\n\nNow, \"mtd_block_markbad()\" will obviously return an error if the\nlow-level driver doesn\u0027t support bad blocks, so this is somewhat\nnon-symmetric, but it actually makes sense if a NULL \"block_isbad\"\nfunction is considered to mean \"I assume that all my blocks are always\ngood\".\n" }, { "commit": "6bc2b95ee602659c1be6fac0f6aadeb0c5c29a5d", "tree": "2509d8e58233c7de6304ed8fd4c9e11b46dba00f", "parents": [ "a14a8d93169a8f2b0b000891571659ddbfa3a169", "a0701f04846eee9976e6b3eafca09f2a9d2744ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 11:38:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 11:38:28 2012 -0800" }, "message": "Merge tag \u0027usb-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nHere are a bunch of USB patches for 3.3-rc1.\n\nNothing major, largest thing here is the removal of some drivers that\ndid not work at all. Other than that, the normal collection of bugfixes\nand new device ids.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n* tag \u0027usb-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (52 commits)\n uwb \u0026 wusb: fix kconfig error\n USB: Realtek cr: fix autopm scheduling while atomic\n USB: ftdi_sio: Add more identifiers\n xHCI: Cleanup isoc transfer ring when TD length mismatch found\n usb: musb: omap2430: minor cleanups.\n qcaux: add more Pantech UML190 and UML290 ports\n Revert \"drivers: usb: Fix dependency for USB_HWA_HCD\"\n usb: mv-otg - Fix build if CONFIG_USB is not set\n USB: cdc-wdm: Avoid hanging on interface with no USB_CDC_DMM_TYPE\n usb: add support for STA2X11 host driver\n drivers: usb: Fix dependency for USB_HWA_HCD\n kernel-doc: fix new warning in usb.h\n USB: OHCI: fix new compiler warnings\n usb: serial: kobil_sct: fix compile warning:\n drivers/usb/host/ehci-fsl.c: add missing iounmap\n USB: cdc-wdm: better allocate a buffer that is at least as big as we tell the USB core\n USB: cdc-wdm: call wake_up_all to allow driver to shutdown on device removal\n USB: cdc-wdm: use two mutexes to allow simultaneous read and write\n USB: cdc-wdm: updating desc-\u003elength must be protected by spin_lock\n USB: usbsevseg: fix max length\n ...\n" }, { "commit": "1a30871fe635d3e92972e6b93e39ff65bb57e52d", "tree": "a9b1dec4e9ab56faba549e7b1a1cec2cbe22b111", "parents": [ "bce41d601e58af12cee1398fe836e6b9a8fb5396" ], "author": { "name": "Artem Bityutskiy", "email": "artem.bityutskiy@linux.intel.com", "time": "Mon Jan 16 11:07:16 2012 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Jan 30 14:23:07 2012 +0000" }, "message": "mtd: fix MTD suspend\n\nCommits 3fe4bae88460869a8e553397cd9057a4ee7ca341 and\n079c985e7a6f4ce60f931cebfdd5ee3c3 broke MTD suspend in 2 ways:\n\n1. When the \u0027-\u003esuspend\u0027 method is not present, we return -EOPNOTSUPP, but\n the callers of \u0027mtd_suspend()\u0027 expects 0 instead.\n2. Checking of the \u0027mtd\u0027 parameter against NULL has been incorrectly removed\n in \u0027mtd_cls_suspend()\u0027.\n\nThis patch fixes the breakages. This has been found, analyzed, reported\nand tested by Rafael J. Wysocki \u003crjw@sisk.pl\u003e.\n\nNote, this patch is not needed in the stable tree because it causes a\nregression introduced during the v3.3 merge window.\n\nReported-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nTested-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nTested-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "181e9bdef37bfcaa41f3ab6c948a2a0d60a268b5", "tree": "66e69f83b63e8517a47e0eb0e7ae730d8a9a109b", "parents": [ "0a9626575400879d1d5e6bc8768188b938d7c501" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Jan 29 20:35:52 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Jan 29 20:35:52 2012 +0100" }, "message": "PM / Hibernate: Fix s2disk regression related to freezing workqueues\n\nCommit 2aede851ddf08666f68ffc17be446420e9d2a056\n\n PM / Hibernate: Freeze kernel threads after preallocating memory\n\nintroduced a mechanism by which kernel threads were frozen after\nthe preallocation of hibernate image memory to avoid problems with\nfrozen kernel threads not responding to memory freeing requests.\nHowever, it overlooked the s2disk code path in which the\nSNAPSHOT_CREATE_IMAGE ioctl was run directly after SNAPSHOT_FREE,\nwhich caused freeze_workqueues_begin() to BUG(), because it saw\nthat worqueues had been already frozen.\n\nAlthough in principle this issue might be addressed by removing\nthe relevant BUG_ON() from freeze_workqueues_begin(), that would\nreintroduce the very problem that commit 2aede851ddf08666f68ffc17be4\nattempted to avoid into that particular code path. For this reason,\nto fix the issue at hand, introduce thaw_kernel_threads() and make\nthe SNAPSHOT_FREE ioctl execute it.\n\nSpecial thanks to Srivatsa S. Bhat for detailed analysis of the\nproblem.\n\nReported-and-tested-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "0a9626575400879d1d5e6bc8768188b938d7c501", "tree": "131242645033de27d549d9cb5d97f0043914b6d2", "parents": [ "e3b8369ca8f2fd756031dd972224bc70c2364ec2", "ce597919361dcec97341151690e780eade2a9cf4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:20:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:20:48 2012 -0800" }, "message": "Merge tag \u0027driver-core-3.3-rc1-bugfixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nHere are some patches for the 3.3-rc1 tree.\n\nIt contains the removal of the sysdev code, now that all users of it are\ngone, as well as some sysfs bugfixes that have been reported by users.\nThere are also some documentation updates here as well.\n\n* tag \u0027driver-core-3.3-rc1-bugfixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n sysfs: Complain bitterly about attempts to remove files from nonexistent directories.\n stable: update documentation to ask for kernel version\n base/core.c:fix typo in comment in function device_add\n Documentation: devres: add allocation functions to list of supported calls\n Documentation update for the driver model core\n kernel-doc: fix new warnings in driver-core\n kernel-doc: fix new warnings in debugfs\n kernel-doc: fix new warnings in device.h\n driver core: remove drivers/base/sys.c and include/linux/sysdev.h\n" }, { "commit": "deb9b4ce97cbbf61a150f317badbeb7531aab276", "tree": "c296cb097c801ef64ee182a59978d3e541e700e8", "parents": [ "81bc3009e061cfd0e62e03a6761cce39c750b65e", "3c424f359898aff48c3d5bed608ac706f8a528c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 13:27:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 13:27:10 2012 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm: (31 commits)\n ARM: 7304/1: ioremap: fix boundary check when reusing static mapping\n ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts\n ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2\n ARM: 7298/1: realview: fix mapping of MPCore private memory region\n PCMCIA: fix sa1111 oops on remove\n ARM: 7288/1: mach-sa1100: add missing module_init() call\n ARM: 7297/1: smp_twd: make sure timer is stopped before registering it\n ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards\n ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block\n ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP\n ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs\n ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary\n ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes\n MFD: ucb1x00-ts: fix resume failure\n MFD: ucb1x00-core: fix gpiolib direction_output handling\n MFD: ucb1x00-core: fix missing restore of io output data on resume\n MFD: mcp-core: fix mcp_priv() to be more type safe\n MFD: mcp-core: fix complaints from the genirq layer\n Revert \"ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus.\"\n Revert \"ARM: sa1100: Refactor mcp-sa11x0 to use platform resources.\"\n ...\n\nFix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into\nmach-imx5 (commit 784a90c0a7d8: \"ARM i.MX: Merge i.MX5 support into\nmach-imx\"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by\nthe CPU_V7 logic from it in the old location in rmk\u0027s branch (commit\na092f2b15399: \"ARM: 7291/1: cache: assume 64-byte L1 cachelines for\nARMv7 CPUs\").\n" }, { "commit": "e050e3f0a71bf7dc2c148b35caff0234decc8198", "tree": "df3069475c20d0ab238735a7a1837db9ae080610", "parents": [ "74ea15d909b31158f9b63190a95b52bc05586d4b" ], "author": { "name": "Stephane Eranian", "email": "eranian@google.com", "time": "Thu Jan 26 17:03:19 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 27 12:06:39 2012 +0100" }, "message": "perf: Fix broken interrupt rate throttling\n\nThis patch fixes the sampling interrupt throttling mechanism.\n\nIt was broken in v3.2. Events were not being unthrottled. The\nunthrottling mechanism required that events be checked at each\ntimer tick.\n\nThis patch solves this problem and also separates:\n\n - unthrottling\n - multiplexing\n - frequency-mode period adjustments\n\nNot all of them need to be executed at each timer tick.\n\nThis third version of the patch is based on my original patch +\nPeterZ proposal (https://lkml.org/lkml/2012/1/7/87).\n\nAt each timer tick, for each context:\n\n - if the current CPU has throttled events, we unthrottle events\n\n - if context has frequency-based events, we adjust sampling periods\n\n - if we have reached the jiffies interval, we multiplex (rotate)\n\nWe decoupled rotation (multiplexing) from frequency-mode sampling\nperiod adjustments. They should not necessarily happen at the same\nrate. Multiplexing is subject to jiffies_interval (currently at 1\nbut could be higher once the tunable is exposed via sysfs).\n\nWe have grouped frequency-mode adjustment and unthrottling into the\nsame routine to minimize code duplication. When throttled while in\nfrequency mode, we scan the events only once.\n\nWe have fixed the threshold enforcement code in __perf_event_overflow().\nThere was a bug whereby it would allow more than the authorized rate\nbecause an increment of hwc-\u003einterrupts was not executed at the right\nplace.\n\nThe patch was tested with low sampling limit (2000) and fixed periods,\nfrequency mode, overcommitted PMU.\n\nOn a 2.1GHz AMD CPU:\n\n $ cat /proc/sys/kernel/perf_event_max_sample_rate\n 2000\n\nWe set a rate of 3000 samples/sec (2.1GHz/3000 \u003d 700000):\n\n $ perf record -e cycles,cycles -c 700000 noploop 10\n $ perf report -D | tail -21\n\n Aggregated stats:\n TOTAL events: 80086\n MMAP events: 88\n COMM events: 2\n EXIT events: 4\n THROTTLE events: 19996\n UNTHROTTLE events: 19996\n SAMPLE events: 40000\n\n cycles stats:\n TOTAL events: 40006\n MMAP events: 5\n COMM events: 1\n EXIT events: 4\n THROTTLE events: 9998\n UNTHROTTLE events: 9998\n SAMPLE events: 20000\n\n cycles stats:\n TOTAL events: 39996\n THROTTLE events: 9998\n UNTHROTTLE events: 9998\n SAMPLE events: 20000\n\nFor 10s, the cap is 2x2000x10 \u003d 40000 samples.\nWe get exactly that: 20000 samples/event.\n\nSigned-off-by: Stephane Eranian \u003ceranian@google.com\u003e\nCc: \u003cstable@kernel.org\u003e # v3.2+\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20120126160319.GA5655@quad\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "2437dcbf555bff04e4ee8b8dba4587f946c1cd3d", "tree": "f04f3ed779c25caa933744d2d5965ca4e297f05d", "parents": [ "0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a", "b64b223aed5f8aeeb6c046f1b050a8f976b87de0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:45:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:45:41 2012 -0800" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n rcu: Add missing __cpuinit annotation in rcutorture code\n sched: Add \"const\" to is_idle_task() parameter\n rcu: Make rcutorture bool parameters really bool (core code)\n memblock: Fix alloc failure due to dumb underflow protection in memblock_find_in_range_node()\n" }, { "commit": "7c24814f7eb9a194b11507b43ca0b947415754c2", "tree": "9d8a091a9e63f629dd5d5e7ac38d883abf75faa8", "parents": [ "074cc73506f529f39fef32ad1c9e1d4cdd8acf6c", "b30b3c60a25a4afbc49167ecb6210c291178ee5f" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 25 07:48:12 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 25 07:48:44 2012 -0800" }, "message": "Merge branch \u0027for-greg\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus\n\n* \u0027for-greg\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:\n usb: musb: omap2430: minor cleanups.\n usb: dwc3: unmap the proper number of sg entries\n usb: musb: fix shutdown while usb gadget is in use\n usb: gadget: f_mass_storage: Use \"bool\" instead of \"int\" in fsg_module_parameters\n usb: gadget: check for streams only for SS udcs\n usb: gadget: fsl_udc: fix the usage of udc-\u003emax_ep\n drivers: usb: otg: Fix dependencies for some OTG drivers\n usb: renesas: silence uninitialized variable report in usbhsg_recip_run_handle()\n usb: gadget: SS Isoc endpoints use comp_desc-\u003ebMaxBurst too\n usb: gadget: storage: endian fix\n usb: dwc3: ep0: fix compile warning\n usb: musb: davinci: fix build breakage\n usb: gadget: langwell: don\u0027t call gadget\u0027s disconnect()\n usb: gadget: langwell: drop langwell_otg support\n usb: otg: kill langwell_otg driver\n usb: dwc3: ep0: tidy up Pending Request handling\n" }, { "commit": "f8275f9694b8adf9f3498e747ea4c3e8b984499b", "tree": "768a55b9033979b44f9242f886984e68635e870c", "parents": [ "a86b4ad6da23b7d2b55813f0cf026f7149932028", "eb7004e623637a6c2b32317c000d4b617b5cb053" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 22:05:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 22:05:44 2012 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\nQuoth Len:\n \"This fixes a merge-window regression due to a conflict\n between error injection and preparation to remove atomicio.c\n Here we fix that regression and complete the removal\n of atomicio.c.\n\n This also re-orders some idle initialization code to\n complete the merge window series that allows cpuidle\n to cope with bringing processors on-line after boot.\"\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n Use acpi_os_map_memory() instead of ioremap() in einj driver\n ACPI, APEI, EINJ, cleanup 0 vs NULL confusion\n ACPI, APEI, EINJ Allow empty Trigger Error Action Table\n thermal: Rename generate_netlink_event\n ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist.\n ACPI: Remove ./drivers/acpi/atomicio.[ch]\n ACPI, APEI: Add RAM mapping support to ACPI\n ACPI, APEI: Add 64-bit read/write support for APEI on i386\n ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores\n ACPI processor hotplug: Split up acpi_processor_add\n" }, { "commit": "701b259f446be2f3625fb852bceb93afe76e206d", "tree": "93f15bcd00bd59c38b4e59fed9af7ddf6b06c8b3", "parents": [ "d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5", "efc3dbc37412c027e363736b4f4c74ee5e8ecffc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 15:51:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 15:51:40 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nDavem says:\n\n1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.\n\n2) tg3 header length computation correction from Eric Dumazet.\n\n3) More build and reference counting fixes for socket memory cgroup\n code from Glauber Costa.\n\n4) module.h snuck back into a core header after all the hard work we\n did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.\n\n5) Fix PHY naming regression and add some new PCI IDs in stmmac, from\n Alessandro Rubini.\n\n6) Netlink message generation fix in new team driver, should only advertise\n the entries that changed during events, from Jiri Pirko.\n\n7) SRIOV VF registration and unregistration fixes, and also add a\n missing PCI ID, from Roopa Prabhu.\n\n8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.\n\n9) ftgmac100/ftmac100 build fix, missing interrupt.h include.\n\n10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.\n\n11) Off by one fix in netem packet scheduler, from Vijay Subramanian.\n\n12) TCP loss detection fix from Yuchung Cheng.\n\n13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.\n\n14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.\n\n15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC\n congestion control modules, fix from Neal Cardwell.\n\n16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.\n\n17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.\n\n18) Statistics bug fixes in mlx4 from Eugenia Emantayev.\n\n19) rds locking bug fix during info dumps, from your\u0027s truly.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)\n rds: Make rds_sock_lock BH rather than IRQ safe.\n netprio_cgroup.h: dont include module.h from other includes\n net: flow_dissector.c missing include linux/export.h\n team: send only changed options/ports via netlink\n net/hyperv: fix possible memory leak in do_set_multicast()\n drivers/net: dsa/mv88e6xxx.c files need linux/module.h\n stmmac: added PCI identifiers\n llc: Fix race condition in llc_ui_recvmsg\n stmmac: fix phy naming inconsistency\n dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.\n tg3: fix ipv6 header length computation\n skge: add byte queue limit support\n mv643xx_eth: Add Rx Discard and Rx Overrun statistics\n bnx2x: fix compilation error with SOE in fw_dump\n bnx2x: handle CHIP_REVISION during init_one\n bnx2x: allow user to change ring size in ISCSI SD mode\n bnx2x: fix Big-Endianess in ethtool -t\n bnx2x: fixed ethtool statistics for MF modes\n bnx2x: credit-leakage fixup on vlan_mac_del_all\n macvlan: fix a possible use after free\n ...\n" }, { "commit": "b82b9183d4f18f9b8c4bb31f223eb6c79b734eb0", "tree": "c93bb04e52255fe3e313ce4469dd2df6c2a62789", "parents": [ "c11bf1c8baff170fa478adc04964da519d160e62" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Jan 24 05:16:00 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 24 15:51:00 2012 -0500" }, "message": "team: send only changed options/ports via netlink\n\nThis patch changes event message behaviour to send only updated records\ninstead of whole list. This fixes bug on which userspace receives non-actual\ndata in case multiple events occur in row.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0fcd97789028e8ec286a4248c20a71eae239ba61", "tree": "9ed799d81bcbcc5edc7f4135390143f57a55b09a", "parents": [ "194b3af4eb4b7ba84e2e4274daf9f58aa958bd04" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:02:56 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jan 24 12:25:14 2012 -0800" }, "message": "kernel-doc: fix new warning in usb.h\n\nFix new kernel-doc warning:\n\nWarning(include/linux/usb.h:1251): No description found for parameter \u0027num_mapped_sgs\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5", "tree": "4ba57a6ec31f3a4683e7766fbf4f182d459a8b51", "parents": [ "4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518", "46fe44ce8777f087aa8ad4a2605fdcfb9c2d63af" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 12:12:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 12:12:40 2012 -0800" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:\n quota: Pass information that quota is stored in system file to userspace\n ext2: protect inode changes in the SETVERSION and SETFLAGS ioctls\n jbd: Issue cache flush after checkpointing\n" }, { "commit": "1a5e29fc2b90daf71a60329c29a1886fd126169a", "tree": "dce477bfaaa0d009970b1f3b3058349525651786", "parents": [ "e9c688a3272fd4b659228f3880de8109a94540e2" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:02:51 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jan 24 10:47:41 2012 -0800" }, "message": "kernel-doc: fix new warnings in device.h\n\nFix new kernel-doc warnings:\n\nWarning(include/linux/device.h:299): No description found for parameter \u0027name\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027subsys\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027node\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027add_dev\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027remove_dev\u0027\nWarning(include/linux/device.h:685): No description found for parameter \u0027id\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__driver\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__register\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__unregister\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c1084a56da255ef5385c0f587e16fdc225a5460f", "tree": "a0c081b48c8cad1fff52f00bdf9c255b6cf70ad5", "parents": [ "68d8a781575d7be490f97eb2c403fb13b083da6a" ], "author": { "name": "Alexander Shishkin", "email": "alexander.shishkin@linux.intel.com", "time": "Wed Dec 21 10:19:38 2011 +0200" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Tue Jan 24 15:41:51 2012 +0200" }, "message": "usb: otg: kill langwell_otg driver\n\nThe way this driver was added by f0ae849 (usb: Add Intel Langwell USB\nOTG Transceiver Driver) never even compiled together with langwell_udc,\nand that\u0027s the only way for it to be useful.\n\nSigned-off-by: Alexander Shishkin \u003calexander.shishkin@linux.intel.com\u003e\nCc: stable@vger.kernel.org # v2.6.31+\nCc: Heikki Krogerus \u003cheikki.krogerus@linux.intel.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: linux-usb@vger.kernel.org\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "c1aab02dac690af7ff634d8e1cb3be6a04387eef", "tree": "9018361108b2c370d247452e4517937057bf9895", "parents": [ "ac1e3d4f5c1097422c6e72aeae322033e9a8c803" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Jan 24 11:41:32 2012 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 17:17:45 2012 -0800" }, "message": "migrate_mode.h is not exported to user mode\n\nso move its include into fs.h inside the __KERNEL__ protection.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ac1e3d4f5c1097422c6e72aeae322033e9a8c803", "tree": "adcebdad5f515a8453bfe48940822f57a6904c9d", "parents": [ "eaed435a7b870a38d89dbdb535c7842d618d3214", "e4c89a508f4385a0cd8681c2749a2cd2fa476e40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 15:11:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 15:11:27 2012 -0800" }, "message": "Merge tag \u0027pm-fixes-for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPower management fixes for 3.3\n\nTwo fixes for regressions introduced during the merge window, one fix for\na long-standing obscure issue in the computation of hibernate image size\nand two small PM documentation fixes.\n\n* tag \u0027pm-fixes-for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Sleep: Fix read_unlock_usermodehelper() call.\n PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression\n PM / Hibernate: Correct additional pages number calculation\n PM / Documentation: Fix minor issue in freezing_of_tasks.txt\n PM / Documentation: Fix spelling mistake in basic-pm-debugging.txt\n" }, { "commit": "a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99", "tree": "d92277ec77dbaf6f04a1ab4fe31a974c1ce51f76", "parents": [ "4f57d865f1d863346ac50db9c25859e73a86499c", "b4d20859362fde976bb2fa53eb51b798cdba1afc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 10:08:08 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 10:08:08 2012 -0800" }, "message": "Merge branch \u0027kernel-doc\u0027 from Randy Dunlap\n\nThe usual kernel-doc fixups from Randy. Some of them David acked as\nmerged in his tree, this is the random left-overs.\n\n* kernel-doc:\n docbook: fix sched source file names in device-drivers book\n docbook: change iomap source filename in deviceiobook\n docbook: don\u0027t use serial_core.h in device-drivers book\n kernel-doc: fix kernel-doc warnings in sched\n kernel-doc: fix new warnings in cfg80211.h\n kernel-doc: fix new warning in usb.h\n kernel-doc: fix new warnings in device.h\n kernel-doc: fix new warnings in debugfs\n kernel-doc: fix new warning in regulator core\n kernel-doc: fix new warnings in pci\n kernel-doc: fix new warnings in driver-core\n kernel-doc: fix new warnings in auditsc.c\n scripts/kernel-doc: fix fatal error caused by cfg80211.h\n" }, { "commit": "fa757281a08799fd6c0f7ec6f111d1cd66afc97b", "tree": "664f8728e55e3d37ca8eb3c6c9087d2da9860463", "parents": [ "2f6c76aa5f0fb53059730c628ac59ef62a14ed7a" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:03:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:54 2012 -0800" }, "message": "kernel-doc: fix kernel-doc warnings in sched\n\nFix new kernel-doc notation warnings:\n\nWarning(include/linux/sched.h:2094): No description found for parameter \u0027p\u0027\nWarning(include/linux/sched.h:2094): Excess function parameter \u0027tsk\u0027 description in \u0027is_idle_task\u0027\nWarning(kernel/sched/cpupri.c:139): No description found for parameter \u0027newpri\u0027\nWarning(kernel/sched/cpupri.c:139): Excess function parameter \u0027pri\u0027 description in \u0027cpupri_set\u0027\nWarning(kernel/sched/cpupri.c:208): Excess function parameter \u0027bootmem\u0027 description in \u0027cpupri_init\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc:\tIngo Molnar \u003cmingo@elte.hu\u003e\nCc:\tPeter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4d922612df8bd1202a1f51d95b78aca3d67302cd", "tree": "1529f0b5d3c52da76a25189474ba4d25122764a1", "parents": [ "2eda013f4894bc200124f791a56c4defb613a0cc" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:02:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:54 2012 -0800" }, "message": "kernel-doc: fix new warning in usb.h\n\nFix new kernel-doc warning:\n\nWarning(include/linux/usb.h:1251): No description found for parameter \u0027num_mapped_sgs\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2eda013f4894bc200124f791a56c4defb613a0cc", "tree": "a186229c34e0629b72d64ed767076257edcdea94", "parents": [ "b5763accd3b5fc131ee06e26ce56e63ae0322c9b" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:02:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:53 2012 -0800" }, "message": "kernel-doc: fix new warnings in device.h\n\nFix new kernel-doc warnings:\n\nWarning(include/linux/device.h:299): No description found for parameter \u0027name\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027subsys\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027node\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027add_dev\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027remove_dev\u0027\nWarning(include/linux/device.h:685): No description found for parameter \u0027id\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__driver\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__register\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__unregister\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "245132643e1cfcd145bbc86a716c1818371fcb93", "tree": "e5bf3cb56efedb059b1a68fd8efd37482131783b", "parents": [ "85046579bde15e532983438f86b36856e358f417" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Fri Jan 20 14:34:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:38:48 2012 -0800" }, "message": "SHM_UNLOCK: fix Unevictable pages stranded after swap\n\nCommit cc39c6a9bbde (\"mm: account skipped entries to avoid looping in\nfind_get_pages\") correctly fixed an infinite loop; but left a problem\nthat find_get_pages() on shmem would return 0 (appearing to callers to\nmean end of tree) when it meets a run of nr_pages swap entries.\n\nThe only uses of find_get_pages() on shmem are via pagevec_lookup(),\ncalled from invalidate_mapping_pages(), and from shmctl SHM_UNLOCK\u0027s\nscan_mapping_unevictable_pages(). The first is already commented, and\nnot worth worrying about; but the second can leave pages on the\nUnevictable list after an unusual sequence of swapping and locking.\n\nFix that by using shmem_find_get_pages_and_swap() (then ignoring the\nswap) instead of pagevec_lookup().\n\nBut I don\u0027t want to contaminate vmscan.c with shmem internals, nor\nshmem.c with LRU locking. So move scan_mapping_unevictable_pages() into\nshmem.c, renaming it shmem_unlock_mapping(); and rename\ncheck_move_unevictable_page() to check_move_unevictable_pages(), looping\ndown an array of pages, oftentimes under the same lock.\n\nLeave out the \"rotate unevictable list\" block: that\u0027s a leftover from\nwhen this was used for /proc/sys/vm/scan_unevictable_pages, whose flawed\nhandling involved looking at pages at tail of LRU.\n\nWas there significance to the sequence first ClearPageUnevictable, then\ntest page_evictable, then SetPageUnevictable here? I think not, we\u0027re\nunder LRU lock, and have no barriers between those.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Shaohua Li \u003cshaohua.li@intel.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e [back to 3.1 but will need respins]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cb78edfdcef5259ac9e9088bd63810d21299928d", "tree": "a318408e90b77169486464342d28d08119ef58bb", "parents": [ "409eb8c2611b4310947a150af988111f7f52ab15" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Fri Jan 20 14:34:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:38:48 2012 -0800" }, "message": "kdump: define KEXEC_NOTE_BYTES arch specific for s390x\n\nkdump only allocates memory for the prstatus ELF note. For s390x,\nbesides of prstatus multiple ELF notes for various different register\ntypes are stored. Therefore the currently allocated memory is not\nsufficient. With this patch the KEXEC_NOTE_BYTES macro can be defined\nby architecture code and for s390x it is set to the correct size now.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nReviewed-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6536e3123e5d3371a6f52e32a3d0694bcc987702", "tree": "45212bcb96a33d3a40cd1c631d9670a1bae52c2b", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Fri Jan 20 14:33:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:38:47 2012 -0800" }, "message": "mm: fix warnings regarding enum migrate_mode\n\nsparc64 allmodconfig:\n\nIn file included from include/linux/compat.h:15,\n from /usr/src/25/arch/sparc/include/asm/siginfo.h:19,\n from include/linux/signal.h:5,\n from include/linux/sched.h:73,\n from arch/sparc/kernel/asm-offsets.c:13:\ninclude/linux/fs.h:618: warning: parameter has incomplete type\n\nIt seems that my sparc64 compiler (gcc-3.4.5) doesn\u0027t like the forward\ndeclaration of enums.\n\nFix this by moving the \"enum migrate_mode\" definition into its own header\nfile.\n\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Andy Isaacson \u003cadi@hexapodia.org\u003e\nCc: Nai Xia \u003cnai.xia@gmail.com\u003e\nCc: Johannes Weiner \u003cjweiner@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": "2d58d7ea9164da59d0ea82fdf80e3ababe52d58c", "tree": "acdb69c02ff8ceac746f2b82eb01d35b17ef879b", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Nov 04 10:31:04 2011 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Mon Jan 23 03:15:25 2012 -0500" }, "message": "thermal: Rename generate_netlink_event\n\nIt doesn\u0027t seem right for the thermal subsystem to export a symbol\nnamed generate_netlink_event. This function is thermal-specific and\nits name should reflect that fact. Rename it to\nthermal_generate_netlink_event.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: R.Durgadoss \u003cdurgadoss.r@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "e9c688a3272fd4b659228f3880de8109a94540e2", "tree": "c295a2db56a079a0f37703f186b44e57e1453527", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jan 22 14:31:15 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jan 22 14:31:15 2012 -0700" }, "message": "driver core: remove drivers/base/sys.c and include/linux/sysdev.h\n\nNow that all users of \u0027struct sysdev\u0027 are removed from the kernel, we\ncan safely remove the .h and .c files for this code, to ensure that no\none accidentally starts to use it again.\n\nMany thanks for Kay who did all the hard work here on making this\nhappen.\n\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "0e90b31f4ba77027a7c21cbfc66404df0851ca21", "tree": "10dc6c443e2f058869d3953a90e6d48fb53f83ae", "parents": [ "8cfd14ad1eb52e44cb1fe7b47a68126e45e04026" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Fri Jan 20 04:57:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:46 2012 -0500" }, "message": "net: introduce res_counter_charge_nofail() for socket allocations\n\nThere is a case in __sk_mem_schedule(), where an allocation\nis beyond the maximum, but yet we are allowed to proceed.\nIt happens under the following condition:\n\n\tsk-\u003esk_wmem_queued + size \u003e\u003d sk-\u003esk_sndbuf\n\nThe network code won\u0027t revert the allocation in this case,\nmeaning that at some point later it\u0027ll try to do it. Since\nthis is never communicated to the underlying res_counter\ncode, there is an inbalance in res_counter uncharge operation.\n\nI see two ways of fixing this:\n\n1) storing the information about those allocations somewhere\n in memcg, and then deducting from that first, before\n we start draining the res_counter,\n2) providing a slightly different allocation function for\n the res_counter, that matches the original behavior of\n the network code more closely.\n\nI decided to go for #2 here, believing it to be more elegant,\nsince #1 would require us to do basically that, but in a more\nobscure way.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCC: Laurent Chavey \u003cchavey@google.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8cfd14ad1eb52e44cb1fe7b47a68126e45e04026", "tree": "5c526f7ced428e65db025ba7af29ca114031c302", "parents": [ "376be5ff8a6a36efadd131860cf26841f366d44c" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Fri Jan 20 04:57:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:45 2012 -0500" }, "message": "cgroup: make sure memcg margin is 0 when over limit\n\nFor the memcg sock code, we\u0027ll need to register allocations\nthat are temporarily over limit. Let\u0027s make sure that margin\nis 0 in this case.\n\nI am keeping this as a separate patch, so that if any weirdness\ninteraction appears in the future, we can now exactly what caused\nit.\n\nSuggested by Johannes Weiner\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCC: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCC: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCC: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "974c12360dfe6ab01201fe9e708e7755c413f8b6", "tree": "8cdf87f44c8be550af2ec1530f8cb271fb1a2e1f", "parents": [ "d0249e44432aa0ffcf710b64449b8eaa3722547e" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Thu Jan 19 14:42:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:44 2012 -0500" }, "message": "tcp: detect loss above high_seq in recovery\n\nCorrectly implement a loss detection heuristic: New sequences (above\nhigh_seq) sent during the fast recovery are deemed lost when higher\nsequences are SACKed.\n\nCurrent code does not catch these losses, because tcp_mark_head_lost()\ndoes not check packets beyond high_seq. The fix is straight-forward by\nchecking packets until the highest sacked packet. In addition, all the\nFLAG_DATA_LOST logic are in-effective and redundant and can be removed.\n\nUpdate the loss heuristic comments. The algorithm above is documented\nas heuristic B, but it is redundant too because heuristic A already\ncovers B.\n\nNote that this change only marks some forward-retransmitted packets LOST.\nIt does NOT forbid TCP performing further CWR on new losses. A potential\nfollow-up patch under preparation is to perform another CWR on \"new\"\nlosses such as\n1) sequence above high_seq is lost (by resetting high_seq to snd_nxt)\n2) retransmission is lost.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93ece0c1a7ace88f10411dbb5643d2aa2fe00ebf", "tree": "c6a00edd4504b9c026bc555e3d74fe155cacadbf", "parents": [ "35fb9afbdeef9d5859d9a878d0372907baf119e1" ], "author": { "name": "Eugenia Emantayev", "email": "eugenia@mellanox.co.il", "time": "Thu Jan 19 09:45:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:43 2012 -0500" }, "message": "mlx4_en: eth statistics modification\n\nIn native mode display all available staticstics.\nIn SRIOV mode on VF display only SW counters statistics,\nin SRIOV mode on hypervisor display SW counters and errors (got from FW)\nstatistics.\n\nSigned-off-by: Eugenia Emantayev \u003ceugenia@mellanox.co.il\u003e\nReviewed-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a7f51a3e08cdaeea78d9e101a0079422a55bbc3", "tree": "aa7bd825268bcd0438f502dbf90de03844cf90c5", "parents": [ "98250221691f728b7cad6deed98866f8847e683f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 21 09:28:53 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 21 15:46:25 2012 +0000" }, "message": "MFD: mcp-core: fix mcp_priv() to be more type safe\n\nmcp_priv() does unexpected things when passed a void pointer. Make it\na typed inline function, which ensures that it works correctly in\nthese cases.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "65f2e753f1eb09d3a7e2a0d16408a5433b4097b2", "tree": "100066fa2d26930a490ee10bb191957f3b3e2df3", "parents": [ "216f63c41cac9f9f8f181fc19be399293c8c934e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 20 17:38:58 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 20 17:38:58 2012 +0000" }, "message": "Revert \"ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus.\"\n\nThis reverts commit 5dd7bf59e0e8563265b3e5b33276099ef628fcc7.\n\nConflicts:\n\n\tscripts/mod/file2alias.c\n\nThis change is wrong on many levels. First and foremost, it causes a\nregression. On boot on Assabet, which this patch gives a codec id of\n\u0027ucb1x00\u0027, it gives:\n\n\tucb1x00 ID not found: 1005\n\n0x1005 is a valid ID for the UCB1300 device.\n\nSecondly, this patch is way over the top in terms of complexity. The\nonly device which has been seen to be connected with this MCP code is\nthe UCB1x00 (UCB1200, UCB1300 etc) devices, and they all use the same\ndriver. Adding a match table, requiring the codec string to match the\nhardware ID read out of the ID register, etc is completely over the top\nwhen we can just read the hardware ID register.\n" }, { "commit": "72081624d5ad3cf56deb6e727b78c4e7a55e4eec", "tree": "853ed00967d6567af191fbb85b625638970ce15f", "parents": [ "160cb5a97daef0cb894685d84c9d4700bb7cccb4" ], "author": { "name": "Srivatsa S. Bhat", "email": "srivatsa.bhat@linux.vnet.ibm.com", "time": "Thu Jan 19 23:25:33 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Jan 19 23:25:33 2012 +0100" }, "message": "PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression\n\nCommit 33e638b, \"PM / Sleep: Use the freezer_count() functions in\n[un]lock_system_sleep() APIs\" introduced an undesirable change in the\nbehaviour of unlock_system_sleep() since freezer_count() internally calls\ntry_to_freeze() - which we don\u0027t need in unlock_system_sleep().\n\nAnd commit bcda53f, \"PM / Sleep: Replace mutex_[un]lock(\u0026pm_mutex) with\n[un]lock_system_sleep()\" made these APIs wide-spread. This caused a\nregression in suspend-to-disk where snapshot_read() and snapshot_write()\nwere getting frozen due to the try_to_freeze embedded in\nunlock_system_sleep(), since these functions were invoked when the freezing\ncondition was still in effect.\n\nFix this by rewriting unlock_system_sleep() by open-coding freezer_count()\nand dropping the try_to_freeze() part. Not only will this fix the\nregression but this will also ensure that the API only does what it is\nintended to do, and nothing more, under the hood.\n\nWhile at it, make the code more correct and robust by ensuring that the\nPF_FREEZER_SKIP flag gets cleared with pm_mutex held, to avoid a race with\nthe freezer.\n\nAlso, to be on the safer side, open-code freezer_do_not_count() as well\n(inside lock_system_sleep()), to ensure that any unrelated modification to\nfreezer[_do_not]_count() does not break things again!\n\nReported-and-tested-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "456a8167e94b66f406c27400a46a707b870452b0", "tree": "6c6eedf5ff8819dc4c6346db651be9e8758e0df7", "parents": [ "f6b24579d099ebb67f39cd7924a72a7eec0ce6ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Jan 18 10:04:29 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jan 19 16:17:35 2012 +1100" }, "message": "KEYS: Permit key_serial() to be called with a const key pointer\n\nPermit key_serial() to be called with a const key pointer.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "507a03c1cba0e32309223d23d19a1bfc0916c140", "tree": "8da15f9c635733948a73bfe35cb50e1195702952", "parents": [ "be405411f712489f2f780ab085e1069e8fb85f19", "79ba0db69c5887f1ad4ed51d58894e7e889084b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:51:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:51:48 2012 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\nThis includes initial support for the recently published ACPI 5.0 spec.\nIn particular, support for the \"hardware-reduced\" bit that eliminates\nthe dependency on legacy hardware.\n\nAPEI has patches resulting from testing on real hardware.\n\nPlus other random fixes.\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (52 commits)\n acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec\n intel_idle: Split up and provide per CPU initialization func\n ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2\n ACPI processor: Remove unneeded cpuidle_unregister_driver call\n intel idle: Make idle driver more robust\n intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle\n ACPI: kernel-parameters.txt : Add intel_idle.max_cstate\n intel_idle: remove redundant local_irq_disable() call\n ACPI processor: Fix error path, also remove sysdev link\n ACPI: processor: fix acpi_get_cpuid for UP processor\n intel_idle: fix API misuse\n ACPI APEI: Convert atomicio routines\n ACPI: Export interfaces for ioremapping/iounmapping ACPI registers\n ACPI: Fix possible alignment issues with GAS \u0027address\u0027 references\n ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64)\n ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64)\n ACPI: Store SRAT table revision\n ACPI, APEI, Resolve false conflict between ACPI NVS and APEI\n ACPI, Record ACPI NVS regions\n ACPI, APEI, EINJ, Refine the fix of resource conflict\n ...\n" }, { "commit": "92b5abbb44e05cdbc4483219f30a435dd871a8ea", "tree": "15490d1c7fd415575ec6beec1baa5ce89f747bf9", "parents": [ "ccb19d263fd1c9e34948e2158c53eacbff369344", "df3481399042200792822b6243e36a95a557b57e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:34:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:34:09 2012 -0800" }, "message": "Merge git://git.infradead.org/users/willy/linux-nvme\n\n* git://git.infradead.org/users/willy/linux-nvme: (105 commits)\n NVMe: Set number of queues correctly\n NVMe: Version 0.8\n NVMe: Set queue flags correctly\n NVMe: Simplify nvme_unmap_user_pages\n NVMe: Mark the end of the sg list\n NVMe: Fix DMA mapping for admin commands\n NVMe: Rename IO_TIMEOUT to NVME_IO_TIMEOUT\n NVMe: Merge the nvme_bio and nvme_prp data structures\n NVMe: Change nvme_completion_fn to take a dev\n NVMe: Change get_nvmeq to take a dev instead of a namespace\n NVMe: Simplify completion handling\n NVMe: Update Identify Controller data structure\n NVMe: Implement doorbell stride capability\n NVMe: Version 0.7\n NVMe: Don\u0027t probe namespace 0\n Fix calculation of number of pages in a PRP List\n NVMe: Create nvme_identify and nvme_get_features functions\n NVMe: Fix memory leak in nvme_dev_add()\n NVMe: Fix calls to dma_unmap_sg\n NVMe: Correct sg list setup in nvme_map_user_pages\n ...\n" }, { "commit": "ccb19d263fd1c9e34948e2158c53eacbff369344", "tree": "6683e55f183920dcbf3e1a5b749e7f9780c465b3", "parents": [ "6a488979f574cb4287880db2dbc8b13cee30c5be", "c3b5003b628d8e373262bee42c7260d6a799c73e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n tg3: Fix single-vector MSI-X code\n openvswitch: Fix multipart datapath dumps.\n ipv6: fix per device IP snmp counters\n inetpeer: initialize -\u003eredirect_genid in inet_getpeer()\n net: fix NULL-deref in WARN() in skb_gso_segment()\n net: WARN if skb_checksum_help() is called on skb requiring segmentation\n caif: Remove bad WARN_ON in caif_dev\n caif: Fix typo in Vendor/Product-ID for CAIF modems\n bnx2x: Disable AN KR work-around for BCM57810\n bnx2x: Remove AutoGrEEEn for BCM84833\n bnx2x: Remove 100Mb force speed for BCM84833\n bnx2x: Fix PFC setting on BCM57840\n bnx2x: Fix Super-Isolate mode for BCM84833\n net: fix some sparse errors\n net: kill duplicate included header\n net: sh-eth: Fix build error by the value which is not defined\n net: Use device model to get driver name in skb_gso_segment()\n bridge: BH already disabled in br_fdb_cleanup()\n net: move sock_update_memcg outside of CONFIG_INET\n mwl8k: Fixing Sparse ENDIAN CHECK warning\n ...\n" }, { "commit": "79ba0db69c5887f1ad4ed51d58894e7e889084b0", "tree": "72948278c60e0997ad2e7cc0181d469c61b62fa8", "parents": [ "cb7971756b901abd61d47f6eb1011066abfb348d", "c130bd6f82e5dda28b1a19741c4c2fe269713199", "5c2a9f06a9cd7194f884cdc88144866235dec07d", "65b7f839ceecc0a36c7969c0c9151d5748cd4242", "9f10f6a520deb3639fac78d81151a3ade88b4e7f", "553575f1ae048aa44682b46b3c51929a0b3ad337" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 01:15:54 2012 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 01:15:54 2012 -0500" }, "message": "Merge branches \u0027einj\u0027, \u0027intel_idle\u0027, \u0027misc\u0027, \u0027srat\u0027 and \u0027turbostat-ivb\u0027 into release\n" }, { "commit": "65b7f839ceecc0a36c7969c0c9151d5748cd4242", "tree": "fd98dd21fafcbeec668bbc2e61812b65bee7919e", "parents": [ "3bd81a8710710f8bf5d1a5ebac315c842c20bdd3" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Tue Jan 17 22:40:08 2012 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Jan 17 23:59:12 2012 -0500" }, "message": "intel_idle: Split up and provide per CPU initialization func\n\nFunction split up, should have no functional change.\n\nProvides entry point for physically hotplugged CPUs\nto initialize and activate cpuidle.\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nCC: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nCC: Shaohua Li \u003cshaohua.li@intel.com\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "57f2685c16fa8e0cb86e4bc7c8ac33bfed943819", "tree": "96a42fe632687c8486c250c4805bf1d4c9c34d19", "parents": [ "488a9d018256dc9f29e041c0360445b6d25eea9a", "e08b881a69d638175bfa99b5af4d72b731633ea7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)\n ARM: mach-shmobile: specify CHCLR registers on SH7372\n dma: shdma: fix runtime PM: clear channel buffers on reset\n dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit\n dmaengine/ste_dma40: clear LNK on channel startup\n dmaengine: intel_mid_dma: remove legacy pm interface\n ASoC: mxs: correct \u0027direction\u0027 of device_prep_dma_cyclic\n dmaengine: intel_mid_dma: error path fix\n dmaengine: intel_mid_dma: locking and freeing fixes\n mtd: gpmi-nand: move to dma_transfer_direction\n mtd: fix compile error for gpmi-nand\n mmc: mxs-mmc: fix the dma_transfer_direction migration\n dmaengine: add DMA_TRANS_NONE to dma_transfer_direction\n dma: mxs-dma: Don\u0027t use CLKGATE bits in CTRL0 to disable DMA channels\n dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe\n dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.\n dma: mxs-dma: fix a typo in comment\n DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove\n video i.MX IPU: Fix display connections\n i.MX IPU DMA: Fix wrong burstsize settings\n dmaengine/ste_dma40: allow fixed physical channel\n ...\n\nFix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}\n\nThe conflicts looked pretty trivial, but I\u0027ll ask people to verify them.\n" }, { "commit": "a25a2b84098eb5e001cb8086603d692aa95bf2ec", "tree": "02c01b36251f7b0afb1a98093e14efb17d015910", "parents": [ "f429ee3b808118591d1f3cdf3c0d0793911a5677", "f1be242c95257b199d8b679bc952ca33487c9af6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:43:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:43:39 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n integrity: digital signature config option name change\n lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts\n lib: MPILIB Kconfig description update\n lib: digital signature dependency fix\n lib: digital signature config option name change\n encrypted-keys: fix rcu and sparse messages\n keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages\n KEYS: Add missing smp_rmb() primitives to the keyring search code\n TOMOYO: Accept \\000 as a valid character.\n security: update MAINTAINERS file with new git repo\n" }, { "commit": "f429ee3b808118591d1f3cdf3c0d0793911a5677", "tree": "96d848f5f677d96758ecd2aee5eb6931b75bf218", "parents": [ "22b4eb5e3174efb49791c62823d0cccc35394c36", "c158a35c8a681cf68d36f22f058f9f5466386c71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:06:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:41:31 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)\n audit: no leading space in audit_log_d_path prefix\n audit: treat s_id as an untrusted string\n audit: fix signedness bug in audit_log_execve_info()\n audit: comparison on interprocess fields\n audit: implement all object interfield comparisons\n audit: allow interfield comparison between gid and ogid\n audit: complex interfield comparison helper\n audit: allow interfield comparison in audit rules\n Kernel: Audit Support For The ARM Platform\n audit: do not call audit_getname on error\n audit: only allow tasks to set their loginuid if it is -1\n audit: remove task argument to audit_set_loginuid\n audit: allow audit matching on inode gid\n audit: allow matching on obj_uid\n audit: remove audit_finish_fork as it can\u0027t be called\n audit: reject entry,always rules\n audit: inline audit_free to simplify the look of generic code\n audit: drop audit_set_macxattr as it doesn\u0027t do anything\n audit: inline checks for not needing to collect aux records\n audit: drop some potentially inadvisable likely notations\n ...\n\nUse evil merge to fix up grammar mistakes in Kconfig file.\n\nBad speling and horrible grammar (and copious swearing) is to be\nexpected, but let\u0027s keep it to commit messages and comments, rather than\nexpose it to users in config help texts or printouts.\n" }, { "commit": "5e8898e97a5db4125d944070922164d1d09a2689", "tree": "a5319fcc60499e63fecc7a08d923a1de8f9c7622", "parents": [ "6ac6172a935d1faf7ef259802267657bc0007a62" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@intel.com", "time": "Tue Jan 17 17:12:03 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jan 18 10:46:21 2012 +1100" }, "message": "lib: digital signature config option name change\n\nIt was reported that DIGSIG is confusing name for digital signature\nmodule. It was suggested to rename DIGSIG to SIGNATURE.\n\nRequested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSuggested-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@intel.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ee0b31a25a010116f44fca6c96f4516d417793dd", "tree": "d7670d202d0f4888b5213ed73d88c9a80bd05b74", "parents": [ "efde8b6e16f11e7d1681c68d86c7fd51053cada7" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Jan 17 20:39:51 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jan 18 10:41:29 2012 +1100" }, "message": "keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages\n\nDefine rcu_assign_keypointer(), which uses the key payload.rcudata instead\nof payload.data, to resolve the CONFIG_SPARSE_RCU_POINTER message:\n\"incompatible types in comparison expression (different address spaces)\"\n\nReplace the rcu_assign_pointer() calls in encrypted/trusted keys with\nrcu_assign_keypointer().\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "67175b855bfd6ed95ffeff95532173c07de6432d", "tree": "2f98cccf78987db9b319c67a523ab44edc7bde3b", "parents": [ "e268337dfe26dfc7efd422a804dbb27977a3cccc" ], "author": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Tue Jan 17 21:14:05 2012 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 15:40:51 2012 -0800" }, "message": "Fix compile breakage with kref.h\n\nThis set of build failures just started appearing on parisc:\n\n In file included from drivers/input/serio/serio_raw.c:12:\n include/linux/kref.h: In function \u0027kref_get\u0027:\n include/linux/kref.h:40: error: \u0027TAINT_WARN\u0027 undeclared (first use in this function)\n include/linux/kref.h:40: error: (Each undeclared identifier is reported only once\n include/linux/kref.h:40: error: for each function it appears in.)\n include/linux/kref.h: In function \u0027kref_sub\u0027:\n include/linux/kref.h:65: error: \u0027TAINT_WARN\u0027 undeclared (first use in this function)\n\nIt happens because TAINT_WARN is defined in kernel.h and this particular\ncompile doesn\u0027t seem to include it (no idea why it\u0027s just manifesting ..\nprobably some #include file untangling exposed it).\n\nFix by adding\n\n #include \u003clinux/kernel.h\u003e\n\nto linux/kref.h\n\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "10d68360871657204885371cdf2594412675d2f9", "tree": "85a4fa8d3b0dc0a7bc525475325f955f75d3881d", "parents": [ "4a6633ed08af5ba67790b4d1adcdeb8ceb55677e" ], "author": { "name": "Peter Moody", "email": "pmoody@google.com", "time": "Wed Jan 04 15:24:31 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:03 2012 -0500" }, "message": "audit: comparison on interprocess fields\n\nThis allows audit to specify rules in which we compare two fields of a\nprocess. Such as is the running process uid !\u003d to the running process\neuid?\n\nSigned-off-by: Peter Moody \u003cpmoody@google.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "4a6633ed08af5ba67790b4d1adcdeb8ceb55677e", "tree": "8b658f732f742d3d3a40f84b39ce4aa42f70d538", "parents": [ "c9fe685f7a17a0ee8bf3fbe51e40b1c8b8e65896" ], "author": { "name": "Peter Moody", "email": "pmoody@google.com", "time": "Tue Dec 13 16:17:51 2011 -0800" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:02 2012 -0500" }, "message": "audit: implement all object interfield comparisons\n\nThis completes the matrix of interfield comparisons between uid/gid\ninformation for the current task and the uid/gid information for inodes.\naka I can audit based on differences between the euid of the process and\nthe uid of fs objects.\n\nSigned-off-by: Peter Moody \u003cpmoody@google.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "c9fe685f7a17a0ee8bf3fbe51e40b1c8b8e65896", "tree": "510a09bc02c5dccb7ef83c88f2a00546b17e2c17", "parents": [ "b34b039324bf081554ee8678f9b8c5d937e5206c" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:02 2012 -0500" }, "message": "audit: allow interfield comparison between gid and ogid\n\nAllow audit rules to compare the gid of the running task to the gid of the\ninode in question.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "02d86a568c6d2d335256864451ac8ce781bc5652", "tree": "3ef085bd96cc79733cff28993379dbbd4b855813", "parents": [ "29ef73b7a823b77a7cd0bdd7d7cded3fb6c2587b" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:01 2012 -0500" }, "message": "audit: allow interfield comparison in audit rules\n\nWe wish to be able to audit when a uid\u003d500 task accesses a file which is\nuid\u003d0. Or vice versa. This patch introduces a new audit filter type\nAUDIT_FIELD_COMPARE which takes as an \u0027enum\u0027 which indicates which fields\nshould be compared. At this point we only define the task-\u003euid vs\ninode-\u003euid, but other comparisons can be added.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "0a300be6d5be8f66cd96609334710c268d0bfdce", "tree": "253d0d1e0aa28a6bdf883bb92e4b62fafe263563", "parents": [ "54d3218b31aee5bc9c859ae60fbde933d922448b" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:00 2012 -0500" }, "message": "audit: remove task argument to audit_set_loginuid\n\nThe function always deals with current. Don\u0027t expose an option\npretending one can use it for something. You can\u0027t.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "54d3218b31aee5bc9c859ae60fbde933d922448b", "tree": "ebc383920713c283133d885191d0c19cb049afd2", "parents": [ "efaffd6e4417860c67576ac760dd6e8bbd15f006" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: allow audit matching on inode gid\n\nMuch like the ability to filter audit on the uid of an inode collected, we\nshould be able to filter on the gid of the inode.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "efaffd6e4417860c67576ac760dd6e8bbd15f006", "tree": "a59ee886b609bbf761fb75744e5e468264c67ab5", "parents": [ "6422e78de6880c66a82af512d9bd0c85eb62e661" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: allow matching on obj_uid\n\nAllow syscall exit filter matching based on the uid of the owner of an\ninode used in a syscall. aka:\n\nauditctl -a always,exit -S open -F obj_uid\u003d0 -F perm\u003dwa\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "6422e78de6880c66a82af512d9bd0c85eb62e661", "tree": "9cce4d385a6508056be7645fd3511ab019b346f4", "parents": [ "7ff68e53ece8c175d2951bb8a30b3cce8f9c5579" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: remove audit_finish_fork as it can\u0027t be called\n\nAudit entry,always rules are not allowed and are automatically changed in\nexit,always rules in userspace. The kernel refuses to load such rules.\n\nThus a task in the middle of a syscall (and thus in audit_finish_fork())\ncan only be in one of two states: AUDIT_BUILD_CONTEXT or AUDIT_DISABLED.\nSince the current task cannot be in AUDIT_RECORD_CONTEXT we aren\u0027t every\ngoing to actually use the code in audit_finish_fork() since it will\nreturn without doing anything. Thus drop the code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "a4ff8dba7d8ce5ceb43fb27df66292251cc73bdc", "tree": "2c89a0a7a7dad853a2c2ec70417ef2f3f5a04fd4", "parents": [ "38cdce53daa0408a61fe6d86fe48f31515c9b840" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:58 2012 -0500" }, "message": "audit: inline audit_free to simplify the look of generic code\n\nmake the conditional a static inline instead of doing it in generic code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "38cdce53daa0408a61fe6d86fe48f31515c9b840", "tree": "a08ff80a819432fa32e384e1960249a59cdb4f33", "parents": [ "07c49417877f8658a6aa0ad9b4e21e4fd4df11b6" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:58 2012 -0500" }, "message": "audit: drop audit_set_macxattr as it doesn\u0027t do anything\n\nunused. deleted.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "07c49417877f8658a6aa0ad9b4e21e4fd4df11b6", "tree": "59a64b96c9f35b8559db4c46b5a43d2d9510c190", "parents": [ "56179a6ec65a56e0279a58e35cb450d38f061b94" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:57 2012 -0500" }, "message": "audit: inline checks for not needing to collect aux records\n\nA number of audit hooks make function calls before they determine that\nauxilary records do not need to be collected. Do those checks as static\ninlines since the most common case is going to be that records are not\nneeded and we can skip the function call overhead.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "b05d8447e7821695bc2fa3359431f7a664232743", "tree": "da90e558279c6407aa2e08d36bea5d9a21cd959c", "parents": [ "f031cd25568a390dc2c9c3a4015054183753449a" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:56 2012 -0500" }, "message": "audit: inline audit_syscall_entry to reduce burden on archs\n\nEvery arch calls:\n\nif (unlikely(current-\u003eaudit_context))\n\taudit_syscall_entry()\n\nwhich requires knowledge about audit (the existance of audit_context) in\nthe arch code. Just do it all in static inline in audit.h so that arch\u0027s\ncan remain blissfully ignorant.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" } ], "next": "d7e7528bcd456f5c36ad4a202ccfb43c5aa98bc4" }