)]}' { "log": [ { "commit": "ecc728467fb0c3e350b57fc66ed7585c15be50f5", "tree": "68d9157193de36f9ac843b2c36222919e66515c4", "parents": [ "aa69cb8c1e72b027548f9751e6377a7a7e8bb8fd", "f1ae98da8525c6b8b1c301c3a2b0bd2b6515cca2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 05 13:23:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 05 13:23:17 2012 -0700" }, "message": "Merge branch \u0027fixes-for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nPull arm CMA fix from Marek Szyprowski:\n \"This removes the ARMv6+ CMA dependency and lets one use old, well-\n tested dma-mapping implementation also on ARMv6+ systems without the\n need to use EXPERIMENTAL stuff.\"\n\nRussell King complained (rightly) about the experimental feature being\nforced on by the ARM config.\n\nHere CMA is \"continuous memory allocator\", not \"cross-memory attach\".\nWe really neet to stop using insane TLA\u0027s for things that aren\u0027t big\nindustry standards.\n\n* \u0027fixes-for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:\n ARM: dma-mapping: remove unconditional dependency on CMA\n" }, { "commit": "c22072bdf053b115a1126658100967dda00b5ecf", "tree": "21520119dbbfce237a5005e9840105e86944c9cc", "parents": [ "0640113be25d283e0ff77a9f041e1242182387f0", "62cf20b32aee4ae889a2eb40fd41c0eab73de970" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 04 11:25:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 04 11:25:31 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 updates from Thomas Gleixner:\n \"The clocksource driver is pure hardware enablement and the skew option\n is default off, well tested and non dangerous.\"\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n tick: Move skew_tick option into the HIGH_RES_TIMER section\n clocksource: em_sti: Add DT support\n clocksource: em_sti: Emma Mobile STI driver\n clockevents: Make clockevents_config() a global symbol\n tick: Add tick skew boot option\n" }, { "commit": "f1ae98da8525c6b8b1c301c3a2b0bd2b6515cca2", "tree": "f73e377f98bbb452612a1f53b3d399cff6cac1fa", "parents": [ "f8f5701bdaf9134b1f90e5044a82c66324d2073f" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Wed May 30 10:48:29 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon Jun 04 08:01:24 2012 +0200" }, "message": "ARM: dma-mapping: remove unconditional dependency on CMA\n\nCMA has been enabled unconditionally on all ARMv6+ systems to solve the\nlong standing issue of double kernel mappings for all dma coherent\nbuffers. This however created a dependency on CONFIG_EXPERIMENTAL for\nthe whole ARM architecture what should be really avoided. This patch\nremoves this dependency and lets one use old, well-tested dma-mapping\nimplementation also on ARMv6+ systems without the need to use\nEXPERIMENTAL stuff.\n\nReported-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "804ce9866d56130032c9c8afc90a1297b7deed56", "tree": "6dd70984f411d2a3624d3f8db7facc3d6396b9ad", "parents": [ "f5e7e844a571124ffc117d4696787d6afc4fc5ae", "c895305e806b4346006d3cfba2b432d52268ecd3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 16:57:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 16:57:51 2012 -0700" }, "message": "Merge tag \u0027fbdev-updates-for-3.5\u0027 of git://github.com/schandinat/linux-2.6\n\nPull fbdev updates from Florian Tobias Schandinat:\n - driver for AUO-K1900 and AUO-K1901 epaper controller\n - large updates for OMAP (e.g. decouple HDMI audio and video)\n - some updates for Exynos and SH Mobile\n - various other small fixes and cleanups\n\n* tag \u0027fbdev-updates-for-3.5\u0027 of git://github.com/schandinat/linux-2.6: (130 commits)\n video: bfin_adv7393fb: Fix cleanup code\n video: exynos_dp: reduce delay time when configuring video setting\n video: exynos_dp: move sw reset prioir to enabling sw defined function\n video: exynos_dp: use devm_ functions\n fb: handle NULL pointers in framebuffer release\n OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request\n OMAPDSS: Apply VENC timings even if panel is disabled\n OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC\n OMAPDSS: DISPC: Support rotation through TILER\n OMAPDSS: VRFB: remove compiler warnings when CONFIG_BUG\u003dn\n OMAPFB: remove compiler warnings when CONFIG_BUG\u003dn\n OMAPDSS: remove compiler warnings when CONFIG_BUG\u003dn\n OMAPDSS: DISPC: fix usage of dispc_ovl_set_accu_uv\n OMAPDSS: use DSI_FIFO_BUG workaround only for manual update displays\n OMAPDSS: DSI: Support command mode interleaving during video mode blanking periods\n OMAPDSS: DISPC: Update Accumulator configuration for chroma plane\n drivers/video: fsl-diu-fb: don\u0027t initialize the THRESHOLDS registers\n video: exynos mipi dsi: support reverse panel type\n video: exynos mipi dsi: Properly interpret the interrupt source flags\n video: exynos mipi dsi: Avoid races in probe()\n ...\n" }, { "commit": "f5e7e844a571124ffc117d4696787d6afc4fc5ae", "tree": "26bb17dc94e9536da540c187b00cedb0c1b24664", "parents": [ "48445159e9ecb44a96a4de06c6ae7c54eb43ba5b", "4a43faf54e9173b6acce37cf7f053fc9515a2cdf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 16:55:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 16:55:42 2012 -0700" }, "message": "Merge tag \u0027for-linus-3.5-20120601\u0027 of git://git.infradead.org/linux-mtd\n\nPull mtd update from David Woodhouse:\n - More robust parsing especially of xattr data in JFFS2\n - Updates to mxc_nand and gpmi drivers to support new boards and device tree\n - Improve consistency of information about ECC strength in NAND devices\n - Clean up partition handling of plat_nand\n - Support NAND drivers without dedicated access to OOB area\n - BCH hardware ECC support for OMAP\n - Other fixes and cleanups, and a few new device IDs\n\nFixed trivial conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c due to\nadded include files next to each other.\n\n* tag \u0027for-linus-3.5-20120601\u0027 of git://git.infradead.org/linux-mtd: (75 commits)\n mtd: mxc_nand: move ecc strengh setup before nand_scan_tail\n mtd: block2mtd: fix recursive call of mtd_writev\n mtd: gpmi-nand: define ecc.strength\n mtd: of_parts: fix breakage in Kconfig\n mtd: nand: fix scan_read_raw_oob\n mtd: docg3 fix in-middle of blocks reads\n mtd: cfi_cmdset_0002: Slight cleanup of fixup messages\n mtd: add fixup for S29NS512P NOR flash.\n jffs2: allow to complete xattr integrity check on first GC scan\n jffs2: allow to discriminate between recoverable and non-recoverable errors\n mtd: nand: omap: add support for hardware BCH ecc\n ARM: OMAP3: gpmc: add BCH ecc api and modes\n mtd: nand: check the return code of \u0027read_oob/read_oob_raw\u0027\n mtd: nand: remove \u0027sndcmd\u0027 parameter of \u0027read_oob/read_oob_raw\u0027\n mtd: m25p80: Add support for Winbond W25Q80BW\n jffs2: get rid of jffs2_sync_super\n jffs2: remove unnecessary GC pass on sync\n jffs2: remove unnecessary GC pass on umount\n jffs2: remove lock_super\n mtd: gpmi: add gpmi support for mx6q\n ...\n" }, { "commit": "efff0471b0dd8b08ca3830b06a9083f6d6cef44e", "tree": "44e99900de7a8677e9fdabe871600ddf98d22c23", "parents": [ "3ded7acfddb3d8dad4a1490a3a75e9d8bc975c35", "5910de9e2de453956c3a18816f4838d96ac86988" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 15:46:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 15:46:46 2012 -0700" }, "message": "Merge branch \u0027ux500/hickup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm fixes for ux500 mismerge mishap from Arnd Bergmann:\n \"The device tree conversion for arm/ux500 in 3.5 turns out to be\n incomplete because of a mismerge done by Linus Walleij that I failed\n to notice early enough and that Lee Jones as the original author of\n those patches did not manage to fix during the -next cycle. While we\n originally to get a much larger set of ux500 device tree enablement\n patches merged, this did not happen in time.\n\n After some discussion at Linaro Connect conference this week, Lee has\n been able to do damage control and provide a series to put the broken\n platform back into usable shape for both DT and non-DT based booting.\n\n This series has not been part of linux-next and is based on top of the\n current state of the upstream kernel rather than an -rc, but this is\n the best we could manage given the earlier breakage.\"\n\n* \u0027ux500/hickup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: ux500: Enable probing of pinctrl through Device Tree\n ARM: ux500: Add support for ab8500 regulators into the Device Tree\n ARM: ux500: Provide regulator support for SMSC911x via Device Tree\n ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot\n ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree\n ARM: ux500: Only initialise STE\u0027s UIBs on boards which support them\n ARM: ux500: Disable platform setup of the ab8500 when DT is enabled\n ARM: ux500: Use correct format for dynamic IRQ assignment\n ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots\n ARM: ux500: PRCMU related configuration and layout corrections for Device Tree\n ARM: ux500: Remove DB8500 PRCMU platform registration when DT is enabled\n ARM: ux500: Disable SMSC911x platform code registration when DT is enabled\n ARM: ux500: New DT:ed u8500_init_devices for one-by-one device enablement\n ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement\n pinctrl-nomadik: Allow Device Tree driver probing\n" }, { "commit": "86c47b70f62a7072d441ba212aab33c2f82627c2", "tree": "d03988bd2226966352bb7f3c2e82ff545353d2c4", "parents": [ "1193755ac6328ad240ba987e6ec41d5e8baf0680", "44fbbb3dc687c9709a6f2236197316e5c79ab1eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 11:53:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 11:53:44 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull third pile of signal handling patches from Al Viro:\n \"This time it\u0027s mostly helpers and conversions to them; there\u0027s a lot\n of stuff remaining in the tree, but that\u0027ll either go in -rc2\n (isolated bug fixes, ideally via arch maintainers\u0027 trees) or will sit\n there until the next cycle.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n x86: get rid of calling do_notify_resume() when returning to kernel mode\n blackfin: check __get_user() return value\n whack-a-mole with TIF_FREEZE\n FRV: Optimise the system call exit path in entry.S [ver #2]\n FRV: Shrink TIF_WORK_MASK [ver #2]\n FRV: Prevent syscall exit tracing and notify_resume at end of kernel exceptions\n new helper: signal_delivered()\n powerpc: get rid of restore_sigmask()\n most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set\n set_restore_sigmask() is never called without SIGPENDING (and never should be)\n TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set\n don\u0027t call try_to_freeze() from do_signal()\n pull clearing RESTORE_SIGMASK into block_sigmask()\n sh64: failure to build sigframe !\u003d signal without handler\n openrisc: tracehook_signal_handler() is supposed to be called on success\n new helper: sigmask_to_save()\n new helper: restore_saved_sigmask()\n new helpers: {clear,test,test_and_clear}_restore_sigmask()\n HAVE_RESTORE_SIGMASK is defined on all architectures now\n" }, { "commit": "1193755ac6328ad240ba987e6ec41d5e8baf0680", "tree": "40bf847d7e3ebaa57b107151d14e6cd1d280cc6d", "parents": [ "4edebed86690eb8db9af3ab85baf4a34e73266cc", "0ef97dcfce4179a2eba046b855ee2f91d6f1b414" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 10:34:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 10:34:35 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs changes from Al Viro.\n \"A lot of misc stuff. The obvious groups:\n * Miklos\u0027 atomic_open series; kills the damn abuse of\n -\u003ed_revalidate() by NFS, which was the major stumbling block for\n all work in that area.\n * ripping security_file_mmap() and dealing with deadlocks in the\n area; sanitizing the neighborhood of vm_mmap()/vm_munmap() in\n general.\n * -\u003eencode_fh() switched to saner API; insane fake dentry in\n mm/cleancache.c gone.\n * assorted annotations in fs (endianness, __user)\n * parts of Artem\u0027s -\u003es_dirty work (jff2 and reiserfs parts)\n * -\u003eupdate_time() work from Josef.\n * other bits and pieces all over the place.\n\n Normally it would\u0027ve been in two or three pull requests, but\n signal.git stuff had eaten a lot of time during this cycle ;-/\"\n\nFix up trivial conflicts in Documentation/filesystems/vfs.txt (the\n\u0027truncate_range\u0027 inode method was removed by the VM changes, the VFS\nupdate adds an \u0027update_time()\u0027 method), and in fs/btrfs/ulist.[ch] (due\nto sparse fix added twice, with other changes nearby).\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (95 commits)\n nfs: don\u0027t open in -\u003ed_revalidate\n vfs: retry last component if opening stale dentry\n vfs: nameidata_to_filp(): don\u0027t throw away file on error\n vfs: nameidata_to_filp(): inline __dentry_open()\n vfs: do_dentry_open(): don\u0027t put filp\n vfs: split __dentry_open()\n vfs: do_last() common post lookup\n vfs: do_last(): add audit_inode before open\n vfs: do_last(): only return EISDIR for O_CREAT\n vfs: do_last(): check LOOKUP_DIRECTORY\n vfs: do_last(): make ENOENT exit RCU safe\n vfs: make follow_link check RCU safe\n vfs: do_last(): use inode variable\n vfs: do_last(): inline walk_component()\n vfs: do_last(): make exit RCU safe\n vfs: split do_lookup()\n Btrfs: move over to use -\u003eupdate_time\n fs: introduce inode operation -\u003eupdate_time\n reiserfs: get rid of resierfs_sync_super\n reiserfs: mark the superblock as dirty a bit later\n ...\n" }, { "commit": "efee984c27b67e3ebef40410f35671997441b57c", "tree": "53457dba2338f853d34e1754e7f7f960e4a29482", "parents": [ "17440f171e28e86cc21a4c8fd1fa3c561503f80e" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 28 02:04:15 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:52 2012 -0400" }, "message": "new helper: signal_delivered()\n\nDoes block_sigmask() + tracehook_signal_handler(); called when\nsigframe has been successfully built. All architectures converted\nto it; block_sigmask() itself is gone now (merged into this one).\n\nI\u0027m still not too happy with the signature, but that\u0027s a separate\nstory (IMO we need a structure that would contain signal number +\nsiginfo + k_sigaction, so that get_signal_to_deliver() would fill one,\nsignal_delivered(), handle_signal() and probably setup...frame() -\ntake one).\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "77097ae503b170120ab66dd1d547f8577193f91f", "tree": "bee5b2e8d91b9ec8ab74c58cbec1796c7bacc2e5", "parents": [ "edd63a2763bdae0daa4f0a4d4c5d61d1154352a5" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 27 13:58:59 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:51 2012 -0400" }, "message": "most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set\n\nOnly 3 out of 63 do not. Renamed the current variant to __set_current_blocked(),\nadded set_current_blocked() that will exclude unblockable signals, switched\nopen-coded instances to it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a610d6e672d6d3723e8da257ad4a8a288a8f2f89", "tree": "2fac6ce7f72756771f4f87583205cc402589dcad", "parents": [ "5754f412a3f107cbcd93ee125bef296f2a07539b" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:42:15 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:49 2012 -0400" }, "message": "pull clearing RESTORE_SIGMASK into block_sigmask()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b7f9a11a6cf1ea9ee6be3eb2b90d91327a09ad14", "tree": "7d5a5f469aea8ac2b3e1ab41e05a6abafcb2b694", "parents": [ "51a7b448d4134e3e8eec633435e3e8faee14a828" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 02 09:59:21 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:48 2012 -0400" }, "message": "new helper: sigmask_to_save()\n\nreplace boilerplate \"should we use -\u003esaved_sigmask or -\u003eblocked?\"\nwith calls of obvious inlined helper...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "51a7b448d4134e3e8eec633435e3e8faee14a828", "tree": "8fc58560ffee1c944ec5e198029d5c2e6f7c0bd3", "parents": [ "4ebefe3ec729003443daf153ed6fad1739271283" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:33:55 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:47 2012 -0400" }, "message": "new helper: restore_saved_sigmask()\n\nfirst fruits of ..._restore_sigmask() helpers: now we can take\nboilerplate \"signal didn\u0027t have a handler, clear RESTORE_SIGMASK\nand restore the blocked mask from -\u003esaved_mask\" into a common\nhelper. Open-coded instances switched...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "fb21affa49204acd409328415b49bfe90136653c", "tree": "3535dbe0c0aad049a38cadfcffe78409397a1b32", "parents": [ "a00b6151a2ae4c52576c35d3998e144a993d50b8", "f23ca335462e3c84f13270b9e65f83936068ec2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull second pile of signal handling patches from Al Viro:\n \"This one is just task_work_add() series + remaining prereqs for it.\n\n There probably will be another pull request from that tree this\n cycle - at least for helpers, to get them out of the way for per-arch\n fixes remaining in the tree.\"\n\nFix trivial conflict in kernel/irq/manage.c: the merge of Andrew\u0027s pile\nhad brought in commit 97fd75b7b8e0 (\"kernel/irq/manage.c: use the\npr_foo() infrastructure to prefix printks\") which changed one of the\npr_err() calls that this merge moves around.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n keys: kill task_struct-\u003ereplacement_session_keyring\n keys: kill the dummy key_replace_session_keyring()\n keys: change keyctl_session_to_parent() to use task_work_add()\n genirq: reimplement exit_irq_thread() hook via task_work_add()\n task_work_add: generic process-context callbacks\n avr32: missed _TIF_NOTIFY_RESUME on one of do_notify_resume callers\n parisc: need to check NOTIFY_RESUME when exiting from syscall\n move key_repace_session_keyring() into tracehook_notify_resume()\n TIF_NOTIFY_RESUME is defined on all targets now\n" }, { "commit": "08615d7d85e5aa02c05bf6c4dde87d940e7f85f6", "tree": "18906149d313d25914160aca21cedf54b3a7e818", "parents": [ "9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702", "0a4dd35c67b144d8ef9432120105f1aab9293ee9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge misc patches from Andrew Morton:\n\n - the \"misc\" tree - stuff from all over the map\n\n - checkpatch updates\n\n - fatfs\n\n - kmod changes\n\n - procfs\n\n - cpumask\n\n - UML\n\n - kexec\n\n - mqueue\n\n - rapidio\n\n - pidns\n\n - some checkpoint-restore feature work. Reluctantly. Most of it\n delayed a release. I\u0027m still rather worried that we don\u0027t have a\n clear roadmap to completion for this work.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (78 patches)\n kconfig: update compression algorithm info\n c/r: prctl: add ability to set new mm_struct::exe_file\n c/r: prctl: extend PR_SET_MM to set up more mm_struct entries\n c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat\n syscalls, x86: add __NR_kcmp syscall\n fs, proc: introduce /proc/\u003cpid\u003e/task/\u003ctid\u003e/children entry\n sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE\n aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()\n eventfd: change int to __u64 in eventfd_signal()\n fs/nls: add Apple NLS\n pidns: make killed children autoreap\n pidns: use task_active_pid_ns in do_notify_parent\n rapidio/tsi721: add DMA engine support\n rapidio: add DMA engine support for RIO data transfers\n ipc/mqueue: add rbtree node caching support\n tools/selftests: add mq_perf_tests\n ipc/mqueue: strengthen checks on mqueue creation\n ipc/mqueue: correct mq_attr_ok test\n ipc/mqueue: improve performance of send/recv\n selftests: add mq_open_tests\n ...\n" }, { "commit": "3eaa73bde2fb475b731a0fde7dd11c3ecfb8679c", "tree": "23c087b9be927d334c3eb3b08f746a8675dae3b9", "parents": [ "cb79295e20a8088a2fd6a9b3cb5f2d889ec36b4d" ], "author": { "name": "Anton Vorontsov", "email": "anton.vorontsov@linaro.org", "time": "Thu May 31 16:26:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:29 2012 -0700" }, "message": "arm: use clear_tasks_mm_cpumask()\n\nChecking for process-\u003emm is not enough because process\u0027 main thread may\nexit or detach its mm via use_mm(), but other threads may still have a\nvalid mm.\n\nTo fix this we would need to use find_lock_task_mm(), which would walk up\nall threads and returns an appropriate task (with task lock held).\n\nclear_tasks_mm_cpumask() has this issue fixed, so let\u0027s use it.\n\nSuggested-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Anton Vorontsov \u003canton.vorontsov@linaro.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5910de9e2de453956c3a18816f4838d96ac86988", "tree": "941ae40e2248b7dad59e49012e8c27a2b3b7571a", "parents": [ "4a85c7fa52d71806dd7389486f11eda907b49fd6" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Sat May 26 06:25:36 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:53 2012 +0200" }, "message": "ARM: ux500: Enable probing of pinctrl through Device Tree\n\nThe Nomadik GPIO controller now relies on Nomadik pinctrl, however\nthe pinctrl driver is not currently started by any ux500 platform.\nThis is requred or GPIOs do not work at all.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "4a85c7fa52d71806dd7389486f11eda907b49fd6", "tree": "cef381739c339f04cee581470af349f49ef9d10e", "parents": [ "bc36748153eea3813018fae3e361a941213e9ada" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Tue May 29 14:29:53 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:49 2012 +0200" }, "message": "ARM: ux500: Add support for ab8500 regulators into the Device Tree\n\nHere we supply the information required to setup regulators successfully\non Snowball and other db8500 variants which use the ab8500 regulators.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "bc36748153eea3813018fae3e361a941213e9ada", "tree": "74458d04c633f3be7198a3cb42ed36ed7889c837", "parents": [ "890d84fac09b7e3986317c9f6d53a7924ac10161" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Thu May 03 11:23:47 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:46 2012 +0200" }, "message": "ARM: ux500: Provide regulator support for SMSC911x via Device Tree\n\nThis patch adds a fixed regulator for use by the SMSC911x Ethernet\nchip driver into the db8500 Device Tree. It also references other\nregulators required by the same device.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "890d84fac09b7e3986317c9f6d53a7924ac10161", "tree": "95b6fad56bea6ce58c8dc37fc1df095f2a1a59cd", "parents": [ "e5999f28903ebf795e83c95ed19191517ad3c001" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Fri May 04 14:01:00 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:41 2012 +0200" }, "message": "ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot\n\nThis patch adds the correct compatible string for use during Device Tree\npopulation. Without it the DB8500 PRCMU regulators would be processed\nwhen DT is enabled.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "e5999f28903ebf795e83c95ed19191517ad3c001", "tree": "ac45bd07bd3b57b36ae2afdd3a1c902d58b36ea1", "parents": [ "fd6948bb2aee1020001d7fd4747160541d69e30f" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Fri May 04 13:32:34 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:37 2012 +0200" }, "message": "ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree\n\nHere we inform Device Tree of which regulators are provided by the db8500-\nprcmu. This way we can reference some of their consumers directly from the\nDevice Tree e.g. SMSC911x Ethernet chip.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "fd6948bb2aee1020001d7fd4747160541d69e30f", "tree": "6cf7a62c08d785bc26630d0490e0d838daf24948", "parents": [ "48a4ea626ddfad1c714ac4e3b7049347c22f2aa2" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Wed May 02 09:53:48 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:33 2012 +0200" }, "message": "ARM: ux500: Only initialise STE\u0027s UIBs on boards which support them\n\nST-Ericsson uses User Interface Boards to extend functionality of\nsome of their development boards. However, these aren\u0027t compatible\nwith all the supported boards found in Mainline (Snowball for\ninstance). This patch ensures that the UIBs are only probed on\nboards which can actually support them. This in turn saves lots of\nunnecessary error messages normally found in Snowball\u0027s boot log.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "48a4ea626ddfad1c714ac4e3b7049347c22f2aa2", "tree": "34f040f03f55539bda09ec3c64facb393e807a9e", "parents": [ "93b5698aae844f75709f759a6c92109ce40780da" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Tue May 29 15:06:55 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:29 2012 +0200" }, "message": "ARM: ux500: Disable platform setup of the ab8500 when DT is enabled\n\nThe final piece of the ab8500 puzzle. Here we prevent any of the ab8500-*\ndrivers from being registered from platform code when Device Tree is\nenabled, as we expect DT do probe each of these individually. We also\nprovide the relevant compatible strings, so that DT knows which nodes\nit needs to pay attention to during population.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "93b5698aae844f75709f759a6c92109ce40780da", "tree": "18900f5355779e14944069ef24827644d252bf36", "parents": [ "e6fada59d4ca59b26600c60de8f4368c8f89961f" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Tue May 29 14:17:36 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:23 2012 +0200" }, "message": "ARM: ux500: Use correct format for dynamic IRQ assignment\n\nThis patch applies the correct format requested by the irq\ndomain. For chained IRQs which use GPIO lines as IRQs, we\nstipulate that a two cell request is required. The first cell\ncontains the requested IRQ and the second can contain flags\npertaining to edge detection and level sensitive values. The\nzeroth cell specifies the GPIO controller by use of a phandle.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "e6fada59d4ca59b26600c60de8f4368c8f89961f", "tree": "7d5d658a3bb525454a2fa432a86270216f94ad88", "parents": [ "ccf74f7677ff1cd0044b24335a968bf9e95990eb" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Thu May 17 13:18:36 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:18 2012 +0200" }, "message": "ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots\n\nThe patch to disable SMSC911x registration was applied twice in the upstream\nkernel by mistake. Git interpreted this as \u0027take the same entry from a\nsimilar struct\u0027 which was close by. This was the wrong thing to do. This patch\nrectifies this error and re-enables SMSC911x registration when Device Tree is\nnot enabled.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ccf74f7677ff1cd0044b24335a968bf9e95990eb", "tree": "02075c7d7c6a415181afb2e432eff9f1cd963415", "parents": [ "dee42ebe45321aa5852d47bde520564e715cf321" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Mon May 28 16:50:49 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:14 2012 +0200" }, "message": "ARM: ux500: PRCMU related configuration and layout corrections for Device Tree\n\nApply db8500 related PRCMU Device Tree settings and clean up some formatting\nerrors. We also remove one of the PRCMU assigned IRQs, as it is currently not\nused.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "dee42ebe45321aa5852d47bde520564e715cf321", "tree": "a37353cf1df8a63c41f55b70000263d06be8ab68", "parents": [ "ada46cda50369444a81a2cf4bf21f580fcb1d6d1" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Mon May 28 16:47:15 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:10 2012 +0200" }, "message": "ARM: ux500: Remove DB8500 PRCMU platform registration when DT is enabled\n\nNow the DB8500 has Device Tree support it will be probed when the DT\nis parsed, rendering the requirement for platform registration void.\nThis patch removes DB8500 PRCMU platform registration.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ada46cda50369444a81a2cf4bf21f580fcb1d6d1", "tree": "44169613e0d6541ed15755c93c1433731878a3ff", "parents": [ "f65c1982faca257053564e7ba6864ee9506f6a83" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Tue May 29 10:28:34 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:05 2012 +0200" }, "message": "ARM: ux500: Disable SMSC911x platform code registration when DT is enabled\n\nNow the SCMC911x is correctly enabled in Device Tree, there is no need\nto continue registering it from platform code. In fact, if we continue\ndoing so, the system will throw an error on boot.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "f65c1982faca257053564e7ba6864ee9506f6a83", "tree": "d41468ea85d27ecb429a759f764e3da44240b050", "parents": [ "11a0b5f09c941ede301ed3eee59fd69c2b4850c2" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Tue May 29 10:03:09 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:03:58 2012 +0200" }, "message": "ARM: ux500: New DT:ed u8500_init_devices for one-by-one device enablement\n\nDuring Device Tree enablement it is necessary to remove\n\u003chw_component\u003e_add_\u003cdevice\u003e calls one at at time, as and when particular\ndevices are DT enabled. This patch provides a temporary solution. Once\nthe new *of_init_devices function has been fully unpopulated it will be\nremoved again.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "11a0b5f09c941ede301ed3eee59fd69c2b4850c2", "tree": "25635f2690b47776f114819a0aa434f05adf6b4e", "parents": [ "855f80cd1683179b251b01d232b3ae228c614766" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Wed May 30 09:55:38 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:03:42 2012 +0200" }, "message": "ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement\n\nDuring Device Tree enablement it is necessary to remove snowball_\u003cdevice\u003e*\nplatform_data segments one at at time, as and when particular devices are\nDT enabled. This patch provides a temporary solution. Once this new struct\nis empty it will be removed again.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "bb8ac181a5cf50458a0d83b4460790badc9fdc16", "tree": "d55493f9ca94516a0aa83dd8ee1d87c2a88d637b", "parents": [ "1dfb5751a4de7c6a57a5602e8e2b87267cfc8c81" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 19 10:25:23 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 30 21:04:50 2012 -0400" }, "message": "bury __kernel_nlink_t, make internal nlink_t consistent\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "47e1993d32d4e0f9524c2147576468fe11e87b5f", "tree": "9957257116c0086e891db39bfa246f3b8f3d7a0f", "parents": [ "63bda79dc484c015f9902f2c8ae019952b93f876", "9dde0ae3769875ec1370cb316e50c54b57d52c1a", "a035254aefe5a6c0b45c8c55588ab47403c674ed" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:16:12 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:16:12 2012 -0700" }, "message": "Merge branches \u0027fixes\u0027 and \u0027fixes2\u0027 into devel-late\n\n* fixes:\n ixp4xx: fix compilation by adding gpiolib support\n\n* fixes2:\n ARM: LPC32xx: Adjust dts files to gpio dt binding\n" }, { "commit": "a035254aefe5a6c0b45c8c55588ab47403c674ed", "tree": "79e27ac2e50d52d178bda53fa2b4241fcd46975e", "parents": [ "af56e0aa35f3ae2a4c1a6d1000702df1dd78cb76" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Sat May 19 12:28:53 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:15:53 2012 -0700" }, "message": "ARM: LPC32xx: Adjust dts files to gpio dt binding\n\nThe GPIO devicetree binding in 3.5 doesn\u0027t register the various LPC32xx GPIO\nbanks via DT subnodes but always all at once, and changes the gpio referencing\nto 3 cells (bank, gpio, flags). This patch adjusts the DTS files to this\nbinding that was just accepted to the gpio subsystem.\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "63bda79dc484c015f9902f2c8ae019952b93f876", "tree": "8ac8535163e54fb7d44c29072c8242608832b0c3", "parents": [ "929d138a3ba776145d2f421c2c4f16d922535090", "be76871ed3ec0f4571704f07d0bd73c74cf00ddc" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:06:56 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:06:56 2012 -0700" }, "message": "Merge branch \u0027late/board\u0027 into devel-late\n\n* late/board:\n ARM: S3C64XX: Hook up carrier class modules on Cragganmore\n ARM: S3C64XX: Initial hookup for Bells module on Cragganmore\n" }, { "commit": "929d138a3ba776145d2f421c2c4f16d922535090", "tree": "cb725266d584eb6a64d4bbc010449bb50ecac247", "parents": [ "d64f41d8d2dabf4d10a11f7a5d1ef8706969655f", "67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:06:46 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:06:46 2012 -0700" }, "message": "Merge branch \u0027late/soc\u0027 into devel-late\n\n* late/soc:\n ARM: vexpress: Remove twice included header files\n ARM: vexpress: Device Tree updates\n ARM: EXYNOS: Support suspend and resume for EXYNOS5250\n ARM: EXYNOS: Add Clock register list for save and restore\n ARM: EXYNOS: Add PMU table for EXYNOS5250\n ARM: EXYNOS: Rename of function for pm.c\n ARM: EXYNOS: Remove GIC save \u0026 restore function\n ARM: dts: Add node for interrupt combiner controller on EXYNOS5250\n ARM: S3C24XX: add support for second irq set of S3C2416\n" }, { "commit": "d64f41d8d2dabf4d10a11f7a5d1ef8706969655f", "tree": "e2cbd1e386b702b227bc029d3614ee2da03964bc", "parents": [ "af56e0aa35f3ae2a4c1a6d1000702df1dd78cb76", "b19861a2a550fac67c8bb92ba8045ede3b6c1286" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:06:39 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:06:39 2012 -0700" }, "message": "Merge branch \u0027late/cleanup\u0027 into devel-late\n\n* late/cleanup:\n ARM: S3C64XX: use timekeeping wrapper on cpuidle\n ARM: S3C64XX: declare the states with the new api on cpuidle\n" }, { "commit": "227d1e4319ffd8729781941d92f4ae4d85beecd9", "tree": "22dd4d85386dd3bdd228b7be988bebbb9607d0fa", "parents": [ "7d36014b972a3833b883a7ef41e6bd3b0d187850", "e94c805f0c234ef54609f23695b60add6b25ad40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 18:21:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 18:21:44 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull arm updates from Russell King:\n \"This contains both some fixes found when trying to get the\n Assabet+neponset setup as a replacement firewall with a 3c589 PCMCIA\n card, and a bunch of changes from Al to fix up the ARM signal\n handling, particularly some of the restart behaviour.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: neponset: make sure neponset_ncr_frob() is exported\n ARM: fix out[bwl]()\n arm: don\u0027t open-code ptrace_report_syscall()\n arm: bury unused _TIF_RESTORE_SIGMASK\n arm: remove unused restart trampoline\n arm: new way of handling ERESTART_RESTARTBLOCK\n arm: if we get into work_pending while returning to kernel mode, just go away\n arm: don\u0027t call try_to_freeze() from do_signal()\n arm: if there\u0027s no handler we need to restore sigmask, syscall or no syscall\n arm: trim _TIF_WORK_MASK, get rid of useless test and branch...\n arm: missing checks of __get_user()/__put_user() return values\n" }, { "commit": "798115958967c8223f3d17e829a891564e8ea4cb", "tree": "f1dcfcffc32047c74854d5788b08c9114f70408f", "parents": [ "b224b9ac8c42afc40cba170187df3d0cdbb13c20" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Tue May 29 15:07:37 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:33 2012 -0700" }, "message": "rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC\n\nIn order to keep consistency with other rtc drivers,rename CONFIG_RTC_MXC\nto CONFIG_RTC_DRV_MXC.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\n[akpm@linux-foundation.org: fix missed arch/arm/configs/imx_v6_v7_defconfig]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e94c805f0c234ef54609f23695b60add6b25ad40", "tree": "09e116c62b065316eb93070e78a1843d9055373a", "parents": [ "ef0c14842e6e04b860d0309c5d5a3c1ead344e35", "70b58d896b1b30e4b89d369fbeb244c0e952cf9f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue May 29 22:13:55 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue May 29 22:13:55 2012 +0100" }, "message": "Merge branch \u0027for-arm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git into for-linus\n\nConflicts:\n\tarch/arm/kernel/ptrace.c\n" }, { "commit": "4b781474682434e7881f20e9dfbe6687ea619795", "tree": "bdd976645ead7f04900e60017502e6a41b03e601", "parents": [ "53f2c4a8fd882009a2a75c5b72d6898c0808616e", "29f772d41c01ad6b72c3de705e79779857badcde" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 11:53:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 11:53:11 2012 -0700" }, "message": "Merge tag \u0027mfd-3.5-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\nPull MFD changes from Samuel Ortiz:\n \"Besides the usual cleanups, this one brings:\n\n * Support for 5 new chipsets: Intel\u0027s ICH LPC and SCH Centerton,\n ST-E\u0027s STAX211, Samsung\u0027s MAX77693 and TI\u0027s LM3533.\n\n * Device tree support for the twl6040, tps65910, da9502 and ab8500\n drivers.\n\n * Fairly big tps56910, ab8500 and db8500 updates.\n\n * i2c support for mc13xxx.\n\n * Our regular update for the wm8xxx driver from Mark.\"\n\nFix up various conflicts with other trees, largely due to ab5500 removal\netc.\n\n* tag \u0027mfd-3.5-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (106 commits)\n mfd: Fix build break of max77693 by adding REGMAP_I2C option\n mfd: Fix twl6040 build failure\n mfd: Fix max77693 build failure\n mfd: ab8500-core should depend on MFD_DB8500_PRCMU\n gpio: tps65910: dt: process gpio specific device node info\n mfd: Remove the parsing of dt info for tps65910 gpio\n mfd: Save device node parsed platform data for tps65910 sub devices\n mfd: Add r_select to lm3533 platform data\n gpio: Add Intel Centerton support to gpio-sch\n mfd: Emulate active low IRQs as well as active high IRQs for wm831x\n mfd: Mark two lm3533 zone registers as volatile\n mfd: Fix return type of lm533 attribute is_visible\n mfd: Enable Device Tree support in the ab8500-pwm driver\n mfd: Enable Device Tree support in the ab8500-sysctrl driver\n mfd: Add support for Device Tree to twl6040\n mfd: Register the twl6040 child for the ASoC codec unconditionally\n mfd: Allocate twl6040 IRQ numbers dynamically\n mfd: twl6040 code cleanup in interrupt initialization part\n mfd: Enable ab8500-gpadc driver for Device Tree\n mfd: Prevent unassigned pointer from being used in ab8500-gpadc driver\n ...\n" }, { "commit": "d85d135d8babbc917b370f36cbc02b7b4a2f2d99", "tree": "2f06e02940d87099670aa31459ad1ab41a1ca036", "parents": [ "5e7b911f9a3e582635801675b7fe935b16cd4af5", "e92a5b28f71aea01b281f9c89d97a4bc5b24748f" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Sun May 27 20:58:20 2012 +0000" }, "committer": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Sun May 27 20:58:20 2012 +0000" }, "message": "Merge tag \u0027omapdss-for-3.5\u0027 of git://github.com/tomba/linux into fbdev-next\n\nOmapdss driver changes for 3.5 merge window.\n\nLots of normal development commits, but perhaps most notable changes are:\n\n* HDMI rework to properly decouple the HDMI audio part from the HDMI video part.\n* Restructure omapdss core driver so that it\u0027s possible to implement device\n tree support. This included changing how platform data is passed to the\n drivers, changing display device registration and improving the panel driver\u0027s\n ability to configure the underlying video output interface.\n* Basic support for DSI packet interleaving\n" }, { "commit": "67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40", "tree": "f12706b80194f48aad3a1bd70ae9215d48875591", "parents": [ "516fb7a22a5347dc6db731369c365ed1f9b64632", "c533f32e1ac440b8840159f89ece8c9cca2422b5" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat May 26 13:30:41 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat May 26 13:30:41 2012 -0700" }, "message": "Merge branch \u0027vexpress-v3.4\u0027 of git://git.linaro.org/people/pawelmoll/linux into late/soc\n\nA few device tree updates and an include file fix for versatile.\n\n* \u0027vexpress-v3.4\u0027 of git://git.linaro.org/people/pawelmoll/linux:\n ARM: vexpress: Remove twice included header files\n ARM: vexpress: Device Tree updates\n + update to 3.4\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "f465d145d76803fe6332092775d891c8c509aa44", "tree": "45889e2eee7e8288ef269e9b661111364a71c25f", "parents": [ "30b842889eea1bea02dff55b13d2ddf07a46ce78", "80b9abf973462499c1a0110df47f62cc90361e2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:14:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:14:01 2012 -0700" }, "message": "Merge tag \u0027cleanup-initcall\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull sweeping late_initcall cleanup for arm-soc from Olof Johansson:\n \"This is a patch series from Shawn Guo that moves from individual\n late_initcalls() to using a member in the machine structure to invoke\n a platform\u0027s late initcalls.\n\n This cleanup is a step in the move towards multiplatform kernels since\n it would reduce the need to check for compatible platforms in each and\n every initcall.\"\n\nFix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,\nimx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,\nin the case of cpuimx51.c the board support being deleted)\n\n* tag \u0027cleanup-initcall\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: ux500: use machine specific hook for late init\n ARM: tegra: use machine specific hook for late init\n ARM: shmobile: use machine specific hook for late init\n ARM: sa1100: use machine specific hook for late init\n ARM: s3c64xx: use machine specific hook for late init\n ARM: prima2: use machine specific hook for late init\n ARM: pnx4008: use machine specific hook for late init\n ARM: omap2: use machine specific hook for late init\n ARM: omap1: use machine specific hook for late init\n ARM: msm: use machine specific hook for late init\n ARM: imx: use machine specific hook for late init\n ARM: exynos: use machine specific hook for late init\n ARM: ep93xx: use machine specific hook for late init\n ARM: davinci: use machine specific hook for late init\n ARM: provide a late_initcall hook for platform initialization\n" }, { "commit": "30b842889eea1bea02dff55b13d2ddf07a46ce78", "tree": "827d96b61384d5fe22ed7aeba02b34026648046e", "parents": [ "84a442b9a16ee69243ce7fce5d6f6f9c3fbdee68", "820f3dd7964f1889baaaaa0c2ba45d05bb619f66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:05:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:05:55 2012 -0700" }, "message": "Merge tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc: soc specific changes (part 2) from Olof Johansson:\n \"This adds support for the spear13xx platform, which has first been\n under review a long time ago and finally been completed after generic\n spear work has gone into the clock, dt and pinctrl branches.\n\n Also a number of updates for the samsung socs are part of this branch.\"\n\nFix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much\nworse than they are: the exonys5 init code was refactored in commit\nfd454997d687 (\"gpio: samsung: refactor gpiolib init for exynos4/5\"), and\nthen commit f10590c9836c (\"ARM: EXYNOS: add GPC4 bank instance\") added a\nnew gpio chip define and did tiny updates to the init code.\n\nSo the conflict diff looks like hell, but it\u0027s actually a fairly simple\nchange.\n\n* tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)\n ARM: exynos: fix building with CONFIG_OF disabled\n ARM: EXYNOS: Add AUXDATA for i2c controllers\n ARM: dts: Update device tree source files for EXYNOS5250\n ARM: EXYNOS: Add device tree support for interrupt combiner\n ARM: EXYNOS: Add irq_domain support for interrupt combiner\n ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5\n ARM: EXYNOS: update irqs for EXYNOS5250 SoC\n ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll\n ARM: EXYNOS: add GPC4 bank instance\n ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition\n ARM: EXYNOS: Modify the GIC physical address for static io-mapping\n ARM: EXYNOS: Add watchdog timer clock instance\n pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res\n SPEAr: Update MAINTAINERS and Documentation\n SPEAr13xx: Add defconfig\n SPEAr13xx: Add compilation support\n SPEAr13xx: Add dts and dtsi files\n pinctrl: Add SPEAr13xx pinctrl drivers\n pinctrl: SPEAr: Create macro for declaring GPIO PINS\n SPEAr13xx: Add common clock framework support\n ...\n" }, { "commit": "84a442b9a16ee69243ce7fce5d6f6f9c3fbdee68", "tree": "332a0c901d8ab2ffb19b8ce14b4b094bf5b08657", "parents": [ "39b6cc668c5ecc66f6f9c9293ffab681cb6f7065", "deb88cc3c69975cbd9875ed9fac259b351f6b64d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:57:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:57:47 2012 -0700" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc device tree conversions (part 2) from Olof Johansson:\n \"These continue the device tree work from part 1, this set is for the\n tegra, mxs and imx platforms, all of which have dependencies on clock\n or pinctrl changes submitted earlier.\"\n\nFix up trivial conflicts due to nearby changes in\ndrivers/{gpio/gpio,i2c/busses/i2c}-mxs.c\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)\n ARM: dt: tegra: invert status\u003ddisable vs status\u003dokay\n ARM: dt: tegra: consistent basic property ordering\n ARM: dt: tegra: sort nodes based on bus order\n ARM: dt: tegra: remove duplicate device_type property\n ARM: dt: tegra: consistenly use lower-case for hex constants\n ARM: dt: tegra: format regs properties consistently\n ARM: dt: tegra: gpio comment cleanup\n ARM: dt: tegra: remove unnecessary unit addresses\n ARM: dt: tegra: whitespace cleanup\n ARM: dt: tegra cardhu: fix typo in SDHCI node name\n ARM: dt: tegra: cardhu: register core regulator tps62361\n ARM: dt: tegra30.dtsi: Add SMMU node\n ARM: dt: tegra20.dtsi: Add GART node\n ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes\n ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes\n ARM: dt: tegra: Add device tree support for AHB\n ARM: dts: enable audio support for imx28-evk\n ARM: dts: enable i2c device for imx28-evk\n i2c: mxs: add device tree probe support\n ARM: dts: enable mmc for imx28-evk\n ...\n" }, { "commit": "27953437059c64d14086196eb96f43c78caa9db3", "tree": "0cfd5fb21262a6db3de0c64462847b4c0c43e9df", "parents": [ "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "3c0dec5f58b3c7b3627715126d1bf9b030a076f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "message": "Merge tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc clock driver changes from Olof Johansson:\n \"The new clock subsystem was merged in linux-3.4 without any users,\n this now moves the first three platforms over to it: imx, mxs and\n spear.\n\n The series also contains the changes for the clock subsystem itself,\n since Mike preferred to have it together with the platforms that\n require these changes, in order to avoid interdependencies and\n conflicts.\"\n\nFix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code\nremoved in one branch, added OF support in another) and\ndrivers/dma/imx-sdma.c (independent changes next to each other).\n\n* tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\n SPEAr: Update defconfigs\n SPEAr: Add SMI NOR partition info in dts files\n SPEAr: Switch to common clock framework\n SPEAr: Call clk_prepare() before calling clk_enable\n SPEAr: clk: Add General Purpose Timer Synthesizer clock\n SPEAr: clk: Add Fractional Synthesizer clock\n SPEAr: clk: Add Auxiliary Synthesizer clock\n SPEAr: clk: Add VCO-PLL Synthesizer clock\n SPEAr: Add DT bindings for SPEAr\u0027s timer\n ARM i.MX: remove now unused clock files\n ARM: i.MX6: implement clocks using common clock framework\n ARM i.MX35: implement clocks using common clock framework\n ARM i.MX5: implement clocks using common clock framework\n ARM: Kirkwood: Replace clock gating\n ARM: Orion: Audio: Add clk/clkdev support\n ARM: Orion: PCIE: Add support for clk\n ARM: Orion: XOR: Add support for clk\n ARM: Orion: CESA: Add support for clk\n ...\n" }, { "commit": "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "tree": "d150ea105242d551f6959c2525472295e151144c", "parents": [ "ce53044c68cf4fb6c50a2a0d88786be65fae7235", "424663566c43ce87e8b33228860bf882f1ea61bf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:31:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:31:49 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc cleanups (part 2) from Olof Johansson:\n \"More cleanups, continuing an earlier set with omap and samsung\n specific cleanups. These could not go into the first set because they\n have dependencies on various other series that in turn depend on the\n first cleanups.\"\n\nFixed up conflicts in arch/arm/plat-omap/counter_32k.c due to commit\nbd0493eaaf5c: \"move read_{boot,persistent}_clock to the architecture\nlevel\" that changed how the persistent clocks were handled. And trivial\nconflicts in arch/arm/mach-omap1/common.h due to just independent\nchanges close to each other.\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (35 commits)\n ARM: SAMSUNG: merge plat-s5p into plat-samsung\n ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig\n ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung\n ARM: SAMSUNG: move platform device for s5p uart into plat-samsung\n ARM: SAMSUNG: move hr timer for common s5p into plat-samsung\n ARM: SAMSUNG: move pm part for common s5p into plat-samsung\n ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung\n ARM: SAMSUNG: move clock part for common s5p into plat-samsung\n ARM: S3C24XX: Use common macro to define resources on dev-uart.c\n ARM: S3C24XX: move common clock init into common.c\n ARM: S3C24XX: move common power-management code to mach-s3c24xx\n ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c\n ARM: S3C24XX: move plat-s3c24xx/cpu.c\n ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX\n ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX\n GPMC: add ECC control definitions\n ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore\n ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx\n ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505\n ARM: OMAP1: Pass dma request lines in platform data to MMC driver\n ...\n" }, { "commit": "ce53044c68cf4fb6c50a2a0d88786be65fae7235", "tree": "19c21da7d261412192e189ef3fd1a9ff4e7ba5c2", "parents": [ "0877aa3908aaeeae8fc2850691668c4315d3db56", "046fae440d32cc6dec8148c7e06a8b4b987f8a2f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:22:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:22:27 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc driver specific updates from Olof Johansson:\n \"These changes are specific to some driver that may be used by multiple\n boards or socs. The most significant change in here is the move of\n the samsung iommu code from a platform specific in-kernel interface to\n the generic iommu subsystem.\"\n\nFix up trivial conflicts in arch/arm/mach-exynos/Kconfig\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mmc: dt: Consolidate DT bindings\n iommu/exynos: Add iommu driver for EXYNOS Platforms\n ARM: davinci: optimize the DMA ISR\n ARM: davinci: implement DEBUG_LL port choice\n ARM: tegra: Add SMMU enabler in AHB\n ARM: tegra: Add Tegra AHB driver\n Input: pxa27x_keypad add choice to set direct_key_mask\n Input: pxa27x_keypad direct key may be low active\n Input: pxa27x_keypad bug fix for direct_key_mask\n Input: pxa27x_keypad keep clock on as wakeup source\n ARM: dt: tegra: pinmux changes for USB ULPI\n ARM: tegra: add USB ULPI PHY reset GPIO to device tree\n ARM: tegra: don\u0027t hard-code USB ULPI PHY reset_gpio\n ARM: tegra: change pll_p_out4\u0027s rate to 24MHz\n ARM: tegra: fix pclk rate\n ARM: tegra: reparent sclk to pll_c_out1\n ARM: tegra: Add pllc clock init table\n ARM: dt: tegra cardhu: basic audio support\n ARM: dt: tegra30.dtsi: Add audio-related nodes\n ARM: tegra: add AUXDATA required for audio\n ...\n" }, { "commit": "0877aa3908aaeeae8fc2850691668c4315d3db56", "tree": "bdb4ee1c1939dfb7a3d2ca10db4b1bbd6eac26e9", "parents": [ "786f02b719f2285e2c0350b6a04dab4a1a0871a1", "4a230408e83698a3d7ff0a9988a58675c2c92cb9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:19:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:19:31 2012 -0700" }, "message": "Merge tag \u0027defconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc defconfig updates from Olof Johansson:\n \"For the first time, we have one branch that collects just updates to\n defconfig files, mostly for adapting to changes in other subsystems.\"\n\n* tag \u0027defconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: PRIMA2: add prima2_defconfig for CSR SiRFprimaII\n ARM: tegra: update defconfig\n ARM: tegra: update defconfig\n ARM: imx_v6_v7_defconfig: Add SPI NOR support\n ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default\n" }, { "commit": "d5adf235adc8d8d67c10afd43922c92753f6be3c", "tree": "18c3cdcbc9a50a8cd00b03d83ec76bad7c7594f8", "parents": [ "d484864dd96e1830e7689510597707c1df8cd681", "1dd1ea8eb46a71201943148cc0ed3182cd04e288" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:31:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:31:59 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine updates from Vinod Koul:\n \"Nothing exciting this time, odd fixes in a bunch of drivers\"\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n dmaengine: at_hdmac: take maxburst from slave configuration\n dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant\n dmaengine: at_hdmac: remove some at_dma_slave comments\n dma: imx-sdma: make channel0 operations atomic\n dmaengine: Fixup dmaengine_prep_slave_single() to be actually useful\n dmaengine: Use dma_sg_len(sg) instead of sg-\u003elength\n dmaengine: Use sg_dma_address instead of sg_phys\n DMA: PL330: Remove duplicate header file inclusion\n dma: imx-sdma: keep the callbacks invoked in the tasklet\n dmaengine: dw_dma: add Device Tree probing capability\n dmaengine: dw_dmac: Add clk_{un}prepare() support\n dma/amba-pl08x: add support for the Nomadik variant\n dma/amba-pl08x: check for terminal count status only\n" }, { "commit": "d484864dd96e1830e7689510597707c1df8cd681", "tree": "51551708ba3f26d05575fa91daaf0c0d970a77c3", "parents": [ "be87cfb47c5c740f7b17929bcd7c480b228513e0", "0f51596bd39a5c928307ffcffc9ba07f90f42a8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nPull CMA and ARM DMA-mapping updates from Marek Szyprowski:\n \"These patches contain two major updates for DMA mapping subsystem\n (mainly for ARM architecture). First one is Contiguous Memory\n Allocator (CMA) which makes it possible for device drivers to allocate\n big contiguous chunks of memory after the system has booted.\n\n The main difference from the similar frameworks is the fact that CMA\n allows to transparently reuse the memory region reserved for the big\n chunk allocation as a system memory, so no memory is wasted when no\n big chunk is allocated. Once the alloc request is issued, the\n framework migrates system pages to create space for the required big\n chunk of physically contiguous memory.\n\n For more information one can refer to nice LWN articles:\n\n - \u0027A reworked contiguous memory allocator\u0027:\n\t\thttp://lwn.net/Articles/447405/\n\n - \u0027CMA and ARM\u0027:\n\t\thttp://lwn.net/Articles/450286/\n\n - \u0027A deep dive into CMA\u0027:\n\t\thttp://lwn.net/Articles/486301/\n\n - and the following thread with the patches and links to all previous\n versions:\n\t\thttps://lkml.org/lkml/2012/4/3/204\n\n The main client for this new framework is ARM DMA-mapping subsystem.\n\n The second part provides a complete redesign in ARM DMA-mapping\n subsystem. The core implementation has been changed to use common\n struct dma_map_ops based infrastructure with the recent updates for\n new dma attributes merged in v3.4-rc2. This allows to use more than\n one implementation of dma-mapping calls and change/select them on the\n struct device basis. The first client of this new infractructure is\n dmabounce implementation which has been completely cut out of the\n core, common code.\n\n The last patch of this redesign update introduces a new, experimental\n implementation of dma-mapping calls on top of generic IOMMU framework.\n This lets ARM sub-platform to transparently use IOMMU for DMA-mapping\n calls if one provides required IOMMU hardware.\n\n For more information please refer to the following thread:\n\t\thttp://www.spinics.net/lists/arm-kernel/msg175729.html\n\n The last patch merges changes from both updates and provides a\n resolution for the conflicts which cannot be avoided when patches have\n been applied on the same files (mainly arch/arm/mm/dma-mapping.c).\"\n\nAcked by Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n \"Yup, this one please. It\u0027s had much work, plenty of review and I\n think even Russell is happy with it.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: (28 commits)\n ARM: dma-mapping: use PMD size for section unmap\n cma: fix migration mode\n ARM: integrate CMA with DMA-mapping subsystem\n X86: integrate CMA with DMA-mapping subsystem\n drivers: add Contiguous Memory Allocator\n mm: trigger page reclaim in alloc_contig_range() to stabilise watermarks\n mm: extract reclaim code from __alloc_pages_direct_reclaim()\n mm: Serialize access to min_free_kbytes\n mm: page_isolation: MIGRATE_CMA isolation functions added\n mm: mmzone: MIGRATE_CMA migration type added\n mm: page_alloc: change fallbacks array handling\n mm: page_alloc: introduce alloc_contig_range()\n mm: compaction: export some of the functions\n mm: compaction: introduce isolate_freepages_range()\n mm: compaction: introduce map_pages()\n mm: compaction: introduce isolate_migratepages_range()\n mm: page_alloc: remove trailing whitespace\n ARM: dma-mapping: add support for IOMMU mapper\n ARM: dma-mapping: use alloc, mmap, free from dma_ops\n ARM: dma-mapping: remove redundant code and do the cleanup\n ...\n\nConflicts:\n\tarch/x86/include/asm/dma-mapping.h\n" }, { "commit": "b9dbf9517784084ee9496f9f17f9754c1d021a9e", "tree": "9b51e9d9becd1d9ed40ffaf34e960bc22970fae8", "parents": [ "e5400321a6f15ce0fe77c8455954f213ef7dcc54" ], "author": { "name": "Magnus Damm", "email": "magnus.damm@gmail.com", "time": "Fri May 25 16:03:44 2012 +0900" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 25 11:32:06 2012 +0200" }, "message": "clocksource: em_sti: Emma Mobile STI driver\n\nThe STI hardware is based on a single 48-bit 32kHz\ncounter that together with two individual compare\nregisters can generate interrupts. There are no\ntimer operating modes selectable which means that\nthe timer can not clear on match.\n\nThis driver is providing clocksource support for the\n48-bit counter. Clockevents are also supported using\nthe same timer in oneshot mode.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: horms@verge.net.au\nCc: arnd@arndb.de\nCc: johnstul@us.ibm.com\nCc: rjw@sisk.pl\nCc: lethal@linux-sh.org\nCc: gregkh@linuxfoundation.org\nCc: olof@lixom.net\nLink: http://lkml.kernel.org/r/20120525070344.23443.69756.sendpatchset@w520\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "ef0c14842e6e04b860d0309c5d5a3c1ead344e35", "tree": "811d9dfb6d0a1bb41917b6ac1dab8acef023803d", "parents": [ "af06bb9f12990cae941816f9d7051dc5bf93c8a2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 25 08:41:53 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 25 08:41:53 2012 +0100" }, "message": "ARM: neponset: make sure neponset_ncr_frob() is exported\n\nThis function is used by modules (such as the SA1111 PCMCIA driver)\nso it needs to be exported.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "af06bb9f12990cae941816f9d7051dc5bf93c8a2", "tree": "67db11243a02d7f274159dc52350228476831a41", "parents": [ "72c04af9a2d57b7945cf3de8e71461bd80695d50" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 25 08:39:25 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 25 08:39:25 2012 +0100" }, "message": "ARM: fix out[bwl]()\n\nout[bwl]() had a side effect that gcc read-back from the register after\nwriting its value. This causes a problem for at least 3c589_cs, which\nspits out lots of \"adapter failure, FIFO diagnostic register 2011.\"\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "07acfc2a9349a8ce45b236c2624dad452001966b", "tree": "c40f3eaac18a8320e65af220979223b5cd632b1b", "parents": [ "b5f4035adfffbcc6b478de5b8c44b618b3124aff", "322728e55aa7834e2fab2786b76df183c4843a12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM changes from Avi Kivity:\n \"Changes include additional instruction emulation, page-crossing MMIO,\n faster dirty logging, preventing the watchdog from killing a stopped\n guest, module autoload, a new MSI ABI, and some minor optimizations\n and fixes. Outside x86 we have a small s390 and a very large ppc\n update.\n\n Regarding the new (for kvm) rebaseless workflow, some of the patches\n that were merged before we switch trees had to be rebased, while\n others are true pulls. In either case the signoffs should be correct\n now.\"\n\nFix up trivial conflicts in Documentation/feature-removal-schedule.txt\narch/powerpc/kvm/book3s_segment.S and arch/x86/include/asm/kvm_para.h.\n\nI suspect the kvm_para.h resolution ends up doing the \"do I have cpuid\"\ncheck effectively twice (it was done differently in two different\ncommits), but better safe than sorry ;)\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (125 commits)\n KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block\n KVM: s390: onereg for timer related registers\n KVM: s390: epoch difference and TOD programmable field\n KVM: s390: KVM_GET/SET_ONEREG for s390\n KVM: s390: add capability indicating COW support\n KVM: Fix mmu_reload() clash with nested vmx event injection\n KVM: MMU: Don\u0027t use RCU for lockless shadow walking\n KVM: VMX: Optimize %ds, %es reload\n KVM: VMX: Fix %ds/%es clobber\n KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte()\n KVM: VMX: unlike vmcs on fail path\n KVM: PPC: Emulator: clean up SPR reads and writes\n KVM: PPC: Emulator: clean up instruction parsing\n kvm/powerpc: Add new ioctl to retreive server MMU infos\n kvm/book3s: Make kernel emulated H_PUT_TCE available for \"PR\" KVM\n KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler\n KVM: PPC: Book3S: Enable IRQs during exit handling\n KVM: PPC: Fix PR KVM on POWER7 bare metal\n KVM: PPC: Fix stbux emulation\n KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields\n ...\n" }, { "commit": "b1bf7d4d1b3911352cf1ec63c1de06214288ccd0", "tree": "0fd27c638977cb5c7e6e3f95085ce842b57a4ae3", "parents": [ "0708500d49e8439d9fe5529795bdc1485f0f46c3", "3e11f7b840b4671213c66817294ad7dd0b572756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO driver changes from Grant Likely:\n \"Lots of gpio changes, both to core code and drivers.\n\n Changes do touch architecture code to remove the need for separate\n arm/gpio.h includes in most architectures.\n\n Some new drivers are added, and a number of gpio drivers are converted\n to use irq_domains for gpio inputs used as interrupts. Device tree\n support has been amended to allow multiple gpio_chips to use the same\n device tree node.\n\n Remaining changes are primarily bug fixes.\"\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (33 commits)\n gpio/generic: initialize basic_mmio_gpio shadow variables properly\n gpiolib: Remove \u0027const\u0027 from data argument of gpiochip_find()\n gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583\n gpiolib: quiet gpiochip_add boot message noise\n gpio: mpc8xxx: Prevent NULL pointer deref in demux handler\n gpio/lpc32xx: Add device tree support\n gpio: Adjust of_xlate API to support multiple GPIO chips\n gpiolib: Implement devm_gpio_request_one()\n gpio-mcp23s08: dbg_show: fix pullup configuration display\n Add support for TCA6424A\n gpio/omap: (re)fix wakeups on level-triggered GPIOs\n gpio/omap: fix broken context restore for non-OFF mode transitions\n gpio/omap: fix missing check in *_runtime_suspend()\n gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()\n gpio/omap: remove suspend/resume callbacks\n gpio/omap: remove retrigger variable in gpio_irq_handler\n gpio/omap: remove saved_wakeup field from struct gpio_bank\n gpio/omap: remove suspend_wakeup field from struct gpio_bank\n gpio/omap: remove saved_fallingdetect, saved_risingdetect\n gpio/omap: remove virtual_irq_start variable\n ...\n\nConflicts:\n\tdrivers/gpio/gpio-samsung.c\n" }, { "commit": "c7523a7c88db637d66841018532cb4b3ab6ab0a8", "tree": "cec08263a493831d43e17d4daa633e2a6b09480e", "parents": [ "2f78d8e249973f1eeb88315e6444e616c60177ae", "b80fe1015be4e3c926d8eb4cc6a340fdd22a43e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer updates from Thomas Gleixner.\n\nVarious trivial conflict fixups in arch Kconfig due to addition of\nunrelated entries nearby. And one slightly more subtle one for sparc32\n(new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas.\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)\n timekeeping: Fix a few minor newline issues.\n time: remove obsolete declaration\n ntp: Fix a stale comment and a few stray newlines.\n ntp: Correct TAI offset during leap second\n timers: Fixup the Kconfig consolidation fallout\n x86: Use generic time config\n unicore32: Use generic time config\n um: Use generic time config\n tile: Use generic time config\n sparc: Use: generic time config\n sh: Use generic time config\n score: Use generic time config\n s390: Use generic time config\n openrisc: Use generic time config\n powerpc: Use generic time config\n mn10300: Use generic time config\n mips: Use generic time config\n microblaze: Use generic time config\n m68k: Use generic time config\n m32r: Use generic time config\n ...\n" }, { "commit": "ab11ca34eea8fda7a1a9302d86f6ef6108ffd68f", "tree": "987ec6c263f3dfa4a7a6f9ce4d5ece47cbc12e29", "parents": [ "f9369910a6225b8d4892c3f20ae740a711cd5ace", "71006fb22b0f5a2045605b3887ee99a0e9adafe4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:21:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:21:51 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 updates from Mauro Carvalho Chehab:\n - some V4L2 API updates needed by embedded devices\n - DVB API extensions for ATSC-MH delivery system, used in US for mobile\n TV\n - new tuners for fc0011/0012/0013 and tua9001\n - a new dvb driver for af9033/9035\n - a new ATSC-MH frontend (lg2160)\n - new remote controller keymaps\n - Removal of a few legacy webcam driver that got replaced by gspca on\n several kernel versions ago\n - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)\n - a new webcam sensor driver (smiapp)\n - a new video input driver for embedded (sta2x1xx)\n - several improvements, fixes, cleanups, etc inside the drivers.\n\nManually fix up conflicts due to err() -\u003e dev_err() conversion in\ndrivers/staging/media/easycap/easycap_main.c\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)\n [media] saa7134-cards: Remove a PCI entry added by mistake\n [media] radio-sf16fmi: add support for SF16-FMD\n [media] rc-loopback: remove duplicate line\n [media] patch for Asus My Cinema PS3-100 (1043:48cd)\n [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS\n [media] em28xx: simple comment fix\n [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2\n [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()\n [media] smiapp: Add support for 8-bit uncompressed formats\n [media] smiapp: Allow generic quirk registers\n [media] smiapp: Use non-binning limits if the binning limit is zero\n [media] smiapp: Initialise rval in smiapp_read_nvm()\n [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check\n [media] smiapp: Use 8-bit reads only before identifying the sensor\n [media] smiapp: Quirk for sensors that only do 8-bit reads\n [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client\n [media] smiapp: Allow using external clock from the clock framework\n [media] zl10353: change .read_snr() to report SNR as a 0.1 dB\n [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)\n [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try\n ...\n" }, { "commit": "a42c6ded827dbd396d2efde7530620be029a72d1", "tree": "ea3129404f32515a04497990a050b2cf73aa1d5d", "parents": [ "1227dd773d8d4e3983b4b751f9ffa0f41402fb7c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 14:44:37 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 22:09:20 2012 -0400" }, "message": "move key_repace_session_keyring() into tracehook_notify_resume()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f9369910a6225b8d4892c3f20ae740a711cd5ace", "tree": "8650ff79d7607bceb35509c028400ecf1c317de0", "parents": [ "05f144a0d5c2207a0349348127f996e104ad7404", "415d04d08fec74b226c92c1fb54ad117c9c6bac4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 18:11:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 18:11:45 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull first series of signal handling cleanups from Al Viro:\n \"This is just the first part of the queue (about a half of it);\n assorted fixes all over the place in signal handling.\n\n This one ends with all sigsuspend() implementations switched to\n generic one (-\u003esaved_sigmask-based).\n\n With this, a bunch of assorted old buglets are fixed and most of the\n missing bits of NOTIFY_RESUME hookup are in place. Two more fixes sit\n in arm and um trees respectively, and there\u0027s a couple of broken ones\n that need obvious fixes - parisc and avr32 check TIF_NOTIFY_RESUME\n only on one of two codepaths; fixes for that will happen in the next\n series\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (55 commits)\n unicore32: if there\u0027s no handler we need to restore sigmask, syscall or no syscall\n xtensa: add handling of TIF_NOTIFY_RESUME\n microblaze: drop \u0027oldset\u0027 argument of do_notify_resume()\n microblaze: handle TIF_NOTIFY_RESUME\n score: add handling of NOTIFY_RESUME to do_notify_resume()\n m68k: add TIF_NOTIFY_RESUME and handle it.\n sparc: kill ancient comment in sparc_sigaction()\n h8300: missing checks of __get_user()/__put_user() return values\n frv: missing checks of __get_user()/__put_user() return values\n cris: missing checks of __get_user()/__put_user() return values\n powerpc: missing checks of __get_user()/__put_user() return values\n sh: missing checks of __get_user()/__put_user() return values\n sparc: missing checks of __get_user()/__put_user() return values\n avr32: struct old_sigaction is never used\n m32r: struct old_sigaction is never used\n xtensa: xtensa_sigaction doesn\u0027t exist\n alpha: tidy signal delivery up\n score: don\u0027t open-code force_sigsegv()\n cris: don\u0027t open-code force_sigsegv()\n blackfin: don\u0027t open-code force_sigsegv()\n ...\n" }, { "commit": "644473e9c60c1ff4f6351fed637a6e5551e3dce7", "tree": "10316518bedc735a2c6552886658d69dfd9f1eb0", "parents": [ "fb827ec68446c83e9e8754fa9b55aed27ecc4661", "4b06a81f1daee668fbd6de85557bfb36dd36078f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:42:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:42:39 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace enhancements from Eric Biederman:\n \"This is a course correction for the user namespace, so that we can\n reach an inexpensive, maintainable, and reasonably complete\n implementation.\n\n Highlights:\n - Config guards make it impossible to enable the user namespace and\n code that has not been converted to be user namespace safe.\n\n - Use of the new kuid_t type ensures the if you somehow get past the\n config guards the kernel will encounter type errors if you enable\n user namespaces and attempt to compile in code whose permission\n checks have not been updated to be user namespace safe.\n\n - All uids from child user namespaces are mapped into the initial\n user namespace before they are processed. Removing the need to add\n an additional check to see if the user namespace of the compared\n uids remains the same.\n\n - With the user namespaces compiled out the performance is as good or\n better than it is today.\n\n - For most operations absolutely nothing changes performance or\n operationally with the user namespace enabled.\n\n - The worst case performance I could come up with was timing 1\n billion cache cold stat operations with the user namespace code\n enabled. This went from 156s to 164s on my laptop (or 156ns to\n 164ns per stat operation).\n\n - (uid_t)-1 and (gid_t)-1 are reserved as an internal error value.\n Most uid/gid setting system calls treat these value specially\n anyway so attempting to use -1 as a uid would likely cause\n entertaining failures in userspace.\n\n - If setuid is called with a uid that can not be mapped setuid fails.\n I have looked at sendmail, login, ssh and every other program I\n could think of that would call setuid and they all check for and\n handle the case where setuid fails.\n\n - If stat or a similar system call is called from a context in which\n we can not map a uid we lie and return overflowuid. The LFS\n experience suggests not lying and returning an error code might be\n better, but the historical precedent with uids is different and I\n can not think of anything that would break by lying about a uid we\n can\u0027t map.\n\n - Capabilities are localized to the current user namespace making it\n safe to give the initial user in a user namespace all capabilities.\n\n My git tree covers all of the modifications needed to convert the core\n kernel and enough changes to make a system bootable to runlevel 1.\"\n\nFix up trivial conflicts due to nearby independent changes in fs/stat.c\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (46 commits)\n userns: Silence silly gcc warning.\n cred: use correct cred accessor with regards to rcu read lock\n userns: Convert the move_pages, and migrate_pages permission checks to use uid_eq\n userns: Convert cgroup permission checks to use uid_eq\n userns: Convert tmpfs to use kuid and kgid where appropriate\n userns: Convert sysfs to use kgid/kuid where appropriate\n userns: Convert sysctl permission checks to use kuid and kgids.\n userns: Convert proc to use kuid/kgid where appropriate\n userns: Convert ext4 to user kuid/kgid where appropriate\n userns: Convert ext3 to use kuid/kgid where appropriate\n userns: Convert ext2 to use kuid/kgid where appropriate.\n userns: Convert devpts to use kuid/kgid where appropriate\n userns: Convert binary formats to use kuid/kgid where appropriate\n userns: Add negative depends on entries to avoid building code that is userns unsafe\n userns: signal remove unnecessary map_cred_ns\n userns: Teach inode_capable to understand inodes whose uids map to other namespaces.\n userns: Fail exec for suid and sgid binaries with ids outside our user namespace.\n userns: Convert stat to return values mapped from kuids and kgids\n userns: Convert user specfied uids and gids in chown into kuids and kgid\n userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs\n ...\n" }, { "commit": "d5b4bb4d103cd601d8009f2d3a7e44586c9ae7cc", "tree": "0f3b6da2b66fc7a4278764982279c2815c913010", "parents": [ "c80ddb526331a72c9e9d1480f85f6fd7c74e3d2d", "bb8187d35f820671d6dd76700d77a6b55f95e2c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "message": "Merge branch \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull the MCA deletion branch from Paul Gortmaker:\n \"It was good that we could support MCA machines back in the day, but\n realistically, nobody is using them anymore. They were mostly limited\n to 386-sx 16MHz CPU and some 486 class machines and never more than\n 64MB of RAM. Even the enthusiast hobbyist community seems to have\n dried up close to ten years ago, based on what you can find searching\n various websites dedicated to the relatively short lived hardware.\n\n So lets remove the support relating to CONFIG_MCA. There is no point\n carrying this forward, wasting cycles doing routine maintenance on it;\n wasting allyesconfig build time on validating it, wasting I/O on git\n grep\u0027ping over it, and so on.\"\n\nLet\u0027s see if anybody screams. It generally has compiled, and James\nBottomley pointed out that there was a MCA extension from NCR that\nallowed for up to 4GB of memory and PPro-class machines. So in *theory*\nthere may be users out there.\n\nBut even James (technically listed as a maintainer) doesn\u0027t actually\nhave a system, and while Alan Cox claims to have a machine in his cellar\nthat he offered to anybody who wants to take it off his hands, he didn\u0027t\nargue for keeping MCA support either.\n\nSo we could bring it back. But somebody had better speak up and talk\nabout how they have actually been using said MCA hardware with modern\nkernels for us to do that. And David already took the patch to delete\nall the networking driver code (commit a5e371f61ad3: \"drivers/net:\ndelete all code/drivers depending on CONFIG_MCA\").\n\n* \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n MCA: delete all remaining traces of microchannel bus support.\n scsi: delete the MCA specific drivers and driver code\n serial: delete the MCA specific 8250 support.\n arm: remove ability to select CONFIG_MCA\n" }, { "commit": "0bd3fbd4abeafa19ae0302d25194468b022d1a56", "tree": "1fc34b25666c97b85dfb7199e48b2e074ffde264", "parents": [ "0b87da68a0f0a7bf7f7446cf64f92e672bd68ef8", "ef45b834319f8a18f257a40ba4bce6b829ef1708" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:59:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:59:10 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto updates from Herbert Xu:\n - New cipher/hash driver for ARM ux500.\n - Code clean-up for aesni-intel.\n - Misc fixes.\n\nFixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite\nfrankly some of it made no sense at all (the pull brought in a\ndeclaration for the dbx500_add_platform_device_noirq() function, which\nneither exists nor is used anywhere).\n\nAlso some trivial add-add context conflicts in the Kconfig file in\ndrivers/{char/hw_random,crypto}/\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: aesni-intel - move more common code to ablk_init_common\n crypto: aesni-intel - use crypto_[un]register_algs\n crypto: ux500 - Cleanup hardware identification\n crypto: ux500 - Update DMA handling for 3.4\n mach-ux500: crypto - core support for CRYP/HASH module.\n crypto: ux500 - Add driver for HASH hardware\n crypto: ux500 - Add driver for CRYP hardware\n hwrng: Kconfig - modify default state for atmel-rng driver\n hwrng: omap - use devm_request_and_ioremap\n crypto: crypto4xx - move up err_request_irq label\n crypto, xor: Sanitize checksumming function selection output\n crypto: caam - add backward compatible string sec4.0\n" }, { "commit": "2e341ca686042aa464efa755447e7bcee91d1eb6", "tree": "c6b16b6b6a6e871fa04396cb2c7eb759bcad5be3", "parents": [ "927ad551031798d4cba49766549600bbb33872d7", "85e184e4c3cd3e2285ceab91ff8f0cac094e8a85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:05:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:05:43 2012 -0700" }, "message": "Merge tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound updates from Takashi Iwai:\n \"This is the first big chunk for 3.5 merges of sound stuff.\n\n There are a few big changes in different areas. First off, the\n streaming logic of USB-audio endpoints has been largely rewritten for\n the better support of \"implicit feedback\". If anything about USB got\n broken, this change has to be checked.\n\n For HD-audio, the resume procedure was changed; instead of delaying\n the resume of the hardware until the first use, now waking up\n immediately at resume. This is for buggy BIOS.\n\n For ASoC, dynamic PCM support and the improved support for digital\n links between off-SoC devices are major framework changes.\n\n Some highlights are below:\n\n * HD-audio\n - Avoid accesses of invalid pin-control bits that may stall the codec\n - V-ref setup cleanups\n - Fix the races in power-saving code\n - Fix the races in codec cache hashes and connection lists\n - Split some common codes for BIOS auto-parser to hda_auto_parser.c\n - Changed the PM resume code to wake up immediately for buggy BIOS\n - Creative SoundCore3D support\n - Add Conexant CX20751/2/3/4 codec support\n\n * ASoC\n - Dynamic PCM support, allowing support for SoCs with internal\n routing through components with tight sequencing and formatting\n constraints within their internal paths or where there are multiple\n components connected with CPU managed DMA controllers inside the\n SoC.\n - Greatly improved support for direct digital links between off-SoC\n devices, providing a much simpler way of connecting things like\n digital basebands to CODECs.\n - Much more fine grained and robust locking, cleaning up some of the\n confusion that crept in with multi-component.\n - CPU support for nVidia Tegra 30 I2S and audio hub controllers and\n ST-Ericsson MSP I2S controolers\n - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,\n Texas Instruments LM49453.\n - Some regmap changes needed by the Tegra I2S driver.\n - mc13783 audio support.\n\n * Misc\n - Rewrite with module_pci_driver()\n - Xonar DGX support for snd-oxygen\n - Improvement of packet handling in snd-firewire driver\n - New USB-endpoint streaming logic\n - Enhanced M-audio FTU quirks and relevant cleanups\n - Increment the support of OSS devices to 256\n - snd-aloop accuracy improvement\n\n There are a few more pending changes for 3.5, but they will be sent\n slightly later as partly depending on the changes of DRM.\"\n\nFix up conflicts in regmap (due to duplicate patches, with some further\nupdates then having already come in from the regmap tree). Also some\nfairly trivial context conflicts in the imx and mcx soc drivers.\n\n* tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)\n ALSA: snd-usb: fix stream info output in /proc\n ALSA: pcm - Add proper state checks to snd_pcm_drain()\n ALSA: sh: Fix up namespace collision in sh_dac_audio.\n ALSA: hda/realtek - Fix unused variable compile warning\n ASoC: sh: fsi: enable chip specific data transfer mode\n ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()\n ASoC: sh: fsi: use same format for IN/OUT\n ASoC: sh: fsi: add fsi_version() and removed meaningless version check\n ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC\n ASoC: tegra: Add machine driver for WM8753 codec\n ALSA: hda - Fix possible races of accesses to connection list array\n ASoC: OMAP: HDMI: Introduce codec\n ARM: mx31_3ds: Add sound support\n ASoC: imx-mc13783 cleanup\n mx31moboard: Add sound support\n ASoC: mc13783 codec cleanups\n ASoC: add imx-mc13783 sound support\n ASoC: Add mc13783 codec\n mfd: mc13xxx: add codec platform data\n ASoC: don\u0027t flip master of DT-instantiated DAI links\n ...\n" }, { "commit": "9dde0ae3769875ec1370cb316e50c54b57d52c1a", "tree": "c0d7967cd121cddf66ebeff5777007f557f86065", "parents": [ "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Wed May 23 18:19:51 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 23 21:22:43 2012 +0200" }, "message": "ixp4xx: fix compilation by adding gpiolib support\n\nOnce again, ixp4xx no longer even compiles. This patch fixes the issue\nby converting over to gpiolib. This patch was first made by Imre and\nposted by Marc, and I added in Russell\u0027s suggestion to empty the gpio\nheader file.\n\nThis fix should also go for 3.1, 3.2, 3.3, and 3.4.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ec0d7f18ab7b5097d7c0c8f3d909ca1031b9d5cd", "tree": "7d62c924592145f819ecaa5d60460a05a10dfdbd", "parents": [ "269af9a1a08d368b46d72e74126564d04c354f7e", "1dcc8d7ba235a316a056f993e88f0d18b92c60d9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "message": "Merge branch \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull fpu state cleanups from Ingo Molnar:\n \"This tree streamlines further aspects of FPU handling by eliminating\n the prepare_to_copy() complication and moving that logic to\n arch_dup_task_struct().\n\n It also fixes the FPU dumps in threaded core dumps, removes and old\n (and now invalid) assumption plus micro-optimizes the exit path by\n avoiding an FPU save for dead tasks.\"\n\nFixed up trivial add-add conflict in arch/sh/kernel/process.c that came\nin because we now do the FPU handling in arch_dup_task_struct() rather\nthan the legacy (and now gone) prepare_to_copy().\n\n* \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, fpu: drop the fpu state during thread exit\n x86, xsave: remove thread_has_fpu() bug check in __sanitize_i387_state()\n coredump: ensure the fpu state is flushed for proper multi-threaded core dump\n fork: move the real prepare_to_copy() users to arch_dup_task_struct()\n" }, { "commit": "e8650a08232e75274304b812ff04cfce9af9671c", "tree": "0609c942e6ca99016e788ff2ee2bbed1bb9215a4", "parents": [ "3c2c4b73aa79e4a1b601710b59e092441175f4bb", "f70d4a95edc7da87f39cd8b603ba131df2c198ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial updates from Jiri Kosina:\n \"As usual, it\u0027s mostly typo fixes, redundant code elimination and some\n documentation updates.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)\n edac, mips: don\u0027t change code that has been removed in edac/mips tree\n xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer\n lib: Change mail address of Oskar Schirmer\n net: Change mail address of Oskar Schirmer\n arm/m68k: Change mail address of Sebastian Hess\n i2c: Change mail address of Oskar Schirmer\n net: Fix tcp_build_and_update_options comment in struct tcp_sock\n atomic64_32.h: fix parameter naming mismatch\n Kconfig: replace \"--- help ---\" with \"---help---\"\n c2port: fix bogus Kconfig \"default no\"\n edac: Fix spelling errors.\n qla1280: Remove redundant NULL check before release_firmware() call\n remoteproc: remove redundant NULL check before release_firmware()\n qla2xxx: Remove redundant NULL check before release_firmware() call.\n aic94xx: Get rid of redundant NULL check before release_firmware() call\n tehuti: delete redundant NULL check before release_firmware()\n qlogic: get rid of a redundant test for NULL before call to release_firmware()\n bna: remove redundant NULL test before release_firmware()\n tg3: remove redundant NULL test before release_firmware() call\n typhoon: get rid of redundant conditional before all to release_firmware()\n ...\n" }, { "commit": "2ff2b289a695807e291e1ed9f639d8a3ba5f4254", "tree": "e4b7f44e5cc1582ba2be8aeba221f4841f4c86a6", "parents": [ "88d6ae8dc33af12fe1c7941b1fae2767374046fd", "73787190d04a34e6da745da893b3ae8bedde418f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf changes from Ingo Molnar:\n \"Lots of changes:\n\n - (much) improved assembly annotation support in perf report, with\n jump visualization, searching, navigation, visual output\n improvements and more.\n\n - kernel support for AMD IBS PMU hardware features. Notably \u0027perf\n record -e cycles:p\u0027 and \u0027perf top -e cycles:p\u0027 should work without\n skid now, like PEBS does on the Intel side, because it takes\n advantage of IBS transparently.\n\n - the libtracevents library: it is the first step towards unifying\n tracing tooling and perf, and it also gives a tracing library for\n external tools like powertop to rely on.\n\n - infrastructure: various improvements and refactoring of the UI\n modules and related code\n\n - infrastructure: cleanup and simplification of the profiling\n targets code (--uid, --pid, --tid, --cpu, --all-cpus, etc.)\n\n - tons of robustness fixes all around\n\n - various ftrace updates: speedups, cleanups, robustness\n improvements.\n\n - typing \u0027make\u0027 in tools/ will now give you a menu of projects to\n build and a short help text to explain what each does.\n\n - ... and lots of other changes I forgot to list.\n\n The perf record make bzImage + perf report regression you reported\n should be fixed.\"\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (166 commits)\n tracing: Remove kernel_lock annotations\n tracing: Fix initial buffer_size_kb state\n ring-buffer: Merge separate resize loops\n perf evsel: Create events initially disabled -- again\n perf tools: Split term type into value type and term type\n perf hists: Fix callchain ip printf format\n perf target: Add uses_mmap field\n ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER\n ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()\n ftrace: Make ftrace_modify_all_code() global for archs to use\n ftrace: Return record ip addr for ftrace_location()\n ftrace: Consolidate ftrace_location() and ftrace_text_reserved()\n ftrace: Speed up search by skipping pages by address\n ftrace: Remove extra helper functions\n ftrace: Sort all function addresses, not just per page\n tracing: change CPU ring buffer state from tracing_cpumask\n tracing: Check return value of tracing_dentry_percpu()\n ring-buffer: Reset head page before running self test\n ring-buffer: Add integrity check at end of iter read\n ring-buffer: Make addition of pages in ring buffer atomic\n ...\n" }, { "commit": "fb09bafda67041b74a668dc9d77735e36bd33d3b", "tree": "2dd32b65062a95045468fdcab366ecdb8e4fcac6", "parents": [ "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "c3c6cc91b0ae7b3d598488ad0b593bafba4a0817" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "message": "Merge tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree changes from Greg Kroah-Hartman:\n \"Here is the big staging tree pull request for the 3.5-rc1 merge\n window.\n\n Loads of changes here, and we just narrowly added more lines than we\n added:\n 622 files changed, 28356 insertions(+), 26059 deletions(-)\n\n But, good news is that there is a number of subsystems that moved out\n of the staging tree, to their respective \"real\" portions of the\n kernel.\n\n Code that moved out was:\n\t- iio core code\n\t- mei driver\n\t- vme core and bridge drivers\n\n There was one broken network driver that moved into staging as a step\n before it is removed from the tree (pc300), and there was a few new\n drivers added to the tree:\n\t- new iio drivers\n\t- gdm72xx wimax USB driver\n\t- ipack subsystem and 2 drivers\n\n All of the movements around have acks from the various subsystem\n maintainers, and all of this has been in the linux-next tree for a\n while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFixed up various trivial conflicts, along with a non-trivial one found\nin -next and pointed out by Olof Johanssen: a clean - but incorrect -\nmerge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually\nas per Stephen Rothwell.\n\n* tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)\n Staging: bcm: Remove two unused variables from Adapter.h\n Staging: bcm: Removes the volatile type definition from Adapter.h\n Staging: bcm: Rename all \"INT\" to \"int\" in Adapter.h\n Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h\n Staging: bcm: Correctly format all comments in Adapter.h\n Staging: bcm: Fix all whitespace issues in Adapter.h\n Staging: bcm: Properly format braces in Adapter.h\n Staging: ipack/bridges/tpci200: remove unneeded casts\n Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant\n Staging: ipack: remove board_name and bus_name fields from struct ipack_device\n Staging: ipack: improve the register of a bus and a device in the bus.\n staging: comedi: cleanup all the comedi_driver \u0027detach\u0027 functions\n staging: comedi: remove all \u0027default N\u0027 in Kconfig\n staging: line6/config.h: Delete unused header\n staging: gdm72xx depends on NET\n staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices\n staging: drm/omap: initial dmabuf/prime import support\n staging: drm/omap: dmabuf/prime mmap support\n pstore/ram: Add ECC support\n pstore/ram: Switch to persistent_ram routines\n ...\n" }, { "commit": "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "tree": "39197121b6ef8cddaa0f4057fe24b4ced58e8982", "parents": [ "5d4e2d08e7fdf7339f84a1c670d296a77e02f881", "59bd234b72fc29887839d792b7d6c7e8d2a577a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "message": "Merge tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY updates from Greg Kroah-Hartman:\n \"Here\u0027s the big TTY/serial driver pull request for the 3.5-rc1 merge\n window.\n\n Nothing major in here, just lots of incremental changes from Alan and\n Jiri reworking some tty core things to behave better and to get a more\n solid grasp on some of the nasty tty locking issues.\n\n There are a few tty and serial driver updates in here as well.\n\n All of this has been in the linux-next releases for a while with no\n problems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (115 commits)\n serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.\n serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.\n serial: bfin_uart: narrow the reboot condition in DMA tx interrupt\n serial: bfin_uart: Adapt bf5xx serial driver to bf60x serial4 controller.\n Revert \"serial_core: Update buffer overrun statistics.\"\n tty: hvc_xen: NULL dereference on allocation failure\n tty: Fix LED error return\n tty: Allow uart_register/unregister/register\n tty: move global ldisc idle waitqueue to the individual ldisc\n serial8250-em: Add DT support\n serial8250-em: clk_get() IS_ERR() error handling fix\n serial_core: Update buffer overrun statistics.\n tty: drop the pty lock during hangup\n cris: fix missing tty arg in wait_event_interruptible_tty call\n tty/amiserial: Add missing argument for tty_unlock()\n tty_lock: Localise the lock\n pty: Lock the devpts bits privately\n tty_lock: undo the old tty_lock use on the ctty\n serial8250-em: Emma Mobile UART driver V2\n Add missing call to uart_update_timeout()\n ...\n" }, { "commit": "a481991467d38afb43c3921d5b5b59ccb61b04ba", "tree": "a4b0b9a14da6fd5ef7b9b512bb32dbfcfcf2cd71", "parents": [ "f6a26ae7699416d86bea8cb68ce413571e9cab3c", "cda4db53e9c28061c100400e1a4d273ea61dfba9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:50:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:50:46 2012 -0700" }, "message": "Merge tag \u0027usb-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB 3.5-rc1 changes from Greg Kroah-Hartman:\n \"Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.\n\n It\u0027s touches a lot of different parts of the kernel, all USB drivers,\n due to some API cleanups (getting rid of the ancient err() macro) and\n some changes that are needed for USB 3.0 power management updates.\n\n There are also lots of new drivers, pimarily gadget, but others as\n well. We deleted a staging driver, which was nice, and finally\n dropped the obsolete usbfs code, which will make Al happy to never\n have to touch that again.\n\n There were some build errors in the tree that linux-next found a few\n days ago, but those were fixed by the most recent changes (all were\n due to us not building with CONFIG_PM disabled.)\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027usb-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)\n xhci: Fix DIV_ROUND_UP compile error.\n xhci: Fix compile with CONFIG_USB_SUSPEND\u003dn\n USB: Fix core compile with CONFIG_USB_SUSPEND\u003dn\n brcm80211: Fix compile error for .disable_hub_initiated_lpm.\n Revert \"USB: EHCI: work around bug in the Philips ISP1562 controller\"\n MAINTAINERS: Add myself as maintainer to the USB PHY Layer\n USB: EHCI: fix command register configuration lost problem\n USB: Remove races in devio.c\n USB: ehci-platform: remove update_device\n USB: Disable hub-initiated LPM for comms devices.\n xhci: Add Intel U1/U2 timeout policy.\n xhci: Add infrastructure for host-specific LPM policies.\n USB: Add macros for interrupt endpoint types.\n xhci: Reserve one command for USB3 LPM disable.\n xhci: Some Evaluate Context commands must succeed.\n USB: Disable USB 3.0 LPM in critical sections.\n USB: Add support to enable/disable USB3 link states.\n USB: Allow drivers to disable hub-initiated LPM.\n USB: Calculate USB 3.0 exit latencies for LPM.\n USB: Refactor code to set LPM support flag.\n ...\n\nConflicts:\n\tarch/arm/mach-exynos/mach-nuri.c\n\tarch/arm/mach-exynos/mach-universal_c210.c\n\tdrivers/net/wireless/ath/ath6kl/usb.c\n" }, { "commit": "f6a26ae7699416d86bea8cb68ce413571e9cab3c", "tree": "e91b7a7c7513151fe583721f7435cc9f5cdc4f42", "parents": [ "cdd3a354a05b0c33fe33ab11a0fb0838396cad19", "48a5765e5104f1afd22c75c5030af3a6cf24b4c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 13:32:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 13:32:53 2012 -0700" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc board specific changes from Olof Johansson:\n \"While we generally attempt to get rid of board specific files and\n replace them with device tree based descriptions, a lot of platforms\n have not come that far:\n\n In shmobile, we add two new board files because their recently started\n effort to add DT support has not proceeded enough to use it for all of\n the important hardware.\n\n In Kirkwood, we are adding support for new boards with a combination\n of DT and board file contents in multiple cases.\n\n pxa/mmp and imx are extending support for existing board files but not\n adding new ones.\"\n\nFix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)\n ARM: shmobile: fix smp build\n ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree\n kirkwood: Add iconnect support\n orion/kirkwood: create a generic function for gpio led blinking\n kirkwood/orion: fix orion_gpio_set_blink\n ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt\n kirkwood: Allow nand to be configured via. devicetree\n mtd: Add orion_nand devicetree bindings\n ARM: kirkwood: Basic support for DNS-320 and DNS-325\n ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva\n ARM: mach-shmobile: Use DT_MACHINE for KZM9G\n ARM: pxa: hx4700: Add Synaptics NavPoint touchpad\n ARM: pxa: Use REGULATOR_SUPPLY macro\n ARM: mach-shmobile: kzm9g: enable SMP boot\n ARM: mach-shmobile: kzm9g: defconfig update\n ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key\n ARM: mach-shmobile: kzm9g: add SDHI support\n ARM: mach-shmobile: kzm9g: add MMCIF support\n ARM: mach-shmobile: kzm9g: correct screen direction\n ARM: mach-shmobile: sh73a0.h: add GPIO_NR\n ...\n" }, { "commit": "cdd3a354a05b0c33fe33ab11a0fb0838396cad19", "tree": "ea2c87bbc2dc5865a97e73e201661d69937b45d5", "parents": [ "813a95e5b4fa936bbde10ef89188932745dcd7f4", "ada2e35defe6c6f0a986ec8147e47726fbd0e7b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:41:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:41:01 2012 -0700" }, "message": "Merge tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc power management changes from Olof Johansson:\n \"Power management changes here are mostly for the omap platform, but\n also include cpuidle changes for ux500 and suspend/resume code for\n mmp.\"\n\n* tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset\n ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database\n ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports\n ARM: OMAP4: hwmod data: I2C: add flag for context restore\n ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports\n ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod\n ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod\n ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data\n ARM: OMAP2+: HDQ1W: add custom reset function\n ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420\n arm: omap3: clockdomain data: Remove superfluous commas from gfx_sgx_3xxx_wkdeps[]\n ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API\n ARM: OMAP3: clock data: add clockdomain for HDQ functional clock\n ARM: OMAP3+: dpll: Configure autoidle mode only if it\u0027s supported\n ARM: OMAP2+: dmtimer: cleanup iclk usage\n ARM: OMAP4+: Add prm and cm base init function.\n ARM: OMAP2/3: Add idle_st bits for ST_32KSYNC timer to prcm-common header\n ARM: OMAP3: Fix CM register bit masks\n ARM: OMAP: clock: convert AM3517/3505 detection/flags to AM35xx\n ARM: OMAP3: clock data: treat all AM35x devices the same\n ...\n" }, { "commit": "813a95e5b4fa936bbde10ef89188932745dcd7f4", "tree": "571ca345861ffb89b45fabe26fcab4e133c8537b", "parents": [ "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "f3f08dcb9965f42378851ce888fb7539607712e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "message": "Merge tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm soc-specific pinctrl changes from Olof Johansson:\n \"With this, five platforms are moving to the relatively new pinctrl\n subsystem for their pin management, replacing the older soc specific\n in-kernel interfaces with common code.\n\n There is quite a bit of net addition of code for each platform being\n added to the pinctrl subsystem. But the payback comes later when\n adding new boards can be done by only providing new device trees\n instead.\"\n\nFix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}\n\n* tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n mtd: nand: gpmi: fix compile error caused by pinctrl call\n ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig\n ARM: nomadik: enable PINCTRL_NOMADIK where needed\n ARM: mxs: enable pinctrl support\n video: mxsfb: adopt pinctrl support\n ASoC: mxs-saif: adopt pinctrl support\n i2c: mxs: adopt pinctrl support\n mtd: nand: gpmi: adopt pinctrl support\n mmc: mxs-mmc: adopt pinctrl support\n serial: mxs-auart: adopt pinctrl support\n serial: amba-pl011: adopt pinctrl support\n spi/imx: adopt pinctrl support\n i2c: imx: adopt pinctrl support\n can: flexcan: adopt pinctrl support\n net: fec: adopt pinctrl support\n ARM: ux500: switch MSP to using pinctrl for pins\n ARM: ux500: alter MSP registration to return a device pointer\n ARM: ux500: switch to using pinctrl for uart0\n ARM: ux500: delete custom pin control system\n ARM: ux500: switch over to Nomadik pinctrl driver\n ...\n" }, { "commit": "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "tree": "bf3e38862b6e4e4c416a6e075b614f2c4befe3e9", "parents": [ "b324c67d4800e59171f48d9ddab6cbfb59110482", "0804dcb2afdcf014947ee98264041765f580d43f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:32:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:32:42 2012 -0700" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull support for new arm SoCs from Olof Johansson:\n \"Three new system-on-chip models are supported: the st-ericsson u9540\n in ux500, the sam9n12 in at91 and the emma ev2 in shmobile.\n\n Emma is a little bit special because it is completely unrelated to the\n classic shmobile models, but the new Renesas rmobile SoCs are a\n combination of things from both Emma and shmobile, so it was decided\n to have them all live in one directory.\n\n This also contains updates to existing shmobile soc code as well as\n some related board changes due to dependencies.\"\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)\n mach-shmobile: Use DT_MACHINE for KZM9D V3\n mach-shmobile: Emma Mobile EV2 DT support V3\n mach-shmobile: KZM9D board Ethernet support V3\n mach-shmobile: Emma Mobile EV2 GPIO support V3\n mach-shmobile: Emma Mobile EV2 SMP support V3\n mach-shmobile: KZM9D board support V3\n mach-shmobile: Emma Mobile EV2 SoC base support V3\n gpio: Emma Mobile GPIO driver V2\n ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict\n ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s\n ARM: mach-shmobile: clock-r8a7740: add MMCIF clock\n ARM: mach-shmobile: clock-r8a7740: add SDHI clock\n ARM: mach-shmobile: clock-r8a7740: add USB clock\n ARM: mach-shmobile: clock-r8a7740: add FSI clock\n ARM: mach-shmobile: r8a7740: cleanup I2C workaround method\n ARM: mach-shmobile: r8a7740: add gpio_irq support\n ARM: mach-shmobile: sh7372: Add FSI DMAEngine support\n ARM / mach-shmobile: Use preset_lpj with calibrate_delay()\n ARM: ux500: ioremap differences for DB9540\n ARM: ux500: core U9540 support\n ...\n" }, { "commit": "b324c67d4800e59171f48d9ddab6cbfb59110482", "tree": "a16509a710e76fa24c01514b60aed06b7db13716", "parents": [ "8dca6010d44cc722a94dc6da96560f9083dac782", "396d81cd0fe12ce5d1f6d159f093f9315d2837bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:30:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:30:52 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull device tree conversions for arm-soc, part 1, from Olof Johansson:\n \"The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game\n of booting using device trees, which is a great step forward for them.\n at91 and spear have pretty much completed this process with a huge\n amount of work being put into at91. The other platforms are\n continuing the process.\n\n We finally start to see the payback on this investment, as new\n machines are getting supported purely by adding a .dts source file\n that can be completely independent of the kernel source.\"\n\nFix up trivial conflict in arch/arm/Kconfig\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)\n ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files\n arm/dts: omap4-panda: Add LEDs support\n arm/dts: omap4-sdp: Add LEDs support\n arm/dts: twl4030: Add twl4030-gpio node\n OMAP4: devices: Do not create mcpdm device if the dtb has been provided\n OMAP4: devices: Do not create dmic device if the dtb has been provided\n Documentation: update docs for mmp dt\n ARM: dts: refresh dts file for arch mmp\n ARM: mmp: support pxa910 with device tree\n ARM: mmp: support mmp2 with device tree\n gpio: pxa: parse gpio from DTS file\n ARM: mmp: support DT in timer\n ARM: mmp: support DT in irq\n ARM: mmp: append CONFIG_MACH_MMP2_DT\n ARM: mmp: fix build issue on mmp with device tree\n ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree\n ARM: ux500: Disable SMSC911x platform code registration when DT is enabled\n ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement\n ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball\n ARM: SPEAr3xx: Correct keyboard data passed from DT\n ...\n" }, { "commit": "8dca6010d44cc722a94dc6da96560f9083dac782", "tree": "c804c272bc3d07a05459c2688e4b1c8b141d561c", "parents": [ "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "74c437532b8b5db53509963ec38e8424c56ff6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:27:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:27:39 2012 -0700" }, "message": "Merge tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull non-critical arm-soc bug fixes from Olof Johansson:\n \"These bug fixes were not important enough to have them included in the\n v3.4 release, mostly because they cover harmless warnings or\n unrealistic configurations. Instead we queue them up to be picked up\n in the next merge window.\"\n\nFixed up trivial conflict in arch/arm/mach-omap2/board-omap4panda.c\n\n* tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: spear6xx: remove board selection options\n ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally\n ARM: OMAP2+: INTC: fix Kconfig option for TI81XX\n ARM: OMAP2+: remove incorrect irq_chip ack field\n ARM: OMAP4: Adding ID for OMAP4460 ES1.1\n ARM: OMAP4: panda: add statics to remove warnings\n ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox\n ARM: OMAP: fix trivial warnings for dspbridge\n arm: davinci: use for_each_set_bit_from\n ARM: OMAP4: hsmmc: check for null pointer\n ARM: OMAP1: fix compilation issue in board-sx1.c\n ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA\n ARM: davinci: da850-evm: fix section mismatch\n ARM: tegra: add pll_x freq table entry for 750MHz\n ARM: davinci: mark spi_board_info arguments as const\n ARM: davinci: fix incorrect pdctl next bit position\n" }, { "commit": "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "tree": "d500225e7a1c90a6bd17d3e63e2f6e781810db2b", "parents": [ "32b908eea9e5ecd1049008e134eadbfcd0da5e38", "0e896b1ddc1905df904df98c204bacf028219729" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull first batch of arm-soc cleanups from Olof Johansson:\n \"These cleanups are basically all over the place. The idea is to\n collect changes with minimal impact but large number of changes so we\n can avoid them from distracting in the diffstat in the other series.\n\n A significant number of lines get removed here, in particular because\n the ixp2000 and ixp23xx platforms get removed. These have never been\n extremely popular and have fallen into disuse over time with no active\n maintainer taking care of them. The u5500 soc never made it into a\n product, so we are removing it from the ux500 platform.\n\n Many good cleanups also went into the at91 and omap platforms, as has\n been the case for a number of releases.\"\n\nTrivial modify-delete conflicts in arch/arm/mach-{ixp2000,ixp23xx}\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (152 commits)\n ARM: clps711x: Cleanup IRQ handling\n ARM clps711x: Removed unused header mach/time.h\n ARM: clps711x: Added note about support EP731x CPU to Kconfig\n ARM: clps711x: Added missing register definitions\n ARM: clps711x: Used own subarch directory for store header file\n Dove: Fix Section mismatch warnings\n ARM: orion5x: ts78xx debugging changes\n ARM: orion5x: remove PM dependency from ts78xx\n ARM: orion5x: ts78xx fix NAND resource off by one\n ARM: orion5x: ts78xx whitespace cleanups\n Orion5x: Fix Section mismatch warnings\n Orion5x: Fix warning: struct pci_dev declared inside paramter list\n ARM: clps711x: Combine header files into one for clps711x-targets\n ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c\n ARM: S3C24XX: Use common macro to define resources on mach-osiris.c\n ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable\n ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c\n ARM: S5PV210: Use common macro to define resources on dev-audio.c\n ARM: S5PC100: Use common macro to define resources on dev-audio.c\n ARM: S5P64X0: Use common macro to define resources on dev-audio.c\n ...\n" }, { "commit": "0f51596bd39a5c928307ffcffc9ba07f90f42a8b", "tree": "b636403815316ecad2170092b70f1079df260a95", "parents": [ "61f6c7a47a2f84b7ba4b65240ffe9247df772b06", "4ce63fcd919c32d22528e54dcd89506962933719" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "message": "Merge branch \u0027for-next-arm-dma\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/dma-mapping.c\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "68f3f16d9ad0f1e28ab3fd0001ab5798c41f15a3", "tree": "fd023109413f5eb28b364663fdf4bf2eabca47d4", "parents": [ "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 21:42:32 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:52:30 2012 -0400" }, "message": "new helper: sigsuspend()\n\nguts of saved_sigmask-based sigsuspend/rt_sigsuspend. Takes\nkernel sigset_t *.\n\nOpen-coded instances replaced with calling it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "471368557a734c6c486ee757952c902b36e7fd01", "tree": "f192a77d2cb70b1d135e7be62418806e8c590a3e", "parents": [ "cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b", "e0d8ffd1df44518cb9ac9b1807d1f13cc100fc2f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:33:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:33:19 2012 -0700" }, "message": "Merge branch \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull core irq changes from Ingo Molnar:\n \"A collection of small fixes.\"\n\nBy Thomas Gleixner\n* \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n hexagon: Remove select of not longer existing Kconfig switches\n arm: Select core options instead of redefining them\n genirq: Do not consider disabled wakeup irqs\n genirq: Allow check_wakeup_irqs to notice level-triggered interrupts\n genirq: Be more informative on irq type mismatch\n genirq: Reject bogus threaded irq requests\n genirq: Streamline irq_action\n" }, { "commit": "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837", "tree": "2a2324b2572162059307db82f9238eeb25673a77", "parents": [ "226da0dbc84ed97f448523e2a4cb91c27fa68ed9", "203dacbdca977bedaba61ad2fca75d934060a5d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "message": "Merge branch \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull smp hotplug cleanups from Thomas Gleixner:\n \"This series is merily a cleanup of code copied around in arch/* and\n not changing any of the real cpu hotplug horrors yet. I wish I\u0027d had\n something more substantial for 3.5, but I underestimated the lurking\n horror...\"\n\nFix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and\narch/sparc/include/asm/thread_info_32.h\n\n* \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)\n um: Remove leftover declaration of alloc_task_struct_node()\n task_allocator: Use config switches instead of magic defines\n sparc: Use common threadinfo allocator\n score: Use common threadinfo allocator\n sh-use-common-threadinfo-allocator\n mn10300: Use common threadinfo allocator\n powerpc: Use common threadinfo allocator\n mips: Use common threadinfo allocator\n hexagon: Use common threadinfo allocator\n m32r: Use common threadinfo allocator\n frv: Use common threadinfo allocator\n cris: Use common threadinfo allocator\n x86: Use common threadinfo allocator\n c6x: Use common threadinfo allocator\n fork: Provide kmemcache based thread_info allocator\n tile: Use common threadinfo allocator\n fork: Provide weak arch_release_[task_struct|thread_info] functions\n fork: Move thread info gfp flags to header\n fork: Remove the weak insanity\n sh: Remove cpu_idle_wait()\n ...\n" }, { "commit": "ff8ce5f67ddca709fe59e6173f89260f0fdc2b22", "tree": "90d3ad380b290d251b54590be485b2ffb4528e5a", "parents": [ "4f6ade91532b5b05ea28219b891f12a3cec528cd", "4ab1056766a4e49f6b9ef324313dd1583f8f8f4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull core ARM updates from Russell King:\n \"This is the bulk of the core ARM updates for this merge window.\n Included in here is a different way to handle the VIVT cache flushing\n on context switch, which should allow scheduler folk to remove a\n special case in their core code.\n\n We have architectured timer support here, which is a set of timers\n specified by the ARM architecture for future SoCs. So we should see\n less variability in timer design going forward.\n\n The last big thing here is my cleanup to the way we handle PCI across\n ARM, fixing some oddities in some platforms which hadn\u0027t realised\n there was a way to deal with their private data already built in to\n our PCI backend.\n\n I\u0027ve also removed support for the ARMv3 architecture; it hasn\u0027t worked\n properly for years so it seems pointless to keep it around.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (47 commits)\n ARM: PCI: remove per-pci_hw list of buses\n ARM: PCI: dove/kirkwood/mv78xx0: use sys-\u003eprivate_data\n ARM: PCI: provide a default bus scan implementation\n ARM: PCI: get rid of pci_std_swizzle()\n ARM: PCI: versatile: fix PCI interrupt setup\n ARM: PCI: integrator: use common PCI swizzle\n ARM: 7416/1: LPAE: Remove unused L_PTE_(BUFFERABLE|CACHEABLE) macros\n ARM: 7415/1: vfp: convert printk\u0027s to pr_*\u0027s\n ARM: decompressor: avoid speculative prefetch from non-RAM areas\n ARM: Remove ARMv3 support from decompressor\n ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level\n ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs\n ARM: 7363/1: DEBUG_LL: limit early mapping to the minimum\n ARM: 7391/1: versatile: add some auxdata for device trees\n ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller\n AMBA: get rid of last two uses of NO_IRQ\n ARM: 7408/1: cacheflush: return error to userspace when flushing syscall fails\n ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held\n ARM: 7404/1: cmpxchg64: use atomic64 and local64 routines for cmpxchg64\n ARM: 7347/1: SCU: use cpu_logical_map for per-CPU low power mode\n ...\n" }, { "commit": "764e0da14fd7ac2d259d98d34ece0a87d32306c9", "tree": "3d1c3065ca2f140f065c15c0b9645703241c68e7", "parents": [ "bdebaf80a02b854381fe212e0dac13c8c8edac57" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 23:16:18 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 23:43:46 2012 +0200" }, "message": "timers: Fixup the Kconfig consolidation fallout\n\nSigh, I missed to check which architecture Kconfig files actually\ninclude the core Kconfig file. There are a few which did not. So we\nbroke them.\n\nInstead of adding the includes to those, we are better off to move the\ninclude to init/Kconfig like we did already with irqs and others.\n\nThis does not change anything for the architectures using the old\nstyle periodic timer mode. It just solves the build wreckage there.\n\nFor those architectures which use the clock events infrastructure it\nmoves the include of the core Kconfig file to \"General setup\" which is\na way more logical place than having it at random locations specified\nby the architecture specific Kconfigs.\n\nReported-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Anna-Maria Gleixner \u003canna-maria@glx-um.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "e47b65b032f2997aa0a7392ecdf656c86d4d7561", "tree": "801d2b42702da485506bcb19606489f0400a7c32", "parents": [ "8e95a53ba4b060e2d0d46575059ae96ea91a80fd" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon May 21 20:45:37 2012 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 12:50:12 2012 -0700" }, "message": "net: drop NET dependency from HAVE_BPF_JIT\n\nThere is no point having the NET dependency on the select target, as it\nforces all users to depend on NET to tell they support BPF_JIT. Move\nthe config option to the bottom of the file - this could be a nice place\nalso for future \"selectable\" config symbols.\n\nFix up all users to drop the dependency on NET now that it is not\nrequired to supress warnings for non-NET builds.\n\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nAcked-by: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "70b58d896b1b30e4b89d369fbeb244c0e952cf9f", "tree": "6518547e933ff0b2e85666b8498c2f9b8c8bfa0f", "parents": [ "7d181b9626057c1f4fb4d231a3c176271782f459" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 19 14:27:27 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:40:44 2012 -0400" }, "message": "arm: don\u0027t open-code ptrace_report_syscall()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7d181b9626057c1f4fb4d231a3c176271782f459", "tree": "0d2b973f77a85d1a177b529c4ffc05e47d0b5d4c", "parents": [ "fa18484d0947b976a769d15c83c50617493c81c1" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun May 06 04:10:18 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:40:20 2012 -0400" }, "message": "arm: bury unused _TIF_RESTORE_SIGMASK\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "fa18484d0947b976a769d15c83c50617493c81c1", "tree": "09845575b951b585d236101e67073b3e9ed4fb16", "parents": [ "6b5c8045ecc7e726cdaa2a9d9c8e5008050e1252" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 02 21:13:45 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:39:44 2012 -0400" }, "message": "arm: remove unused restart trampoline\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6b5c8045ecc7e726cdaa2a9d9c8e5008050e1252", "tree": "2bf168797818da579310adcd192765fcbe34ae87", "parents": [ "21c1176a72bd019d513b26e05d491a31b50b18d2" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 02 21:02:03 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:39:11 2012 -0400" }, "message": "arm: new way of handling ERESTART_RESTARTBLOCK\n\nnew \"syscall start\" flag; handled in syscall_trace() by switching\nsyscall number to that of syscall_restart(2). Restarts of that\nkind (ERESTART_RESTARTBLOCK) are handled by setting that bit;\nsyscall number is not modified until the actual call.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "21c1176a72bd019d513b26e05d491a31b50b18d2", "tree": "f4b17999ea482335f50c2b7e5c2f8f5e9636fcba", "parents": [ "d9be5ea6f9b6a51535ccdd9881ffb3be2dbd48e9" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 28 17:51:42 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:38:24 2012 -0400" }, "message": "arm: if we get into work_pending while returning to kernel mode, just go away\n\nchecking in do_signal() is pointless - if we get there with !user_mode(regs)\n(and we might), we\u0027ll end up looping indefinitely. Check in work_pending\nand break out of the loop if so.\n\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d9be5ea6f9b6a51535ccdd9881ffb3be2dbd48e9", "tree": "69013d711c49ae60173825ee8fa627b09a641e14", "parents": [ "7dfae72027cd8345247e675a3b27439df95fe06e" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 27 01:18:52 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:37:56 2012 -0400" }, "message": "arm: don\u0027t call try_to_freeze() from do_signal()\n\nget_signal_to_deliver() will handle it itself\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7dfae72027cd8345247e675a3b27439df95fe06e", "tree": "6eee45a43ec71e1d62e89a6a37e32e4c340f8125", "parents": [ "84849b3ed8081e9e2eb0e441c699eda807853cb6" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Apr 26 18:15:11 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:36:45 2012 -0400" }, "message": "arm: if there\u0027s no handler we need to restore sigmask, syscall or no syscall\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "84849b3ed8081e9e2eb0e441c699eda807853cb6", "tree": "3e15f1c4598275d3caf7b188cd00d87e815f55d6", "parents": [ "7f1b5a9966b176e10d6cd322324a82be2379a51b" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Apr 24 16:40:34 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:36:32 2012 -0400" }, "message": "arm: trim _TIF_WORK_MASK, get rid of useless test and branch...\n\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7f1b5a9966b176e10d6cd322324a82be2379a51b", "tree": "17afc9db77c23205e8ca29d515ba7d6a8cfc61c1", "parents": [ "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Apr 22 17:15:42 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 14:36:30 2012 -0400" }, "message": "arm: missing checks of __get_user()/__put_user() return values\n\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "4ab1056766a4e49f6b9ef324313dd1583f8f8f4e", "tree": "89f975e7e021dd27dc807e45445e963aeb39fcda", "parents": [ "4175160b065e74572819a320dcd34129224a4e1c", "4cdfc2ec72e940abb4322aa1bc14f43a1486fc5d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:33 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:33 2012 +0100" }, "message": "Merge branch \u0027v3-removal\u0027 into for-linus\n\nConflicts:\n\tarch/arm/boot/compressed/head.S\n" }, { "commit": "4175160b065e74572819a320dcd34129224a4e1c", "tree": "3298e2c9a7c7db33bf28617875e5429e17eec61c", "parents": [ "ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd", "0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:24 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:24 2012 +0100" }, "message": "Merge branch \u0027misc\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/ptrace.c\n" }, { "commit": "ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd", "tree": "97eb0b6e2d4fad9d5a3e58a4762997c6170ae05d", "parents": [ "dfb85185bda373a70409c70c2632b02fb0f8f449", "5693188a6e888603afa9564974145e5e6e2c623c", "56cb248428ead13a6b423ed3f3cf9e4aa01244b1", "d098bc7d58ebda22a6554b6c9df1056802d9900f", "34fd421349ffc6a4280b71276bf7c6d48f92156f", "90cf2418f5c45192bac1ac57af62f61dbac92886", "d12379acaf55a395083ca81d753b1af75507556c" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:10 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:10 2012 +0100" }, "message": "Merge branches \u0027amba\u0027, \u0027devel-stable\u0027, \u0027fixes\u0027, \u0027mach-types\u0027, \u0027mmci\u0027, \u0027pci\u0027 and \u0027versatile\u0027 into for-linus\n" }, { "commit": "61f6c7a47a2f84b7ba4b65240ffe9247df772b06", "tree": "aaeadf6490c61a541f83c86374e87a69384b2ca5", "parents": [ "58f42fd54144346898e6dc6d6ae3acd4c591b42f" ], "author": { "name": "Vitaly Andrianov", "email": "vitalya@ti.com", "time": "Mon May 14 13:49:56 2012 -0400" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:09:40 2012 +0200" }, "message": "ARM: dma-mapping: use PMD size for section unmap\n\nThe dma_contiguous_remap() function clears existing section maps using\nthe wrong size (PGDIR_SIZE instead of PMD_SIZE). This is a bug which\ndoes not affect non-LPAE systems, where PGDIR_SIZE and PMD_SIZE are the same.\nOn LPAE systems, however, this bug causes the kernel to hang at this point.\n\nThis fix has been tested on both LPAE and non-LPAE kernel builds.\n\nSigned-off-by: Vitaly Andrianov \u003cvitalya@ti.com\u003e\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "c79095092834a18ae74cfc08def1a5a101dc106c", "tree": "c6cd81c38b92dcdb269288ab9a125bc13f4bb339", "parents": [ "0a2b9a6ea93650b8a00f9fd5ee8fdd25671e2df6" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu Dec 29 13:09:51 2011 +0100" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:09:38 2012 +0200" }, "message": "ARM: integrate CMA with DMA-mapping subsystem\n\nThis patch adds support for CMA to dma-mapping subsystem for ARM\narchitecture. By default a global CMA area is used, but specific devices\nare allowed to have their private memory areas if required (they can be\ncreated with dma_declare_contiguous() function during board\ninitialisation).\n\nContiguous memory areas reserved for DMA are remapped with 2-level page\ntables on boot. Once a buffer is requested, a low memory kernel mapping\nis updated to to match requested memory access type.\n\nGFP_ATOMIC allocations are performed from special pool which is created\nearly during boot. This way remapping page attributes is not needed on\nallocation time.\n\nCMA has been enabled unconditionally for ARMv6+ systems.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCC: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nTested-by: Rob Clark \u003crob.clark@linaro.org\u003e\nTested-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nTested-by: Benjamin Gaignard \u003cbenjamin.gaignard@linaro.org\u003e\nTested-by: Robert Nelson \u003crobertcnelson@gmail.com\u003e\nTested-by: Barry Song \u003cBaohua.Song@csr.com\u003e\n" }, { "commit": "4ce63fcd919c32d22528e54dcd89506962933719", "tree": "648f7681a5c89209b627e8c3e899d953ed38685d", "parents": [ "f99d60341238fe73fc514129cd9ae4e44e1b2c47" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Wed May 16 15:48:21 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:06:23 2012 +0200" }, "message": "ARM: dma-mapping: add support for IOMMU mapper\n\nThis patch add a complete implementation of DMA-mapping API for\ndevices which have IOMMU support.\n\nThis implementation tries to optimize dma address space usage by remapping\nall possible physical memory chunks into a single dma address space chunk.\n\nDMA address space is managed on top of the bitmap stored in the\ndma_iommu_mapping structure stored in device-\u003earchdata. Platform setup\ncode has to initialize parameters of the dma address space (base address,\nsize, allocation precision order) with arm_iommu_create_mapping() function.\nTo reduce the size of the bitmap, all allocations are aligned to the\nspecified order of base 4 KiB pages.\n\ndma_alloc_* functions allocate physical memory in chunks, each with\nalloc_pages() function to avoid failing if the physical memory gets\nfragmented. In worst case the allocated buffer is composed of 4 KiB page\nchunks.\n\ndma_map_sg() function minimizes the total number of dma address space\nchunks by merging of physical memory chunks into one larger dma address\nspace chunk. If requested chunk (scatter list entry) boundaries\nmatch physical page boundaries, most calls to dma_map_sg() requests will\nresult in creating only one chunk in dma address space.\n\ndma_map_page() simply creates a mapping for the given page(s) in the dma\naddress space.\n\nAll dma functions also perform required cache operation like their\ncounterparts from the arm linear physical memory mapping version.\n\nThis patch contains code and fixes kindly provided by:\n- Krishna Reddy \u003cvdumpa@nvidia.com\u003e,\n- Andrzej Pietrasiewicz \u003candrzej.p@samsung.com\u003e,\n- Hiroshi DOYU \u003chdoyu@nvidia.com\u003e\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nAcked-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nTested-By: Subash Patel \u003csubash.ramaswamy@linaro.org\u003e\n" } ], "next": "f99d60341238fe73fc514129cd9ae4e44e1b2c47" }