)]}' { "log": [ { "commit": "ce1fd36932f230ac1757914b1e99b555c95bae8f", "tree": "82fafd5d58df57be5d6ef2d10b365793c7a85c38", "parents": [ "934c2b6d0cb50f9014ba0f10241e062a3bfc462d" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Jun 14 08:54:14 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Jun 14 08:54:14 2011 +0200" }, "message": "ALSA: Update document for using KBUILD_MODNAME\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "f0f52a9463839c52a63c05d6e7d4a330d94a9794", "tree": "d964f65aa37dd46b457bc615f2f37e75390c6df8", "parents": [ "0f48f2600911d5de6393829e4a9986d4075558b3", "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6:\n intel-iommu: Fix off-by-one in RMRR setup\n intel-iommu: Add domain check in domain_remove_one_dev_info\n intel-iommu: Remove Host Bridge devices from identity mapping\n intel-iommu: Use coherent DMA mask when requested\n intel-iommu: Dont cache iova above 32bit\n intel-iommu: Speed up processing of the identity_mapping function\n intel-iommu: Check for identity mapping candidate using system dma mask\n intel-iommu: Only unlink device domains from iommu\n intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n intel-iommu: Flush unmaps at domain_exit\n intel-iommu: Remove obsolete comment from detect_intel_iommu\n intel-iommu: fix VT-d PMR disable for TXT on S3 resume\n" }, { "commit": "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d", "tree": "cb685e370cc1cb2dec39b29500bdd22fd1814596", "parents": [ "7b668357810ecb5fdda4418689d50f5d95aea6a8" ], "author": { "name": "Youquan Song", "email": "youquan.song@intel.com", "time": "Wed May 25 19:13:49 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:26:35 2011 +0100" }, "message": "intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n\nThere are no externally-visible changes with this. In the loop in the\ninternal __domain_mapping() function, we simply detect if we are mapping:\n - size \u003e\u003d 2MiB, and\n - virtual address aligned to 2MiB, and\n - physical address aligned to 2MiB, and\n - on hardware that supports superpages.\n\n(and likewise for larger superpages).\n\nWe automatically use a superpage for such mappings. We never have to\nworry about *breaking* superpages, since we trust that we will always\n*unmap* the same range that was mapped. So all we need to do is ensure\nthat dma_pte_clear_range() will also cope with superpages.\n\nAdjust pfn_to_dma_pte() to take a superpage \u0027level\u0027 as an argument, so\nit can return a PTE at the appropriate level rather than always\nextending the page tables all the way down to level 1. Again, this is\nsimplified by the fact that we should never encounter existing small\npages when we\u0027re creating a mapping; any old mapping that used the same\nvirtual range will have been entirely removed and its obsolete page\ntables freed.\n\nProvide an \u0027intel_iommu\u003dsp_off\u0027 argument on the command line as a\nchicken bit. Not that it should ever be required.\n\n\u003d\u003d\n\nThe original commit seen in the iommu-2.6.git was Youquan\u0027s\nimplementation (and completion) of my own half-baked code which I\u0027d\ntyped into an email. Followed by half a dozen subsequent \u0027fixes\u0027.\n\nI\u0027ve taken the unusual step of rewriting history and collapsing the\noriginal commits in order to keep the main history simpler, and make\nlife easier for the people who are going to have to backport this to\nolder kernels. And also so I can give it a more coherent commit comment\nwhich (hopefully) gives a better explanation of what\u0027s going on.\n\nThe original sequence of commits leading to identical code was:\n\nYouquan Song (3):\n intel-iommu: super page support\n intel-iommu: Fix superpage alignment calculation error\n intel-iommu: Fix superpage level calculation error in dma_pfn_level_pte()\n\nDavid Woodhouse (4):\n intel-iommu: Precalculate superpage support for dmar_domain\n intel-iommu: Fix hardware_largepage_caps()\n intel-iommu: Fix inappropriate use of superpages in __domain_mapping()\n intel-iommu: Fix phys_pfn in __domain_mapping for sglist pages\n\nSigned-off-by: Youquan Song \u003cyouquan.song@intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "990c91f0af46c57f0291060d928c7ab82f9d5667", "tree": "72a347b09509e3658b12d4e013f072bf2b771299", "parents": [ "bc805a03c26e1e25171bc627c6264553d27f746c" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:12 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:12 2011 +0930" }, "message": "lguest: remove support for VIRTIO_F_NOTIFY_ON_EMPTY.\n\nNo virtio device does this any more, so no need to clutter lguest with it.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bc805a03c26e1e25171bc627c6264553d27f746c", "tree": "2700f17b81a74376d6f03a0d60083ec387cbbcc4", "parents": [ "15517f7c213442e4d8a098cf0732b237f764c576" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:11 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:12 2011 +0930" }, "message": "lguest: fix up compilation after move\n\ned16648eb5b86917f0b90bdcdbc857202da72f90 \"Move kvm, uml, and lguest\nsubdirectories\" broke the lguest example launcher.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "2ba781ced93922e249dee2ac0751faccb4fb0656", "tree": "8b62346278b60d1bc9765dc6691f07219a27d894", "parents": [ "6345d24daf0c1fffe6642081d783cdf653ebaa5c", "437cb0dbd104a1564e0e78f0d486b97677f80909" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:44:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:44:33 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (43 commits)\n acer-wmi: support integer return type from WMI methods\n msi-laptop: fix section mismatch in reference from the function load_scm_model_init\n acer-wmi: support to set communication device state by new wmid method\n acer-wmi: allow 64-bits return buffer from WMI methods\n acer-wmi: check the existence of internal 3G device when set capability\n platform/x86:delete two unused variables\n support wlan hotkey on Acer Travelmate 5735Z\n platform-x86: intel_mid_thermal: Fix memory leak\n platform/x86: Fix Makefile for intel_mid_powerbtn\n platform/x86: Simplify intel_mid_powerbtn\n acer-wmi: Delete out-of-date documentation\n acerhdf: Clean up includes\n acerhdf: Drop pointless dependency on THERMAL_HWMON\n acer-wmi: Update MAINTAINERS\n wmi: Orphan ACPI-WMI driver\n tc1100-wmi: Orphan driver\n acer-wmi: does not allow negative number set to initial device state\n platform/oaktrail: ACPI EC Extra driver for Oaktrail\n thinkpad_acpi: Convert printks to pr_\u003clevel\u003e\n thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning\n ...\n" }, { "commit": "437cb0dbd104a1564e0e78f0d486b97677f80909", "tree": "e066b3d65eb965ca68ecc8ef14581f2450ad3a61", "parents": [ "139f37f5e14cd883eee2a8a36289f544b5390a44", "987dfbaa65b2c3568b85e29d2598da08a011ee09" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Sun May 29 14:27:13 2011 -0400" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Sun May 29 14:27:13 2011 -0400" }, "message": "Merge branch \u0027x86-platform-next\u0027 into x86-platform\n" }, { "commit": "daa94222b638bfe34f745d0982de7a165ce7f67c", "tree": "2157ed94339d46f7a2da22e22648a70319e8fdd0", "parents": [ "f310642123e0d32d919c60ca3fab5acd130c4ba3", "751516f0a9bad32544f40f471037c0e45fb639c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI EC: remove redundant code\n ACPI: Add D3 cold state\n ACPI: processor: fix processor_physically_present in UP kernel\n ACPI: Split out custom_method functionality into an own driver\n ACPI: Cleanup custom_method debug stuff\n ACPI EC: enable MSI workaround for Quanta laptops\n ACPICA: Update to version 20110413\n ACPICA: Execute an orphan _REG method under the EC device\n ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place\n ACPICA: Update internal address SpaceID for DataTable regions\n ACPICA: Add more methods eligible for NULL package element removal\n ACPICA: Split all internal Global Lock functions to new file - evglock\n ACPI: EC: add another DMI check for ASUS hardware\n ACPI EC: remove dead code\n ACPICA: Fix code divergence of global lock handling\n ACPICA: Use acpi_os_create_lock interface\n ACPI: osl, add acpi_os_create_lock interface\n ACPI:Fix goto flows in thermal-sys\n" }, { "commit": "f310642123e0d32d919c60ca3fab5acd130c4ba3", "tree": "f3844152e2e8c0fdd01621a400f84c8a159252a0", "parents": [ "ef1d57599dc904fdb31b8e9b5336350d21a1fde1", "5d4c47e0195b989f284907358bd5c268a44b91c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "message": "Merge branch \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6\n\n* \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:\n x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n x86 idle: deprecate \"no-hlt\" cmdline param\n x86 idle APM: deprecate CONFIG_APM_CPU_IDLE\n x86 idle floppy: deprecate disable_hlt()\n x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it\n x86 idle: clarify AMD erratum 400 workaround\n idle governor: Avoid lock acquisition to read pm_qos before entering idle\n cpuidle: menu: fixed wrapping timers at 4.294 seconds\n" }, { "commit": "5d4c47e0195b989f284907358bd5c268a44b91c7", "tree": "3a7c81ff3b3f5a5eb6199044a72c0145b58db413", "parents": [ "cdaab4a0d330f70c0e5ad8c3f7c65c2e375ea180" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:46:09 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:17 2011 -0400" }, "message": "x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n\nmwait_idle() is a C1-only idle loop intended to be more efficient\nthan HLT on SMP hardware that supports it.\n\nBut mwait_idle() has been replaced by the more general\nmwait_idle_with_hints(), which handles both C1 and deeper C-states.\nACPI uses only mwait_idle_with_hints(), and never uses mwait_idle().\n\nDeprecate mwait_idle() and the \"idle\u003dmwait\" cmdline param\nto simplify the x86 idle code.\n\nAfter this change, kernels configured with\n(!CONFIG_ACPI\u003dn \u0026\u0026 !CONFIG_INTEL_IDLE\u003dn) when run on hardware\nthat support MWAIT will simply use HLT. If MWAIT is desired\non those systems, cpuidle and the cpuidle drivers above\ncan be used.\n\ncc: x86@kernel.org\ncc: stable@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "cdaab4a0d330f70c0e5ad8c3f7c65c2e375ea180", "tree": "c0737c6c9106f858df5e223b168d548de1c1990e", "parents": [ "99c63221435963e0cee2402686ba99293c2ffa9e" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:41:17 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:16 2011 -0400" }, "message": "x86 idle: deprecate \"no-hlt\" cmdline param\n\nWe\u0027d rather that modern machines not check if HLT works on\nevery entry into idle, for the benefit of machines that had\nmarginal electricals 15-years ago. If those machines are still running\nthe upstream kernel, they can use \"idle\u003dpoll\". The only difference\nwill be that they\u0027ll now invoke HLT in machine_hlt().\n\ncc: x86@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "99c63221435963e0cee2402686ba99293c2ffa9e", "tree": "7c73900db0eafed36291257494c1e084de6ad034", "parents": [ "3b70b2e5fcf6315eb833a1bcc2b810bdc75484ff" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:19:23 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:15 2011 -0400" }, "message": "x86 idle APM: deprecate CONFIG_APM_CPU_IDLE\n\nWe don\u0027t want to export the pm_idle function pointer to modules.\nCurrently CONFIG_APM_CPU_IDLE w/ CONFIG_APM_MODULE forces us to.\n\nCONFIG_APM_CPU_IDLE is of dubious value, it runs only on 32-bit\nuniprocessor laptops that are over 10 years old. It calls into\nthe BIOS during idle, and is known to cause a number of machines\nto fail.\n\nRemoving CONFIG_APM_CPU_IDLE and will allow us to stop exporting\npm_idle. Any systems that were calling into the APM BIOS\nat run-time will simply use HLT instead.\n\ncc: x86@kernel.org\ncc: Jiri Kosina \u003cjkosina@suse.cz\u003e\ncc: stable@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "3b70b2e5fcf6315eb833a1bcc2b810bdc75484ff", "tree": "803b88453cf6be96b81727105b67bb7566cf7b48", "parents": [ "06ae40ce073daf233607a3c54a489f2c1e44683e" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:08:48 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:15 2011 -0400" }, "message": "x86 idle floppy: deprecate disable_hlt()\n\nPlan to remove floppy_disable_hlt in 2012, an ancient\nworkaround with comments that it should be removed.\n\nThis allows us to remove clutter and a run-time branch\nfrom the idle code.\n\nWARN_ONCE() on invocation until it is removed.\n\ncc: x86@kernel.org\ncc: stable@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "526b4af47f44148c9d665e57723ed9f86634c6e3", "tree": "7906a3b45703aa730d5e7ebadc36a55aee5417ca", "parents": [ "aecad432fd68dafa5b3b497c4816fbfce6fd4066" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Thu May 26 12:26:24 2011 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 01:50:40 2011 -0400" }, "message": "ACPI: Split out custom_method functionality into an own driver\n\nWith /sys/kernel/debug/acpi/custom_method root can write\nto arbitrary memory and increase his priveleges, even if\nthese are restricted.\n\n-\u003e Make this an own debug .config option and warn about the\nsecurity issue in the config description.\n\n-\u003e Still keep acpi/debugfs.c which now only creates an empty\n /sys/kernel/debug/acpi directory. There might be other\n users of it later.\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: rui.zhang@intel.com\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "36947a76826111e661a26cb0f668a5be6cc3ddb4", "tree": "ed5d92c9d71f9ca68e6a3583a10ebf911c9c44dd", "parents": [ "a947e23a8ec04bccbfe98c5a2d64cd1f88b612d5", "69b4573296469fd3f70cf7044693074980517067" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 13:03:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 13:03:41 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (36 commits)\n Cache xattr security drop check for write v2\n fs: block_page_mkwrite should wait for writeback to finish\n mm: Wait for writeback when grabbing pages to begin a write\n configfs: remove unnecessary dentry_unhash on rmdir, dir rename\n fat: remove unnecessary dentry_unhash on rmdir, dir rename\n hpfs: remove unnecessary dentry_unhash on rmdir, dir rename\n minix: remove unnecessary dentry_unhash on rmdir, dir rename\n fuse: remove unnecessary dentry_unhash on rmdir, dir rename\n coda: remove unnecessary dentry_unhash on rmdir, dir rename\n afs: remove unnecessary dentry_unhash on rmdir, dir rename\n affs: remove unnecessary dentry_unhash on rmdir, dir rename\n 9p: remove unnecessary dentry_unhash on rmdir, dir rename\n ncpfs: fix rename over directory with dangling references\n ncpfs: document dentry_unhash usage\n ecryptfs: remove unnecessary dentry_unhash on rmdir, dir rename\n hostfs: remove unnecessary dentry_unhash on rmdir, dir rename\n hfsplus: remove unnecessary dentry_unhash on rmdir, dir rename\n hfs: remove unnecessary dentry_unhash on rmdir, dir rename\n omfs: remove unnecessary dentry_unhash on rmdir, dir rneame\n udf: remove unnecessary dentry_unhash from rmdir, dir rename\n ...\n" }, { "commit": "1ba4b8cb94e59b17fd0142a509eb583695c36db6", "tree": "e42d1967025670401758d32964a5fa048f59f10a", "parents": [ "c4a227d89f758e582fd167bb15245f2704de99ef", "cc3ce5176d83cd8ae1134f86e208ea758d6cb78e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:56:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:56:32 2011 -0700" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rcu: Start RCU kthreads in TASK_INTERRUPTIBLE state\n rcu: Remove waitqueue usage for cpu, node, and boost kthreads\n rcu: Avoid acquiring rcu_node locks in timer functions\n atomic: Add atomic_or()\n Documentation: Add statistics about nested locks\n rcu: Decrease memory-barrier usage based on semi-formal proof\n rcu: Make rcu_enter_nohz() pay attention to nesting\n rcu: Don\u0027t do reschedule unless in irq\n rcu: Remove old memory barriers from rcu_process_callbacks()\n rcu: Add memory barriers\n rcu: Fix unpaired rcu_irq_enter() from locking selftests\n" }, { "commit": "4cb865deec59ef31d966622d1ec87411ae32dfab", "tree": "e060d515f62e4f334aded38c9079485d50166693", "parents": [ "55f08e1baa3ef11c952b626dbc7ef9e3e8332a63", "19d78a61be6dd707dcec298c486303d4ba2c840a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:35:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:35:15 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (33 commits)\n x86: poll waiting for I/OAT DMA channel status\n maintainers: add dma engine tree details\n dmaengine: add TODO items for future work on dma drivers\n dmaengine: Add API documentation for slave dma usage\n dmaengine/dw_dmac: Update maintainer-ship\n dmaengine: move link order\n dmaengine/dw_dmac: implement pause and resume in dwc_control\n dmaengine/dw_dmac: Replace spin_lock* with irqsave variants and enable submission from callback\n dmaengine/dw_dmac: Divide one sg to many desc, if sg len is greater than DWC_MAX_COUNT\n dmaengine/dw_dmac: set residue as total len in dwc_tx_status if status is !DMA_SUCCESS\n dmaengine/dw_dmac: don\u0027t call callback routine in case dmaengine_terminate_all() is called\n dmaengine: at_hdmac: pause: no need to wait for FIFO empty\n pch_dma: modify pci device table definition\n pch_dma: Support new device ML7223 IOH\n pch_dma: Support I2S for ML7213 IOH\n pch_dma: Fix DMA setting issue\n pch_dma: modify for checkpatch\n pch_dma: fix dma direction issue for ML7213 IOH video-in\n dmaengine: at_hdmac: use descriptor chaining help function\n dmaengine: at_hdmac: implement pause and resume in atc_control\n ...\n\nFix up trivial conflict in drivers/dma/dw_dmac.c\n" }, { "commit": "29f742f88a32c9ab8cf6d9ba69e1ea918be5aa58", "tree": "a38aa38c8025e050ec82a7e64d02dca07f90ffc7", "parents": [ "f62508f68d04adefc4cf9b0177ba02c8818b3eec", "23b5c8fa01b723c70a20d6e4ef4ff54c7656d6e1" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 27 12:38:52 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat May 28 17:41:05 2011 +0200" }, "message": "Merge branch \u0027rcu/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent\n" }, { "commit": "f62508f68d04adefc4cf9b0177ba02c8818b3eec", "tree": "5e522d00561955358e6a9f44d0e4e2d5316fbf29", "parents": [ "dc7acbb2518f250050179c8581a972df3b6a24f1" ], "author": { "name": "Juri Lelli", "email": "juri.lelli@gmail.com", "time": "Thu May 19 12:53:53 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat May 28 17:03:29 2011 +0200" }, "message": "Documentation: Add statistics about nested locks\n\nExplain what the trailing \"/1\" on some lock class names of\nlock_stat output means.\n\nReviewed-by: Yong Zhang \u003cyong.zhang0@gmail.com\u003e\nSigned-off-by: Juri Lelli \u003cjuri.lelli@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/4DD4F6C1.5090701@gmail.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "29a6ccca3869bbe33879dae0cd7df2a1559eff54", "tree": "2d9d355d8662ede95af7bc812d686dc4d5f37ff3", "parents": [ "426048313dfa7d65dbd2379b1665755511f9544f", "6a8a98b22b10f1560d5f90aded4a54234b9b2724" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 20:06:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 20:06:53 2011 -0700" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (97 commits)\n mtd: kill CONFIG_MTD_PARTITIONS\n mtd: remove add_mtd_partitions, add_mtd_device and friends\n mtd: convert remaining users to mtd_device_register()\n mtd: samsung onenand: convert to mtd_device_register()\n mtd: omap2 onenand: convert to mtd_device_register()\n mtd: txx9ndfmc: convert to mtd_device_register()\n mtd: tmio_nand: convert to mtd_device_register()\n mtd: socrates_nand: convert to mtd_device_register()\n mtd: sharpsl: convert to mtd_device_register()\n mtd: s3c2410 nand: convert to mtd_device_register()\n mtd: ppchameleonevb: convert to mtd_device_register()\n mtd: orion_nand: convert to mtd_device_register()\n mtd: omap2: convert to mtd_device_register()\n mtd: nomadik_nand: convert to mtd_device_register()\n mtd: ndfc: convert to mtd_device_register()\n mtd: mxc_nand: convert to mtd_device_register()\n mtd: mpc5121_nfc: convert to mtd_device_register()\n mtd: jz4740_nand: convert to mtd_device_register()\n mtd: h1910: convert to mtd_device_register()\n mtd: fsmc_nand: convert to mtd_device_register()\n ...\n\nFixed up trivial conflicts in\n - drivers/mtd/maps/integrator-flash.c: removed in ARM tree\n - drivers/mtd/maps/physmap.c: addition of afs partition probe type\n clashing with removal of CONFIG_MTD_PARTITIONS\n" }, { "commit": "426048313dfa7d65dbd2379b1665755511f9544f", "tree": "dc727b9e41eb3d9dfe8e68f14b027c776d8aba98", "parents": [ "2a56d2220284b0e4dd8569fa475d7053f1c40a63", "7ad20aa9d39a525542b0840ac38bfc77be831e19" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:52:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:52:57 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (60 commits)\n [SCSI] lpfc 8.3.24: Extend BSG infrastructure and add link diagnostics\n [SCSI] lpfc 8.3.24: Add resource extent support\n [SCSI] lpfc 8.3.24: Add request-firmware support\n [SCSI] lpfc 8.3.24: Add SR-IOV control\n [SCSI] lpfc 8.3.24: Extended hardware support and support dump images\n [SCSI] lpfc 8.3.24: Miscellaneous Fixes and Corrections\n [SCSI] libsas: Add option for SATA soft reset\n [SCSI] libsas: check dev-\u003egone before submitting sata i/o\n [SCSI] libsas: fix/amend device gone notification in sas_deform_port()\n [SCSI] MAINTAINERS update for SCSI (new email address)\n [SCSI] Fix Ultrastor asm snippet\n [SCSI] osst: fix warning\n [SCSI] osst: wrong index used in inner loop\n [SCSI] aic94xx: world-writable sysfs update_bios file\n [SCSI] MAINTAINERS: Add drivers/target/ entry\n [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions\n [SCSI] target: Convert REPORT_LUNs to use int_to_scsilun\n [SCSI] target: Fix task-\u003etask_execute_queue\u003d1 clear bug + LUN_RESET OOPs\n [SCSI] target: Fix bug with task_sg chained transport_free_dev_tasks release\n [SCSI] target: Fix interrupt context bug with stats_lock and core_tmr_alloc_req\n ...\n" }, { "commit": "2a56d2220284b0e4dd8569fa475d7053f1c40a63", "tree": "96f959486a2f31db599e5f97167074bd1ecb3dc6", "parents": [ "46f2cc80514e389bacfb642a32a4181fa1f1d20b", "239df0fd5ee25588f8a5ba7f7ee646940cc403f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:51:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:51:32 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)\n ARM: 6945/1: Add unwinding support for division functions\n ARM: kill pmd_off()\n ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks\n ARM: 6943/1: mm: use TTBR1 instead of reserved context ID\n ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7\n ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area\n ARM: add sendmmsg syscall\n ARM: 6863/1: allow hotplug on msm\n ARM: 6832/1: mmci: support for ST-Ericsson db8500v2\n ARM: 6830/1: mach-ux500: force PrimeCell revisions\n ARM: 6829/1: amba: make hardcoded periphid override hardware\n ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID\n ARM: 6827/1: mach-netx: delete hardcoded periphid\n ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume\n ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2\n ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM\n ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM\n at91: drop at572d940hf support\n at91rm9200: introduce at91rm9200_set_type to specficy cpu package\n at91: drop boot_params and PLAT_PHYS_OFFSET\n ...\n" }, { "commit": "239df0fd5ee25588f8a5ba7f7ee646940cc403f4", "tree": "bfece31a51ceec2793cb69b3ac1c936e0652bcbc", "parents": [ "cc780af5aca00d573eae0e926e1d4cf1439b580e", "ae1d3b974e091b5fc9008bd41bcbdaac68110b62", "81479c246c07b703aeb4bf54933b7d928cb5b717" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 27 22:59:57 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 27 22:59:57 2011 +0100" }, "message": "Merge branches \u0027devel\u0027, \u0027devel-stable\u0027 and \u0027fixes\u0027 into for-linus\n" }, { "commit": "e52e713ec30a31e9a4663d9aebbaae5ec07466a6", "tree": "68f9680577ae68f3972a5ed73afed5d1c2794310", "parents": [ "bdf7cf1c83872a0586ce4c4da6889103cc36dbd3", "2f3e4af471e38e0658e701973238ae4b5e50fcd6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 10:25:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 10:25:02 2011 -0700" }, "message": "Merge branch \u0027docs-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs\n\n* \u0027docs-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:\n Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/ to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/\u003cmoved_file\u003e to Documentation/security/\u003cmoved_file\u003e.\n" }, { "commit": "c0880dcded3ffe77700184e9d96c110ce0094c11", "tree": "202387e0ecbad9af5a9cc080b2e794ce53247788", "parents": [ "f7fc06e3a47d68831a21f6aabf2a80648846602b", "616a4b83bd1b4ec2260a91480e211290c35348bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 10:14:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 10:14:22 2011 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote\n [media] Add missing include guard to header file\n [media] Inlined functions should be static\n [media] Remove invalid parameter description\n [media] cpia2: fix warning about invalid trigraph sequence\n [media] s5p-csis: Add missing dependency on PLAT_S5P\n [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG\n [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function\n [media] uvcvideo: Connect video devices to media entities\n [media] uvcvideo: Register subdevices for each entity\n [media] uvcvideo: Register a v4l2_device\n [media] add V4L2-PIX-FMT-SRGGB12 \u0026 friends to docbook\n [media] Documentation/DocBook: Rename media fops xml files\n [media] Media DocBook: fix validation errors\n [media] wl12xx: g_volatile_ctrl fix: wrong field set\n [media] fix kconfig dependency warning for VIDEO_TIMBERDALE\n [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked\n [media] Add support for M-5MOLS 8 Mega Pixel camera ISP\n" }, { "commit": "020036678e810be10a352339faa9a1df2bd8f5a3", "tree": "5bc292407b04a4e5f626e9625041101c3f684eb2", "parents": [ "c4bae98c4f913d3220d185c47d8817b5e2bba007" ], "author": { "name": "Carlos Corbacho", "email": "carlos@strangeworlds.co.uk", "time": "Mon May 02 09:57:23 2011 +0100" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Fri May 27 12:36:46 2011 -0400" }, "message": "acer-wmi: Delete out-of-date documentation\n\nThe documentation file for acer-wmi is long out of date, and there\u0027s not\nmuch point in keeping it around either.\n\nSigned-off-by: Carlos Corbacho \u003ccarlos@strangeworlds.co.uk\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "aa38572954ade525817fe88c54faebf85e5a61c0", "tree": "ef398ec06c97134592f62a49c99f3f80041b427c", "parents": [ "d6e9bd256c88ce5f4b668249e363a74f51393daa" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Fri May 27 06:53:02 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 27 07:04:40 2011 -0400" }, "message": "fs: pass exact type of data dirties to -\u003edirty_inode\n\nTell the filesystem if we just updated timestamp (I_DIRTY_SYNC) or\nanything else, so that the filesystem can track internally if it\nneeds to push out a transaction for fdatasync or not.\n\nThis is just the prototype change with no user for it yet. I plan\nto push large XFS changes for the next merge window, and getting\nthis trivial infrastructure in this window would help a lot to avoid\ntree interdependencies.\n\nAlso remove incorrect comments that -\u003edirty_inode can\u0027t block. That\nhas been changed a long time ago, and many implementations rely on it.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "492c826b9facefa84995f4dea917e301b5ee0884", "tree": "f0ac1382e4b9047d43d522ce1cb111e74f84d61b", "parents": [ "ba413c5972676295862797a46f9070f81691d80e" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sun May 08 22:30:18 2011 +0100" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Fri May 27 10:34:37 2011 +0100" }, "message": "regulator: Remove supply_regulator_dev from machine configuration\n\nsupply_regulator_dev (using a struct pointer) has been deprecated in favour\nof supply_regulator (using a regulator name) for quite a few releases\nnow with a warning generated if it is used and there are no current in tree\nusers so just remove the code.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "57cc083ad9e1bfeeb4a0ee831e7bb008c8865bf0", "tree": "03b491fd20b4ca3e58354b15067f6961f32a016b", "parents": [ "3864601387cf4196371e3c1897fdffa5228296f9" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Thu May 26 16:25:46 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:36 2011 -0700" }, "message": "coredump: add support for exe_file in core name\n\nNow, exe_file is not proc FS dependent, so we can use it to name core\nfile. So we add %E pattern for core file name cration which extract path\nfrom mm_struct-\u003eexe_file. Then it converts slashes to exclamation marks\nand pastes the result to the core file name itself.\n\nThis is useful for environments where binary names are longer than 16\ncharacter (the current-\u003ecomm limitation). Also where there are binaries\nwith same name but in a different path. Further in case the binery itself\nchanges its current-\u003ecomm after exec.\n\nSo by doing (s/$/#/ -- # is treated as git comment):\n\n $ sysctl kernel.core_pattern\u003d\u0027core.%p.%e.%E\u0027\n $ ln /bin/cat cat45678901234567890\n $ ./cat45678901234567890\n ^Z\n $ rm cat45678901234567890\n $ fg\n ^\\Quit (core dumped)\n $ ls core*\n\nwe now get:\n\n core.2434.cat456789012345.!root!cat45678901234567890 (deleted)\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nReviewed-by: Andi Kleen \u003candi@firstfloor.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a77aea92010acf54ad785047234418d5d68772e2", "tree": "c7cb57b62fd02bee2baceb79251923f7caec6139", "parents": [ "d846687d7f84e45f23ecf3846dbb43312a1206dd" ], "author": { "name": "Daniel Lezcano", "email": "daniel.lezcano@free.fr", "time": "Thu May 26 16:25:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "cgroup: remove the ns_cgroup\n\nThe ns_cgroup is an annoying cgroup at the namespace / cgroup frontier and\nleads to some problems:\n\n * cgroup creation is out-of-control\n * cgroup name can conflict when pids are looping\n * it is not possible to have a single process handling a lot of\n namespaces without falling in a exponential creation time\n * we may want to create a namespace without creating a cgroup\n\n The ns_cgroup was replaced by a compatibility flag \u0027clone_children\u0027,\n where a newly created cgroup will copy the parent cgroup values.\n The userspace has to manually create a cgroup and add a task to\n the \u0027tasks\u0027 file.\n\nThis patch removes the ns_cgroup as suggested in the following thread:\n\nhttps://lists.linux-foundation.org/pipermail/containers/2009-June/018616.html\n\nThe \u0027cgroup_clone\u0027 function is removed because it is no longer used.\n\nThis is a userspace-visible change. Commit 45531757b45c (\"cgroup: notify\nns_cgroup deprecated\") (merged into 2.6.27) caused the kernel to emit a\nprintk warning users that the feature is planned for removal. Since that\ntime we have heard from XXX users who were affected by this.\n\nSigned-off-by: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nSigned-off-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Paul Menage \u003cmenage@google.com\u003e\nAcked-by: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "74a1166dfe1135dcc168d35fa5261aa7e087011b", "tree": "a7add70f0344e2352b8d0d6beb10aef85c6585f7", "parents": [ "f780bdb7c1c73009cb57adcf99ef50027d80bf3c" ], "author": { "name": "Ben Blum", "email": "bblum@andrew.cmu.edu", "time": "Thu May 26 16:25:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "cgroups: make procs file writable\n\nMake procs file writable to move all threads by tgid at once.\n\nAdd functionality that enables users to move all threads in a threadgroup\nat once to a cgroup by writing the tgid to the \u0027cgroup.procs\u0027 file. This\ncurrent implementation makes use of a per-threadgroup rwsem that\u0027s taken\nfor reading in the fork() path to prevent newly forking threads within the\nthreadgroup from \"escaping\" while the move is in progress.\n\nSigned-off-by: Ben Blum \u003cbblum@andrew.cmu.edu\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nReviewed-by: Paul Menage \u003cmenage@google.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Miao Xie \u003cmiaox@cn.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": "f780bdb7c1c73009cb57adcf99ef50027d80bf3c", "tree": "d15668ffcc40a2aaa31723b87cfda0b166f84d57", "parents": [ "4714d1d32d97239fb5ae3e10521d3f133a899b66" ], "author": { "name": "Ben Blum", "email": "bblum@andrew.cmu.edu", "time": "Thu May 26 16:25:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "cgroups: add per-thread subsystem callbacks\n\nAdd cgroup subsystem callbacks for per-thread attachment in atomic contexts\n\nAdd can_attach_task(), pre_attach(), and attach_task() as new callbacks\nfor cgroups\u0027s subsystem interface. Unlike can_attach and attach, these\nare for per-thread operations, to be called potentially many times when\nattaching an entire threadgroup.\n\nAlso, the old \"bool threadgroup\" interface is removed, as replaced by\nthis. All subsystems are modified for the new interface - of note is\ncpuset, which requires from/to nodemasks for attach to be globally scoped\n(though per-cpuset would work too) to persist from its pre_attach to\nattach_task and attach.\n\nThis is a pre-patch for cgroup-procs-writable.patch.\n\nSigned-off-by: Ben Blum \u003cbblum@andrew.cmu.edu\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nReviewed-by: Paul Menage \u003cmenage@google.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Miao Xie \u003cmiaox@cn.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": "dcb3a08e69629ea65a3e9647da730bfaf670497d", "tree": "da89f661c9e0b2ae3d1dabcc3e27dcf06d2ae8fa", "parents": [ "02d54f092697b6046e466e447cc694b0e6ed45d0" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Thu May 26 16:25:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "Documentation: configfs examples crash fix\n\nWhen configfs_register_subsystem() fails, we unregister too many\nsubsystems in configfs_example_init. Decrement i by one to not unregister\nnon-registered subsystem.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Joel Becker \u003cjoel.becker@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "02d54f092697b6046e466e447cc694b0e6ed45d0", "tree": "cb18ecc6a8c7b0f49d5a22db4b944bbf7635465c", "parents": [ "4ed960b14d3b5fd14f1d9eb02f6d7e398317627a" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Thu May 26 16:25:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "getdelays: show average CPU/IO/SWAP/RECLAIM delays\n\nI find it very handy to show the average delays in milliseconds.\n\nExample output (on 100 concurrent dd reading sparse files):\n\n CPU count real total virtual total delay total delay average\n 986 3223509952 3207643301 38863410579 39.415ms\n IO count delay total delay average\n 0 0 0ms\n SWAP count delay total delay average\n 0 0 0ms\n RECLAIM count delay total delay average\n 1059 5131834899 4ms\n dd: read\u003d0, write\u003d0, cancelled_write\u003d0\n\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Mel Gorman \u003cmel@linux.vnet.ibm.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nReviewed-by: Satoru Moriya \u003csatoru.moriya@hds.com\u003e\nReviewed-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": "4ed960b14d3b5fd14f1d9eb02f6d7e398317627a", "tree": "bcbe96919f4b19e2fd98366385aa41fba84699c4", "parents": [ "fbdd91a6293f5e7fb1914966f5d244f72619641e" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu May 26 16:25:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "Documentation/accounting/getdelays.c: handle sendto() failures\n\nFixes\n\n Documentation/accounting/getdelays.c: In function `get_family_id\u0027:\n Documentation/accounting/getdelays.c:172:14: warning: variable `rc\u0027 set but not used [-Wunused-but-set-variable]\n\nReported-by: \"Justin P. Mattock\" \u003cjustinmattock@gmail.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fbdd91a6293f5e7fb1914966f5d244f72619641e", "tree": "a022652bf869cf946efefd478ea58e257a206b3a", "parents": [ "72eef0f3af410de2c85f236140ddea61b71cfc3e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Thu May 26 16:25:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "Documentation/accounting/getdelays.c: fix unused var warning\n\nFixes\n\n Documentation/accounting/getdelays.c: In function `main\u0027:\n Documentation/accounting/getdelays.c:436:7: warning: variable `i\u0027 set but not used [-Wunused-but-set-variable]\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "72eef0f3af410de2c85f236140ddea61b71cfc3e", "tree": "e2ceccb88da76028c65c158609328786253cdee9", "parents": [ "1d5827235de48e829d5d4a03c3688ef6f2b15562" ], "author": { "name": "Nikanth Karthikesan", "email": "knikanth@suse.de", "time": "Thu May 26 16:25:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "Documentation/atomic_ops.txt: avoid volatile in sample code\n\nAs declaring counter as volatile is discouraged, it is best not to use it\nin sample code as well.\n\nSigned-off-by: Nikanth Karthikesan \u003cknikanth@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a74b81b0aff4a01e0816df5915c854fb52c5e87f", "tree": "98364cec6a9e0c0fd510e5fe9af46f1ddb28956b", "parents": [ "f8d613e2a665bf1be9628a3c3f9bafe7599b32c0", "ece928df16494becd43f999aff9bd530182e7e81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 10:55:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 10:55:15 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (28 commits)\n Ocfs2: Teach local-mounted ocfs2 to handle unwritten_extents correctly.\n ocfs2/dlm: Do not migrate resource to a node that is leaving the domain\n ocfs2/dlm: Add new dlm message DLM_BEGIN_EXIT_DOMAIN_MSG\n Ocfs2/move_extents: Set several trivial constraints for threshold.\n Ocfs2/move_extents: Let defrag handle partial extent moving.\n Ocfs2/move_extents: move/defrag extents within a certain range.\n Ocfs2/move_extents: helper to calculate the defraging length in one run.\n Ocfs2/move_extents: move entire/partial extent.\n Ocfs2/move_extents: helpers to update the group descriptor and global bitmap inode.\n Ocfs2/move_extents: helper to probe a proper region to move in an alloc group.\n Ocfs2/move_extents: helper to validate and adjust moving goal.\n Ocfs2/move_extents: find the victim alloc group, where the given #blk fits.\n Ocfs2/move_extents: defrag a range of extent.\n Ocfs2/move_extents: move a range of extent.\n Ocfs2/move_extents: lock allocators and reserve metadata blocks and data clusters for extents moving.\n Ocfs2/move_extents: Add basic framework and source files for extent moving.\n Ocfs2/move_extents: Adding new ioctl code \u0027OCFS2_IOC_MOVE_EXT\u0027 to ocfs2.\n Ocfs2/refcounttree: Publicize couple of funcs from refcounttree.c\n Ocfs2: Add a new code \u0027OCFS2_INFO_FREEFRAG\u0027 for o2info ioctl.\n Ocfs2: Add a new code \u0027OCFS2_INFO_FREEINODE\u0027 for o2info ioctl.\n ...\n" }, { "commit": "f8d613e2a665bf1be9628a3c3f9bafe7599b32c0", "tree": "98d4da8d0e1a5fb1d9064626b4b96d95ccf26375", "parents": [ "8a0599dd2471f2a2e409498c08a0ab339057ad06", "5bc20fc59706214d9591c11e1938a629d3538c12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 10:50:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 10:50:56 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:\n xen: cleancache shim to Xen Transcendent Memory\n ocfs2: add cleancache support\n ext4: add cleancache support\n btrfs: add cleancache support\n ext3: add cleancache support\n mm/fs: add hooks to support cleancache\n mm: cleancache core ops functions and config\n fs: add field to superblock to support cleancache\n mm/fs: cleancache documentation\n\nFix up trivial conflict in fs/btrfs/extent_io.c due to includes\n" }, { "commit": "8a0599dd2471f2a2e409498c08a0ab339057ad06", "tree": "c23c72f3eb4a95d8854720be9d8a228d4adae54a", "parents": [ "35806b4f7c5620b547f183e9d53f7cfaeabb582b", "233eebb9a96f956c541c0c9094fd321894bd93a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 10:49:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 10:49:11 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: correctly decrement the extent buffer index in xfs_bmap_del_extent\n xfs: check for valid indices in xfs_iext_get_ext and xfs_iext_idx_to_irec\n xfs: fix up asserts in xfs_iflush_fork\n xfs: do not do pointer arithmetic on extent records\n xfs: do not use unchecked extent indices in xfs_bunmapi\n xfs: do not use unchecked extent indices in xfs_bmapi\n xfs: do not use unchecked extent indices in xfs_bmap_add_extent_*\n xfs: remove if_lastex\n xfs: remove the unused XFS_BMAPI_RSVBLOCKS flag\n xfs: do not discard alloc btree blocks\n xfs: add online discard support\n" }, { "commit": "35806b4f7c5620b547f183e9d53f7cfaeabb582b", "tree": "dc966f5edd9e482fdc85b8fb886ae39ce5c5ec80", "parents": [ "32e51f141fd8d880f57b6a2eb53ce72856254d4a", "d183e11a4a66d80e10d60b0918a47cf073135379" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 09:53:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 09:53:20 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (61 commits)\n jbd2: Add MAINTAINERS entry\n jbd2: fix a potential leak of a journal_head on an error path\n ext4: teach ext4_ext_split to calculate extents efficiently\n ext4: Convert ext4 to new truncate calling convention\n ext4: do not normalize block requests from fallocate()\n ext4: enable \"punch hole\" functionality\n ext4: add \"punch hole\" flag to ext4_map_blocks()\n ext4: punch out extents\n ext4: add new function ext4_block_zero_page_range()\n ext4: add flag to ext4_has_free_blocks\n ext4: reserve inodes and feature code for \u0027quota\u0027 feature\n ext4: add support for multiple mount protection\n ext4: ensure f_bfree returned by ext4_statfs() is non-negative\n ext4: protect bb_first_free in ext4_trim_all_free() with group lock\n ext4: only load buddy bitmap in ext4_trim_fs() when it is needed\n jbd2: Fix comment to match the code in jbd2__journal_start()\n ext4: fix waiting and sending of a barrier in ext4_sync_file()\n jbd2: Add function jbd2_trans_will_send_data_barrier()\n jbd2: fix sending of data flush on journal commit\n ext4: fix ext4_ext_fiemap_cb() to handle blocks before request range correctly\n ...\n" }, { "commit": "23b5c8fa01b723c70a20d6e4ef4ff54c7656d6e1", "tree": "d03faad5e19848b35a019793b9a1cbc0bb68a708", "parents": [ "4305ce7894dd38b0633bfc8978437320119223bd" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Sep 07 10:38:22 2010 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Thu May 26 09:42:23 2011 -0700" }, "message": "rcu: Decrease memory-barrier usage based on semi-formal proof\n\n(Note: this was reverted, and is now being re-applied in pieces, with\nthis being the fifth and final piece. See below for the reason that\nit is now felt to be safe to re-apply this.)\n\nCommit d09b62d fixed grace-period synchronization, but left some smp_mb()\ninvocations in rcu_process_callbacks() that are no longer needed, but\nsheer paranoia prevented them from being removed. This commit removes\nthem and provides a proof of correctness in their absence. It also adds\na memory barrier to rcu_report_qs_rsp() immediately before the update to\nrsp-\u003ecompleted in order to handle the theoretical possibility that the\ncompiler or CPU might move massive quantities of code into a lock-based\ncritical section. This also proves that the sheer paranoia was not\nentirely unjustified, at least from a theoretical point of view.\n\nIn addition, the old dyntick-idle synchronization depended on the fact\nthat grace periods were many milliseconds in duration, so that it could\nbe assumed that no dyntick-idle CPU could reorder a memory reference\nacross an entire grace period. Unfortunately for this design, the\naddition of expedited grace periods breaks this assumption, which has\nthe unfortunate side-effect of requiring atomic operations in the\nfunctions that track dyntick-idle state for RCU. (There is some hope\nthat the algorithms used in user-level RCU might be applied here, but\nsome work is required to handle the NMIs that user-space applications\ncan happily ignore. For the short term, better safe than sorry.)\n\nThis proof assumes that neither compiler nor CPU will allow a lock\nacquisition and release to be reordered, as doing so can result in\ndeadlock. The proof is as follows:\n\n1.\tA given CPU declares a quiescent state under the protection of\n\tits leaf rcu_node\u0027s lock.\n\n2.\tIf there is more than one level of rcu_node hierarchy, the\n\tlast CPU to declare a quiescent state will also acquire the\n\t-\u003elock of the next rcu_node up in the hierarchy, but only\n\tafter releasing the lower level\u0027s lock. The acquisition of this\n\tlock clearly cannot occur prior to the acquisition of the leaf\n\tnode\u0027s lock.\n\n3.\tStep 2 repeats until we reach the root rcu_node structure.\n\tPlease note again that only one lock is held at a time through\n\tthis process. The acquisition of the root rcu_node\u0027s -\u003elock\n\tmust occur after the release of that of the leaf rcu_node.\n\n4.\tAt this point, we set the -\u003ecompleted field in the rcu_state\n\tstructure in rcu_report_qs_rsp(). However, if the rcu_node\n\thierarchy contains only one rcu_node, then in theory the code\n\tpreceding the quiescent state could leak into the critical\n\tsection. We therefore precede the update of -\u003ecompleted with a\n\tmemory barrier. All CPUs will therefore agree that any updates\n\tpreceding any report of a quiescent state will have happened\n\tbefore the update of -\u003ecompleted.\n\n5.\tRegardless of whether a new grace period is needed, rcu_start_gp()\n\twill propagate the new value of -\u003ecompleted to all of the leaf\n\trcu_node structures, under the protection of each rcu_node\u0027s -\u003elock.\n\tIf a new grace period is needed immediately, this propagation\n\twill occur in the same critical section that -\u003ecompleted was\n\tset in, but courtesy of the memory barrier in #4 above, is still\n\tseen to follow any pre-quiescent-state activity.\n\n6.\tWhen a given CPU invokes __rcu_process_gp_end(), it becomes\n\taware of the end of the old grace period and therefore makes\n\tany RCU callbacks that were waiting on that grace period eligible\n\tfor invocation.\n\n\tIf this CPU is the same one that detected the end of the grace\n\tperiod, and if there is but a single rcu_node in the hierarchy,\n\twe will still be in the single critical section. In this case,\n\tthe memory barrier in step #4 guarantees that all callbacks will\n\tbe seen to execute after each CPU\u0027s quiescent state.\n\n\tOn the other hand, if this is a different CPU, it will acquire\n\tthe leaf rcu_node\u0027s -\u003elock, and will again be serialized after\n\teach CPU\u0027s quiescent state for the old grace period.\n\nOn the strength of this proof, this commit therefore removes the memory\nbarriers from rcu_process_callbacks() and adds one to rcu_report_qs_rsp().\nThe effect is to reduce the number of memory barriers by one and to\nreduce the frequency of execution from about once per scheduling tick\nper CPU to once per grace period.\n\nThis was reverted do to hangs found during testing by Yinghai Lu and\nIngo Molnar. Frederic Weisbecker supplied Yinghai with tracing that\nlocated the underlying problem, and Frederic also provided the fix.\n\nThe underlying problem was that the HARDIRQ_ENTER() macro from\nlib/locking-selftest.c invoked irq_enter(), which in turn invokes\nrcu_irq_enter(), but HARDIRQ_EXIT() invoked __irq_exit(), which\ndoes not invoke rcu_irq_exit(). This situation resulted in calls\nto rcu_irq_enter() that were not balanced by the required calls to\nrcu_irq_exit(). Therefore, after these locking selftests completed,\nRCU\u0027s dyntick-idle nesting count was a large number (for example,\n72), which caused RCU to to conclude that the affected CPU was not in\ndyntick-idle mode when in fact it was.\n\nRCU would therefore incorrectly wait for this dyntick-idle CPU, resulting\nin hangs.\n\nIn contrast, with Frederic\u0027s patch, which replaces the irq_enter()\nin HARDIRQ_ENTER() with an __irq_enter(), these tests don\u0027t ever call\neither rcu_irq_enter() or rcu_irq_exit(), which works because the CPU\nrunning the test is already marked as not being in dyntick-idle mode.\nThis means that the rcu_irq_enter() and rcu_irq_exit() calls and RCU\nthen has no problem working out which CPUs are in dyntick-idle mode and\nwhich are not.\n\nThe reason that the imbalance was not noticed before the barrier patch\nwas applied is that the old implementation of rcu_enter_nohz() ignored\nthe nesting depth. This could still result in delays, but much shorter\nones. Whenever there was a delay, RCU would IPI the CPU with the\nunbalanced nesting level, which would eventually result in rcu_enter_nohz()\nbeing called, which in turn would force RCU to see that the CPU was in\ndyntick-idle mode.\n\nThe reason that very few people noticed the problem is that the mismatched\nirq_enter() vs. __irq_exit() occured only when the kernel was built with\nCONFIG_DEBUG_LOCKING_API_SELFTESTS.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\n" }, { "commit": "4fe4746ab694690af9f2ccb80184f5c575917c7f", "tree": "533cf28d9c926e6f684c3905286ab179c2b4cc88", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Dan Magenheimer", "email": "dan.magenheimer@oracle.com", "time": "Thu May 26 10:00:56 2011 -0600" }, "committer": { "name": "Dan Magenheimer", "email": "dan.magenheimer@oracle.com", "time": "Thu May 26 10:00:56 2011 -0600" }, "message": "mm/fs: cleancache documentation\n\nThis patchset introduces cleancache, an optional new feature exposed\nby the VFS layer that potentially dramatically increases page cache\neffectiveness for many workloads in many environments at a negligible\ncost. It does this by providing an interface to transcendent memory,\nwhich is memory/storage that is not otherwise visible to and/or directly\naddressable by the kernel.\n\nInstead of being discarded, hooks in the reclaim code \"put\" clean\npages to cleancache. Filesystems that \"opt-in\" may \"get\" pages\nfrom cleancache that were previously put, but pages in cleancache are\n\"ephemeral\", meaning they may disappear at any time. And the size\nof cleancache is entirely dynamic and unknowable to the kernel.\nFilesystems currently supported by this patchset include ext3, ext4,\nbtrfs, and ocfs2. Other filesystems (especially those built entirely\non VFS) should be easy to add, but should first be thoroughly tested to\nensure coherency.\n\nDetails and a FAQ are provided in Documentation/vm/cleancache.txt\n\nThis first patch of eight in this cleancache series only adds two\nnew documentation files.\n\n[v8: minor documentation changes by author]\n[v3: akpm@linux-foundation.org: document sysfs API]\n[v3: hch@infradead.org: move detailed description to Documentation/vm]\nSigned-off-by: Dan Magenheimer \u003cdan.magenheimer@oracle.com\u003e\nReviewed-by: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nCc: Matthew Wilcox \u003cmatthew@wil.cx\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Rik Van Riel \u003criel@redhat.com\u003e\nCc: Jan Beulich \u003cJBeulich@novell.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Andreas Dilger \u003cadilger@sun.com\u003e\nCc: Ted Ts\u0027o \u003ctytso@mit.edu\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\n" }, { "commit": "ece928df16494becd43f999aff9bd530182e7e81", "tree": "905042764ea5d8ab6eda63666406e19f607bcf4c", "parents": [ "3d1c1829ebe7e8bb48a997b39b4865abc9197e5e", "dda54e76d7dba0532ebdd72e0b4f492a03f83225" ], "author": { "name": "Joel Becker", "email": "jlbec@evilplan.org", "time": "Wed May 25 21:51:55 2011 -0700" }, "committer": { "name": "Joel Becker", "email": "jlbec@evilplan.org", "time": "Wed May 25 21:51:55 2011 -0700" }, "message": "Merge branch \u0027move_extents\u0027 of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window\n\nConflicts:\n\tfs/ocfs2/ioctl.c\n" }, { "commit": "3f5785ec31adcb7cafa9135087297a38d9698cf8", "tree": "b7d06f14e1aea0292a88c4bc0305ea602f6ebd33", "parents": [ "8c1c77ff9be27137fa7cbbf51efedef1a2ae915b", "94265cf5f731c7df29fdfde262ca3e6d51e6828c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 17:00:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 17:00:17 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)\n bonding: documentation and code cleanup for resend_igmp\n bonding: prevent deadlock on slave store with alb mode (v3)\n net: hold rtnl again in dump callbacks\n Add Fujitsu 1000base-SX PCI ID to tg3\n bnx2x: protect sequence increment with mutex\n sch_sfq: fix peek() implementation\n isdn: netjet - blacklist Digium TDM400P\n via-velocity: don\u0027t annotate MAC registers as packed\n xen: netfront: hold RTNL when updating features.\n sctp: fix memory leak of the ASCONF queue when free asoc\n net: make dev_disable_lro use physical device if passed a vlan dev (v2)\n net: move is_vlan_dev into public header file (v2)\n bug.h: Fix build with CONFIG_PRINTK disabled.\n wireless: fix fatal kernel-doc error + warning in mac80211.h\n wireless: fix cfg80211.h new kernel-doc warnings\n iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled\n dst: catch uninitialized metrics\n be2net: hash key for rss-config cmd not set\n bridge: initialize fake_rtable metrics\n net: fix __dst_destroy_metrics_generic()\n ...\n\nFix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c\n" }, { "commit": "8c1c77ff9be27137fa7cbbf51efedef1a2ae915b", "tree": "cdbd09cac5f5d1c6eb5ec4257dc478c6acca70c5", "parents": [ "f3ae1c75203535f65448517e46c8dd70a56b6c71", "08ee80cc397ac1a306ca689a22ede954d92d0db1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 16:55:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 16:55:55 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (75 commits)\n mmc: core: eMMC bus width may not work on all platforms\n mmc: sdhci: Auto-CMD23 fixes.\n mmc: sdhci: Auto-CMD23 support.\n mmc: core: Block CMD23 support for UHS104/SDXC cards.\n mmc: sdhci: Implement MMC_CAP_CMD23 for SDHCI.\n mmc: core: Use CMD23 for multiblock transfers when we can.\n mmc: quirks: Add/remove quirks conditional support.\n mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver\n mmc: sdhci-pxa: Add quirks for DMA/ADMA to match h/w\n mmc: core: duplicated trial with same freq in mmc_rescan_try_freq()\n mmc: core: add support for eMMC Dual Data Rate\n mmc: core: eMMC signal voltage does not use CMD11\n mmc: sdhci-pxa: add platform code for UHS signaling\n mmc: sdhci: add hooks for setting UHS in platform specific code\n mmc: core: clear MMC_PM_KEEP_POWER flag on resume\n mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume\n mmc: sdhi: allow powering down controller with no card inserted\n mmc: tmio: runtime suspend the controller, where possible\n mmc: sdhi: support up to 3 interrupt sources\n mmc: sdhi: print physical base address and clock rate\n ...\n" }, { "commit": "f3ae1c75203535f65448517e46c8dd70a56b6c71", "tree": "58f719cb97666dcfb3392c6c0547d6cbce2e68c8", "parents": [ "9720d75399fd2655a6b6fb06abcf548150f22362", "d49e46875c11a09e80e76c66db90710369b8fe12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 16:54:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 16:54:01 2011 -0700" }, "message": "Merge branch \u0027kconfig-for-40\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027kconfig-for-40\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:\n xconfig: merge code path to conf_write()\n kconfig: do not record timestamp in .config\n gconfig: Hide unused left treeview when start up the interface\n gconfig: enable rules hint for main treeviews\n MAINTAINERS: Update KCONFIG entry\n kconfig-language: add to hints\n kconfig: Document the new \"visible if\" syntax\n kconfig: quiet commands when V\u003d0\n kconfig: change update-po-config to reflect new layout of arch/um\n kconfig: make update-po-config work in KBUILD_OUTPUT\n kconfig: rearrange clean-files\n kconfig: change gconf to modify hostprogs-y like nconf and mconf\n kconfig: change qconf to modify hostprogs-y like nconf and mconf\n kconfig: only build kxgettext when needed\n nconfig: Silence unused return values from wattrset\n kconfig: Do not record timestamp in auto.conf and autoconf.h\n kconfig: get rid of unused flags\n kconfig: allow multiple inclusion of the same file\n kconfig: Avoid buffer underrun in choice input\n" }, { "commit": "0c63e38a129e7b1f625c6112439a4efc87b1635c", "tree": "bde880587c6a1da9eee2d44d3036b56e0d557f07", "parents": [ "0798b1dbfbd9ff2a370c5968c5f0621ef0075fe0", "b0b349a85d3df00a40a8bd398e4a151fd8e91bbe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 16:52:50 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 16:52:50 2011 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: New driver for the SMSC EMC6W201\n hwmon: (abituguru) Depend on DMI\n hwmon: (it87) Use request_muxed_region\n hwmon: (sch5627) Trigger Vbat measurements\n hwmon: (sch5627) Add sch5627_send_cmd function\n i8k: Integrate with the hwmon subsystem\n hwmon: (max6650) Properly support the MAX6650\n hwmon: (max6650) Drop device detection\n Move ACPI power meter driver to hwmon\n hwmon: (f71882fg) Add support for F71808A\n hwmon: (f71882fg) Split has_beep in fan_has_beep and temp_has_beep\n hwmon: (asc7621) Drop duplicate dependency\n hwmon: (jc42) Change detection class\n hwmon: Add driver for AMD family 15h processor power information\n hwmon: (k10temp) Add support for Fam15h (Bulldozer)\n hwmon: Use helper functions to set and get driver data\n i8k: Avoid lahf in 64-bit code\n" }, { "commit": "ae1d3b974e091b5fc9008bd41bcbdaac68110b62", "tree": "82e50a66925ced79f59ed4504f6e073ef55edee3", "parents": [ "586893ebc42943008010b4c210cfc9167df615e5", "7a2207a0e1142a9b214b323e43ab2ecc592e5b0e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu May 26 00:41:21 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu May 26 00:41:21 2011 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://github.com/at91linux/linux-2.6-at91 into devel-stable\n" }, { "commit": "115d2535f8ced13503b62a1275338e09a51681dc", "tree": "3a9ecacf360bdff1e3bf0c0b7a7a82033bdc44dc", "parents": [ "cca4acc491ade9280e88a756d5d7d9424d160814" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed May 25 11:55:57 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed May 25 19:50:17 2011 -0300" }, "message": "[media] add V4L2-PIX-FMT-SRGGB12 \u0026 friends to docbook\n\nThe xml with those guys are there, but they weren\u0027t included\non the docbook.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "cca4acc491ade9280e88a756d5d7d9424d160814", "tree": "e78ed04fea19a0755bc91da0e0c72a3517be11ee", "parents": [ "5f1e15868871a9da820357e0e3ff6fe89d2a16a6" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed May 25 10:56:58 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed May 25 19:49:34 2011 -0300" }, "message": "[media] Documentation/DocBook: Rename media fops xml files\n\nBy convention, the name of the XML file should match the references\ndeclared at media-entities.tmpl, as, otherwise, some validation\nscripts break.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "94265cf5f731c7df29fdfde262ca3e6d51e6828c", "tree": "e19d43a5e8b19a220a4258a5a9f30d63ffc4bf55", "parents": [ "9fe0617d9b6d21f700ee9e658e1c9fe3be2fb402" ], "author": { "name": "Flavio Leitner", "email": "fbl@redhat.com", "time": "Wed May 25 08:38:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 17:55:33 2011 -0400" }, "message": "bonding: documentation and code cleanup for resend_igmp\n\nImproves the documentation about how IGMP resend parameter\nworks, fix two missing checks and coding style issues.\n\nSigned-off-by: Flavio Leitner \u003cfbl@redhat.com\u003e\nAcked-by: Rick Jones \u003crick.jones2@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "46b2903c05b248ed78304113ecfba368b4c55def", "tree": "fadcbea8400b014d75d5a075a505401bfcfc0b91", "parents": [ "f2889fee8c7fe0ac9752186d43f9486392bb204d" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed May 25 14:49:20 2011 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed May 25 14:49:20 2011 -0700" }, "message": "dmaengine: Add API documentation for slave dma usage\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "586893ebc42943008010b4c210cfc9167df615e5", "tree": "eec3179235978fba9ca6bfae0799d97c8532ee15", "parents": [ "014322dac6ae0048c928c6ca2faf0d53194f9d15", "bd6356bdafc853201168f718f0059fbe11191461" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 25 21:47:48 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 25 21:47:48 2011 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mach-exynos4/mach-nuri.c\n" }, { "commit": "b0b349a85d3df00a40a8bd398e4a151fd8e91bbe", "tree": "79d2e5d15bb13e349af23cd3602090c9ef92f793", "parents": [ "ec693fe5287e1791f4d206e81ebdfdc7d1f8f6b9" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed May 25 20:43:33 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed May 25 20:43:33 2011 +0200" }, "message": "hwmon: New driver for the SMSC EMC6W201\n\nThis is a new driver for the SMSC EMC6W201 hardware monitoring device.\nThe device is functionally close to the EMC6D100 series, but is\nregister-incompatible.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nTested-by: Harry G McGavran Jr \u003cw5pny@arrl.net\u003e\nTested-by: Jeff Rickman \u003cjrickman@myamigos.us\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "9c084dae5dc7ae0039e330230e70f2a5956e566a", "tree": "1d0bb268081342ca1dee7a6c819cd459f409939d", "parents": [ "67b670ff04cdff1c9584ecdb22e297956664c9b5" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed May 25 20:43:32 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed May 25 20:43:32 2011 +0200" }, "message": "hwmon: (max6650) Properly support the MAX6650\n\nThe MAX6650 has only one fan input.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: \"Hans J. Koch\" \u003chjk@hansjkoch.de\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "67b670ff04cdff1c9584ecdb22e297956664c9b5", "tree": "c7715376d73ac1dfbdbe9a1f1fe0710ddd344308", "parents": [ "7d0333653840b0c692f55f1aaaa71d626fb00870" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed May 25 20:43:32 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed May 25 20:43:32 2011 +0200" }, "message": "hwmon: (max6650) Drop device detection\n\nMAX6650 device detection is unreliable, we got reports of false\npositives. We now have many ways to let users instantiate the devices\nexplicitly, so unreliable detection should be dropped.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: \"Hans J. Koch\" \u003chjk@hansjkoch.de\u003e\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "629c58bac082ae091e518187d63249fa7e9f796f", "tree": "f5b754d8fe64c8a819c89989b72c438d330c05ee", "parents": [ "4d53811a28090b7583bb68fda294e0f009679770" ], "author": { "name": "Hans de Goede", "email": "hdegoede@redhat.com", "time": "Wed May 25 20:43:32 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed May 25 20:43:32 2011 +0200" }, "message": "hwmon: (f71882fg) Add support for F71808A\n\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "512d1027a6c58def3c2a410e8be65b7e730aad3b", "tree": "a83a92937cb27a135f56610b299dbcac5fbcaa2f", "parents": [ "9e5813111265ad3c37a4370f0ee7e634dc07a7d6" ], "author": { "name": "Andreas Herrmann", "email": "andreas.herrmann3@amd.com", "time": "Wed May 25 20:43:31 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed May 25 20:43:31 2011 +0200" }, "message": "hwmon: Add driver for AMD family 15h processor power information\n\nThis CPU family provides NB register values to gather following\nTDP information\n\n* ProcessorPwrWatts: Specifies in Watts the maximum amount of power\n the processor can support.\n* CurrPwrWatts: Specifies in Watts the current amount of power being\n consumed by the processor.\n\nThis driver provides\n\n* power1_crit (ProcessorPwrWatts)\n* power1_input (CurrPwrWatts)\n\nSigned-off-by: Andreas Herrmann \u003candreas.herrmann3@amd.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "9e5813111265ad3c37a4370f0ee7e634dc07a7d6", "tree": "2e697c1c13f1a6515494842c687e91857a428c1d", "parents": [ "95de3b257516d21af6e0313c7bab119e4f80d6f4" ], "author": { "name": "Andre Przywara", "email": "andre.przywara@amd.com", "time": "Wed May 25 20:43:31 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed May 25 20:43:31 2011 +0200" }, "message": "hwmon: (k10temp) Add support for Fam15h (Bulldozer)\n\nAMDs upcoming CPUs use the same mechanism for the internal\ntemperature reporting as the Fam10h CPUs, so we just needed to add\nthe appropriate PCI-ID to the list.\nThis allows to use the k10temp driver on those CPUs.\nWhile at it change the Kconfig entry to be more generic.\n\nSigned-off-by: Andre Przywara \u003candre.przywara@amd.com\u003e\nAcked-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "2a651c7f8d377cf88271374315cbb5fe82eac784", "tree": "00bef7fdd1541d0a96d36410630280dfba24f8b5", "parents": [ "c88bc60a3bd3c63da3960076f13a4606c76bf013", "ee294bedb6d0658c9934ef5d96951a22003c8886" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:21:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:21:56 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n 9p: update Documentation pointers\n net/9p: enable 9p to work in non-default network namespace\n net/9p: p9_idpool_get return -1 on error\n fs/9p: Don\u0027t clunk dentry fid when we fail to get a writeback inode\n 9p: Small cleanup in \u003cnet/9p/9p.h\u003e\n 9p: remove experimental tag from tested configurations\n 9p: typo fixes and minor cleanups\n net/9p: Change linuxdoc names to match functions.\n" }, { "commit": "929cfdd5d3bdc772aff32e5a3fb4e3894394aa75", "tree": "f67202d079eaf1f8d65b2e1bfac70b768ae34bc4", "parents": [ "798ce8f1cca29dcc3f4b55947f611f4ffb32ac2b", "a1c15c59feee36267c43142a41152fbf7402afb6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:15:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:15:35 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40/drivers\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.40/drivers\u0027 of git://git.kernel.dk/linux-2.6-block: (110 commits)\n loop: handle on-demand devices correctly\n loop: limit \u0027max_part\u0027 module param to DISK_MAX_PARTS\n drbd: fix warning\n drbd: fix warning\n drbd: Fix spelling\n drbd: fix schedule in atomic\n drbd: Take a more conservative approach when deciding max_bio_size\n drbd: Fixed state transitions after async outdate-peer-handler returned\n drbd: Disallow the peer_disk_state to be D_OUTDATED while connected\n drbd: Fix for the connection problems on high latency links\n drbd: fix potential activity log refcount imbalance in error path\n drbd: Only downgrade the disk state in case of disk failures\n drbd: fix disconnect/reconnect loop, if ping-timeout \u003d\u003d ping-int\n drbd: fix potential distributed deadlock\n lru_cache.h: fix comments referring to ts_ instead of lc_\n drbd: Fix for application IO with the on-io-error\u003dpass-on policy\n xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions.\n xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override.\n xen/blkback: don\u0027t fail empty barrier requests\n xen/blkback: fix xenbus_transaction_start() hang caused by double xenbus_transaction_end()\n ...\n" }, { "commit": "798ce8f1cca29dcc3f4b55947f611f4ffb32ac2b", "tree": "15fba84ba4b930397c29fe562504f66211365699", "parents": [ "22e12bbc9bc38c6d0bd541d061a0f547596fc19d", "1547010e6e15a3f44f49381246421a1e19de526e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:14:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:14:07 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.40/core\u0027 of git://git.kernel.dk/linux-2.6-block: (40 commits)\n cfq-iosched: free cic_index if cfqd allocation fails\n cfq-iosched: remove unused \u0027group_changed\u0027 in cfq_service_tree_add()\n cfq-iosched: reduce bit operations in cfq_choose_req()\n cfq-iosched: algebraic simplification in cfq_prio_to_maxrq()\n blk-cgroup: Initialize ioc-\u003ecgroup_changed at ioc creation time\n block: move bd_set_size() above rescan_partitions() in __blkdev_get()\n block: call elv_bio_merged() when merged\n cfq-iosched: Make IO merge related stats per cpu\n cfq-iosched: Fix a memory leak of per cpu stats for root group\n backing-dev: Kill set but not used var in bdi_debug_stats_show()\n block: get rid of on-stack plugging debug checks\n blk-throttle: Make no throttling rule group processing lockless\n blk-cgroup: Make cgroup stat reset path blkg-\u003elock free for dispatch stats\n blk-cgroup: Make 64bit per cpu stats safe on 32bit arch\n blk-throttle: Make dispatch stats per cpu\n blk-throttle: Free up a group only after one rcu grace period\n blk-throttle: Use helper function to add root throtl group to lists\n blk-throttle: Introduce a helper function to fill in device details\n blk-throttle: Dynamically allocate root group\n blk-cgroup: Allow sleeping while dynamically allocating a group\n ...\n" }, { "commit": "22e12bbc9bc38c6d0bd541d061a0f547596fc19d", "tree": "39b93f43b482c5b4cb9d99933384a8a7fcb85d71", "parents": [ "19426a8f810752b4218e59b1e2187f33e255f7bc", "86ff9baadf16c8a1b452d72f5585be63457d9b15" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:59:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:59:42 2011 -0700" }, "message": "Merge branch \u0027timers-ptp-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-ptp-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n ptp: Fix dp83640 build warning when building statically\n ptp: Added a clock driver for the National Semiconductor PHYTER.\n ptp: Added a clock driver for the IXP46x.\n ptp: Added a clock that uses the eTSEC found on the MPC85xx.\n ptp: Added a brand new class driver for ptp clocks.\n" }, { "commit": "4b060420a596095869a6d7849caa798d23839cd1", "tree": "ebbbc25555d0358f73527f114f78691ac849ce3e", "parents": [ "e50c1f609c63223adaa38f5a79b18759a00adf72" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Tue May 24 17:13:12 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:45 2011 -0700" }, "message": "bitmap, irq: add smp_affinity_list interface to /proc/irq\n\nManually adjusting the smp_affinity for IRQ\u0027s becomes unwieldy when the\ncpu count is large.\n\nSetting smp affinity to cpus 256 to 263 would be:\n\n\techo 000000ff,00000000,00000000,00000000,00000000,00000000,00000000,00000000 \u003e smp_affinity\n\ninstead of:\n\n\techo 256-263 \u003e smp_affinity_list\n\nThink about what it looks like for cpus around say, 4088 to 4095.\n\nWe already have many alternate \"list\" interfaces:\n\n/sys/devices/system/cpu/cpuX/indexY/shared_cpu_list\n/sys/devices/system/cpu/cpuX/topology/thread_siblings_list\n/sys/devices/system/cpu/cpuX/topology/core_siblings_list\n/sys/devices/system/node/nodeX/cpulist\n/sys/devices/pci***/***/local_cpulist\n\nAdd a companion interface, smp_affinity_list to use cpu lists instead of\ncpu maps. This conforms to other companion interfaces where both a map\nand a list interface exists.\n\nThis required adding a bitmap_parselist_user() function in a manner\nsimilar to the bitmap_parse_user() function.\n\n[akpm@linux-foundation.org: make __bitmap_parselist() static]\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Andy Shevchenko \u003candy.shevchenko@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": "4ff4d8d342fe25c4d1106fb0ffdd310a43d0ace0", "tree": "b41ea0ecc007f1c90eceada0db081dc0fb81700c", "parents": [ "d634f194d4e2e58d57927c812aca097e67a2287d" ], "author": { "name": "Nolan Leake", "email": "nolan@sigbus.net", "time": "Tue May 24 17:13:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:41 2011 -0700" }, "message": "um: add ucast ethernet transport\n\nThe ucast transport is similar to the mcast transport (and, in fact,\nshares most of its code), only it uses UDP unicast to move packets.\n\nObviously this is only useful for point-to-point connections between\nvirtual ethernet devices.\n\nSigned-off-by: Nolan Leake \u003cnolan@cumulusnetworks.com\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a2c8990aed5ab000491732b07c8c4465d1b389b8", "tree": "1aaac1e831410ac3e59c969f05426315d2054c28", "parents": [ "5b52fc890bece77bffb9fade69239f71384ef02b" ], "author": { "name": "Michal Hocko", "email": "mhocko@suse.cz", "time": "Tue May 24 17:12:50 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:36 2011 -0700" }, "message": "memsw: remove noswapaccount kernel parameter\n\nThe noswapaccount parameter has been deprecated since 2.6.38 without any\ncomplaints from users so we can remove it. swapaccount\u003d0|1 can be used\ninstead.\n\nAs we are removing the parameter we can also clean up swapaccount because\nit doesn\u0027t have to accept an empty string anymore (to match noswapaccount)\nand so we can push \u003d into __setup macro rather than checking \"\u003d1\" resp.\n\"\u003d0\" strings\n\nSigned-off-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Hiroyuki Kamezawa \u003ckamezawa.hiroyuki@gmail.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de03c72cfce5b263a674d04348b58475ec50163c", "tree": "e2b035234440bcd1aa88078c3f9c8457d461ef9c", "parents": [ "692e0b35427a088bf75d9363788c61c7edbe93a5" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue May 24 17:12:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:21 2011 -0700" }, "message": "mm: convert mm-\u003ecpu_vm_cpumask into cpumask_var_t\n\ncpumask_t is very big struct and cpu_vm_mask is placed wrong position.\nIt might lead to reduce cache hit ratio.\n\nThis patch has two change.\n1) Move the place of cpumask into last of mm_struct. Because usually cpumask\n is accessed only front bits when the system has cpu-hotplug capability\n2) Convert cpu_vm_mask into cpumask_var_t. It may help to reduce memory\n footprint if cpumask_size() will use nr_cpumask_bits properly in future.\n\nIn addition, this patch change the name of cpu_vm_mask with cpu_vm_mask_var.\nIt may help to detect out of tree cpu_vm_mask users.\n\nThis patch has no functional change.\n\n[akpm@linux-foundation.org: build fix]\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3d48ae45e72390ddf8cc5256ac32ed6f7a19cbea", "tree": "1f46db3a8424090dd8e0b58991fa5acc1a73e680", "parents": [ "97a894136f29802da19a15541de3c019e1ca147e" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue May 24 17:12:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:18 2011 -0700" }, "message": "mm: Convert i_mmap_lock to a mutex\n\nStraightforward conversion of i_mmap_lock to a mutex.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Richard Weinberger \u003crichard@nod.at\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Namhyung Kim \u003cnamhyung@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": "ee294bedb6d0658c9934ef5d96951a22003c8886", "tree": "a06361f1f2a2eef2bc6554c0688c1e52d154ae83", "parents": [ "e75762fdcd27c1d0293d9160b3ac6dcb3371272a" ], "author": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Wed May 25 09:19:27 2011 -0500" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Wed May 25 09:33:05 2011 -0500" }, "message": "9p: update Documentation pointers\n\nUpdate documentation pointers to include virtfs publication, 9p RFC\nas well as updated list of servers and alternative clients.\n\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "5f1e15868871a9da820357e0e3ff6fe89d2a16a6", "tree": "d6599a1e2d89e5732756ff13008768ef65d85379", "parents": [ "c6ae804a65649d5919d232d65dc6a08c9e5ac01b" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon May 23 07:12:27 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed May 25 07:51:59 2011 -0300" }, "message": "[media] Media DocBook: fix validation errors\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "6a8a98b22b10f1560d5f90aded4a54234b9b2724", "tree": "c0757487bad9e1774bebc6fff935e275f036809a", "parents": [ "eea72d5fdf59879edb2c6639b0b7cc385e0df646" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Mon May 23 10:23:43 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed May 25 02:25:35 2011 +0100" }, "message": "mtd: kill CONFIG_MTD_PARTITIONS\n\nNow that none of the drivers use CONFIG_MTD_PARTITIONS we can remove\nit from Kconfig and the last remaining uses.\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "cb87ea28ed9e75a41eb456bfcb547b4e6f10e750", "tree": "e3fe4a653bd96815c650dd9f5db11edc6b39b0db", "parents": [ "641c3187b9d53cfd4c23b0ce2ab18a13d5e775e5" ], "author": { "name": "John Calixto", "email": "john.calixto@modsystems.com", "time": "Tue Apr 26 18:56:29 2011 -0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:02:54 2011 -0400" }, "message": "mmc: core: Add mmc CMD+ACMD passthrough ioctl\n\nAllows appropriately-privileged applications to send CMD (normal) and ACMD\n(application-specific; preceded with CMD55) commands to cards/devices on\nthe mmc bus. This is primarily useful for enabling the security\nfunctionality built in to every SD card.\n\nIt can also be used as a generic passthrough (e.g. to enable virtual\nmachines to control mmc bus devices directly). However, this use case has\nnot been tested rigorously. Generic passthrough testing was only conducted\nfor a few non-security opcodes to prove the feasibility of the passthrough.\n\nSince any opcode can be sent using this passthrough, it is very possible to\nrender the card/device unusable. Applications that use this ioctl must\nhave CAP_SYS_RAWIO.\n\nSecurity commands tested on TI PCIxx12 (SDHCI), Sigma Designs SMP8652 SoC,\nTI OMAP3621/OMAP3630 SoC, Samsung S5PC110 SoC, Qualcomm MSM7200A SoC.\n\nSigned-off-by: John Calixto \u003cjohn.calixto@modsystems.com\u003e\nReviewed-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "371a689f64b0da140c3bcd3f55305ffa1c3a58ef", "tree": "c0dff82d668378d395cb22ce33cd93e6dafef9eb", "parents": [ "1a258db6f396e26c2c00b19c0107a891895d4584" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Mon Apr 11 18:10:25 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue May 24 21:01:21 2011 -0400" }, "message": "mmc: MMC boot partitions support.\n\nAllows device MMC boot partitions to be accessed. MMC partitions are\ntreated effectively as separate block devices on the same MMC card.\n\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "03eb14199e8a2ff2bc170b283305990151b0d619", "tree": "c16c123a850e8033b2daa71ad9ae241906542dd8", "parents": [ "d762f4383100c2a87b1a3f2d678cd3b5425655b4", "ede338f4ce2fb5ee99d18751df32fbd3b10df268" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 25 00:08:17 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 25 00:08:17 2011 +0100" }, "message": "Merge branch \u0027devicetree/arm-next\u0027 of git://git.secretlab.ca/git/linux-2.6 into devel-stable\n" }, { "commit": "37d8cb5478651b27779b9a80d024c614c452eae3", "tree": "53fe55f595dea61ba8acd72bd19d2655513b7195", "parents": [ "dc522adbee91dd17fa31f8e8cf72673fe0e8370e", "07da0372dd6ca5517400ce95040861def25930c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 15:20:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 15:20:02 2011 -0700" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c-parport: Various cleanups\n i2c-i801: Don\u0027t depend on other kernel driver config options\n i2c-i801: Check for vendor Fujitsu before probing for apanel\n i2c-i801: Don\u0027t probe for slaves on IDF channels\n i2c-i801: SMBus patch for Intel Panther Point DeviceIDs\n i2c/writing-clients: Fix foo_driver.id_table\n" }, { "commit": "2bb732cdb48d271ff7a910260ffb851fb4bc8a28", "tree": "580bf68eb1e52b4e6915588d61423347ae09c318", "parents": [ "f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1", "c4d5ee13984f57b2f881635c49045151679f5e8a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 13:31:37 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 13:31:37 2011 -0700" }, "message": "Merge branch \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:\n kbuild: make KBUILD_NOCMDDEP\u003d1 handle empty built-in.o\n scripts/kallsyms.c: fix potential segfault\n scripts/gen_initramfs_list.sh: Convert to a /bin/sh script\n kbuild: Fix GNU make v3.80 compatibility\n kbuild: Fix passing -Wno-* options to gcc 4.4+\n kbuild: move scripts/basic/docproc.c to scripts/docproc.c\n kbuild: Fix Makefile.asm-generic for um\n kbuild: Allow to combine multiple W\u003d levels\n kbuild: Disable -Wunused-but-set-variable for gcc 4.6.0\n Fix handling of backlash character in LINUX_COMPILE_BY name\n kbuild: asm-generic support\n kbuild: implement several W\u003d levels\n kbuild: Fix build with binutils \u003c\u003d 2.19\n initramfs: Use KBUILD_BUILD_TIMESTAMP for generated entries\n kbuild: Allow to override LINUX_COMPILE_BY and LINUX_COMPILE_HOST macros\n kbuild: Drop unused LINUX_COMPILE_TIME and LINUX_COMPILE_DOMAIN macros\n kbuild: Use the deterministic mode of ar\n kbuild: Call gzip with -n\n kbuild: move KALLSYMS_EXTRA_PASS from Kconfig to Makefile\n Kconfig: improve KALLSYMS_ALL documentation\n\nFix up trivial conflict in Makefile\n" }, { "commit": "4637f40f200063973553ce3c4c1ac6c247e4535c", "tree": "ff317a0dfb67cae313a208d120edd5102730044d", "parents": [ "5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f", "b73077eb03f510a84b102fb97640e595a958403c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:58:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:58:49 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)\n Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander\n Input: tsc2007 - add X, Y and Z fuzz factors to platform data\n Input: tsc2007 - add poll_period parameter to platform data\n Input: tsc2007 - add poll_delay parameter to platform data\n Input: tsc2007 - add max_rt parameter to platform data\n Input: tsc2007 - debounce pressure measurement\n Input: ad714x - fix captouch wheel option algorithm\n Input: ad714x - allow platform code to specify irqflags\n Input: ad714x - fix threshold and completion interrupt masks\n Input: ad714x - fix up input configuration\n Input: elantech - remove support for proprietary X driver\n Input: elantech - report multitouch with proper ABS_MT messages\n Input: elantech - export pressure and width when supported\n Input: elantech - describe further the protocol\n Input: atmel_tsadcc - correct call to input_free_device\n Input: add driver FSL MPR121 capacitive touch sensor\n Input: remove useless synchronize_rcu() calls\n Input: ads7846 - fix gpio_pendown configuration\n Input: ads7846 - add possibility to use external vref on ads7846\n Input: rotary-encoder - add support for half-period encoders\n ...\n" }, { "commit": "6e2a851e71e65d4ec5bbc51802c36a61322d792b", "tree": "863e234e6bfea1391c41ae27d92b47859fbf7345", "parents": [ "3116c86033079a1d4d4e84c40028f96b614843b8" ], "author": { "name": "Seth Heasley", "email": "seth.heasley@intel.com", "time": "Tue May 24 20:58:49 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Tue May 24 20:58:49 2011 +0200" }, "message": "i2c-i801: SMBus patch for Intel Panther Point DeviceIDs\n\nThis patch adds the SMBus controller DeviceID for the Intel Panther Point PCH.\n\nSigned-off-by: Seth Heasley \u003cseth.heasley@intel.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "3116c86033079a1d4d4e84c40028f96b614843b8", "tree": "c81390ec173f671cb2ee09aa2bd48096f71a6d75", "parents": [ "d762f4383100c2a87b1a3f2d678cd3b5425655b4" ], "author": { "name": "Vikram Narayanan", "email": "vikram186@gmail.com", "time": "Tue May 24 20:58:48 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Tue May 24 20:58:48 2011 +0200" }, "message": "i2c/writing-clients: Fix foo_driver.id_table\n\nThe i2c_device_id structure variable\u0027s name is not used in the\ni2c_driver structure.\n\nSigned-off-by: Vikram Narayanan \u003cvikram186@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "eb08d8ff476ad39a149e1044c7d3fd742a168864", "tree": "fb3b442e8b601ea9c8987a553433c8bfaa188159", "parents": [ "9f22aae04631ec90eeab804b024de3c658dae406", "56e46742e846e4de167dde0e1e1071ace1c882a5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:51:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:51:07 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6: (52 commits)\n UBIFS: switch to dynamic printks\n UBIFS: fix kernel-doc comments\n UBIFS: fix extremely rare mount failure\n UBIFS: simplify LEB recovery function further\n UBIFS: always cleanup the recovered LEB\n UBIFS: clean up LEB recovery function\n UBIFS: fix-up free space on mount if flag is set\n UBIFS: add the fixup function\n UBIFS: add a superblock flag for free space fix-up\n UBIFS: share the next_log_lnum helper\n UBIFS: expect corruption only in last journal head LEBs\n UBIFS: synchronize write-buffer before switching to the next bud\n UBIFS: remove BUG statement\n UBIFS: change bud replay function conventions\n UBIFS: substitute the replay tree with a replay list\n UBIFS: simplify replay\n UBIFS: store free and dirty space in the bud replay entry\n UBIFS: remove unnecessary stack variable\n UBIFS: double check that buds are replied in order\n UBIFS: make 2 functions static\n ...\n" }, { "commit": "4f788dce0baf44295a8d9708d3f124587158c061", "tree": "8c19d56392a3399f3012607c335bc78ed7be6565", "parents": [ "3cc6851f9a3509e2ced0eb218599857b07c0ab46" ], "author": { "name": "adam radford", "email": "aradford@gmail.com", "time": "Wed May 11 18:35:05 2011 -0700" }, "committer": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Tue May 24 12:36:06 2011 -0400" }, "message": "[SCSI] megaraid_sas: Version and Changelog update\n\nSigned-off-by: Adam Radford \u003caradford@gmail.com\u003e\nSigned-off-by: James Bottomley \u003cjbottomley@parallels.com\u003e\n" }, { "commit": "e84661aa84e2e003738563f65155d4f12dc474e7", "tree": "9f9b6d2fac2048c5fb8c2728bcf2930435890d4f", "parents": [ "bf59170a66bc3eaf3ee513aa6ce9774aa2ab5188" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Fri May 20 13:45:32 2011 +0000" }, "committer": { "name": "Alex Elder", "email": "aelder@sgi.com", "time": "Tue May 24 11:17:13 2011 -0500" }, "message": "xfs: add online discard support\n\nNow that we have reliably tracking of deleted extents in a\ntransaction we can easily implement \"online\" discard support\nwhich calls blkdev_issue_discard once a transaction commits.\n\nThe actual discard is a two stage operation as we first have\nto mark the busy extent as not available for reuse before we\ncan start the actual discard. Note that we don\u0027t bother\nsupporting discard for the non-delaylog mode.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Alex Elder \u003caelder@sgi.com\u003e\n" }, { "commit": "bdebd4892e05cc9068659f25af33c6b322034eb2", "tree": "748cb44e626383e2f877b194c49d61b0f687c304", "parents": [ "6ef3d36eee2a5593e31f9f77b4aa992024838ff7" ], "author": { "name": "Arnaud Lacombe", "email": "lacombar@gmail.com", "time": "Sun May 15 23:22:56 2011 -0400" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Tue May 24 16:13:40 2011 +0200" }, "message": "kconfig: do not record timestamp in .config\n\nSigned-off-by: Arnaud Lacombe \u003clacombar@gmail.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "69a60c4d177632bd56ae567dc0a082f7119b71c2", "tree": "8d94c8a6ad6cd7040650763b23a0396d16e440f2", "parents": [ "e2b0c215c2bd57693af69f7a430585109c02b07f" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Sun May 01 21:34:16 2011 +0800" }, "committer": { "name": "Joel Becker", "email": "jlbec@evilplan.org", "time": "Mon May 23 23:37:14 2011 -0700" }, "message": "ocfs2: remove the /sys/o2cb symlink\n\nIt is obsoleted since Dec 2005.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nSigned-off-by: Joel Becker \u003cjlbec@evilplan.org\u003e\n" }, { "commit": "e2b0c215c2bd57693af69f7a430585109c02b07f", "tree": "1b3197508edd4045267dfb1d71c46a3acf9ae1ec", "parents": [ "d762f4383100c2a87b1a3f2d678cd3b5425655b4" ], "author": { "name": "Tiger Yang", "email": "tiger.yang@oracle.com", "time": "Wed Mar 02 19:32:09 2011 +0800" }, "committer": { "name": "Joel Becker", "email": "jlbec@evilplan.org", "time": "Mon May 23 23:37:12 2011 -0700" }, "message": "ocfs2: clean up mount option about atime in ocfs2.txt\n\nAs ocfs2 supports relatime and strictatime, we need update the\nrelative document. Atime_quantum need work with strictatime, so only\nshow it in procfs when mount with strictatime.\n\nSigned-off-by: Tiger Yang \u003ctiger.yang@oracle.com\u003e\nSigned-off-by: Joel Becker \u003cjlbec@evilplan.org\u003e\n" }, { "commit": "df462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc", "tree": "bca52fce066159f136d75c69e79016422212cb1d", "parents": [ "343800e7d20944aead238c2c6e3f7789f8b6587c", "cf25220677b3f10468a74278130fe224f73632a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 21:12:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 21:12:49 2011 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)\n [media] gspca - sunplus: Fix some warnings and simplify code\n [media] gspca: Fix some warnings tied to \u0027no debug\u0027\n [media] gspca: Unset debug by default\n [media] gspca - cpia1: Remove a bad conditional compilation instruction\n [media] gspca - main: Remove USB traces\n [media] gspca - main: Version change to 2.13\n [media] gspca - stk014 / t613: Accept the index 0 in querymenu\n [media] gspca - kinect: Remove __devinitdata\n [media] gspca - cpia1: Fix some warnings\n [media] video/Kconfig: Fix mis-classified devices\n [media] support for medion dvb stick 1660:1921\n [media] tm6000: fix uninitialized field, change prink to dprintk\n [media] cx231xx: Add support for Iconbit U100\n [media] saa7134 add new TV cards\n [media] Use a more consistent value for RC repeat period\n [media] cx18: Move spinlock and vb_type initialisation into stream_init\n [media] tm6000: remove tm6010 sif audio start and stop\n [media] tm6000: remove unused exports\n [media] tm6000: add pts logging\n [media] tm6000: change from ioctl to unlocked_ioctl\n ...\n" }, { "commit": "5e152b4c9e0fce6149c74406346a7ae7e7a17727", "tree": "12503a50142797c1babfd87099c193b3e4d54f93", "parents": [ "a77febbef105554c5a37241cf903f48ab7bc03c7", "9251bac97d47fdaea406ea0595c2d0aa50022f12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)\n PCI: Don\u0027t use dmi_name_in_vendors in quirk\n PCI: remove unused AER functions\n PCI/sysfs: move bus cpuaffinity to class dev_attrs\n PCI: add rescan to /sys/.../pci_bus/.../\n PCI: update bridge resources to get more big ranges when allocating space (again)\n KVM: Use pci_store/load_saved_state() around VM device usage\n PCI: Add interfaces to store and load the device saved state\n PCI: Track the size of each saved capability data area\n PCI/e1000e: Add and use pci_disable_link_state_locked()\n x86/PCI: derive pcibios_last_bus from ACPI MCFG\n PCI: add latency tolerance reporting enable/disable support\n PCI: add OBFF enable/disable support\n PCI: add ID-based ordering enable/disable support\n PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.\n PCI: Set PCIE maxpayload for card during hotplug insertion\n PCI/ACPI: Report _OSC control mask returned on failure to get control\n x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs\n PCI: handle positive error codes\n PCI: check pci_vpd_pci22_wait() return\n PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio\n ...\n\nFix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be4461\nmoved the intel SMBUS ID definitons to the i2c-i801.c driver.\n" }, { "commit": "f5039935ac685b3b9b8c13fbc33cac8643dee32e", "tree": "18f547a1249cd9b745ff84af45afd4d475298d5f", "parents": [ "f14d8d3a1618438c08eb74114c06b3307fac6436" ], "author": { "name": "Vikram Narayanan", "email": "vikram186@gmail.com", "time": "Mon May 23 12:01:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:14:11 2011 -0700" }, "message": "Documentation: update GregKH links\n\nFixed the broken links in the SubmittingPatches file.\n\n[ The old links turn out to not be broken after all, but the new links\n are certainly more readable - Linus ]\n\nSigned-off-by: Vikram Narayanan \u003cvikram186@gmail.com\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f14d8d3a1618438c08eb74114c06b3307fac6436", "tree": "2b1667960ae91ea1a03f4d7de8974c7f9b9b92b0", "parents": [ "8208266060664726e9f998a9c57c2780549e460c" ], "author": { "name": "Nicolas Kaiser", "email": "nikai@nikai.net", "time": "Mon May 23 11:59:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:14:11 2011 -0700" }, "message": "Documentation: fix vgaarbiter.txt typos etc.\n\nFixed typos.\n\nv2: Incorporated changes by Randy Dunlap.\n\nSigned-off-by: Nicolas Kaiser \u003cnikai@nikai.net\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8208266060664726e9f998a9c57c2780549e460c", "tree": "1138ba65c633bf51b54c8fa25c5094aae8f3c6cd", "parents": [ "52307a9e1d8910e205f6be2c4dd35900f7b11282" ], "author": { "name": "Harry Wei", "email": "harryxiyou@gmail.com", "time": "Mon May 23 11:58:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:14:11 2011 -0700" }, "message": "Documentation: update LXR web link\n\nUpdate LXR (Linux cross reference) web link.\n\nSigned-off-by: Harry Wei \u003charryxiyou@gmail.com\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "52307a9e1d8910e205f6be2c4dd35900f7b11282", "tree": "243c21dbaf6953c6c1099bd0e1dc293647844359", "parents": [ "56dab6c20808f0405fee66ddc3dd092fd115d911" ], "author": { "name": "Lucian Adrian Grijincu", "email": "lucian.grijincu@gmail.com", "time": "Mon May 23 11:57:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:14:11 2011 -0700" }, "message": "Documentation: update epoll sysctl text\n\nmax_user_instances was removed in this commit:\n\n commit 9df04e1f25effde823a600e755b51475d438f56b\n Author: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\n Date: Thu Jan 29 14:25:26 2009 -0800\n\n epoll: drop max_user_instances and rely only on max_user_watches\n\nbut the documentation entry was not removed.\n\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Lucian Adrian Grijincu \u003clucian.grijincu@gmail.com\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "56dab6c20808f0405fee66ddc3dd092fd115d911", "tree": "3d9165e2e667dddb75eef89ce74b51abd89f616b", "parents": [ "ea2b50ef4c9e030749ae473e95258f477c3a68ca" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon May 23 11:55:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:14:11 2011 -0700" }, "message": "Documentation: update dontdiff file\n\nv2, updated based on comments from Joe and Paul.\n\nUpdate to Documentation/dontdiff, based on many updates to\nvarious .gitignore patches over the last 2 years.\n\nInitially begun by Michael Prokop \u003cmika@grml.org\u003e, with lots of\nchanges by Randy Dunlap.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Michael Prokop \u003cmika@grml.org\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c78275f366c687b5b3ead3d99fc96d1f02d38a8e", "tree": "279a8cccfc56fd347b4864c3f400935f18244a5f", "parents": [ "d94ba80ebbea17f036cecb104398fbcd788aa742" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Apr 22 12:03:54 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:10:14 2011 -0700" }, "message": "ptp: Added a clock that uses the eTSEC found on the MPC85xx.\n\nThe eTSEC includes a PTP clock with quite a few features. This patch adds\nsupport for the basic clock adjustment functions, plus two external time\nstamps, one alarm, and the PPS callback.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "d94ba80ebbea17f036cecb104398fbcd788aa742", "tree": "7fe40228c5ea2bb77f2892b722d27155df8c1157", "parents": [ "caebc160ce3f76761cc62ad96ef6d6f30f54e3dd" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Apr 22 12:03:08 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:01:00 2011 -0700" }, "message": "ptp: Added a brand new class driver for ptp clocks.\n\nThis patch adds an infrastructure for hardware clocks that implement\nIEEE 1588, the Precision Time Protocol (PTP). A class driver offers a\nregistration method to particular hardware clock drivers. Each clock is\npresented as a standard POSIX clock.\n\nThe ancillary clock features are exposed in two different ways, via\nthe sysfs and by a character device.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "c44dead70a841d90ddc01968012f323c33217c9e", "tree": "85489ebe9b9a3413cd8ee197ffb40c8aa8d97e63", "parents": [ "99dff5856220a02b8711f2e8746413ea6e53ccf6", "d5f6db9e1aff6ccf1876224f152c0268b0c8a992" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:33:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:33:02 2011 -0700" }, "message": "Merge branch \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)\n USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h\n USB: UHCI: Support big endian GRUSBHC HC\n sparc: add {read,write}*_be routines\n USB: UHCI: Add support for big endian descriptors\n USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier\n USB: UHCI: Add support for big endian mmio\n usb-storage: Correct adjust_quirks to include latest flags\n usb/isp1760: Fix possible unlink problems\n usb/isp1760: Move function isp1760_endpoint_disable() within file.\n USB: remove remaining usages of hcd-\u003estate from usbcore and fix regression\n usb: musb: ux500: add configuration and build options for ux500 dma\n usb: musb: ux500: add dma glue layer for ux500\n usb: musb: ux500: add dma name for ux500\n usb: musb: ux500: add ux500 specific code for gadget side\n usb: musb: fix compile error\n usb-storage: fix up the unusual_realtek device list\n USB: gadget: f_audio: Fix invalid dereference of initdata\n EHCI: don\u0027t rescan interrupt QHs needlessly\n OHCI: fix regression caused by nVidia shutdown workaround\n USB: OTG: msm: Free VCCCX regulator even if we can\u0027t set the voltage\n ...\n" }, { "commit": "99dff5856220a02b8711f2e8746413ea6e53ccf6", "tree": "d8bae7ccdf8f7ad5221b053bb74a6220df996b3a", "parents": [ "bb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c", "d9a0fbfd7bc5d2c42f0fa9bcbdab62c4942d0388" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:23:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:23:20 2011 -0700" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)\n serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.\n tty/serial: Fix break handling for PORT_TEGRA\n tty/serial: Add explicit PORT_TEGRA type\n n_tracerouter and n_tracesink ldisc additions.\n Intel PTI implementaiton of MIPI 1149.7.\n Kernel documentation for the PTI feature.\n export kernel call get_task_comm().\n tty: Remove to support serial for S5P6442\n pch_phub: Support new device ML7223\n 8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter\n ASoC: Update cx20442 for TTY API change\n pch_uart: Support new device ML7223 IOH\n parport: Use request_muxed_region for IT87 probe and lock\n tty/serial: add support for Xilinx PS UART\n n_gsm: Use print_hex_dump_bytes\n drivers/tty/moxa.c: Put correct tty value\n TTY: tty_io, annotate locking functions\n TTY: serial_core, remove superfluous set_task_state\n TTY: serial_core, remove invalid test\n Char: moxa, fix locking in moxa_write\n ...\n\nFix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and\ndrivers/tty/serial/Makefile.\n\nI did the hci_ldisc thing as an evil merge, cleaning things up.\n" }, { "commit": "6fad2b5b649fa1fa6ee7293222815f5b62499889", "tree": "c2f9735e8868d3ce5decb5a08c56e1a1cc9730af", "parents": [ "19504828b4bee5e471bcd35e214bc6fd0d380692", "4cc452758fd250bb5968c583d825bb0e68d65db0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:26:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:26:20 2011 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:\n hwmon: (coretemp) Fix checkpatch errors\n hwmon: Remove pkgtemp driver\n hwmon: (coretemp) Merge pkgtemp with coretemp\n hwmon: (pmbus) Add support for Analog Devices ADM1275\n hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health Controllers\n hwmon: (pmbus) Add support for TI UCD9200 series of PWM System Controllers\n hwmon: (pmbus) Use device specific function to read fan configuration\n hwmon: (pmbus) Expand scope of device specific get_status function\n hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registers\n hwmon: Driver for MAX16065 System Manager and compatibles\n hwmon: (sht15) add support for CRC validation\n hwmon: (sht15) add support for the status register\n hwmon: (sht15) clean-up the probe function\n hwmon: (sht15) general code clean-up\n hwmon: Add support for MAX6642\n" }, { "commit": "57d19e80f459dd845fb3cfeba8e6df8471bac142", "tree": "8254766715720228db3d50f1ef3c7fe003c06d65", "parents": [ "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "e64851f5a0ad6ec991f74ebb3108c35aa0323d5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n b43: fix comment typo reqest -\u003e request\n Haavard Skinnemoen has left Atmel\n cris: typo in mach-fs Makefile\n Kconfig: fix copy/paste-ism for dell-wmi-aio driver\n doc: timers-howto: fix a typo (\"unsgined\")\n perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c\n md, raid5: Fix spelling error in comment (\u0027Ofcourse\u0027 --\u003e \u0027Of course\u0027).\n treewide: fix a few typos in comments\n regulator: change debug statement be consistent with the style of the rest\n Revert \"arm: mach-u300/gpio: Fix mem_region resource size miscalculations\"\n audit: acquire creds selectively to reduce atomic op overhead\n rtlwifi: don\u0027t touch with treewide double semicolon removal\n treewide: cleanup continuations and remove logging message whitespace\n ath9k_hw: don\u0027t touch with treewide double semicolon removal\n include/linux/leds-regulator.h: fix syntax in example code\n tty: fix typo in descripton of tty_termios_encode_baud_rate\n xtensa: remove obsolete BKL kernel option from defconfig\n m68k: fix comment typo \u0027occcured\u0027\n arch:Kconfig.locks Remove unused config option.\n treewide: remove extra semicolons\n ...\n" }, { "commit": "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "tree": "e5ec44a30720f1db1cd4a803b3711a2293322dc5", "parents": [ "e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f", "366a2382c68d01638350efcf23d46a47d661c595" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:10:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:10:03 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)\n HID: hid-multitouch: cosmetic changes, sort classes and devices\n HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE\n HID: hid-multitouch: add support for Unitec panels\n HID: hid-multitouch: add support for Touch International panels\n HID: hid-multitouch: add support for GoodTouch panels\n HID: hid-multitouch: add support for CVTouch panels\n HID: hid-multitouch: add support for ActionStar panels\n HID: hiddev: fix race between hiddev_disconnect and hiddev_release\n HID: magicmouse: ignore \u0027ivalid report id\u0027 while switching modes\n HID: fix a crash in hid_report_raw_event() function.\n HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus\n HID: assorted usage updates from hut 1.12\n HID: roccat: fix actual/startup profile sysfs attribute in koneplus\n HID: hid-multitouch: Add support for Lumio panels\n HID: \u0027name\u0027 and \u0027phys\u0027 in \u0027struct hid_device\u0027 can never be NULL\n HID: hid-multitouch: add support for Ilitek dual-touch panel\n HID: picolcd: Avoid compile warning/error triggered by copy_from_user()\n HID: add support for Logitech G27 wheel\n HID: hiddev: fix error path in hiddev_read when interrupted\n HID: add support for Sony Navigation Controller\n ...\n" } ], "next": "710421cc7d295cc59eb2676fe2ba3bc3252c124e" }