)]}' { "log": [ { "commit": "dbd5768f87ff6fb0a4fe09c4d7b6c4a24de99430", "tree": "42ea94ea733538f797aa745945fc43c4d1b89217", "parents": [ "7994e6f7254354e03028a11f98a27bd67dace9f1" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:48:02 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:41 2012 +0800" }, "message": "vfs: Rename end_writeback() to clear_inode()\n\nAfter we moved inode_sync_wait() from end_writeback() it doesn\u0027t make sense\nto call the function end_writeback() anymore. Rename it to clear_inode()\nwhich well says what the function really does - set I_CLEAR flag.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "7994e6f7254354e03028a11f98a27bd67dace9f1", "tree": "b93db15bf5e4cd890670db0fd36575b5efce2366", "parents": [ "4f8ad655dbc82cf05d2edc11e66b78a42d38bf93" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:48:01 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:40 2012 +0800" }, "message": "vfs: Move waiting for inode writeback from end_writeback() to evict_inode()\n\nCurrently, I_SYNC can never be set when evict_inode() (and thus\nend_writeback()) is called because flusher thread holds inode reference while\ninode is under writeback. As a result inode_sync_wait() in those places\ncurrently does nothing. However that is going to change and unveils problems\nwith calling inode_sync_wait() from end_writeback(). Several filesystems call\nend_writeback() after they have deleted the inode (btrfs, gfs2, ...) and other\nfilesystems (ext3, ext4, reiserfs, ...) can deadlock when waiting for I_SYNC\nbecause they call end_writeback() from within a transaction.\n\nTo avoid these issues, we move inode_sync_wait() into evict_inode() before\ncalling -\u003eevict_inode(). That way we preserve the current property that\n-\u003eevict_inode() and writeback never run in parallel and all filesystems are\nsafe.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "4f8ad655dbc82cf05d2edc11e66b78a42d38bf93", "tree": "a2692bde34b45857e14c05c10c61e33763ac1bde", "parents": [ "f0d07b7ffde758a27a48509ceda9a9ef413e0ea0" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:48:00 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:40 2012 +0800" }, "message": "writeback: Refactor writeback_single_inode()\n\nThe code in writeback_single_inode() is relatively complex. The list requeing\nlogic makes sense only for flusher thread but not really for sync_inode() or\nwrite_inode_now() callers. Also when we want to get rid of inode references\nheld by flusher thread, we will need a special I_SYNC handling there.\n\nSo separate part of writeback_single_inode() which does the real writeback work\ninto __writeback_single_inode() and make writeback_single_inode() do only stuff\nnecessary for callers writing only one inode, moving the special list handling\ninto writeback_sb_inodes(). As a sideeffect this fixes a possible race where we\ncould skip some inode during sync(2) because other writer refiled it from b_io\nto b_dirty list. Also I_SYNC handling is moved into the callers of\n__writeback_single_inode() to make locking easier.\n\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "f0d07b7ffde758a27a48509ceda9a9ef413e0ea0", "tree": "cb02c3a9e662cca039f7093b69f62b4e0838c98f", "parents": [ "ccb26b5a65867839d95156e02ea4861f64a8cbf3" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:47:59 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:39 2012 +0800" }, "message": "writeback: Remove wb-\u003elist_lock from writeback_single_inode()\n\nwriteback_single_inode() doesn\u0027t need wb-\u003elist_lock for anything on entry now.\nSo remove the requirement. This makes locking of writeback_single_inode()\ntemporarily awkward (entering with i_lock, returning with i_lock and\nwb-\u003elist_lock) but it will be sanitized in the next patch.\n\nAlso inode_wait_for_writeback() doesn\u0027t need wb-\u003elist_lock for anything. It was\njust taking it to make usage convenient for callers but with\nwriteback_single_inode() changing it\u0027s not very convenient anymore. So remove\nthe lock from that function.\n\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "ccb26b5a65867839d95156e02ea4861f64a8cbf3", "tree": "36ee626d4525171d6a8bb2e4582bd9e0a811bb2d", "parents": [ "6290be1c1dc6589eeda213aa40946b27fa4faac8" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:47:58 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:39 2012 +0800" }, "message": "writeback: Separate inode requeueing after writeback\n\nMove inode requeueing after inode has been written out into a separate\nfunction.\n\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "6290be1c1dc6589eeda213aa40946b27fa4faac8", "tree": "5c7aa9510c3210775b948b578fa844cbfe399aa0", "parents": [ "cc1676d917f32504dbadc858fa790bc524c9f0da" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:47:57 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:39 2012 +0800" }, "message": "writeback: Move I_DIRTY_PAGES handling\n\nInstead of clearing I_DIRTY_PAGES and resetting it when we didn\u0027t succeed in\nwriting them all, just clear the bit only when we succeeded writing all the\npages. We also move the clearing of the bit close to other i_state handling to\nseparate it from writeback list handling. This is desirable because list\nhandling will differ for flusher thread and other writeback_single_inode()\ncallers in future. No filesystem plays any tricks with I_DIRTY_PAGES (like\nchecking it in -\u003ewritepages or -\u003ewrite_inode implementation) so this movement\nis safe.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "cc1676d917f32504dbadc858fa790bc524c9f0da", "tree": "d665d5ad0a844a6b1aff74deb4c8aa01c7596135", "parents": [ "365b94ae67d2915d412b593d47449a6bffed9d37" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:47:56 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:38 2012 +0800" }, "message": "writeback: Move requeueing when I_SYNC set to writeback_sb_inodes()\n\nWhen writeback_single_inode() is called on inode which has I_SYNC already\nset while doing WB_SYNC_NONE, inode is moved to b_more_io list. However\nthis makes sense only if the caller is flusher thread. For other callers of\nwriteback_single_inode() it doesn\u0027t really make sense and may be even wrong\n- flusher thread may be doing WB_SYNC_ALL writeback in parallel.\n\nSo we move requeueing from writeback_single_inode() to writeback_sb_inodes().\n\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "365b94ae67d2915d412b593d47449a6bffed9d37", "tree": "ed5d92a05a7c4670439632a20895f523a6553720", "parents": [ "68809c7108b9a75baf2a888b1c19ce1a4680f600" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu May 03 14:47:55 2012 +0200" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:43:38 2012 +0800" }, "message": "writeback: Move clearing of I_SYNC into inode_sync_complete()\n\nMove clearing of I_SYNC into inode_sync_complete(). It is more logical to have\nclearing of I_SYNC bit and waking of waiters in one place. Also later we will\nhave two places needing to clear I_SYNC and wake up waiters so this allows them\nto use the common helper. Moving of I_SYNC clearing to a later stage of\nwriteback_single_inode() is safe since we hold i_lock all the time.\n\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "68809c7108b9a75baf2a888b1c19ce1a4680f600", "tree": "72dac532abb4f42d197023a0495952c387c835ce", "parents": [ "4cd9069a0a0e5fb8b007425c937642682ac96c76" ], "author": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:21:42 2012 +0800" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sun May 06 13:41:58 2012 +0800" }, "message": "writeback: initialize global_dirty_limit\n\nThis prevents global_dirty_limit from remaining 0 (the initial value)\nfor long time, since it\u0027s only updated in update_dirty_limit() when\nabove the dirty freerun area.\n\nIt will avoid unexpected consequences when some random code use it as a\nconvenient approximation of the global dirty threshold.\n\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "4cd9069a0a0e5fb8b007425c937642682ac96c76", "tree": "cb7872cb3a6a22b1503349106faa1ad0068f8cbc", "parents": [ "18cf8cf8bab1296f477ee4dd8f78b5b23c5a192e" ], "author": { "name": "Richard Kennedy", "email": "richard@rsk.demon.co.uk", "time": "Wed Apr 25 14:53:05 2012 +0100" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Wed Apr 25 21:58:11 2012 +0800" }, "message": "fs: remove 8 bytes of padding from struct writeback_control on 64 bit builds\n\nReorder structure writeback_control to remove 8 bytes of padding on 64\nbit builds, this shrinks its size from 48 to 40 bytes.\n\nThis structure is always on the stack and uses C99 named initialisation,\nso should be safe and have a small impact on stack usage.\n\nSigned-off-by: Richard Kennedy \u003crichard@rsk.demon.co.uk\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "18cf8cf8bab1296f477ee4dd8f78b5b23c5a192e", "tree": "78ce4000085e180d89e85e9363379b55e455b205", "parents": [ "668ce0ac707719d866af7e432e518af7b4c575ad" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Thu Apr 12 13:44:20 2012 -0700" }, "committer": { "name": "Fengguang Wu", "email": "fengguang.wu@intel.com", "time": "Sat Apr 14 17:37:27 2012 +0800" }, "message": "mm: page-writeback.c: local functions should not be exposed globally\n\nThe function global_dirtyable_memory is only referenced in this file and\nshould be marked static to prevent it from being exposed globally.\n\nThis quiets the sparse warning:\n\nwarning: symbol \u0027global_dirtyable_memory\u0027 was not declared. Should it be static?\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "668ce0ac707719d866af7e432e518af7b4c575ad", "tree": "56981174aa46721ef0b4d3710f990153e22dda3a", "parents": [ "a1c0cad352520206305b1a3c2658097721454855", "ef1f0982540e5f79c8bbf3675bbc0a9734dba3fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 19:44:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 19:44:36 2012 -0700" }, "message": "Merge branch \u0027systemh-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull system.h fixups for less common arch\u0027s from Paul Gortmaker:\n \"Here is what is hopefully the last of the system.h related fixups.\n\n The fixes for Alpha and ia64 are code relocations consistent with what\n was done for the more mainstream architectures. Note that the\n diffstat lines removed vs lines added are not the same since I\u0027ve\n fixed some of the whitespace issues in the relocated code blocks.\n However they are functionally the same. Compile tested locally, plus\n these two have been in linux-next for a while.\n\n There is also a trivial one line system.h related fix for the Tilera\n arch from Chris Metcalf to fix an implict include..\"\n\n* \u0027systemh-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n irq_work: fix compile failure on tile from missing include\n ia64: populate the cmpxchg header with appropriate code\n alpha: fix build failures from system.h dismemberment\n" }, { "commit": "a1c0cad352520206305b1a3c2658097721454855", "tree": "82f850ea19e1750549a1e7ea414c2c6ab032362a", "parents": [ "659e45d8a0aca8619f0d308448c480279fa002b6", "b78f29ca0516266431688c5eb42d39ce42ec039a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 19:42:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 19:42:56 2012 -0700" }, "message": "Merge tag \u0027fbdev-fixes-for-3.4-1\u0027 of git://github.com/schandinat/linux-2.6\n\nPull fbdev fixes from Florian Tobias Schandinat:\n - a compile fix for au1*fb\n - a fix to make kyrofb usable on x86_64\n - a fix for uvesafb to prevent an oops due to NX-protection\n\n \"The fix for kyrofb is a bit large but it\u0027s just replacing \"unsigned\n long\" by \"u32\" for 64 bit compatibility.\"\n\n* tag \u0027fbdev-fixes-for-3.4-1\u0027 of git://github.com/schandinat/linux-2.6:\n video:uvesafb: Fix oops that uvesafb try to execute NX-protected page\n fbdev: fix au1*fb builds\n kyrofb: fix on x86_64\n" }, { "commit": "659e45d8a0aca8619f0d308448c480279fa002b6", "tree": "4475e6a64568e81d9418265eb4932f017e7a61a9", "parents": [ "c104f1fa1ecf4ee0fc06e31b1f77630b2551be81", "d53ba47484ed6245e640ee4bfe9d21e9bfc15765" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 19:41:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 19:41:27 2012 -0700" }, "message": "Merge branch \u0027for-linus-min\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull the minimal btrfs branch from Chris Mason:\n \"We have a use-after-free in there, along with errors when mount -o\n discard is enabled, and a BUG_ON(we should compile with UP more\n often).\"\n\n* \u0027for-linus-min\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:\n Btrfs: use commit root when loading free space cache\n Btrfs: fix use-after-free in __btrfs_end_transaction\n Btrfs: check return value of bio_alloc() properly\n Btrfs: remove lock assert from get_restripe_target()\n Btrfs: fix eof while discarding extents\n Btrfs: fix uninit variable in repair_eb_io_failure\n Revert \"Btrfs: increase the global block reserve estimates\"\n" }, { "commit": "c104f1fa1ecf4ee0fc06e31b1f77630b2551be81", "tree": "31c9e009409cc0b26b6d69adf48d49b08aded978", "parents": [ "d8dd0b6d4836bce81cece60509ef3b157a420776", "63634806519b49bb43f37e53a1e8366eb3e846a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:45:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:45:13 2012 -0700" }, "message": "Merge branch \u0027for-3.4/drivers\u0027 of git://git.kernel.dk/linux-block\n\nPull block driver bits from Jens Axboe:\n\n - A series of fixes for mtip32xx. Most from Asai at Micron, but also\n one from Greg, getting rid of the dependency on PCIE_HOTPLUG.\n\n - A few bug fixes for xen-blkfront, and blkback.\n\n - A virtio-blk fix for Vivek, making resize actually work.\n\n - Two fixes from Stephen, making larger transfers possible on cciss.\n This is needed for tape drive support.\n\n* \u0027for-3.4/drivers\u0027 of git://git.kernel.dk/linux-block:\n block: mtip32xx: remove HOTPLUG_PCI_PCIE dependancy\n mtip32xx: dump tagmap on failure\n mtip32xx: fix handling of commands in various scenarios\n mtip32xx: Shorten macro names\n mtip32xx: misc changes\n mtip32xx: Add new sysfs entry \u0027status\u0027\n mtip32xx: make setting comp_time as common\n mtip32xx: Add new bitwise flag \u0027dd_flag\u0027\n mtip32xx: fix error handling in mtip_init()\n virtio-blk: Call revalidate_disk() upon online disk resize\n xen/blkback: Make optional features be really optional.\n xen/blkback: Squash the discard support for \u0027file\u0027 and \u0027phy\u0027 type.\n mtip32xx: fix incorrect value set for drv_cleanup_done, and re-initialize and start port in mtip_restart_port()\n cciss: Fix scsi tape io with more than 255 scatter gather elements\n cciss: Initialize scsi host max_sectors for tape drive support\n xen-blkfront: make blkif_io_lock spinlock per-device\n xen/blkfront: don\u0027t put bdev right after getting it\n xen-blkfront: use bitmap_set() and bitmap_clear()\n xen/blkback: Enable blkback on HVM guests\n xen/blkback: use grant-table.c hypercall wrappers\n" }, { "commit": "d8dd0b6d4836bce81cece60509ef3b157a420776", "tree": "7a28f327a15443d6c9d091f3d272abd107251ab7", "parents": [ "2d59dcfb54ade45cacc59a6e7bd96b8c19088c3d", "1b2e19f17ed327af6add02978efdf354e4f8e4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "message": "Merge branch \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block\n\nPull block core bits from Jens Axboe:\n \"It\u0027s a nice and quiet round this time, since most of the tricky stuff\n has been pushed to 3.5 to give it more time to mature. After a few\n hectic block IO core changes for 3.3 and 3.2, I\u0027m quite happy with a\n slow round.\n\n Really minor stuff in here, the only real functional change is making\n the auto-unplug threshold a per-queue entity. The threshold is set so\n that it\u0027s low enough that we don\u0027t hold off IO for too long, but still\n big enough to get a nice benefit from the batched insert (and hence\n queue lock cost reduction). For raid configurations, this currently\n breaks down.\"\n\n* \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block:\n block: make auto block plug flush threshold per-disk based\n Documentation: Add sysfs ABI change for cfq\u0027s target latency.\n block: Make cfq_target_latency tunable through sysfs.\n block: use lockdep_assert_held for queue locking\n block: blk_alloc_queue_node(): use caller\u0027s GFP flags instead of GFP_KERNEL\n" }, { "commit": "2d59dcfb54ade45cacc59a6e7bd96b8c19088c3d", "tree": "7bd97d8bf2e59560ebfc21fbdaf69767e2173365", "parents": [ "7d93101fc71ec47c7cc66ac99f76ef795c5207aa" ], "author": { "name": "Kevin Hilman", "email": "khilman@ti.com", "time": "Fri Apr 13 13:32:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 17:57:40 2012 -0700" }, "message": "cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS\n\nThe OMAP driver needs a \u0027depends on ARCH_OMAP2PLUS\u0027 since it only\nbuilds for OMAP2+ platforms.\n\nThis \u0027depends on\u0027 was in the original patch from Russell King, but was\nerroneously removed by me when making this option user-selectable in\ncommit b09db45c (cpufreq: OMAP driver depends CPUfreq tables.) This\npatch remedies that.\n\nApologies to Russell King for breaking his originally working patch.\n\nAlso, thanks to Grazvydas Ignotas for reporting the same problem.\n\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7d93101fc71ec47c7cc66ac99f76ef795c5207aa", "tree": "87093d704813cf1e159e5c64d51d8268c1630afe", "parents": [ "6e1173399d09aa7ab5db613911e38700b2307ece", "3d3eeb2ef26112a200785e5fca58ec58dd33bf1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:41:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:41:21 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\nPull sparc fixes from David Miller.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc64: Eliminate obsolete __handle_softirq() function\n sparc64: Fix bootup crash on sun4v.\n" }, { "commit": "6e1173399d09aa7ab5db613911e38700b2307ece", "tree": "a86e7a294f5648dbc531c9590094492b887fea90", "parents": [ "461c14917e04f76d5efc63ce079798d4ca6c297f", "d7ee11157f1fce02632e2f3a56b99b2afd9e5f93" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:19:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:19:41 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon patches from Guenter Roeck:\n \"Fix build warnings in four drivers\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (pmbus_core) Fix compiler warning\n hwmon: (smsc47m1) Fix compiler warning\n hwmon: (acpi_power_meter) Fix compiler warning seen in some configurations\n hwmon: (smsc47b397) Fix compiler warning\n" }, { "commit": "461c14917e04f76d5efc63ce079798d4ca6c297f", "tree": "fe6381cc1f1d7d2c7447fef54d490f8d99ce4b78", "parents": [ "cf7d8a5550779486524f775c8cf4be9b91365d23", "9a5c7d6eb9b8cc9fa1c7169ecfd96c9e267c0452" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:18:20 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:18:20 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO bug fixes from Grant Likely:\n \"Miscellaneous bug fixes to GPIO drivers and for a corner case in the\n gpio device tree parsing code.\"\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n gpio/exynos: Fix compiler warning in gpio-samsung.c file\n gpio: Fix range check in of_gpio_simple_xlate()\n gpio: Fix uninitialized variable bit in adp5588_irq_handler\n gpio/sodaville: Convert sodaville driver to new irqdomain API\n" }, { "commit": "cf7d8a5550779486524f775c8cf4be9b91365d23", "tree": "0be1d7e7aebcedcd97e1ec9a1af3a190f45a20b4", "parents": [ "4166fb64593514ad920b7dbd290e0a934b37d24a", "39ec0d38141b198f94fd19c2bb10fd7c616510d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:17:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:17:45 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull SPI bug fixes from Grant Likely:\n \"Miscellaneous driver bug fixes. No major changes in this branch.\"\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/imx: prevent NULL pointer dereference in spi_imx_probe()\n spi/imx: mark base member in spi_imx_data as __iomem\n spi/mpc83xx: fix NULL pdata dereference bug\n spi/davinci: Fix DMA API usage in davinci\n spi/pL022: include types.h to remove compilation warnings\n" }, { "commit": "3d3eeb2ef26112a200785e5fca58ec58dd33bf1e", "tree": "9a7ba8c313355f9b9832bff425517c0457f0cf69", "parents": [ "9e0daff30fd7ecf698e5d20b0fa7f851e427cca5" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Fri Apr 13 03:35:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:58:38 2012 -0700" }, "message": "sparc64: Eliminate obsolete __handle_softirq() function\n\nThe invocation of softirq is now handled by irq_exit(), so there is no\nneed for sparc64 to invoke it on the trap-return path. In fact, doing so\nis a bug because if the trap occurred in the idle loop, this invocation\ncan result in lockdep-RCU failures. The problem is that RCU ignores idle\nCPUs, and the sparc64 trap-return path to the softirq handlers fails to\ntell RCU that the CPU must be considered non-idle while those handlers\nare executing. This means that RCU is ignoring any RCU read-side critical\nsections in those handlers, which in turn means that RCU-protected data\ncan be yanked out from under those read-side critical sections.\n\nThe shiny new lockdep-RCU ability to detect RCU read-side critical sections\nthat RCU is ignoring located this problem.\n\nThe fix is straightforward: Make sparc64 stop manually invoking the\nsoftirq handlers.\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nSuggested-by: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nTested-by: Meelis Roos \u003cmroos@linux.ee\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e0daff30fd7ecf698e5d20b0fa7f851e427cca5", "tree": "d40d7ee1cf7e2ca200d9c58c29e9ba44f8fa2d14", "parents": [ "4166fb64593514ad920b7dbd290e0a934b37d24a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:56:22 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:56:22 2012 -0700" }, "message": "sparc64: Fix bootup crash on sun4v.\n\nThe DS driver registers as a subsys_initcall() but this can be too\nearly, in particular this risks registering before we\u0027ve had a chance\nto allocate and setup module_kset in kernel/params.c which is\nperformed also as a subsyts_initcall().\n\nRegister DS using device_initcall() insteal.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "ef1f0982540e5f79c8bbf3675bbc0a9734dba3fc", "tree": "7865706f7112dbb5c195c41695bbfdcf9e5471ee", "parents": [ "85f8f7759e418c814ee2ceacf73eddb9bed39492" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Wed Apr 11 12:21:39 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Apr 13 13:15:16 2012 -0400" }, "message": "irq_work: fix compile failure on tile from missing include\n\nBuilding with IRQ_WORK configured results in\n\nkernel/irq_work.c: In function ‘irq_work_run’:\nkernel/irq_work.c:110: error: implicit declaration of function ‘irqs_disabled’\n\nThe appropriate header just needs to be included.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "85f8f7759e418c814ee2ceacf73eddb9bed39492", "tree": "a896b80f398d0e48e44e16ac344de466f4be4545", "parents": [ "5ba840f9da1ff96e0c6e982608a9e80e35333cc5" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Apr 03 13:51:35 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Apr 13 13:15:16 2012 -0400" }, "message": "ia64: populate the cmpxchg header with appropriate code\n\ncommit 93f378883cecb9dcb2cf5b51d9d24175906659da\n\n \"Fix ia64 build errors (fallout from system.h disintegration)\"\n\nintroduced arch/ia64/include/asm/cmpxchg.h as a temporary\nbuild fix and stated:\n\n \"... leave the migration of xchg() and cmpxchg() to this new\n header file for a future patch.\"\n\nMigrate the appropriate chunks from asm/intrinsics.h and fix\nthe whitespace issues in the migrated chunk.\n\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "5ba840f9da1ff96e0c6e982608a9e80e35333cc5", "tree": "96ebea9798d3a15630c3ba73b730beb4d99689ab", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Apr 02 16:04:13 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Apr 13 13:15:16 2012 -0400" }, "message": "alpha: fix build failures from system.h dismemberment\n\ncommit ec2212088c42ff7d1362629ec26dda4f3e8bdad3\n\n \"Disintegrate asm/system.h for Alpha\"\n\ncombined with commit b4816afa3986704d1404fc48e931da5135820472\n\n \"Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\"\n\nintroduced the concept of asm/cmpxchg.h but the alpha arch\nnever got one. Fork the cmpxchg content out of the asm/atomic.h\nfile to create one.\n\nSome minor whitespace fixups were done on the block of code that\ncreated the new file.\n\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "4166fb64593514ad920b7dbd290e0a934b37d24a", "tree": "bf48a0ea86b578ba7f8bec61ebe6565f4b36f061", "parents": [ "e4757cab4cff01e9c47b14376be7438694032c3c", "6f3603367b8f7c34598fdfc1058622e0e1951e98" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 18:51:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 18:51:32 2012 -0700" }, "message": "Merge tag \u0027srpt-srq-type\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull infiniband fix from Roland Dreier:\n \"Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on\n non-mlx4 hardware.\"\n\n* tag \u0027srpt-srq-type\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/srpt: Set srq_type to IB_SRQT_BASIC\n" }, { "commit": "e4757cab4cff01e9c47b14376be7438694032c3c", "tree": "38e7828df0824c7cf4385e2ecdc29295d5df0864", "parents": [ "a959613533a176a8f5f402585827e94a5220d2db" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 12 19:46:34 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 18:35:58 2012 -0700" }, "message": "kconfig: delete last traces of __enabled_ from autoconf.h\n\nWe\u0027ve now fixed IS_ENABLED() and friends to not require any special\n\"__enabled_\" prefixed versions of the normal Kconfig options, so delete\nthe last traces of them being generated.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a959613533a176a8f5f402585827e94a5220d2db", "tree": "74953f42164342521a8285b80770ecc09d2b1e0f", "parents": [ "69349c2dc01c489eccaa4c472542c08e370c6d7e" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 12 19:46:33 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 18:35:58 2012 -0700" }, "message": "Revert \"kconfig: fix __enabled_ macros definition for invisible and un-selected symbols\"\n\nThis reverts commit 953742c8fe8ac45be453fee959d7be40cd89f920.\n\nDumping two lines into autoconf.h for all existing Kconfig options\nresults in a giant file (~16k lines) we have to process each time we\ncompile something. We\u0027ve weaned IS_ENABLED() and similar off of\nrequiring the __enabled_ definitions so now we can revert the change\nwhich caused all the extra lines.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "69349c2dc01c489eccaa4c472542c08e370c6d7e", "tree": "2422ef07a511d51714e0e16da1ac65c7256e9add", "parents": [ "7c427f45503f77f148cc2b66864e0684c60fa3a0" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 12 19:46:32 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 18:35:58 2012 -0700" }, "message": "kconfig: fix IS_ENABLED to not require all options to be defined\n\nUsing IS_ENABLED() within C (vs. within CPP #if statements) in its\ncurrent form requires us to actually define every possible bool/tristate\nKconfig option twice (__enabled_* and __enabled_*_MODULE variants).\n\nThis results in a huge autoconf.h file, on the order of 16k lines for a\nx86_64 defconfig.\n\nFixing IS_ENABLED to be able to work on the smaller subset of just\nthings that we really have defined is step one to fixing this. Which\nmeans it has to not choke when fed non-enabled options, such as:\n\n include/linux/netdevice.h:964:1: warning: \"__enabled_CONFIG_FCOE_MODULE\" is not defined [-Wundef]\n\nThe original prototype of how to implement a C and preprocessor\ncompatible way of doing this came from the Google+ user \"comex .\" in\nresponse to Linus\u0027 crowdsourcing challenge for a possible improvement on\nhis earlier C specific solution:\n\n\t#define config_enabled(x) (__stringify(x)[0] \u003d\u003d \u00271\u0027)\n\nIn this implementation, I\u0027ve chosen variable names that hopefully make\nhow it works more understandable.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d53ba47484ed6245e640ee4bfe9d21e9bfc15765", "tree": "12bcb989f0e210f25770a72441eb8b947fd2fad3", "parents": [ "4edc2ca388d62abffe38149f6ac00e749ea721c5" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Apr 12 16:03:57 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 20:54:01 2012 -0400" }, "message": "Btrfs: use commit root when loading free space cache\n\nA user reported that booting his box up with btrfs root on 3.4 was way\nslower than on 3.3 because I removed the ideal caching code. It turns out\nthat we don\u0027t load the free space cache if we\u0027re in a commit for deadlock\nreasons, but since we\u0027re reading the cache and it hasn\u0027t changed yet we are\nsafe reading the inode and free space item from the commit root, so do that\nand remove all of the deadlock checks so we don\u0027t unnecessarily skip loading\nthe free space cache. The user reported this fixed the slowness. Thanks,\n\nTested-by: Calvin Walton \u003ccalvin.walton@kepstin.ca\u003e\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "7c427f45503f77f148cc2b66864e0684c60fa3a0", "tree": "5cd354211d9b926bc16dcf0a02e21911e6d46039", "parents": [ "f4f9c1ac78c5c20150f03c370c2bd7eca44f5127", "9de29225bdd25958c1fa82521ff02726f1cab953" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:37:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:37:21 2012 -0700" }, "message": "Merge tag \u0027usb-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg KH:\n \"Here are a number of fixes for the USB core and drivers for 3.4-rc2\n\n Lots of tiny xhci fixes here, a few usb-serial driver fixes and new\n device ids, and a smattering of other minor fixes in different USB\n drivers.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027usb-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (30 commits)\n USB: update usbtmc api documentation\n xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI\n xHCI: use gfp flags from caller instead of GFP_ATOMIC\n xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host\n USB: fix bug of device descriptor got from superspeed device\n xhci: Fix register save/restore order.\n xhci: Restore event ring dequeue pointer on resume.\n xhci: Don\u0027t write zeroed pointers to xHC registers.\n xhci: Warn when hosts don\u0027t halt.\n xhci: don\u0027t re-enable IE constantly\n usb: xhci: fix section mismatch in linux-next\n xHCI: correct to print the true HSEE of USBCMD\n USB: serial: fix race between probe and open\n UHCI: hub_status_data should indicate if ports are resuming\n EHCI: keep track of ports being resumed and indicate in hub_status_data\n USB: fix race between root-hub suspend and remote wakeup\n USB: sierra: add support for Sierra Wireless MC7710\n USB: ftdi_sio: fix race condition in TIOCMIWAIT, and abort of TIOCMIWAIT when the device is removed\n USB: ftdi_sio: fix status line change handling for TIOCMIWAIT and TIOCGICOUNT\n USB: don\u0027t ignore suspend errors for root hubs\n ...\n" }, { "commit": "f4f9c1ac78c5c20150f03c370c2bd7eca44f5127", "tree": "92719848d035ddf5233a297dabb587f95652a975", "parents": [ "3dbc35a339d7c8c756cb159b9ba076fac4e7faeb", "11bbd5b6dae49fd7072ebf5eb63735827bd72f42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "message": "Merge tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull tty and serial fixes from Greg KH:\n \"Here are some tty and serial fixes for 3.4-rc2.\n\n Most important here is the pl011 fix, which has been reported by about\n 100 different people, which means more people use it than I expected\n :)\n\n There are also some 8250 driver reverts due to some problems reported\n by them. And other minor fixes as well.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n pch_uart: Add Kontron COMe-mTT10 uart clock quirk\n pch_uart: Fix MSI setting issue\n serial/8250_pci: add a \"force background timer\" flag and use it for the \"kt\" serial port\n Revert \"serial/8250_pci: setup-quirk workaround for the kt serial controller\"\n Revert \"serial/8250_pci: init-quirk msi support for kt serial controller\"\n tty/serial/omap: console can only be built-in\n serial: samsung: fix omission initialize ulcon in reset port fn()\n printk(): add KERN_CONT where needed in hpet and vt code\n tty/serial: atmel_serial: fix RS485 half-duplex problem\n tty: serial: altera_uart: Check for NULL platform_data in probe.\n isdn/gigaset: use gig_dbg() for debugging output\n omap-serial: Fix the error handling in the omap_serial probe\n serial: PL011: move interrupt clearing\n" }, { "commit": "3dbc35a339d7c8c756cb159b9ba076fac4e7faeb", "tree": "600e89a8133bc8508fd748fc63e32725e17144ef", "parents": [ "f5ad50100680bfe7d2702d2487d303ee122bf5f7", "474a89885f77953b12bce9f23660c31ef5c2630e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:35:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:35:12 2012 -0700" }, "message": "Merge tag \u0027staging-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree fixes from Greg KH:\n \"Here are a number of bugfixes for the drivers/staging/ portion of the\n kernel that have been reported recently.\n\n Nothing major here, with maybe the exception of the ramster code can\n now be built so it is enabled in the build again, and lots of memory\n leaks that people like to have fixed on their systems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027staging-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:\n staging: android: fix mem leaks in __persistent_ram_init()\n staging: vt6656: Don\u0027t leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()\n staging: iio: hmc5843: Fix crash in probe function.\n staging/xgifb: fix display on XGI Volari Z11m cards\n Staging: android: timed_gpio: Fix resource leak in timed_gpio_probe error paths\n android: make persistent_ram based drivers depend on HAVE_MEMBLOCK\n staging: iio: ak8975: Remove i2c client data corruption\n staging: drm/omap: move where DMM driver is registered\n staging: zsmalloc: fix memory leak\n Staging: rts_pstor: off by one in for loop\n staging: ozwpan: Added new maintainer for ozwpan\n staging:rts_pstor:Avoid \"Bad target number\" message when probing driver\n staging:rts_pstor:Fix possible panic by NULL pointer dereference\n Staging: vt6655-6: check keysize before memcpy()\n staging/media/as102: Don\u0027t call release_firmware() on uninitialized variable\n staging:iio:core add missing increment of loop index in iio_map_array_unregister()\n staging: ramster: unbreak my heart\n staging/vme: Fix module parameters\n staging: sep: Fix sign of error\n" }, { "commit": "f5ad50100680bfe7d2702d2487d303ee122bf5f7", "tree": "2d43dc7098d556a21b0445c02082b7c32093f080", "parents": [ "b3dfd76c945b879513b991bac23ffcb97fe88ec2", "282029c005e65ffdce3aa9f8220f88a8bbbc4dae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:34:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:34:33 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core and kobject fixes from Greg KH:\n \"Here are some minor fixes for the driver core and kobjects that people\n have reported recently.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027driver-core-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n kobject: provide more diagnostic info for kobject_add_internal() failures\n sysfs: handle \u0027parent deleted before child added\u0027\n sysfs: Prevent crash on unset sysfs group attributes\n sysfs: Update the name hash for an entry after changing the namespace\n drivers/base: fix compiler warning in SoC export driver - idr should be ida\n drivers/base: Remove unneeded spin_lock_init call for soc_lock\n" }, { "commit": "b3dfd76c945b879513b991bac23ffcb97fe88ec2", "tree": "fa5044e39dc816293ebf46cbb208443039eec7c5", "parents": [ "9b1ef1de20e2658c77cce89941f45525704ab534", "5269a9ab7def9a3116663347d59c4d70afa2d180" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:33:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:33:16 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull a fix for the recent irqdomain bug fixes from Grant Likely:\n \"I flubbed one patch in the last pull request which broke a format\n string on 64 bit platforms. Here\u0027s the fix.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n irq_domain: fix type mismatch in debugfs output format\n" }, { "commit": "5269a9ab7def9a3116663347d59c4d70afa2d180", "tree": "e4c93f4f7a1cc8e6c243bce6be7b5c37ece3cc54", "parents": [ "ecca5c3acc0d0933d89abc44e60afb0cc8170e35" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Apr 12 14:42:15 2012 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Apr 12 16:25:48 2012 -0600" }, "message": "irq_domain: fix type mismatch in debugfs output format\n\nsizeof(void*) returns an unsigned long, but it was being used as a width parameter to a \"%-*s\" format string which requires an int. On 64 bit platforms this causes a type mismatch:\n\n linux/kernel/irq/irqdomain.c:575: warning: field width should have type\n \u0027int\u0027, but argument 6 has type \u0027long unsigned int\u0027\n\nThis change casts the size to an int so printf gets the right data type.\n\nReported-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: David Daney \u003cdavid.daney@cavium.com\u003e\n" }, { "commit": "9b1ef1de20e2658c77cce89941f45525704ab534", "tree": "9ae887c34496c6a8be6ea3e5eaa41cd52e743588", "parents": [ "ccb1ec95e924a24906ef01ce6d028a8dc13dc87d", "7b78f13603c6fcb64e020a0bbe31a651ea2b657b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:20:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:20:24 2012 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull trivial perf build failure fix from Thomas Gleixner.\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf tools: Fix getrusage() related build failure on glibc trunk\n" }, { "commit": "ccb1ec95e924a24906ef01ce6d028a8dc13dc87d", "tree": "b16a02083ba6843fe3f2513f74a72c95d43ddccb", "parents": [ "4a1d7544fee5e601a4e642ce2720689f90428d65", "d48fc63f6f3f485ed5aa9cf019d8e8e3a7d10263" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:16:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:16:26 2012 -0700" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer fixes from Thomas Gleixner:\n \"The itimer removal one is not strictly a fix, but I really wanted to\n avoid a rebase of the urgent ones.\"\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n Revert \"clocksource: Load the ACPI PM clocksource asynchronously\"\n clockevents: tTack broadcast device mode change in tick_broadcast_switch_to_oneshot()\n itimer: Use printk_once instead of WARN_ONCE\n nohz: Fix stale jiffies update in tick_nohz_restart()\n tick: Document TICK_ONESHOT config option\n proc: stats: Use arch_idle_time for idle and iowait times if available\n itimer: Schedule silent NULL pointer fixup in setitimer() for removal\n" }, { "commit": "4a1d7544fee5e601a4e642ce2720689f90428d65", "tree": "2b79fe68b28e38183917606829d1bfce61f4e0be", "parents": [ "ecca5c3acc0d0933d89abc44e60afb0cc8170e35", "8c91c5325e107ec17e40a59a47c6517387d64eb7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:06:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:06:07 2012 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 fixes from Thomas Gleixner.\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86: Use correct byte-sized register constraint in __add()\n x86: Use correct byte-sized register constraint in __xchg_op()\n x86: vsyscall: Use NULL instead 0 for a pointer argument\n" }, { "commit": "474a89885f77953b12bce9f23660c31ef5c2630e", "tree": "2da1f0498aa3f93ffb91b2a7305169286976f6cd", "parents": [ "17b7e1ba1e2ecc9a09f5e154e555accd2a2eaedf" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Wed Apr 11 22:10:20 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 12 14:34:32 2012 -0700" }, "message": "staging: android: fix mem leaks in __persistent_ram_init()\n\nIf, in __persistent_ram_init(), the call to\npersistent_ram_buffer_init() fails or the call to\npersistent_ram_init_ecc() fails then we fail to free the memory we\nallocated to \u0027prz\u0027 with kzalloc() - thus leaking it.\n\nTo prevent the leaks I consolidated all error exits from the function\nat a \u0027err:\u0027 label at the end and made all error cases jump to that\nlabel where we can then make sure we always free \u0027prz\u0027. This is safe\nsince all the situations where the code bails out happen before \u0027prz\u0027\nhas been stored anywhere and although we\u0027ll do a redundant kfree(NULL)\ncall in the case of kzalloc() itself failing that\u0027s OK since kfree()\ndeals gracefully with NULL pointers and I felt it was more important\nto keep all error exits at a single location than to avoid that one\nharmless/redundant kfree() on a error path.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nAcked-by: Colin Cross \u003cccross@android.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "17b7e1ba1e2ecc9a09f5e154e555accd2a2eaedf", "tree": "7ecf4e5154c5f52d08f692b66c81c0d631e56990", "parents": [ "62d2feb9803f18c4e3c8a1a2c7e30a54df8a1d72" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Thu Apr 12 00:35:46 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 12 14:34:31 2012 -0700" }, "message": "staging: vt6656: Don\u0027t leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()\n\nIf copy_to_user() fails in the WLAN_CMD_GET_NODE_LIST case of the\nswitch in drivers/staging/vt6656/ioctl.c::private_ioctl() we\u0027ll leak\nthe memory allocated to \u0027pNodeList\u0027. Fix that by kfree\u0027ing the memory\nin the failure case.\nAlso remove a pointless cast (to type \u0027PSNodeList\u0027) of a kmalloc()\nreturn value - kmalloc() returns a void pointer that is implicitly\nconverted, so there is no need for an explicit cast.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "62d2feb9803f18c4e3c8a1a2c7e30a54df8a1d72", "tree": "dc9cf2f46467833a75b31b82b6ec307cbd741e97", "parents": [ "6490311f423b0d77969d6fa2ab6354b87e373bf9" ], "author": { "name": "Marek Belisko", "email": "marek.belisko@open-nandra.com", "time": "Thu Apr 12 21:48:03 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 12 14:34:31 2012 -0700" }, "message": "staging: iio: hmc5843: Fix crash in probe function.\n\nFix crash after issuing:\n\techo hmc5843 0x1e \u003e /sys/class/i2c-dev/i2c-2/device/new_device\n\n\t[ 37.180999] device: \u00272-001e\u0027: device_add\n\t[ 37.188293] bus: \u0027i2c\u0027: add device 2-001e\n\t[ 37.194549] PM: Adding info for i2c:2-001e\n\t[ 37.200958] bus: \u0027i2c\u0027: driver_probe_device: matched device 2-001e with driver hmc5843\n\t[ 37.210815] bus: \u0027i2c\u0027: really_probe: probing driver hmc5843 with device 2-001e\n\t[ 37.224884] HMC5843 initialized\n\t[ 37.228759] ------------[ cut here ]------------\n\t[ 37.233612] kernel BUG at mm/slab.c:505!\n\t[ 37.237701] Internal error: Oops - BUG: 0 [#1] PREEMPT\n\t[ 37.243103] Modules linked in:\n\t[ 37.246337] CPU: 0 Not tainted (3.3.1-gta04+ #28)\n\t[ 37.251647] PC is at kfree+0x84/0x144\n\t[ 37.255493] LR is at kfree+0x20/0x144\n\t[ 37.259338] pc : [\u003cc00b408c\u003e] lr : [\u003cc00b4028\u003e] psr: 40000093\n\t[ 37.259368] sp : de249cd8 ip : 0000000c fp : 00000090\n\t[ 37.271362] r10: 0000000a r9 : de229eac r8 : c0236274\n\t[ 37.276855] r7 : c09d6490 r6 : a0000013 r5 : de229c00 r4 : de229c10\n\t[ 37.283691] r3 : c0f00218 r2 : 00000400 r1 : c0eea000 r0 : c00b4028\n\t[ 37.290527] Flags: nZcv IRQs off FIQs on Mode SVC_32 ISA ARM Segment user\n\t[ 37.298095] Control: 10c5387d Table: 9e1d0019 DAC: 00000015\n\t[ 37.304107] Process sh (pid: 91, stack limit \u003d 0xde2482f0)\n\t[ 37.309844] Stack: (0xde249cd8 to 0xde24a000)\n\t[ 37.314422] 9cc0: de229c10 de229c00\n\t[ 37.322998] 9ce0: de229c10 ffffffea 00000005 c0236274 de140a80 c00b4798 dec00080 de140a80\n\t[ 37.331573] 9d00: c032f37c dec00080 000080d0 00000001 de229c00 de229c10 c048d578 00000005\n\t[ 37.340148] 9d20: de229eac 0000000a 00000090 c032fa40 00000001 00000000 00000001 de229c10\n\t[ 37.348724] 9d40: de229eac 00000029 c075b558 00000001 00000003 00000004 de229c10 c048d594\n\t[ 37.357299] 9d60: 00000000 60000013 00000018 205b0007 37332020 3432322e 5d343838 c0060020\n\t[ 37.365905] 9d80: de251600 00000001 00000000 de251600 00000001 c0065a84 de229c00 de229c48\n\t[ 37.374481] 9da0: 00000006 0048d62c de229c38 de229c00 de229c00 de1f6c00 de1f6c20 00000001\n\t[ 37.383056] 9dc0: 00000000 c048d62c 00000000 de229c00 de229c00 de1f6c00 de1f6c20 00000001\n\t[ 37.391632] 9de0: 00000000 c048d62c 00000000 c0330164 00000000 de1f6c20 c048d62c de1f6c00\n\t[ 37.400207] 9e00: c0330078 de1f6c04 c078d714 de189b58 00000000 c02ccfd8 de1f6c20 c0795f40\n\t[ 37.408782] 9e20: c0238330 00000000 00000000 c02381a8 de1b9fc0 de1f6c20 de1f6c20 de249e48\n\t[ 37.417358] 9e40: c0238330 c0236bb0 decdbed8 de7d0f14 de1f6c20 de1f6c20 de1f6c54 de1f6c20\n\t[ 37.425933] 9e60: 00000000 c0238030 de1f6c20 c078d7bc de1f6c20 c02377ec de1f6c20 de1f6c28\n\t[ 37.434509] 9e80: dee64cb0 c0236138 c047c554 de189b58 00000000 c004b45c de1f6c20 de1f6cd8\n\t[ 37.443084] 9ea0: c0edfa6c de1f6c00 dee64c68 de1f6c04 de1f6c20 dee64cb8 c047c554 de189b58\n\t[ 37.451690] 9ec0: 00000000 c02cd634 dee64c68 de249ef4 de23b008 dee64cb0 0000000d de23b000\n\t[ 37.460266] 9ee0: de23b007 c02cd78c 00000002 00000000 00000000 35636d68 00333438 00000000\n\t[ 37.468841] 9f00: 00000000 00000000 001e0000 00000000 00000000 00000000 00000000 0a10cec0\n\t[ 37.477416] 9f20: 00000002 de249f80 0000000d dee62990 de189b40 c0234d88 0000000d c010c354\n\t[ 37.485992] 9f40: 0000000d de210f28 000acc88 de249f80 0000000d de248000 00000000 c00b7bf8\n\t[ 37.494567] 9f60: de210f28 000acc88 de210f28 000acc88 00000000 00000000 0000000d c00b7ed8\n\t[ 37.503143] 9f80: 00000000 00000000 0000000d 00000000 0007fa28 0000000d 000acc88 00000004\n\t[ 37.511718] 9fa0: c000e544 c000e380 0007fa28 0000000d 00000001 000acc88 0000000d 00000000\n\t[ 37.520294] 9fc0: 0007fa28 0000000d 000acc88 00000004 00000001 00000020 00000002 00000000\n\t[ 37.528869] 9fe0: 00000000 beab8624 0000ea05 b6eaebac 600d0010 00000001 00000000 00000000\n\t[ 37.537475] [\u003cc00b408c\u003e] (kfree+0x84/0x144) from [\u003cc0236274\u003e] (device_add+0x530/0x57c)\n\t[ 37.545806] [\u003cc0236274\u003e] (device_add+0x530/0x57c) from [\u003cc032fa40\u003e] (iio_device_register+0x8c8/0x990)\n\t[ 37.555480] [\u003cc032fa40\u003e] (iio_device_register+0x8c8/0x990) from [\u003cc0330164\u003e] (hmc5843_probe+0xec/0x114)\n\t[ 37.565338] [\u003cc0330164\u003e] (hmc5843_probe+0xec/0x114) from [\u003cc02ccfd8\u003e] (i2c_device_probe+0xc4/0xf8)\n\t[ 37.574737] [\u003cc02ccfd8\u003e] (i2c_device_probe+0xc4/0xf8) from [\u003cc02381a8\u003e] (driver_probe_device+0x118/0x218)\n\t[ 37.584777] [\u003cc02381a8\u003e] (driver_probe_device+0x118/0x218) from [\u003cc0236bb0\u003e] (bus_for_each_drv+0x4c/0x84)\n\t[ 37.594818] [\u003cc0236bb0\u003e] (bus_for_each_drv+0x4c/0x84) from [\u003cc0238030\u003e] (device_attach+0x78/0xa4)\n\t[ 37.604125] [\u003cc0238030\u003e] (device_attach+0x78/0xa4) from [\u003cc02377ec\u003e] (bus_probe_device+0x28/0x9c)\n\t[ 37.613433] [\u003cc02377ec\u003e] (bus_probe_device+0x28/0x9c) from [\u003cc0236138\u003e] (device_add+0x3f4/0x57c)\n\t[ 37.622650] [\u003cc0236138\u003e] (device_add+0x3f4/0x57c) from [\u003cc02cd634\u003e] (i2c_new_device+0xf8/0x19c)\n\t[ 37.631805] [\u003cc02cd634\u003e] (i2c_new_device+0xf8/0x19c) from [\u003cc02cd78c\u003e] (i2c_sysfs_new_device+0xb4/0x130)\n\t[ 37.641754] [\u003cc02cd78c\u003e] (i2c_sysfs_new_device+0xb4/0x130) from [\u003cc0234d88\u003e] (dev_attr_store+0x18/0x24)\n\t[ 37.651611] [\u003cc0234d88\u003e] (dev_attr_store+0x18/0x24) from [\u003cc010c354\u003e] (sysfs_write_file+0x10c/0x140)\n\t[ 37.661193] [\u003cc010c354\u003e] (sysfs_write_file+0x10c/0x140) from [\u003cc00b7bf8\u003e] (vfs_write+0xb0/0x178)\n\t[ 37.670410] [\u003cc00b7bf8\u003e] (vfs_write+0xb0/0x178) from [\u003cc00b7ed8\u003e] (sys_write+0x3c/0x68)\n\t[ 37.678833] [\u003cc00b7ed8\u003e] (sys_write+0x3c/0x68) from [\u003cc000e380\u003e] (ret_fast_syscall+0x0/0x3c)\n\t[ 37.687683] Code: 1593301c e5932000 e3120080 1a000000 (e7f001f2)\n\t[ 37.700775] ---[ end trace aaf805debdb69390 ]---\n\nClient data was assigned to iio_dev structure in probe but in\nhmc5843_init_client function casted to private driver data structure which\nis wrong. Possibly calling mutex_init(\u0026data-\u003elock); corrupt data\nwhich the lead to above crash.\n\nSigned-off-by: Marek Belisko \u003cmarek.belisko@open-nandra.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nAcked-by: Jonathan Cameron \u003cjic23@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "ecca5c3acc0d0933d89abc44e60afb0cc8170e35", "tree": "e765a76f8bf07717b4c446193bc4e2601b4fd038", "parents": [ "174808af90a06ee59ffedd60c00c252f1f887f25", "026ee1f66aaa7f01b617a0ba89ac4b531f9603f1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:15:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:15:21 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge fixes from Andrew Morton.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (14 patches)\n panic: fix stack dump print on direct call to panic()\n drivers/rtc/rtc-pl031.c: enable clock on all ST variants\n Revert \"mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()\"\n hugetlb: fix race condition in hugetlb_fault()\n drivers/rtc/rtc-twl.c: use static register while reading time\n drivers/rtc/rtc-s3c.c: add placeholder for driver private data\n drivers/rtc/rtc-s3c.c: fix compilation error\n MAINTAINERS: add PCDP console maintainer\n memcg: do not open code accesses to res_counter members\n drivers/rtc/rtc-efi.c: fix section mismatch warning\n drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected\n drivers/char/random.c: fix boot id uniqueness race\n memcg: fix broken boolen expression\n memcg: fix up documentation on global LRU\n" }, { "commit": "174808af90a06ee59ffedd60c00c252f1f887f25", "tree": "5e026fdc0d2b4d66c0a79267e5755e10d6d04bd8", "parents": [ "778c2dee6f134bf0472ed45eedaee53b4f336afb", "5d949944229b0a08e218723be231731cd86b94f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix bluetooth userland regression reported by Keith Packard, from\n Gustavo Padovan.\n\n 2) Revert ath9k PS idle change, from Sujith Manoharan.\n\n 3) Correct default TCP memory limits (again), from Eric Dumazet.\n\n 4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal\n Cardwell.\n\n 5) We made a facility for layers like wireless to say how much tailroom\n they need in the SKB for link layer stuff such as wireless\n encryption etc., but TCP works hard to fill every SKB out to the end\n defeating this specification.\n\n This leads to every TCP packet getting reallocated by the wireless\n code in order to have the right amount of tailroom available.\n\n Fix TCP to only fill SKBs out to the real amount of data area it\n asked for during the allocation, this way it won\u0027t eat into the\n slack added for the device\u0027s tailroom needs.\n\n Reported by Marc Merlin and fixed by Eric Dumazet.\n\n 6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh\n Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,\n AceLan Kao, and Andrei Emeltchenko.\n\n 7) OOPS on tty_close fix in bluetooth\u0027s hci_ldisc from Johan Hovold.\n\n 8) netfilter erroneously scales TCP window twice, fix from Changli Gao.\n\n 9) Memleak fix in wext-core from Julia Lawall.\n\n10) Consistently handle invalid TCP packets in ipv4 vs. ipv6 conntrack,\n from Jozsef Kadlecsik.\n\n11) Validate IP header length properly in netfilter conntrack\u0027s\n ipv4_get_l4proto().\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)\n NFC: Fix the LLCP Tx fragmentation loop\n rtlwifi: Add missing DMA buffer unmapping for PCI drivers\n rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine\n tcp: avoid order-1 allocations on wifi and tx path\n net: allow pskb_expand_head() to get maximum tailroom\n bridge: Do not send queries on multicast group leaves\n MAINTAINERS: Mark NATSEMI driver as orphan\u0027d.\n tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample\n tcp: restore correct limit\n Revert \"ath9k: fix going to full-sleep on PS idle\"\n rt2x00: Fix rfkill_polling register function.\n bcma: fix build error on MIPS; implicit pcibios_enable_device\n netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net\n netfilter: nf_ct_ipv4: packets with wrong ihl are invalid\n netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently\n net/wireless/wext-core.c: add missing kfree\n rtlwifi: Fix oops on rate-control failure\n mac80211: Convert WARN_ON to WARN_ON_ONCE\n rtlwifi: rtl8192de: Fix firmware initialization\n nl80211: ensure interface is up in various APIs\n ...\n" }, { "commit": "778c2dee6f134bf0472ed45eedaee53b4f336afb", "tree": "8f2d50f1876aeb142f0642ebfc2c39bf877cb222", "parents": [ "e42bd6e4a666709fc3a56cf4577c1f6fdb1c193f", "173fa4eccc39b04fbc0b569fabac6dbcec33507a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Mostly exynos and intel.\n\n Intel has 3 regression fixers (more info in intel merge commit), along\n with some other make hw work fixes, exynos has some cleanups and an\n ioctl fix.\n\n A couple of radeon fixes, couple of build fixes, and a savage\n userspace interface possible overflow fix.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (23 commits)\n drm/exynos: fixed exynos broken ioctl\n drm/i915: clear fencing tracking state when retiring requests\n drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n drm/exynos: fix struct for operation callback functions to driver name\n drm/exynos: use define instead of default_win member in struct mixer_context\n drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n drm/exynos: remove unused codes in hdmi and mixer\n drm/exynos: remove unnecessary type conversion of hdmi and mixer\n drm/i915: make rc6 module parameter read-only\n drm/i915: implement ColorBlt w/a\n drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n Revert \"drm/i915: reenable gmbus on gen3+ again\"\n drm/radeon: only add the mm i2c bus if the hw_i2c module param is set\n vgaarb.h: fix build warnings\n drm/i915: properly compute dp dithering for user-created modes\n drm/radeon/kms: fix DVO setup on some r4xx chips\n drm/savage: fix integer overflows in savage_bci_cmdbuf()\n drm/radeon: replace udelay with mdelay for long timeouts\n drm/i915: Finish any pending operations on the framebuffer before disabling\n drm/i915: Removed IVB forced enable of sprite dest key.\n ...\n" }, { "commit": "e42bd6e4a666709fc3a56cf4577c1f6fdb1c193f", "tree": "e2596e735f3f0373072ffc9ce8cd5ae246b6d84c", "parents": [ "7e066489726b52bea419085e5b8929e1e89f57a8", "afbaa90b80b1ec66e5137cc3824746bfdf559b18" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:56 2012 -0700" }, "message": "Merge tag \u0027md-3.4-fixes\u0027 of git://neil.brown.name/md\n\nPull a few more fixes for md from NeilBrown:\n \"Two are tagged for -stable. They can cause an oops, but very rarely.\"\n\n* tag \u0027md-3.4-fixes\u0027 of git://neil.brown.name/md:\n md/bitmap: prevent bitmap_daemon_work running while initialising bitmap\n md/raid1,raid10: Fix calculation of \u0027vcnt\u0027 when processing error recovery.\n MD: Bitmap version cleanup.\n" }, { "commit": "026ee1f66aaa7f01b617a0ba89ac4b531f9603f1", "tree": "536bca88c7ee8475eb33b0b8a654bd13b8fd64a9", "parents": [ "2f3972168353d355854d6381f1f360ce83b723e5" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Apr 12 12:49:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "panic: fix stack dump print on direct call to panic()\n\nCommit 6e6f0a1f0fa6 (\"panic: don\u0027t print redundant backtraces on oops\")\ncauses a regression where no stack trace will be printed at all for the\ncase where kernel code calls panic() directly while not processing an\noops, and of course there are 100\u0027s of instances of this type of call.\n\nThe original commit executed the check (!oops_in_progress), but this will\nalways be false because just before the dump_stack() there is a call to\nbust_spinlocks(1), which does the following:\n\n void __attribute__((weak)) bust_spinlocks(int yes)\n {\n\tif (yes) {\n\t\t++oops_in_progress;\n\nThe proper way to resolve the problem that original commit tried to\nsolve is to avoid printing a stack dump from panic() when the either of\nthe following conditions is true:\n\n 1) TAINT_DIE has been set (this is done by oops_end())\n This indicates and oops has already been printed.\n 2) oops_in_progress \u003e 1\n This guards against the rare case where panic() is invoked\n a second time, or in between oops_begin() and oops_end()\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.3+]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f3972168353d355854d6381f1f360ce83b723e5", "tree": "78d1013f792083ca34925fba1ae30e71c7bbd1d5", "parents": [ "41c93088127df2579e8ca64010929ec9e41d5543" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Apr 12 12:49:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-pl031.c: enable clock on all ST variants\n\nThe ST variants of the PL031 all require bit 26 in the control register\nto be set before they work properly. Discovered this when testing on\nthe Nomadik board where it would suprisingly just stand still.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: Mian Yousaf Kaukab \u003cmian.yousaf.kaukab@stericsson.com\u003e\nCc: Alessandro Rubini \u003crubini@unipv.it\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "41c93088127df2579e8ca64010929ec9e41d5543", "tree": "5bbfded1934fc94facbfa892a59874703aa6922a", "parents": [ "66aebce747eaf9bc456bf1f1b217d8db843031d0" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Thu Apr 12 12:49:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "Revert \"mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()\"\n\nThis reverts commit c38446cc65e1f2b3eb8630c53943b94c4f65f670.\n\nBefore the commit, the code makes senses to me but not after the commit.\nThe \"nr_reclaimed\" is the number of pages reclaimed by scanning through\nthe memcg\u0027s lru lists. The \"nr_to_reclaim\" is the target value for the\nwhole function. For example, we like to early break the reclaim if\nreclaimed 32 pages under direct reclaim (not DEF_PRIORITY).\n\nAfter the reverted commit, the target \"nr_to_reclaim\" is decremented each\ntime by \"nr_reclaimed\" but we still use it to compare the \"nr_reclaimed\".\nIt just doesn\u0027t make sense to me...\n\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "66aebce747eaf9bc456bf1f1b217d8db843031d0", "tree": "460c0268105191b2d581f42d5534dc952d565a17", "parents": [ "f3ec434c69ac7f447ff6e6389c19727c9f002087" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Thu Apr 12 12:49:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "hugetlb: fix race condition in hugetlb_fault()\n\nThe race is as follows:\n\nSuppose a multi-threaded task forks a new process (on cpu A), thus\nbumping up the ref count on all the pages. While the fork is occurring\n(and thus we have marked all the PTEs as read-only), another thread in\nthe original process (on cpu B) tries to write to a huge page, taking an\naccess violation from the write-protect and calling hugetlb_cow(). Now,\nsuppose the fork() fails. It will undo the COW and decrement the ref\ncount on the pages, so the ref count on the huge page drops back to 1.\nMeanwhile hugetlb_cow() also decrements the ref count by one on the\noriginal page, since the original address space doesn\u0027t need it any\nmore, having copied a new page to replace the original page. This\nleaves the ref count at zero, and when we call unlock_page(), we panic.\n\n\tfork on CPU A\t\t\t\tfault on CPU B\n\t\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\t\t\t\t\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\t...\n\tdown_write(\u0026parent-\u003emmap_sem);\n\tdown_write_nested(\u0026child-\u003emmap_sem);\n\t...\n\twhile duplicating vmas\n\t\tif error\n\t\t\tbreak;\n\t...\n\tup_write(\u0026child-\u003emmap_sem);\n\tup_write(\u0026parent-\u003emmap_sem);\t\t...\n\t\t\t\t\t\tdown_read(\u0026parent-\u003emmap_sem);\n\t\t\t\t\t\t...\n\t\t\t\t\t\tlock_page(page);\n\t\t\t\t\t\thandle COW\n\t\t\t\t\t\tpage_mapcount(old_page) \u003d\u003d 2\n\t\t\t\t\t\talloc and prepare new_page\n\t...\n\thandle error\n\tpage_remove_rmap(page);\n\tput_page(page);\n\t...\n\t\t\t\t\t\tfold new_page into pte\n\t\t\t\t\t\tpage_remove_rmap(page);\n\t\t\t\t\t\tput_page(page);\n\t\t\t\t\t\t...\n\t\t\t\toops \u003d\u003d\u003e\tunlock_page(page);\n\t\t\t\t\t\tup_read(\u0026parent-\u003emmap_sem);\n\nThe solution is to take an extra reference to the page while we are\nholding the lock on it.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f3ec434c69ac7f447ff6e6389c19727c9f002087", "tree": "4b60b41bb31b52c979a8c5e5fd45aad913a8bf03", "parents": [ "c3cba9281ba39f3aef377fe52890e2d8f1e6dae3" ], "author": { "name": "Konstantin Shlyakhovoy", "email": "x0155534@ti.com", "time": "Thu Apr 12 12:49:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-twl.c: use static register while reading time\n\nRTC stores time and date in several registers. Due to the fact that\nthese registers can\u0027t be read instantaneously, there is a chance that\nreading from counting registers gives an error of one minute, one hour,\none day, etc.\n\nTo address this issue, the RTC has hardware support to copy the RTC\ncounting registers to static shadowed registers. The current\nimplementation does not use this feature, and in a stress test, we can\nreproduce this error at a rate of around two times per 300000 readings.\n\nFix the implementation to ensure that the right snapshot of time is\ncaptured.\n\nSigned-off-by: Konstantin Shlyakhovoy \u003cx0155534@ti.com\u003e\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Benoit Cousson \u003cb-cousson@ti.com\u003e\nCc: linux-omap \u003clinux-omap@vger.kernel.org\u003e\nAcked-by: Mykola Oleksiienko \u003cx0174904@ti.com\u003e\nAcked-by: Oleksandr Dmytryshyn \u003coleksandr.dmytryshyn@ti.com\u003e\nAcked-by: Graeme Gregory \u003cgg@slimlogic.co.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c3cba9281ba39f3aef377fe52890e2d8f1e6dae3", "tree": "b5c9a43711be9a96c7689b39868beef266ac04a5", "parents": [ "cd1e6f9e53e1a673a489826729709aaffa8ad621" ], "author": { "name": "Tushar Behera", "email": "tushar.behera@linaro.org", "time": "Thu Apr 12 12:49:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-s3c.c: add placeholder for driver private data\n\nDriver data field is a pointer, hence assigning that to an integer results\nin compilation warnings.\n\nFixes following compilation warnings:\n\n drivers/rtc/rtc-s3c.c: In function `s3c_rtc_get_driver_data\u0027:\n drivers/rtc/rtc-s3c.c:452:3: warning: return makes integer from pointer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c: At top level:\n drivers/rtc/rtc-s3c.c:674:3: warning: initialization makes pointer from integer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c:674:3: warning: (near initialization for `s3c_rtc_dt_match[1].data\u0027) [enabled by default]\n drivers/rtc/rtc-s3c.c:677:3: warning: initialization makes pointer from integer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c:677:3: warning: (near initialization for `s3c_rtc_dt_match[2].data\u0027) [enabled by default]\n drivers/rtc/rtc-s3c.c:680:3: warning: initialization makes pointer from integer without a cast [enabled by default]\n drivers/rtc/rtc-s3c.c:680:3: warning: (near initialization for `s3c_rtc_dt_match[3].data\u0027) [enabled by default]\n\nSigned-off-by: Tushar Behera \u003ctushar.behera@linaro.org\u003e\nCc: Heiko Stuebner \u003cheiko@sntech.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd1e6f9e53e1a673a489826729709aaffa8ad621", "tree": "ad21faabe2c6e2211c302bf449fd0cae5e28aa0a", "parents": [ "3971dae51d7cccf4c8197786b050b3a65ace01f0" ], "author": { "name": "Tushar Behera", "email": "tushar.behera@linaro.org", "time": "Thu Apr 12 12:49:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-s3c.c: fix compilation error\n\nFix this error:\n\n drivers/rtc/rtc-s3c.c: At top level:\n drivers/rtc/rtc-s3c.c:671:3: error: request for member `data\u0027 in something not a structure or union\n drivers/rtc/rtc-s3c.c:674:3: error: request for member `data\u0027 in something not a structure or union\n drivers/rtc/rtc-s3c.c:677:3: error: request for member `data\u0027 in something not a structure or union\n drivers/rtc/rtc-s3c.c:680:3: error: request for member `data\u0027 in something not a structure or union\n\nSigned-off-by: Tushar Behera \u003ctushar.behera@linaro.org\u003e\nCc: Heiko Stuebner \u003cheiko@sntech.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3971dae51d7cccf4c8197786b050b3a65ace01f0", "tree": "400eb88881c4910561c6f0ee880269ea8f38564d", "parents": [ "569530fb1b40ab2d2ca147ee79898ac807ebdf90" ], "author": { "name": "Khalid Aziz", "email": "khalid@hp.com", "time": "Thu Apr 12 12:49:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "MAINTAINERS: add PCDP console maintainer\n\nAdd missing maintainer info for PCDP console code.\n\nSigned-off-by: Khalid Aziz \u003ckhalid.aziz@hp.com\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "569530fb1b40ab2d2ca147ee79898ac807ebdf90", "tree": "e9f4f9a04a9a8f2a94a919aff55629f8946b30f4", "parents": [ "32050017cf3bf2b983571a90351328b4f66e463d" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Apr 12 12:49:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "memcg: do not open code accesses to res_counter members\n\nWe should use the accessor res_counter_read_u64 for that.\n\nAlthough a purely cosmetic change is sometimes better delayed, to avoid\nconflicting with other people\u0027s work, we are starting to have people\ntouching this code as well, and reproducing the open code behavior\nbecause that\u0027s the standard \u003d)\n\nTime to fix it, then.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32050017cf3bf2b983571a90351328b4f66e463d", "tree": "2d74014af20316dcc0b7eeaef7a341d89b414472", "parents": [ "bb58da08f01ee12561867fcd4385b82679ae7f6c" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Thu Apr 12 12:49:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-efi.c: fix section mismatch warning\n\nefi_rtc_init() uses platform_driver_probe(), so there\u0027s no need to also\nset efi_rtc_driver\u0027s probe member (as it won\u0027t be used anyway). This\nfixes a modpost section mismatch warning (as efi_rtc_probe() validly is\n__init).\n\nSigned-off-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bb58da08f01ee12561867fcd4385b82679ae7f6c", "tree": "892e60c551aa5be4046fe20402c0cb9d2950a978", "parents": [ "44e4360fa3384850d65dd36fb4e6e5f2f112709b" ], "author": { "name": "Andreas Dumberger", "email": "andreas.dumberger@tqs.de", "time": "Thu Apr 12 12:49:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected\n\nhwclock refuses to set date/time if RTC registers contain invalid\nvalues. Check the date/time register values at probe time and\ninitialize them to make hwclock happy.\n\nSigned-off-by: Andreas Dumberger \u003candreas.dumberger@tqs.de\u003e\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44e4360fa3384850d65dd36fb4e6e5f2f112709b", "tree": "bca5390346511ef308933b9968cdc43ec8569b7f", "parents": [ "d833049bd20570cbbadeb5228c579f9f3aaa4e03" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@efficios.com", "time": "Thu Apr 12 12:49:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:12 2012 -0700" }, "message": "drivers/char/random.c: fix boot id uniqueness race\n\n/proc/sys/kernel/random/boot_id can be read concurrently by userspace\nprocesses. If two (or more) user-space processes concurrently read\nboot_id when sysctl_bootid is not yet assigned, a race can occur making\nboot_id differ between the reads. Because the whole point of the boot id\nis to be unique across a kernel execution, fix this by protecting this\noperation with a spinlock.\n\nGiven that this operation is not frequently used, hitting the spinlock\non each call should not be an issue.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Greg Kroah-Hartman \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d833049bd20570cbbadeb5228c579f9f3aaa4e03", "tree": "2995af0705ce161cba50739048e90b89ea3991e2", "parents": [ "6252efcc3626bdcde1c1c2d8a83be0bc66b8cc2c" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill@shutemov.name", "time": "Thu Apr 12 12:49:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:11 2012 -0700" }, "message": "memcg: fix broken boolen expression\n\naction !\u003d CPU_DEAD || action !\u003d CPU_DEAD_FROZEN is always true.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6252efcc3626bdcde1c1c2d8a83be0bc66b8cc2c", "tree": "594d74c5a9b06f289d105130cd81055267f67144", "parents": [ "45852766a0212c2d4f0d7faa71eedbd6c1d70452" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Thu Apr 12 12:49:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:12:11 2012 -0700" }, "message": "memcg: fix up documentation on global LRU\n\nIn v3.3-rc1, the global LRU was removed in commit 925b7673cce3 (\"mm:\nmake per-memcg LRU lists exclusive\"). The patch fixes up the memcg\ndocs.\n\nI left the swap session to someone who has better understanding of\n\u0027memory+swap\u0027.\n\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4edc2ca388d62abffe38149f6ac00e749ea721c5", "tree": "6e31a2d72b9bb05f46960c0a8a789044f5dcf584", "parents": [ "e627ee7bcd42b4e3a03ca01a8e46dcb4033c5ae0" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "message": "Btrfs: fix use-after-free in __btrfs_end_transaction\n\n49b25e0540904be0bf558b84475c69d72e4de66e introduced a use-after-free bug\nthat caused spurious -EIO\u0027s to be returned.\n\nDo the check before we free the transaction.\n\nCc: David Sterba \u003cdsterba@suse.cz\u003e\nCc: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "e627ee7bcd42b4e3a03ca01a8e46dcb4033c5ae0", "tree": "a6f8060dd57184e79b5c46404c941f999137030d", "parents": [ "c6664b42c4e567792abdb17c958fb01c5bcfcb3a" ], "author": { "name": "Tsutomu Itoh", "email": "t-itoh@jp.fujitsu.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "message": "Btrfs: check return value of bio_alloc() properly\n\nbio_alloc() has the possibility of returning NULL.\nSo, it is necessary to check the return value.\n\nSigned-off-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "c6664b42c4e567792abdb17c958fb01c5bcfcb3a", "tree": "41a5f7e6f6507db58103ed3d96f3154e0fe04331", "parents": [ "b89203f74bdfcb15407d54d3f257b16a2ea19e62" ], "author": { "name": "Ilya Dryomov", "email": "idryomov@gmail.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "message": "Btrfs: remove lock assert from get_restripe_target()\n\nThis fixes a regression introduced by fc67c450. spin_is_locked() always\nreturns 0 on UP kernels, which caused assert in get_restripe_target() to\nbe fired on every call from btrfs_reduce_alloc_profile() on UP systems.\nRemove it completely for now, it\u0027s not clear if it\u0027s going to be needed\nin future.\n\nReported-by: Bobby Powers \u003cbobbypowers@gmail.com\u003e\nReported-by: Mitch Harder \u003cmitch.harder@sabayonlinux.org\u003e\nTested-by: Mitch Harder \u003cmitch.harder@sabayonlinux.org\u003e\nSigned-off-by: Ilya Dryomov \u003cidryomov@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "b89203f74bdfcb15407d54d3f257b16a2ea19e62", "tree": "a0cbfbc0bf259b4382b881a9108b21dc88525389", "parents": [ "d95603b262edb53d6016a8df0c150371d4d61e67" ], "author": { "name": "Liu Bo", "email": "liubo2009@cn.fujitsu.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 16:03:56 2012 -0400" }, "message": "Btrfs: fix eof while discarding extents\n\nWe miscalculate the length of extents we\u0027re discarding, and it leads to\nan eof of device.\n\nReported-by: Daniel Blueman \u003cdaniel@quora.org\u003e\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "d95603b262edb53d6016a8df0c150371d4d61e67", "tree": "ba8da96db0bde764935281c592c3f49a29325cc6", "parents": [ "8e62c2de6e23e5c1fee04f59de51b54cc2868ca5" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 15:55:15 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 15:55:15 2012 -0400" }, "message": "Btrfs: fix uninit variable in repair_eb_io_failure\n\nWe\u0027d have to be passing bogus extent buffers for this uninit variable to\nactually be used, but set it to zero just in case.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "7e066489726b52bea419085e5b8929e1e89f57a8", "tree": "b144712e5200002b55b45f362ffa1fd53d0389c6", "parents": [ "4abb663b641ee21024906dae45af7de50ebad2d8", "6fa6c8e25e95bdc73e92e4c96b8e3299169b616e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irqdomain bug fixes from Grant Likely:\n \"This branch fixes a bug in irq_create_mapping() where an error return\n from irq_alloc_desc_from() gets ignored.\n\n It also removes irq_virq_count to fix a bug on powerpc where the\n irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS\n boundary.\n\n The remaining patches get rid of an completely pointless export and\n fix some minor bugs in the irqdomain debug output.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n irq_domain: Move irq_virq_count into NOMAP revmap\n irqdomain: Fix debugfs formatting\n irq_domain: correct the debugfs file name\n irq: Kill pointless irqd_to_hw export\n irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().\n" }, { "commit": "4abb663b641ee21024906dae45af7de50ebad2d8", "tree": "4c12141a8abd046dde464f50aa837eb9ae854918", "parents": [ "5ba7026b4467b55fedddf73d093ef3322e8e5b52", "0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:07 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input updates from Dmitry Torokhov:\n \"Just a few small fixes...\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: da9052 - fix memory leak in da9052_onkey_probe()\n Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h\n Input: trackpoint - use psmouse_fmt() for messages\n Input: elantech - v4 is a clickpad, with only one button\n Input: elantech - reset touchpad before configuring it\n Input: sentelic - filter taps in absolute mode\n Input: tps6507x-ts - fix MODULE_ALIAS to match driver name\n" }, { "commit": "5ba7026b4467b55fedddf73d093ef3322e8e5b52", "tree": "6f0206c39fafc0441423517b490e3efd07f94645", "parents": [ "45852766a0212c2d4f0d7faa71eedbd6c1d70452", "b1349f2536efcb592927ab6f8687c36c3c124f6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:07:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:07:39 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs fixes from Al Viro:\n \"Regression fix in mtdchar_open(), fix for a really old leak\n (almost never hit in practice - it\u0027s a b0rken failure exit in\n simple_fill_super()) and a typo fix in vfs.txt (misspelled\n method type).\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n typo fix in Documentation/filesystems/vfs.txt\n dentry leak in simple_fill_super() failure exit\n fix breakage in mtdchar_open(), sanitize failure exits\n" }, { "commit": "8e62c2de6e23e5c1fee04f59de51b54cc2868ca5", "tree": "a67d4c8b0cfb0a8db86d451fbe6462c3fcf4b021", "parents": [ "bc3f116fec194f1d7329b160c266fe16b9266a1e" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 13:46:48 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Apr 12 13:46:48 2012 -0400" }, "message": "Revert \"Btrfs: increase the global block reserve estimates\"\n\nThis reverts commit 5500cdbe14d7435e04f66ff3cfb8ecd8b8e44ebf.\n\nWe\u0027ve had a number of complaints of early enospc that bisect down\nto this patch. We\u0027ll hae to fix the reservations differently.\n\nCC: stable@kernel.org\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "173fa4eccc39b04fbc0b569fabac6dbcec33507a", "tree": "5d73a6eb84c6f029f0934c0548b641471a23decb", "parents": [ "19e5c4e72c7287491f0da64e26b6b7175942f502", "490aa60ee7e884febf4818234d5c97669665db9a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:42:01 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:42:01 2012 +0100" }, "message": "Merge branch \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes\n\n* \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung:\n drm/exynos: fixed exynos broken ioctl\n drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n drm/exynos: fix struct for operation callback functions to driver name\n drm/exynos: use define instead of default_win member in struct mixer_context\n drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n drm/exynos: remove unused codes in hdmi and mixer\n drm/exynos: remove unnecessary type conversion of hdmi and mixer\n drm/exynos: add format list of plane\n drm/exynos: fixed duplicated page allocation bug.\n drm/exynos: fixed page align and code clean.\n" }, { "commit": "19e5c4e72c7287491f0da64e26b6b7175942f502", "tree": "e6dd9e513b68ec8febd77e7779fb831190a6a9be", "parents": [ "46783150a6552f9513f08e62cfcc07125d6e502b", "15a13bbdffb0d6288a5dd04aee9736267da1335f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 13:01:57 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:41:10 2012 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes\n\nDaniel Vetter writes:\n3 regression fixes:\n- disable gmbus again, too broken for 3.4, we\u0027ll try again for 3.5\n- dp bandwidth computation fix, we\u0027ve lost the 6bpc dithering flag\n sometimes, this is a 3.3 regression (maybe even earlier for some\n configurations).\n- fix resume regression caused by the gen2/3 fencing fix merged into -rc2.\n\nAnd a few other fixes:\n- gpu hang fix for i845 (Chris)\n- sprite fix (Armin Reese)\n- crtc disable vs. scanlinewait race fix (Chris)\n- rc6 module option read-only, it confused testers (Jesse)\n- fbc related blitter death hw workaround, note that we disable fbc on snb\n by default anyway.\n\nWith these fixes we have one 3.4 regression outstanding: One of the\ncleanup patches for the interlaced support managed to confuse the lvds\npanel fitter when upscaling. The root-cause is still unclear, but test\npatches are awaiting feedback from the reporter.\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: clear fencing tracking state when retiring requests\n drm/i915: make rc6 module parameter read-only\n drm/i915: implement ColorBlt w/a\n drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n Revert \"drm/i915: reenable gmbus on gen3+ again\"\n drm/i915: properly compute dp dithering for user-created modes\n drm/i915: Finish any pending operations on the framebuffer before disabling\n drm/i915: Removed IVB forced enable of sprite dest key.\n" }, { "commit": "9de29225bdd25958c1fa82521ff02726f1cab953", "tree": "7c7df98574f166524942331f4379dd73812118a4", "parents": [ "5c15c9a63d0f169666ca37cdb30b1e479f07f9d7" ], "author": { "name": "Stephen Lewis", "email": "lewis@sdf.lonestar.org", "time": "Mon Apr 02 13:38:49 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 12 08:26:22 2012 -0700" }, "message": "USB: update usbtmc api documentation\n\nCorrect path names in API documentation for usbtmc\n\nSigned-off-by: Stephen Lewis \u003clewis@sdf.lonestar.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "5c15c9a63d0f169666ca37cdb30b1e479f07f9d7", "tree": "943dcbd00aac0b5aa623dede2d77619cd83ca18a", "parents": [ "a65a6f14dc24a90bde3f5d0073ba2364476200bf", "95018a53f7653e791bba1f54c8d75d9cb700d1bd" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 12 08:18:49 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 12 08:18:49 2012 -0700" }, "message": "Merge tag \u0027for-usb-linus-2012-04-11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus\n\nHi Greg,\n\nHere\u0027s 11 xHCI bug fixes for 3.4.\n\nSome of the patches fix issues with crashes on system resume related to\nVIA xHCI host controllers accessing bad memory addresses. The patches\nchange the register restore ordering, so I had several vendors confirm\nthat the patches don\u0027t break their xHCI hosts.\n\nElric Fu confirms this patchset fixes the VIA issue, Alex He confirms\nthe changes does not break suspend/resume on AMD xHCI systems, and I\u0027ve\nmade sure it doesn\u0027t break Intel host controllers. I have not heard\nback from Felipe about the TI host, so at this point, I\u0027m just going to\nsend them off.\n\nSeveral of the patches are marked for stable. Please pull.\n\nSarah Sharp\n" }, { "commit": "6f3603367b8f7c34598fdfc1058622e0e1951e98", "tree": "fa61186333d1a57894534aac71e0aac72e95815c", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Apr 12 07:51:08 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Apr 12 07:56:57 2012 -0700" }, "message": "IB/srpt: Set srq_type to IB_SRQT_BASIC\n\nSince commit 96104eda0169 (\"RDMA/core: Add SRQ type field\"), kernel\nusers of SRQs need to specify srq_type \u003d IB_SRQT_BASIC in struct\nib_srq_init_attr, or else most low-level drivers will fail in\nwhen srpt_add_one() calls ib_create_srq() and gets -ENOSYS.\n\n(mlx4_ib works OK nearly all of the time, because it just needs\nsrq_type !\u003d IB_SRQT_XRC. And apparently nearly everyone using\nib_srpt is using mlx4 hardware)\n\nReported-by: Alexey Shvetsov \u003calexxy@gentoo.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "5d949944229b0a08e218723be231731cd86b94f3", "tree": "5aaf18d11ee4a3486ec7469971f326eb5811679b", "parents": [ "a21d45726acacc963d8baddf74607d9b74e2b723", "b4838d12e1f3cb48c2489a0b08733b5dbf848297" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 09:55:22 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 09:55:22 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "490aa60ee7e884febf4818234d5c97669665db9a", "tree": "63f7a78e6ec706953ef7005241b97c15b6cb3870", "parents": [ "677e84c1b5c8533ea351a9556308071ca47a1eb2" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 16:42:54 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 16:42:54 2012 +0900" }, "message": "drm/exynos: fixed exynos broken ioctl\n\nthis patch removes the pointer of uint64_t *edid. it should be just\na uint64_t.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "15a13bbdffb0d6288a5dd04aee9736267da1335f", "tree": "7cc3e8326352191e8171bf448ed9c4684eb670f7", "parents": [ "f57f9c167af7cb3fd315e6a8ebe194a8aea0832a" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Apr 12 01:27:57 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Apr 12 09:02:37 2012 +0200" }, "message": "drm/i915: clear fencing tracking state when retiring requests\n\nThis fixes a resume regression introduced in\n\ncommit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba\nAuthor: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nDate: Wed Mar 21 10:48:18 2012 +0000\n\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n\nwhich fixed fencing tracking for untiled blt commands.\n\nA side effect of that patch was that now also untiled objects have a\nnon-zero obj-\u003elast_fenced_seqno to track when a fence can be set up\nafter a pipelined tiling change. Unfortunately this was only cleared\nby the fence setup and teardown code, resulting in tons of untiled but\ninactive objects with non-zero last_fenced_seqno.\n\nNow after resume we completely reset the seqno tracking, both on the\ndriver side (by setting dev_priv-\u003enext_seqno \u003d 1) and on the hw side\n(by allocating a new hws page, which contains the seqnos). Hilarity\nand indefinite waits ensued from the stale seqnos in\nobj-\u003elast_fenced_seqno from before the suspend.\n\nThe fix is to properly clear the fencing tracking state like we\nalready do for the normal gpu rendering while moving objects off the\nactive list.\n\nReported-and-tested-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "63634806519b49bb43f37e53a1e8366eb3e846a4", "tree": "f33cfa5cf98b0c3de57eb9b6acf49f91fdca1722", "parents": [ "95fea2f1d90626498e2495a81fe5aab7fba9fb3f" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 12 08:47:05 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Apr 12 08:47:05 2012 +0200" }, "message": "block: mtip32xx: remove HOTPLUG_PCI_PCIE dependancy\n\nThis removes the HOTPLUG_PCI_PCIE dependency on the driver and makes it\ndepend on PCI.\n\nCc: Sam Bradshaw \u003csbradshaw@micron.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nAcked-by: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "6fa6c8e25e95bdc73e92e4c96b8e3299169b616e", "tree": "34dc13fb2448eab4916f55edd10dfa34c36505df", "parents": [ "15e06bf64f686befd2030da867a3dad965b96cc0" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 15 15:06:08 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Apr 12 00:37:48 2012 -0600" }, "message": "irq_domain: Move irq_virq_count into NOMAP revmap\n\nThis patch replaces the old global setting of irq_virq_count that is only\nused by the NOMAP mapping and instead uses a revmap_data property so that\nthe maximum NOMAP allocation can be set per NOMAP irq_domain.\n\nThere is exactly one user of irq_virq_count in-tree right now: PS3.\nAlso, irq_virq_count is only useful for the NOMAP mapping. So,\ninstead of having a single global irq_virq_count values, this change\ndrops it entirely and added a max_irq argument to irq_domain_add_nomap().\nThat makes it a property of an individual nomap irq domain instead of\na global system settting.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\n" }, { "commit": "afbaa90b80b1ec66e5137cc3824746bfdf559b18", "tree": "8c0307e41849eef28146343efc4fed75f83a30f1", "parents": [ "f4380a915823dbed0bf8e3cf502ebcf2b7c7f833" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 16:05:06 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 16:05:06 2012 +1000" }, "message": "md/bitmap: prevent bitmap_daemon_work running while initialising bitmap\n\nIf a bitmap is added while the array is active, it is possible\nfor bitmap_daemon_work to run while the bitmap is being\ninitialised.\nThis is particularly a problem if bitmap_daemon_work sees\nbitmap-\u003efilemap as non-NULL before it has been filled in properly.\nSo hold bitmap_info.mutex while filling in -\u003efilemap\nto prevent problems.\n\nThis patch is suitable for any -stable kernel, though it might not\napply cleanly before about 3.1.\n\nCc: stable@vger.kernel.org\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "f4380a915823dbed0bf8e3cf502ebcf2b7c7f833", "tree": "1326179e1f715f33495066b2fe4b99acf1bbdd96", "parents": [ "9e41dd35b39c2cf40767332b8f914d7afe25cc40" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Thu Apr 12 16:04:47 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 16:04:47 2012 +1000" }, "message": "md/raid1,raid10: Fix calculation of \u0027vcnt\u0027 when processing error recovery.\n\nIf r1bio-\u003esectors % 8 !\u003d 0,then the memcmp and a later\nmemcpy will omit the last bio_vec.\n\nThis is suitable for any stable kernel since 3.1 when bad-block\nmanagement was introduced.\n\nCc: stable@vger.kernel.org\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "9e41dd35b39c2cf40767332b8f914d7afe25cc40", "tree": "b694a4d27b3fd7beb1881d5ad993303fe7309c59", "parents": [ "5020ad7d143ccfcf8149974096220d59e5572120" ], "author": { "name": "Andrei Warkentin", "email": "andrey.warkentin@gmail.com", "time": "Thu Apr 12 15:55:21 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Apr 12 15:55:21 2012 +1000" }, "message": "MD: Bitmap version cleanup.\n\nbitmap_new_disk_sb() would still create V3 bitmap superblock\nwith host-endian layout.\n\nPerhaps I\u0027m confused, but shouldn\u0027t bitmap_new_disk_sb() be\ncreating a V4 bitmap superblock instead, that is portable,\nas per comment in bitmap.h?\n\nSigned-off-by: Andrei Warkentin \u003candrey.warkentin@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "677e84c1b5c8533ea351a9556308071ca47a1eb2", "tree": "38ab6a72f214433ef294403b6c5cdb3dd25afb0a", "parents": [ "578b6065adc8805a8774e4bf3145e18de123f8b2" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:27 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:27 2012 +0900" }, "message": "drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n\nThe struct exynos_drm_manager has to exist for exynos drm sub driver\nusing encoder and connector. If it isn\u0027t NULL to member of struct\nexynos_drm_subdrv, will create encoder and connector else will not. And\nthe is_local member also doesn\u0027t need.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "578b6065adc8805a8774e4bf3145e18de123f8b2", "tree": "88e563c3edb1fea30c8cb71836e45cd3e0420726", "parents": [ "a2ee151b6b6863d108552de82e02b77166ca23a8" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:26 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:26 2012 +0900" }, "message": "drm/exynos: fix struct for operation callback functions to driver name\n\nThe mixer driver and hdmi driver have each operation callback functions\nand they is registered to hdmi common driver. Their struct names in hdmi\ncommon driver include display, manager and overlay. It confuses to\nappear whose operation and two driver cannot register same operation\ncallback functions at the same time. Use their struct names to driver\nname.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "a2ee151b6b6863d108552de82e02b77166ca23a8", "tree": "9e1ec043e025cd89415d0731a8aa039b54d0c544", "parents": [ "a634dd54c05636a89a272e27e59118374065975e" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:25 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:24 2012 +0900" }, "message": "drm/exynos: use define instead of default_win member in struct mixer_context\n\nThe default_win member in struct mixer_context isn\u0027t change its value\nafter initialized to 0, so it\u0027s better using to define.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "a634dd54c05636a89a272e27e59118374065975e", "tree": "efae3c63bb5dfb3530dbac391e76e14f1cb675f9", "parents": [ "46da222be7873bd1c79fa110d6988a2b826f7dee" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:24 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:21 2012 +0900" }, "message": "drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n\nHDMI_OVERLAY_NUMBER is specific of mixer driver and be used \"windows\nlayer\" term in exynos user manaual, so rename it.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "46da222be7873bd1c79fa110d6988a2b826f7dee", "tree": "3f537ffba07d760ff3bfb08a6d464c15be7cbcaf", "parents": [ "f9309d1bf220122659328040db47eede32514656" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:23 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:18 2012 +0900" }, "message": "drm/exynos: remove unused codes in hdmi and mixer\n\nSome members in struct mixer_context aren\u0027t used and the define\nHDMI_OVERLAY_NUMBER is unused in hdmi driver, remove them.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "f9309d1bf220122659328040db47eede32514656", "tree": "e611a15e167289b1496eefb612a7afeec9afebb3", "parents": [ "6b1c762da98fd0d475a4539f94541aec91a8de30" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:22 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:16 2012 +0900" }, "message": "drm/exynos: remove unnecessary type conversion of hdmi and mixer\n\nWhen the void pointer type variable is assigned to the specific pointer\ntype variable, don\u0027t need to do type conversion.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5", "tree": "af1258e22b8ded4e7d4d0f123b06335c9c7cb1d4", "parents": [ "55158c886a0c43765140673d2343d3119d34a25a" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Wed Apr 11 20:55:18 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Apr 11 22:15:04 2012 -0700" }, "message": "Input: da9052 - fix memory leak in da9052_onkey_probe()\n\nIf, in drivers/input/misc/da9052_onkey.c::da9052_onkey_probe(), the\ncall to either kzalloc() or input_allocate_device() fails then we will\nreturn -ENOMEM from the function without freeing the other allocation\nthat may have succeeded, thus we leak either the memory allocated for\n\u0027onkey\u0027 or the memory allocated for \u0027input_dev\u0027 if one succeeds and\nthe other fails.\nFix that by jumping to the \u0027err_free_mem\u0027 label at the end of the\nfunction that properly cleans up rather than returning directly.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "45852766a0212c2d4f0d7faa71eedbd6c1d70452", "tree": "52d7087c519e01c5ff488c7d191c7307168f6937", "parents": [ "f549e088b806f44b6ab6eeef0cb71ced1d2488dd", "fae2e0fb24c61ca68c98d854a34732549ebc1854" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 20:56:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 20:56:28 2012 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fixes from Benjamin Herrenschmidt:\n \"Fixes for two nasty regression affecting powerpc in 3.4.\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: Fix typo in runlatch code\n powerpc: Fix page fault with lockdep regression\n" }, { "commit": "d48fc63f6f3f485ed5aa9cf019d8e8e3a7d10263", "tree": "6f02bc7b7585c82cb3d4490d1dc7ba77e3bac4f9", "parents": [ "fa4da365bc7772c2cd6d5405bdf151612455f957" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Apr 11 23:49:16 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Apr 12 00:05:05 2012 +0200" }, "message": "Revert \"clocksource: Load the ACPI PM clocksource asynchronously\"\n\nThis reverts commit b519508298e0292e1771eecf14aaf67755adc39d.\n\nThe reason for this revert is that making the frequency verification\npreemptible and interruptible is not working reliably. Michaels\nmachine failed to use PM-timer with the message:\n\n PM-Timer running at invalid rate: 113% of normal - aborting.\n\nThat\u0027s not a surprise as the frequency verification does rely on\ninterrupts being disabled. With a async scheduled thread there is no\nguarantee to achieve the same result. Also some driver might fiddle\nwith the CTC channel 2 during the verification period, which makes the\nresult even more random and unpredictable.\n\nThis can be solved by using the same mechanism as we use in the\ndeferred TSC validation code, but that only will work if we verified a\nworking HPET _BEFORE_ trying to do the PM-Timer lazy validation.\n\nSo for now reverting is the safe option.\n\nBisected-by: Michael Witten \u003cmfwitten@gmail.com\u003e\nCc: Arjan van de Ven \u003carjanvandeven@gmail.com\u003e\nCc: Arjan van de Ven \u003carjan@infradead.org\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nLKML-Reference: \u003calpine.LFD.2.02.1204112303270.2542@ionos\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "f549e088b806f44b6ab6eeef0cb71ced1d2488dd", "tree": "1dc4d7745d3ad67d1ab467455aeec1f58b9af5cf", "parents": [ "70f33fa5863458ec9f1ae3aabdb9c2401598ec3d", "0559d8dc13a1cd68b5e64c0b61659f36c7b5c89f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 13:24:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 13:24:52 2012 -0700" }, "message": "Merge tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull infiniband fixes from Roland Dreier:\n \"Fix a regression in the /sys/class/infiniband/.../rate attribute --\n old kernels used to just return something, even if the underlying\n value was out-of-bounds, while 3.4-rc1 returned EINVAL to userspace.\n This breaks some applications that check for the error, so go back to\n the old behavior.\"\n\n* tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/core: Don\u0027t return EINVAL from sysfs rate attribute for invalid speeds\n IB/mlx4: Don\u0027t return an invalid speed when a port is down\n" }, { "commit": "f57f9c167af7cb3fd315e6a8ebe194a8aea0832a", "tree": "5a7be1cbce225f51aff28e6e79020dd842649242", "parents": [ "80e829fade4eea5f07c410df6a551c42e2d0ca9c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Apr 11 09:39:02 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 21:36:38 2012 +0200" }, "message": "drm/i915: make rc6 module parameter read-only\n\nPeople have been getting confused and thinking this is a runtime control.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b4838d12e1f3cb48c2489a0b08733b5dbf848297", "tree": "45d6df434bb8235c42cbbe975ed58ee3d1e76319", "parents": [ "673f7786e205c87b5d978c62827b9a66d097bebb" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Apr 10 19:43:03 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 15:09:33 2012 -0400" }, "message": "NFC: Fix the LLCP Tx fragmentation loop\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "673f7786e205c87b5d978c62827b9a66d097bebb", "tree": "4ecbf9e03f1b150f3b91be22ffaaac37dae34c4b", "parents": [ "a7959c1394d4126a70a53b914ce4105f5173d0aa" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Mar 26 10:48:20 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 15:01:45 2012 -0400" }, "message": "rtlwifi: Add missing DMA buffer unmapping for PCI drivers\n\nIn https://bugzilla.kernel.org/show_bug.cgi?id\u003d42976, a system with driver\nrtl8192se used as an AP suffers from \"Out of SW-IOMMU space\" errors. These\nare caused by the DMA buffers used for beacons never being unmapped.\n\nThis bug was also reported at\nhttps://bugs.launchpad.net/ubuntu/+source/linux/+bug/961618\n\nReported-and-Tested-by: Da Xue \u003cda@lessconfused.com\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a7959c1394d4126a70a53b914ce4105f5173d0aa", "tree": "62374a9502df20d3f5f949793ad870755f58c4b7", "parents": [ "011afa1ed8c408d694957d2474d89dc81a60b70c" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Mar 19 15:44:31 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 15:01:44 2012 -0400" }, "message": "rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine\n\nThe current version of rtlwifi for USB operations uses kmalloc to\nacquire a 32-bit buffer for each read of the device. When\n_usb_read_sync() is called with the rcu_lock held, the result is\na \"sleeping function called from invalid context\" BUG. This is\nreported for two cases in https://bugzilla.kernel.org/show_bug.cgi?id\u003d42775.\nThe first case has the lock originating from within rtlwifi and could\nbe fixed by rearranging the locking; however, the second originates from\nwithin mac80211. The kmalloc() call is removed from _usb_read_sync()\nby creating a ring buffer pointer in the private area and\nallocating the buffer data in the probe routine.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e [This version good for 3.3+ - different patch for 3.2 - 2.6.39]\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "70f33fa5863458ec9f1ae3aabdb9c2401598ec3d", "tree": "cab932fad832093ab383f291aab82b1b0f3593e9", "parents": [ "a1ada086062101533eb0f841d3884137688091ec", "e72d5c7e9c831f6e393c71dcd62acafbac2b58d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:08:20 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:08:20 2012 -0700" }, "message": "Merge branch \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull arch/tile fixes from Chris Metcalf:\n \"This is one important change from Srivatsa Bhat that got dropped when\n I put together my pull request for -rc2, plus a trivial change to\n remove a compiler warning.\"\n\n* \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: avoid unused variable warning in proc.c for tilegx\n tile/CPU hotplug: Add missing call to notify_cpu_starting()\n" }, { "commit": "a1ada086062101533eb0f841d3884137688091ec", "tree": "3dd45239db0eaaf7693e5bae75f0c8b61466bb6e", "parents": [ "39f86a608a3e0f0164bd1540acf87696cfdfb5bb", "fae3d88a5c56c3f836e95c4516da883a48612437" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:07:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:07:38 2012 -0700" }, "message": "Merge tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n - A series of fixes for Conexant 20549 HD-audio codec chip\n - A workaround for HDMI hotplug debug prints that annoyed people\n - A fix for the new support of platform DAPM contexts\n - Many driver-specific minor fixes\n\n* tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - hide HDMI/ELD printks unless snd.debug\u003d2\n ALSA: sound/isa/sscape.c: add missing resource-release code\n sound: sound/oss/msnd_pinnacle.c: add vfrees\n ALSA: hda - clean up CX20549 test mixer setup\n ALSA: hda - CX20549 doesn\u0027t need pin_amp_workaround.\n ALSA: hda - Remove CD control from model\u003dbenq for CX20549\n ALSA: hda - fix record volume controls of CX20459 (\"Venice\")\n ALSA: hda - Rename capture sources of CX20549 to match common conventions\n ALSA: hda - Fix proc output for ADC amp values of CX20549\n ASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS\n ASoC: set idle_bias_off\u003d1 for all platform DAPM contexts\n ASoC: imx-audmux: Check for NULL pointer\n ASoC: imx-audmux: Fix ssi port numbers in sysfs\n ASoC: ak4642: fixup: mute needs +1 step\n MAINTAINERS: Don\u0027t list everyone working on Wolfson drivers\n MAINTAINERS: Add missing ASoC OMAP co-maintainer\n ASoC: pxa: pxa2xx-i2s: add io.h for IOMEM macro\n ASoC: tegra: ensure clocks are enabled when touching registers\n ASoC: sgtl5000: Enable VAG when DAC/ADC up\n ALSA: asihpi - fix return value of hpios_locked_mem_alloc()\n" }, { "commit": "39f86a608a3e0f0164bd1540acf87696cfdfb5bb", "tree": "a8a88fd3dda891fd89aa9058ec798aa12d04bc16", "parents": [ "1b6150fe82de8a555b0200d20bb5e3752fbe4160", "ed0ee0ce0a3224dab5caa088a5f8b6df25924276" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:05:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 11 11:05:34 2012 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media fixes from Mauro Carvalho Chehab:\n\n - dvb core: there is a regression found when used with xine. For\n whatever unknown reason, xine (and xine-lib clients) wants that the\n frontend to tell what frequency he is using even before the PLL lock\n (or at least, it expects a non-zero frequency).\n\n On DVB, the frequency is only actually known after a frequency\n zig-zag seek, done by the DVB core. Anyway, the fix was trivial.\n That solves Fedora BZ#808871.\n\n - ivtv: fix a regression when selecting the language channel\n\n - uvc: fix a race-related crash\n\n - it913x: fixes firmware loading\n\n - two trivial patches (a dependency issue at a radio driver at sound\n Kconfig, and a warning fix on dvb).\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:\n [media] uvcvideo: Fix race-related crash in uvc_video_clock_update()\n [media] Drivers/media/radio: Fix build error\n [media] dvb_frontend: fix compiler warning\n [media] it913x: fix firmware loading errors\n [media] ivtv: Fix AUDIO_(BILINGUAL_)CHANNEL_SELECT regression\n [media] dvb_frontend: regression fix: userspace ABI broken for xine\n" } ], "next": "1b6150fe82de8a555b0200d20bb5e3752fbe4160" }