)]}' { "log": [ { "commit": "690efa08e268a36df170bee79df93a9649c3f217", "tree": "16fa1ccd5cefd3db92201908ca2a1051f86799db", "parents": [ "5698e9180cb70020bbf8b613174afe6308f902b0", "ae58d1e406986f31d1e88b32f5ac601506c196d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 05 10:55:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 05 10:55:31 2012 -0700" }, "message": "Merge branch \u0027i2c-embedded/for-current\u0027 of git://git.pengutronix.de/git/wsa/linux\n\nPull embedded i2c update from Wolfram Sang:\n \"This only contains one new driver which had multiple dependencies\n (pinctrl, i2c-mux-rework, new devm_* functions), so I decided to wait\n for rc1. Plus, it had to wait a little for the ack of a devicetree\n maintainer since the bindings were not trivial enough for me to pass\n through.\n\n So, given that, I hope there is still something like the \"new driver\n rule\", so we could have the driver in 3.5 and people can start using\n it. That would make merging support for some boards easier for 3.6\n since the dependency on this driver is gone then.\"\n\n* \u0027i2c-embedded/for-current\u0027 of git://git.pengutronix.de/git/wsa/linux:\n i2c: Add generic I2C multiplexer using pinctrl API\n" }, { "commit": "a3fe778c7895cd847d23c25ad566d83346282a77", "tree": "53ba1b736dac08680a08753f7163a1890d7a0d03", "parents": [ "9171c670b4915e30360c2aed530b8377fbbcc852", "165c8aed5bbc6bdddbccae0ba9db451732558ff9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 04 12:28:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 04 12:28:45 2012 -0700" }, "message": "Merge tag \u0027stable/frontswap.v16-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm\n\nPull frontswap feature from Konrad Rzeszutek Wilk:\n \"Frontswap provides a \"transcendent memory\" interface for swap pages.\n In some environments, dramatic performance savings may be obtained\n because swapped pages are saved in RAM (or a RAM-like device) instead\n of a swap disk. This tag provides the basic infrastructure along with\n some changes to the existing backends.\"\n\nFix up trivial conflict in mm/Makefile due to removal of swap token code\nchanging a line next to the new frontswap entry.\n\nThis pull request came in before the merge window even opened, it got\ndelayed to after the merge window by me just wanting to make sure it had\nactual users. Apparently IBM is using this on their embedded side, and\nJan Beulich says that it\u0027s already made available for SLES and OpenSUSE\nusers.\n\nAlso acked by Rik van Riel, and Konrad points to other people liking it\ntoo. So in it goes.\n\nBy Dan Magenheimer (4) and Konrad Rzeszutek Wilk (2)\nvia Konrad Rzeszutek Wilk\n* tag \u0027stable/frontswap.v16-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:\n frontswap: s/put_page/store/g s/get_page/load\n MAINTAINER: Add myself for the frontswap API\n mm: frontswap: config and doc files\n mm: frontswap: core frontswap functionality\n mm: frontswap: core swap subsystem hooks and headers\n mm: frontswap: add frontswap header file\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": "ae58d1e406986f31d1e88b32f5ac601506c196d8", "tree": "85f8973189b8e7bab81bdc235eeb1fb48176bb9d", "parents": [ "f8f5701bdaf9134b1f90e5044a82c66324d2073f" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri May 18 09:29:34 2012 -0600" }, "committer": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Jun 04 16:49:43 2012 +0200" }, "message": "i2c: Add generic I2C multiplexer using pinctrl API\n\nThis is useful for SoCs whose I2C module\u0027s signals can be routed to\ndifferent sets of pins at run-time, using the pinctrl API.\n\n +-----+ +-----+\n | dev | | dev |\n +------------------------+ +-----+ +-----+\n | SoC | | |\n | /----|------+--------+\n | +---+ +------+ | child bus A, on first set of pins\n | |I2C|---|Pinmux| |\n | +---+ +------+ | child bus B, on second set of pins\n | \\----|------+--------+--------+\n | | | | |\n +------------------------+ +-----+ +-----+ +-----+\n | dev | | dev | | dev |\n +-----+ +-----+ +-----+\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\n" }, { "commit": "912afc3616b94c5c4af584972c7f5903b53cf15a", "tree": "3edd4596fe53ce5bc8224b1cccd5d34dcac040a7", "parents": [ "4fc3acf2918fa158dc651a0c824a23944e956919", "cc8394d86f045b86ff303d3c9e4ce47d97148951" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 02 17:39:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 02 17:39:40 2012 -0700" }, "message": "Merge tag \u0027dm-3.5-changes-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm\n\nPull device-mapper updates from Alasdair G Kergon:\n \"Improve multipath\u0027s retrying mechanism in some defined circumstances\n and provide a simple reserve/release mechanism for userspace tools to\n access thin provisioning metadata while the pool is in use.\"\n\n* tag \u0027dm-3.5-changes-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:\n dm thin: provide userspace access to pool metadata\n dm thin: use slab mempools\n dm mpath: allow ioctls to trigger pg init\n dm mpath: delay retry of bypassed pg\n dm mpath: reduce size of struct multipath\n" }, { "commit": "cc8394d86f045b86ff303d3c9e4ce47d97148951", "tree": "ad37143c9709f523fb2ca9fc5ac9de75e9a011f9", "parents": [ "a24c25696b7133dd534d7a9436e576af79d9ce3b" ], "author": { "name": "Joe Thornber", "email": "ejt@redhat.com", "time": "Sun Jun 03 00:30:01 2012 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun Jun 03 00:30:01 2012 +0100" }, "message": "dm thin: provide userspace access to pool metadata\n\nThis patch implements two new messages that can be sent to the thin\npool target allowing it to take a snapshot of the _metadata_. This,\nread-only snapshot can be accessed by userland, concurrently with the\nlive target.\n\nOnly one metadata snapshot can be held at a time. The pool\u0027s status\nline will give the block location for the current msnap.\n\nSince version 0.1.5 of the userland thin provisioning tools, the\nthin_dump program displays the msnap as follows:\n\n thin_dump -m \u003cmsnap root\u003e \u003cmetadata dev\u003e\n\nAvailable here: https://github.com/jthornber/thin-provisioning-tools\n\nNow that userland can access the metadata we can do various things\nthat have traditionally been kernel side tasks:\n\n i) Incremental backups.\n\n By using metadata snapshots we can work out what blocks have\n changed over time. Combined with data snapshots we can ensure\n the data doesn\u0027t change while we back it up.\n\n A short proof of concept script can be found here:\n\n https://github.com/jthornber/thinp-test-suite/blob/master/incremental_backup_example.rb\n\n ii) Migration of thin devices from one pool to another.\n\n iii) Merging snapshots back into an external origin.\n\n iv) Asyncronous replication.\n\nSigned-off-by: Joe Thornber \u003cejt@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "63004afa718b1506fe9a286075b3b2d8c6ca2b9b", "tree": "2ca957b939f36c7b6a8d85e162fec9d5a4bcca99", "parents": [ "f309532bf3e1cc1b787403d84e3039812a7dbe50", "40b46a7d2938589a5abab132a7824fd17ae18f62" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 02 16:17:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 02 16:17:03 2012 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull straggler x86 fixes from Peter Anvin:\n \"Three groups of patches:\n\n - EFI boot stub documentation and the ability to print error messages;\n - Removal for PTRACE_ARCH_PRCTL for x32 (obsolete interface which\n should never have been ported, and the port is broken and\n potentially dangerous.)\n - ftrace stack corruption fixes. I\u0027m not super-happy about the\n technical implementation, but it is probably the least invasive in\n the short term. In the future I would like a single method for\n nesting the debug stack, however.\"\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, x32, ptrace: Remove PTRACE_ARCH_PRCTL for x32\n x86, efi: Add EFI boot stub documentation\n x86, efi; Add EFI boot stub console support\n x86, efi: Only close open files in error path\n ftrace/x86: Do not change stacks in DEBUG when calling lockdep\n x86: Allow nesting of the debug stack IDT setting\n x86: Reset the debug_stack update counter\n ftrace: Use breakpoint method to update ftrace caller\n ftrace: Synchronize variable setting with breakpoints\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": "af4f8ba31a4e328677bec493ceeaf112ca193b65", "tree": "d97a6dc3a8ddcd2bcebe124a4716e565a7868cdc", "parents": [ "efff0471b0dd8b08ca3830b06a9083f6d6cef44e", "c03f94ccbd67fbcf546e5a9fcfeb99ef0aca4ada" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 16:50:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 16:50:23 2012 -0700" }, "message": "Merge branch \u0027slab/for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux\n\nPull slab updates from Pekka Enberg:\n \"Mainly a bunch of SLUB fixes from Joonsoo Kim\"\n\n* \u0027slab/for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:\n slub: use __SetPageSlab function to set PG_slab flag\n slub: fix a memory leak in get_partial_node()\n slub: remove unused argument of init_kmem_cache_node()\n slub: fix a possible memory leak\n Documentations: Fix slabinfo.c directory in vm/slub.txt\n slub: fix incorrect return type of get_any_partial()\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": "0c7596621e313bfcfbacb288e768c7150f5de9e0", "tree": "d1d65365794d5ca136f053cda174b822c8aa7b85", "parents": [ "9fa7dedad3d30345c843bd82db02c4d6169e5f61" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Fri Mar 16 12:03:13 2012 +0000" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Jun 01 09:11:41 2012 -0700" }, "message": "x86, efi: Add EFI boot stub documentation\n\nSince we can\u0027t expect every user to read the EFI boot stub code it\nseems prudent to have a couple of paragraphs explaining what it is and\nhow it works.\n\nThe \"initrd\u003d\" option in particular is tricky because it only\nunderstands absolute EFI-style paths (backslashes as directory\nseparators), and until now this hasn\u0027t been documented anywhere. This\nhas tripped up a couple of users.\n\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nLink: http://lkml.kernel.org/r/1331907517-3985-4-git-send-email-matt@console-pimps.org\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "c3b2da314834499f34cba94f7053e55f6d6f92d8", "tree": "7012b569ee9e0781761a8eb388190979441583c7", "parents": [ "033369d1af1264abc23bea2e174aa47cdd212f6f" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Mar 26 09:59:21 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:07:25 2012 -0400" }, "message": "fs: introduce inode operation -\u003eupdate_time\n\nBtrfs has to make sure we have space to allocate new blocks in order to modify\nthe inode, so updating time can fail. We\u0027ve gotten around this by having our\nown file_update_time but this is kind of a pain, and Christoph has indicated he\nwould like to make xfs do something different with atime updates. So introduce\n-\u003eupdate_time, where we will deal with i_version an a/m/c time updates and\nindicate which changes need to be made. The normal version just does what it\nhas always done, updates the time and marks the inode dirty, and then\nfilesystems can choose to do something different.\n\nI\u0027ve gone through all of the users of file_update_time and made them check for\nerrors with the exception of the fault code since it\u0027s complicated and I wasn\u0027t\nquite sure what to do there, also Jan is going to be pushing the file time\nupdates into page_mkwrite for those who have it so that should satisfy btrfs and\nmake it not a big deal to check the file_update_time() return code in the\ngeneric fault path. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\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": "5b172087f99189416d5f47fd7ab5e6fb762a9ba3", "tree": "2619444e8ceee40df80814a1004687ac3d7f1eda", "parents": [ "d97b46a64674a267bc41c9e16132ee2a98c3347d" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu May 31 16:26:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:32 2012 -0700" }, "message": "c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat\n\nWe would like to have an ability to restore command line arguments and\nprogram environment pointers but first we need to obtain them somehow.\nThus we put these values into /proc/$pid/stat. The exit_code is needed to\nrestore zombie tasks.\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nAcked-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Andrew Vagin \u003cavagin@openvz.org\u003e\nCc: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "818411616baf46ceba0cff6f05af3a9b294734f7", "tree": "b6e338e20d4a45b6a05ffa37e6af33e0cc1b50c0", "parents": [ "98ed57eef9f67dfe541be0bca34660ffc88365b2" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu May 31 16:26:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:32 2012 -0700" }, "message": "fs, proc: introduce /proc/\u003cpid\u003e/task/\u003ctid\u003e/children entry\n\nWhen we do checkpoint of a task we need to know the list of children the\ntask, has but there is no easy and fast way to generate reverse\nparent-\u003echildren chain from arbitrary \u003cpid\u003e (while a parent pid is\nprovided in \"PPid\" field of /proc/\u003cpid\u003e/status).\n\nSo instead of walking over all pids in the system (creating one big\nprocess tree in memory, just to figure out which children a task has) --\nwe add explicit /proc/\u003cpid\u003e/task/\u003ctid\u003e/children entry, because the kernel\nalready has this kind of information but it is not yet exported.\n\nThis is a first level children, not the whole process tree.\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nReviewed-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cef0184c115e5e4e10498f6548d9526465e72478", "tree": "752c4116e0f93328239db9ff2c2ed730fef3ce0e", "parents": [ "fd1f87d24d492fda464bedf10a5dd5174ff9b065" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Thu May 31 16:26:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:31 2012 -0700" }, "message": "mqueue: separate mqueue default value from maximum value\n\nCommit b231cca4381e (\"message queues: increase range limits\") changed\nmqueue default value when attr parameter is specified NULL from hard\ncoded value to fs.mqueue.{msg,msgsize}_max sysctl value.\n\nThis made large side effect. When user need to use two mqueue\napplications 1) using !NULL attr parameter and it require big message\nsize and 2) using NULL attr parameter and only need small size message,\napp (1) require to raise fs.mqueue.msgsize_max and app (2) consume large\nmemory size even though it doesn\u0027t need.\n\nDoug Ledford propsed to switch back it to static hard coded value.\nHowever it also has a compatibility problem. Some applications might\nstarted depend on the default value is tunable.\n\nThe solution is to separate default value from maximum value.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Doug Ledford \u003cdledford@redhat.com\u003e\nAcked-by: Doug Ledford \u003cdledford@redhat.com\u003e\nAcked-by: Joe Korty \u003cjoe.korty@ccur.com\u003e\nCc: Amerigo Wang \u003camwang@redhat.com\u003e\nAcked-by: Serge E. Hallyn \u003cserue@us.ibm.com\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Manfred Spraul \u003cmanfred@colorfullife.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "052fb0d635df5d49dfc85687d94e1a87bf09378d", "tree": "2cde635970974b44a7363e5e940d38f20de46d39", "parents": [ "715be1fce0d964aca15618b24f6f415f3cbd03c8" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu May 31 16:26:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:29 2012 -0700" }, "message": "proc: report file/anon bit in /proc/pid/pagemap\n\nThis is an implementation of Andrew\u0027s proposal to extend the pagemap file\nbits to report what is missing about tasks\u0027 working set.\n\nThe problem with the working set detection is multilateral. In the criu\n(checkpoint/restore) project we dump the tasks\u0027 memory into image files\nand to do it properly we need to detect which pages inside mappings are\nreally in use. The mincore syscall I though could help with this did not.\n First, it doesn\u0027t report swapped pages, thus we cannot find out which\nparts of anonymous mappings to dump. Next, it does report pages from page\ncache as present even if they are not mapped, and it doesn\u0027t make that has\nnot been cow-ed.\n\nNote, that issue with swap pages is critical -- we must dump swap pages to\nimage file. But the issues with file pages are optimization -- we can\ntake all file pages to image, this would be correct, but if we know that a\npage is not mapped or not cow-ed, we can remove them from dump file. The\ndump would still be self-consistent, though significantly smaller in size\n(up to 10 times smaller on real apps).\n\nAndrew noticed, that the proc pagemap file solved 2 of 3 above issues --\nit reports whether a page is present or swapped and it doesn\u0027t report not\nmapped page cache pages. But, it doesn\u0027t distinguish cow-ed file pages\nfrom not cow-ed.\n\nI would like to make the last unused bit in this file to report whether the\npage mapped into respective pte is PageAnon or not.\n\n[comment stolen from Pavel Emelyanov\u0027s v1 patch]\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "15837294d4ce717f69942f7366e99d4d1d3d9923", "tree": "41a7047f7f4bf3747fa162aaeec6a1e0a18fd848", "parents": [ "1cefe28f95da307287a05a6a0c10213f01055e2a" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Thu May 31 16:26:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:26 2012 -0700" }, "message": "CodingStyle: add kmalloc_array() to memory allocators\n\nAdd the new kmalloc_array() to the list of general-purpose memory\nallocators in chapter 14.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nAcked-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nAcked-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "76f901eb4659779ecacd0e4eba49f55442daef53", "tree": "0761f03211ffdfc06216eabeb61b02ef6d598d3c", "parents": [ "bd0e162d0312aa95e8b85ba883efddebf27be121", "96facd23e45e6d5020be135c8ab392ba9e044fa4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:10:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:10:15 2012 -0700" }, "message": "Merge tag \u0027for-v3.5\u0027 of git://git.infradead.org/battery-2.6\n\nPull battery updates from Anton Vorontsov:\n \"A bunch of fixes for v3.5, nothing extraordinary.\"\n\n* tag \u0027for-v3.5\u0027 of git://git.infradead.org/battery-2.6: (27 commits)\n smb347-charger: Include missing \u003clinux/err.h\u003e\n smb347-charger: Clean up battery attributes\n max17042_battery: Add support for max17047/50 chip\n sbs-battery.c: Capacity attr \u003d remaining relative capacity\n isp1704_charger: Use after free on probe error\n ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZE\n power_supply: Fix a typo in BATTERY_DS2781 Kconfig entry\n charger-manager: Provide cm_notify_event function for in-kernel use\n charger-manager: Poll battery health in normal state\n smb347-charger: Convert to regmap API\n smb347-charger: Move IRQ enabling to the end of probe\n smb347-charger: Rename few functions to match better what they are doing\n smb347-charger: Convert to use module_i2c_driver()\n smb347_charger: Cleanup power supply registration code in probe\n ab8500: Clean up probe routines\n ab8500_fg: Harden platform data check\n ab8500_btemp: Harden platform data check\n ab8500_charger: Harden platform data check\n MAINTAINERS: Fix \u0027F\u0027 entry for the power supply class\n max17042_battery: Handle irq request failure case\n ...\n" }, { "commit": "054552272e6e152ff40f8b7f164dd390a5a62097", "tree": "9be4ee91a0ea090672f6ea1be2f6e6eef027d810", "parents": [ "5b461209d07ab9a9284760f6ffe696de558031a3", "1ff2f40305772b159a91c19590ee159d3a504afc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:02:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:02:41 2012 -0700" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi\n\nPull final round of SCSI updates from James Bottomley:\n \"This is primarily another round of driver updates (bnx2fc, qla2xxx,\n qla4xxx) including the target mode driver for qla2xxx. We\u0027ve also got\n a couple of regression fixes (async scanning, broken this merge window\n and a fix to a long standing break in the scsi_wait_scan module).\"\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (45 commits)\n [SCSI] fix scsi_wait_scan\n [SCSI] fix async probe regression\n [SCSI] be2iscsi: fix dma free size mismatch regression\n [SCSI] qla4xxx: Update driver version to 5.02.00-k17\n [SCSI] qla4xxx: Capture minidump for ISP82XX on firmware failure\n [SCSI] qla4xxx: Add change_queue_depth API support\n [SCSI] qla4xxx: Fix clear ddb mbx command failure issue.\n [SCSI] qla4xxx: Fix kernel panic during discovery logout.\n [SCSI] qla4xxx: Correct early completion of pending mbox.\n [SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs\n [SCSI] libfcoe: Add fcoe_sysfs\n [SCSI] bnx2fc: Allocate fcoe_ctlr with bnx2fc_interface, not as a member\n [SCSI] fcoe: Allocate fcoe_ctlr with fcoe_interface, not as a member\n [SCSI] Fix dm-multipath starvation when scsi host is busy\n [SCSI] ufs: fix potential NULL pointer dereferencing error in ufshcd_prove.\n [SCSI] qla2xxx: don\u0027t free pool that wasn\u0027t allocated\n [SCSI] mptfusion: unlock on error in mpt_config()\n [SCSI] tcm_qla2xxx: Add \u003e\u003d 24xx series fabric module for target-core\n [SCSI] qla2xxx: Add LLD target-mode infrastructure for \u003e\u003d 24xx series\n [SCSI] Revert \"qla2xxx: During loopdown perform Diagnostic loopback.\"\n ...\n" }, { "commit": "5b461209d07ab9a9284760f6ffe696de558031a3", "tree": "0d21496c0b85b96c16aee52b024252baf1d8fb93", "parents": [ "fde86d310886372a377213251e72fb87aaa406c9", "3c9c708c9fc967e389f85bc735e4c1f65d67334e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:00:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:00:09 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nPull follow-up block updates from Jens Axboe:\n \"Includes the fix from Eric to resolve the infinite loop in looking up\n or creating an IO context for an exiting task.\n\n Also a bunch of mtip32xx patches. Fairly trivial stuff. It\u0027s fairly\n new though, but no point in keeping it out of the tree until 3.6 imho.\n I\u0027ve thrown it through basic testing locally as well, works fine. The\n one contentious part is the patch that Greg complained about (sysfs\n file with multiple values, should be a debugfs file), which is\n perfectly valid, but not a regression from what the file contains now.\n That will be fixed up separately.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: avoid infinite loop in get_task_io_context()\n mtip32xx: Changes to sysfs entries\n mtip32xx: Convert macro definitions for flag bits to enum\n mtip32xx: minor performance tweak\n mtip32xx: Fix to support more than one sector in exec_drive_command()\n mtip32xx: Use plain spinlock for \u0027cmd_issue_lock\u0027\n mtip32xx: Set block queue boundary variables\n mtip32xx: Fix to handle TFE for PIO(IOCTL/internal) commands\n mtip32xx: Change HDIO_GET_IDENTITY to return stored data\n mtip32xx: Set custom timeouts for PIO commands\n mtip32xx: fix clearing an incorrect register in mtip_init_port\n" }, { "commit": "13199a0845729492fc51d1ba87938cdfe341b141", "tree": "544267bc4076fff6b2eaae119372b13f23aa8932", "parents": [ "af56e0aa35f3ae2a4c1a6d1000702df1dd78cb76", "2e1d4a065a77d076a679df22a4eddbc7e33cad98" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 10:32:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 10:32:36 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking changes from David S. Miller:\n\n 1) Fix IPSEC header length calculation for transport mode in ESP. The\n issue is whether to do the calculation before or after alignment.\n Fix from Benjamin Poirier.\n\n 2) Fix regression in IPV6 IPSEC fragment length calculations, from Gao\n Feng. This is another transport vs tunnel mode issue.\n\n 3) Handle AF_UNSPEC connect()s properly in L2TP to avoid OOPSes. Fix\n from James Chapman.\n\n 4) Fix USB ASIX driver\u0027s reception of full sized VLAN packets, from\n Eric Dumazet.\n\n 5) Allow drop monitor (and, more generically, all generic netlink\n protocols) to be automatically loaded as a module. From Neil\n Horman.\n\nFix up trivial conflict in Documentation/feature-removal-schedule.txt\ndue to new entries added next to each other at the end. As usual.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)\n net/smsc911x: Repair broken failure paths\n virtio-net: remove useless disable on freeze\n netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG\n drop_monitor: Add module alias to enable automatic module loading\n genetlink: Build a generic netlink family module alias\n net: add MODULE_ALIAS_NET_PF_PROTO_NAME\n r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)\n r6040: disable pci device if the subsequent calls (after pci_enable_device) fails\n skb: avoid unnecessary reallocations in __skb_cow\n net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens\n asix: allow full size 8021Q frames to be received\n rds_rdma: don\u0027t assume infiniband device is PCI\n l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case\n mac80211: fix ADDBA declined after suspend with wowlan\n wlcore: fix undefined symbols when CONFIG_PM is not defined\n mac80211: fix flag check for QoS NOACK frames\n ath9k_hw: apply internal regulator settings on AR933x\n ath9k_hw: update AR933x initvals to fix issues with high power devices\n ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails\n ath9k: stop rx dma before stopping tx\n ...\n" }, { "commit": "b77874c9699522540e65aa4291e37a7e43533bf3", "tree": "7da11a926fc8d697e3a475ee662e04f239b9cff5", "parents": [ "8ce800935d074ee4667a6a950fb4784009a969ea" ], "author": { "name": "Asai Thambi S P", "email": "asamymuthupa@micron.com", "time": "Tue May 29 18:44:54 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu May 31 08:46:50 2012 +0200" }, "message": "mtip32xx: Changes to sysfs entries\n\n* Formatted the output of \u0027registers\u0027 entry\n* Added \"Commands in Q\u0027 to output of \u0027registers\u0027 entry\n* Added a new entry \u0027flags\u0027\n\nSigned-off-by: Asai Thambi S P \u003casamymuthupa@micron.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "af56e0aa35f3ae2a4c1a6d1000702df1dd78cb76", "tree": "304bd85e5db2d07efa2913aa7c6313b918cfbfdb", "parents": [ "65a50c951a38e9827dd9655b6e686bde912e799b", "6bd9adbdf9ca6a052b0b7455ac67b925eb38cfad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 11:17:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 11:17:19 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\nPull ceph updates from Sage Weil:\n \"There are some updates and cleanups to the CRUSH placement code, a bug\n fix with incremental maps, several cleanups and fixes from Josh Durgin\n in the RBD block device code, a series of cleanups and bug fixes from\n Alex Elder in the messenger code, and some miscellaneous bounds\n checking and gfp cleanups/fixes.\"\n\nFix up trivial conflicts in net/ceph/{messenger.c,osdmap.c} due to the\nnetworking people preferring \"unsigned int\" over just \"unsigned\".\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (45 commits)\n libceph: fix pg_temp updates\n libceph: avoid unregistering osd request when not registered\n ceph: add auth buf in prepare_write_connect()\n ceph: rename prepare_connect_authorizer()\n ceph: return pointer from prepare_connect_authorizer()\n ceph: use info returned by get_authorizer\n ceph: have get_authorizer methods return pointers\n ceph: ensure auth ops are defined before use\n ceph: messenger: reduce args to create_authorizer\n ceph: define ceph_auth_handshake type\n ceph: messenger: check return from get_authorizer\n ceph: messenger: rework prepare_connect_authorizer()\n ceph: messenger: check prepare_write_connect() result\n ceph: don\u0027t set WRITE_PENDING too early\n ceph: drop msgr argument from prepare_write_connect()\n ceph: messenger: send banner in process_connect()\n ceph: messenger: reset connection kvec caller\n libceph: don\u0027t reset kvec in prepare_write_banner()\n ceph: ignore preferred_osd field\n ceph: fully initialize new layout\n ...\n" }, { "commit": "42fe55ce905212542426fa6407a76534a5fb696a", "tree": "874c5984e4222ea253b78c5be4755b3d31da54e2", "parents": [ "19ce0a995ff230b364c7329fd488c70e91c171d9", "14674e70119ea01549ce593d8901a797f8a90f74" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 10:03:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 10:03:46 2012 -0700" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\nPull i2c updates from Jean Delvare.\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING\n i2c-dev: Add support for I2C_M_RECV_LEN\n" }, { "commit": "19ce0a995ff230b364c7329fd488c70e91c171d9", "tree": "e24fe57a87d16a54cbffd087fb6af2083f7f2ad0", "parents": [ "6bb340c7868fbfd7bd0e8a0e23397a2bcb528429", "4b98b32aefb2c143a40cdaa254eb905f1bb06b5d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 09:59:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 09:59:13 2012 -0700" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\nPull second set of watchdog updates from Wim Van Sebroeck:\n \"This changeset contains following changes:\n * Add support for multiple watchdog devices. We use dynamically\n allocated device id\u0027s for this.\n * Add locking into the generic watchdog infrastructure.\n * Add support for dynamically allocated watchdog_device structs so\n that we can deal with devices that get unbound.\n * convert following drivers to the generic watchdog framework:\n sch5627, sch5636 and sp805_wdt.\n * Add DA9052/53 PMIC watchdog support\n * Fix printk format warnings for iTCO_wdt.c\"\n\n* git://www.linux-watchdog.org/linux-watchdog:\n watchdog: iTCO_wdt.c: fix printk format warnings\n watchdog: sp805_wdt: Add clk_{un}prepare support\n watchdog: sp805_wdt: convert to watchdog core\n hwmon/sch56xx: Depend on watchdog for watchdog core functions\n watchdog: sch56xx-common: set correct bits in register()\n Watchdog: DA9052/53 PMIC watchdog support\n watchdog: sch56xx-common: Add proper ref-counting of watchdog data\n watchdog: sch56xx: Remove unnecessary checks for register changes\n watchdog: sch56xx: Use watchdog core\n watchdog: Add support for dynamically allocated watchdog_device structs\n watchdog: Add Locking support\n watchdog: watchdog_dev: Rewrite wrapper code\n watchdog: use dev_ functions\n watchdog: create all the proper device files\n watchdog: Add a flag to indicate the watchdog doesn\u0027t reboot things\n watchdog: Add multiple device support\n watchdog: watchdog_core.h: make functions extern\n watchdog: correct the name of the watchdog_core inlude file\n watchdog: Add watchdog_active() routine\n watchdog: watchdog_dev: include private header to pickup global symbol prototypes\n" }, { "commit": "2f83766d4b18774c856329a8fca4c9338dfeda39", "tree": "a19ea2165755f5700d7f37a61ece7edce231744f", "parents": [ "4523e1458566a0e8ecfaff90f380dd23acc44d27", "28f8571e1e84782244cc7bf1b129baf6cdc0832e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:49:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:49:28 2012 -0700" }, "message": "Merge tag \u0027iommu-updates-v3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\nPull IOMMU updates from Joerg Roedel:\n \"Not much stuff this time. The only change to the IOMMU core code is\n the addition of a handle to the fault handling code. A few updates to\n the AMD IOMMU driver to work around new errata. The other patches are\n mostly fixes and enhancements to the existing ARM IOMMU drivers and\n documentation updates.\n\n A new IOMMU driver for the Exynos platform was also underway but got\n merged via the Samsung tree and is not part of this tree.\"\n\n* tag \u0027iommu-updates-v3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:\n Documentation: kernel-parameters.txt Add amd_iommu_dump\n iommu/core: pass a user-provided token to fault handlers\n iommu/tegra: gart: Fix register offset correctly\n iommu: OMAP: device detach on domain destroy\n iommu: tegra/gart: Add device tree support\n iommu: tegra/gart: use correct gart_device\n iommu/tegra: smmu: Print device name correctly\n iommu/amd: Add workaround for event log erratum\n iommu/amd: Check for the right TLP prefix bit\n dma-debug: release free_entries_lock before saving stack trace\n" }, { "commit": "28f8571e1e84782244cc7bf1b129baf6cdc0832e", "tree": "31838b4724f687e23d439c5b1854eb4ce9598288", "parents": [ "3d06fca8d2aa3543030e40b95f1d62f9f5a03540", "29cdd4e4ec91aae239192bb122d377d15a9d75e3", "803b5277215c75a5cc3b3eb5d19015c7290601a5", "774dfc9bb7f2ab1950a790a8f13eca3d5c580033", "77ca23323594589ac8cba1c8d59bfe7e85d3cb8b", "c099cf1731f5929af18928a50c8c814b44b30f98" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Wed May 30 12:41:29 2012 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Wed May 30 12:41:29 2012 +0200" }, "message": "Merge branches \u0027iommu/fixes\u0027, \u0027dma-debug\u0027, \u0027arm/omap\u0027, \u0027arm/tegra\u0027, \u0027core\u0027 and \u0027x86/amd\u0027 into next\n" }, { "commit": "c099cf1731f5929af18928a50c8c814b44b30f98", "tree": "1e5ffd48b6be2007bd8792a202db9efb448defff", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Shuah Khan", "email": "shuahkhan@gmail.com", "time": "Thu May 24 15:58:25 2012 -0600" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Wed May 30 12:39:27 2012 +0200" }, "message": "Documentation: kernel-parameters.txt Add amd_iommu_dump\n\nAdd amd_iommu_dump to kernel-parameters.txt\n\nSigned-off-by: Shuah Khan \u003cshuahkhan@gmail.com\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "14674e70119ea01549ce593d8901a797f8a90f74", "tree": "15474236bfa505aa396bf2892cbbee65e842b94b", "parents": [ "838bfa6049fb84dc66c9c9bbeb3a968ec987fd3d" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed May 30 10:55:34 2012 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed May 30 10:55:34 2012 +0200" }, "message": "i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING\n\nSince there are uses for I2C_M_NOSTART which are much more sensible and\nstandard than most of the protocol mangling functionality (the main one\nbeing gather writes to devices where something like a register address\nneeds to be inserted before a block of data) create a new I2C_FUNC_NOSTART\nfor this feature and update all the users to use it.\n\nAlso strengthen the disrecommendation of the protocol mangling while we\u0027re\nat it.\n\nIn the case of regmap-i2c we remove the requirement for mangling as\nI2C_M_NOSTART is the only mangling feature which is being used.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "664a0d7862a6b10c709d4b4a3655fe2c59a20064", "tree": "c543a0e6a3dd7e0cea7ab3e5f365af02ca23297f", "parents": [ "54e2dc9341aca23d5241699e3b74c8dce609fa2d" ], "author": { "name": "Ashish Jangam", "email": "ashish.jangam@kpitcummins.com", "time": "Thu May 24 18:31:14 2012 +0530" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 30 07:56:12 2012 +0200" }, "message": "Watchdog: DA9052/53 PMIC watchdog support\n\nThis driver adds support for the watchdog functionality provided by\nthe Dialog Semiconductor DA9052 PMIC chip.\n\nTested on samsung smdkv6410 and i.mx53 QS boards.\n\nSigned-off-by: Anthony Olech \u003cAnthony.Olech@diasemi.com\u003e\nSigned-off-by: Ashish Jangam \u003cashish.jangam@kpitcummins.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "e907df32725204d6d2cb79b872529911c8eadcdf", "tree": "3e90c58ea0ee9c2d77c1c4b0854dc046f6efb6a0", "parents": [ "f4e9c82f64b524314a390b13d3ba7d483f09258f" ], "author": { "name": "Hans de Goede", "email": "hdegoede@redhat.com", "time": "Tue May 22 11:40:26 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 30 07:55:31 2012 +0200" }, "message": "watchdog: Add support for dynamically allocated watchdog_device structs\n\nIf a driver\u0027s watchdog_device struct is part of a dynamically allocated\nstruct (which it often will be), merely locking the module is not enough,\neven with a drivers module locked, the driver can be unbound from the device,\nexamples:\n1) The root user can unbind it through sysfd\n2) The i2c bus master driver being unloaded for an i2c watchdog\n\nI will gladly admit that these are corner cases, but we still need to handle\nthem correctly.\n\nThe fix for this consists of 2 parts:\n1) Add ref / unref operations, so that the driver can refcount the struct\n holding the watchdog_device struct and delay freeing it until any\n open filehandles referring to it are closed\n2) Most driver operations will do IO on the device and the driver should not\n do any IO on the device after it has been unbound. Rather then letting each\n driver deal with this internally, it is better to ensure at the watchdog\n core level that no operations (other then unref) will get called after\n the driver has called watchdog_unregister_device(). This actually is the\n bulk of this patch.\n\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "f4e9c82f64b524314a390b13d3ba7d483f09258f", "tree": "82d688ae7782234dc01c6a340596bac21531aae4", "parents": [ "7a87982420e5e126bfefeb42232d1fd92052794e" ], "author": { "name": "Hans de Goede", "email": "hdegoede@redhat.com", "time": "Tue May 22 11:40:26 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 30 07:55:23 2012 +0200" }, "message": "watchdog: Add Locking support\n\nThis patch fixes some potential multithreading issues, despite only\nallowing one process to open the /dev/watchdog device, we can still get\ncalled multiple times at the same time, since a program could be using thread,\nor could share the fd after a fork.\n\nThis causes 2 potential problems:\n1) watchdog_start / open do an unlocked test_n_set / test_n_clear,\n if these 2 race, the watchdog could be stopped while the active\n bit indicates it is running or visa versa.\n\n2) Most watchdog_dev drivers probably assume that only one\n watchdog-op will get called at a time, this is not necessary\n true atm.\n\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "d6b469d915ae348b3bb8b25034063d6870ff4a00", "tree": "7bc00fa1870ba2fb1a7943c1a1d9e524752cb299", "parents": [ "2bbeed016dd96045ec82c3a309afddcc3a0db1d2" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Fri May 11 12:00:20 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 30 07:54:46 2012 +0200" }, "message": "watchdog: create all the proper device files\n\nCreate the watchdog class and it\u0027s associated devices.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "45f5fed30a6460ec58f159ff297a2974153a97de", "tree": "d173b2d22ed1187fb7ed2cb85015ddf5c545da05", "parents": [ "fb5f6658163412dce22724e906e324ab7fd62c18" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu May 10 21:48:59 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 30 07:54:25 2012 +0200" }, "message": "watchdog: Add multiple device support\n\nWe keep the old /dev/watchdog interface file for the first watchdog via\nmiscdev. This is basically a cut and paste of the relevant interface code\nfrom the rtc driver layer tweaked for watchdog.\n\nRevised to fix problems noted by Hans de Goede\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Tomas Winkler \u003ctomas.winkler@intel.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "7e5b2db77b05746613516599c916a8cc2e321077", "tree": "c3ec333ff7b77bcc8e456a3a3d19bf20f5c651b8", "parents": [ "227d1e4319ffd8729781941d92f4ae4d85beecd9", "c819baf31f5f91fbb06b2c93de2d5b8c8d096f3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 18:27:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 18:27:19 2012 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS updates from Ralf Baechle:\n \"The whole series has been sitting in -next for quite a while with no\n complaints. The last change to the series was before the weekend the\n removal of an SPI patch which Grant - even though previously acked by\n himself - appeared to raise objections. So I removed it until the\n situation is clarified. Other than that all the patches have the acks\n from their respective maintainers, all MIPS and x86 defconfigs are\n building fine and I\u0027m not aware of any problems introduced by this\n series.\n\n Among the key features for this patch series is a sizable patchset for\n Lantiq which among other things introduces support for Lantiq\u0027s\n flagship product, the FALCON SOC. It also means that the opensource\n developers behind this patchset have overtaken Lantiq\u0027s competing\n inhouse development team that was working behind closed doors.\n\n Less noteworthy the ath79 patchset which adds support for a few more\n chip variants, cleanups and fixes. Finally the usual dose of tweaking\n of generic code.\"\n\nFix up trivial conflicts in arch/mips/lantiq/xway/gpio_{ebu,stp}.c where\nprintk spelling fixes clashed with file move and eventual removal of the\nprintk.\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (81 commits)\n MIPS: lantiq: remove orphaned code\n MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.\n MIPS: lantiq: implement support for FALCON soc\n MTD: MIPS: lantiq: verify that the NOR interface is available on falcon soc\n MTD: MIPS: lantiq: implement OF support\n watchdog: MIPS: lantiq: implement OF support and minor fixes\n SERIAL: MIPS: lantiq: implement OF support\n GPIO: MIPS: lantiq: convert gpio-stp-xway to OF\n GPIO: MIPS: lantiq: convert gpio-mm-lantiq to OF and of_mm_gpio\n GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to the subsystem folder\n MIPS: pci: convert lantiq driver to OF\n MIPS: lantiq: convert dma to platform driver\n MIPS: lantiq: implement support for clkdev api\n MIPS: lantiq: drop ltq_gpio_request() and gpio_to_irq()\n OF: MIPS: lantiq: implement irq_domain support\n OF: MIPS: lantiq: implement OF support\n MIPS: lantiq: drop mips_machine support\n OF: PCI: const usage needed by MIPS\n MIPS: Cavium: Remove smp_reserve_lock.\n MIPS: Move cache setup to setup_arch().\n ...\n" }, { "commit": "e862e7c4ee52c2d1a0af37a8c3a2bda079042b06", "tree": "41284c9cc0bb04039f61b8cbf2719dfa9a0aac5b", "parents": [ "bcffb10f287c89ca6e4f89ef748301a9e22384d0" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Tue May 29 15:07:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:34 2012 -0700" }, "message": "drivers/rtc/rtc-lpc32xx.c: add device tree support\n\nAdds device tree support for rtc-lpc32xx.c\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0108c4ff62a0ee324c58175ff6b7000865023498", "tree": "e25434c28edbd078b9f70a3f154e7f0981e22306", "parents": [ "7c20342230ff370c397fc4a9c4c1e7a91964bb66" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Tue May 29 15:07:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:33 2012 -0700" }, "message": "rtc/spear: add Device Tree probing capability\n\nSPEAr platforms now support DT and so must convert all drivers support DT.\nThis patch adds DT probing support for rtc and updates its documentation\ntoo.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: Stefan Roese \u003csr@denx.de\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Rajeev Kumar \u003crajeev-dlh.kumar@st.com\u003e\nCc: Rob Herring \u003crobherring2@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "401dea7f7ade662b77c33ce2498fb5b4f97cb29c", "tree": "2e54d2e170e3e9ba0db256e633c91b2f802f9896", "parents": [ "e7e11d8ba807d451857b5c68abe249c7fc2b980f" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Tue May 29 15:07:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:32 2012 -0700" }, "message": "leds: add LM3533 LED driver\n\nAdd sub-driver for the LEDs on National Semiconductor / TI LM3533 lighting\npower chips.\n\nThe chip provides 256 brightness levels, hardware accelerated blinking as\nwell as ambient-light-sensor and pwm input control.\n\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Rob Landley \u003crob@landley.net\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Bryan Wu \u003cbryan.wu@canonical.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44e1e9f8e70506728b02a18e6d03599a6485d67f", "tree": "cb50e9faaf6017d44faf6bd5224e209df42aa9d8", "parents": [ "49dca5aebfdeadd4bf27b6cb4c60392147dc35a4" ], "author": { "name": "Shuah Khan", "email": "shuahkhan@gmail.com", "time": "Tue May 29 15:07:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:32 2012 -0700" }, "message": "leds: add new transient trigger for one shot timer activation\n\nThe leds timer trigger does not currently have an interface to activate a\none shot timer. The current support allows for setting two timers, one\nfor specifying how long a state to be on, and the second for how long the\nstate to be off. The delay_on value specifies the time period an LED\nshould stay in on state, followed by a delay_off value that specifies how\nlong the LED should stay in off state. The on and off cycle repeats until\nthe trigger gets deactivated. There is no provision for one time\nactivation to implement features that require an on or off state to be\nheld just once and then stay in the original state forever.\n\nWithout one shot timer interface, user space can still use timer trigger\nto set a timer to hold a state, however when user space application\ncrashes or goes away without deactivating the timer, the hardware will be\nleft in that state permanently.\n\nAs a specific example of this use-case, let\u0027s look at vibrate feature on\nphones. Vibrate function on phones is implemented using PWM pins on SoC\nor PMIC. There is a need to activate one shot timer to control the\nvibrate feature, to prevent user space crashes leaving the phone in\nvibrate mode permanently causing the battery to drain.\n\nThis trigger exports three properties, activate, state, and duration When\ntransient trigger is activated these properties are set to default values.\n\n- duration allows setting timer value in msecs. The initial value is 0.\n- activate allows activating and deactivating the timer specified by\n duration as needed. The initial and default value is 0. This will allow\n duration to be set after trigger activation.\n- state allows user to specify a transient state to be held for the specified\n duration.\n\nSigned-off-by: Shuah Khan \u003cshuahkhan@gmail.com\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: NeilBrown \u003cneilb@suse.de\u003e\nCc: Bryan Wu \u003cbryan.wu@canonical.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7f26c970b40b3e35ef699729b22d6915ca007135", "tree": "e2932f61c820be5bb72bfd45414cdf8fcc26f6cc", "parents": [ "1615d210dbc9c67c38b66bcff53233452dbaae22" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Tue May 29 15:07:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:29 2012 -0700" }, "message": "backlight: add LM3533 backlight driver\n\nAdd sub-driver for the backlights on National Semiconductor / TI LM3533\nlighting power chips.\n\nThe chip provides 256 brightness levels and ambient-light-sensor and pwm\ninput control.\n\n[akpm@linux-foundation.org: fix warning]\n[akpm@linux-foundation.org: fix the type of `mode\u0027]\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Rob Landley \u003crob@landley.net\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cc926f78420705817b807dbec0c5d3643827eba3", "tree": "fea47aea4b5963fbf06e77c593abeee3afb1958b", "parents": [ "d01dd17f1067ca50dbb9d1d3400d33221ce339e7" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue May 29 15:07:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:27 2012 -0700" }, "message": "memcg: move charges to root cgroup if use_hierarchy\u003d0\n\nPresently, at removal of cgroup, -\u003epre_destroy() is called and moves\ncharges to the parent cgroup. A major reason for returning -EBUSY from\n-\u003epre_destroy() is that the \u0027moving\u0027 hits the parent\u0027s resource\nlimitation. It happens only when use_hierarchy\u003d0.\n\nConsidering use_hierarchy\u003d0, all cgroups should be flat. So, no one\ncannot justify moving charges to parent...parent and children are in flat\nconfiguration, not hierarchical.\n\nThis patch modifes the code to move charges to the root cgroup at\nrmdir/force_empty if use_hierarchy\u003d\u003d0. This will much simplify rmdir()\nand reduce error in -\u003epre_destroy.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2bb2ba9d51a8044a71a29608d2c4ef8f5b2d57a2", "tree": "5e58869c606c541d41a9bfa62aa6e8bc42cae5ac", "parents": [ "f9be23d6da035241b7687b25e64401171986dcef" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue May 29 15:07:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:27 2012 -0700" }, "message": "rescounters: add res_counter_uncharge_until()\n\nWhen killing a res_counter which is a child of other counter, we need to\ndo\n\n\tres_counter_uncharge(child, xxx)\n\tres_counter_charge(parent, xxx)\n\nThis is not atomic and wastes CPU. This patch adds\nres_counter_uncharge_until(). This function\u0027s uncharge propagates to\nancestors until specified res_counter.\n\n\tres_counter_uncharge_until(child, parent, xxx)\n\nNow the operation is atomic and efficient.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@redhat.com\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4b91355e9dc9ac1eb3d69e56de093899ff2677ef", "tree": "b6d18618013eadd3b3e3144c90b16d0d5f07b3af", "parents": [ "181eb39425f2b9275afcb015eaa547d11f71a02f" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue May 29 15:06:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:24 2012 -0700" }, "message": "memcg: fix/change behavior of shared anon at moving task\n\nThis patch changes memcg\u0027s behavior at task_move().\n\nAt task_move(), the kernel scans a task\u0027s page table and move the changes\nfor mapped pages from source cgroup to target cgroup. There has been a\nbug at handling shared anonymous pages for a long time.\n\nBefore patch:\n - The spec says \u0027shared anonymous pages are not moved.\u0027\n - The implementation was \u0027shared anonymoys pages may be moved\u0027.\n If page_mapcount \u003c\u003d2, shared anonymous pages\u0027s charge were moved.\n\nAfter patch:\n - The spec says \u0027all anonymous pages are moved\u0027.\n - The implementation is \u0027all anonymous pages are moved\u0027.\n\nConsidering usage of memcg, this will not affect user\u0027s experience.\n\u0027shared anonymous\u0027 pages only exists between a tree of processes which\ndon\u0027t do exec(). Moving one of process without exec() seems not sane.\nFor example, libcgroup will not be affected by this change. (Anyway, no\none noticed the implementation for a long time...)\n\nBelow is a discussion log:\n\n - current spec/implementation are complex\n - Now, shared file caches are moved\n - It adds unclear check as page_mapcount(). To do correct check,\n we should check swap users, etc.\n - No one notice this implementation behavior. So, no one get benefit\n from the design.\n - In general, once task is moved to a cgroup for running, it will not\n be moved....\n - Finally, we have control knob as memory.move_charge_at_immigrate.\n\nHere is a patch to allow moving shared pages, completely. This makes\nmemcg simpler and fix current broken code.\n\nSuggested-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "692569946fbf56fbb75d85c57679541f9a3550b4", "tree": "74e8dbcec28756ef92a9782b7e17311c47b72597", "parents": [ "51300cef41c9355a7d428fe0714888d3c72a6f2f" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Tue May 29 15:06:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:23 2012 -0700" }, "message": "mm: document the meminfo and vmstat fields of relevance to transparent hugepages\n\nUpdate Documentation/vm/transhuge.txt and\nDocumentation/filesystems/proc.txt with some information on monitoring\ntransparent huge page usage and the associated overhead.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "17cf28afea2a1112f240a3a2da8af883be024811", "tree": "ed9e3eb9b1d44118a12e4ecdf369e3b9b3208be1", "parents": [ "3f31d07571eeea18a7d34db9af21d2285b807a17" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Tue May 29 15:06:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:23 2012 -0700" }, "message": "mm/fs: remove truncate_range\n\nRemove vmtruncate_range(), and remove the truncate_range method from\nstruct inode_operations: only tmpfs ever supported it, and tmpfs has now\nconverted over to using the fallocate method of file_operations.\n\nUpdate Documentation accordingly, adding (setlease and) fallocate lines.\nAnd while we\u0027re in mm.h, remove duplicate declarations of shmem_lock() and\nshmem_file_setup(): everyone is now using the ones in shmem_fs.h.\n\nBased-on-patch-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Cong Wang \u003camwang@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.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": "eb6332a54542bcd3aedb121ecb247f172b8f3602", "tree": "58c2b39668bd0411e36f024e2e1f7b8e37b02260", "parents": [ "6f60b69d8cabbf7c0daf879cae4d09ac0776f4b4" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Tue May 29 15:06:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:20 2012 -0700" }, "message": "Documentation: memcg: future proof hierarchical statistics documentation\n\nThe hierarchical versions of per-memcg counters in memory.stat are all\ncalculated the same way and are all named total_\u003ccounter\u003e.\n\nDocumenting the pattern is easier for maintenance than listing each\ncounter twice.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Ying Han \u003cyinghan@google.com\u003e\nRandy Dunlap \u003crdunlap@xenotime.net\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "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": "d766023eea566bb3c2a57a0567af5b271908fdc2", "tree": "45e79163b73c0463075fd7faffadd923aee685b8", "parents": [ "905cec410a8b0ff3afb1845d6fe7215e0259b717", "21848d08bea8f057b3e48c00165dfd42e27eb4e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 10:40:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 10:40:11 2012 -0700" }, "message": "Merge branch \u0027doc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull documentation updates from Jiri Kosina:\n \"I am currently relaying documentation patches through \u0027doc\u0027 branch of\n trivial tree, until Rob, the new documentation maintainer, has\n established a proper tree.\"\n\n* \u0027doc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:\n doc: ext3: update documentation with barrier\u003d1 default\n Documentation/initrd.txt: Change the location of util-linux\n Documentation/SubmittingPatches: suggested the use of scripts/get_maintainer.pl\n Documentation/kernel-parameters: remove autotest and mcatest\n" }, { "commit": "da85d3426f52b3728671b1b1a67c6bed16915c0e", "tree": "167d36f5ade387e77969241f6ed9ee98eca2cf86", "parents": [ "1347a2cebcb4cd6ca94eda0ebc8c5c6825bc4544", "d6686da814c884e341d3bd8aa54947c91cb678be" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 10:37:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 10:37:56 2012 -0700" }, "message": "Merge branch \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\nPull kconfig changes from Michal Marek:\n\n - Error handling for make KCONFIG_ALLCONFIG\u003d\u003c...\u003e all*config plus a fix\n for a bug that was exposed by this\n\n - Fix for the script/config utility.\n\n* \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n scripts/config: properly report and set string options\n kbuild: all{no,yes,mod,def,rand}config only read files when instructed to.\n kconfig: Add error handling to KCONFIG_ALLCONFIG\n" }, { "commit": "1347a2cebcb4cd6ca94eda0ebc8c5c6825bc4544", "tree": "495eb1b7071a0890c1fa58c12139ebd6305e0e82", "parents": [ "90324cc1b11a211e37eabd8cb863e1a1561d6b1d", "f7fc237e330deaaea4ba6726b603d4058d1e6b38" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 10:32:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 10:32:28 2012 -0700" }, "message": "Merge branch \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\nPull kbuild updates from Michal Marek.\n\nFixed up nontrivial merge conflict in Makefile as per Stephen Rothwell\nand linux-next (and trivial arch/sparc/Makefile changes due to removed\nsparc32 logic).\n\n* \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n mips: Fix KBUILD_CPPFLAGS definition\n kbuild: fix ia64 link\n kbuild: document KBUILD_LDS, KBUILD_VMLINUX_{INIT,MAIN} and LDFLAGS_vmlinux\n kbuild: link of vmlinux moved to a script\n kbuild: refactor final link of sparc32\n kbuild: drop unused KBUILD_VMLINUX_OBJS from top-level Makefile\n kbuild: Makefile: remove unnecessary check for m68knommu ARCH\n" }, { "commit": "90324cc1b11a211e37eabd8cb863e1a1561d6b1d", "tree": "c8b79c6850420a114ca6660c1b44fc486b1ba86d", "parents": [ "fb8b00675eb6462aacab56bca31ed6107bda5314", "169ebd90131b2ffca74bb2dbe7eeacd39fb83714" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 09:54:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 28 09:54:45 2012 -0700" }, "message": "Merge tag \u0027writeback\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\nPull writeback tree from Wu Fengguang:\n \"Mainly from Jan Kara to avoid iput() in the flusher threads.\"\n\n* tag \u0027writeback\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: Avoid iput() from flusher thread\n vfs: Rename end_writeback() to clear_inode()\n vfs: Move waiting for inode writeback from end_writeback() to evict_inode()\n writeback: Refactor writeback_single_inode()\n writeback: Remove wb-\u003elist_lock from writeback_single_inode()\n writeback: Separate inode requeueing after writeback\n writeback: Move I_DIRTY_PAGES handling\n writeback: Move requeueing when I_SYNC set to writeback_sb_inodes()\n writeback: Move clearing of I_SYNC into inode_sync_complete()\n writeback: initialize global_dirty_limit\n fs: remove 8 bytes of padding from struct writeback_control on 64 bit builds\n mm: page-writeback.c: local functions should not be exposed globally\n" }, { "commit": "ae32adc1e06d096399f195eeda12d443d53539c4", "tree": "9fc69aaabc6a7b95d435ae7197f57aaa672933db", "parents": [ "f465d145d76803fe6332092775d891c8c509aa44", "9868a060ccf769c08ec378a9829137e272e9a92c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:35:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:35:03 2012 -0700" }, "message": "Merge branch \u0027i2c-embedded/for-next\u0027 of git://git.pengutronix.de/git/wsa/linux\n\nPull i2c-embedded changes from Wolfram Sang:\n \"Major changes:\n\n - lots of devicetree additions for existing drivers. I tried hard to\n make sure the bindings are proper. In more complicated cases, I\n requested acks from people having more experience with them than\n me. That took a bit of extra time and also some time went into\n discussions with developers about what bindings are and what not.\n I have the feeling that the workflow with bindings should be\n improved to scale better. I will spend some more thought on\n this...\n\n - i2c-muxes are succesfully used meanwhile, so we dropped\n EXPERIMENTAL for them and renamed the drivers to a standard pattern\n to match the rest of the subsystem. They can also be used with\n devicetree now.\n\n - ixp2000 was removed since the whole platform goes away.\n\n - cleanups (strlcpy instead of strcpy, NULL instead of 0)\n\n - The rest is typical driver fixes I assume.\n\n All patches have been in linux-next at least since v3.4-rc6.\"\n\nFixed up trivial conflict in arch/arm/mach-lpc32xx/common.c due to the\nsame patch already having come in through the arm/soc trees, with\nadditional patches on top of it.\n\n* \u0027i2c-embedded/for-next\u0027 of git://git.pengutronix.de/git/wsa/linux: (35 commits)\n i2c: davinci: Free requested IRQ in remove\n i2c: ocores: register OF i2c devices\n i2c: tegra: notify transfer-complete after clearing status.\n I2C: xiic: Add OF binding support\n i2c: Rename last mux driver to standard pattern\n i2c: tegra: fix 10bit address configuration\n i2c: muxes: rename first set of drivers to a standard pattern\n of/i2c: implement of_find_i2c_adapter_by_node\n i2c: implement i2c_verify_adapter\n i2c-s3c2410: Add HDMIPHY quirk for S3C2440\n i2c-s3c2410: Rework device type handling\n i2c: muxes are not EXPERIMENTAL anymore\n i2c/of: Automatically populate i2c mux busses from device tree data.\n i2c: Add a struct device * parameter to i2c_add_mux_adapter()\n of/i2c: call i2c_verify_client from of_find_i2c_device_by_node\n i2c: designware: Add clk_{un}prepare() support\n i2c: designware: add PM support\n i2c: ixp2000: remove driver\n i2c: pnx: add device tree support\n i2c: imx: don\u0027t use strcpy but strlcpy\n ...\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": "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": "da89fb165e5e51a2ec1ff8a0ff6bc052d1068184", "tree": "1f15b6177a886ceef83d60c3b5a7af926442f581", "parents": [ "d5adf235adc8d8d67c10afd43922c92753f6be3c", "b25b086d23eb852bf3cfdeb60409b4967ebb3c0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:37:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:37:26 2012 -0700" }, "message": "Merge tag \u0027tag-for-linus-3.5\u0027 of git://git.linaro.org/people/sumitsemwal/linux-dma-buf\n\nPull dma-buf updates from Sumit Semwal:\n \"Here\u0027s the first signed-tag pull request for dma-buf framework. It\n includes the following key items:\n - mmap support\n - vmap support\n - related documentation updates\n\n These are needed by various drivers to allow mmap/vmap of dma-buf\n shared buffers. Dave Airlie has some prime patches dependent on the\n vmap pull as well.\"\n\n* tag \u0027tag-for-linus-3.5\u0027 of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:\n dma-buf: add initial vmap documentation\n dma-buf: minor documentation fixes.\n dma-buf: add vmap interface\n dma-buf: mmap support\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": "be87cfb47c5c740f7b17929bcd7c480b228513e0", "tree": "48a82c823205e4ac0b50ea7d6c336fc5a26b5bbe", "parents": [ "58823de9d2f1265030d0d06cb03cc2a551994398", "adcc70b249ca77c1197eb62b1645146721ba6e5b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:45:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:45:25 2012 -0700" }, "message": "Merge tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound update from Takashi Iwai:\n \"This is the second updates for 3.5-rc1. It\u0027s mainly for OMAP4 HDMI\n updates and the device tree updates for OMAP, in addition to a couple\n of PCM accuray improvement and Realtek ALC269VD codec support.\"\n\n* tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)\n ALSA: hda/realtek - Add new codec support for ALC269VD\n ALSA: core: group read of pointer, tstamp and jiffies\n ASoC: OMAP: HDMI: Rename sound card source file\n ASoC: OMAP: HDMI: Make sound card naming more generic\n ASoC: OMAP: HDMI: Make build config options more generic\n ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI\n ASoC: OMAP: HDMI: Improve how the display state is verified\n ASoC: OMAP: HDMI: Expand configuration of hw_params\n ASoC: OMAP: HDMI: Use the DSS audio interface\n ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI\n ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI\n ASoC: OMAP: HDMI: Update the platform device names\n ASoC: omap-abe-twl6040: Introduce driver data for runtime parameters\n ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm table\n ASoC: omap-abe-twl6040: Keep only one snd_soc_dai_link structure\n ASoC: omap-dmic: Add device tree bindings\n ASoC: omap-mcpdm: Add device tree bindings\n ASoC: omap-mcbsp: buffer size constraint only applies to playback stream\n ASoC: omap-mcbsp: Use the common interrupt line if supported by the SoC\n ASoC: omap-mcbsp: Remove unused FRAME dma_op_mode\n ...\n" }, { "commit": "4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85", "tree": "99cc41c06ade46f9925268728417c9529ce5041e", "parents": [ "92bf3d09410531a06e06504957271e3978f937e2", "7b91747d42a1012e3781dd09fa638d113809e3fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:30:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:30:35 2012 -0700" }, "message": "Merge tag \u0027cris-for-linus\u0027 of git://jni.nu/cris\n\nPull CRIS changes from Jesper Nilsson:\n \"No major changes here, but fixes some compile errors for CRIS, some\n small style issues, some documentation and as a bonus nukes a couple\n of obsolete rtc-files and related code.\"\n\n* tag \u0027cris-for-linus\u0027 of git://jni.nu/cris:\n cris: Remove old legacy \"-traditional\" flag from arch-v10/lib/Makefile\n CRIS: Remove legacy RTC drivers\n cris/mm/fault.c: Port OOM changes to do_page_fault\n cris:fix the wrong function declear\n CRIS: Add _sdata to vmlinux.lds.S\n cris: posix_types.h, include asm-generic/posix_types.h\n CRIS: Update documentation\n cris/arch-v32: cryptocop: Use kzalloc\n net:removed the unused variable\n cris:removed the unused variable\n CRISv32: Correct name of read_mostly section.\n" }, { "commit": "92bf3d09410531a06e06504957271e3978f937e2", "tree": "e638413049deb010103bc65e2650d1315dbaa748", "parents": [ "603d6637aeb9a14cd0087d7c24c3777bfa51fcbf", "0caaa9539adcff38ce12e99f0ab25645e7eb3eea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:23:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:23:32 2012 -0700" }, "message": "Merge tag \u0027mmc-merge-for-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC changes from Chris Ball\n - at91-mci: This driver will be replaced by atmel-mci in 3.7.\n - atmel-mci: Add support for old at91-mci hardware.\n - dw_mmc: Allow multiple controllers; this previously caused\n corruption.\n - imxmmc: Remove this driver, replaced by mxcmmc.\n - mmci: Add device tree support.\n - omap: Allow multiple controllers.\n - omap_hsmmc: Auto CMD12, DDR support.\n - tegra: Support SD 3.0 spec.\n\nFix up the usual trivial conflicts in feature-removal-schedule.txt\n\n* tag \u0027mmc-merge-for-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (38 commits)\n mmc: at91-mci: this driver is now deprecated\n mmc: omap_hsmmc: pass IRQF_ONESHOT to request_threaded_irq\n mmc: block: Allow disabling 512B sector size emulation\n mmc: atmel-mci: add debug logs\n mmc: atmel-mci: add support for version lower than v2xx\n mmc: atmel-mci: change the state machine for compatibility with old IP\n mmc: atmel-mci: the r/w proof capability lack was not well managed\n mmc: dw_mmc: Fixed sdio interrupt mask bit setting bug\n mmc: omap: convert to module_platform_driver\n mmc: omap: make it behave well as a module\n mmc: omap: convert to per instance workqueue\n mmc: core: Remove dead code\n mmc: card: Avoid null pointer dereference\n mmc: core: Prevent eMMC VCC supply to be cut from late init\n mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue\n mmc: queue: remove redundant memsets\n mmc: queue: rename mmc_request function\n mmc: core: skip card initialization if power class selection fails\n mmc: core: fix the signaling 1.8V for HS200\n mmc: core: fix the decision of HS200/DDR card-type\n ...\n" }, { "commit": "ece78b7df734726e790dcab207f463401ff80440", "tree": "4a0b23c28c6a727d5eebc8a88a22fe3720c425fd", "parents": [ "07acfc2a9349a8ce45b236c2624dad452001966b", "0324876628a9c7faf8127e20af29373dc6dec876" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:14:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 08:14:59 2012 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs\n\nPull ext2, ext3 and quota fixes from Jan Kara:\n \"Interesting bits are:\n - removal of a special i_mutex locking subclass (I_MUTEX_QUOTA) since\n quota code does not need i_mutex anymore in any unusual way.\n - backport (from ext4) of a fix of a checkpointing bug (missing cache\n flush) that could lead to fs corruption on power failure\n\n The rest are just random small fixes \u0026 cleanups.\"\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:\n ext2: trivial fix to comment for ext2_free_blocks\n ext2: remove the redundant comment for ext2_export_ops\n ext3: return 32/64-bit dir name hash according to usage type\n quota: Get rid of nested I_MUTEX_QUOTA locking subclass\n quota: Use precomputed value of sb_dqopt in dquot_quota_sync\n ext2: Remove i_mutex use from ext2_quota_write()\n reiserfs: Remove i_mutex use from reiserfs_quota_write()\n ext4: Remove i_mutex use from ext4_quota_write()\n ext3: Remove i_mutex use from ext3_quota_write()\n quota: Fix double lock in add_dquot_ref() with CONFIG_QUOTA_DEBUG\n jbd: Write journal superblock with WRITE_FUA after checkpointing\n jbd: protect all log tail updates with j_checkpoint_mutex\n jbd: Split updating of journal superblock and marking journal empty\n ext2: do not register write_super within VFS\n ext2: Remove s_dirt handling\n ext2: write superblock only once on unmount\n ext3: update documentation with barrier\u003d1 default\n ext3: remove max_debt in find_group_orlov()\n jbd: Refine commit writeout logic\n" }, { "commit": "21848d08bea8f057b3e48c00165dfd42e27eb4e9", "tree": "8a485826426a3de0d748367695149178c9e14484", "parents": [ "76dab97cd8e21e9d29ed41278b9a5308869a50e3" ], "author": { "name": "Stefan Hajnoczi", "email": "stefanha@linux.vnet.ibm.com", "time": "Wed Mar 28 09:32:32 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri May 25 16:19:55 2012 +0200" }, "message": "doc: ext3: update documentation with barrier\u003d1 default\n\nCommit 00eacd6 (\"ext3: make ext3 mount default to barrier\u003d1\") changed\nthe default barrier mount option for ext3. The documentation needs to\nbe updated, so this patch does that.\n\nSigned-off-by: Stefan Hajnoczi \u003cstefanha@linux.vnet.ibm.com\u003e\nAcked-by: Rob Landley \u003crob@landley.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "76dab97cd8e21e9d29ed41278b9a5308869a50e3", "tree": "fe232288bf7762bfd22d7f4467eb24d4b23cbcd5", "parents": [ "e52d2e1f25f03edf7628fae219150d8dc5023081" ], "author": { "name": "Marcos Paulo de Souza", "email": "marcos.souza.org@gmail.com", "time": "Thu Apr 12 00:14:34 2012 -0300" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri May 25 16:18:34 2012 +0200" }, "message": "Documentation/initrd.txt: Change the location of util-linux\n\nThe address of util-linux seems deprecated. The new util-linux location is\nin the kernel.org. So, change this for the correct address.\n\nSigned-off-by: Marcos Paulo de Souza \u003cmarcos.souza.org@gmail.com\u003e\nAcked-by: Rob Landley \u003crob@landley.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e52d2e1f25f03edf7628fae219150d8dc5023081", "tree": "c1594e04583cd79518c48955ceedc85ac1ceba67", "parents": [ "9b170dbd82448826ca3b8b6ee47daf36c4f438f3" ], "author": { "name": "Michel Machado", "email": "michel@digirati.com.br", "time": "Mon Apr 02 22:10:53 2012 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri May 25 16:18:30 2012 +0200" }, "message": "Documentation/SubmittingPatches: suggested the use of scripts/get_maintainer.pl\n\nHad I found a reference to scripts/get_maintainer.pl when I first read\nDocumentation/SubmittingPatches, it would\u0027ve saved me some time.\n\nSigned-off-by: Michel Machado \u003cmichel@digirati.com.br\u003e\nAcked-by: Rob Landley \u003crob@landley.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "9b170dbd82448826ca3b8b6ee47daf36c4f438f3", "tree": "eac3040078127d2b06fa97eb00b2de8eb4c733ae", "parents": [ "e8650a08232e75274304b812ff04cfce9af9671c" ], "author": { "name": "Sebastian Andrzej Siewior", "email": "sebastian@breakpoint.cc", "time": "Mon Mar 26 21:28:33 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri May 25 16:18:25 2012 +0200" }, "message": "Documentation/kernel-parameters: remove autotest and mcatest\n\nIt has no more users, the last one is gone in \"[PATCH] ia64: Kconfig\ncleanup\" aka (\"6fd79ab50b\").\nmcatest is gone in commit \"[PATCH] ia64: SGI SN update\"\n(\"c6bacd5010ec\").\n\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Sebastian Andrzej Siewior \u003csebastian@breakpoint.cc\u003e\nAcked-by: Rob Landley \u003crob@landley.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "b25b086d23eb852bf3cfdeb60409b4967ebb3c0c", "tree": "b7c40775fe47606e319f1d2dab3842ad3460c316", "parents": [ "12c4727e1d5370270a7df781d2ba0a76e05c1137" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 13:34:38 2012 +0100" }, "committer": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Fri May 25 12:51:11 2012 +0530" }, "message": "dma-buf: add initial vmap documentation\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\n" }, { "commit": "4c78513e457f72d5554a0f6e2eabfad7b98e4f19", "tree": "2cdb5c552580f159ff66632aef781e8739c85c42", "parents": [ "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 24 14:38:52 2012 +0530" }, "committer": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Fri May 25 12:35:24 2012 +0530" }, "message": "dma-buf: mmap support\n\nCompared to Rob Clark\u0027s RFC I\u0027ve ditched the prepare/finish hooks\nand corresponding ioctls on the dma_buf file. The major reason for\nthat is that many people seem to be under the impression that this is\nalso for synchronization with outstanding asynchronous processsing.\nI\u0027m pretty massively opposed to this because:\n\n- It boils down reinventing a new rather general-purpose userspace\n synchronization interface. If we look at things like futexes, this\n is hard to get right.\n- Furthermore a lot of kernel code has to interact with this\n synchronization primitive. This smells a look like the dri1 hw_lock,\n a horror show I prefer not to reinvent.\n- Even more fun is that multiple different subsystems would interact\n here, so we have plenty of opportunities to create funny deadlock\n scenarios.\n\nI think synchronization is a wholesale different problem from data\nsharing and should be tackled as an orthogonal problem.\n\nNow we could demand that prepare/finish may only ensure cache\ncoherency (as Rob intended), but that runs up into the next problem:\nWe not only need mmap support to facilitate sw-only processing nodes\nin a pipeline (without jumping through hoops by importing the dma_buf\ninto some sw-access only importer), which allows for a nicer\nION-\u003edma-buf upgrade path for existing Android userspace. We also need\nmmap support for existing importing subsystems to support existing\nuserspace libraries. And a loot of these subsystems are expected to\nexport coherent userspace mappings.\n\nSo prepare/finish can only ever be optional and the exporter /needs/\nto support coherent mappings. Given that mmap access is always\nsomewhat fallback-y in nature I\u0027ve decided to drop this optimization,\ninstead of just making it optional. If we demonstrate a clear need for\nthis, supported by benchmark results, we can always add it in again\nlater as an optional extension.\n\nOther differences compared to Rob\u0027s RFC is the above mentioned support\nfor mapping a dma-buf through facilities provided by the importer.\nWhich results in mmap support no longer being optional.\n\nNote that this dma-buf mmap patch does _not_ support every possible\ninsanity an existing subsystem could pull of with mmap: Because it\ndoes not allow to intercept pagefaults and shoot down ptes importing\nsubsystems can\u0027t add some magic of their own at these points (e.g. to\nautomatically synchronize with outstanding rendering or set up some\nspecial resources). I\u0027ve done a cursory read through a few mmap\nimplementions of various subsytems and I\u0027m hopeful that we can avoid\nthis (and the complexity it\u0027d bring with it).\n\nAdditonally I\u0027ve extended the documentation a bit to explain the hows\nand whys of this mmap extension.\n\nIn case we ever want to add support for explicitly cache maneged\nuserspace mmap with a prepare/finish ioctl pair, we could specify that\nuserspace needs to mmap a different part of the dma_buf, e.g. the\nrange starting at dma_buf-\u003esize up to dma_buf-\u003esize*2. This works\nbecause the size of a dma_buf is invariant over it\u0027s lifetime. The\nexporter would obviously need to fall back to coherent mappings for\nboth ranges if a legacy clients maps the coherent range and the\narchitecture cannot suppor conflicting caching policies. Also, this\nwould obviously be optional and userspace needs to be able to fall\nback to coherent mappings.\n\nv2:\n- Spelling fixes from Rob Clark.\n- Compile fix for !DMA_BUF from Rob Clark.\n- Extend commit message to explain how explicitly cache managed mmap\n support could be added later.\n- Extend the documentation with implementations notes for exporters\n that need to manually fake coherency.\n\nv3:\n- dma_buf pointer initialization goof-up noticed by Rebecca Schultz\n Zavin.\n\nCc: Rob Clark \u003crob.clark@linaro.org\u003e\nCc: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\nAcked-by: Rob Clark \u003crob.clark@linaro.org\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\n" }, { "commit": "5307c9556bc17e3cd26d4e94fc3b2565921834de", "tree": "e51937060ccd5e293dec7246a7961b0ae5509a53", "parents": [ "ce004178be1bbaa292e9e6497939e2970300095a" ], "author": { "name": "Mike Galbraith", "email": "mgalbraith@suse.de", "time": "Tue May 08 12:20:58 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 25 01:44:50 2012 +0200" }, "message": "tick: Add tick skew boot option\n\nLet the user decide whether power consumption or jitter is the\nmore important consideration for their machines.\n\nQuoting removal commit af5ab277ded04bd9bc6b048c5a2f0e7d70ef0867:\n\n\"Historically, Linux has tried to make the regular timer tick on the\n various CPUs not happen at the same time, to avoid contention on\n xtime_lock.\n \n Nowadays, with the tickless kernel, this contention no longer happens\n since time keeping and updating are done differently. In addition,\n this skew is actually hurting power consumption in a measurable way on\n many-core systems.\"\n\nProblems:\n\n- Contrary to the above, systems do encounter contention on both\n xtime_lock and RCU structure locks when the tick is synchronized.\n \n- Moderate sized RT systems suffer intolerable jitter due to the tick\n being synchronized.\n\n- SGI reports the same for their large systems.\n\n- Fully utilized systems reap no power saving benefit from skew removal,\n but do suffer from resulting induced lock contention.\n\n- 0209f649 rcu: limit rcu_node leaf-level fanout\n This patch was born to combat lock contention which testing showed\n to have been _induced by_ skew removal. Skew the tick, contention\n disappeared virtually completely.\n\nSigned-off-by: Mike Galbraith \u003cmgalbraith@suse.de\u003e\nLink: http://lkml.kernel.org/r/1336472458.21924.78.camel@marge.simpson.net\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\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": "0708500d49e8439d9fe5529795bdc1485f0f46c3", "tree": "2019b8ebcd86c9b593e56ac1d630c921f130c8d3", "parents": [ "be122abe4bcd6d39b37892daae28c8bf5e4030fc", "8d6c1efa51236bb781f202aa13b9f4ba654978c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:57:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:57:18 2012 -0700" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull device tree changes from Grant Likely:\n \"Mostly documentation updates, but also includes an empty stub for\n non-CONFIG_OF builds.\"\n\n* tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n dt/documentation: Fix value format description\n dt: add vendor prefix for EM Microelectronics\n ARM: DT: Add binding for GIC virtualization extentions (VGIC)\n of/irq: add empty irq_of_parse_and_map() for non-dt builds\n" }, { "commit": "f0d1b3c2bcc5de8a17af5f2274f7fcde8292b5fc", "tree": "9103d4258fa91dc97d06f76673fc9478d9ac51bd", "parents": [ "e26b203ede31fffd52571a5ba607a26c79dc5c0d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu May 24 07:13:30 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 24 16:22:53 2012 -0400" }, "message": "net/wanrouter: Deprecate and schedule for removal\n\nNo one uses this on current kernels anymore.\n\nLet it be known it\u0027s going to be removed eventually.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2fde3a65e88330017b816faf2ef75f141d21375", "tree": "57152ab5756e7ed1c58742e7e16f13a45ff11f21", "parents": [ "28f3d717618156c0dcd2f497d791b578a7931d87", "8c914028f5ddaa417b7d0f4b7fdc24caceaa8043" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:42:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 12:42:54 2012 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull main drm updates from Dave Airlie:\n \"This is the main merge window request for the drm.\n\n It\u0027s big, but jam packed will lots of features and of course 0\n regressions. (okay maybe there\u0027ll be one).\n\n Highlights:\n\n - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus\n (qemu only). These drivers use the generic modesetting drivers.\n\n - initial prime/dma-buf support for i915, nouveau, radeon, udl and\n exynos\n\n - switcheroo audio support: so GPUs with HDMI can turn off the sound\n driver without crashing stuff.\n\n - There are some patches drifting outside drivers/gpu into x86 and\n EFI for better handling of multiple video adapters in Apple Macs,\n they\u0027ve got correct acks except one trivial fixup.\n\n - Core:\n\tedid parser has better DMT and reduced blanking support,\n\tcrtc properties,\n\tplane properties,\n\n - Drivers:\n\texynos: add 2D core accel support, prime support, hdmi features\n\tintel: more Haswell support, initial Valleyview support, more\n\t hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of\n\t cleanups and fixes\n\tradeon: more HDMI audio support, improved GPU lockup recovery\n\t support, remove nested mutexes, less memory copying on PCIE, fix\n\t bus master enable race (kexec), improved fence handling\n\tgma500: cleanups, 1080p support, acpi fixes\n\tnouveau: better nva3 memory reclocking, kepler accel (needs\n\t external firmware rip), async buffer moves on nv84+ hw.\n\n I\u0027ve some more dma-buf patches that rely on the dma-buf merge for vmap\n stuff, and I\u0027ve a few fixes building up, but I\u0027d decided I\u0027d better\n get rid of the main pull sooner rather than later, so the audio guys\n are also unblocked.\"\n\nFix up trivial conflict due to some duplicated changes in\ndrivers/gpu/drm/i915/intel_ringbuffer.c\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (605 commits)\n drm/nouveau/nvd9: Fix GPIO initialisation sequence.\n drm/nouveau: Unregister switcheroo client on exit\n drm/nouveau: Check dsm on switcheroo unregister\n drm/nouveau: fix a minor annoyance in an output string\n drm/nouveau: turn a BUG into a WARN\n drm/nv50: decode PGRAPH DATA_ERROR \u003d 0x24\n drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks\n drm/nvd9/copy: initialise copy engine, seems to work like nvc0\n drm/nvc0/ttm: use copy engines for async buffer moves\n drm/nva3/ttm: use copy engine for async buffer moves\n drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method\n drm/nv84/ttm: use crypto engine for async buffer copies\n drm/nouveau/ttm: untangle code to support accelerated buffer moves\n drm/nouveau/fbcon: use fence for sync, rather than notifier\n drm/nv98/crypt: non-stub implementation of the engine hooks\n drm/nouveau/fifo: turn all fifo modules into engine modules\n drm/nv50/graph: remove ability to do interrupt-driven context switching\n drm/nv50: remove manual context unload on context destruction\n drm/nv50: remove execution engine context saves on suspend\n drm/nv50/fifo: use hardware channel kickoff functionality\n ...\n" }, { "commit": "28f3d717618156c0dcd2f497d791b578a7931d87", "tree": "37b11581b51929b5473541e53bd242b3e1a9f666", "parents": [ "654443e20dfc0617231f28a07c96a979ee1a0239", "1ca7ee30630e1022dbcf1b51be20580815ffab73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:54:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:54:29 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull more networking updates from David Miller:\n \"Ok, everything from here on out will be bug fixes.\"\n\n1) One final sync of wireless and bluetooth stuff from John Linville.\n These changes have all been in his tree for more than a week, and\n therefore have had the necessary -next exposure. John was just away\n on a trip and didn\u0027t have a change to send the pull request until a\n day or two ago.\n\n2) Put back some defines in user exposed header file areas that were\n removed during the tokenring purge. From Stephen Hemminger and Paul\n Gortmaker.\n\n3) A bug fix for UDP hash table allocation got lost in the pile due to\n one of those \"you got it.. no I\u0027ve got it..\" situations. :-)\n\n From Tim Bird.\n\n4) SKB coalescing in TCP needs to have stricter checks, otherwise we\u0027ll\n try to coalesce overlapping frags and crash. Fix from Eric Dumazet.\n\n5) RCU routing table lookups can race with free_fib_info(), causing\n crashes when we deref the device pointers in the route. Fix by\n releasing the net device in the RCU callback. From Yanmin Zhang.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits)\n tcp: take care of overlaps in tcp_try_coalesce()\n ipv4: fix the rcu race between free_fib_info and ip_route_output_slow\n mm: add a low limit to alloc_large_system_hash\n ipx: restore token ring define to include/linux/ipx.h\n if: restore token ring ARP type to header\n xen: do not disable netfront in dom0\n phy/micrel: Fix ID of KSZ9021\n mISDN: Add X-Tensions USB ISDN TA XC-525\n gianfar:don\u0027t add FCB length to hard_header_len\n Bluetooth: Report proper error number in disconnection\n Bluetooth: Create flags for bt_sk()\n Bluetooth: report the right security level in getsockopt\n Bluetooth: Lock the L2CAP channel when sending\n Bluetooth: Restore locking semantics when looking up L2CAP channels\n Bluetooth: Fix a redundant and problematic incoming MTU check\n Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C\n Bluetooth: Fix EIR data generation for mgmt_device_found\n Bluetooth: Fix Inquiry with RSSI event mask\n Bluetooth: improve readability of l2cap_seq_list code\n Bluetooth: Fix skb length calculation\n ...\n" }, { "commit": "654443e20dfc0617231f28a07c96a979ee1a0239", "tree": "a0dc3f093eb13892539082e663607c34b4fc2d07", "parents": [ "2c01e7bc46f10e9190818437e564f7e0db875ae9", "9cba26e66d09bf394ae5a739627a1dc8b7cae6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "message": "Merge branch \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull user-space probe instrumentation from Ingo Molnar:\n \"The uprobes code originates from SystemTap and has been used for years\n in Fedora and RHEL kernels. This version is much rewritten, reviews\n from PeterZ, Oleg and myself shaped the end result.\n\n This tree includes uprobes support in \u0027perf probe\u0027 - but SystemTap\n (and other tools) can take advantage of user probe points as well.\n\n Sample usage of uprobes via perf, for example to profile malloc()\n calls without modifying user-space binaries.\n\n First boot a new kernel with CONFIG_UPROBE_EVENT\u003dy enabled.\n\n If you don\u0027t know which function you want to probe you can pick one\n from \u0027perf top\u0027 or can get a list all functions that can be probed\n within libc (binaries can be specified as well):\n\n\t$ perf probe -F -x /lib/libc.so.6\n\n To probe libc\u0027s malloc():\n\n\t$ perf probe -x /lib64/libc.so.6 malloc\n\tAdded new event:\n\tprobe_libc:malloc (on 0x7eac0)\n\n You can now use it in all perf tools, such as:\n\n\tperf record -e probe_libc:malloc -aR sleep 1\n\n Make use of it to create a call graph (as the flat profile is going to\n look very boring):\n\n\t$ perf record -e probe_libc:malloc -gR make\n\t[ perf record: Woken up 173 times to write data ]\n\t[ perf record: Captured and wrote 44.190 MB perf.data (~1930712\n\n\t$ perf report | less\n\n\t 32.03% git libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--0.95%-- 0x208eb1000000000\n\t |\n\t |--0.63%-- htab_traverse_noresize\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 5.07% sh libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.99% python-config libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.54% make libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--7.34%-- glob\n\t | |\n\t | |--93.18%-- 0x41588f\n\t | |\n\t | --6.82%-- glob\n\t | 0x41588f\n\n\t ...\n\n Or:\n\n\t$ perf report -g flat | less\n\n\t# Overhead Command Shared Object Symbol\n\t# ........ ............. ............. ..........\n\t#\n\t 32.03% git libc-2.15.so [.] malloc\n\t 27.19%\n\t malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t 24.77%\n\t malloc\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t 11.02%\n\t malloc\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t 6.57%\n\t malloc\n\n\t ...\n\n The core uprobes design is fairly straightforward: uprobes probe\n points register themselves at (inode:offset) addresses of\n libraries/binaries, after which all existing (or new) vmas that map\n that address will have a software breakpoint injected at that address.\n vmas are COW-ed to preserve original content. The probe points are\n kept in an rbtree.\n\n If user-space executes the probed inode:offset instruction address\n then an event is generated which can be recovered from the regular\n perf event channels and mmap-ed ring-buffer.\n\n Multiple probes at the same address are supported, they create a\n dynamic callback list of event consumers.\n\n The basic model is further complicated by the XOL speedup: the\n original instruction that is probed is copied (in an architecture\n specific fashion) and executed out of line when the probe triggers.\n The XOL area is a single vma per process, with a fixed number of\n entries (which limits probe execution parallelism).\n\n The API: uprobes are installed/removed via\n /sys/kernel/debug/tracing/uprobe_events, the API is integrated to\n align with the kprobes interface as much as possible, but is separate\n to it.\n\n Injecting a probe point is privileged operation, which can be relaxed\n by setting perf_paranoid to -1.\n\n You can use multiple probes as well and mix them with kprobes and\n regular PMU events or tracepoints, when instrumenting a task.\"\n\nFix up trivial conflicts in mm/memory.c due to previous cleanup of\nunmap_single_vma().\n\n* \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)\n perf probe: Detect probe target when m/x options are absent\n perf probe: Provide perf interface for uprobes\n tracing: Fix kconfig warning due to a typo\n tracing: Provide trace events interface for uprobes\n tracing: Extract out common code for kprobes/uprobes trace events\n tracing: Modify is_delete, is_return from int to bool\n uprobes/core: Decrement uprobe count before the pages are unmapped\n uprobes/core: Make background page replacement logic account for rss_stat counters\n uprobes/core: Optimize probe hits with the help of a counter\n uprobes/core: Allocate XOL slots for uprobes use\n uprobes/core: Handle breakpoint and singlestep exceptions\n uprobes/core: Rename bkpt to swbp\n uprobes/core: Make order of function parameters consistent across functions\n uprobes/core: Make macro names consistent\n uprobes: Update copyright notices\n uprobes/core: Move insn to arch specific structure\n uprobes/core: Remove uprobe_opcode_sz\n uprobes/core: Make instruction tables volatile\n uprobes: Move to kernel/events/\n uprobes/core: Clean up, refactor and improve the code\n ...\n" }, { "commit": "2c01e7bc46f10e9190818437e564f7e0db875ae9", "tree": "8b06c85d69754f7df27f7fb42520f6e2ceaea907", "parents": [ "ab11ca34eea8fda7a1a9302d86f6ef6108ffd68f", "e644dae645e167d154c0526358940986682a72b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:34:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 10:34:29 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input layer updates from Dmitry Torokhov:\n - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics\n Navpoint, LM8333 keypads, Wacom I2C touhscreen);\n - updates to existing touchpad drivers (ALPS, Sntelic);\n - Wacom driver now supports Intuos5;\n - device-tree bindings in numerous drivers;\n - other cleanups and fixes.\n\nFix annoying conflict in drivers/input/tablet/wacom_wac.c that I think\nimplies that the input layer device naming is broken, but let\u0027s see. I\nbrough it up with Dmitry.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)\n Input: matrix-keymap - fix building keymaps\n Input: spear-keyboard - document DT bindings\n Input: spear-keyboard - add device tree bindings\n Input: matrix-keymap - wire up device tree support\n Input: matrix-keymap - uninline and prepare for device tree support\n Input: adp5588 - add support for gpio names\n Input: omap-keypad - dynamically handle register offsets\n Input: synaptics - fix compile warning\n MAINTAINERS: adjust input-related patterns\n Input: ALPS - switch to using input_mt_report_finger_count\n Input: ALPS - add semi-MT support for v4 protocol\n Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver\n Input: atmel_mxt_ts - dump each message on just 1 line\n Input: atmel_mxt_ts - do not read extra (checksum) byte\n Input: atmel_mxt_ts - verify object size in mxt_write_object\n Input: atmel_mxt_ts - only allow root to update firmware\n Input: atmel_mxt_ts - use CONFIG_PM_SLEEP\n Input: sentelic - report device\u0027s production serial number\n Input: tl6040-vibra - Device Tree support\n Input: evdev - properly handle read/write with count 0\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": "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": "0b87da68a0f0a7bf7f7446cf64f92e672bd68ef8", "tree": "cc5ddfd411bc9c5d6fb828b86eba92f50294805e", "parents": [ "59d0952b43552570e0f1c3ff91ebb16d4caec171", "cad19fa66469d2a745fae0c168833d5d33d64489" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:42:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 15:42:42 2012 -0700" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\nPull first set of watchdog updates from Wim Van Sebroeck:\n \"This pull contains:\n\n - The removal of ixp2000_wdt\n - The addition of ie6xx_wdt\n - Some documentation fixes\n - Small fixes and improvements\n\n (Note: Part 2 will contain generic watchdog core changes + conversion\n of some more drivers)\"\n\n* git://www.linux-watchdog.org/linux-watchdog:\n Documentation/watchdog: Fix the file descriptor leak when no cmdline arg given\n Documentation/watchdog: close the fd when cmdline arg given\n Documentation/watchdog: Fix a small typo\n watchdog: s3c2410_wdt: Set timeout to actually achieved timeout\n watchdog: wm831x: Convert to gpio_request_one()\n watchdog: via_wdt: depends on PCI\n watchdog: ie6xx_wdt needs io.h\n watchdog: ie6xx_wdt.c: fix printk format warning\n watchdog: Add watchdog driver for Intel Atom E6XX\n watchdog: it87_wdt: Add support for IT8728F watchdog.\n watchdog: i6300esb: don\u0027t depend on X86\n watchdog: Use module_pci_driver\n watchdog: sch311x_wdt.c: Remove RESGEN\n watchdog: s3c2410-wdt: Use of_match_ptr().\n watchdog: Device tree support for pnx4008-wdt\n watchdog: ar7_wdt.c: use devm_request_and_ioremap\n watchdog: remove ixp2000 driver\n watchdog: sp5100_tco.c: quiet sparse noise about using plain integer was NULL pointer\n" }, { "commit": "1259f6ee15c1603dcae41eb6af5a5f9cf932d4d6", "tree": "bf85658f7c5a2c86da3bc613d7fea13bbffe4e72", "parents": [ "468f4d1a855f8039dabf441b8bf68cae264033ff", "4573acbc461b8089198500cee06ef0cdc5b70e82" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:15:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:15:09 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon updates from Guenter Roeck:\n \"New driver for INA219 and INA226, added support for IT8782F and\n IT8783E/F to it87 driver, plus cleanups in a couple of drivers.\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (it87) Make temp3 attribute conditional for IT8782F\n hwmon: (it87) Convert to use devm_kzalloc and devm_request_region\n hwmon: INA219 and INA226 support\n hwmon: (it87) Create voltage attributes only if voltage is enabled\n hwmon: (ntc_thermistor) Fix checkpatch warning\n hwmon: (ntc_thermistor) Optimize and fix build warning\n hwmon: (ntc_thermistor) Return error code from hwmon_device_register\n hwmon: (ntc_thermistor) Convert to devm_kzalloc\n hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT\n acpi_power_meter: clean up code around setup_attrs\n acpi_power_meter: drop meter_rw_attrs, use common meter_attrs\n acpi_power_meter: remove duplicate code between register_{ro,rw}_attrs\n acpi_power_meter: use a {RW,RO}_SENSOR_TEMPLATE macro to clean things up\n acpi_power_meter: use the same struct {rw,ro}_sensor_template for both\n hwmon: use module_pci_driver\n hwmon: (it87) Add support for IT8782F and IT8783E/F\n" }, { "commit": "468f4d1a855f8039dabf441b8bf68cae264033ff", "tree": "303ac5bc1ac3f86f136a30f9356e84f20dcbf13f", "parents": [ "eb2689e06b3526c7684b09beecf26070f05ee825", "8714c8d74d313c3ba27bf9c2aaacb1ad71c644f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:07:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 14:07:06 2012 -0700" }, "message": "Merge tag \u0027pm-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management updates from Rafael Wysocki:\n\n - Implementation of opportunistic suspend (autosleep) and user space\n interface for manipulating wakeup sources.\n\n - Hibernate updates from Bojan Smojver and Minho Ban.\n\n - Updates of the runtime PM core and generic PM domains framework\n related to PM QoS.\n\n - Assorted fixes.\n\n* tag \u0027pm-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (25 commits)\n epoll: Fix user space breakage related to EPOLLWAKEUP\n PM / Domains: Make it possible to add devices to inactive domains\n PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format\n PM / Domains: Fix computation of maximum domain off time\n PM / Domains: Fix link checking when add subdomain\n PM / Sleep: User space wakeup sources garbage collector Kconfig option\n PM / Sleep: Make the limit of user space wakeup sources configurable\n PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo\n PM / Domains: Cache device stop and domain power off governor results, v3\n PM / Domains: Make device removal more straightforward\n PM / Sleep: Fix a mistake in a conditional in autosleep_store()\n epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready\n PM / QoS: Create device constraints objects on notifier registration\n PM / Runtime: Remove device fields related to suspend time, v2\n PM / Domains: Rework default domain power off governor function, v2\n PM / Domains: Rework default device stop governor function, v2\n PM / Sleep: Add user space interface for manipulating wakeup sources, v3\n PM / Sleep: Add \"prevent autosleep time\" statistics to wakeup sources\n PM / Sleep: Implement opportunistic sleep, v2\n PM / Sleep: Add wakeup_source_activate and wakeup_source_deactivate tracepoints\n ...\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": "6f73b3629f774c6cba589b15fd095112b25ca923", "tree": "50a60feae71cb5f40078f552b9b08468bc7b29c9", "parents": [ "3a8580f82024e30b31c662aa49346adf7a3bcdb5", "2074b1d9d53ae696dd3f49482bad43254f40f01d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:02:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 09:02:42 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc updates from Benjamin Herrenschmidt:\n \"Here are the powerpc goodies for 3.5. Main highlights are:\n\n - Support for the NX crypto engine in Power7+\n - A bunch of Anton goodness, including some micro optimization of our\n syscall entry on Power7\n - I converted a pile of our thermal control drivers to the new i2c\n APIs (essentially turning the old therm_pm72 into a proper set of\n windfarm drivers). That\u0027s one more step toward removing the\n deprecated i2c APIs, there\u0027s still a few drivers to fix, but we are\n getting close\n - kexec/kdump support for 47x embedded cores\n\n The big missing thing here is no updates from Freescale. Not sure\n what\u0027s up here, but with Kumar not working for them anymore things are\n a bit in a state of flux in that area.\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)\n powerpc: Fix irq distribution\n Revert \"powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags\"\n powerpc: Fixing a cputhread code documentation\n powerpc/crypto: Enable the PFO-based encryption device\n powerpc/crypto: Build files for the nx device driver\n powerpc/crypto: debugfs routines and docs for the nx device driver\n powerpc/crypto: SHA512 hash routines for nx encryption\n powerpc/crypto: SHA256 hash routines for nx encryption\n powerpc/crypto: AES-XCBC mode routines for nx encryption\n powerpc/crypto: AES-GCM mode routines for nx encryption\n powerpc/crypto: AES-ECB mode routines for nx encryption\n powerpc/crypto: AES-CTR mode routines for nx encryption\n powerpc/crypto: AES-CCM mode routines for nx encryption\n powerpc/crypto: AES-CBC mode routines for nx encryption\n powerpc/crypto: nx driver code supporting nx encryption\n powerpc/pseries: Enable the PFO-based RNG accelerator\n powerpc/pseries/hwrng: PFO-based hwrng driver\n powerpc/pseries: Add PFO support to the VIO bus\n powerpc/pseries: Add pseries update notifier for OFDT prop changes\n powerpc/pseries: Add new hvcall constants to support PFO\n ...\n" }, { "commit": "cad19fa66469d2a745fae0c168833d5d33d64489", "tree": "0621fd18462f9308fc0c66543d05b756a3d51557", "parents": [ "3c2a6186c1a69d647e3a48ad3f7f9078c451111e" ], "author": { "name": "Devendra Naga", "email": "devendra.aaru@gmail.com", "time": "Thu May 17 15:07:48 2012 +0530" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:27:48 2012 +0200" }, "message": "Documentation/watchdog: Fix the file descriptor leak when no cmdline arg given\n\nwe start a infinite loop when user gives ./watchdog-test, and when user\nctrl + c\u0027s the program, we just exit immeadiately with out closing the\nfiledescriptor of the watchdog device. a signal handler is used to\ndo the job of closing the filedescriptor and exiting the program.\n\nSigned-off-by: Devendra Naga \u003cdevendra.aaru@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "3c2a6186c1a69d647e3a48ad3f7f9078c451111e", "tree": "4c88ca07108376d64fa29a43cbdff3e245a2a676", "parents": [ "2deca7365582b7568dbdd2c3d9eef7ac17d41fd6" ], "author": { "name": "Devendra Naga", "email": "devendra.aaru@gmail.com", "time": "Mon May 14 23:42:02 2012 +0530" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:27:40 2012 +0200" }, "message": "Documentation/watchdog: close the fd when cmdline arg given\n\nin the watchdog test code, the ioctl is performed on the watchdog device\nand just doing exit(0) so we leak a filedescripor.\n\nSigned-off-by: Devendra Naga \u003cdevendra.aaru@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "2deca7365582b7568dbdd2c3d9eef7ac17d41fd6", "tree": "a826da67afb2fa6b5bcb6b4d7cb97b20914856cc", "parents": [ "5f2430f554aabb4810b2a6f906be571ac1241d96" ], "author": { "name": "Devendra Naga", "email": "devendra.aaru@gmail.com", "time": "Mon May 14 14:33:37 2012 +0530" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:27:00 2012 +0200" }, "message": "Documentation/watchdog: Fix a small typo\n\nSigned-off-by: Devendra Naga \u003cdevendra.aaru@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "3ba3774b8c433fe9e91158d65cf2324ff0c5a15d", "tree": "10f26eabcc5e67ff65845f384c84491c354c2296", "parents": [ "ae21cc20a604b45e97d0cdbce7e9302ce7dd7d5c" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Fri Apr 20 21:55:29 2012 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Wed May 23 16:16:55 2012 +0200" }, "message": "watchdog: Device tree support for pnx4008-wdt\n\nThis patch adds device tree support to pnx4008-wdt.c\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "9a74e884ee71dbf3d0967b0321d7b4529a04826c", "tree": "29cf0211927a3e54908f2dffa9ebde18794d6ed6", "parents": [ "fd8f89027d816cb023edf6bfd4c744f194150a05" ], "author": { "name": "Robert Love", "email": "robert.w.love@intel.com", "time": "Tue May 22 19:06:21 2012 -0700" }, "committer": { "name": "James Bottomley", "email": "JBottomley@Parallels.com", "time": "Wed May 23 09:40:09 2012 +0100" }, "message": "[SCSI] libfcoe: Add fcoe_sysfs\n\nThis patch adds a \u0027fcoe bus\u0027 infrastructure to the kernel\nthat is driven by changes to libfcoe which allow LLDs to\npresent FIP (FCoE Initialization Protocol) discovered\nentities and their attributes to user space via sysfs.\n\nThis patch adds the following APIs-\n\nfcoe_ctlr_device_add\nfcoe_ctlr_device_delete\nfcoe_fcf_device_add\nfcoe_fcf_device_delete\n\nThey allow the LLD to expose the FCoE ENode Controller\nand any discovered FCFs (Fibre Channel Forwarders, e.g.\nFCoE switches) to the user. Each of these new devices\nhas their own bus_type so that they are grouped together\nfor easy lookup from a user space application. Each\nnew class has an attribute_group to expose attributes\nfor any created instances. The attributes are-\n\nfcoe_ctlr_device\n* fcf_dev_loss_tmo\n* lesb_link_fail\n* lesb_vlink_fail\n* lesb_miss_fka\n* lesb_symb_err\n* lesb_err_block\n* lesb_fcs_error\n\nfcoe_fcf_device\n* fabric_name\n* switch_name\n* priority\n* selected\n* fc_map\n* vfid\n* mac\n* fka_peroid\n* fabric_state\n* dev_loss_tmo\n\nA device loss infrastructre similar to the FC Transport\u0027s\nis also added by this patch. It is nice to have so that a\nlink flapping adapter doesn\u0027t continually advance the count\nused to identify the discovered FCF. FCFs will exist in a\n\"Disconnected\" state until either the timer expires or the\nFCF is rediscovered and becomes \"Connected.\"\n\nThis patch generates a few checkpatch.pl WARNINGS that\nI\u0027m not sure what to do about. They\u0027re macros modeled\naround the FC Transport attribute building macros, which\nhave the same \u0027feature\u0027 where the caller can ommit a cast\nin the argument list and no cast occurs in the code. I\u0027m\nnot sure how to keep the code condensed while keeping the\nmacros. Any advice would be appreciated.\n\nSigned-off-by: Robert Love \u003crobert.w.love@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\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": "3c2c4b73aa79e4a1b601710b59e092441175f4bb", "tree": "fbd08c3e18517871b25fe9c886caae423947d578", "parents": [ "f08b9c2f8af0d61faa1170aeae4fbca1eff6a504", "99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:21:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:21:48 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID subsystem updates from Jiri Kosina:\n \"Apart from various driver updates and added support for a number of\n new devices (mostly multitouch ones, but not limited to), there is one\n change that is worth pointing out explicitly: creation of HID device\n groups and proper autoloading of hid-multitouch, implemented by Henrik\n Rydberg.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (50 commits)\n HID: wacom: fix build breakage without CONFIG_LEDS_CLASS\n HID: waltop: Extend barrel button fix\n HID: hyperv: Set the hid drvdata correctly\n HID: wacom: Unify speed setting\n HID: wacom: Add speed setting for Intuos4 WL\n HID: wacom: Move Graphire raport header check.\n HID: uclogic: Add support for UC-Logic TWHL850\n HID: explain the signed/unsigned handling in hid_add_field()\n HID: handle logical min/max signedness properly in parser\n HID: logitech: read all 32 bits of report type bitfield\n HID: wacom: Add LED selector control for Wacom Intuos4 WL\n HID: hid-multitouch: fix wrong protocol detection\n HID: wiimote: Fix IR data parser\n HID: wacom: Add tilt reporting for Intuos4 WL\n HID: multitouch: MT interface matching for Baanto\n HID: hid-multitouch: Only match MT interfaces\n HID: Create a common generic driver\n HID: hid-multitouch: Switch to device groups\n HID: Create a generic device group\n HID: Allow bus wildcard matching\n ...\n" }, { "commit": "d79ee93de909dfb252279b9a95978bbda9a814a9", "tree": "bfccca60fd36259ff4bcc5e78a2c272fbd680065", "parents": [ "2ff2b289a695807e291e1ed9f639d8a3ba5f4254", "1c2927f18576d65631d8e0ddd19e1d023183222e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:27:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:27:32 2012 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes from Ingo Molnar:\n \"The biggest change is the cleanup/simplification of the load-balancer:\n instead of the current practice of architectures twiddling scheduler\n internal data structures and providing the scheduler domains in\n colorfully inconsistent ways, we now have generic scheduler code in\n kernel/sched/core.c:sched_init_numa() that looks at the architecture\u0027s\n node_distance() parameters and (while not fully trusting it) deducts a\n NUMA topology from it.\n\n This inevitably changes balancing behavior - hopefully for the better.\n\n There are various smaller optimizations, cleanups and fixlets as well\"\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched: Taint kernel with TAINT_WARN after sleep-in-atomic bug\n sched: Remove stale power aware scheduling remnants and dysfunctional knobs\n sched/debug: Fix printing large integers on 32-bit platforms\n sched/fair: Improve the -\u003egroup_imb logic\n sched/nohz: Fix rq-\u003ecpu_load[] calculations\n sched/numa: Don\u0027t scale the imbalance\n sched/fair: Revert sched-domain iteration breakage\n sched/x86: Rewrite set_cpu_sibling_map()\n sched/numa: Fix the new NUMA topology bits\n sched/numa: Rewrite the CONFIG_NUMA sched domain support\n sched/fair: Propagate \u0027struct lb_env\u0027 usage into find_busiest_group\n sched/fair: Add some serialization to the sched_domain load-balance walk\n sched/fair: Let minimally loaded cpu balance the group\n sched: Change rq-\u003enr_running to unsigned int\n x86/numa: Check for nonsensical topologies on real hw as well\n x86/numa: Hard partition cpu topology masks on node boundaries\n x86/numa: Allow specifying node_distance() for numa\u003dfake\n x86/sched: Make mwait_usable() heed to \"idle\u003d\" kernel parameters properly\n sched: Update documentation and comments\n sched_rt: Avoid unnecessary dequeue and enqueue of pushable tasks in set_cpus_allowed_rt()\n" }, { "commit": "88d6ae8dc33af12fe1c7941b1fae2767374046fd", "tree": "8f17415c0722b0a4d7511ac170cfb4e3802e1ad2", "parents": [ "f5c101892fbd3d2f6d2729bc7eb7b3f6c31dbddd", "0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:40:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:40:19 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup updates from Tejun Heo:\n \"cgroup file type addition / removal is updated so that file types are\n added and removed instead of individual files so that dynamic file\n type addition / removal can be implemented by cgroup and used by\n controllers. blkio controller changes which will come through block\n tree are dependent on this. Other changes include res_counter cleanup\n and disallowing kthread / PF_THREAD_BOUND threads to be attached to\n non-root cgroups.\n\n There\u0027s a reported bug with the file type addition / removal handling\n which can lead to oops on cgroup umount. The issue is being looked\n into. It shouldn\u0027t cause problems for most setups and isn\u0027t a\n security concern.\"\n\nFix up trivial conflict in Documentation/feature-removal-schedule.txt\n\n* \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n res_counter: Account max_usage when calling res_counter_charge_nofail()\n res_counter: Merge res_counter_charge and res_counter_charge_nofail\n cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads\n cgroup: remove cgroup_subsys-\u003epopulate()\n cgroup: get rid of populate for memcg\n cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg\n cgroup: make css-\u003erefcnt clearing on cgroup removal optional\n cgroup: use negative bias on css-\u003erefcnt to block css_tryget()\n cgroup: implement cgroup_rm_cftypes()\n cgroup: introduce struct cfent\n cgroup: relocate __d_cgrp() and __d_cft()\n cgroup: remove cgroup_add_file[s]()\n cgroup: convert memcg controller to the new cftype interface\n memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP\n cgroup: convert all non-memcg controllers to the new cftype interface\n cgroup: relocate cftype and cgroup_subsys definitions in controllers\n cgroup: merge cft_release_agent cftype array into the base files array\n cgroup: implement cgroup_add_cftypes() and friends\n cgroup: build list of all cgroups under a given cgroupfs_root\n cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()\n ...\n" }, { "commit": "599ed4b0aeceb6d45ea33f64639e745e3da72766", "tree": "d1d68299eacda3b12097bd3a7d4e7c895e3d6a13", "parents": [ "85e184e4c3cd3e2285ceab91ff8f0cac094e8a85", "ced47a3117ba084b404f3fc28de3ef6eaba1b911" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed May 23 01:37:59 2012 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed May 23 01:37:59 2012 +0200" }, "message": "Merge branch \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc into topic/asoc\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": "5d4e2d08e7fdf7339f84a1c670d296a77e02f881", "tree": "1c419660defa56191091dfdf50fdb57a72009173", "parents": [ "fb2123fad3b499f0898835b19dbb93b18d27ee98", "94ca629e40eb7e997be21d8065c25e4f3797b03f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:02:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:02:13 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core updates from Greg Kroah-Hartman:\n \"Here\u0027s the driver core, and other driver subsystems, pull request for\n the 3.5-rc1 merge window.\n\n Outside of a few minor driver core changes, we ended up with the\n following different subsystem and core changes as well, due to\n interdependancies on the driver core:\n - hyperv driver updates\n - drivers/memory being created and some drivers moved into it\n - extcon driver subsystem created out of the old Android staging\n switch driver code\n - dynamic debug updates\n - printk rework, and /dev/kmsg changes\n\n All of this has been tested in the linux-next releases for a few weeks\n with no reported problems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFix up conflicts in drivers/extcon/extcon-max8997.c where git noticed\nthat a patch to the deleted drivers/misc/max8997-muic.c driver needs to\nbe applied to this one.\n\n* tag \u0027driver-core-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)\n uio_pdrv_genirq: get irq through platform resource if not set otherwise\n memory: tegra{20,30}-mc: Remove empty *_remove()\n printk() - isolate KERN_CONT users from ordinary complete lines\n sysfs: get rid of some lockdep false positives\n Drivers: hv: util: Properly handle version negotiations.\n Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()\n memory: tegra{20,30}-mc: Use dev_err_ratelimited()\n driver core: Add dev_*_ratelimited() family\n Driver Core: don\u0027t oops with unregistered driver in driver_find_device()\n printk() - restore prefix/timestamp printing for multi-newline strings\n printk: add stub for prepend_timestamp()\n ARM: tegra30: Make MC optional in Kconfig\n ARM: tegra20: Make MC optional in Kconfig\n ARM: tegra30: MC: Remove unnecessary BUG*()\n ARM: tegra20: MC: Remove unnecessary BUG*()\n printk: correctly align __log_buf\n ARM: tegra30: Add Tegra Memory Controller(MC) driver\n ARM: tegra20: Add Tegra Memory Controller(MC) driver\n printk() - restore timestamp printing at console output\n printk() - do not merge continuation lines of different threads\n ...\n" }, { "commit": "fb2123fad3b499f0898835b19dbb93b18d27ee98", "tree": "7273754cded304f52dbbef86d23dda96e0a8452a", "parents": [ "a481991467d38afb43c3921d5b5b59ccb61b04ba", "991214386dee8a3cd9adc743778f472ac8a12bbc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "message": "Merge tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull Char/Misc patches from Greg Kroah-Hartman:\n \"Here are a few various char/misc tree patches for the 3.5-rc1 merge\n window.\n\n Nothing major here at all, just different driver updates and some\n parport dead code removal.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n parport: remove unused dead code from lowlevel drivers\n xilinx_hwicap: reset XHI_MAX_RETRIES\n xilinx_hwicap: add support for virtex6 FPGAs\n Support M95040 SPI EEPROM\n misc: add support for bmp18x chips to the bmp085 driver\n misc: bmp085: add device tree properties\n misc: clean up bmp085 driver\n misc: do not mark exported functions __devexit\n misc: add missing __devexit_p() annotations\n pch_phub: delete duplicate definitions\n misc: Fix irq leak in max8997_muic_probe error path\n" } ], "next": "a481991467d38afb43c3921d5b5b59ccb61b04ba" }