)]}' { "log": [ { "commit": "7c8df28633bf0b7eb253f866029be0ac59ddb062", "tree": "d8fba38a54a339d460026f79952cab16240e4e5a", "parents": [ "e8c073c4ff51207f5c1c37fb054360bbc0f38251" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Jul 08 16:00:54 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:26 2013 -0700" }, "message": "ptrace: revert \"Prepare to fix racy accesses on task breakpoints\"\n\nThis reverts commit bf26c018490c (\"Prepare to fix racy accesses on task\nbreakpoints\").\n\nThe patch was fine but we can no longer race with SIGKILL after commit\n9899d11f6544 (\"ptrace: ensure arch_ptrace/ptrace_request can never race\nwith SIGKILL\"), the __TASK_TRACED tracee can\u0027t be woken up and\n-\u003eptrace_bps[] can\u0027t go away.\n\nNow that ptrace_get_breakpoints/ptrace_put_breakpoints have no callers,\nwe can kill them and remove task-\u003eptrace_bp_refcnt.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Michael Neuling \u003cmikey@neuling.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Jan Kratochvil \u003cjan.kratochvil@redhat.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6e5b93ee55d401f1619092fb675b57c28c9ed7ec", "tree": "d6d9627ec023d7375d8dc996523509ee45d082bd", "parents": [ "4e80b1880c5a31d051d1e4a7377dec0a20701c23" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Jul 08 16:00:46 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:25 2013 -0700" }, "message": "fatfs: add FAT_IOCTL_GET_VOLUME_ID\n\nThis patch, originally from Android kernel, adds vfat ioctl command\nFAT_IOCTL_GET_VOLUME_ID, with this command we can get the vfat volume ID\nusing following code:\n\n\tioctl(fd, FAT_IOCTL_GET_VOLUME_ID, \u0026volume_ID)\n\nThis patch is a modified version of the patch by Mike Lockwood, with\nchanges from Dmitry Pervushin, who noticed the original patch makes some\nvolume IDs abiguous with error returns: for example, if volume id is\n0xFFFFFDAD, that matches -ENOIOCTLCMD, we get \"FFFFFFFF\" from the user\nspace.\n\nSo add a parameter to ioctl to get the correct volume ID.\n\nAndroid uses vfat volume ID to identify different sd card, when a new sd\ncard is inserted to device, android can scan the media on it and pop up\nnew contents.\n\nSigned-off-by: Bintian Wang \u003cbintian.wang@linaro.org\u003e\nCc: dmitry pervushin \u003cdpervushin@gmail.com\u003e\nCc: Mike Lockwood \u003clockwood@android.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nAcked-by: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Sean McNeil \u003csean@mcneil.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ef277c73ca3b1aade278036ae11640090681d558", "tree": "87290bf57329a3df8c381b3078b07a137c4fc543", "parents": [ "bcb615a81b1765864c71c50afb56631e7a1e5283" ], "author": { "name": "Tang Chen", "email": "tangchen@cn.fujitsu.com", "time": "Mon Jul 08 16:00:21 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:23 2013 -0700" }, "message": "page migration: fix wrong comment in address_space_operations.migratepage()\n\nThere is no parameter \"sync\" in address_space_operations-\u003emigratepage().\nIt should be migrate_mode. And the comment is for MIGRATE_ASYNC.\n\nSigned-off-by: Tang Chen \u003ctangchen@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": "64363aad5ff1b878230e91223038c26a2205bff3", "tree": "8f8bb770645e634d55fc390ec4428b1818eccd10", "parents": [ "73b44ff43c4b3cf517826da03c51948593f88753" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 08 16:00:18 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:23 2013 -0700" }, "message": "mm: remove unused VM_\u003cREADfoo\u003e macros and expand other in-place\n\nThese VM_\u003cREADfoo\u003e macros aren\u0027t used very often and three of them\naren\u0027t used at all.\n\nExpand the ones that are used in-place, and remove all the now unused\n#define VM_\u003cfoo\u003e macros.\n\nVM_READHINTMASK, VM_NormalReadHint and VM_ClearReadHint were added just\nbefore 2.4 and appears have never been used.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc6df808aaf00eed564e2e7fc0f246691363cd12", "tree": "477e6f1b9761b978e816ded53b1ad802cd119319", "parents": [ "25d130ba22362757a90135fd8a0f75cc7fc71e79" ], "author": { "name": "Wanpeng Li", "email": "liwanp@linux.vnet.ibm.com", "time": "Mon Jul 08 16:00:15 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:22 2013 -0700" }, "message": "mm/writeback: commit reason of WB_REASON_FORKER_THREAD mismatch name\n\nAfter commit 839a8e8660b6 (\"writeback: replace custom worker pool\nimplementation with unbound workqueue\"), there is no bdi forker thread\nany more. However, WB_REASON_FORKER_THREAD is still used due to it is\nTPs userland visible and we won\u0027t be exposing exactly the same\ninformation with just a different name.\n\nSigned-off-by: Wanpeng Li \u003cliwanp@linux.vnet.ibm.com\u003e\nReviewed-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6ce1bc86ae8b8f74095f2694732ccbab2f3849e5", "tree": "c7554cb93620c424933d6ac1436b4124062f6cb4", "parents": [ "12057841008534236e52df3d3e63e089f27c5406" ], "author": { "name": "Wanpeng Li", "email": "liwanp@linux.vnet.ibm.com", "time": "Mon Jul 08 16:00:12 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:22 2013 -0700" }, "message": "mm/writeback: remove wb_reason_name\n\nwb_reason_name is not used any more - remove it.\n\nSigned-off-by: Wanpeng Li \u003cliwanp@linux.vnet.ibm.com\u003e\nReviewed-by: Tejun Heo \u003ctj@kernel.org\u003e\nReviewed-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "12057841008534236e52df3d3e63e089f27c5406", "tree": "797565f4611303fb4280043cf247495d6bc817a8", "parents": [ "f3deb6872b946a851a3799b315f3c85ce4c027fc" ], "author": { "name": "Haicheng Li", "email": "haicheng.li@linux.intel.com", "time": "Mon Jul 08 16:00:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:22 2013 -0700" }, "message": "fs/fs-writeback.c: : make wb_do_writeback() as static\n\nIt\u0027s not used globally and could be static.\n\nSigned-off-by: Haicheng Li \u003chaicheng.li@linux.intel.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b21fbccd4b8aba805cbc231998ec7bf83616a79e", "tree": "d6465436da82b1cb45d4bf9b99b41b439285ba71", "parents": [ "bc732f1d55cf41627ee4c64078812b2fa592b394" ], "author": { "name": "Zhang Yanfei", "email": "zhangyanfei@cn.fujitsu.com", "time": "Mon Jul 08 16:00:07 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:22 2013 -0700" }, "message": "mm: remove unused functions is_{normal_idx, normal, dma32, dma}\n\nThese functions are nowhere used, so remove them.\n\nSigned-off-by: Zhang Yanfei \u003czhangyanfei@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": "537926caedb335b198eb53930ebeeb6426a541f9", "tree": "685a8ed83bdacd0dbb6e9a48791e3463ff9f06aa", "parents": [ "425c598d583883c33c75780225ba8e0794b43bd9" ], "author": { "name": "Zhang Yanfei", "email": "zhangyanfei@cn.fujitsu.com", "time": "Mon Jul 08 16:00:02 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:21 2013 -0700" }, "message": "include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE\n\n0xc just means MOVABLE + DMA32, which results in zone DMA32.\n\nSigned-off-by: Zhang Yanfei \u003czhangyanfei@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": "20fc02b477c526c6a85f84e3770373778ff2f97e", "tree": "46dd1f9a79d4eb3bac8a3a061e167e0fe5919824", "parents": [ "46c001a2753f47ffa621131baa3409e636515347" ], "author": { "name": "Zhang Yanfei", "email": "zhangyanfei@cn.fujitsu.com", "time": "Mon Jul 08 15:59:58 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:21 2013 -0700" }, "message": "mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED\n\nVM_UNLIST was used to indicate that the vm_struct is not listed in\nvmlist.\n\nBut after commit 4341fa454796 (\"mm, vmalloc: remove list management of\nvmlist after initializing vmalloc\"), the meaning of this flag changed.\nIt now means the vm_struct is not fully initialized. So renaming it to\nVM_UNINITIALIZED seems more reasonable.\n\nAlso change clear_vm_unlist to clear_vm_uninitialized_flag.\n\nSigned-off-by: Zhang Yanfei \u003czhangyanfei@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": "79f6530cb59e2a0af6953742a33cc29e98ca631c", "tree": "3778b26699b0f217a3c888853faaf0e15c760fc2", "parents": [ "f9f0a7d0dcbd19e9705e8b96a4b408f035e25c93" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Mon Jul 08 15:59:36 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:19 2013 -0700" }, "message": "audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record\n\nThe old audit PATH records for mq_open looked like this:\n\n type\u003dPATH msg\u003daudit(1366282323.982:869): item\u003d1 name\u003d(null) inode\u003d6777\n dev\u003d00:0c mode\u003d041777 ouid\u003d0 ogid\u003d0 rdev\u003d00:00\n obj\u003dsystem_u:object_r:tmpfs_t:s15:c0.c1023\n type\u003dPATH msg\u003daudit(1366282323.982:869): item\u003d0 name\u003d\"test_mq\" inode\u003d26732\n dev\u003d00:0c mode\u003d0100700 ouid\u003d0 ogid\u003d0 rdev\u003d00:00\n obj\u003dstaff_u:object_r:user_tmpfs_t:s15:c0.c1023\n\n...with the audit related changes that went into 3.7, they now look like this:\n\n type\u003dPATH msg\u003daudit(1366282236.776:3606): item\u003d2 name\u003d(null) inode\u003d66655\n dev\u003d00:0c mode\u003d0100700 ouid\u003d0 ogid\u003d0 rdev\u003d00:00\n obj\u003dstaff_u:object_r:user_tmpfs_t:s15:c0.c1023\n type\u003dPATH msg\u003daudit(1366282236.776:3606): item\u003d1 name\u003d(null) inode\u003d6926\n dev\u003d00:0c mode\u003d041777 ouid\u003d0 ogid\u003d0 rdev\u003d00:00\n obj\u003dsystem_u:object_r:tmpfs_t:s15:c0.c1023\n type\u003dPATH msg\u003daudit(1366282236.776:3606): item\u003d0 name\u003d\"test_mq\"\n\nBoth of these look wrong to me. As Steve Grubb pointed out:\n\n \"What we need is 1 PATH record that identifies the MQ. The other PATH\n records probably should not be there.\"\n\nFix it to record the mq root as a parent, and flag it such that it\nshould be hidden from view when the names are logged, since the root of\nthe mq filesystem isn\u0027t terribly interesting. With this change, we get\na single PATH record that looks more like this:\n\n type\u003dPATH msg\u003daudit(1368021604.836:484): item\u003d0 name\u003d\"test_mq\" inode\u003d16914\n dev\u003d00:0c mode\u003d0100644 ouid\u003d0 ogid\u003d0 rdev\u003d00:00\n obj\u003dunconfined_u:object_r:user_tmpfs_t:s0\n\nIn order to do this, a new audit_inode_parent_hidden() function is\nadded. If we do it this way, then we avoid having the existing callers\nof audit_inode needing to do any sort of flag conversion if auditing is\ninactive.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nReported-by: Jiri Jaburek \u003cjjaburek@redhat.com\u003e\nCc: Steve Grubb \u003csgrubb@redhat.com\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d2b4a646717153a1a180b64d4a8464054dbd700e", "tree": "a019907da37389f59ddb429c7d10de178514af1e", "parents": [ "8dce5f3dee21bf976193ddb06426b9727cf5d1a2", "67eacc1583909d0588c8d5d80c16298c899a6382" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 07 11:11:43 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 07 11:11:43 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine updates from Vinod Koul:\n \"Once you have some time from extended weekend celebrations please\n consider pulling the following to get:\n - Various fixes and PCI driver for dw_dmac by Andy\n - DT binding for imx-dma by Markus \u0026 imx-sdma by Shawn\n - DT fixes for dmaengine by Lars\n - jz4740 dmac driver by Lars\n - and various fixes across the drivers\"\n\nWhat \"extended weekend celebrations\"? I\u0027m in the merge window, who has\ntime for extended celebrations..\n\n* \u0027for-linus\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (40 commits)\n DMA: shdma: add DT support\n DMA: shdma: shdma_chan_filter() has to be in shdma-base.h\n DMA: shdma: (cosmetic) don\u0027t re-calculate a pointer\n dmaengine: at_hdmac: prepare clk before calling enable\n dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions\n dmaengine: at_hdmac: remove unsuded atc_cleanup_descriptors()\n dmaengine: at_hdmac: add FIFO configuration parameter to DMA DT binding\n ARM: at91: dt: add header to define at_hdmac configuration\n MIPS: jz4740: Correct clock gate bit for DMA controller\n MIPS: jz4740: Remove custom DMA API\n MIPS: jz4740: Register jz4740 DMA device\n dma: Add a jz4740 dmaengine driver\n MIPS: jz4740: Acquire and enable DMA controller clock\n dma: mmp_tdma: disable irq when disabling dma channel\n dmaengine: PL08x: Avoid collisions with get_signal() macro\n dmaengine: dw: select DW_DMAC_BIG_ENDIAN_IO automagically\n dma: dw: add PCI part of the driver\n dma: dw: split driver to library part and platform code\n dma: move dw_dmac driver to an own directory\n dw_dmac: don\u0027t check resource with devm_ioremap_resource\n ...\n" }, { "commit": "8dce5f3dee21bf976193ddb06426b9727cf5d1a2", "tree": "a2e44ee8cc3283b258ff05ad9a5065a5fc2b39ac", "parents": [ "21884a83b2192a00885d7244a1dda32debd2fbc7", "e24f6628811e2d4531b443684b598f7050932012" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 07 11:01:19 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 07 11:01:19 2013 -0700" }, "message": "Merge branch \u0027cpuinit-delete\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull first stage of __cpuinit removal from Paul Gortmaker:\n \"The two commits here 1) dummy out all the __cpuinit macros so that we\n no longer generate such sections, and then 2) remove all the section\n processing that we used to do for those sections.\n\n This makes all the __cpuinit and friends no-ops, so that we can remove\n the use cases of it at our leisure. Expect stage 2, which does the\n tree wide removal sweep at the end of the merge window.\"\n\n* \u0027cpuinit-delete\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n modpost: remove all traces of cpuinit/cpuexit sections\n init.h: remove __cpuinit sections from the kernel\n" }, { "commit": "21884a83b2192a00885d7244a1dda32debd2fbc7", "tree": "e00267bbcac32f0114b3d21a20c61107d2314c40", "parents": [ "8b70a90cabafb6a6e1a0d3f838b38355fe48337e", "73b0cd674ccc64c921e25bd7154f26d342116539" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 06 14:09:38 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 06 14:09:38 2013 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer core updates from Thomas Gleixner:\n \"The timer changes contain:\n\n - posix timer code consolidation and fixes for odd corner cases\n\n - sched_clock implementation moved from ARM to core code to avoid\n duplication by other architectures\n\n - alarm timer updates\n\n - clocksource and clockevents unregistration facilities\n\n - clocksource/events support for new hardware\n\n - precise nanoseconds RTC readout (Xen feature)\n\n - generic support for Xen suspend/resume oddities\n\n - the usual lot of fixes and cleanups all over the place\n\n The parts which touch other areas (ARM/XEN) have been coordinated with\n the relevant maintainers. Though this results in an handful of\n trivial to solve merge conflicts, which we preferred over nasty cross\n tree merge dependencies.\n\n The patches which have been committed in the last few days are bug\n fixes plus the posix timer lot. The latter was in akpms queue and\n next for quite some time; they just got forgotten and Frederic\n collected them last minute.\"\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (59 commits)\n hrtimer: Remove unused variable\n hrtimers: Move SMP function call to thread context\n clocksource: Reselect clocksource when watchdog validated high-res capability\n posix-cpu-timers: don\u0027t account cpu timer after stopped thread runtime accounting\n posix_timers: fix racy timer delta caching on task exit\n posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()\n selftests: add basic posix timers selftests\n posix_cpu_timers: consolidate expired timers check\n posix_cpu_timers: consolidate timer list cleanups\n posix_cpu_timer: consolidate expiry time type\n tick: Sanitize broadcast control logic\n tick: Prevent uncontrolled switch to oneshot mode\n tick: Make oneshot broadcast robust vs. CPU offlining\n x86: xen: Sync the CMOS RTC as well as the Xen wallclock\n x86: xen: Sync the wallclock when the system time is set\n timekeeping: Indicate that clock was set in the pvclock gtod notifier\n timekeeping: Pass flags instead of multiple bools to timekeeping_update()\n xen: Remove clock_was_set() call in the resume path\n hrtimers: Support resuming with two or more CPUs online (but stopped)\n timer: Fix jiffies wrap behavior of round_jiffies_common()\n ...\n" }, { "commit": "2cb7b5a38c45b48e9ffb8b382c675a4d64ecccde", "tree": "03a4960e9e30a023fdd77b558012a2d6a9ac23ab", "parents": [ "b2c311075db578f1433d9b303698491bfa21279a", "798f0fd188be3656991c8745104b5ee045769a5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 06 12:37:04 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 06 12:37:04 2013 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux\n\nPull irqdomain refactoring from Grant Likely:\n \"This is the long awaited simplification of irqdomain. It gets rid of\n the different types of irq domains and instead both linear and tree\n mappings can be supported in a single domain. Doing this removes a\n lot of special case code and makes irq domains simpler to understand\n overall\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux:\n irq: fix checkpatch error\n irqdomain: Include hwirq number in /proc/interrupts\n irqdomain: make irq_linear_revmap() a fast path again\n irqdomain: remove irq_domain_generate_simple()\n irqdomain: Refactor irq_domain_associate_many()\n irqdomain: Beef up debugfs output\n irqdomain: Clean up aftermath of irq_domain refactoring\n irqdomain: Eliminate revmap type\n irqdomain: merge linear and tree reverse mappings.\n irqdomain: Add a name field\n irqdomain: Replace LEGACY mapping with LINEAR\n irqdomain: Relax failure path on setting up mappings\n" }, { "commit": "b2c311075db578f1433d9b303698491bfa21279a", "tree": "41d5f1b5ad6f45be7211f524328de81f7e9754be", "parents": [ "45175476ae2dbebc860d5cf486f2916044343513", "02c0241b600e4ab8a732c89749e252165145d60c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 05 12:12:33 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 05 12:12:33 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto update from Herbert Xu:\n - Do not idle omap device between crypto operations in one session.\n - Added sha224/sha384 shims for SSSE3.\n - More optimisations for camellia-aesni-avx2.\n - Removed defunct blowfish/twofish AVX2 implementations.\n - Added unaligned buffer self-tests.\n - Added PCLMULQDQ optimisation for CRCT10DIF.\n - Added support for Freescale\u0027s DCP co-processor\n - Misc fixes.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (44 commits)\n crypto: testmgr - test hash implementations with unaligned buffers\n crypto: testmgr - test AEADs with unaligned buffers\n crypto: testmgr - test skciphers with unaligned buffers\n crypto: testmgr - check that entries in alg_test_descs are in correct order\n Revert \"crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher\"\n Revert \"crypto: blowfish - add AVX2/x86_64 implementation of blowfish cipher\"\n crypto: camellia-aesni-avx2 - tune assembly code for more performance\n hwrng: bcm2835 - fix MODULE_LICENSE tag\n hwrng: nomadik - use clk_prepare_enable()\n crypto: picoxcell - replace strict_strtoul() with kstrtoul()\n crypto: dcp - Staticize local symbols\n crypto: dcp - Use NULL instead of 0\n crypto: dcp - Use devm_* APIs\n crypto: dcp - Remove redundant platform_set_drvdata()\n hwrng: use platform_{get,set}_drvdata()\n crypto: omap-aes - Don\u0027t idle/start AES device between Encrypt operations\n crypto: crct10dif - Use PTR_RET\n crypto: ux500 - Cocci spatch \"resource_size.spatch\"\n crypto: sha256_ssse3 - add sha224 support\n crypto: sha512_ssse3 - add sha384 support\n ...\n" }, { "commit": "45175476ae2dbebc860d5cf486f2916044343513", "tree": "9002f57513ecd3780e07a7c54443d05d081806dd", "parents": [ "2dd1cb5a7ea7aa0d3f7f36baa48aae3725655647", "83ff59a066637a6c28844bbf43009459408240f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 05 12:09:48 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 05 12:09:48 2013 -0700" }, "message": "Merge tag \u0027upstream-3.11-rc1\u0027 of git://git.infradead.org/linux-ubi\n\nPull ubi fixes from Artem Bityutskiy:\n \"A couple of fixes and clean-ups, allow for assigning user-defined UBI\n device numbers when attaching MTD devices by using the \"mtd\u003d\" module\n parameter\"\n\n* tag \u0027upstream-3.11-rc1\u0027 of git://git.infradead.org/linux-ubi:\n UBI: support ubi_num on mtd.ubi command line\n UBI: fastmap break out of used PEB search\n UBI: document UBI_IOCVOLUP better in user header\n UBI: do not abort init when ubi.mtd devices cannot be found\n UBI: drop redundant \"UBI error\" string\n" }, { "commit": "332962f2c88868ed3cdab466870baaa34dd58612", "tree": "d670139ba37bca7b8f5a5179f401c8694636285c", "parents": [ "2b0f89317e99735bbf32eaede81f707f98ab1b5e" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jul 04 22:46:45 2013 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 05 11:09:28 2013 +0200" }, "message": "clocksource: Reselect clocksource when watchdog validated high-res capability\n\nUp to commit 5d33b883a (clocksource: Always verify highres capability)\nwe had no sanity check when selecting a clocksource, which prevented\nthat a non highres capable clocksource is used when the system already\nswitched to highres/nohz mode.\n\nThe new sanity check works as Alex and Tim found out. It prevents the\nTSC from being used. This happens because on x86 the boot process\nlooks like this:\n\n tsc_start_freqency_validation(TSC);\n clocksource_register(HPET);\n clocksource_done_booting();\n\tclocksource_select()\n\t\tSelects HPET which is valid for high-res\n\n switch_to_highres();\n\n clocksource_register(TSC);\n \tTSC is not selected, because it is not yet\n\tflagged as VALID_HIGH_RES\n\n clocksource_watchdog()\n\tValidates TSC for highres, but that does not make TSC\n\tthe current clocksource.\n\nBefore the sanity check was added, we installed TSC unvalidated which\nworked most of the time. If the TSC was really detected as unstable,\nthen the unstable logic removed it and installed HPET again.\n\nThe sanity check is correct and needed. So the watchdog needs to kick\na reselection of the clocksource, when it qualifies TSC as a valid\nhigh res clocksource.\n\nTo solve this, we mark the clocksource which got the flag\nCLOCK_SOURCE_VALID_FOR_HRES set by the watchdog with an new flag\nCLOCK_SOURCE_RESELECT and trigger the watchdog thread. The watchdog\nthread evaluates the flag and invokes clocksource_select() when set.\n\nTo avoid that the clocksource_done_booting() code, which is about to\ninstall the first real clocksource anyway, needs to go through\nclocksource_select and tick_oneshot_notify() pointlessly, split out\nthe clocksource_watchdog_kthread() list walk code and invoke the\nselect/notify only when called from clocksource_watchdog_kthread().\n\nSo clocksource_done_booting() can utilize the same splitout code\nwithout the select/notify invocation and the clocksource_mutex\nunlock/relock dance.\n\nReported-and-tested-by: Alex Shi \u003calex.shi@intel.com\u003e\nCc: Hans Peter Anvin \u003chpa@linux.intel.com\u003e\nCc: Tim Chen \u003ctim.c.chen@linux.intel.com\u003e\nCc: Andi Kleen \u003candi.kleen@intel.com\u003e\nTested-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Davidlohr Bueso \u003cdavidlohr.bueso@hp.com\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nLink: http://lkml.kernel.org/r/alpine.DEB.2.02.1307042239150.11637@ionos.tec.linutronix.de\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "67eacc1583909d0588c8d5d80c16298c899a6382", "tree": "093794f972e21cf084efcb734667453db1c68926", "parents": [ "d0951a23383d09276f7976ed34d8f1cede629b48" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Tue Jun 18 18:16:57 2013 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Jul 05 11:41:00 2013 +0530" }, "message": "DMA: shdma: add DT support\n\nThis patch adds Device Tree support to the shdma driver. No special DT\nproperties are used, only standard DMA DT bindings are implemented. Since\nshdma controllers reside on SoCs, their configuration is SoC-specific and\nshall be passed to the driver from the SoC platform data, using the\nauxdata procedure.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski+renesas@gmail.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "d0951a23383d09276f7976ed34d8f1cede629b48", "tree": "42d1889f0b813185cca8a65698f648cc8d3f684e", "parents": [ "fa74326c44767626a5ae794b29d54103e2259e64" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Jun 06 17:37:14 2013 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Jul 05 11:40:59 2013 +0530" }, "message": "DMA: shdma: shdma_chan_filter() has to be in shdma-base.h\n\nshdma_chan_filter() is a function, provided by the shdma-base.c module,\nmove its declaration to the appropriate header.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski+renesas@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "764037c6f55c5c844d0ab6049e6e7c0dc3cb7665", "tree": "58e1f14c501d25fa1d1df6df45a723d6fd33cd6e", "parents": [ "757f4e51b74f7fb19251020e742a78111fdea194" ], "author": { "name": "Ludovic Desroches", "email": "ludovic.desroches@atmel.com", "time": "Thu Jun 13 10:39:38 2013 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Jul 05 11:40:53 2013 +0530" }, "message": "ARM: at91: dt: add header to define at_hdmac configuration\n\nDMA-cell content is a concatenation of several values. In order to keep this\nstuff human readable, macros are introduced.\n\nThe values for the FIFO configuration are not the same as the ones used in the\nconfiguration register in order to keep backward compatibility. Most devices\nuse the half FIFO configuration but USART ones have to use the ASAP\nconfiguration. This parameter was not initially planed to be into the at91 dma\ndt binding. The third cell will be used to store this parameter, it will\nbecome a concatenation of the FIFO configuration and of the peripheral ID. In\norder to keep backward compatibility i.e. FIFO configuration is equal to 0, we\nhave to perform a translation since the value to put in the register to set\nhalf FIFO is 1.\n\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Ludovic Desroches \u003cludovic.desroches@atmel.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "d7cabeed830b7eb3958cbc084a85649126cd670f", "tree": "0cf740e0fa71d4e875b7da2ce27344614df95fb1", "parents": [ "e368b510c01aaf7b2957306836ffdeacc24712a3" ], "author": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Wed Jun 19 20:38:28 2013 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Jul 05 11:40:47 2013 +0530" }, "message": "dmaengine: PL08x: Avoid collisions with get_signal() macro\n\nAs pointed out by Arnd Bergmann there is a get_signal macro definied in\nlinux/signal.h which can conflict with the platform data callback\nfunction of the same name leading to confusing errors from the compiler\n(especially if signal.h manages to get pulled into the driver itself due\nto header dependencies). Avoid such errors by renaming get_signal and\nput_signal in the platform data to get_xfer_signal and put_xfer_signal.\n\nSigned-off-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "72ae6e4b31e40397eaa81007b39a1074638a6798", "tree": "c7b7f4ca0407b24e032def7223a78bc731661e14", "parents": [ "ea7e79063e604c89b16b819d2e88b20c421d9514" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Fri May 10 15:19:14 2013 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Jul 05 11:40:29 2013 +0530" }, "message": "dmaengine: at_hdmac: extend hardware handshaking interface identification\n\nPeripheral handshaking identification numbers can be bigger than 15, so new\nfields have been created in the CFG register.\nAdd macros to take this modification into account and use them in\nat_dma_xlate() function.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "290ad0f9d954b445788bf26652b239c59cec2060", "tree": "bee92be4769a1f84d599e2e97cd3cc6e25f2caa9", "parents": [ "8552bb4f16800d5ebc176a2cf5f2aa55b22731ea" ], "author": { "name": "Markus Pargmann", "email": "mpa@pengutronix.de", "time": "Sun May 26 11:53:20 2013 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Jul 05 11:40:26 2013 +0530" }, "message": "dma: imx-dma: Add oftree support\n\nAdding devicetree support for imx-dma driver. Use driver name for\nfunction \u0027imx_dma_is_general_purpose\u0027 because the devicename for\ndevicetree initialized devices is different.\n\nSigned-off-by: Markus Pargmann \u003cmpa@pengutronix.de\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nReviewed-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "74b9272bbedf45cb01a048217830d64d59aaa73b", "tree": "11cf66b529d4861edd03d16f97c8178e9cfd9f77", "parents": [ "f5b63ac0f77ecab46796ba5d368ea5dd51834e6e", "6dd18e4684f3d188277bbbc27545248487472108" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 15:51:45 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 15:51:45 2013 -0700" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux\n\nPull device tree updates from Grant Likely:\n \"This branch contains the following changes:\n - Removal of CONFIG_OF_DEVICE, it is always enabled by CONFIG_OF\n - Remove #ifdef from linux/of_platform.h to increase compiler syntax\n coverage\n - Bug fix for address decoding on Bimini and js2x powerpc platforms.\n - miscellaneous binding changes\n\n One note on the above. The binding changes going in from all kinds of\n different trees has gotten rather out of hand. I picked up some\n during this cycle, but even going though my tree isn\u0027t a great fit.\n\n Ian Campbell has prototyped splitting the bindings and .dtb files into\n a separate repository. The plan is to migrate to using that sometime\n in the next few kernel releases which should get rid of a lot of the\n churn on binding docs and .dts files\"\n\n* tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux:\n of: Fix address decoding on Bimini and js2x machines\n of: remove CONFIG_OF_DEVICE\n usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE\n of: remove of_platform_driver\n ibmebus: convert of_platform_driver to platform_driver\n driver core: move to_platform_driver to platform_device.h\n mfd: DT bindings for the palmas family MFD\n ARM: dts: omap3-devkit8000: fix NAND memory binding\n of/base: fix typos\n of: remove #ifdef from linux/of_platform.h\n" }, { "commit": "f5b63ac0f77ecab46796ba5d368ea5dd51834e6e", "tree": "66788b3327afa62aa7f8fe05951945a2ee1e9e4e", "parents": [ "98f486f18d16e2214728d101ed8b6a12dce75539", "57961e3ba72f4a8a1aa52e978020ecc2ca03a79f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 15:35:08 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 15:35:08 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input updates from Dmitry Torokhov:\n \"First round of updates for the input subsystem.\n\n You will get a new touchsreen driver for Cypress 4th generation\n devices, a driver for a special controller implementing PS/2 protocol\n in OLPC devices, and a driver for power key for SiRFprimaII PWRC.\n\n HID and bcm5497 now support for the 2013 MacBook Air.\n\n EVIOCGKEY and the rest of evdev ioctls now flush events of matching\n type from the client\u0027s event queue so that clients can be sure any\n events received after issuing EVIOCG* ioctl are new events.\n\n And a host of cleanups and improvements in other drivers\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (87 commits)\n Input: cyttsp4 - kfree xfer_buf on error path in probe()\n Input: tps6507x-ts - select INPUT_POLLDEV\n Input: bcm5974 - add support for the 2013 MacBook Air\n HID: apple: Add support for the 2013 Macbook Air\n Input: cyttsp4 - leak on error path in probe()\n Input: cyttsp4 - silence NULL dereference warning\n Input: cyttsp4 - silence shift wrap warning\n Input: tps6507x-ts - convert to polled input device infrastructure\n ARM: davinci: da850-evm: remove vref from touchscreen platform data\n Input: cyttsp4 - SPI driver for Cypress TMA4XX touchscreen devices\n Input: cyttsp4 - I2C driver for Cypress TMA4XX touchscreen devices\n Input: cyttsp4 - add core driver for Cypress TMA4XX touchscreen devices\n Input: cyttsp - I2C driver split into two modules\n Input: add OLPC AP-SP driver\n Input: nspire-keypad - remove redundant dev_err call in nspire_keypad_probe()\n Input: tps6507x-ts - remove vref from platform data\n Input: tps6507x-ts - use bool for booleans\n Input: tps6507x-ts - remove bogus unreachable code\n Input: samsung-keypad - let device core setup the default pin configuration\n Input: wacom_i2c - implement hovering capability\n ...\n" }, { "commit": "2b0f89317e99735bbf32eaede81f707f98ab1b5e", "tree": "16daa236e21876b11f1c0b9256cd4046aadba020", "parents": [ "07bd1172902e782f288e4d44b1fde7dec0f08b6f", "fa18f7bde3ad4568d1d343b60d963bfbd8dc3991" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jul 04 23:11:22 2013 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jul 04 23:11:22 2013 +0200" }, "message": "Merge branch \u0027timers/posix-cpu-timers-for-tglx\u0027 of\ngit://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/core\n\nFrederic sayed: \"Most of these patches have been hanging around for\nseveral month now, in -mmotm for a significant chunk. They already\nmissed a few releases.\"\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "84cbd7222b2b00dcddef3103203986b3d59c836a", "tree": "cdbe55ec410f853d4d532ed3252334cb110d5985", "parents": [ "80cc38b16389849a6e06441ace4530f6b2497c3c", "a3fda7dd5179989dd0ead820dcebd13f956ddec1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 12:30:30 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 12:30:30 2013 -0700" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi\n\nPull first round of SCSI updates from James Bottomley:\n \"The patch set is mostly driver updates (usf, zfcp, lpfc, mpt2sas,\n megaraid_sas, bfa, ipr) and a few bug fixes. Also of note is that the\n Buslogic driver has been rewritten to a better coding style and 64 bit\n support added. We also removed the libsas limitation on 16 bytes for\n the command size (currently no drivers make use of this)\"\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (101 commits)\n [SCSI] megaraid: minor cut and paste error fixed.\n [SCSI] ufshcd-pltfrm: remove unnecessary dma_set_coherent_mask() call\n [SCSI] ufs: fix register address in UIC error interrupt handling\n [SCSI] ufshcd-pltfrm: add missing empty slot in ufs_of_match[]\n [SCSI] ufs: use devres functions for ufshcd\n [SCSI] ufs: Fix the response UPIU length setting\n [SCSI] ufs: rework link start-up process\n [SCSI] ufs: remove version check before IS reg clear\n [SCSI] ufs: amend interrupt configuration\n [SCSI] ufs: wrap the i/o access operations\n [SCSI] storvsc: Update the storage protocol to win8 level\n [SCSI] storvsc: Increase the value of scsi timeout for storvsc devices\n [SCSI] MAINTAINERS: Add myself as the maintainer for BusLogic SCSI driver\n [SCSI] BusLogic: Port driver to 64-bit.\n [SCSI] BusLogic: Fix style issues\n [SCSI] libiscsi: Added new boot entries in the session sysfs\n [SCSI] aacraid: Fix for arrays are going offline in the system. System hangs\n [SCSI] ipr: IOA Status Code(IOASC) update\n [SCSI] sd: Update WRITE SAME heuristics\n [SCSI] fnic: potential dead lock in fnic_is_abts_pending()\n ...\n" }, { "commit": "80cc38b16389849a6e06441ace4530f6b2497c3c", "tree": "1dabc02b0a1faa6b640de20e38aa31bb5d0c443f", "parents": [ "3366dd9fa887ebbda4872e9554f853eaeda764be", "83a35e360433b58791bc9c4e288cace466d62e3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 11:40:58 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 11:40:58 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial tree updates from Jiri Kosina:\n \"The usual stuff from trivial tree\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)\n treewide: relase -\u003e release\n Documentation/cgroups/memory.txt: fix stat file documentation\n sysctl/net.txt: delete reference to obsolete 2.4.x kernel\n spinlock_api_smp.h: fix preprocessor comments\n treewide: Fix typo in printk\n doc: device tree: clarify stuff in usage-model.txt.\n open firmware: \"/aliasas\" -\u003e \"/aliases\"\n md: bcache: Fixed a typo with the word \u0027arithmetic\u0027\n irq/generic-chip: fix a few kernel-doc entries\n frv: Convert use of typedef ctl_table to struct ctl_table\n sgi: xpc: Convert use of typedef ctl_table to struct ctl_table\n doc: clk: Fix incorrect wording\n Documentation/arm/IXP4xx fix a typo\n Documentation/networking/ieee802154 fix a typo\n Documentation/DocBook/media/v4l fix a typo\n Documentation/video4linux/si476x.txt fix a typo\n Documentation/virtual/kvm/api.txt fix a typo\n Documentation/early-userspace/README fix a typo\n Documentation/video4linux/soc-camera.txt fix a typo\n lguest: fix CONFIG_PAE -\u003e CONFIG_x86_PAE in comment\n ...\n" }, { "commit": "3366dd9fa887ebbda4872e9554f853eaeda764be", "tree": "d1bb553325b276e9d2a1bce99f3e64834b46866b", "parents": [ "697a067f1ec67f2f8dfafd0a1b95a46997a11f32", "21796b39c9e876a46a353a4a9ff9881766a7c176" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 11:39:00 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 11:39:00 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID updates from Jiri Kosina:\n - HID battery handling cleanup by David Herrmann\n - ELO 4000/4500 driver, which has been finally ported to be proper HID\n driver by Jiri Slaby\n - ps3remote driver functionality is now provided by generic sony\n driver, by Jiri Kosina\n - PS2/3 Buzz controllers support, by Colin Leitner\n - rework of wiimote driver including full extensions hotpluggin\n support, sub-device modularization and speaker support by David\n Herrmann\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)\n HID: wacom: Intuos4 battery charging changes\n HID: i2c-hid: support sending HID output reports using the output register\n HID: kye: Add report fixup for Genius Gila Gaming mouse\n HID: wiimote: support Nintendo Wii U Pro Controller\n Input: make gamepad API keycodes more clear\n input: document gamepad API and add extra keycodes\n HID: explain out-of-range check better\n HID: fix false positive out of range values\n HID: wiimote: fix coccinelle warnings\n HID: roccat: check cdev_add return value\n HID: fold ps3remote driver into generic Sony driver\n HID: hyperv: convert alloc+memcpy to memdup\n HID: core: fix reporting of raw events\n HID: wiimote: discard invalid EXT data reports\n HID: wiimote: fix classic controller parsing\n HID: wiimote: init EXT/MP during device detection\n HID: wiimote: fix DRM debug-attr to correctly parse input\n HID: wiimote: add MP quirks\n HID: wiimote: remove old static extension support\n HID: wiimote: add \"bboard_calib\" attribute\n ...\n" }, { "commit": "65b97fb7303050fc826e518cf67fc283da23314f", "tree": "595e7f04d65d95a39d65bd2dcf2385b3b6ea7969", "parents": [ "ddcf6600b133697adbafd96e080818bdc0dfd028", "1d8b368ab4aacfc3f864655baad4d31a3028ec1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 10:29:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 10:29:23 2013 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc updates from Ben Herrenschmidt:\n \"This is the powerpc changes for the 3.11 merge window. In addition to\n the usual bug fixes and small updates, the main highlights are:\n\n - Support for transparent huge pages by Aneesh Kumar for 64-bit\n server processors. This allows the use of 16M pages as transparent\n huge pages on kernels compiled with a 64K base page size.\n\n - Base VFIO support for KVM on power by Alexey Kardashevskiy\n\n - Wiring up of our nvram to the pstore infrastructure, including\n putting compressed oopses in there by Aruna Balakrishnaiah\n\n - Move, rework and improve our \"EEH\" (basically PCI error handling\n and recovery) infrastructure. It is no longer specific to pseries\n but is now usable by the new \"powernv\" platform as well (no\n hypervisor) by Gavin Shan.\n\n - I fixed some bugs in our math-emu instruction decoding and made it\n usable to emulate some optional FP instructions on processors with\n hard FP that lack them (such as fsqrt on Freescale embedded\n processors).\n\n - Support for Power8 \"Event Based Branch\" facility by Michael\n Ellerman. This facility allows what is basically \"userspace\n interrupts\" for performance monitor events.\n\n - A bunch of Transactional Memory vs. Signals bug fixes and HW\n breakpoint/watchpoint fixes by Michael Neuling.\n\n And more ... I appologize in advance if I\u0027ve failed to highlight\n something that somebody deemed worth it.\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)\n pstore: Add hsize argument in write_buf call of pstore_ftrace_call\n powerpc/fsl: add MPIC timer wakeup support\n powerpc/mpic: create mpic subsystem object\n powerpc/mpic: add global timer support\n powerpc/mpic: add irq_set_wake support\n powerpc/85xx: enable coreint for all the 64bit boards\n powerpc/8xx: Erroneous double irq_eoi() on CPM IRQ in MPC8xx\n powerpc/fsl: Enable CONFIG_E1000E in mpc85xx_smp_defconfig\n powerpc/mpic: Add get_version API both for internal and external use\n powerpc: Handle both new style and old style reserve maps\n powerpc/hw_brk: Fix off by one error when validating DAWR region end\n powerpc/pseries: Support compression of oops text via pstore\n powerpc/pseries: Re-organise the oops compression code\n pstore: Pass header size in the pstore write callback\n powerpc/powernv: Fix iommu initialization again\n powerpc/pseries: Inform the hypervisor we are using EBB regs\n powerpc/perf: Add power8 EBB support\n powerpc/perf: Core EBB support for 64-bit book3s\n powerpc/perf: Drop MMCRA from thread_struct\n powerpc/perf: Don\u0027t enable if we have zero events\n ...\n" }, { "commit": "21796b39c9e876a46a353a4a9ff9881766a7c176", "tree": "119e93184ba04e6cee5798cfd28686100899db1e", "parents": [ "08ec2dcc3527a20c619aca2fb36f800908256bac", "9d157624035214793c6d06b0512c6ab1a7b39e05", "b8e0fe31a7c8623741f91bc27f925220341fdf81" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jul 04 15:05:02 2013 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jul 04 15:05:02 2013 +0200" }, "message": "Merge branches \u0027for-3.11/wacom-fixed\u0027 and \u0027for-3.11/wiimote\u0027 into for-linus\n" }, { "commit": "ddcf6600b133697adbafd96e080818bdc0dfd028", "tree": "f382f8eaca3cc2d298542ae9599ce49884127d0e", "parents": [ "c16bfeb264decb964742067f02fdd51494e25e64", "a50d9a4d9ad3c71341788099d733e4151b8a511b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:56:35 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:56:35 2013 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon updates from Guenter Roeck:\n - new driver to support GMT G762/G763 pwm fan controllers\n - add support for DS1631, DS1721, and DS1731 to ds1621 driver\n - remove detect function from ds1621 driver as unreliable\n - bug fixes in nct6775, iio_hwmon, and adm1021 drivers\n - remove redundant platform_set_drvdata in various drivers\n - add device tree support to ina2xx driver\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (ds1621) Fix temperature rounding operations\n hwmon: (nct6775) Drop unsupported fan alarm attributes for NCT6775\n hwmon: (nct6775) Fix temperature alarm attributes\n Add support for GMT G762/G763 PWM fan controllers\n hwmon: (ina2xx) Add device tree support to pass the shunt resistor\n hwmon: (ds1621) Update documentation\n hwmon: (ds1621) Add DS1731 chip support to ds1621 driver\n hwmon: (iio_hwmon) add alias table\n hwmon: (adm1021) Do not create min sysfs attributes for LM84\n hwmon: (ds1621) Remove detect function\n hwmon: (ds1621) Add ds1631 chip support to ds1621 driver and documentation\n hwmon: (ds1621) Add ds1721 update interval sysfs attribute\n hwmon: (ds1621) Add ds1721 chip support\n hwmon: (w83627ehf) Remove redundant platform_set_drvdata()\n hwmon: (ntc_thermistor) Remove redundant platform_set_drvdata()\n hwmon: (i5k_amb) Remove redundant platform_set_drvdata()\n hwmon: (coretemp) Remove redundant platform_set_drvdata()\n hwmon: (abituguru3) Remove redundant platform_set_drvdata()\n" }, { "commit": "c16bfeb264decb964742067f02fdd51494e25e64", "tree": "255eac59926c0d08168581b7c324612694dffe5b", "parents": [ "1286da8bc009cb2aee7f285e94623fc974c0c983", "cf3b1c2ba362ecea5b8e07d370233e25f3d6366d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:55:33 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:55:33 2013 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds\n\nPull LED subsystem updates from Bryan Wu:\n - lp55xx device tree updates\n - mc13xxx driver updates\n - some clean up\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:\n leds: mc13783: Fix \"uninitialized variable\" warning\n leds: Convert led class driver from legacy pm ops to dev_pm_ops\n leds: leds-mc13783: Add MC13892 LED support\n leds: leds-mc13783: Prepare driver to support MC13892 LEDs\n leds: renesas-tpu: cleanup a small type issue\n leds: use platform_{get,set}_drvdata()\n leds: leds-gpio: Let device core handle pinctrl\n leds: lp5562: Properly setup of_device_id table\n leds: lp5523: Properly setup of_device_id table\n leds: lp5521: Properly setup of_device_id table\n leds: lp5562: support the device tree feature\n leds: lp55xx: support dynamic channel settings in the device tree structure\n leds: leds-ns2: remove unnecessary platform_set_drvdata()\n leds: leds-mc13783: remove unnecessary platform_set_drvdata()\n leds: leds-gpio: remove unnecessary platform_set_drvdata()\n leds: atmel-pwm: remove unnecessary platform_set_drvdata()\n leds: lp55xx: add support for Device Tree bindings\n" }, { "commit": "1286da8bc009cb2aee7f285e94623fc974c0c983", "tree": "51ec0a79c3de63fa809b831ae0cbb5b85e44482f", "parents": [ "9e220385c4eb8b7e66174a60ea0e15b6b296f228", "1ba65ae4bdbd43265c51ee4c30ff21a48124b6d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:52:22 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:52:22 2013 -0700" }, "message": "Merge tag \u0027sound-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound updates from Takashi Iwai:\n \"A relative calm release at this time with a flat diffstat. The only\n significant change in the ALSA core side is the support for more than\n 32 card instances, configurable via kconfig. Other than that, in both\n ASoC and other parts, mostly some improvements and fixes on the driver\n side.\n\n - hda: More quirks for ALC269-variants on Dell \u0026 co, VIA codec fixes\n - hda: Haswell HDMI audio fixes, runtime PM improvements\n - hda: Intel BayTrail support, ALC5505 DSP support\n - es1968: MediaForte M56VAP support\n - usb-audio: Improved support for Yamaha/Roland devices\n - usb-audio: M2Tech hiFace, Audio Advantage Micro II support\n - hdspm: wordclock fixes\n - ASoC: Pending fixes for WM8962\n - ASoC: Cleanups and fixes for Blackfin, SGTL5000 and UX500\n - ASoC: Generalisation of the Bluetooth and HDMI stub drivers\n - ASoC: SSM2518 and RT5640 codec drivers.\n - ASoC: Tegra CPUs with RT5640 machine driver\n - ASoC: AC\u002797 refactoring bug fixes\n - ASoC: ADAU1701 driver fixes\n - Clean up of *_set_drvdata() in a wide range of drivers\"\n\n* tag \u0027sound-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (284 commits)\n ALSA: vmaster: Fix the regression of missing vmaster hook call\n ALSA: hda - Add Dell SSID to support Headset Mic recording\n ASoC: adau1701: remove control_data assignment\n ASoC: adau1701: more direct regmap usage\n ASoC: ac97: fixup multi-platform AC\u002797 module build failure\n ASoC: pxa2xx: fixup multi-platform AC\u002797 build failures\n ASoC: tegra20-ac97: Remove unused variable\n ASoC: tegra20-ac97: Remove duplicate error message\n ALSA: usb-audio: Add Audio Advantage Micro II\n ASoC: tas5086: fix Mid-Z implementation\n ASoC: tas5086: fix TAS5086_CLOCK_CONTROL register size\n ALSA: Replace the magic number 44 with const\n ALSA: hda - Fix the max length of control name in generic parser\n ALSA: hda - Guess what, it\u0027s two more Dell headset mic quirks\n ALSA: hda - Yet another Dell headset mic quirk\n ALSA: hda - Add support for ALC5505 DSP power-save mode\n ASoC: mfld: Remove unused variable\n ALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE\n ALSA: usb-audio: claim autodetected PCM interfaces all at once\n ALSA: usb-audio: remove superfluous Roland quirks\n ...\n" }, { "commit": "9e220385c4eb8b7e66174a60ea0e15b6b296f228", "tree": "803274a4d820749510bc19a9231959189cdebd81", "parents": [ "7f0ef0267e20d62d45d527911a993b1e998f4968", "5a0a6a4f17a3606289f96356383db695a555bdbd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:49:46 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 19:49:46 2013 -0700" }, "message": "Merge branch \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata\n\nPull libata updates from Tejun Heo:\n \"Overview of changes:\n\n - The rest of maintainer email address updates.\n\n - Some core updates - more robust default behavior for port\n multipliers, better error reporting for SG_IO commands, and a way\n to better work around now ancient and probably pretty rare PATA -\u003e\n SATA bridges with ATAPI devices.\n\n - sata_rcar stabilization.\n\n - Some hardware PCI ID additions and one-off low level driver\n updates.\"\n\n* \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)\n AHCI: use ATA_BUSY\n libata-zpodd: must use ata_tf_init()\n ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs\n ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs\n libata: cleanup SAT error translation\n ahci: sata: add support for exynos5440 sata\n libata: skip SRST for all SIMG [34]7x port-multipliers\n ahci: remove pmp link online check in FBS EH\n sata highbank: add bit-banged SGPIO driver support\n ahci: make ahci_transmit_led_message into a function pointer\n sata_rcar: fix compilation warning in sata_rcar_thaw()\n sata_highbank: increase retry count but shorten duration for Calxeda controller\n ata: use pci_get_drvdata()\n ipr: qc_fill_rtf() method should not store alternate status register\n sata_rcar: add \u0027base\u0027 local variable to some functions\n sata_rcar: correct \u0027sata_rcar_sht\u0027\n sata_rcar: kill superfluous code in sata_rcar_bmdma_fill_sg()\n libata: do not limit R-Car SATA driver to shmobile\n ata: use platform_{get,set}_drvdata()\n AHCI: Make distinct names for ports in /proc/interrupts\n ...\n" }, { "commit": "7f0ef0267e20d62d45d527911a993b1e998f4968", "tree": "de51abc7da5903f59d83e23937f22420164c9477", "parents": [ "862f0012549110d6f2586bf54b52ed4540cbff3a", "9307c29524502c21f0e8a6d96d850b2f5bc0bd9a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 17:12:13 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 17:12:13 2013 -0700" }, "message": "Merge branch \u0027akpm\u0027 (updates from Andrew Morton)\n\nMerge first patch-bomb from Andrew Morton:\n - various misc bits\n - I\u0027m been patchmonkeying ocfs2 for a while, as Joel and Mark have been\n distracted. There has been quite a bit of activity.\n - About half the MM queue\n - Some backlight bits\n - Various lib/ updates\n - checkpatch updates\n - zillions more little rtc patches\n - ptrace\n - signals\n - exec\n - procfs\n - rapidio\n - nbd\n - aoe\n - pps\n - memstick\n - tools/testing/selftests updates\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (445 commits)\n tools/testing/selftests: don\u0027t assume the x bit is set on scripts\n selftests: add .gitignore for kcmp\n selftests: fix clean target in kcmp Makefile\n selftests: add .gitignore for vm\n selftests: add hugetlbfstest\n self-test: fix make clean\n selftests: exit 1 on failure\n kernel/resource.c: remove the unneeded assignment in function __find_resource\n aio: fix wrong comment in aio_complete()\n drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode\n drivers/memstick/host/r592.c: convert to module_pci_driver\n drivers/memstick/host/jmb38x_ms: convert to module_pci_driver\n pps-gpio: add device-tree binding and support\n drivers/pps/clients/pps-gpio.c: convert to module_platform_driver\n drivers/pps/clients/pps-gpio.c: convert to devm_* helpers\n drivers/parport/share.c: use kzalloc\n Documentation/accounting/getdelays.c: avoid strncpy in accounting tool\n aoe: update internal version number to v83\n aoe: update copyright date\n aoe: perform I/O completions in parallel\n ...\n" }, { "commit": "862f0012549110d6f2586bf54b52ed4540cbff3a", "tree": "83d29a684b885b1f58af76e0cd29b8552fd480ea", "parents": [ "f991fae5c6d42dfc5029150b05a78cf3f6c18cc9", "a0f75f9d495b3905b4c658c1d813a127f558a350" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:31:35 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:31:35 2013 -0700" }, "message": "Merge tag \u0027pci-v3.11-changes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI changes from Bjorn Helgaas:\n \"PCI device hotplug\n - Add pci_alloc_dev() interface (Gu Zheng)\n - Add pci_bus_get()/put() for reference counting (Jiang Liu)\n - Fix SR-IOV reference count issues (Jiang Liu)\n - Remove unused acpi_pci_roots list (Jiang Liu)\n\n MSI\n - Conserve interrupt resources on x86 (Alexander Gordeev)\n\n AER\n - Force fatal severity when component has been reset (Betty Dall)\n - Reset link below Root Port as well as Downstream Port (Betty Dall)\n - Fix \"Firmware first\" flag setting (Bjorn Helgaas)\n - Don\u0027t parse HEST for non-PCIe devices (Bjorn Helgaas)\n\n ASPM\n - Warn when we can\u0027t disable ASPM as driver requests (Bjorn Helgaas)\n\n Miscellaneous\n - Add CircuitCo PCI IDs (Darren Hart)\n - Add AMD CZ SATA and SMBus PCI IDs (Shane Huang)\n - Work around Ivytown NTB BAR size issue (Jon Mason)\n - Detect invalid initial BAR values (Kevin Hao)\n - Add pcibios_release_device() (Sebastian Ott)\n - Fix powerpc \u0026 sparc PCI_UNKNOWN power state usage (Bjorn Helgaas)\"\n\n* tag \u0027pci-v3.11-changes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (51 commits)\n MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci\n PCI: Add CircuitCo vendor ID and subsystem ID\n PCI: Use pdev-\u003epm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)\n PCI: Return early on allocation failures to unindent mainline code\n PCI: Simplify IOV implementation and fix reference count races\n PCI: Drop redundant setting of bus-\u003eis_added in virtfn_add_bus()\n unicore32/PCI: Remove redundant call of pci_bus_add_devices()\n m68k/PCI: Remove redundant call of pci_bus_add_devices()\n PCI / ACPI / PM: Use correct power state strings in messages\n PCI: Fix comment typo for pcie_pme_remove()\n PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()\n PCI: Fix refcount issue in pci_create_root_bus() error recovery path\n ia64/PCI: Clean up pci_scan_root_bus() usage\n PCI/AER: Reset link for devices below Root Port or Downstream Port\n ACPI / APEI: Force fatal AER severity when component has been reset\n PCI/AER: Remove \"extern\" from function declarations\n PCI/AER: Move AER severity defines to aer.h\n PCI/AER: Set dev-\u003e__aer_firmware_first only for matching devices\n PCI/AER: Factor out HEST device type matching\n PCI/AER: Don\u0027t parse HEST table for non-PCIe devices\n ...\n" }, { "commit": "c378f70adbc1bbecd9e6db145019f14b2f688c7c", "tree": "6b81f9cf54e812e10d6930ece08f3149dccbc535", "parents": [ "9532f149ee4532b5efc7e4a76381e1742805e1af" ], "author": { "name": "Paul Clements", "email": "paul.clements@steeleye.com", "time": "Wed Jul 03 15:09:04 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:05 2013 -0700" }, "message": "nbd: correct disconnect behavior\n\nCurrently, when a disconnect is requested by the user (via NBD_DISCONNECT\nioctl) the return from NBD_DO_IT is undefined (it is usually one of\nseveral error codes). This means that nbd-client does not know if a\nmanual disconnect was performed or whether a network error occurred.\nBecause of this, nbd-client\u0027s persist mode (which tries to reconnect after\nerror, but not after manual disconnect) does not always work correctly.\n\nThis change fixes this by causing NBD_DO_IT to always return 0 if a user\nrequests a disconnect. This means that nbd-client can correctly either\npersist the connection (if an error occurred) or disconnect (if the user\nrequested it).\n\nSigned-off-by: Paul Clements \u003cpaul.clements@steeleye.com\u003e\nAcked-by: Rob Landley \u003crob@landley.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6ca40c2565fc617534d20d10a5848b626213608c", "tree": "8d0ddc5543772647e232158d7f332a25b3291ae7", "parents": [ "ed5edee2f8547d5c2b28de21cb1471aaea71ee0a" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Wed Jul 03 15:09:01 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:05 2013 -0700" }, "message": "rapidio: change endpoint device name format\n\nChange endpoint device name format to use a component tag value instead of\ndevice destination ID.\n\nRapidIO specification defines a component tag to be a unique identifier\nfor devices in a network. RapidIO switches already use component tag as\npart of their device name and also use it for device identification when\nprocessing error management event notifications.\n\nForming an endpoint\u0027s device name using its component tag instead of\ndestination ID allows to keep sysfs device directories unchanged in case\nif a routing process dynamically changes endpoint\u0027s destination ID as a\nresult of route optimization.\n\nThis change should not affect any existing users because a valid device\ndestination ID always should be obtained by reading \"destid\" attribute and\nnot by parsing device name.\n\nThis patch also removes switchid member from struct rio_switch because it\nsimply duplicates the component tag and does not have other use than in\ndevice name generation.\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Andre van Herk \u003candre.van.herk@Prodrive.nl\u003e\nCc: Micha Nelissen \u003cmicha.nelissen@Prodrive.nl\u003e\nCc: Stef van Os \u003cstef.van.os@Prodrive.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3bdbb62fe97537252b22f700009863eeb51aa750", "tree": "7a3150f7496f951ac6de51f2156cf29fc8f9a73f", "parents": [ "fdf90abc00979fb2d61dbdba9e855200e236142b" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Wed Jul 03 15:08:58 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:05 2013 -0700" }, "message": "rapidio: add udev notification\n\nAdd RapidIO-specific modalias generation to enable udev notifications\nabout RapidIO-specific events.\n\nThe RapidIO modalias string format is shown below:\n\n\"rapidio:vNNNNdNNNNavNNNNadNNNN\"\n\nWhere:\nv - Device Vendor ID (16 bit),\nd - Device ID (16 bit),\nav - Assembly Vendor ID (16 bit),\nad - Assembly ID (16 bit),\n\nas they are reported in corresponding Capability Registers (CARs)\nof each RapidIO device.\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Andre van Herk \u003candre.van.herk@Prodrive.nl\u003e\nCc: Micha Nelissen \u003cmicha.nelissen@Prodrive.nl\u003e\nCc: Stef van Os \u003cstef.van.os@Prodrive.nl\u003e\nCc: Jean Delvare \u003cjdelvare@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": "9edbc30b434f56258d03faac5daf37a555384db3", "tree": "d6454e8d28a6177d31f91bf081bb0602b8c73056", "parents": [ "e6161d64263ee7a903acdde1a8ab7d4221d5512f" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Wed Jul 03 15:08:53 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:04 2013 -0700" }, "message": "rapidio: update enumerator registration mechanism\n\nUpdate enumeration/discovery method registration mechanism to allow\nloading enumeration/discovery methods before all mports are registered.\n\nExisting statically linked RapidIO subsystem expects that all available\nRapidIO mport devices are initialized and registered before the\nenumeration/discovery method is registered. Switching to loadable mport\ndevice drivers creates situation when mport device driver can be loaded\nafter enumeration/discovery method is attached (e.g., loadable mport\ndriver in a system with statically linked RapidIO core and enumerator).\nThis also will happen in a system with hot-pluggable RapidIO controllers.\n\nTo remove the dependency on the initialization/registration order this\npatch introduces enumeration/discovery registration mechanism that\nsupports arbitrary registration order of mports and enumerator/discovery\nmethods.\n\nThe following registration rules are implemented:\n- only one enumeration/discovery method can be registered for given mport ID\n (including RIO_MPORT_ANY);\n- when new enumeration/discovery methods tries to attach to the registered mport\n device, method with matching mport ID will replace a default method previously\n registered for given mport (if any);\n- enumeration/discovery method with target ID\u003dRIO_MPORT_ANY will be attached\n only to mports that do not have another enumerator attached to them;\n- when new mport device is registered with RapidIO subsystem, registration\n routine searches for the enumeration/discovery method with the best matching\n mport ID;\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Andre van Herk \u003candre.van.herk@Prodrive.nl\u003e\nCc: Micha Nelissen \u003cmicha.nelissen@Prodrive.nl\u003e\nCc: Stef van Os \u003cstef.van.os@Prodrive.nl\u003e\nCc: Jean Delvare \u003cjdelvare@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": "2ec3ba69faf301fb599e3651515e808e8efa533e", "tree": "953f10726fd0cd61fec02082233c6097287d7257", "parents": [ "36f0efbbe8e21c153dfc2f94c91f89ab06fd64c5" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Wed Jul 03 15:08:50 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:04 2013 -0700" }, "message": "rapidio: convert switch drivers to modules\n\nRework RapidIO switch drivers to add an option to build them as loadable\nkernel modules.\n\nThis patch removes RapidIO-specific vmlinux section and converts switch\ndrivers to be compatible with LDM driver registration method. To simplify\nregistration of device-specific callback routines this patch introduces\nrio_switch_ops data structure. The sw_sysfs() callback is removed from\nthe list of device-specific operations because under the new structure its\nfunctions can be handled by switch driver\u0027s probe() and remove() routines.\n\nIf a specific switch device driver is not loaded the RapidIO subsystem\ncore will use default standard-based operations to configure a switch.\nBecause the current implementation of RapidIO enumeration/discovery method\nrelies on availability of device-specific operations for error management,\nswitch device drivers must be loaded before the RapidIO\nenumeration/discovery starts.\n\nThis patch also moves several common routines from enumeration/discovery\nmodule into the RapidIO core code to make switch-specific operations\naccessible to all components of RapidIO subsystem.\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Andre van Herk \u003candre.van.herk@Prodrive.nl\u003e\nCc: Micha Nelissen \u003cmicha.nelissen@Prodrive.nl\u003e\nCc: Stef van Os \u003cstef.van.os@Prodrive.nl\u003e\nCc: Jean Delvare \u003cjdelvare@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": "8190773985141f063e1d6dc10200527c655abfb5", "tree": "5c148834f047748dfa2ce3500236b89656976567", "parents": [ "80628ca06c5d42929de6bc22c0a41589a834d151" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jul 03 15:08:31 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:03 2013 -0700" }, "message": "kernel/fork.c:copy_process(): don\u0027t add the uninitialized child to thread/task/pid lists\n\ncopy_process() adds the new child to thread_group/init_task.tasks list and\nthen does attach_pid(child, PIDTYPE_PID). This means that the lockless\nnext_thread() or next_task() can see this thread with the wrong pid. Say,\n\"ls /proc/pid/task\" can list the same inode twice.\n\nWe could move attach_pid(child, PIDTYPE_PID) up, but in this case\nfind_task_by_vpid() can find the new thread before it was fully\ninitialized.\n\nAnd this is already true for PIDTYPE_PGID/PIDTYPE_SID, With this patch\ncopy_process() initializes child-\u003epids[*].pid first, then calls\nattach_pid() to insert the task into the pid-\u003etasks list.\n\nattach_pid() no longer need the \"struct pid*\" argument, it is always\ncalled after pid_link-\u003epid was already set.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Sergey Dyasly \u003cdserrg@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": "81dabb464139324c005159f5afba377104d8828d", "tree": "6f105f6a2a4f32b8ff45efb51889b172452e7282", "parents": [ "3f4185483832ccf3d2977923db576fa689c2abce" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jul 03 15:08:26 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:02 2013 -0700" }, "message": "exit.c: unexport __set_special_pids()\n\nMove __set_special_pids() from exit.c to sys.c close to its single caller\nand make it static.\n\nAnd rename it to set_special_pids(), another helper with this name has\ngone away.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "29000caecbe87b6b66f144f72111f0d02fbbf0c1", "tree": "91d178abd9543a49c087af857a3cfabececfd71e", "parents": [ "37f07655522042399db7a4b54aee830bdb52ce2c" ], "author": { "name": "Andrey Vagin", "email": "avagin@openvz.org", "time": "Wed Jul 03 15:08:12 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:01 2013 -0700" }, "message": "ptrace: add ability to get/set signal-blocked mask\n\ncrtools uses a parasite code for dumping processes. The parasite code is\ninjected into a process with help PTRACE_SEIZE.\n\nCurrently crtools blocks signals from a parasite code. If a process has\npending signals, crtools wait while a process handles these signals.\n\nThis method is not suitable for stopped tasks. A stopped task can have a\nfew pending signals, when we will try to execute a parasite code, we will\nneed to drop SIGSTOP, but all other signals must remain pending, because a\nstate of processes must not be changed during checkpointing.\n\nThis patch adds two ptrace commands to set/get signal-blocked mask.\n\nI think gdb can use this commands too.\n\n[akpm@linux-foundation.org: be consistent with brace layout]\nSigned-off-by: Andrey Vagin \u003cavagin@openvz.org\u003e\nReviewed-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1d0c48e66b3f1cf40660f69a87f55af3df0b2ae3", "tree": "0b3531877c44659181ae17098ee581f09833f40e", "parents": [ "8318fde4ac78f6793b1cbaf57659902253a61617" ], "author": { "name": "Jingoo Han", "email": "jg1.han@samsung.com", "time": "Wed Jul 03 15:05:14 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:43 2013 -0700" }, "message": "lcd: add devm_lcd_device_{register,unregister}()\n\nThese functions allow the driver core to automatically clean up any\nallocation made by lcd drivers. Thus it simplifies the error paths.\n\nSigned-off-by: Jingoo Han \u003cjg1.han@samsung.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8318fde4ac78f6793b1cbaf57659902253a61617", "tree": "7b7a30f1bdcd75972b8efba43fece1d48f19d611", "parents": [ "9ed3936fd7e918bfea565f51aa4379967009d7dd" ], "author": { "name": "Jingoo Han", "email": "jg1.han@samsung.com", "time": "Wed Jul 03 15:05:13 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:43 2013 -0700" }, "message": "backlight: add devm_backlight_device_{register,unregister}()\n\nThese functions allow the driver core to automatically clean up any\nallocation made by backlight drivers. Thus it simplifies the error\npaths.\n\nSigned-off-by: Jingoo Han \u003cjg1.han@samsung.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "48a9db462d99494583dad829969616ac90a8df4e", "tree": "d908a6172274a9d4d5c14752aa648086bc4721cd", "parents": [ "dcf6d294830d46b0e6901477fb4bf455281d90c8" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "b.zolnierkie@samsung.com", "time": "Wed Jul 03 15:05:06 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:42 2013 -0700" }, "message": "drivers/dma: remove unused support for MEMSET operations\n\nThere have never been any real users of MEMSET operations since they\nhave been introduced in January 2007 by commit 7405f74badf4 (\"dmaengine:\nrefactor dmaengine around dma_async_tx_descriptor\"). Therefore remove\nsupport for them for now, it can be always brought back when needed.\n\n[sebastian.hesselbarth@gmail.com: fix drivers/dma/mv_xor]\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cb.zolnierkie@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Sebastian Hesselbarth \u003csebastian.hesselbarth@gmail.com\u003e\nCc: Vinod Koul \u003cvinod.koul@intel.com\u003e\nAcked-by: Dan Williams \u003cdjbw@fb.com\u003e\nCc: Tomasz Figa \u003ct.figa@samsung.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nCc: Kevin Hilman \u003ckhilman@linaro.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5017b2851373ee15c7035151853bb1448800cae2", "tree": "b0f60670bbf5658a44a51930e8eb728b0ea70a20", "parents": [ "45c64940c8bb64a042464ecec89d95eb4cce9b07" ], "author": { "name": "Jani Nikula", "email": "jani.nikula@intel.com", "time": "Wed Jul 03 15:05:02 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:42 2013 -0700" }, "message": "dmi: add support for exact DMI matches in addition to substring matching\n\ndmi_match() considers a substring match to be a successful match. This is\nnot always sufficient to distinguish between DMI data for different\nsystems. Add support for exact string matching using strcmp() in addition\nto the substring matching using strstr().\n\nThe specific use case in the i915 driver is to allow us to use an exact\nmatch for D510MO, without also incorrectly matching D510MOV:\n\n {\n\t.ident \u003d \"Intel D510MO\",\n\t.matches \u003d {\n\t\tDMI_MATCH(DMI_BOARD_VENDOR, \"Intel\"),\n\t\tDMI_EXACT_MATCH(DMI_BOARD_NAME, \"D510MO\"),\n\t},\n }\n\nSigned-off-by: Jani Nikula \u003cjani.nikula@intel.com\u003e\nCc: \u003cannndddrr@gmail.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Cornel Panceac \u003ccpanceac@gmail.com\u003e\nAcked-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8537548c924db3c44afde7646b6e220c7beb79d", "tree": "619ef33bab975df1946eb118f7d03e6aaed77515", "parents": [ "02aa2a37636c8fa4fb9322d91be46ff8225b7de0" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Wed Jul 03 15:04:57 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:41 2013 -0700" }, "message": "drivers: avoid format strings in names passed to alloc_workqueue()\n\nFor the workqueue creation interfaces that do not expect format strings,\nmake sure they cannot accidently be parsed that way. Additionally, clean\nup calls made with a single parameter that would be handled as a format\nstring. Many callers are passing potentially dynamic string content, so\nuse \"%s\" in those cases to avoid any potential accidents.\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e7152b97f38f1f5b915c719e6a3040697a700a16", "tree": "78f73f1c4791683f38b5894b0c7f12d9e9b6006d", "parents": [ "98bd8d05ea5798ff3179ee33f0ca2789722ecc5a" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Jul 03 15:04:54 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:41 2013 -0700" }, "message": "err.h: IS_ERR() can accept __user pointers\n\nSparse generates a false positive when you pass a __user or __iomem\npointer to the IS_ERR() functions.\n\n drivers/rtc/rtc-ds1286.c:344:36: sparse: incorrect type in argument 1 (different address spaces)\n drivers/rtc/rtc-ds1286.c:344:36: expected void const *ptr\n drivers/rtc/rtc-ds1286.c:344:36: got unsigned int [noderef] [usertype] \u003casn:2\u003e*rtcregs\n\nWe can silence these by adding a __force here and upgrading to Sparse\nv0.4.5-rc1 or later.\n\nThis change has no effect when using current Sparse releases.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Christopher Li \u003csparse@chrisli.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "55878e88c59221c3187e1c24ec3b15eb79c374c0", "tree": "f0c9a994d63b3fb64dffe6477317db53453b2b61", "parents": [ "b26a3dfd4c0b888303a5909ef37febeb582e190e" ], "author": { "name": "Cody P Schafer", "email": "cody@linux.vnet.ibm.com", "time": "Wed Jul 03 15:04:44 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:40 2013 -0700" }, "message": "sparsemem: add BUILD_BUG_ON when sizeof mem_section is non-power-of-2\n\nInstead of leaving a hidden trap for the next person who comes along and\nwants to add something to mem_section, add a big fat warning about it\nneeding to be a power-of-2, and insert a BUILD_BUG_ON() in sparse_init()\nto catch mistakes.\n\nRight now non-power-of-2 mem_sections cause a number of WARNs at boot\n(which don\u0027t clearly point to the size of mem_section as an issue), but\nthe system limps on (temporarily, at least).\n\nThis is based upon Dave Hansen\u0027s earlier RFC where he ran into the same\nissue:\n\t\"sparsemem: fix boot when SECTIONS_PER_ROOT is not power-of-2\"\n\thttp://lkml.indiana.edu/hypermail/linux/kernel/1205.2/03077.html\n\nSigned-off-by: Cody P Schafer \u003ccody@linux.vnet.ibm.com\u003e\nAcked-by: Dave Hansen \u003cdave.hansen@linux.intel.com\u003e\nCc: Jiang Liu \u003cliuj97@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": "e1280be0d8614be94e5bef48b6c830dfa03e82a7", "tree": "6bcce2ec66882e5c3a14bcddc50c9af7d693ab53", "parents": [ "e3a466b29fc3da335a5a5b695ca6da980d157070" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:04:34 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:39 2013 -0700" }, "message": "mm: kill free_all_bootmem_node()\n\nNow nobody makes use of free_all_bootmem_node(), kill it.\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fccc998771043db1613509b26c18b3d7f071e668", "tree": "c917d6508d4194a4a50796ccb36614e3fe56da7e", "parents": [ "1895418189e08c1d1eec4fbdb5fb41d793f57ba5" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:04:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:38 2013 -0700" }, "message": "mm: introduce helper function set_max_mapnr()\n\nIntroduce a helper function set_max_mapnr() to set global variable\nmax_mapnr.\n\nAlso unify condition compilation for max_mapnr with\nCONFIG_NEED_MULTIPLE_NODES instead of CONFIG_DISCONTIGMEM.\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1895418189e08c1d1eec4fbdb5fb41d793f57ba5", "tree": "43db8d2e00758e6ad3de06db3832986b4575c312", "parents": [ "808c2c3745975714ecd4da4d68c915de9048b12f" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:04:21 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:38 2013 -0700" }, "message": "mm: kill global variable num_physpages\n\nNow all references to num_physpages have been removed, so kill it.\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7ee3d4e8cd560500192d80ca84d7f15d6dee0807", "tree": "8c58a121edb9c528fb6497e04774dca8d121aa4f", "parents": [ "a214a8c68bcdef2fb0803425f7fe36fe41030d3f" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:03:41 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:35 2013 -0700" }, "message": "mm: introduce helper function mem_init_print_info() to simplify mem_init()\n\nIntroduce helper function mem_init_print_info() to simplify mem_init()\nacross different architectures, which also unifies the format and\ninformation printed.\n\nFunction mem_init_print_info() calculates memory statistics information\nwithout walking each page, so it should be a little faster on some\narchitectures.\n\nAlso introduce another helper get_num_physpages() to kill the global\nvariable num_physpages.\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1622d1abdf7b554eb7cc40c0d08d989176732242", "tree": "d0553ae064f5ef452c1b34a1ef112279791d8bce", "parents": [ "e6c495a96ce02574e765d5140039a64c8d4e8c9e" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:03:33 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:34 2013 -0700" }, "message": "vmlinux.lds: add comments for global variables and clean up useless declarations\n\nThe original goal of this patchset is to fix the bug reported by\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d53501 Now it has also been\nexpanded to reduce common code used by memory initializion.\n\nPatch 1-7:\n\t1) add comments for global variables exported by vmlinux.lds\n\t2) normalize global variables exported by vmlinux.lds\nPatch 8:\n\tIntroduce helper functions mem_init_print_info() and\n\tget_num_physpages()\nPatch 9:\n\tAvoid using global variable num_physpages at runtime\nPatch 10:\n\tDon\u0027t update num_physpages in memory_hotplug.c\nPatch 11-40:\n\tModify arch mm initialization code to:\n\t1) Simplify mem_init() by using mem_init_print_info()\n\t2) Prepare for killing global variable num_physpages\nPatch 41:\n\tKill the global variable num_physpages\n\nWith all patches applied, mem_init(), free_initmem(), free_initrd_mem()\ncould be as simple as below. This patch series has reduced about 1.2K\nlines of code in total.\n\n#ifndef CONFIG_DISCONTIGMEM\nvoid __init\nmem_init(void)\n{\n\tmax_mapnr \u003d max_low_pfn;\n\tfree_all_bootmem();\n\thigh_memory \u003d (void *) __va(max_low_pfn * PAGE_SIZE);\n\n\tmem_init_print_info(NULL);\n}\n#endif /* CONFIG_DISCONTIGMEM */\n\nvoid\nfree_initmem(void)\n{\n\tfree_initmem_default(-1);\n}\n\n#ifdef CONFIG_BLK_DEV_INITRD\nvoid\nfree_initrd_mem(unsigned long start, unsigned long end)\n{\n\tfree_reserved_area(start, end, -1, \"initrd\");\n}\n#endif\n\nDue to hardware resource limitations, I have only tested this on x86_64.\nAnd the messages reported on an x86_64 system are:\n\nLog message before applying patches:\nMemory: 7745676k/8910848k available (6934k kernel code, 836024k absent, 329148k reserved, 6343k data, 1012k init)\n\nLog message after applying patches:\nMemory: 7744624K/8074824K available (6969K kernel code, 1011K data, 2828K rodata, 1016K init, 9640K bss, 330200K reserved)\n\nGreat thanks to Vineet Gupta for testing on ARC.\n\nThis patch:\n\nDocument global variables exported from vmlinux.lds.\n\n1) Add comments about usage guidelines for global variables exported\n from vmlinux.lds.S.\n2) Remove unused __initdata_begin[] and __initdata_end[].\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Vineet Gupta \u003cvgupta@synopsys.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c3d5f5f0c2bc4eabeaf49f1a21e1aeb965246cd2", "tree": "ec3b59b33102150b20c04de0b43d25dcea692b68", "parents": [ "7b4b2a0d6c8500350784beb83a6a55e60ea3bea3" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:03:14 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:33 2013 -0700" }, "message": "mm: use a dedicated lock to protect totalram_pages and zone-\u003emanaged_pages\n\nCurrently lock_memory_hotplug()/unlock_memory_hotplug() are used to\nprotect totalram_pages and zone-\u003emanaged_pages. Other than the memory\nhotplug driver, totalram_pages and zone-\u003emanaged_pages may also be\nmodified at runtime by other drivers, such as Xen balloon,\nvirtio_balloon etc. For those cases, memory hotplug lock is a little\ntoo heavy, so introduce a dedicated lock to protect totalram_pages and\nzone-\u003emanaged_pages.\n\nNow we have a simplified locking rules totalram_pages and\nzone-\u003emanaged_pages as:\n\n1) no locking for read accesses because they are unsigned long.\n2) no locking for write accesses at boot time in single-threaded context.\n3) serialize write accesses at runtime by acquiring the dedicated\n managed_page_count_lock.\n\nAlso adjust zone-\u003emanaged_pages when freeing reserved pages into the\nbuddy system, to keep totalram_pages and zone-\u003emanaged_pages in\nconsistence.\n\n[akpm@linux-foundation.org: don\u0027t export adjust_managed_page_count to modules (for now)]\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: \u003csworddragon2@aol.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\nCc: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nCc: Joonsoo Kim \u003cjs1304@gmail.com\u003e\nCc: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Tang Chen \u003ctangchen@cn.fujitsu.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b4b2a0d6c8500350784beb83a6a55e60ea3bea3", "tree": "9d36d3bc9b94d613ed6b556a5f534bb9eec6f876", "parents": [ "4f9f47745e948eca18bb97c82dbb4d53f2380086" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:03:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:33 2013 -0700" }, "message": "mm: accurately calculate zone-\u003emanaged_pages for highmem zones\n\nCommit \"mm: introduce new field \u0027managed_pages\u0027 to struct zone\" assumes\nthat all highmem pages will be freed into the buddy system by function\nmem_init(). But that\u0027s not always true, some architectures may reserve\nsome highmem pages during boot. For example PPC may allocate highmem\npages for giagant HugeTLB pages, and several architectures have code to\ncheck PageReserved flag to exclude highmem pages allocated during boot\nwhen freeing highmem pages into the buddy system.\n\nSo treat highmem pages in the same way as normal pages, that is to:\n1) reset zone-\u003emanaged_pages to zero in mem_init().\n2) recalculate managed_pages when freeing pages into the buddy system.\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Joonsoo Kim \u003cjs1304@gmail.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: \u003csworddragon2@aol.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\nCc: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Tang Chen \u003ctangchen@cn.fujitsu.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dbe67df4ba78c79db547c7864e1120981c144c97", "tree": "5dbfb1f416d8099b46921d5ad59f1d8287473564", "parents": [ "11199692d83dd3fe1511203024fb9853d176ec4c" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:02:51 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:32 2013 -0700" }, "message": "mm: enhance free_reserved_area() to support poisoning memory with zero\n\nAddress more review comments from last round of code review.\n1) Enhance free_reserved_area() to support poisoning freed memory with\n pattern \u00270\u0027. This could be used to get rid of poison_init_mem()\n on ARM64.\n2) A previous patch has disabled memory poison for initmem on s390\n by mistake, so restore to the original behavior.\n3) Remove redundant PAGE_ALIGN() when calling free_reserved_area().\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: \u003csworddragon2@aol.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\nCc: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nCc: Joonsoo Kim \u003cjs1304@gmail.com\u003e\nCc: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Tang Chen \u003ctangchen@cn.fujitsu.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "11199692d83dd3fe1511203024fb9853d176ec4c", "tree": "a8632c310774eef2928f24d5aca81d1203dd54b8", "parents": [ "dcf6b7ddd7df8965727746f89c59229b23180e5a" ], "author": { "name": "Jiang Liu", "email": "liuj97@gmail.com", "time": "Wed Jul 03 15:02:48 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:32 2013 -0700" }, "message": "mm: change signature of free_reserved_area() to fix building warnings\n\nChange signature of free_reserved_area() according to Russell King\u0027s\nsuggestion to fix following build warnings:\n\n arch/arm/mm/init.c: In function \u0027mem_init\u0027:\n arch/arm/mm/init.c:603:2: warning: passing argument 1 of \u0027free_reserved_area\u0027 makes integer from pointer without a cast [enabled by default]\n free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL);\n ^\n In file included from include/linux/mman.h:4:0,\n from arch/arm/mm/init.c:15:\n include/linux/mm.h:1301:22: note: expected \u0027long unsigned int\u0027 but argument is of type \u0027void *\u0027\n extern unsigned long free_reserved_area(unsigned long start, unsigned long end,\n\n mm/page_alloc.c: In function \u0027free_reserved_area\u0027:\n\u003e\u003e mm/page_alloc.c:5134:3: warning: passing argument 1 of \u0027virt_to_phys\u0027 makes pointer from integer without a cast [enabled by default]\n In file included from arch/mips/include/asm/page.h:49:0,\n from include/linux/mmzone.h:20,\n from include/linux/gfp.h:4,\n from include/linux/mm.h:8,\n from mm/page_alloc.c:18:\n arch/mips/include/asm/io.h:119:29: note: expected \u0027const volatile void *\u0027 but argument is of type \u0027long unsigned int\u0027\n mm/page_alloc.c: In function \u0027free_area_init_nodes\u0027:\n mm/page_alloc.c:5030:34: warning: array subscript is below array bounds [-Warray-bounds]\n\nAlso address some minor code review comments.\n\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nReported-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: \u003csworddragon2@aol.com\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\nCc: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nCc: Joonsoo Kim \u003cjs1304@gmail.com\u003e\nCc: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Tang Chen \u003ctangchen@cn.fujitsu.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Wen Congyang \u003cwency@cn.fujitsu.com\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Yasuaki Ishimatsu \u003cisimatu.yasuaki@jp.fujitsu.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dcf6b7ddd7df8965727746f89c59229b23180e5a", "tree": "5786f2748cfd0f6870ad092e41e524709dcd817e", "parents": [ "917d9290af749fac9c4d90bacf18699c9d8ba28d" ], "author": { "name": "Rafael Aquini", "email": "aquini@redhat.com", "time": "Wed Jul 03 15:02:46 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:32 2013 -0700" }, "message": "swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES\n\nConsidering the use cases where the swap device supports discard:\na) and can do it quickly;\nb) but it\u0027s slow to do in small granularities (or concurrent with other\n I/O);\nc) but the implementation is so horrendous that you don\u0027t even want to\n send one down;\n\nAnd assuming that the sysadmin considers it useful to send the discards down\nat all, we would (probably) want the following solutions:\n\n i. do the fine-grained discards for freed swap pages, if device is\n capable of doing so optimally;\n ii. do single-time (batched) swap area discards, either at swapon\n or via something like fstrim (not implemented yet);\niii. allow doing both single-time and fine-grained discards; or\n iv. turn it off completely (default behavior)\n\nAs implemented today, one can only enable/disable discards for swap, but\none cannot select, for instance, solution (ii) on a swap device like (b)\neven though the single-time discard is regarded to be interesting, or\nnecessary to the workload because it would imply (1), and the device is\nnot capable of performing it optimally.\n\nThis patch addresses the scenario depicted above by introducing a way to\nensure the (probably) wanted solutions (i, ii, iii and iv) can be flexibly\nflagged through swapon(8) to allow a sysadmin to select the best suitable\nswap discard policy accordingly to system constraints.\n\nThis patch introduces SWAP_FLAG_DISCARD_PAGES and SWAP_FLAG_DISCARD_ONCE\nnew flags to allow more flexibe swap discard policies being flagged\nthrough swapon(8). The default behavior is to keep both single-time, or\nbatched, area discards (SWAP_FLAG_DISCARD_ONCE) and fine-grained discards\nfor page-clusters (SWAP_FLAG_DISCARD_PAGES) enabled, in order to keep\nconsistentcy with older kernel behavior, as well as maintain compatibility\nwith older swapon(8). However, through the new introduced flags the best\nsuitable discard policy can be selected accordingly to any given swap\ndevice constraint.\n\n[akpm@linux-foundation.org: tweak comments]\nSigned-off-by: Rafael Aquini \u003caquini@redhat.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Shaohua Li \u003cshli@kernel.org\u003e\nCc: Karel Zak \u003ckzak@redhat.com\u003e\nCc: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Larry Woodman \u003clwoodman@redhat.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "917d9290af749fac9c4d90bacf18699c9d8ba28d", "tree": "506f3a6f90d318a612161da2adf8aae8f81aaab3", "parents": [ "2415cf12e04d415b16d9c2f2a705bcd6cd9a0474" ], "author": { "name": "Tim Chen", "email": "tim.c.chen@linux.intel.com", "time": "Wed Jul 03 15:02:44 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:32 2013 -0700" }, "message": "mm: tune vm_committed_as percpu_counter batching size\n\nCurrently the per cpu counter\u0027s batch size for memory accounting is\nconfigured as twice the number of cpus in the system. However, for\nsystem with very large memory, it is more appropriate to make it\nproportional to the memory size per cpu in the system.\n\nFor example, for a x86_64 system with 64 cpus and 128 GB of memory, the\nbatch size is only 2*64 pages (0.5 MB). So any memory accounting\nchanges of more than 0.5MB will overflow the per cpu counter into the\nglobal counter. Instead, for the new scheme, the batch size is\nconfigured to be 0.4% of the memory/cpu \u003d 8MB (128 GB/64 /256), which is\nmore inline with the memory size.\n\nI\u0027ve done a repeated brk test of 800KB (from will-it-scale test suite)\nwith 80 concurrent processes on a 4 socket Westmere machine with a total\nof 40 cores. Without the patch, about 80% of cpu is spent on spin-lock\ncontention within the vm_committed_as counter. With the patch, there\u0027s\na 73x speedup on the benchmark and the lock contention drops off almost\nentirely.\n\n[akpm@linux-foundation.org: fix section mismatch]\nSigned-off-by: Tim Chen \u003ctim.c.chen@linux.intel.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Dave Hansen \u003cdave.hansen@intel.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5f1e31d2f5977d910d0b2f5018173e99241d1940", "tree": "e3ae407197f5518faba7cf4fe48a86f19f94def1", "parents": [ "4c42efa266030f32227f35fabbdd986fcf8f2ec4" ], "author": { "name": "Wanpeng Li", "email": "liwanp@linux.vnet.ibm.com", "time": "Wed Jul 03 15:02:42 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:32 2013 -0700" }, "message": "mm/hugetlb: remove hugetlb_prefault\n\nhugetlb_prefault() is not used any more, this patch removes it.\n\nSigned-off-by: Wanpeng Li \u003cliwanp@linux.vnet.ibm.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4c42efa266030f32227f35fabbdd986fcf8f2ec4", "tree": "a5c49137d8884c463252fa47b62c59d823e4c1ab", "parents": [ "cea27eb2a202959783f81254c48c250ddd80e129" ], "author": { "name": "Wanpeng Li", "email": "liwanp@linux.vnet.ibm.com", "time": "Wed Jul 03 15:02:41 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:32 2013 -0700" }, "message": "mm/pageblock: remove get/set_pageblock_flags\n\nget_pageblock_flags and set_pageblock_flags are not used any more, this\npatch removes them.\n\nSigned-off-by: Wanpeng Li \u003cliwanp@linux.vnet.ibm.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c53954a092d07c5684d31ea1fc813d262cff08a5", "tree": "257a36dd4b413e2d82aff23b5b7194a01b57df40", "parents": [ "a0b8cab3b9b2efadabdcff264c450ca515e2619c" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Jul 03 15:02:34 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:31 2013 -0700" }, "message": "mm: remove lru parameter from __lru_cache_add and lru_cache_add_lru\n\nSimilar to __pagevec_lru_add, this patch removes the LRU parameter from\n__lru_cache_add and lru_cache_add_lru as the caller does not control the\nexact LRU the page gets added to. lru_cache_add_lru gets renamed to\nlru_cache_add the name is silly without the lru parameter. With the\nparameter removed, it is required that the caller indicate if they want\nthe page added to the active or inactive list by setting or clearing\nPageActive respectively.\n\n[akpm@linux-foundation.org: Suggested the patch]\n[gang.chen@asianux.com: fix used-unintialized warning]\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: Chen Gang \u003cgang.chen@asianux.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Alexey Lyahkov \u003calexey.lyashkov@gmail.com\u003e\nCc: Andrew Perepechko \u003canserper@ya.ru\u003e\nCc: Robin Dong \u003csanbai@taobao.com\u003e\nCc: Theodore Tso \u003ctytso@mit.edu\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Bernd Schubert \u003cbernd.schubert@fastmail.fm\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a0b8cab3b9b2efadabdcff264c450ca515e2619c", "tree": "31bcd78c027cafbc9daf892fe7b6db07c48297a5", "parents": [ "059285a25f30c13ed4f5d91cecd6094b9b20bb7b" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Jul 03 15:02:32 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:31 2013 -0700" }, "message": "mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API\n\nNow that the LRU to add a page to is decided at LRU-add time, remove the\nmisleading lru parameter from __pagevec_lru_add. A consequence of this\nis that the pagevec_lru_add_file, pagevec_lru_add_anon and similar\nhelpers are misleading as the caller no longer has direct control over\nwhat LRU the page is added to. Unused helpers are removed by this patch\nand existing users of pagevec_lru_add_file() are converted to use\nlru_cache_add_file() directly and use the per-cpu pagevecs instead of\ncreating their own pagevec.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nReviewed-by: Jan Kara \u003cjack@suse.cz\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Alexey Lyahkov \u003calexey.lyashkov@gmail.com\u003e\nCc: Andrew Perepechko \u003canserper@ya.ru\u003e\nCc: Robin Dong \u003csanbai@taobao.com\u003e\nCc: Theodore Tso \u003ctytso@mit.edu\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Bernd Schubert \u003cbernd.schubert@fastmail.fm\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c6286c983900c77410a951874f1589f4a41fbbae", "tree": "3e4b1d2c2c4c783886f9c6e98770f4602273197c", "parents": [ "f968ef1c55199301e98c28fe7dfa8ace05ecdb96" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Jul 03 15:02:26 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:31 2013 -0700" }, "message": "mm: add tracepoints for LRU activation and insertions\n\nAndrew Perepechko reported a problem whereby pages are being prematurely\nevicted as the mark_page_accessed() hint is ignored for pages that are\ncurrently on a pagevec --\nhttp://www.spinics.net/lists/linux-ext4/msg37340.html .\n\nAlexey Lyahkov and Robin Dong have also reported problems recently that\ncould be due to hot pages reaching the end of the inactive list too\nquickly and be reclaimed.\n\nRather than addressing this on a per-filesystem basis, this series aims\nto fix the mark_page_accessed() interface by deferring what LRU a page\nis added to pagevec drain time and allowing mark_page_accessed() to call\nSetPageActive on a pagevec page.\n\nPatch 1 adds two tracepoints for LRU page activation and insertion. Using\n\tthese processes it\u0027s possible to build a model of pages in the\n\tLRU that can be processed offline.\n\nPatch 2 defers making the decision on what LRU to add a page to until when\n\tthe pagevec is drained.\n\nPatch 3 searches the local pagevec for pages to mark PageActive on\n\tmark_page_accessed. The changelog explains why only the local\n\tpagevec is examined.\n\nPatches 4 and 5 tidy up the API.\n\npostmark, a dd-based test and fs-mark both single and threaded mode were\nrun but none of them showed any performance degradation or gain as a\nresult of the patch.\n\nUsing patch 1, I built a *very* basic model of the LRU to examine\noffline what the average age of different page types on the LRU were in\nmilliseconds. Of course, capturing the trace distorts the test as it\u0027s\nwritten to local disk but it does not matter for the purposes of this\ntest. The average age of pages in milliseconds were\n\n\t\t\t\t vanilla deferdrain\nAverage age mapped anon: 1454 1250\nAverage age mapped file: 127841 155552\nAverage age unmapped anon: 85 235\nAverage age unmapped file: 73633 38884\nAverage age unmapped buffers: 74054 116155\n\nThe LRU activity was mostly files which you\u0027d expect for a dd-based\nworkload. Note that the average age of buffer pages is increased by the\nseries and it is expected this is due to the fact that the buffer pages\nare now getting added to the active list when drained from the pagevecs.\nNote that the average age of the unmapped file data is decreased as they\nare still added to the inactive list and are reclaimed before the\nbuffers.\n\nThere is no guarantee this is a universal win for all workloads and it\nwould be nice if the filesystem people gave some thought as to whether\nthis decision is generally a win or a loss.\n\nThis patch:\n\nUsing these tracepoints it is possible to model LRU activity and the\naverage residency of pages of different types. This can be used to\ndebug problems related to premature reclaim of pages of particular\ntypes.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Alexey Lyahkov \u003calexey.lyashkov@gmail.com\u003e\nCc: Andrew Perepechko \u003canserper@ya.ru\u003e\nCc: Robin Dong \u003csanbai@taobao.com\u003e\nCc: Theodore Tso \u003ctytso@mit.edu\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Bernd Schubert \u003cbernd.schubert@fastmail.fm\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e69e9d4aee712a22665f008ae0550bb3d7c7f7c1", "tree": "bb63cd5b881678c902f6b5e197a107022825be30", "parents": [ "cef2ac3f6c8ab532e49cf69d05f540931ad8ee64" ], "author": { "name": "HATAYAMA Daisuke", "email": "d.hatayama@jp.fujitsu.com", "time": "Wed Jul 03 15:02:18 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:30 2013 -0700" }, "message": "vmalloc: introduce remap_vmalloc_range_partial\n\nWe want to allocate ELF note segment buffer on the 2nd kernel in vmalloc\nspace and remap it to user-space in order to reduce the risk that memory\nallocation fails on system with huge number of CPUs and so with huge ELF\nnote segment that exceeds 11-order block size.\n\nAlthough there\u0027s already remap_vmalloc_range for the purpose of\nremapping vmalloc memory to user-space, we need to specify user-space\nrange via vma.\n Mmap on /proc/vmcore needs to remap range across multiple objects, so\nthe interface that requires vma to cover full range is problematic.\n\nThis patch introduces remap_vmalloc_range_partial that receives user-space\nrange as a pair of base address and size and can be used for mmap on\n/proc/vmcore case.\n\nremap_vmalloc_range is rewritten using remap_vmalloc_range_partial.\n\n[akpm@linux-foundation.org: use PAGE_ALIGNED()]\nSigned-off-by: HATAYAMA Daisuke \u003cd.hatayama@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Atsushi Kumagai \u003ckumagai-atsushi@mxc.nes.nec.co.jp\u003e\nCc: Lisa Mitchell \u003clisa.mitchell@hp.com\u003e\nCc: Zhang Yanfei \u003czhangyanfei@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": "0fa73b86ef0797ca4fde5334117ca0b330f08030", "tree": "e3c9a84f928a23b6613f177837fcfd6beb8e41f2", "parents": [ "d702909f0aa14fe678d74d7f974aa66bfb211d0b" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Jul 03 15:02:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:30 2013 -0700" }, "message": "include/linux/mm.h: add PAGE_ALIGNED() helper\n\nTo test whether an address is aligned to PAGE_SIZE.\n\nCc: HATAYAMA Daisuke \u003cd.hatayama@jp.fujitsu.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e,\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "114d4b79f7e561fd76fb98eba79e18df7cdd60f0", "tree": "20d1e2b060b4272e9a18894538d6beb551d5b7c8", "parents": [ "72c3b51bda557ab38d6c5b2af750c27cba15f828" ], "author": { "name": "Cody P Schafer", "email": "cody@linux.vnet.ibm.com", "time": "Wed Jul 03 15:02:09 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:29 2013 -0700" }, "message": "mmzone: note that node_size_lock should be manipulated via pgdat_resize_lock()\n\nSigned-off-by: Cody P Schafer \u003ccody@linux.vnet.ibm.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "72c3b51bda557ab38d6c5b2af750c27cba15f828", "tree": "4a54ebf4989062ce4ea034b59070afaf4970644a", "parents": [ "f919b19614f06711cba300c1bb1e3d94c9ca21b0" ], "author": { "name": "Cody P Schafer", "email": "cody@linux.vnet.ibm.com", "time": "Wed Jul 03 15:02:08 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:29 2013 -0700" }, "message": "mm: fix comment referring to non-existent size_seqlock, change to span_seqlock\n\nSigned-off-by: Cody P Schafer \u003ccody@linux.vnet.ibm.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b45972265f823ed01eae0867a176320071665787", "tree": "ded8dcb801e71fe10e38c715a91571c745c563b5", "parents": [ "d04e8acd03e5c3421ef18e3da7bc88d56179ca42" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Jul 03 15:02:05 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:29 2013 -0700" }, "message": "mm: vmscan: take page buffers dirty and locked state into account\n\nPage reclaim keeps track of dirty and under writeback pages and uses it\nto determine if wait_iff_congested() should stall or if kswapd should\nbegin writing back pages. This fails to account for buffer pages that\ncan be under writeback but not PageWriteback which is the case for\nfilesystems like ext3 ordered mode. Furthermore, PageDirty buffer pages\ncan have all the buffers clean and writepage does no IO so it should not\nbe accounted as congested.\n\nThis patch adds an address_space operation that filesystems may\noptionally use to check if a page is really dirty or really under\nwriteback. An implementation is provided for for buffer_heads is added\nand used for block operations and ext3 in ordered mode. By default the\npage flags are obeyed.\n\nCredit goes to Jan Kara for identifying that the page flags alone are\nnot sufficient for ext3 and sanity checking a number of ideas on how the\nproblem could be addressed.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Valdis Kletnieks \u003cValdis.Kletnieks@vt.edu\u003e\nCc: Zlatko Calusic \u003czcalusic@bitsync.net\u003e\nCc: dormando \u003cdormando@rydia.net\u003e\nCc: Trond Myklebust \u003ctrond.myklebust@fys.uio.no\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "283aba9f9e0e4882bf09bd37a2983379a6fae805", "tree": "8c856efae71bb2daaadae48ff565132dd6e0b06b", "parents": [ "d43006d503ac921c7df4f94d13c17db6f13c9d26" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Jul 03 15:01:51 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:28 2013 -0700" }, "message": "mm: vmscan: block kswapd if it is encountering pages under writeback\n\nHistorically, kswapd used to congestion_wait() at higher priorities if\nit was not making forward progress. This made no sense as the failure\nto make progress could be completely independent of IO. It was later\nreplaced by wait_iff_congested() and removed entirely by commit 258401a6\n(mm: don\u0027t wait on congested zones in balance_pgdat()) as it was\nduplicating logic in shrink_inactive_list().\n\nThis is problematic. If kswapd encounters many pages under writeback\nand it continues to scan until it reaches the high watermark then it\nwill quickly skip over the pages under writeback and reclaim clean young\npages or push applications out to swap.\n\nThe use of wait_iff_congested() is not suited to kswapd as it will only\nstall if the underlying BDI is really congested or a direct reclaimer\nwas unable to write to the underlying BDI. kswapd bypasses the BDI\ncongestion as it sets PF_SWAPWRITE but even if this was taken into\naccount then it would cause direct reclaimers to stall on writeback\nwhich is not desirable.\n\nThis patch sets a ZONE_WRITEBACK flag if direct reclaim or kswapd is\nencountering too many pages under writeback. If this flag is set and\nkswapd encounters a PageReclaim page under writeback then it\u0027ll assume\nthat the LRU lists are being recycled too quickly before IO can complete\nand block waiting for some IO to complete.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Valdis Kletnieks \u003cValdis.Kletnieks@vt.edu\u003e\nTested-by: Zlatko Calusic \u003czcalusic@bitsync.net\u003e\nCc: dormando \u003cdormando@rydia.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d43006d503ac921c7df4f94d13c17db6f13c9d26", "tree": "3adf95869d1821cd5360c81dca790b3203608555", "parents": [ "9aa41348a8d11427feec350b21dcdd4330fd20c4" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Jul 03 15:01:50 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:28 2013 -0700" }, "message": "mm: vmscan: have kswapd writeback pages based on dirty pages encountered, not priority\n\nCurrently kswapd queues dirty pages for writeback if scanning at an\nelevated priority but the priority kswapd scans at is not related to the\nnumber of unqueued dirty encountered. Since commit \"mm: vmscan: Flatten\nkswapd priority loop\", the priority is related to the size of the LRU\nand the zone watermark which is no indication as to whether kswapd\nshould write pages or not.\n\nThis patch tracks if an excessive number of unqueued dirty pages are\nbeing encountered at the end of the LRU. If so, it indicates that dirty\npages are being recycled before flusher threads can clean them and flags\nthe zone so that kswapd will start writing pages until the zone is\nbalanced.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Valdis Kletnieks \u003cValdis.Kletnieks@vt.edu\u003e\nTested-by: Zlatko Calusic \u003czcalusic@bitsync.net\u003e\nCc: dormando \u003cdormando@rydia.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ffbdccf5e1facd18b54429a749667fb185c10f20", "tree": "b3c8cf7399bb6493568d02bce307dce45b4ea9d7", "parents": [ "541c237c0923f567c9c4cabb8a81635baadc713f" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Jul 03 15:01:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:26 2013 -0700" }, "message": "mm, memcg: don\u0027t take task_lock in task_in_mem_cgroup\n\nFor processes that have detached their mm\u0027s, task_in_mem_cgroup()\nunnecessarily takes task_lock() when rcu_read_lock() is all that is\nnecessary to call mem_cgroup_from_task().\n\nWhile we\u0027re here, switch task_in_mem_cgroup() to return bool.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0f8975ec4db2c8b5bd111b211292ca9be0feb6b8", "tree": "47bb0acc9fc3e783ad9cf33097a6636190f5e42b", "parents": [ "2b0a9f017548f05e42fbf7e67c4a626c1ebd5e12" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Wed Jul 03 15:01:20 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:26 2013 -0700" }, "message": "mm: soft-dirty bits for user memory changes tracking\n\nThe soft-dirty is a bit on a PTE which helps to track which pages a task\nwrites to. In order to do this tracking one should\n\n 1. Clear soft-dirty bits from PTEs (\"echo 4 \u003e /proc/PID/clear_refs)\n 2. Wait some time.\n 3. Read soft-dirty bits (55\u0027th in /proc/PID/pagemap2 entries)\n\nTo do this tracking, the writable bit is cleared from PTEs when the\nsoft-dirty bit is. Thus, after this, when the task tries to modify a\npage at some virtual address the #PF occurs and the kernel sets the\nsoft-dirty bit on the respective PTE.\n\nNote, that although all the task\u0027s address space is marked as r/o after\nthe soft-dirty bits clear, the #PF-s that occur after that are processed\nfast. This is so, since the pages are still mapped to physical memory,\nand thus all the kernel does is finds this fact out and puts back\nwritable, dirty and soft-dirty bits on the PTE.\n\nAnother thing to note, is that when mremap moves PTEs they are marked\nwith soft-dirty as well, since from the user perspective mremap modifies\nthe virtual memory at mremap\u0027s new address.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Xiao Guangrong \u003cxiaoguangrong@linux.vnet.ibm.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c846ef7deba2d4f75138cf6a4b137b7e0e7659af", "tree": "58785c1483290e6649e2d4324d4acac16ddaf41e", "parents": [ "1873e50028ce87dd9014049c86d71a898fa02166" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Jul 03 15:00:41 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:07:22 2013 -0700" }, "message": "include/linux/smp.h:on_each_cpu(): switch back to a macro\n\nCommit f21afc25f9ed (\"smp.h: Use local_irq_{save,restore}() in !SMP\nversion of on_each_cpu()\") converted on_each_cpu() to a C function.\n\nThis required inclusion of irqflags.h, which broke ia64 and mn10300 (at\nleast) due to header ordering hell.\n\nSwitch on_each_cpu() back to a macro to fix this.\n\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.10.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f991fae5c6d42dfc5029150b05a78cf3f6c18cc9", "tree": "d140deb437bde0631778b4984eeb72c1f4ee0c1d", "parents": [ "d4141531f63a29bb2a980092b6f2828c385e6edd", "2c843bd92ec276ecb68504b3b5ffa7066183f032" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 14:35:40 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 14:35:40 2013 -0700" }, "message": "Merge tag \u0027pm+acpi-3.11-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management and ACPI updates from Rafael Wysocki:\n \"This time the total number of ACPI commits is slightly greater than\n the number of cpufreq commits, but Viresh Kumar (who works on cpufreq)\n remains the most active patch submitter.\n\n To me, the most significant change is the addition of offline/online\n device operations to the driver core (with the Greg\u0027s blessing) and\n the related modifications of the ACPI core hotplug code. Next are the\n freezer updates from Colin Cross that should make the freezing of\n tasks a bit less heavy weight.\n\n We also have a couple of regression fixes, a number of fixes for\n issues that have not been identified as regressions, two new drivers\n and a bunch of cleanups all over.\n\n Highlights:\n\n - Hotplug changes to support graceful hot-removal failures.\n\n It sometimes is necessary to fail device hot-removal operations\n gracefully if they cannot be carried out completely. For example,\n if memory from a memory module being hot-removed has been allocated\n for the kernel\u0027s own use and cannot be moved elsewhere, it\u0027s\n desirable to fail the hot-removal operation in a graceful way\n rather than to crash the kernel, but currenty a success or a kernel\n crash are the only possible outcomes of an attempted memory\n hot-removal. Needless to say, that is not a very attractive\n alternative and it had to be addressed.\n\n However, in order to make it work for memory, I first had to make\n it work for CPUs and for this purpose I needed to modify the ACPI\n processor driver. It\u0027s been split into two parts, a resident one\n handling the low-level initialization/cleanup and a modular one\n playing the actual driver\u0027s role (but it binds to the CPU system\n device objects rather than to the ACPI device objects representing\n processors). That\u0027s been sort of like a live brain surgery on a\n patient who\u0027s riding a bike.\n\n So this is a little scary, but since we found and fixed a couple of\n regressions it caused to happen during the early linux-next testing\n (a month ago), nobody has complained.\n\n As a bonus we remove some duplicated ACPI hotplug code, because the\n ACPI-based CPU hotplug is now going to use the common ACPI hotplug\n code.\n\n - Lighter weight freezing of tasks.\n\n These changes from Colin Cross and Mandeep Singh Baines are\n targeted at making the freezing of tasks a bit less heavy weight\n operation. They reduce the number of tasks woken up every time\n during the freezing, by using the observation that the freezer\n simply doesn\u0027t need to wake up some of them and wait for them all\n to call refrigerator(). The time needed for the freezer to decide\n to report a failure is reduced too.\n\n Also reintroduced is the check causing a lockdep warining to\n trigger when try_to_freeze() is called with locks held (which is\n generally unsafe and shouldn\u0027t happen).\n\n - cpufreq updates\n\n First off, a commit from Srivatsa S Bhat fixes a resume regression\n introduced during the 3.10 cycle causing some cpufreq sysfs\n attributes to return wrong values to user space after resume. The\n fix is kind of fresh, but also it\u0027s pretty obvious once Srivatsa\n has identified the root cause.\n\n Second, we have a new freqdomain_cpus sysfs attribute for the\n acpi-cpufreq driver to provide information previously available via\n related_cpus. From Lan Tianyu.\n\n Finally, we fix a number of issues, mostly related to the\n CPUFREQ_POSTCHANGE notifier and cpufreq Kconfig options and clean\n up some code. The majority of changes from Viresh Kumar with bits\n from Jacob Shin, Heiko Stübner, Xiaoguang Chen, Ezequiel Garcia,\n Arnd Bergmann, and Tang Yuantian.\n\n - ACPICA update\n\n A usual bunch of updates from the ACPICA upstream.\n\n During the 3.4 cycle we introduced support for ACPI 5 extended\n sleep registers, but they are only supposed to be used if the\n HW-reduced mode bit is set in the FADT flags and the code attempted\n to use them without checking that bit. That caused suspend/resume\n regressions to happen on some systems. Fix from Lv Zheng causes\n those registers to be used only if the HW-reduced mode bit is set.\n\n Apart from this some other ACPICA bugs are fixed and code cleanups\n are made by Bob Moore, Tomasz Nowicki, Lv Zheng, Chao Guan, and\n Zhang Rui.\n\n - cpuidle updates\n\n New driver for Xilinx Zynq processors is added by Michal Simek.\n\n Multidriver support simplification, addition of some missing\n kerneldoc comments and Kconfig-related fixes come from Daniel\n Lezcano.\n\n - ACPI power management updates\n\n Changes to make suspend/resume work correctly in Xen guests from\n Konrad Rzeszutek Wilk, sparse warning fix from Fengguang Wu and\n cleanups and fixes of the ACPI device power state selection\n routine.\n\n - ACPI documentation updates\n\n Some previously missing pieces of ACPI documentation are added by\n Lv Zheng and Aaron Lu (hopefully, that will help people to\n uderstand how the ACPI subsystem works) and one outdated doc is\n updated by Hanjun Guo.\n\n - Assorted ACPI updates\n\n We finally nailed down the IA-64 issue that was the reason for\n reverting commit 9f29ab11ddbf (\"ACPI / scan: do not match drivers\n against objects having scan handlers\"), so we can fix it and move\n the ACPI scan handler check added to the ACPI video driver back to\n the core.\n\n A mechanism for adding CMOS RTC address space handlers is\n introduced by Lan Tianyu to allow some EC-related breakage to be\n fixed on some systems.\n\n A spec-compliant implementation of acpi_os_get_timer() is added by\n Mika Westerberg.\n\n The evaluation of _STA is added to do_acpi_find_child() to avoid\n situations in which a pointer to a disabled device object is\n returned instead of an enabled one with the same _ADR value. From\n Jeff Wu.\n\n Intel BayTrail PCH (Platform Controller Hub) support is added to\n the ACPI driver for Intel Low-Power Subsystems (LPSS) and that\n driver is modified to work around a couple of known BIOS issues.\n Changes from Mika Westerberg and Heikki Krogerus.\n\n The EC driver is fixed by Vasiliy Kulikov to use get_user() and\n put_user() instead of dereferencing user space pointers blindly.\n\n Code cleanups are made by Bjorn Helgaas, Nicholas Mazzuca and Toshi\n Kani.\n\n - Assorted power management updates\n\n The \"runtime idle\" helper routine is changed to take the return\n values of the callbacks executed by it into account and to call\n rpm_suspend() if they return 0, which allows us to reduce the\n overall code bloat a bit (by dropping some code that\u0027s not\n necessary any more after that modification).\n\n The runtime PM documentation is updated by Alan Stern (to reflect\n the \"runtime idle\" behavior change).\n\n New trace points for PM QoS are added by Sahara\n (\u003ckeun-o.park@windriver.com\u003e).\n\n PM QoS documentation is updated by Lan Tianyu.\n\n Code cleanups are made and minor issues are addressed by Bernie\n Thompson, Bjorn Helgaas, Julius Werner, and Shuah Khan.\n\n - devfreq updates\n\n New driver for the Exynos5-bus device from Abhilash Kesavan.\n\n Minor cleanups, fixes and MAINTAINERS update from MyungJoo Ham,\n Abhilash Kesavan, Paul Bolle, Rajagopal Venkat, and Wei Yongjun.\n\n - OMAP power management updates\n\n Adaptive Voltage Scaling (AVS) SmartReflex voltage control driver\n updates from Andrii Tseglytskyi and Nishanth Menon.\"\n\n* tag \u0027pm+acpi-3.11-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (162 commits)\n cpufreq: Fix cpufreq regression after suspend/resume\n ACPI / PM: Fix possible NULL pointer deref in acpi_pm_device_sleep_state()\n PM / Sleep: Warn about system time after resume with pm_trace\n cpufreq: don\u0027t leave stale policy pointer in cdbs-\u003ecur_policy\n acpi-cpufreq: Add new sysfs attribute freqdomain_cpus\n cpufreq: make sure frequency transitions are serialized\n ACPI: implement acpi_os_get_timer() according the spec\n ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan\n ACPI: Add CMOS RTC Operation Region handler support\n ACPI / processor: Drop unused variable from processor_perflib.c\n cpufreq: tegra: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: s3c64xx: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: omap: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: imx6q: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: exynos: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: dbx500: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: davinci: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: arm-big-little: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: powernow-k8: call CPUFREQ_POSTCHANGE notfier in error cases\n cpufreq: pcc: call CPUFREQ_POSTCHANGE notfier in error cases\n ...\n" }, { "commit": "f39d420f672f99ad9a0fe7deb951a0030d4f0d9e", "tree": "450e229a4305362f72cc5461aab8af4f2f5d023e", "parents": [ "fe489bf4505ae26d3c6d6a1f1d3064c2a9c5cd85", "572e5b018ba68d634f30aef71cf04d85c884aa05" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 14:04:58 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 14:04:58 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates from James Morris:\n \"In this update, Smack learns to love IPv6 and to mount a filesystem\n with a transmutable hierarchy (i.e. security labels are inherited\n from parent directory upon creation rather than creating process).\n\n The rest of the changes are maintenance\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (37 commits)\n tpm/tpm_i2c_infineon: Remove unused header file\n tpm: tpm_i2c_infinion: Don\u0027t modify i2c_client-\u003edriver\n evm: audit integrity metadata failures\n integrity: move integrity_audit_msg()\n evm: calculate HMAC after initializing posix acl on tmpfs\n maintainers: add Dmitry Kasatkin\n Smack: Fix the bug smackcipso can\u0027t set CIPSO correctly\n Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()\n Smack: Add smkfstransmute mount option\n Smack: Improve access check performance\n Smack: Local IPv6 port based controls\n tpm: fix regression caused by section type conflict of tpm_dev_release() in ppc builds\n maintainers: Remove Kent from maintainers\n tpm: move TPM_DIGEST_SIZE defintion\n tpm_tis: missing platform_driver_unregister() on error in init_tis()\n security: clarify cap_inode_getsecctx description\n apparmor: no need to delay vfree()\n apparmor: fix fully qualified name parsing\n apparmor: fix setprocattr arg processing for onexec\n apparmor: localize getting the security context to a few macros\n ...\n" }, { "commit": "fe489bf4505ae26d3c6d6a1f1d3064c2a9c5cd85", "tree": "46596fd7edf7c4da1dafdb2c62011841e71cf32d", "parents": [ "3e34131a65127e73fbae68c82748f32c8af7e4a4", "a3ff5fbc94a829680d4aa005cd17add1c1a1fb5b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:21:40 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:21:40 2013 -0700" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM fixes from Paolo Bonzini:\n \"On the x86 side, there are some optimizations and documentation\n updates. The big ARM/KVM change for 3.11, support for AArch64, will\n come through Catalin Marinas\u0027s tree. s390 and PPC have misc cleanups\n and bugfixes\"\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (87 commits)\n KVM: PPC: Ignore PIR writes\n KVM: PPC: Book3S PR: Invalidate SLB entries properly\n KVM: PPC: Book3S PR: Allow guest to use 1TB segments\n KVM: PPC: Book3S PR: Don\u0027t keep scanning HPTEG after we find a match\n KVM: PPC: Book3S PR: Fix invalidation of SLB entry 0 on guest entry\n KVM: PPC: Book3S PR: Fix proto-VSID calculations\n KVM: PPC: Guard doorbell exception with CONFIG_PPC_DOORBELL\n KVM: Fix RTC interrupt coalescing tracking\n kvm: Add a tracepoint write_tsc_offset\n KVM: MMU: Inform users of mmio generation wraparound\n KVM: MMU: document fast invalidate all mmio sptes\n KVM: MMU: document fast invalidate all pages\n KVM: MMU: document fast page fault\n KVM: MMU: document mmio page fault\n KVM: MMU: document write_flooding_count\n KVM: MMU: document clear_spte_count\n KVM: MMU: drop kvm_mmu_zap_mmio_sptes\n KVM: MMU: init kvm generation close to mmio wrap-around value\n KVM: MMU: add tracepoint for check_mmio_spte\n KVM: MMU: fast invalidate all mmio sptes\n ...\n" }, { "commit": "3e34131a65127e73fbae68c82748f32c8af7e4a4", "tree": "2e404beb5a99b3434e460c45539254149d80a178", "parents": [ "f3acb96f38bb16057e98f862e70e56ca3588ef54", "0b0c002c340e78173789f8afaa508070d838cf3d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:12:42 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:12:42 2013 -0700" }, "message": "Merge tag \u0027stable/for-linus-3.11-rc0-tag-two\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\nPull Xen bugfixes from Konrad Rzeszutek Wilk:\n - Fix memory leak when CPU hotplugging.\n - Compile bugs with various #ifdefs\n - Fix state changes in Xen PCI front not dealing well with new\n toolstack.\n - Cleanups in code (use pr_*, fix 80 characters splits, etc)\n - Long standing bug in double-reporting the steal time\n\n* tag \u0027stable/for-linus-3.11-rc0-tag-two\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/time: remove blocked time accounting from xen \"clockchip\"\n xen: Convert printks to pr_\u003clevel\u003e\n xen: ifdef CONFIG_HIBERNATE_CALLBACKS xen_*_suspend\n xen/pcifront: Deal with toolstack missing \u0027XenbusStateClosing\u0027 state.\n xen/time: Free onlined per-cpu data structure if we want to online it again.\n xen/time: Check that the per_cpu data structure has data before freeing.\n xen/time: Don\u0027t leak interrupt name when offlining.\n xen/time: Encapsulate the struct clock_event_device in another structure.\n xen/spinlock: Don\u0027t leak interrupt name when offlining.\n xen/smp: Don\u0027t leak interrupt name when offlining.\n xen/smp: Set the per-cpu IRQ number to a valid default.\n xen/smp: Introduce a common structure to contain the IRQ name and interrupt line.\n xen/smp: Coalesce the free_irq calls in one function.\n xen-pciback: fix error return code in pcistub_irq_handler_switch()\n" }, { "commit": "baa6f8209312f9734434b89c12497774eea1cbe1", "tree": "9cddd941d7cb829c2baf2df6980e2410e866d604", "parents": [ "76f7a102c0290d3e24703b6cd3716d5a594d6173", "06df44ee41442d83be061c5fd1b1de4f5fc6fbbf", "b3087e48ce20be784fae1dbabc2e42e2ad0f21bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:09:06 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:09:06 2013 -0700" }, "message": "Merge tags \u0027modules-next-for-linus\u0027 and \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull trivial module and virtio fixes from Rusty Russell.\n\nApparently these were meant for 3.10, but came in after the release.\n\n* tag \u0027modules-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:\n modpost.c: Add .text.unlikely to TEXT_SECTIONS\n\n* tag \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:\n virtio: remove virtqueue_add_buf().\n lguest: rename i386_head.S\n virtio_blk: Add missing \u0027static\u0027 qualifiers\n virtio: console: Add emergency writeonly register to config space\n virtio_pci: better macro exported in uapi\n" }, { "commit": "76f7a102c0290d3e24703b6cd3716d5a594d6173", "tree": "93c1558d63f217bd48c5accc7347bab4b5526904", "parents": [ "92295f632cefbdf15d46e9ac5f0fc3cfade35259", "70083c4c8c60d9ddc188f51e0960574badc919af" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:56:38 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:56:38 2013 -0700" }, "message": "Merge tag \u0027regulator-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator updates from Mark Brown:\n \"Very quiet release here, as well as the usual driver specific updates\n only a couple of new things:\n\n - New drivers for TI ABB LDOs and MAX77693 PMICs\n - Support for enabling bypass mode support via device tree\"\n\n* tag \u0027regulator-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (23 commits)\n regulator: max77693: Remove NULL test for rmatch[i].init_data\n regulator: max77693: Fix trivial typo\n regulator: ab8500-ext: Staticize local symbols\n regulator: max77693: Add max77693 regualtor driver.\n regulator: max8973: fix a typo in documentation\n regulator: max8973: initial DT support\n regulators: max8973: fix multiple instance support\n regulator: of: Added a property to indicate bypass mode support\n regulator: ti-abb: Convert to use devm_ioremap_resource\n regulator: tps62360: Fix crash in i2c_driver .probe\n regulator: ab8500: Provide supply names for the AUX regulators\n regulator: ab8500-ext: Enable for Device Tree\n regulator: ab8500-ext: Register as a device in its own right\n regulator: ab8500-ext: Provide a set_voltage call-back operation\n regulator: ab8500: Ensure AB8500 external registers are probed first\n regulator: core: add regulator_get_linear_step()\n regulator: lp397x: use devm_kzalloc() to make cleanup paths simpler\n regulator: lp872x: support the device tree feature\n regulator: Remove unnecessary include of linux/delay.h from regulator drivers\n regulator: isl6271a: Use NULL instead of 0\n ...\n" }, { "commit": "92295f632cefbdf15d46e9ac5f0fc3cfade35259", "tree": "5b3820d4ed135ccbef540781d99a46137959bbb6", "parents": [ "750b2d7b93f2ba19f4f238cc641bda22fe07c155", "45e3ec3784aec0d194740b75b547bfabca448ff3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:54:50 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:54:50 2013 -0700" }, "message": "Merge tag \u0027clk-for-linus-3.11\u0027 of git://git.linaro.org/people/mturquette/linux\n\nPull clock framework updates from Mike Turquette:\n \"The common clock framework changes for 3.11 include new clock drivers\n across several different platforms and architectures, fixes to\n existing drivers, a MAINTAINERS file fix and improvements to the basic\n clock types that allow them to be of use to more platforms than before.\n\n Only a few fixes to the core framework are included with most all of\n the changes landing in the various clock drivers themselves.\"\n\n* tag \u0027clk-for-linus-3.11\u0027 of git://git.linaro.org/people/mturquette/linux: (55 commits)\n clk: tegra: fix ifdef for tegra_periph_reset_assert inline\n clk: tegra: provide tegra_periph_reset_assert alternative\n clk: exynos4: Fix clock aliases for cpufreq related clocks\n clk: samsung: Add MUX_FA macro to pass flag and alias\n clk: add support for Rockchip gate clocks\n clk: vexpress: Make the clock drivers directly available for arm64\n clk: vexpress: Use full node name to identify individual clocks\n clk: tegra: T114: add DFLL DVCO reset control\n clk: tegra: T114: add DFLL source clocks\n clk: tegra: T114: add FCPU clock shaper programming, needed by the DFLL\n clk: gate: add CLK_GATE_HIWORD_MASK\n clk: divider: add CLK_DIVIDER_HIWORD_MASK flag\n clk: mux: add CLK_MUX_HIWORD_MASK\n clk: Always notify whole subtree when reparenting\n MAINTAINERS: make drivers/clk entry match subdirs\n clk: honor CLK_GET_RATE_NOCACHE in clk_set_rate\n clk: use clk_get_rate() for debugfs\n clk: tegra: Use override bits when needed\n clk: tegra: override bits for Tegra30 PLLM\n clk: tegra: override bits for Tegra114 PLLM\n ...\n" }, { "commit": "750b2d7b93f2ba19f4f238cc641bda22fe07c155", "tree": "bfef33ef5444ac2ac78c61e47baa7a5d19916214", "parents": [ "3dbde57ad941c55345fd7fac0ee3f70f204b02d8", "ed893559c9799df3b32051871c22017151394d82" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:51:05 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:51:05 2013 -0700" }, "message": "Merge tag \u0027spi-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi\n\nPull spi updates from Mark Brown:\n \"A fairly quiet release for the SPI subsystem, the standout changes\n being:\n\n - Core support for implementing bits per word constraints implemented\n by Stephen Warren, factoring some code out of drivers.\n\n - Addition of polling mode support for the s3c64xx driver as some\n newer Exynos systems have taken the unusual step of removing\n interrupt support.\n\n - Use of the in-IP FIFO and generic dmaengine support for the OMAP2\n driver, providing improved performance.\n\n - Conversion of the mpc512x driver to use the core message queue\n infrastructure.\n\n The nicest thing being that all the factoring out into common code\n leads to a negative diffstat overall.\"\n\n* tag \u0027spi-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (42 commits)\n spi/s3c64xx: Rely on the compiler eliminating the OF ID table\n spi: s3c64xx: Added support for exynos5440 spi\n spi: s3c64xx: Added provision for dedicated cs pin\n spi: omap2-mcspi: add generic DMA request support to the DT binding\n spi: omap2-mcspi: convert to dma_request_slave_channel_compat()\n spi/s3c64xx: Make wait_for_timeout() function name less generic\n spi: s3c64xx: added support for polling mode\n spi: omap2-mcspi: Add FIFO buffer support\n spi: omap2-mcspi: Move bytes per word calculation to the function\n spi: spi-xilinx: cleanup a check in xilinx_spi_txrx_bufs()\n spi: spi-nuc900: Remove redundant platform_set_drvdata()\n spi: spi-fsl-lib: Make mpc8xxx_spi_work static\n spi: spi-topcliff-pch: Fix sparse warnings\n spi: spi-xilinx: Remove redundant platform_set_drvdata()\n spi: spi-xilinx: Add run run-time endian detection\n spi: mpc512x: use the SPI subsystem\u0027s message queue\n spi: mpc512x: improve throughput in the RX/TX func\n spi: mpc512x: minor prep before feature change\n spi: atmel: convert to dma_request_slave_channel_compat()\n spi: sirf: avoid uninitialized-use warning\n ...\n" }, { "commit": "3dbde57ad941c55345fd7fac0ee3f70f204b02d8", "tree": "237c6de64d05da3f61b9ac1724e37a5c1f014b71", "parents": [ "a6e6d863cf68bba886acfe47dbdc8f245cce588f", "2207a4e1ca6a1bb126360b6d0c236af6664532f2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:48:03 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:48:03 2013 -0700" }, "message": "Merge tag \u0027pinctrl-for-v3.11-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pin control changes from Linus Walleij:\n\n - A large slew of improvements of the Genric pin configuration support,\n and deployment in four different platforms: Rockchip, Super-H PFC,\n ABx500 and TZ1090. Support BIAS_BUS_HOLD, get device tree parsing\n and debugfs support into shape.\n\n - We also have device tree support with generic naming conventions for\n the generic pin configuration.\n\n - Delete the unused and confusing direct pinconf API. Now state\n transitions is *the* way to control pins and multiplexing.\n\n - New drivers for Rockchip, TZ1090, and TZ1090 PDC.\n\n - Two pin control states related to power management are now handled in\n the device core: \"sleep\" and \"idle\", removing a lot of boilerplate\n code in drivers. We do not yet know if this is the final word for\n pin PM, but it already make things a lot easier to handle.\n\n - Handle sparse GPIO ranges passing a list of disparate pins, and\n utilize these in the new BayTrail (x86 Atom SoC) driver.\n\n - Make the sunxi (AllWinner) driver handle external interrupts.\n\n - Make it possible for pinctrl-single to handle the case where several\n pins are managed by a single register, and augment it to handle sleep\n modes.\n\n - Cleanups and improvements for the abx500 drivers.\n\n - Move Sirf pin control drivers to their own directory, support\n save/restore of context and add support for the SiRFatlas6 SoC.\n\n - PMU muxing for the Dove pinctrl driver.\n\n - Finalization and support for VF610 in the i.MX6 pinctrl driver.\n\n - Smoothen out various Exynos rough edges.\n\n - Generic cleanups of various kinds.\n\n* tag \u0027pinctrl-for-v3.11-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (82 commits)\n pinctrl: vt8500: wmt: remove redundant dev_err call in wmt_pinctrl_probe()\n pinctrl: remove bindings for pinconf options needing more thought\n pinctrl: remove slew-rate parameter from tz1090\n pinctrl: set unit for debounce time pinconfig to usec\n pinctrl: more clarifications for generic pull configs\n pinctrl: rip out the direct pinconf API\n pinctrl-tz1090-pdc: add TZ1090 PDC pinctrl driver\n pinctrl-tz1090: add TZ1090 pinctrl driver\n pinctrl: samsung: Staticize drvdata_list\n pinctrl: rockchip: Add missing irq_gc_unlock() call before return error\n pinctrl: abx500: rework error path\n pinctrl: abx500: suppress hardcoded value\n pinctrl: abx500: factorize code\n pinctrl: abx500: fix abx500_gpio_get()\n pinctrl: abx500: fix abx500_pin_config_set()\n pinctrl: abx500: Add device tree support\n sh-pfc: Guard DT parsing with #ifdef CONFIG_OF\n pinctrl: add Intel BayTrail GPIO/pinctrl support\n pinctrl: fix pinconf_ops::pin_config_dbg_parse_modify kerneldoc\n pinctrl: Staticize local symbols\n ...\n\nConflicts:\n\tdrivers/net/ethernet/ti/davinci_mdio.c\n\tdrivers/pinctrl/Makefile\n" }, { "commit": "a6e6d863cf68bba886acfe47dbdc8f245cce588f", "tree": "cf6a408da597c5e39def6a28c38d117c5899eef8", "parents": [ "60b5adffb4f3e4b4c1978959f24e8e531b2ef3cb", "7bc8c4c37aea74332b16ffb5412a8ad355d508ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:40:58 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:40:58 2013 -0700" }, "message": "Merge tag \u0027regmap-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull regmap updates from Mark Brown:\n \"A small but useful set of regmap updates this time around:\n\n - An abstraction for bitfields within a register map contributed by\n Srinivas Kandagatla, allowing drivers to cope more easily when\n hardware designers randomly move things about (mainly when talking\n to things like system controllers).\n\n - Changes from Lars-Peter Clausen to allow the MMIO regmap to be used\n from hard IRQ context.\n\n - Small improvements to the cache infrastructure and performance,\n including a default cache sync operation so now all regmaps can\n sync easily.\n\n There\u0027s also a pinctrl driver making use of the new bitfield API,\n merged here for dependency reasons. There will be a simple add/add\n conflict with the pinctrl tree as a result.\"\n\n* tag \u0027regmap-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:\n pinctrl: st: Remove unnecessary use of of_match_ptr macro\n pinctrl: st: fix return value check\n pinctrl: st: Add pinctrl and pinconf support.\n regmap: debugfs: Suppress cache for partial register files\n regmap: Add regmap_field APIs\n regmap: core: Cache all registers by default when cache is enabled\n regmap: Implemented default cache sync operation\n regmap: Make regmap-mmio usable from atomic contexts\n regmap: regcache: Fixup locking for custom lock callbacks\n regmap: debugfs: Fix return from regmap_debugfs_get_dump_start\n regmap: debugfs: Don\u0027t mark lockdep as broken due to debugfs write\n regmap: rbtree: Use range information to allocate nodes\n regmap: rbtree: Factor out node allocation\n regmap: Make regmap_check_range_table() a public API\n regmap: Add support for discarding parts of the register cache\n" }, { "commit": "c1101cbc7db316dcdc94d344727fd372622d0ce7", "tree": "f1d8946a404bbf7508408a8a76f9c1b7fe672498", "parents": [ "1873e50028ce87dd9014049c86d71a898fa02166", "5ea34a01423a27d4526f3551e8542f2f991bd4a0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:08:24 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 11:08:24 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 updates from Martin Schwidefsky:\n \"This is the bulk of the s390 patches for the 3.11 merge window.\n\n Notable enhancements are: the block timeout patches for dasd from\n Hannes, and more work on the PCI support front. In addition some\n cleanup and the usual bug fixing.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)\n s390/dasd: Fail all requests when DASD_FLAG_ABORTIO is set\n s390/dasd: Add \u0027timeout\u0027 attribute\n block: check for timeout function in blk_rq_timed_out()\n block/dasd: detailed I/O errors\n s390/dasd: Reduce amount of messages for specific errors\n s390/dasd: Implement block timeout handling\n s390/dasd: process all requests in the device tasklet\n s390/dasd: make number of retries configurable\n s390/dasd: Clarify comment\n s390/hwsampler: Updated misleading member names in hws_data_entry\n s390/appldata_net_sum: do not use static data\n s390/appldata_mem: do not use static data\n s390/vmwatchdog: do not use static data\n s390/airq: simplify adapter interrupt code\n s390/pci: remove per device debug attribute\n s390/dma: remove gratuitous brackets\n s390/facility: decompose test_facility()\n s390/sclp: remove duplicated include from sclp_ctl.c\n s390/irq: store interrupt information in pt_regs\n s390/drivers: Cocci spatch \"ptr_ret.spatch\"\n ...\n" }, { "commit": "1873e50028ce87dd9014049c86d71a898fa02166", "tree": "046d37339278c3b88f0c248e9e6ff5fed804fe62", "parents": [ "fb2af0020a51709ad87ea8055c325d3fbde04158", "aa729dccb5e8dfbc78e2e235b8754d6acccee731" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 10:31:38 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 10:31:38 2013 -0700" }, "message": "Merge tag \u0027arm64-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64\n\nPull ARM64 updates from Catalin Marinas:\n \"Main features:\n - KVM and Xen ports to AArch64\n - Hugetlbfs and transparent huge pages support for arm64\n - Applied Micro X-Gene Kconfig entry and dts file\n - Cache flushing improvements\n\n For arm64 huge pages support, there are x86 changes moving part of\n arch/x86/mm/hugetlbpage.c into mm/hugetlb.c to be re-used by arm64\"\n\n* tag \u0027arm64-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (66 commits)\n arm64: Add initial DTS for APM X-Gene Storm SOC and APM Mustang board\n arm64: Add defines for APM ARMv8 implementation\n arm64: Enable APM X-Gene SOC family in the defconfig\n arm64: Add Kconfig option for APM X-Gene SOC family\n arm64/Makefile: provide vdso_install target\n ARM64: mm: THP support.\n ARM64: mm: Raise MAX_ORDER for 64KB pages and THP.\n ARM64: mm: HugeTLB support.\n ARM64: mm: Move PTE_PROT_NONE bit.\n ARM64: mm: Make PAGE_NONE pages read only and no-execute.\n ARM64: mm: Restore memblock limit when map_mem finished.\n mm: thp: Correct the HPAGE_PMD_ORDER check.\n x86: mm: Remove general hugetlb code from x86.\n mm: hugetlb: Copy general hugetlb code from x86 to mm.\n x86: mm: Remove x86 version of huge_pmd_share.\n mm: hugetlb: Copy huge_pmd_share from x86 to mm.\n arm64: KVM: document kernel object mappings in HYP\n arm64: KVM: MAINTAINERS update\n arm64: KVM: userspace API documentation\n arm64: KVM: enable initialization of a 32bit vcpu\n ...\n" }, { "commit": "fb2af0020a51709ad87ea8055c325d3fbde04158", "tree": "88f3bc38d5604c6eed00597873f209726f9aaeb5", "parents": [ "790eac5640abf7a57fa3a644386df330e18c11b0", "3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 09:46:29 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 09:46:29 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM updates from Russell King:\n \"This contains the usual updates from other people (listed below) and\n the usual random muddle of miscellaneous ARM updates which cover some\n low priority bug fixes and performance improvements.\n\n I\u0027ve started to put the pull request wording into the merge commits,\n which are:\n\n - NoMMU stuff:\n\n This includes the following series sent earlier to the list:\n - nommu-fixes\n - R7 Support\n - MPU support\n\n I\u0027ve left out the ARCH_MULTIPLATFORM/!MMU stuff that Arnd and I\n were discussing today until we\u0027ve reached a conclusion/that\u0027s had\n some more review.\n\n This is rebased (and re-tested) on your devel-stable branch because\n otherwise there were going to be conflicts with Uwe\u0027s V7M work now\n that you\u0027ve merged that. I\u0027ve included the fix for limiting MPU to\n CPU_V7.\n\n - Huge page support\n\n These changes bring both HugeTLB support and Transparent HugePage\n (THP) support to ARM. Only long descriptors (LPAE) are supported\n in this series.\n\n The code has been tested on an Arndale board (Exynos 5250).\n\n - LPAE updates\n\n Please pull these miscellaneous LPAE fixes I\u0027ve been collecting for\n a while now for 3.11. They\u0027ve been tested and reviewed by quite a\n few people, and most of the patches are pretty trivial. -- Will Deacon.\n\n - arch_timer cleanups\n\n Please pull these arch_timer cleanups I\u0027ve been holding onto for a\n while. They\u0027re the same as my last posting, but have been rebased\n to v3.10-rc3.\n\n - mpidr linearisation (multiprocessor id register - identifies which\n CPU number we are in the system)\n\n This patch series that implements MPIDR linearization through a\n simple hashing algorithm and updates current cpu_{suspend}/{resume}\n code to use the newly created hash structures to retrieve context\n pointers. It represents a stepping stone for the implementation of\n power management code on forthcoming multi-cluster ARM systems.\n\n It has been tested on TC2 (dual cluster A15xA7 system), iMX6q,\n OMAP4 and Tegra, with processors hitting low-power states requiring\n warm-boot resume through the cpu_resume code path\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (77 commits)\n ARM: 7775/1: mm: Remove do_sect_fault from LPAE code\n ARM: 7777/1: Avoid extra calls to the C compiler\n ARM: 7774/1: Fix dtb dependency to use order-only prerequisites\n ARM: 7770/1: remove residual ARMv2 support from decompressor\n ARM: 7769/1: Cortex-A15: fix erratum 798181 implementation\n ARM: 7768/1: prevent risks of out-of-bound access in ASID allocator\n ARM: 7767/1: let the ASID allocator handle suspended animation\n ARM: 7766/1: versatile: don\u0027t mark pen as __INIT\n ARM: 7765/1: perf: Record the user-mode PC in the call chain.\n ARM: 7735/2: Preserve the user r/w register TPIDRURW on context switch and fork\n ARM: kernel: implement stack pointer save array through MPIDR hashing\n ARM: kernel: build MPIDR hash function data structure\n ARM: mpu: Ensure that MPU depends on CPU_V7\n ARM: mpu: protect the vectors page with an MPU region\n ARM: mpu: Allow enabling of the MPU via kconfig\n ARM: 7758/1: introduce config HAS_BANDGAP\n ARM: 7757/1: mm: don\u0027t flush icache in switch_mm with hardware broadcasting\n ARM: 7751/1: zImage: don\u0027t overwrite ourself with a page table\n ARM: 7749/1: spinlock: retry trylock operation if strex fails on free lock\n ARM: 7748/1: oabi: handle faults when loading swi instruction from userspace\n ...\n" }, { "commit": "790eac5640abf7a57fa3a644386df330e18c11b0", "tree": "08de20bde44f59e51b91ff473a71047c2957e8c9", "parents": [ "0b0585c3e192967cb2ef0ac0816eb8a8c8d99840", "48bde8d3620f5f3c6ae9ff599eb404055ae51664" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 09:10:19 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 09:10:19 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull second set of VFS changes from Al Viro:\n \"Assorted f_pos race fixes, making do_splice_direct() safe to call with\n i_mutex on parent, O_TMPFILE support, Jeff\u0027s locks.c series,\n -\u003ed_hash/-\u003ed_compare calling conventions changes from Linus, misc\n stuff all over the place.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)\n Document -\u003etmpfile()\n ext4: -\u003etmpfile() support\n vfs: export lseek_execute() to modules\n lseek_execute() doesn\u0027t need an inode passed to it\n block_dev: switch to fixed_size_llseek()\n cpqphp_sysfs: switch to fixed_size_llseek()\n tile-srom: switch to fixed_size_llseek()\n proc_powerpc: switch to fixed_size_llseek()\n ubi/cdev: switch to fixed_size_llseek()\n pci/proc: switch to fixed_size_llseek()\n isapnp: switch to fixed_size_llseek()\n lpfc: switch to fixed_size_llseek()\n locks: give the blocked_hash its own spinlock\n locks: add a new \"lm_owner_key\" lock operation\n locks: turn the blocked_list into a hashtable\n locks: convert fl_link to a hlist_node\n locks: avoid taking global lock if possible when waking up blocked waiters\n locks: protect most of the file_lock handling with i_lock\n locks: encapsulate the fl_link list handling\n locks: make \"added\" in __posix_lock_file a bool\n ...\n" }, { "commit": "55ccb616a6e42052edb37e9c4f82cf8854a59429", "tree": "9a01858cb1aa6c49dc3baaff5bd513d068b4e22e", "parents": [ "8bb495e3f02401ee6f76d1b1d77f3ac9f079e376" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Jun 28 00:06:42 2013 +0000" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Jul 03 16:16:20 2013 +0200" }, "message": "posix_cpu_timer: consolidate expiry time type\n\nThe posix cpu timer expiry time is stored in a union of two types: a 64\nbits field if we rely on scheduler precise accounting, or a cputime_t if\nwe rely on jiffies.\n\nThis results in quite some duplicate code and special cases to handle the\ntwo types.\n\nJust unify this into a single 64 bits field. cputime_t can always fit\ninto it.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nCc: Olivier Langlois \u003colivier@trillion01.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "46a1c2c7ae53de2a5676754b54a73c591a3951d2", "tree": "1910875cf34a7fe1cd8fd9474d3a5538236fb4f0", "parents": [ "2142914e3eb1168978e842f65cfd182be7582861" ], "author": { "name": "Jie Liu", "email": "jeff.liu@oracle.com", "time": "Tue Jun 25 12:02:13 2013 +0800" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 03 16:23:27 2013 +0400" }, "message": "vfs: export lseek_execute() to modules\n\nFor those file systems(btrfs/ext4/ocfs2/tmpfs) that support\nSEEK_DATA/SEEK_HOLE functions, we end up handling the similar\nmatter in lseek_execute() to update the current file offset\nto the desired offset if it is valid, ceph also does the\nsimliar things at ceph_llseek().\n\nTo reduce the duplications, this patch make lseek_execute()\npublic accessible so that we can call it directly from the\nunderlying file systems.\n\nThanks Dave Chinner for this suggestion.\n\n[AV: call it vfs_setpos(), don\u0027t bring the removed \u0027inode\u0027 argument back]\n\nv2-\u003ev1:\n- Add kernel-doc comments for lseek_execute()\n- Call lseek_execute() in ceph-\u003ellseek()\n\nSigned-off-by: Jie Liu \u003cjeff.liu@oracle.com\u003e\nCc: Dave Chinner \u003cdchinner@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Chris Mason \u003cchris.mason@fusionio.com\u003e\nCc: Josef Bacik \u003cjbacik@fusionio.com\u003e\nCc: Ben Myers \u003cbpm@sgi.com\u003e\nCc: Ted Tso \u003ctytso@mit.edu\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nCc: Sage Weil \u003csage@inktank.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0b0585c3e192967cb2ef0ac0816eb8a8c8d99840", "tree": "9f655158a396623736b8cc94c2a27a2fce4ab644", "parents": [ "b028161fbba178ccd35aa69051c04d7673fe9d80", "c9e5fe66f5947c9e56dfc7655e5b4b127ca2120f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 20:04:25 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 20:04:25 2013 -0700" }, "message": "Merge branch \u0027for-3.11-cpuset\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cpuset changes from Tejun Heo:\n \"cpuset has always been rather odd about its configurations - a cgroup\n right after creation didn\u0027t allow any task executions before\n configuration, changing configuration in the parent modifies the\n descendants irreversibly and so on. These behaviors are inherently\n nasty and almost hostile against sharing the hierarchy with other\n controllers making it very difficult to use in unified hierarchy.\n\n Li is currently in the process of updating the behaviors for\n __DEVEL__sane_behavior which is the bulk of changes in this pull\n request. It isn\u0027t complete yet and the behaviors will change further\n but all changes are gated behind sane_behavior. In the process, the\n rather hairy work-item punting which was used to work around the\n limitations of cgroup descendant iterator was simplified.\"\n\n* \u0027for-3.11-cpuset\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cpuset: rename @cont to @cgrp\n cpuset: fix to migrate mm correctly in a corner case\n cpuset: allow to move tasks to empty cpusets\n cpuset: allow to keep tasks in empty cpusets\n cpuset: introduce effective_{cpumask|nodemask}_cpuset()\n cpuset: record old_mems_allowed in struct cpuset\n cpuset: remove async hotplug propagation work\n cpuset: let hotplug propagation work wait for task attaching\n cpuset: re-structure update_cpumask() a bit\n cpuset: remove cpuset_test_cpumask()\n cpuset: remove unnecessary variable in cpuset_attach()\n cpuset: cleanup guarantee_online_{cpus|mems}()\n cpuset: remove redundant check in cpuset_cpus_allowed_fallback()\n" }, { "commit": "b028161fbba178ccd35aa69051c04d7673fe9d80", "tree": "a164c39cdf5e1b954584dcdc51401e1521beae27", "parents": [ "f317ff9eed763e99bd226a447f93d42509434f43", "c7ba8287cd11f2fc9e2feee9e1fac34b7293658f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 19:54:47 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 19:54:47 2013 -0700" }, "message": "Merge branch \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup changes from Tejun Heo:\n \"This pull request contains the following changes.\n\n - cgroup_subsys_state (css) reference counting has been converted to\n percpu-ref. css is what each resource controller embeds into its\n own control structure and perform reference count against. It may\n be used in hot paths of various subsystems and is similar to module\n refcnt in that aspect. For example, block-cgroup\u0027s css refcnting\n was showing up a lot in Mikulaus\u0027s device-mapper scalability work\n and this should alleviate it.\n\n - cgroup subtree iterator has been updated so that RCU read lock can\n be released after grabbing reference. This allows simplifying its\n users which requires blocking which used to build iteration list\n under RCU read lock and then traverse it outside. This pull\n request contains simplification of cgroup core and device-cgroup.\n A separate pull request will update cpuset.\n\n - Fixes for various bugs including corner race conditions and RCU\n usage bugs.\n\n - A lot of cleanups and some prepartory work for the planned unified\n hierarchy support.\"\n\n* \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (48 commits)\n cgroup: CGRP_ROOT_SUBSYS_BOUND should also be ignored when mounting an existing hierarchy\n cgroup: CGRP_ROOT_SUBSYS_BOUND should be ignored when comparing mount options\n cgroup: fix deadlock on cgroup_mutex via drop_parsed_module_refcounts()\n cgroup: always use RCU accessors for protected accesses\n cgroup: fix RCU accesses around task-\u003ecgroups\n cgroup: fix RCU accesses to task-\u003ecgroups\n cgroup: grab cgroup_mutex in drop_parsed_module_refcounts()\n cgroup: fix cgroupfs_root early destruction path\n cgroup: reserve ID 0 for dummy_root and 1 for unified hierarchy\n cgroup: implement for_each_[builtin_]subsys()\n cgroup: move init_css_set initialization inside cgroup_mutex\n cgroup: s/for_each_subsys()/for_each_root_subsys()/\n cgroup: clean up find_css_set() and friends\n cgroup: remove cgroup-\u003eactual_subsys_mask\n cgroup: prefix global variables with \"cgroup_\"\n cgroup: convert CFTYPE_* flags to enums\n cgroup: rename cont to cgrp\n cgroup: clean up cgroup_serial_nr_cursor\n cgroup: convert cgroup_cft_commit() to use cgroup_for_each_descendant_pre()\n cgroup: make serial_nr_cursor available throughout cgroup.c\n ...\n" }, { "commit": "f317ff9eed763e99bd226a447f93d42509434f43", "tree": "d77edfcdb1e7c32c30327f50dce04bcff8ec1531", "parents": [ "13cc56013842a847a0f6ff805d9ed9181e753ef8", "a85f1a41f020bc2c97611060bcfae6f48a1db28d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 19:53:30 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 19:53:30 2013 -0700" }, "message": "Merge branch \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\nPull workqueue changes from Tejun Heo:\n \"Surprisingly, Lai and I didn\u0027t break too many things implementing\n custom pools and stuff last time around and there aren\u0027t any follow-up\n changes necessary at this point.\n\n The only change in this pull request is Viresh\u0027s patches to make some\n per-cpu workqueues to behave as unbound workqueues dependent on a boot\n param whose default can be configured via a config option. This leads\n to higher processing overhead / lower bandwidth as more work items are\n bounced across CPUs; however, it can lead to noticeable powersave in\n certain configurations - ~10% w/ idlish constant workload on a\n big.LITTLE configuration according to Viresh.\n\n This is because per-cpu workqueues interfere with how the scheduler\n perceives whether or not each CPU is idle by forcing pinned tasks on\n them, which makes the scheduler\u0027s power-aware scheduling decisions\n less effective.\n\n Its effectiveness is likely less pronounced on homogenous\n configurations and this type of optimization can probably be made\n automatic; however, the changes are pretty minimal and the affected\n workqueues are clearly marked, so it\u0027s an easy gain for some\n configurations for the time being with pretty unintrusive changes.\"\n\n* \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n fbcon: queue work on power efficient wq\n block: queue work on power efficient wq\n PHYLIB: queue work on system_power_efficient_wq\n workqueue: Add system wide power_efficient workqueues\n workqueues: Introduce new flag WQ_POWER_EFFICIENT for power oriented workqueues\n" }, { "commit": "13cc56013842a847a0f6ff805d9ed9181e753ef8", "tree": "76b55717efc36f83c934ee894a8522e8a28eb57f", "parents": [ "7c6809ff2bd63d4c97ce9e0b94d39d5180842c48", "a4244454df1296e90cc961c1b636b1176ef0d9a0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 19:52:14 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 19:52:14 2013 -0700" }, "message": "Merge branch \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\nPull per-cpu changes from Tejun Heo:\n \"This pull request contains Kent\u0027s per-cpu reference counter. It has\n gone through several iterations since the last time and the dynamic\n allocation is gone.\n\n The usual usage is relatively straight-forward although async kill\n confirm interface, which is not used int most cases, is somewhat icky.\n There also are some interface concerns - e.g. I\u0027m not sure about\n passing in @relesae callback during init as that becomes funny when we\n later implement synchronous kill_and_drain - but nothing too serious\n and it\u0027s quite useable now.\n\n cgroup_subsys_state refcnting has already been converted and we should\n convert module refcnt (Kent?)\"\n\n* \u0027for-3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu-refcount: use RCU-sched insted of normal RCU\n percpu-refcount: implement percpu_tryget() along with percpu_ref_kill_and_confirm()\n percpu-refcount: implement percpu_ref_cancel_init()\n percpu-refcount: add __must_check to percpu_ref_init() and don\u0027t use ACCESS_ONCE() in percpu_ref_kill_rcu()\n percpu-refcount: cosmetic updates\n percpu-refcount: consistently use plain (non-sched) RCU\n percpu-refcount: Don\u0027t use silly cmpxchg()\n percpu: implement generic percpu refcounting\n" }, { "commit": "96a3d998fb92c28b9862297fcf93a24d8a0eac1d", "tree": "7fe1a799a3a84d276e7dcf8b0afa5b4ceb56659f", "parents": [ "3045f94a20cc54e3e5b20a843701eeab86f57163", "5236eb968ec21c693d463d0494e39b00c1bc174d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 16:31:49 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 16:31:49 2013 -0700" }, "message": "Merge branch \u0027x86-tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 tracing updates from Ingo Molnar:\n \"This tree adds IRQ vector tracepoints that are named after the handler\n and which output the vector #, based on a zero-overhead approach that\n relies on changing the IDT entries, by Seiji Aguchi.\n\n The new tracepoints look like this:\n\n # perf list | grep -i irq_vector\n irq_vectors:local_timer_entry [Tracepoint event]\n irq_vectors:local_timer_exit [Tracepoint event]\n irq_vectors:reschedule_entry [Tracepoint event]\n irq_vectors:reschedule_exit [Tracepoint event]\n irq_vectors:spurious_apic_entry [Tracepoint event]\n irq_vectors:spurious_apic_exit [Tracepoint event]\n irq_vectors:error_apic_entry [Tracepoint event]\n irq_vectors:error_apic_exit [Tracepoint event]\n [...]\"\n\n* \u0027x86-tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/tracing: Add config option checking to the definitions of mce handlers\n trace,x86: Do not call local_irq_save() in load_current_idt()\n trace,x86: Move creation of irq tracepoints from apic.c to irq.c\n x86, trace: Add irq vector tracepoints\n x86: Rename variables for debugging\n x86, trace: Introduce entering/exiting_irq()\n tracing: Add DEFINE_EVENT_FN() macro\n" } ], "next": "4d6f843a38fa26035598f1f35181aa5f328db897" }