)]}' { "log": [ { "commit": "e268337dfe26dfc7efd422a804dbb27977a3cccc", "tree": "59b9e22b0de119f0d85f329fa481d965cf7aec42", "parents": [ "5e5997849a8eae7a895a88699a1999b637f87303" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 15:21:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 15:21:19 2012 -0800" }, "message": "proc: clean up and fix /proc/\u003cpid\u003e/mem handling\n\nJüri Aedla reported that the /proc/\u003cpid\u003e/mem handling really isn\u0027t very\nrobust, and it also doesn\u0027t match the permission checking of any of the\nother related files.\n\nThis changes it to do the permission checks at open time, and instead of\ntracking the process, it tracks the VM at the time of the open. That\nsimplifies the code a lot, but does mean that if you hold the file\ndescriptor open over an execve(), you\u0027ll continue to read from the _old_\nVM.\n\nThat is different from our previous behavior, but much simpler. If\nsomebody actually finds a load where this matters, we\u0027ll need to revert\nthis commit.\n\nI suspect that nobody will ever notice - because the process mapping\naddresses will also have changed as part of the execve. So you cannot\nactually usefully access the fd across a VM change simply because all\nthe offsets for IO would have changed too.\n\nReported-by: Jüri Aedla \u003casd@ut.ee\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5e5997849a8eae7a895a88699a1999b637f87303", "tree": "3d5dc81509583183ccd1a262e6e4e17aede834c0", "parents": [ "00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0", "54b466e44b1c7809144bbd8cd6be3f85877ca46f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 12:41:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 12:41:10 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n cfq-iosched: fix use-after-free of cfqq\n" }, { "commit": "54b466e44b1c7809144bbd8cd6be3f85877ca46f", "tree": "01c99a8b6fff843ac7c327b8a0c777039e2c405e", "parents": [ "b3c9dd182ed3bdcdaf0e42625a35924b0497afdc" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Jan 17 21:26:11 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Jan 17 21:26:11 2012 +0100" }, "message": "cfq-iosched: fix use-after-free of cfqq\n\nWith the changes in life time management between the cfq IO contexts\nand the cfq queues, we now risk having cfqd-\u003eactive_queue being\nfreed when cfq_slice_expired() is being called. cfq_preempt_queue()\ncaches this queue and uses it after calling said function, causing\na use-after-free condition. This triggers the following oops,\nwhen cfqq_type() attempts to dereference it:\n\nBUG: unable to handle kernel paging request at ffff8800746c4f0c\nIP: [\u003cffffffff81266d59\u003e] cfqq_type+0xb/0x20\nPGD 18d4063 PUD 1fe15067 PMD 1ffb9067 PTE 80000000746c4160\nOops: 0000 [#1] SMP DEBUG_PAGEALLOC\nCPU 3\nModules linked in:\n\nPid: 1, comm: init Not tainted 3.2.0-josef+ #367 Bochs Bochs\nRIP: 0010:[\u003cffffffff81266d59\u003e] [\u003cffffffff81266d59\u003e] cfqq_type+0xb/0x20\nRSP: 0018:ffff880079c11778 EFLAGS: 00010046\nRAX: 0000000000000000 RBX: ffff880076f3df08 RCX: 0000000000000000\nRDX: 0000000000000006 RSI: ffff880074271888 RDI: ffff8800746c4f08\nRBP: ffff880079c11778 R08: 0000000000000078 R09: 0000000000000001\nR10: 09f911029d74e35b R11: 09f911029d74e35b R12: ffff880076f337f0\nR13: ffff8800746c4f08 R14: ffff8800746c4f08 R15: 0000000000000002\nFS: 00007f62fd44f700(0000) GS:ffff88007cd80000(0000) knlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\nCR2: ffff8800746c4f0c CR3: 0000000076c21000 CR4: 00000000000006e0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess init (pid: 1, threadinfo ffff880079c10000, task ffff880079c0a040)\nStack:\n ffff880079c117c8 ffffffff812683d8 ffff880079c117a8 ffffffff8125de43\n ffff8800744fcf48 ffff880074b43e98 ffff8800770c8828 ffff880074b43e98\n 0000000000000003 0000000000000000 ffff880079c117f8 ffffffff81254149\nCall Trace:\n [\u003cffffffff812683d8\u003e] cfq_insert_request+0x3f5/0x47c\n [\u003cffffffff8125de43\u003e] ? blk_recount_segments+0x20/0x31\n [\u003cffffffff81254149\u003e] __elv_add_request+0x1ca/0x200\n [\u003cffffffff8125aa99\u003e] blk_queue_bio+0x2ef/0x312\n [\u003cffffffff81258f7b\u003e] generic_make_request+0x9f/0xe0\n [\u003cffffffff8125907b\u003e] submit_bio+0xbf/0xca\n [\u003cffffffff81136ec7\u003e] submit_bh+0xdf/0xfe\n [\u003cffffffff81176d04\u003e] ext3_bread+0x50/0x99\n [\u003cffffffff811785b3\u003e] dx_probe+0x38/0x291\n [\u003cffffffff81178864\u003e] ext3_dx_find_entry+0x58/0x219\n [\u003cffffffff81178ad5\u003e] ext3_find_entry+0xb0/0x406\n [\u003cffffffff8110c4d5\u003e] ? cache_alloc_debugcheck_after.isra.46+0x14d/0x1a0\n [\u003cffffffff8110cfbd\u003e] ? kmem_cache_alloc+0xef/0x191\n [\u003cffffffff8117a330\u003e] ext3_lookup+0x39/0xe1\n [\u003cffffffff81119461\u003e] d_alloc_and_lookup+0x45/0x6c\n [\u003cffffffff8111ac41\u003e] do_lookup+0x1e4/0x2f5\n [\u003cffffffff8111aef6\u003e] link_path_walk+0x1a4/0x6ef\n [\u003cffffffff8111b557\u003e] path_lookupat+0x59/0x5ea\n [\u003cffffffff8127406c\u003e] ? __strncpy_from_user+0x30/0x5a\n [\u003cffffffff8111bce0\u003e] do_path_lookup+0x23/0x59\n [\u003cffffffff8111cfd6\u003e] user_path_at_empty+0x53/0x99\n [\u003cffffffff8107b37b\u003e] ? remove_wait_queue+0x51/0x56\n [\u003cffffffff8111d02d\u003e] user_path_at+0x11/0x13\n [\u003cffffffff811141f5\u003e] vfs_fstatat+0x3a/0x64\n [\u003cffffffff8111425a\u003e] vfs_stat+0x1b/0x1d\n [\u003cffffffff81114359\u003e] sys_newstat+0x1a/0x33\n [\u003cffffffff81060e12\u003e] ? task_stopped_code+0x42/0x42\n [\u003cffffffff815d6712\u003e] system_call_fastpath+0x16/0x1b\nCode: 89 e6 48 89 c7 e8 fa ca fe ff 85 c0 74 06 4c 89 2b 41 b6 01 5b 44 89 f0 41 5c 41 5d 41 5e 5d c3 55 48 89 e5 66 66 66 66 90 31 c0 \u003c8b\u003e 57 04 f6 c6 01 74 0b 83 e2 20 83 fa 01 19 c0 83 c0 02 5d c3\nRIP [\u003cffffffff81266d59\u003e] cfqq_type+0xb/0x20\n RSP \u003cffff880079c11778\u003e\nCR2: ffff8800746c4f0c\n\nGet rid of the caching of cfqd-\u003eactive_queue, and reorder the\ncheck so that it happens before we expire the active queue.\n\nThanks to Tejun for pin pointing the error location.\n\nReported-by: Chris Mason \u003cchris.mason@oracle.com\u003e\nTested-by: Chris Mason \u003cchris.mason@oracle.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0", "tree": "e2221c08271cd4413f191532a957cb0e7b2a525b", "parents": [ "8364919c5698d934860aabc607ffd32b13c8c37c", "8ea11f7f11c811d1f502c2dabc5259d447c2f2a0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 11:56:29 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 11:56:29 2012 -0800" }, "message": "Merge branch \u0027stable/for-linus-fixes-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-fixes-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/balloon: Move the registration from device to subsystem.\n" }, { "commit": "8364919c5698d934860aabc607ffd32b13c8c37c", "tree": "8d11db5c61d442f9bfc4499e56353ac120af6f8b", "parents": [ "d3569d163cba40f9c5682df083dbed3f049478a4", "7f788ec07d169123bb1bd14e6221a2b228079ce8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:49:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:49:06 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\n* \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n USB: EHCI: Don\u0027t use NO_IRQ in xilinx ehci driver\n microblaze: Add topology init\n" }, { "commit": "d3569d163cba40f9c5682df083dbed3f049478a4", "tree": "1a473b4378d3184859424b2bd1389f3d46083fec", "parents": [ "20c300b10c358daa507be335aec6aa3987ef425a", "f0e48b6bd4e407459715240cd241ddb6b89bdf81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:48:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:48:13 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: virtuoso: Xonar DS: fix polarity of front output\n ALSA: Au88x0 - Reduce the number of playback subdevices of au8830 from 32 to 16\n ALSA: Au88x0 - Support 4 channels playback when AC97 codecs has SDAC bit\n ALSA: HDA: Fix internal microphone on Dell Studio 16 XPS 1645\n ALSA: Don\u0027t prompt for CONFIG_SND_COMPRESS_OFFLOAD\n ALSA: HDA: Use LPIB position fix for Macbook Pro 7,1\n" }, { "commit": "20c300b10c358daa507be335aec6aa3987ef425a", "tree": "a6b39d4003aff1c1f4a413c3e92a66b37e130d90", "parents": [ "951880e634a79884236a575b896abf55c39ae0bf" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Tue Jan 17 12:54:01 2012 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:30:38 2012 -0800" }, "message": "tty: remove unused tty_driver-\u003etermios_locked\n\nThis field is unused since 2.6.28 (commit fe6e29fdb1a7: \"tty: simplify\nktermios allocation\", to be exact)\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "951880e634a79884236a575b896abf55c39ae0bf", "tree": "b23ec5a95cd72083227ed5b7396e2f8799f4a58c", "parents": [ "c2bc3a316a7281f67e36b34dac2802cbe36a9128" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:19:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:19:41 2012 -0800" }, "message": "Revert \"capabitlies: ns_capable can use the cap helpers rather than lsm call\"\n\nThis reverts commit d2a7009f0bb03fa22ad08dd25472efa0568126b9.\n\nJ. R. Okajima explains:\n\n \"After this commit, I am afraid access(2) on NFS may not work\n correctly. The scenario based upon my guess.\n - access(2) overrides the credentials.\n - calls inode_permission() -- ... -- generic_permission() --\n ns_capable().\n - while the old ns_capable() calls security_capable(current_cred()),\n the new ns_capable() calls has_ns_capability(current) --\n security_capable(__task_cred(t)).\n\n current_cred() returns current-\u003ecred which is effective (overridden)\n credentials, but __task_cred(current) returns current-\u003ereal_cred (the\n NFSD\u0027s credential). And the overridden credentials by access(2) lost.\"\n\nRequested-by: J. R. Okajima \u003chooanon05@yahoo.co.jp\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c2bc3a316a7281f67e36b34dac2802cbe36a9128", "tree": "53e0b78ac25109b71c47bf47f4cdbb35ef1e7e36", "parents": [ "5674124f9f16f196533abb383193bd232c9afc2f", "2dac8e54f988ab58525505d7ef982493374433c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:23:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:23:09 2012 -0800" }, "message": "Merge branch \u0027x86/rdrand\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86/rdrand\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n random: Adjust the number of loops when initializing\n random: Use arch-specific RNG to initialize the entropy store\n" }, { "commit": "5674124f9f16f196533abb383193bd232c9afc2f", "tree": "275af51d6f7749dc72e1530fcace7c770cdbdd46", "parents": [ "5d48421be3c8a9f753d61b826ecb3ad287d867c0", "72142fd4109105c6bd21658966ca5e93c1684081" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:19:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 18:19:19 2012 -0800" }, "message": "Merge branch \u0027x86-syscall-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-syscall-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86: Move \u003casm/asm-offsets.h\u003e from trace_syscalls.c to asm/syscall.h\n x86, um: Fix typo in 32-bit system call modifications\n um: Use $(srctree) not $(KBUILD_SRC)\n x86, um: Mark system call tables readonly\n x86, um: Use the same style generated syscall tables as native\n um: Generate headers before generating user-offsets.s\n um: Run host archheaders, allow use of host generated headers\n kbuild, headers.sh: Don\u0027t make archheaders explicitly\n x86, syscall: Allow syscall offset to be symbolic\n x86, syscall: Re-fix typo in comment\n x86: Simplify syscallhdr.sh\n x86: Generate system call tables and unistd_*.h from tables\n checksyscalls: Use arch/x86/syscalls/syscall_32.tbl as source\n x86: Machine-readable syscall tables and scripts to process them\n trace: Include \u003casm/asm-offsets.h\u003e in trace_syscalls.c\n x86-64, ia32: Move compat_ni_syscall into C and its own file\n x86-64, syscall: Adjust comment spacing and remove typo\n kbuild: Add support for an \"archheaders\" target\n kbuild: Add support for installing generated asm headers\n" }, { "commit": "5d48421be3c8a9f753d61b826ecb3ad287d867c0", "tree": "69a20e537b5b76643484fd4e9b1e17e1eda60fb3", "parents": [ "6e03db2ba17b5d32431b4c2012e6a41153318a90", "be405f95f0a090d1dfc26a5bb4d781c00f34479c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 17:53:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 17:53:27 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:\n ktest: Add INGORE_ERRORS to ignore warnings in boot up\n ktest: Still do reboot even for REBOOT_TYPE \u003d script\n ktest: Fix compare script to test if options are not documented\n ktest: Detect typos in option names\n ktest: Have all values be set by defaults\n ktest: Change initialization of defaults hash to perl format\n ktest: Add options SWITCH_TO_GOOD and SWITCH_TO_TEST\n ktest: Allow overriding bisect test results\n ktest: Evaluate options before processing them\n ktest: Evaluate $KERNEL_VERSION in both install and post install\n ktest: Only ask options needed for install\n ktest: When creating a new config, ask for BUILD_OPTIONS\n ktest: Do not ask for some options if the only test is build\n ktest: Ask for type of test when creating a new config\n ktest: Allow bisect test to restart where it left off\n ktest: When creating new config, allow the use of ${THIS_DIR}\n ktest: Add default for ssh-user, build-target and target-image\n ktest: Allow success logs to be stored\n ktest: Save test output\n" }, { "commit": "6e03db2ba17b5d32431b4c2012e6a41153318a90", "tree": "001d90ae19ec62d7f34df127a36783ef78e5bc75", "parents": [ "e032d80774315869aa2285b217fdbbfed86c0b49", "1a51a0ce174ddc0b0c11b6a0dbd179d95020e80b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 17:47:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 17:47:27 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:\n ARM: OMAP3: fix build on !CONFIG_IOMMU_API\n" }, { "commit": "e032d80774315869aa2285b217fdbbfed86c0b49", "tree": "c23bcaaa2217a68fd142aaa4dbf9c471f6eb9569", "parents": [ "5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jan 16 14:40:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 17:08:42 2012 -0800" }, "message": "mce: fix warning messages about static struct mce_device\n\nWhen suspending, there was a large list of warnings going something like:\n\n\tDevice \u0027machinecheck1\u0027 does not have a release() function, it is broken and must be fixed\n\nThis patch turns the static mce_devices into dynamically allocated, and\nproperly frees them when they are removed from the system. It solves\nthe warning messages on my laptop here.\n\nReported-by: \"Srivatsa S. Bhat\" \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nTested-by: Djalal Harouni \u003ctixxdz@opendz.org\u003e\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6", "tree": "f956ebeec64d7c4249a8886585dc8416e51d72a3", "parents": [ "a12587b00388d1694933252e97abca237bc3a6b8", "a61c2332f8e1939cd4984b63cab641b2366eb428" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:34:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:34:44 2012 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm\n\n* \u0027fixes\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm:\n ARM: sa11x0: assabet: fix build warning\n ARM: Add arm_memblock_steal() to allocate memory away from the kernel\n ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format\n ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97\n ARM: 7272/1: S3C24XX: Fix build error for missing \u003cmach/system-reset.h\u003e\n ARM: 7271/1: Fix typo in conversion of ARCH_NR_GPIOS to Kconfig\n" }, { "commit": "a12587b00388d1694933252e97abca237bc3a6b8", "tree": "56ba7ec24ed84f81ce41fc327c3722ab2fb9f3eb", "parents": [ "adfeb6e9f46ded31b46fe406ad0dd6a9b4e0f7fe", "7c5465d6ccd759caa959828e2add5603518dafc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:08:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:08:13 2012 -0800" }, "message": "Merge tag \u0027nfs-for-3.3-2\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nNFS client bugfixes and cleanups for Linux 3.3 (pull 2)\n\n* tag \u0027nfs-for-3.3-2\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n pnfsblock: alloc short extent before submit bio\n pnfsblock: remove rpc_call_ops from struct parallel_io\n pnfsblock: move find lock page logic out of bl_write_pagelist\n pnfsblock: cleanup bl_mark_sectors_init\n pnfsblock: limit bio page count\n pnfsblock: don\u0027t spinlock when freeing block_dev\n pnfsblock: clean up _add_entry\n pnfsblock: set read/write tk_status to pnfs_error\n pnfsblock: acquire im_lock in _preload_range\n NFS4: fix compile warnings in nfs4proc.c\n nfs: check for integer overflow in decode_devicenotify_args()\n NFS: cleanup endian type in decode_ds_addr()\n NFS: add an endian notation\n" }, { "commit": "adfeb6e9f46ded31b46fe406ad0dd6a9b4e0f7fe", "tree": "244eeecd2f0ecce8b84ab1301824168f1651d632", "parents": [ "97740400bc76b64781d01f8cdfbcf750582006ef", "5f8b1f877e0212bfde8cb950725391f4a50c9396" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:07:46 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:07:46 2012 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: (sysfs-interface) Update tempX_type attribute to be more generic\n hwmon: (adm1031) Fix coding style issues\n hwmon: (it87) Add IT8728F support\n hwmon: (coretemp) Add missing section annotations\n hwmon: (lm90) Add range check to set_update_interval\n hwmon: (lm63) Support extended lookup table of LM96163\n hwmon: (lm63) Expose automatic fan speed control lookup table\n hwmon: (lm63) Fix incorrect comment about I2C address\n hwmon: (lm63) LM64 has a dedicated pin for tachometer\n hwmon: (lm63) Add sensor type attribute for external sensor on LM96163\n hwmon: (lm63) Add support for update_interval sysfs attribute\n hwmon: (lm63) Add support for writing the external critical temperature\n hwmon: (lm63) Add support for unsigned upper temperature limits\n hwmon: (lm63) Add support for LM96163\n hwmon: (lm63) Add support for external temperature offset register\n hwmon: (lm63) Fix checkpatch errors\n hwmon: (max1111) Change sysfs interface to in[0-3]_input in millivolts\n" }, { "commit": "97740400bc76b64781d01f8cdfbcf750582006ef", "tree": "85900329fbce72011339ab2348dcf13dde2a64fd", "parents": [ "408e057870c8680a50963b08f9f7efaa151a74ec", "ee34a37049114303011e154478c63b977bcff24c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:02:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:02:30 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Hibernate: Drop the check of swap space size for compressed image\n PM / shmobile: fix A3SP suspend method\n PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset\n PM / Domains: Fix build for CONFIG_PM_SLEEP unset\n PM: Make sysrq-o be available for CONFIG_PM unset\n" }, { "commit": "408e057870c8680a50963b08f9f7efaa151a74ec", "tree": "4d4085332d0b1b7e8727cb037dfb206fc1ed538c", "parents": [ "287b901dcadd7eb3c5aa93b679bbad4058814921", "29a36d4dec6cf7ad72e6e3337bf954096cbbb4cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 14:36:07 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 14:36:07 2012 -0800" }, "message": "Merge branch \u0027misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n scripts/coccinelle: improve the coverage of some semantic patches\n coccinelle: semantic patches related to devm_ functions (part 2)\n coccinelle: semantic patches related to devm_ functions (part 1)\n coccinelle.txt: update documentation to include M\u003d option\n coccicheck: add M\u003d option to control which dir is processed\n ctags: remove struct forward declarations\n scripts/tags.sh: Add Page flag function magic\n" }, { "commit": "287b901dcadd7eb3c5aa93b679bbad4058814921", "tree": "f7fd50888b456b559ef58892b33f2f263a49a0a6", "parents": [ "c63dbbd5268c397f051e0e0f665799ef64a1f3a4", "30c4eaafac80cc110efa66d2dfc551386eefdf53" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 14:35:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 14:35:34 2012 -0800" }, "message": "Merge branch \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n menuconfig: fix a regression when canceling the prompt dialog at exit\n kbuild: Fix compiler warning with assertion when calling \u0027fwrite\u0027\n Improve update-po-config output\n menuconfig: let make not report error when not save configuration\n merge_config.sh: fix bug in final check\n merge_config.sh: whitespace cleanup\n merge_config.sh: use signal names compatible with dash and bash\n kconfig: add merge_config.sh script\n kconfig: use xfwrite wrapper function to silence warnings\n kconfig: fix set but not used warnings\n kconfig: fix warnings by specifing format arguments\n" }, { "commit": "c63dbbd5268c397f051e0e0f665799ef64a1f3a4", "tree": "3d832ca143858fd601869a1e2dbe553bd513d854", "parents": [ "53999bf34d55981328f8ba9def558d3e104d6e36", "7c43185138cf523b0810ffd2c9e18e2ecb356730" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 14:34:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 14:34:54 2012 -0800" }, "message": "Merge branch \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n Kbuild: Use dtc\u0027s -d (dependency) option\n dtc: Implement -d option to write out a dependency file\n kbuild: Fix comment in Makefile.lib\n scripts/genksyms: clean lex/yacc generated files\n kbuild: Correctly deal with make options which contain an \"s\"\n" }, { "commit": "a61c2332f8e1939cd4984b63cab641b2366eb428", "tree": "00588593f5cff6da2386e897be6b701fc789e916", "parents": [ "716a3dc20084da9b3ab17bd125005a5345e23e3b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 14 16:10:53 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 22:25:29 2012 +0000" }, "message": "ARM: sa11x0: assabet: fix build warning\n\nSince a32618d2 (ARM: pgtable: switch to use pgtable-nopud.h), assabet\nwarns as follows:\n\narch/arm/mach-sa1100/assabet.c: In function \u0027map_sa1100_gpio_regs\u0027:\narch/arm/mach-sa1100/assabet.c:264: warning: passing argument 1 of \u0027pmd_offset\u0027 from incompatible pointer type\n\nFix this by adding the necessary pud_offset() macro.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "5f8b1f877e0212bfde8cb950725391f4a50c9396", "tree": "095c4ae2bd610d00a9cf44055efb0198d2c7d237", "parents": [ "1c720093f635af490e103c79c056e7408aee6618" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Mon Jan 16 22:51:48 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:48 2012 +0100" }, "message": "hwmon: (sysfs-interface) Update tempX_type attribute to be more generic\n\nThe temp[1-*]_type attribute reports the temperature sensor type. Sensor type 1\nis described as \"PII/Celeron Diode\", which is quite restrictive; other CPUs\nmay also have an embedded temperature sensor diode with similar characteristics.\nChange description to \"CPU embedded diode\" to be more generic.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "1c720093f635af490e103c79c056e7408aee6618", "tree": "b604e59b53e73ba693e855b89c746900f091ca69", "parents": [ "16b5dda22e3798e61bb008d2329d4f4d90ef764e" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Mon Jan 16 22:51:48 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:48 2012 +0100" }, "message": "hwmon: (adm1031) Fix coding style issues\n\nFix almost all coding style issues except for the multi-line macro errors,\nwhich do not really apply since the macros are not multi-line statements\nbut declarations.\n\nBased on merged patch series from Zac Storer; fixed remaining checkpatch\nerrors and warnings.\n\nCc: Zac Storer \u003czac.3.14159@gmail.com\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "16b5dda22e3798e61bb008d2329d4f4d90ef764e", "tree": "f9b00eb0982045d496835b2ab0e829995c3d94d9", "parents": [ "d6db23c7ce8d02896197394c1d741bdffe58ac54" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 16 22:51:48 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:48 2012 +0100" }, "message": "hwmon: (it87) Add IT8728F support\n\nUntil we get a datasheet for the IT8728F, treat it as fully compatible\nwith the IT8721F, as it seems to work reasonably well.\n\nThis closes kernel bug #27262.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "d6db23c7ce8d02896197394c1d741bdffe58ac54", "tree": "8382f3907f04f29bb5bca9ce4e93a30b32b7f5be", "parents": [ "6b101116ae445311031f3e9f91d3010d444b9845" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "message": "hwmon: (coretemp) Add missing section annotations\n\nMany functions in the coretemp driver lack a proper section\nannotation. Add them to let the kernel free the memory after\ninitialization when possible.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Durgadoss R \u003cdurgadoss.r@intel.com\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "6b101116ae445311031f3e9f91d3010d444b9845", "tree": "418e5369d31ebdf8aea6bfa4c012e7ac8702ded6", "parents": [ "2fe28ab51d200121b9c39f9b34cf2d132fcf5de1" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "message": "hwmon: (lm90) Add range check to set_update_interval\n\nWhen writing the update_interval attribute, the parameter value was\nnot range checked, which could cause an integer overflow and result\nin an arbitrary update interval. Fix by limiting the value range to\n\u003c0, 100000\u003e.\n\nReported-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "2fe28ab51d200121b9c39f9b34cf2d132fcf5de1", "tree": "e3f51eb47a960a2bbd2a517f1c9988daa2c8755f", "parents": [ "d216f6809eb690b9a888c286cde68cda4d0c4cfa" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "message": "hwmon: (lm63) Support extended lookup table of LM96163\n\nThe LM96163 has an extended lookup table with 12 entries instead of 8,\nadd support for that.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nTested-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "d216f6809eb690b9a888c286cde68cda4d0c4cfa", "tree": "46a83526ded3df6713a0d41514adb1ad465b969f", "parents": [ "d93ab7807063ade8ad4b3ba55347e333dbde4d52" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "message": "hwmon: (lm63) Expose automatic fan speed control lookup table\n\nThe LM63 and compatible devices have a lookup table to control the fan\nspeed automatically. Expose it in sysfs. Values are cached for 5\nseconds, independently of the other register values to avoid slowing\ndown \"sensors\". We might make the table values writable in the future.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nTested-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "d93ab7807063ade8ad4b3ba55347e333dbde4d52", "tree": "130f8591f19df28a325c14bde7d89280ab2a09b2", "parents": [ "409c0b5bdf7d80e61380ce6b226b98405576d7cc" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:47 2012 +0100" }, "message": "hwmon: (lm63) Fix incorrect comment about I2C address\n\nWhat was true of the LM63 doesn\u0027t apply to the LM64.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "409c0b5bdf7d80e61380ce6b226b98405576d7cc", "tree": "c9c3f4d9ad0d74203599db8d77768a2676b22812", "parents": [ "f496b2d4f181fa5fcdf24016b11caaa33eb12477" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "message": "hwmon: (lm63) LM64 has a dedicated pin for tachometer\n\nOn the LM64, the tachometer function has a dedicated pin and fan speed\nmonitoring is always enabled.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "f496b2d4f181fa5fcdf24016b11caaa33eb12477", "tree": "8b52c917c9e95dcd4fd0c1907ac083c293601ed1", "parents": [ "04738b2b2f37c13bbe37b7695fec6c1c60d79c7a" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "message": "hwmon: (lm63) Add sensor type attribute for external sensor on LM96163\n\nOn LM96163, the external temperature sensor type is configurable to\neither a thermal diode or a 3904 transistor. The chip reports a wrong\ntemperature if misconfigured. Add writable attribute to support it.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "04738b2b2f37c13bbe37b7695fec6c1c60d79c7a", "tree": "77802752c8901e35eab6bfb1763e7160e37c7328", "parents": [ "94e55df48a230162edc641e55c28d058f5b6cb76" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "message": "hwmon: (lm63) Add support for update_interval sysfs attribute\n\nThe update interval is configurable on LM63 and compatibles. Add\nsupport for it.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "94e55df48a230162edc641e55c28d058f5b6cb76", "tree": "19b93afcb7e23289cf2cc82c7aaa114f6f54a158", "parents": [ "e872c91e726e7f7f74817cf9a81a138bf0d0a583" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "message": "hwmon: (lm63) Add support for writing the external critical temperature\n\nOn LM64, the external critical temperature limit is always writable. On LM96163,\nit is writable if the chip is configured for it. Add conditional support for\nwriting the register dependent on chip type and configuration.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "e872c91e726e7f7f74817cf9a81a138bf0d0a583", "tree": "5cba7f2c9b5afa53f5e3dad11e2272aed5e1fb2f", "parents": [ "210961c436d5c552a816ae9c6b38cbc8b993395a" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:46 2012 +0100" }, "message": "hwmon: (lm63) Add support for unsigned upper temperature limits\n\nLM96163 supports unsigned upper limits for the external temperature sensor.\nAdd support for it.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "210961c436d5c552a816ae9c6b38cbc8b993395a", "tree": "234ab06ad1a1a3acc69082d4964e5b955dd337a6", "parents": [ "786375f7298dcc78a7cf44be9e15fb79bddc6f25" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "message": "hwmon: (lm63) Add support for LM96163\n\nLM96163 is an enhanced version of LM63 with improved PWM resolution. Add chip\ndetection code as well as support for improved PWM resolution if the chip is\nconfigured to use it.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nTested-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "786375f7298dcc78a7cf44be9e15fb79bddc6f25", "tree": "1fa888b117ab8e6a9012252599f231620c62aa95", "parents": [ "662bda28328b983f842f008a81a5fd4e6de6c5fe" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "message": "hwmon: (lm63) Add support for external temperature offset register\n\nLM63 and compatibles support a temperature offset register for the external\ntemperature sensor. Add support for it.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "662bda28328b983f842f008a81a5fd4e6de6c5fe", "tree": "c9f63cad236851f617712dcf0c8308ee47ac9481", "parents": [ "012f3b9118c7aaa3549f89299386f92b6580d235" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "message": "hwmon: (lm63) Fix checkpatch errors\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nTested-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "012f3b9118c7aaa3549f89299386f92b6580d235", "tree": "7ee22ace6e9446c699ffa2451e03225bddc80590", "parents": [ "53999bf34d55981328f8ba9def558d3e104d6e36" ], "author": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Mon Jan 16 22:51:45 2012 +0100" }, "message": "hwmon: (max1111) Change sysfs interface to in[0-3]_input in millivolts\n\nThis patch fixed the inconsistent max1111 sysfs interface as pointed\nout by Jean Delvare:\n\n It was pointed to me that the max1111 driver doesn\u0027t implement the\n standard sysfs interface for hwmon drivers (as described in\n Documentation/hwmon/sysfs-interface). It exports files adc[0-3]_in,\n which\n aren\u0027t part of the standard interface. Presumably these should be\n renamed to in[0-3]_input. Renaming them is probably not sufficient\n though, as I see no scaling done in the driver. As the MAX1111 chip has\n a documented full scale of 2.048V, I take it that the LSB of the ADC\n has a weight of 8 mV. Exporting raw register values to user-space is\n not OK.\n\nReported-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "2dac8e54f988ab58525505d7ef982493374433c3", "tree": "a36ddf3790f984c8331b6d44bc1baa0f08c6a842", "parents": [ "3e88bdff1c65145f7ba297ccec69c774afe4c785" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:23:29 2012 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:33:49 2012 -0800" }, "message": "random: Adjust the number of loops when initializing\n\nWhen we are initializing using arch_get_random_long() we only need to\nloop enough times to touch all the bytes in the buffer; using\npoolwords for that does twice the number of operations necessary on a\n64-bit machine, since in the random number generator code \"word\" means\n32 bits.\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nLink: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-tytso@mit.edu\n" }, { "commit": "3e88bdff1c65145f7ba297ccec69c774afe4c785", "tree": "2d01752cdd8a5b3f1cbcad3e0ef55d6f02696efd", "parents": [ "cf833d0b9937874b50ef2867c4e8badfd64948ce" ], "author": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Thu Dec 22 16:28:01 2011 -0500" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Jan 16 11:18:21 2012 -0800" }, "message": "random: Use arch-specific RNG to initialize the entropy store\n\nIf there is an architecture-specific random number generator (such as\nRDRAND for Intel architectures), use it to initialize /dev/random\u0027s\nentropy stores. Even in the worst case, if RDRAND is something like\nAES(NSA_KEY, counter++), it won\u0027t hurt, and it will definitely help\nagainst any other adversaries.\n\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nLink: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-tytso@mit.edu\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "30c4eaafac80cc110efa66d2dfc551386eefdf53", "tree": "e68f07f280fbcb820addb8529193be37dc183d54", "parents": [ "37ae2d5998aa29d8bf52f124199a21341bc6d18d" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Jan 16 15:57:39 2012 +0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Jan 16 14:40:16 2012 +0100" }, "message": "menuconfig: fix a regression when canceling the prompt dialog at exit\n\nThis commit fixes a bug, while introducing a new one..\n\ncommit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2\nAuthor: Wang YanQing \u003cudknight@gmail.com\u003e\nDate: Thu Jan 12 11:31:32 2012 +0800\n\n menuconfig: let make not report error when not save configuration\n\nPressing ESC should cancel the yes/no dialog and return back to\nthe main menu, but not exit from menuconfig.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Wang YanQing \u003cudknight@gmail.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "f0e48b6bd4e407459715240cd241ddb6b89bdf81", "tree": "3b677937923ff93c7bd981c8eb455fb4bf2d67a8", "parents": [ "49b9c40e9b5e47ef64f8601b84981fa45c3c4f86" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Sat Jan 14 16:42:24 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jan 16 12:19:55 2012 +0100" }, "message": "ALSA: virtuoso: Xonar DS: fix polarity of front output\n\nThe two DACs for the front output and the surround/center/LFE/back\noutputs are wired up out of phase, so when channels are duplicated,\ntheir sound can cancel out each other and result in a weaker bass\nresponse. To fix this, reverse the polarity of the neutron flow to\nthe front output.\n\nReported-any-tested-by: Daniel Hill \u003cdaniel@enemyplanet.geek.nz\u003e\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nCc: 2.6.34+ \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "49b9c40e9b5e47ef64f8601b84981fa45c3c4f86", "tree": "963fc2585b16cdf8bd83e9fc9403354afa4b4385", "parents": [ "7b32486ca449a20d64fa381262cc5e56893f0ac1" ], "author": { "name": "Raymond Yau", "email": "superquad.vortex2@gmail.com", "time": "Fri Jan 13 10:35:01 2012 +0800" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jan 16 12:16:42 2012 +0100" }, "message": "ALSA: Au88x0 - Reduce the number of playback subdevices of au8830 from 32 to 16\n\n- The maximum number of playback streams depend on the number of sample\n rate conveters (16) and the number of DMA channels (32).\n\nSigned-off-by: Raymond Yau \u003csuperquad.vortex2@gmail.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "7b32486ca449a20d64fa381262cc5e56893f0ac1", "tree": "e4cade4011a76062492344e5d05cc7095eccfa7e", "parents": [ "ffe535edb9a9c5b4d5fe03dfa3d89a1495580f1b" ], "author": { "name": "Raymond Yau", "email": "superquad.vortex2@gmail.com", "time": "Fri Jan 13 10:30:08 2012 +0800" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jan 16 12:16:34 2012 +0100" }, "message": "ALSA: Au88x0 - Support 4 channels playback when AC97 codecs has SDAC bit\n\n- Check SDAC bit of AC97 codec for supporting 4 channels playback.\n\nSigned-off-by: Raymond Yau \u003csuperquad.vortex2@gmail.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "ffe535edb9a9c5b4d5fe03dfa3d89a1495580f1b", "tree": "6a8621b6d89c811c6cd95e816967828b7bae3d60", "parents": [ "5c845beb4220ba7cddb099bd47c72be7e6919712" ], "author": { "name": "David Henningsson", "email": "david.henningsson@canonical.com", "time": "Mon Jan 16 10:52:20 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jan 16 12:15:26 2012 +0100" }, "message": "ALSA: HDA: Fix internal microphone on Dell Studio 16 XPS 1645\n\nMore than one user reports that changing the model from \"both\" to\n\"dmic\" makes their Internal Mic work.\n\nCc: stable@kernel.org\nTested-by: Martin Ling \u003cmartin-launchpad@earth.li\u003e\nBugLink: https://bugs.launchpad.net/bugs/795823\nSigned-off-by: David Henningsson \u003cdavid.henningsson@canonical.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "1a51a0ce174ddc0b0c11b6a0dbd179d95020e80b", "tree": "b30ece8d9230bf47f7ed552986e24187b3e0e3a6", "parents": [ "f93ea733878733f3e98475bc3e2ccf789bebcfb8" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Wed Jan 11 15:28:11 2012 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jan 16 11:49:47 2012 +0100" }, "message": "ARM: OMAP3: fix build on !CONFIG_IOMMU_API\n\nomap3isp depends on CONFIG_IOMMU_API, so avoid registering its\ndevice (and defining its configuration structs) on !CONFIG_IOMMU_API.\n\nThis is generally nice to have, but more importantly, it fixes:\n\narch/arm/plat-omap/include/plat/iommu.h: In function \u0027dev_to_omap_iommu\u0027:\narch/arm/plat-omap/include/plat/iommu.h:135: error: \u0027struct\ndev_archdata\u0027 has no member named \u0027iommu\u0027\narch/arm/mach-omap2/devices.c: In function \u0027omap3_init_camera\u0027:\narch/arm/mach-omap2/devices.c:222: error: \u0027struct dev_archdata\u0027 has no\nmember named \u0027iommu\u0027\nmake[1]: *** [arch/arm/mach-omap2/devices.o] Error 1\nmake: *** [arch/arm/mach-omap2] Error 2\n\nWhich happens because while setting up the omap3isp device we try\nto access the (now nonexistent) iommu member of dev_archdata.\n\nCompile tested with omap2plus_defconfig on today\u0027s:\n\ncommit e343a895a9f342f239c5e3c5ffc6c0b1707e6244\nMerge: 06792c4 193a667\nAuthor: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nDate: Tue Jan 10 18:04:27 2012 -0800\n\n Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n\nReported-by: Govindraj Raja \u003cgovindraj.raja@ti.com\u003e\nReported-by: Arik Nemtsov \u003carik@wizery.com\u003e\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Joerg Roedel \u003cJoerg.Roedel@amd.com\u003e\nCc: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "7f788ec07d169123bb1bd14e6221a2b228079ce8", "tree": "1566fc6bd5520e3a8372114904b8b9ba8fa9c6a7", "parents": [ "d761f0c521868e59cd0bc59159cbdb4686fe210d" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Thu Jan 12 09:18:03 2012 +0100" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Jan 16 08:23:15 2012 +0100" }, "message": "USB: EHCI: Don\u0027t use NO_IRQ in xilinx ehci driver\n\nDrivers shouldn\u0027t use NO_IRQ. This driver is used\nby Microblaze and PPC. PPC defines NO_IRQ as 0\nand Microblaze has removed it.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nAcked-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCC: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCC: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCC: linux-usb@vger.kernel.org\nCC: devicetree-discuss@lists.ozlabs.org\n" }, { "commit": "53999bf34d55981328f8ba9def558d3e104d6e36", "tree": "4ca98169e5c96c1ec8e04d15fce75c60a8b9578d", "parents": [ "122804ecb59493fbb4d31b3ba9ac59faaf45276f" ], "author": { "name": "Kevin Winchester", "email": "kjwinchester@gmail.com", "time": "Sun Jan 15 19:32:55 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 16:21:07 2012 -0800" }, "message": "error: implicit declaration of function \u0027module_flags_taint\u0027\n\nRecent changes to kernel/module.c caused the following compile\nerror:\n\n kernel/module.c: In function ‘show_taint’:\n kernel/module.c:1024:2: error: implicit declaration of function ‘module_flags_taint’ [-Werror\u003dimplicit-function-declaration]\n cc1: some warnings being treated as errors\n\nCorrect this error by moving the definition of module_flags_taint\noutside of the #ifdef CONFIG_MODULE_UNLOAD section.\n\nSigned-off-by: Kevin Winchester \u003ckjwinchester@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "122804ecb59493fbb4d31b3ba9ac59faaf45276f", "tree": "cff4d8a158c412e4a8d3abc8d91bb0eb52b01c9a", "parents": [ "16008d641670571ff4cd750b416c7caf2d89f467", "126400033940afb658123517a2e80eb68259fbd7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:49:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:49:56 2012 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)\n [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver\n mb86a20s: Add a few more register settings at the init seq\n mb86a20s: Group registers into the same line\n [media] [PATCH] don\u0027t reset the delivery system on DTV_CLEAR\n [media] [BUG] it913x-fe fix typo error making SNR levels unstable\n [media] cx23885: Query the CX25840 during enum_input for status\n [media] cx25840: Add support for g_input_status\n [media] rc-videomate-m1f.c Rename to match remote controler name\n [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828\n [media] convert drivers/media/* to use module_platform_driver()\n [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB\n [media] Exynos4 JPEG codec v4l2 driver\n [media] doc: v4l: selection: choose pixels as units for selection rectangles\n [media] v4l: s5p-tv: mixer: fix setup of VP scaling\n [media] v4l: s5p-tv: mixer: add support for selection API\n [media] v4l: emulate old crop API using extended crop/compose API\n [media] doc: v4l: add documentation for selection API\n [media] doc: v4l: add binary images for selection API\n [media] v4l: add support for selection api\n [media] hd29l2: fix review findings\n ...\n" }, { "commit": "16008d641670571ff4cd750b416c7caf2d89f467", "tree": "6dc32821bd4576106cee50d52a90a8106a9d481f", "parents": [ "b3c9dd182ed3bdcdaf0e42625a35924b0497afdc", "85a0f7b220777cd3c232fd2f079db5c4a874c4ee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:48:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:48:41 2012 -0800" }, "message": "Merge branch \u0027for-3.3/drivers\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.3/drivers\u0027 of git://git.kernel.dk/linux-block:\n mtip32xx: do rebuild monitoring asynchronously\n xen-blkfront: Use kcalloc instead of kzalloc to allocate array\n mtip32xx: uninitialized variable in mtip_quiesce_io()\n mtip32xx: updates based on feedback\n xen-blkback: convert hole punching to discard request on loop devices\n xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io\n xen/blk[front|back]: Enhance discard support with secure erasing support.\n xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together\n mtip32xx: update to new -\u003emake_request() API\n mtip32xx: add module.h include to avoid conflict with moduleh tree\n mtip32xx: mark a few more items static\n mtip32xx: ensure that all local functions are static\n mtip32xx: cleanup compat ioctl handling\n mtip32xx: fix warnings/errors on 32-bit compiles\n block: Add driver for Micron RealSSD pcie flash cards\n" }, { "commit": "b3c9dd182ed3bdcdaf0e42625a35924b0497afdc", "tree": "ad48ad4d923fee147c736318d0fad35b3755f4f5", "parents": [ "83c2f912b43c3a7babbb6cb7ae2a5276c1ed2a3e", "5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "message": "Merge branch \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block: (37 commits)\n Revert \"block: recursive merge requests\"\n block: Stop using macro stubs for the bio data integrity calls\n blockdev: convert some macros to static inlines\n fs: remove unneeded plug in mpage_readpages()\n block: Add BLKROTATIONAL ioctl\n block: Introduce blk_set_stacking_limits function\n block: remove WARN_ON_ONCE() in exit_io_context()\n block: an exiting task should be allowed to create io_context\n block: ioc_cgroup_changed() needs to be exported\n block: recursive merge requests\n block, cfq: fix empty queue crash caused by request merge\n block, cfq: move icq creation and rq-\u003eelv.icq association to block core\n block, cfq: restructure io_cq creation path for io_context interface cleanup\n block, cfq: move io_cq exit/release to blk-ioc.c\n block, cfq: move icq cache management to block core\n block, cfq: move io_cq lookup to blk-ioc.c\n block, cfq: move cfqd-\u003eicq_list to request_queue and add request-\u003eelv.icq\n block, cfq: reorganize cfq_io_context into generic and cfq specific parts\n block: remove elevator_queue-\u003eops\n block: reorder elevator switch sequence\n ...\n\nFix up conflicts in:\n - block/blk-cgroup.c\n\tSwitch from can_attach_task to can_attach\n - block/cfq-iosched.c\n\tconflict with now removed cic index changes (we now use q-\u003eid instead)\n" }, { "commit": "83c2f912b43c3a7babbb6cb7ae2a5276c1ed2a3e", "tree": "eaa7f50dea154d9f19721db69c7adde64d48848f", "parents": [ "f0ed5b9a28536b8be2f578a9450cfa42ab31ccf8", "172d1b0b73256551f100fc00c69e356d047103f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:35 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)\n perf tools: Fix compile error on x86_64 Ubuntu\n perf report: Fix --stdio output alignment when --showcpuutilization used\n perf annotate: Get rid of field_sep check\n perf annotate: Fix usage string\n perf kmem: Fix a memory leak\n perf kmem: Add missing closedir() calls\n perf top: Add error message for EMFILE\n perf test: Change type of \u0027-v\u0027 option to INCR\n perf script: Add missing closedir() calls\n tracing: Fix compile error when static ftrace is enabled\n recordmcount: Fix handling of elf64 big-endian objects.\n perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again\n perf tools: Add support for guest/host-only profiling\n perf kvm: Do guest-only counting by default\n perf top: Don\u0027t update total_period on process_sample\n perf hists: Stop using \u0027self\u0027 for struct hist_entry\n perf hists: Rename total_session to total_period\n x86: Add counter when debug stack is used with interrupts enabled\n x86: Allow NMIs to hit breakpoints in i386\n x86: Keep current stack in NMI breakpoints\n ...\n" }, { "commit": "f0ed5b9a28536b8be2f578a9450cfa42ab31ccf8", "tree": "f252f2f4a2829af46be87b176f4ca236a5d21471", "parents": [ "a520458fccc5f5dd4d0ed63c0602db2fd3172b21", "8030c36d13f030103356709e63638678fdc66fdc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:09 2012 -0800" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, atomic: atomic64_read() take a const pointer\n x86, UV: Update Boot messages for SGI UV2 platform\n" }, { "commit": "a520458fccc5f5dd4d0ed63c0602db2fd3172b21", "tree": "3bca2be919eac0bfb50bd0623cda6df589260de8", "parents": [ "c49c41a4134679cecb77362e7f6b59acb6320aa7", "1f4f43475f1295dc41c18684e59deea9b6d46045" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:25:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:25:41 2012 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6:\n UBI: use own macros for the layout volume\n UBI: fix nameless volumes handling\n UBIFS: fix non-debug configuration build\n" }, { "commit": "126400033940afb658123517a2e80eb68259fbd7", "tree": "eca9ab5883d2a43b60f05d8f5acd5d673ea6494c", "parents": [ "ebe967492c681da781dbc0f7c0d6a1b5c1977d45" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Fri Jan 13 15:20:38 2012 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Jan 15 11:12:21 2012 -0200" }, "message": "[media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver\n\nI added it by mistake. It is useless as no real hardware.\nIt even uses even Cypress FX2, general USB bridge chip, default IDs\nthat makes driver load all FX2 devices having default ID...\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "1f4f43475f1295dc41c18684e59deea9b6d46045", "tree": "aaaff8bce03b74a558c46c01ed37015358477acd", "parents": [ "4a59c797a18917a5cf3ff7ade296b46134d91e6a" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Tue Jan 10 17:57:03 2012 +0100" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@linux.intel.com", "time": "Sun Jan 15 15:08:55 2012 +0200" }, "message": "UBI: use own macros for the layout volume\n\nThis is a minor nicification: UBI_LAYOUT_VOLUME_TYPE and\nUBI_LAYOUT_VOLUME_ALIGN are currently defined but not used -\nuse them.\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@linux.intel.com\u003e\n" }, { "commit": "4a59c797a18917a5cf3ff7ade296b46134d91e6a", "tree": "5f6f45af1f25eb25f99ac110f27084bd29cfb260", "parents": [ "e234b5f2079414b3d772286e3ee00e7bbf6da833" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Fri Jan 13 15:07:40 2012 +0100" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@linux.intel.com", "time": "Sun Jan 15 15:06:08 2012 +0200" }, "message": "UBI: fix nameless volumes handling\n\nCurrently it\u0027s possible to create a volume without a name. E.g:\nubimkvol -n 32 -s 2MiB -t static /dev/ubi0 -N \"\"\n\nAfter that vtbl_check() will always fail because it does not permit\nempty strings.\n\nCc: stable@kernel.org\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@linux.intel.com\u003e\n" }, { "commit": "e234b5f2079414b3d772286e3ee00e7bbf6da833", "tree": "860baa06589f5f11b354500f30f43ff8c2f4cda9", "parents": [ "94b1984ab9ab61cc6047c07e074d766485299a9c" ], "author": { "name": "Dominique Martinet", "email": "asmadeus@codewreck.org", "time": "Sun Jan 15 00:28:03 2012 +0100" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@linux.intel.com", "time": "Sun Jan 15 13:46:02 2012 +0200" }, "message": "UBIFS: fix non-debug configuration build\n\nFix a brown paperbag bug introduced by me in the previous commit. I was\nin hurry and forgot about the non-debug case completely.\n\nArtem: amend the commit message and tweak the patch to preserve alignment.\n This made the patch a bit less readable, though.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@linux.intel.com\u003e\n" }, { "commit": "85a0f7b220777cd3c232fd2f079db5c4a874c4ee", "tree": "5d238aaf0f5a49fd2fa815528de86fa4170964b0", "parents": [ "f748040bb875a0d94c3ceef180ab704bdf43079f", "62ee8c13e26cffe6483630f59932c3e936dfb586" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Sun Jan 15 10:39:35 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Sun Jan 15 10:39:35 2012 +0100" }, "message": "Merge branch \u0027for-3.3/mtip32xx\u0027 into for-3.3/drivers\n" }, { "commit": "5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922", "tree": "fba354212902ad0c7228bff43a38aca6df47c899", "parents": [ "6898e3bd11cc9a931ef115eee9000ac9d8f8c3cf" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Sun Jan 15 10:29:48 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Sun Jan 15 10:29:48 2012 +0100" }, "message": "Revert \"block: recursive merge requests\"\n\nThis reverts commit 274193224cdabd687d804a26e0150bb20f2dd52c.\n\nWe have some problems related to selection of empty queues\nthat need to be resolved, evidence so far points to the\nrecursive merge logic making either being the cause or at\nleast the accelerator for this. So revert it for now, until\nwe figure this out.\n\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "c49c41a4134679cecb77362e7f6b59acb6320aa7", "tree": "45e690c036ca5846a48c8be67945d1d841b2d96d", "parents": [ "892d208bcf79e4e1058707786a7b6d486697cd78", "f423e5ba76e7e4a6fcb4836b4f072d1fdebba8b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security:\n capabilities: remove __cap_full_set definition\n security: remove the security_netlink_recv hook as it is equivalent to capable()\n ptrace: do not audit capability check when outputing /proc/pid/stat\n capabilities: remove task_ns_* functions\n capabitlies: ns_capable can use the cap helpers rather than lsm call\n capabilities: style only - move capable below ns_capable\n capabilites: introduce new has_ns_capabilities_noaudit\n capabilities: call has_ns_capability from has_capability\n capabilities: remove all _real_ interfaces\n capabilities: introduce security_capable_noaudit\n capabilities: reverse arguments to security_capable\n capabilities: remove the task from capable LSM hook entirely\n selinux: sparse fix: fix several warnings in the security server cod\n selinux: sparse fix: fix warnings in netlink code\n selinux: sparse fix: eliminate warnings for selinuxfs\n selinux: sparse fix: declare selinux_disable() in security.h\n selinux: sparse fix: move selinux_complete_init\n selinux: sparse fix: make selinux_secmark_refcount static\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n\nManually fix up a semantic mis-merge wrt security_netlink_recv():\n\n - the interface was removed in commit fd7784615248 (\"security: remove\n the security_netlink_recv hook as it is equivalent to capable()\")\n\n - a new user of it appeared in commit a38f7907b926 (\"crypto: Add\n userspace configuration API\")\n\ncausing no automatic merge conflict, but Eric Paris pointed out the\nissue.\n" }, { "commit": "892d208bcf79e4e1058707786a7b6d486697cd78", "tree": "15446e4d19f7f98078344ab0bc37ae6af4898c6d", "parents": [ "dca88ad6915b65f6e037f8c3e632fcd92a70bd88", "029aeff5db879afd7760f11214b6fea45f76b58e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:11:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:11:11 2012 -0800" }, "message": "Merge tag \u0027kmemleak\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux\n\nKmemleak patches\n\nMain features:\n- Handle percpu memory allocations (only scanning them, not actually\n reporting).\n- Memory hotplug support.\n\nUsability improvements:\n- Show the origin of early allocations.\n- Report previously found leaks even if kmemleak has been disabled by\n some error.\n\n* tag \u0027kmemleak\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux:\n kmemleak: Add support for memory hotplug\n kmemleak: Handle percpu memory allocation\n kmemleak: Report previously found leaks even after an error\n kmemleak: When the early log buffer is exceeded, report the actual number\n kmemleak: Show where early_log issues come from\n" }, { "commit": "dca88ad6915b65f6e037f8c3e632fcd92a70bd88", "tree": "a3dcbe53310997dcc37c7d49129c48febef53992", "parents": [ "fed474857efbed79cd390d0aee224231ca718f63", "1632b9e2a14ce9f4e08faf6c4380431d63319bd3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:03:30 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.infradead.org/users/dhowells/linux-headers\n\n* \u0027for-next\u0027 of git://git.infradead.org/users/dhowells/linux-headers:\n UAPI: Split trivial #if defined(__KERNEL__) \u0026\u0026 X conditionals\n UAPI: Don\u0027t have a #elif clause in a __KERNEL__ guard in linux/soundcard.h\n UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed\n UAPI: Make linux/patchkey.h easier to parse\n UAPI: Fix nested __KERNEL__ guards in video/edid.h\n UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter\n UAPI: Guard linux/cuda.h\n UAPI: Guard linux/pmu.h\n UAPI: Guard linux/isdn_divertif.h\n UAPI: Guard linux/sound.h\n UAPI: Rearrange definition of HZ in asm-generic/param.h\n UAPI: Make FRV use asm-generic/param.h\n UAPI: Make M32R use asm-generic/param.h\n UAPI: Make MN10300 use asm-generic/param.h\n UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace\n UAPI: Don\u0027t include linux/compat.h in sparc\u0027s asm/siginfo.h\n UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines\n" }, { "commit": "fed474857efbed79cd390d0aee224231ca718f63", "tree": "8935acfe89c87fe63f72bb114fa17f97f7c26564", "parents": [ "1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Thu Jan 12 17:59:46 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:01:42 2012 -0800" }, "message": "fsnotify: don\u0027t BUG in fsnotify_destroy_mark()\n\nRemoving the parent of a watched file results in \"kernel BUG at\nfs/notify/mark.c:139\".\n\nTo reproduce\n\n add \"-w /tmp/audit/dir/watched_file\" to audit.rules\n rm -rf /tmp/audit/dir\n\nThis is caused by fsnotify_destroy_mark() being called without an\nextra reference taken by the caller.\n\nReported by Francesco Cosoleto here:\n\n https://bugzilla.novell.com/show_bug.cgi?id\u003d689860\n\nFix by removing the BUG_ON and adding a comment about not accessing mark after\nthe iput.\n\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nCC: stable@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1e6c4dfdeb040b2dd5c4d6d803ab95c3971ad80c", "tree": "594366f7c9e9ab8a54d2b82121c8802b1950ead6", "parents": [ "51be08419dc86c72486ac556aa39bc01026a403d", "364212fddaaa60c5a64f67a0f5624ad996ecc8a0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 17:59:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 17:59:02 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:\n kconfig/streamline-config.pl: Fix parsing Makefile with variables\n kconfig/streamline-config.pl: Simplify backslash line concatination\n" }, { "commit": "37ae2d5998aa29d8bf52f124199a21341bc6d18d", "tree": "95cb787bfcb7340caaa1f20513b3f22edef886aa", "parents": [ "e2aef4d33ac43ec45e4fc2903288030d7f464832" ], "author": { "name": "Arnaud Lacombe", "email": "lacombar@gmail.com", "time": "Wed Nov 23 13:05:53 2011 -0500" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sun Jan 15 00:17:18 2012 +0100" }, "message": "kbuild: Fix compiler warning with assertion when calling \u0027fwrite\u0027\n\nReinhard Tartler discovered a corner case of calling xfwrite() where the\nlength of the string is zero.\n\nArnaud Lacombe suggested to use assertion for the corner case, as\nfwrite(3) is currently used:\n\n 1) in comment printers. Empty comment are not allowed.\n 2) in a callback passed to expr_print(), where the string printed is\n either NULL OR non-empty.\n 3) in the lexer, auto-generated, and unused.\n\nI feel using assertion is a good solution:\n\n 1) It cleanly takes care of the above-mentioned corner case.\n 2) It can be easily disabled by defining NDEBUG.\n 3) It asserts xfwrite() is simply a wrapper for fwrite().\n\nReported-by: Reinhard Tartler \u003cReinhard.Tartler@informatik.uni-erlangen.de\u003e\nSigned-off-by: Arnaud Lacombe \u003clacombar@gmail.com\u003e\nSigned-off-by: Jean Sacren \u003csakiwit@gmail.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "e2aef4d33ac43ec45e4fc2903288030d7f464832", "tree": "336dac0c61fe53a36725c220f147492e60a6ed33", "parents": [ "c55ac154019f628b42316bc21545ee1b2bee3db6" ], "author": { "name": "Peter Foley", "email": "pefoley2@verizon.net", "time": "Sun Dec 18 18:15:16 2011 -0500" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sun Jan 15 00:13:53 2012 +0100" }, "message": "Improve update-po-config output\n\nMake the V\u003d0 output from update-po-config be aligned correctly.\nAlso remove an outdated comment and add a \"GEN\" statement.\n\nSigned-off-by: Peter Foley \u003cpefoley2@verizon.net\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "51be08419dc86c72486ac556aa39bc01026a403d", "tree": "50ac35ac89f207d2a732b67eb2f1e9b671e5c064", "parents": [ "ec8013beddd717d1740cfefb1a9b900deef85462", "f787f32e67e00b072f46b2ae3c454d2c0a1fcdb7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:11:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:11:19 2012 -0800" }, "message": "Merge branch \u0027fbdev-next\u0027 of git://github.com/schandinat/linux-2.6\n\n* \u0027fbdev-next\u0027 of git://github.com/schandinat/linux-2.6: (175 commits)\n module_param: make bool parameters really bool (drivers/video/i810)\n Revert \"atmel_lcdfb: Adjust HFP calculation so it matches the manual.\"\n OMAPDSS: HDMI: Disable DDC internal pull up\n OMAPDSS: HDMI: Move duplicate code from boardfile\n OMAPDSS: add OrtusTech COM43H4M10XTC display support\n OMAP: DSS2: Support for UMSH-8173MD TFT panel\n ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver\n OMAPDSS: HDMI: Create function to enable HDMI audio\n ASoC: OMAP: HDMI: Correct signature of ASoC functions\n ASoC: OMAP: HDMI: Introduce driver data for audio codec\n grvga: fix section mismatch warnings\n video: s3c-fb: Don\u0027t keep device runtime active when open\n video: s3c-fb: Hold runtime PM references when touching registers\n video: s3c-fb: Take a runtime PM reference when unblanked\n video: s3c-fb: Disable runtime PM in error paths from probe\n video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer\n video: s3c-fb: Make runtime PM functional again\n drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()\n drivers/video: fsl-diu-fb: add default platform ops functions\n drivers/video: fsl-diu-fb: remove broken reference count enabling the display\n ...\n" }, { "commit": "ec8013beddd717d1740cfefb1a9b900deef85462", "tree": "7aa28de51cb2f375baf6fe943afd85e75ca7bcb9", "parents": [ "0bfc96cb77224736dfa35c3c555d37b3646ef35e" ], "author": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Jan 12 16:01:29 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:07:24 2012 -0800" }, "message": "dm: do not forward ioctls from logical volumes to the underlying device\n\nA logical volume can map to just part of underlying physical volume.\nIn this case, it must be treated like a partition.\n\nBased on a patch from Alasdair G Kergon.\n\nCc: Alasdair G Kergon \u003cagk@redhat.com\u003e\nCc: dm-devel@redhat.com\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0bfc96cb77224736dfa35c3c555d37b3646ef35e", "tree": "af5135c929ee8e1bdb38c306b2634dbc547d5189", "parents": [ "577ebb374c78314ac4617242f509e2f5e7156649" ], "author": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Jan 12 16:01:28 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:07:24 2012 -0800" }, "message": "block: fail SCSI passthrough ioctls on partition devices\n\nLinux allows executing the SG_IO ioctl on a partition or LVM volume, and\nwill pass the command to the underlying block device. This is\nwell-known, but it is also a large security problem when (via Unix\npermissions, ACLs, SELinux or a combination thereof) a program or user\nneeds to be granted access only to part of the disk.\n\nThis patch lets partitions forward a small set of harmless ioctls;\nothers are logged with printk so that we can see which ioctls are\nactually sent. In my tests only CDROM_GET_CAPABILITY actually occurred.\nOf course it was being sent to a (partition on a) hard disk, so it would\nhave failed with ENOTTY and the patch isn\u0027t changing anything in\npractice. Still, I\u0027m treating it specially to avoid spamming the logs.\n\nIn principle, this restriction should include programs running with\nCAP_SYS_RAWIO. If for example I let a program access /dev/sda2 and\n/dev/sdb, it still should not be able to read/write outside the\nboundaries of /dev/sda2 independent of the capabilities. However, for\nnow programs with CAP_SYS_RAWIO will still be allowed to send the\nioctls. Their actions will still be logged.\n\nThis patch does not affect the non-libata IDE driver. That driver\nhowever already tests for bd !\u003d bd-\u003ebd_contains before issuing some\nioctl; it could be restricted further to forbid these ioctls even for\nprograms running with CAP_SYS_ADMIN/CAP_SYS_RAWIO.\n\nCc: linux-scsi@vger.kernel.org\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: James Bottomley \u003cJBottomley@parallels.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n[ Make it also print the command name when warning - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "577ebb374c78314ac4617242f509e2f5e7156649", "tree": "690ae95d67bb8f9fd66bc0daebc90a46904420ac", "parents": [ "81d48f0aee544885c39ef6e1ffb1175f276e6adf" ], "author": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Jan 12 16:01:27 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:07:24 2012 -0800" }, "message": "block: add and use scsi_blk_cmd_ioctl\n\nIntroduce a wrapper around scsi_cmd_ioctl that takes a block device.\n\nThe function will then be enhanced to detect partition block devices\nand, in that case, subject the ioctls to whitelisting.\n\nCc: linux-scsi@vger.kernel.org\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: James Bottomley \u003cJBottomley@parallels.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "29a36d4dec6cf7ad72e6e3337bf954096cbbb4cf", "tree": "15ac5f3d0df3f56f233603e8626b5d383e6ab278", "parents": [ "fb3f8af4ff52faf9b31e6c4e8ca0b0b16332808c" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Sat Jan 14 23:41:54 2012 +0100" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sun Jan 15 00:05:46 2012 +0100" }, "message": "scripts/coccinelle: improve the coverage of some semantic patches\n\nThis patch ensures that all semantic patches in the scripts/coccinelle\ndirectory provide the report option. Report messages that include line\nnumbers now have the line number preceded by \"line\" for easier subsequent\nprocessing.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "7c43185138cf523b0810ffd2c9e18e2ecb356730", "tree": "24deed8741857d00f5575bf8febf0c6f66357af4", "parents": [ "136ec2049fea65aed0446d04ab7cfff2ae3070f1" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Jan 09 11:38:15 2012 -0700" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sun Jan 15 00:04:35 2012 +0100" }, "message": "Kbuild: Use dtc\u0027s -d (dependency) option\n\nThis hooks dtc into Kbuild\u0027s dependency system.\n\nThus, for example, \"make dtbs\" will rebuild tegra-harmony.dtb if only\ntegra20.dtsi has changed yet tegra-harmony.dts has not. The previous\nlack of this feature recently caused me to have very confusing \"git\nbisect\" results.\n\nFor ARM, it\u0027s obvious what to add to $(targets). I\u0027m not familiar enough\nwith other architectures to know what to add there. Powerpc appears to\nalready add various .dtb files into $(targets), but the other archs may\nneed something added to $(targets) to work.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n[mmarek: Dropped arch/c6x part to avoid merging commits from the middle\nof the merge window]\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "136ec2049fea65aed0446d04ab7cfff2ae3070f1", "tree": "03a8b0bc6775757b9e83cb9029a913a6e64cfdc9", "parents": [ "5bb0571bfddcdcd3fbf42a58fcce4d0b743fe62f" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Jan 10 17:27:52 2012 -0700" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 23:47:37 2012 +0100" }, "message": "dtc: Implement -d option to write out a dependency file\n\nThis will allow callers to rebuild .dtb files when any of the /include/d\n.dtsi files are modified, not just the top-level .dts file.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "fb3f8af4ff52faf9b31e6c4e8ca0b0b16332808c", "tree": "41aa64830b16a74300c0d6dd5f1323b373c86655", "parents": [ "22e0059af301ec163d563c3590d2277c2a557d4f" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Tue Dec 27 18:28:51 2011 +0100" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 22:40:04 2012 +0100" }, "message": "coccinelle: semantic patches related to devm_ functions (part 2)\n\ndevm_ functions allocate memory that is to remain allocated until the\ndevice is detached. This patch checks for freeing of such memory using\nstandard memory freeing functions.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "22e0059af301ec163d563c3590d2277c2a557d4f", "tree": "6ac7178b9f2ef6a6210f98f92020e7987ac8bc28", "parents": [ "f95ab20972cfefa8ee5428d6c3afd4cb8eacabf4" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Tue Dec 27 18:28:50 2011 +0100" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 22:39:53 2012 +0100" }, "message": "coccinelle: semantic patches related to devm_ functions (part 1)\n\ndevm_ functions allocate memory that is to remain allocated until the\ndevice is detached. This patch checks for opportunities for using the\nfunction devm_request_and_ioremap.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "f95ab20972cfefa8ee5428d6c3afd4cb8eacabf4", "tree": "545ecec1bbb70e0172be353a4a25446bb85371d1", "parents": [ "d0bc1fb4672b978b608400a5112249cdbc28f9ae" ], "author": { "name": "Greg Dietsche", "email": "Gregory.Dietsche@cuw.edu", "time": "Sat Nov 05 20:59:44 2011 -0500" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 22:25:56 2012 +0100" }, "message": "coccinelle.txt: update documentation to include M\u003d option\n\nAdding documentation for the new M\u003d option which limits Coccinelle\nto a specific set of directories.\n\nSigned-off-by: Greg Dietsche \u003cGregory.Dietsche@cuw.edu\u003e\nAcked-by: Julia Lawall \u003cjulia.lawall@lip6.fr\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "81d48f0aee544885c39ef6e1ffb1175f276e6adf", "tree": "093f37084c133795e4ce71befa57185328737171", "parents": [ "f5e4e20faa1eee3feaa0394897bbd1aca544e809", "661db794eb8179c7bea02f159bb691a2fff4a8e0", "14c173eb63432ba5d0783b6c4b23a8fe0c76fb0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:55 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:55 2012 -0800" }, "message": "Merge tags \u0027devicetree-for-linus\u0027 and \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n2nd set of device tree changes and SPI bug fixes for v3.3\n\n* tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of/irq: Add interrupts-names property to name an irq resource\n of/address: Add reg-names property to name an iomem resource\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/tegra: depend instead of select TEGRA_SYSTEM_DMA\n" }, { "commit": "d0bc1fb4672b978b608400a5112249cdbc28f9ae", "tree": "5570ade8bf0919055925fce7a01832e942e53d38", "parents": [ "ff894e396b4d0b5383127c1bcb2cd3879946526e" ], "author": { "name": "Greg Dietsche", "email": "Gregory.Dietsche@cuw.edu", "time": "Sat Nov 05 20:59:43 2011 -0500" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 22:25:40 2012 +0100" }, "message": "coccicheck: add M\u003d option to control which dir is processed\n\nExamples:\n\tmake coccicheck M\u003ddrivers/net/wireless/\n\tmake coccicheck SUBDIRS\u003ddrivers/net/wireless/\n\nVersion 2:\n\tfix patch file names when using M\u003d\n\ttell coccinelle where the include files are\n\nVersion 3:\n\tAdd second include option to support out of tree development\n\tFix error message\n\nSigned-off-by: Greg Dietsche \u003cGregory.Dietsche@cuw.edu\u003e\nAcked-by: Julia Lawall \u003cjulia.lawall@lip6.fr\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "f5e4e20faa1eee3feaa0394897bbd1aca544e809", "tree": "047a93ff025c46ed97d3192a79f55b38fa071ca1", "parents": [ "4964e0664c80680fa6b28ef91381c076a5b25c2c", "f408c985cefc9b1d99bc099e1208dd7df3445aa5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:23 2012 -0800" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n2nd round of GPIO changes for v3.3 merge window\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion\n gpio: pl061: remove combined interrupt\n gpio: pl061: convert to use generic irq chip\n GPIO: add bindings for managed devices\n ARM: realview: convert pl061 no irq to 0 instead of -1\n gpio: pl061: convert to use 0 for no irq\n gpio: pl061: use chained_irq_* functions in irq handler\n GPIO/pl061: Add suspend resume capability\n drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap\n" }, { "commit": "4964e0664c80680fa6b28ef91381c076a5b25c2c", "tree": "62099c5aaeee7274bcc66bcfba35d479affa97cf", "parents": [ "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "7bf6612e8a9d6a0b3b82e8e2611942be1258b307" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)\n MIPS: Delete unused function add_temporary_entry.\n MIPS: Set default pci cache line size.\n MIPS: Flush huge TLB\n MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.\n MIPS: Octeon: Add support for OCTEON II PCIe\n MIPS: Octeon: Update PCI Latency timer and enable more error reporting.\n MIPS: Alchemy: Update cpu-feature-overrides\n MIPS: Alchemy: db1200: Improve PB1200 detection.\n MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.\n MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller\n MIPS: Alchemy: irq: register pm at irq init time\n MIPS: Alchemy: Touchscreen support on DB1100\n MIPS: Alchemy: Hook up IrDA on DB1000/DB1100\n net/irda: convert au1k_ir to platform driver.\n MIPS: Alchemy: remove unused board headers\n MTD: nand: make au1550nd.c a platform_driver\n MIPS: Netlogic: Mark Netlogic chips as SMT capable\n MIPS: Netlogic: Add support for XLP 3XX cores\n MIPS: Netlogic: Merge some of XLR/XLP wakup code\n MIPS: Netlogic: Add default XLP config.\n ...\n\nFix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,\ntraps.c} and drivers/tty/serial/Makefile\n" }, { "commit": "c55ac154019f628b42316bc21545ee1b2bee3db6", "tree": "40c405f7d244746e461d6e3cfe32d1b846fdc6a3", "parents": [ "320d41bb1597799669bab28a047f9868dd754aca" ], "author": { "name": "Wang YanQing", "email": "udknight@gmail.com", "time": "Thu Jan 12 11:31:32 2012 +0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 21:54:32 2012 +0100" }, "message": "menuconfig: let make not report error when not save configuration\n\nI find every time when I choice the \u0027NO\u0027 button at the dialog\nwhich let me choice whether to save the configuration before exit\nmenuconfig, it always report the blow:\n\n\" GEN /mnt/sda7/home/build/test/Makefile\n HOSTCC scripts/kconfig/mconf.o\n HOSTLD scripts/kconfig/mconf\nscripts/kconfig/mconf Kconfig\n\nYour configuration changes were NOT saved.\n\nmake[2]: *** [menuconfig] Error 1\nmake[1]: *** [menuconfig] Error 2\nmake: *** [sub-make] Error 2 \"\n\nThis patch repair it.\n\nSigned-off-by: Wang YanQing \u003cudknight@gmail.com\u003e\nAcked-by: Davidlohr Bueso \u003cdave@gnu.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "320d41bb1597799669bab28a047f9868dd754aca", "tree": "59b4a7493eea8ae29015c5421717f2ac326e124b", "parents": [ "c0c0cda276b796e9c9710672b3bb4a737dbb4900" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jan 10 15:41:15 2012 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 21:44:29 2012 +0100" }, "message": "merge_config.sh: fix bug in final check\n\nArnaud Lacombe pointed out the final checking that the requested configs\nwere included in the final .config was broken.\n\nThe example was that if you had a fragment that disabled\nCONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no\nfinal warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final\n.config.\n\nThis bug was introduced by me in v3 of the original patch, and the\nfollowing patch reverts the invalid change.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nReported-by: Arnaud Lacombe \u003clacombar@gmail.com\u003e\nCc: Darren Hart \u003cdvhart@linux.intel.com\u003e\nCc: Michal Marek \u003cmmarek@suse.cz\u003e\nCc: Arnaud Lacombe \u003clacombar@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "c0c0cda276b796e9c9710672b3bb4a737dbb4900", "tree": "3719ff50ba97aaf742aeb336737fe329b5f1c1c9", "parents": [ "041b78c89b1fe68f44c45e8b6cc6c9f8ea8f0e4c" ], "author": { "name": "Darren Hart", "email": "dvhart@linux.intel.com", "time": "Tue Jan 10 15:41:12 2012 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 21:44:29 2012 +0100" }, "message": "merge_config.sh: whitespace cleanup\n\nFix whitespace usage in the clean_up routine.\n\nSigned-off-by: Darren Hart \u003cdvhart@linux.intel.com\u003e\nAcked-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Michal Marek \u003cmmarek@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "041b78c89b1fe68f44c45e8b6cc6c9f8ea8f0e4c", "tree": "ee84767b51a0d08f6ef7c2556843252c8b50b4ca", "parents": [ "4b5f72145e3ba85e38240dba844ebe1fcbb73713" ], "author": { "name": "Darren Hart", "email": "dvhart@linux.intel.com", "time": "Tue Jan 10 15:41:10 2012 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 21:44:29 2012 +0100" }, "message": "merge_config.sh: use signal names compatible with dash and bash\n\nThe SIGHUP SIGINT and SIGTERM names caused failures when running\nmerge_config.sh with the dash shell. Dropping the \"SIG\" component makes\nthe script work in both bash and dash.\n\nSigned-off-by: Darren Hart \u003cdvhart@linux.intel.com\u003e\nAcked-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Michal Marek \u003cmmarek@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "4b5f72145e3ba85e38240dba844ebe1fcbb73713", "tree": "30321b441f53ec5e126ee119d668bdeb952c2131", "parents": [ "70cc01e7579cdb71f42f3f7085ab457be7808783" ], "author": { "name": "john stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jan 10 15:41:08 2012 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Jan 14 21:44:28 2012 +0100" }, "message": "kconfig: add merge_config.sh script\n\nAfter noticing almost every distro has their own method of managing config\nfragments, I went looking at some best practices, and wanted to try to\nconsolidate some of the different approaches so this fairly simple\ninfrastructure can be shared (and new distros/build systems don\u0027t have to\nimplement yet another config fragment merge script).\n\nThis script is most influenced by the Windriver tools used in the Yocto\nProject, reusing some portions found there.\n\nThis script merges multiple config fragments, warning on any overridden\nvalues. It then sets any unspecified values to their default, then\nfinally checks to make sure no specified value was dropped due to\nunsatisfied dependencies.\n\nI\u0027m sure this implementation won\u0027t work for everyone, and I expect it will\nneed to evolve to adapt for various use cases. But I think its a\nreasonable starting point.\n\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Reinhard Tartler \u003cReinhard.Tartler@informatik.uni-erlangen.de\u003e\nCc: Dmitry Fink \u003cDmitry.Fink@palm.com\u003e\nCc: Darren Hart \u003cdvhart@linux.intel.com\u003e\nCc: Eric B Munson \u003cebmunson@us.ibm.com\u003e\nCc: Bruce Ashfield \u003cBruce.Ashfield@windriver.com\u003e\nCc: Michal Marek \u003cmmarek@suse.cz\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "tree": "a112335f2b2b2a51e90531c6c67e8a3b54dcf0ef", "parents": [ "0b48d42235caf627121f440b57d376f48a9af8b6", "72db395ffadb1d33233fd123c2bf87ba0198c6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nAutogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n module_param: check that bool parameters really are bool.\n intelfbdrv.c: bailearly is an int module_param\n paride/pcd: fix bool verbose module parameter.\n module_param: make bool parameters really bool (drivers \u0026 misc)\n module_param: make bool parameters really bool (arch)\n module_param: make bool parameters really bool (core code)\n kernel/async: remove redundant declaration.\n printk: fix unnecessary module_param_name.\n lirc_parallel: fix module parameter description.\n module_param: avoid bool abuse, add bint for special cases.\n module_param: check type correctness for module_param_array\n modpost: use linker section to generate table.\n modpost: use a table rather than a giant if/else statement.\n modules: sysfs - export: taint, coresize, initsize\n kernel/params: replace DEBUGP with pr_debug\n module: replace DEBUGP with pr_debug\n module: struct module_ref should contains long fields\n module: Fix performance regression on modules with large symbol tables\n module: Add comments describing how the \"strmap\" logic works\n\nFix up conflicts in scripts/mod/file2alias.c due to the new linker-\ngenerated table approach to adding __mod_*_device_table entries. The\nARM sa11x0 mcp bus needed to be converted to that too.\n" }, { "commit": "0b48d42235caf627121f440b57d376f48a9af8b6", "tree": "400967c5fcb1cd08bbc0e1739e229f9717590f19", "parents": [ "8e63dd6e1c589ba99a18df9cbaa41c3178607641", "7a6ef8c72314f254c107c6a9ed7cb201961ee05a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:41 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-3.3\u0027 of git://linux-nfs.org/~bfields/linux: (31 commits)\n nfsd4: nfsd4_create_clid_dir return value is unused\n NFSD: Change name of extended attribute containing junction\n svcrpc: don\u0027t revert to SVC_POOL_DEFAULT on nfsd shutdown\n svcrpc: fix double-free on shutdown of nfsd after changing pool mode\n nfsd4: be forgiving in the absence of the recovery directory\n nfsd4: fix spurious 4.1 post-reboot failures\n NFSD: forget_delegations should use list_for_each_entry_safe\n NFSD: Only reinitilize the recall_lru list under the recall lock\n nfsd4: initialize special stateid\u0027s at compile time\n NFSd: use network-namespace-aware cache registering routines\n SUNRPC: create svc_xprt in proper network namespace\n svcrpc: update outdated BKL comment\n nfsd41: allow non-reclaim open-by-fh\u0027s in 4.1\n svcrpc: avoid memory-corruption on pool shutdown\n svcrpc: destroy server sockets all at once\n svcrpc: make svc_delete_xprt static\n nfsd: Fix oops when parsing a 0 length export\n nfsd4: Use kmemdup rather than duplicating its implementation\n nfsd4: add a separate (lockowner, inode) lookup\n nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error\n ...\n" }, { "commit": "8e63dd6e1c589ba99a18df9cbaa41c3178607641", "tree": "e1662280bb1d8227e767c877c1f06c74ec5c40bc", "parents": [ "f88609a0e447fb73851c0f640ed47257838ff99f", "ebb7f616abf6ee11603e6b63aa6c5f84c80a17d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:23 2012 -0800" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit\n powerpc: Fix RCU idle and hcall tracing\n" }, { "commit": "f88609a0e447fb73851c0f640ed47257838ff99f", "tree": "12d2d77f42f7721fec8d9f99780679f7ddd0875c", "parents": [ "2145199c4f0db7c517dd788abec301dc84b91bd0", "046d0a37024a5b1e66ec9314e5e7feba42feb811" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:25:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:25:40 2012 -0800" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n MAINTAINERS: List i2c-omap and i2c-davinci drivers\n MAINTAINERS: i2c: Add third maintainer\n i2c/gpio-i2cmux: Convert to use module_platform_driver()\n i2c/busses: Use module_platform_driver()\n i2c-dev: Use memdup_user\n i2c: Convert to DEFINE_PCI_DEVICE_TABLE\n i2c-ali1535: enable SPARC support\n i2c: Fix error value returned by several bus drivers\n" }, { "commit": "f408c985cefc9b1d99bc099e1208dd7df3445aa5", "tree": "8413c8cf3d8b21bfed24f09726f5c07d87be9c40", "parents": [ "fda87903f4e9caf87e02d52768c2611e417b7efb" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Dec 18 18:24:57 2011 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jan 13 22:25:23 2012 -0700" }, "message": "GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion\n\nThe existing gpio_to_irq() implementation on sa1100 only translates\nvalidly for internal GPIOs. Since this sub-arch enables GPIOLIB\nsupport, this results in buggy translations for non-internal GPIOs.\n\nGet rid of the private gpio_to_irq() implementation, replacing it\nwith the .to_irq method in the sa1100 gpio chip instead.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "2145199c4f0db7c517dd788abec301dc84b91bd0", "tree": "d5ae3afd434b81a377bf3ddb3780703952a4fdc0", "parents": [ "21ebd6c68b5511b55f4f456e4ba17c2d711e3617", "081794564e3000e602de290d1121792c33b475a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:48:42 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:48:42 2012 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n dma-buf: Documentation update for Kconfig select\n nouveau: Support Optimus models for vga_switcheroo\n nouveau: properly check for _DSM function support\n dma-buf: drop option text so users don\u0027t select it.\n radeon: Call pci_clear_master() instead of open-coding it.\n gma500: Discard modes that don\u0027t fit in stolen memory\n drm: bump DRM_CONNECTOR_MAX_ENCODER from 2 to 3\n drm/radeon/kms: Fix module parameter description format\n drm/radeon/kms/ni: fix packet2 handling for VM IB parser\n ttm/dma: Remove the WARN() which is not useful.\n" }, { "commit": "21ebd6c68b5511b55f4f456e4ba17c2d711e3617", "tree": "2f4f98568a7a52ab6734fb190d0cbf6f9c1c6492", "parents": [ "4b8be38cf782f8ebebc089083fa0572ade79d7ca", "74d836c4142e5d100f8d9a1b2ee3003c2ed7109d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:43:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:43:32 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)\n rtc: max8925: Add function to work as wakeup source\n mfd: Add pm ops to max8925\n mfd: Convert aat2870 to dev_pm_ops\n mfd: Still check other interrupts if we get a wm831x touchscreen IRQ\n mfd: Introduce missing kfree in 88pm860x probe routine\n mfd: Add S5M series configuration\n mfd: Add s5m series irq driver\n mfd: Add S5M core driver\n mfd: Improve mc13xxx dt binding document\n mfd: Fix stmpe section mismatch\n mfd: Fix stmpe build warning\n mfd: Fix STMPE I2c build failure\n mfd: Constify aat2870-core i2c_device_id table\n gpio: Add support for stmpe variant 801\n mfd: Add support for stmpe variant 801\n mfd: Add support for stmpe variant 610\n mfd: Add support for STMPE SPI interface\n mfd: Separate out STMPE controller and interface specific code\n misc: Remove max8997-muic sysfs attributes\n mfd: Remove unused wm831x_irq_data_to_mask_reg()\n ...\n\nFix up trivial conflict in drivers/leds/Kconfig due to addition of\nLEDS_MAX8997 and LEDS_TCA6507 next to each other.\n" }, { "commit": "4b8be38cf782f8ebebc089083fa0572ade79d7ca", "tree": "2f88a0a5c1c0be9121c31b5a2775ae2f979cfa66", "parents": [ "5df1b274cd2f0304339c7f5586fa16cce0fdfce2", "0db13fc2abbb0b1a8d8efee20dfbd7f3c5d54022" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:41:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:41:15 2012 -0800" }, "message": "Merge tag \u0027mmc-merge-for-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nMMC highlights for 3.3:\n\nCore:\n * Support for the HS200 high-speed eMMC mode.\n * Support SDIO 3.0 Ultra High Speed cards.\n * Kill pending block requests immediately if card is removed.\n * Enable the eMMC feature for locking boot partitions read-only\n until next power on, exposed via sysfs.\n\nDrivers:\n * Runtime PM support for Intel Medfield SDIO.\n * Suspend/resume support for sdhci-spear.\n * sh-mmcif now processes requests asynchronously.\n\n* tag \u0027mmc-merge-for-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (58 commits)\n mmc: fix a deadlock between system suspend and MMC block IO\n mmc: sdhci: restore the enabled dma when do reset all\n mmc: dw_mmc: miscaculated the fifo-depth with wrong bit operation\n mmc: host: Adds support for eMMC 4.5 HS200 mode\n mmc: core: HS200 mode support for eMMC 4.5\n mmc: dw_mmc: fixed wrong bit operation for SDMMC_GET_FCNT()\n mmc: core: Separate the timeout value for cache-ctrl\n mmc: sdhci-spear: Fix compilation error\n mmc: sdhci: Deal with failure case in sdhci_suspend_host\n mmc: dw_mmc: Clear the DDR mode for non-DDR\n mmc: sd: Fix SDR12 timing regression\n mmc: sdhci: Fix tuning timer incorrect setting when suspending host\n mmc: core: Add option to prevent eMMC sleep command\n mmc: omap_hsmmc: use threaded irq handler for card-detect.\n mmc: sdhci-pci: enable runtime PM for Medfield SDIO\n mmc: sdhci: Always pass clock request value zero to set_clock host op\n mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION\n mmc: sdhci-pci: get gpio numbers from platform data\n mmc: sdhci-pci: add platform data\n mmc: sdhci: prevent card detection activity for non-removable cards\n ...\n" }, { "commit": "5df1b274cd2f0304339c7f5586fa16cce0fdfce2", "tree": "3c04d03acdeaef1c3c9b264671ea8adecc46e362", "parents": [ "69e4747ee9727d660b88d7e1efe0f4afcb35db1b", "65cc21b4523e94d5640542a818748cd3be8cd6b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:40:12 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:40:12 2012 -0800" }, "message": "Merge branch \u0027wire-accept4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\n* \u0027wire-accept4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n ia64: Add accept4() syscall\n" }, { "commit": "69e4747ee9727d660b88d7e1efe0f4afcb35db1b", "tree": "2dde4642ad0dba19688b664c4397c61cf9ebce25", "parents": [ "a3301b751b19f0efbafddc4034f8e7ce6bf3007b" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Sun Jan 08 17:07:28 2012 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:39:44 2012 -0800" }, "message": "Unused iocbs in a batch should not be accounted as active.\n\nSince commit 080d676de095 (\"aio: allocate kiocbs in batches\") iocbs are\nallocated in a batch during processing of first iocbs. All iocbs in a\nbatch are automatically added to ctx-\u003eactive_reqs list and accounted in\nctx-\u003ereqs_active.\n\nIf one (not the last one) of iocbs submitted by an user fails, further\niocbs are not processed, but they are still present in ctx-\u003eactive_reqs\nand accounted in ctx-\u003ereqs_active. This causes process to stuck in a D\nstate in wait_for_all_aios() on exit since ctx-\u003ereqs_active will never\ngo down to zero. Furthermore since kiocb_batch_free() frees iocb\nwithout removing it from active_reqs list the list become corrupted\nwhich may cause oops.\n\nFix this by removing iocb from ctx-\u003eactive_reqs and updating\nctx-\u003ereqs_active in kiocb_batch_free().\n\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nReviewed-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: stable@kernel.org # 3.2\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a3301b751b19f0efbafddc4034f8e7ce6bf3007b", "tree": "1b94ed9c9ecf887c53bb416d5e7b59694aa353f6", "parents": [ "96e80a7851b44f3decaac0625665cd64e550b71d" ], "author": { "name": "Srivatsa S. Bhat", "email": "srivatsa.bhat@linux.vnet.ibm.com", "time": "Sat Jan 14 08:11:31 2012 +0530" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 19:11:35 2012 -0800" }, "message": "x86/mce: Fix CPU hotplug and suspend regression related to MCE\n\nCommit 8a25a2fd126c (\"cpu: convert \u0027cpu\u0027 and \u0027machinecheck\u0027 sysdev_class\nto a regular subsystem\") changed how things are dealt with in the MCE\nsubsystem. Some of the things that got broken due to this are CPU\nhotplug and suspend/hibernate.\n\nMCE uses per_cpu allocations of struct device. So, when a CPU goes\noffline and comes back online, in order to ensure that we start from a\nclean slate with respect to the MCE subsystem, zero out the entire\nper_cpu device structure to 0 before using it.\n\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ee34a37049114303011e154478c63b977bcff24c", "tree": "b33342752535473f07742206395049233579d12b", "parents": [ "a029db43986e23677498ab4d84bb61b05de83484" ], "author": { "name": "Barry Song", "email": "Baohua.Song@csr.com", "time": "Mon Jan 09 12:56:23 2012 +0800" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Jan 14 00:41:37 2012 +0100" }, "message": "PM / Hibernate: Drop the check of swap space size for compressed image\n\nFor compressed image, the space required is not known until\nwe finish compressing and writing all pages.\nThis patch drops the check, and if swap space is not enough\nfinally, system can still restore to normal after writing\nswap fails for compressed images.\n\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "a029db43986e23677498ab4d84bb61b05de83484", "tree": "f05254ed98a0e2a5c20c24b7343fbefe9c5dd366", "parents": [ "e59a8db8d9b7c02e0bbefbeb18a3836288a97b8a" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Sat Jan 14 00:40:14 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Jan 14 00:40:14 2012 +0100" }, "message": "PM / shmobile: fix A3SP suspend method\n\nFix the reverted condition in sh7372_a3sp_suspend().\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "e59a8db8d9b7c02e0bbefbeb18a3836288a97b8a", "tree": "6d507257fb36ecccdaed806869934419ae890506", "parents": [ "0f1d6986bae57b6d11e2c9ce5e66b6c6b0e3684d" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Jan 14 00:39:36 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Jan 14 00:39:36 2012 +0100" }, "message": "PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset\n\nThe governor functions in drivers/base/power/domain_governor.c\nare only used if CONFIG_PM_RUNTIME is set and they refer to data\nstructures that are only present in that case. For this reason,\nthey shouldn\u0027t be compiled at all when CONFIG_PM_RUNTIME is not set.\n\nReported-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" } ], "next": "0f1d6986bae57b6d11e2c9ce5e66b6c6b0e3684d" }