)]}' { "log": [ { "commit": "a587d2daebcd2bc159d4348b6a7b028950a6d803", "tree": "8001158a76efe400600a4e54dc5dae384b32b6e5", "parents": [ "a9ce6bc15100023b411f8117e53a016d61889800" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Aug 25 13:39:18 2010 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Aug 27 11:13:51 2010 -0700" }, "message": "x86: Remove not used early_res code\n\nand some functions in e820.c that are not used anymore\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "edbe7d23b4482e7f33179290bcff3b1feae1c5f3", "tree": "2bf55fc2cb94e32fdd79018e9e04b55cbe8d49d9", "parents": [ "88ba088c18457caaf8d2e5f8d36becc731a3d4f6" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Aug 25 13:39:16 2010 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Aug 27 11:10:54 2010 -0700" }, "message": "memblock: Add find_memory_core_early()\n\nAccording to node range in early_node_map[] with __memblock_find_in_range\nto find free range.\n\nWill be used by memblock_x86_find_in_range_node()\n\nmemblock_x86_find_in_range_node will be used to find right buffer for NODE_DATA\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "7950c407c0288b223a200c1bba8198941599ca37", "tree": "4d7ad677fa918630cc29363c197d2593198727be", "parents": [ "5303b68f57c227c27193a14e57dd12be27cd670f" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Aug 25 13:39:14 2010 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Aug 27 11:07:56 2010 -0700" }, "message": "memblock: Add memblock_free/reserve_reserved_regions()\n\nSo we can avoid export memblock_reserved_init_regions()\nSuggested by Ben.\n\n-v2: use __init_memblock attribute\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "5303b68f57c227c27193a14e57dd12be27cd670f", "tree": "a7a217f9e3385b2f721cc2ec7ef3413577264e08", "parents": [ "10d0643988e976360eb3497dcafb55b393b8e480" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Jul 28 15:38:40 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:34 2010 +1000" }, "message": "memblock: Add memblock_find_in_range()\n\nThis is a wrapper for memblock_find_base() using slightly different\narguments (start,end instead of start,size for example) in order to\nmake it easier to convert existing arch/x86 code.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "10d0643988e976360eb3497dcafb55b393b8e480", "tree": "fa8f614dd7ab2ffc2f94700451e6c9e6d26c702e", "parents": [ "f0b37fad9a63217c39997b2d2b31f44e3d8be727" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Jul 28 15:43:02 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:33 2010 +1000" }, "message": "memblock: Option for the architecture to put memblock into the .init section\n\nArch code can define ARCH_DISCARD_MEMBLOCK in asm/memblock.h,\nwhich in turns causes memblock code and data to go respectively\ninto the .init and .initdata sections. This will be used by the\nx86 architecture.\n\nIf ARCH_DISCARD_MEMBLOCK is defined, the debugfs files to inspect\nthe memblock arrays after boot are not created.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "f0b37fad9a63217c39997b2d2b31f44e3d8be727", "tree": "ac98bee1b6f0a3d3c4f7907ddcbc11e81fd8c882", "parents": [ "25818f0f288cd5333ba5a90ad6dde3def4c4ff58" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Jul 28 15:28:21 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:32 2010 +1000" }, "message": "memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCK\n\nThis should make it easier to catch/debug incorrect use when\nthe CONFIG_ option isn\u0027t set.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "25818f0f288cd5333ba5a90ad6dde3def4c4ff58", "tree": "993384eff73bac874201d342c43a8e596dd1f485", "parents": [ "37d8d4bf489e39eedc9537f8616fe87879b13cb0" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 28 15:25:10 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:30 2010 +1000" }, "message": "memblock: Make MEMBLOCK_ERROR be 0\n\nAnd ensure we don\u0027t hand out 0 as a valid allocation. We put the\nlow limit at PAGE_SIZE arbitrarily.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "37d8d4bf489e39eedc9537f8616fe87879b13cb0", "tree": "44987d75fa87aee2737bca59574e3b7459ad4797", "parents": [ "ea9e4376bb545e400a325b3d76fecd02815303c0" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Jul 28 15:20:58 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:29 2010 +1000" }, "message": "memblock: Export MEMBLOCK_ERROR\n\nwill used by x86 memblock_x86_find_in_range_node and nobootmem replacement\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "5e63cf43af844ed30acc278b38b8c9bc51eba493", "tree": "02706d0ed24d45b94fdc7ac3a823eedd81a82d12", "parents": [ "6d03b885f0926ab5b66e21307d505afcafa6dced" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Jul 28 15:07:21 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:27 2010 +1000" }, "message": "memblock: Expose some memblock bits for use by x86\n\nThis exposes memblock_debug and associated memblock_dbg() macro,\nalong with memblock_can_resize so that x86 can use these when\nported to use memblock\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9", "tree": "f2c7173d47bf973d1a42ee249760b1c74d917009", "parents": [ "c196f76fd5ece716ee3b7fa5dda3576961c0cecc" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:17 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:24 2010 +1000" }, "message": "memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid()\n\nThe former is now strict, it will fail if it cannot honor the allocation\nwithin the node, while the later implements the previous semantic which\nfalls back to allocating anywhere.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "c196f76fd5ece716ee3b7fa5dda3576961c0cecc", "tree": "7687dbae04327ed56bec60b21667eea66a9e52b4", "parents": [ "fef501d49d31f997a3381b6c1efd5bca382b6b6f" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:16 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:23 2010 +1000" }, "message": "memblock: NUMA allocate can now use early_pfn_map\n\nWe now provide a default (weak) implementation of memblock_nid_range()\nwhich uses the early_pfn_map[] if CONFIG_ARCH_POPULATES_NODE_MAP\nis set. Sparc still needs to use its own method due to the way\nthe pages can be scattered between nodes.\n\nThis implementation is inefficient due to our main algorithm and\ncallback construct wanting to work on an ascending addresses bases\nwhile early_pfn_map[] would rather work with nid\u0027s (it\u0027s unsorted\nat that stage). But it should work and we can look into improving\nit subsequently, possibly using arch compile options to chose a\ndifferent algorithm alltogether.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "d2cd563ba82c424083b78e0ce97d68bfb04d1242", "tree": "ff4ab6de8b6906a6c955aa51c4ee53868dfafc0a", "parents": [ "142b45a72e221537c1bb1995497fef7cdc439e26" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:14 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:21 2010 +1000" }, "message": "memblock: Add arch function to control coalescing of memblock memory regions\n\nSome archs such as ARM want to avoid coalescing accross things such\nas the lowmem/highmem boundary or similar. This provides the option\nto control it via an arch callback for which a weak default is provided\nwhich always allows coalescing.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "bf23c51f1f49d3960f3cd8e3d2e7f943d9c41042", "tree": "6150486aaeb3bc8601fdf61ebfe5b441af1e3fb7", "parents": [ "4734b594c6ca1be796d30c82d93fdf5160f45124" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:06 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:12 2010 +1000" }, "message": "memblock: Move memblock arrays to static storage in memblock.c and make their size a variable\n\nThis is in preparation for having resizable arrays.\n\nNote that we still allocate one more than needed, this is unchanged from\nthe previous implementation.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "4734b594c6ca1be796d30c82d93fdf5160f45124", "tree": "72443c76c7d4c0cade456cc21997f383417747de", "parents": [ "9d3c30f5a17ec35894eadb7171f724643dce19c3" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 28 14:31:29 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:11 2010 +1000" }, "message": "memblock: Remove memblock_type.size and add memblock.memory_size instead\n\nRight now, both the \"memory\" and \"reserved\" memblock_type structures have\na \"size\" member. It represents the calculated memory size in the former\ncase and is unused in the latter.\n\nThis moves it out to the main memblock structure instead\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "9d3c30f5a17ec35894eadb7171f724643dce19c3", "tree": "c5c6f448b79facd126bc11e70ae5e19ade320127", "parents": [ "2898cc4cdf208f15246b7a1c6951d2b126a70fd6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:04 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:10 2010 +1000" }, "message": "memblock: Remove unused memblock.debug struct member\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "2898cc4cdf208f15246b7a1c6951d2b126a70fd6", "tree": "9ab5e803751ee7b8288248796339a0f17617ca29", "parents": [ "cd3db0c4ca3d237e7ad20f7107216e575705d2b0" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 13:34:42 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:09 2010 +1000" }, "message": "memblock: Change u64 to phys_addr_t\n\nLet\u0027s not waste space and cycles on archs that don\u0027t support \u003e32-bit\nphysical address space.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "cd3db0c4ca3d237e7ad20f7107216e575705d2b0", "tree": "03be7c14bd68a568a6e2f6df2db9fbbdf11c1483", "parents": [ "e63075a3c9377536d085bc013cd3fe6323162449" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:02 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:08 2010 +1000" }, "message": "memblock: Remove rmo_size, burry it in arch/powerpc where it belongs\n\nThe RMA (RMO is a misnomer) is a concept specific to ppc64 (in fact\nserver ppc64 though I hijack it on embedded ppc64 for similar purposes)\nand represents the area of memory that can be accessed in real mode\n(aka with MMU off), or on embedded, from the exception vectors (which\nis bolted in the TLB) which pretty much boils down to the same thing.\n\nWe take that out of the generic MEMBLOCK data structure and move it into\narch/powerpc where it belongs, renaming it to \"RMA\" while at it.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e63075a3c9377536d085bc013cd3fe6323162449", "tree": "28fde124dde6df867947882fc686d228502846df", "parents": [ "27f574c223d2c09610058b3ec7a29582d63a3e06" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:01 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:07 2010 +1000" }, "message": "memblock: Introduce default allocation limit and use it to replace explicit ones\n\nThis introduce memblock.current_limit which is used to limit allocations\nfrom memblock_alloc() or memblock_alloc_base(..., MEMBLOCK_ALLOC_ACCESSIBLE).\n\nThe old MEMBLOCK_ALLOC_ANYWHERE changes value from 0 to ~(u64)0 and can still\nbe used with memblock_alloc_base() to allocate really anywhere.\n\nIt is -no-longer- cropped to MEMBLOCK_REAL_LIMIT which disappears.\n\nNote to archs: I\u0027m leaving the default limit to MEMBLOCK_ALLOC_ANYWHERE. I\nstrongly recommend that you ensure that you set an appropriate limit\nduring boot in order to guarantee that an memblock_alloc() at any time\nresults in something that is accessible with a simple __va().\n\nThe reason is that a subsequent patch will introduce the ability for\nthe array to resize itself by reallocating itself. The MEMBLOCK core will\nhonor the current limit when performing those allocations.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "27f574c223d2c09610058b3ec7a29582d63a3e06", "tree": "2689c93200504ff0d8734be50a8ca329607d8807", "parents": [ "c3f72b5706716ada7923def513486ab7bb3a5301" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:39:00 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:06 2010 +1000" }, "message": "memblock: Expose MEMBLOCK_ALLOC_ANYWHERE\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "35a1f0bd07015dde66501b47cfb6ddc72ebe7346", "tree": "9bfa42fd86d8fc6a6971a3b6ffcd703cc056f944", "parents": [ "b693fffb189fbfe7e1e8317ce5838808be8666a0" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:38:58 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:04 2010 +1000" }, "message": "memblock: Remove nid_range argument, arch provides memblock_nid_range() instead\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "b693fffb189fbfe7e1e8317ce5838808be8666a0", "tree": "432d1caa8c4a4ba9f0c76c1502af0a232bd8f62b", "parents": [ "1e2b904026e9debf95f500b8980a00c43ac0f31c" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 13:52:55 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:03 2010 +1000" }, "message": "memblock: Remove memblock_find()\n\nNobody uses it anymore. It\u0027s semantics were ... weird\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "1e2b904026e9debf95f500b8980a00c43ac0f31c", "tree": "8fcd7bd0880d04428ed20c38e6dcc0790edf320a", "parents": [ "719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 13:52:25 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Aug 05 12:56:02 2010 +1000" }, "message": "memblock: Remove obsolete accessors\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "5b385f259fa4d356452e3b4729cbaf5213f4f55b", "tree": "17bfa3a22d367eb80b4720275579407917a70f4b", "parents": [ "dbe3039e64b1dd4cf26f782d45b524f85b444ad4" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 13:40:38 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 14:38:57 2010 +1000" }, "message": "memblock: Introduce for_each_memblock() and new accessors\n\nWalk memblock\u0027s using for_each_memblock() and use memblock_region_base/end_pfn() for\ngetting to PFNs.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "72d4b0b4e0e7fa858767e03972771a9f7c02b689", "tree": "5cdf39edb6edbaa7f75da27ad1d9ce7864bb9448", "parents": [ "411a25a80da328f5ae6b6c037872ffe867fcc130" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 14:38:47 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 14:38:47 2010 +1000" }, "message": "memblock: Implement memblock_is_memory and memblock_is_region_memory\n\nTo make it fast, we steal ARM\u0027s binary search for memblock_is_memory()\nand we use that to also the replace existing implementation of\nmemblock_is_reserved().\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "411a25a80da328f5ae6b6c037872ffe867fcc130", "tree": "625457e24037b0473dd293d66bae20828e432519", "parents": [ "e3239ff92a17976ac5d26fa0fe40ef3a9daf2523" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 06 15:38:56 2010 -0700" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 14:21:49 2010 +1000" }, "message": "memblock: No reason to include asm/memblock.h late\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e3239ff92a17976ac5d26fa0fe40ef3a9daf2523", "tree": "da3c493196811ccae1b79c3c94234f5d481c8221", "parents": [ "f1c2c19c498e27de48bf0dc4221e6e31b1823169" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 14:06:41 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 14:21:49 2010 +1000" }, "message": "memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "b8b3e9058f0f1d5c5a81c7d3d46f373d5f59a82c", "tree": "1033085760392dc7e24a79bbeb276ce1a34314d0", "parents": [ "51102ee5b8853d230e534cbcd0d888f0134738a3", "327aec03ac4c7bbf5e41ff03ac3a84c424589f27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:36:16 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:36:16 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (22 commits)\n 9p: fix sparse warnings in new xattr code\n fs/9p: remove sparse warning in vfs_inode\n fs/9p: destroy fid on failed remove\n fs/9p: Prevent parallel rename when doing fid_lookup\n fs/9p: Add support user. xattr\n net/9p: Implement TXATTRCREATE 9p call\n net/9p: Implement attrwalk 9p call\n 9p: Implement LOPEN\n fs/9p: This patch implements TLCREATE for 9p2000.L protocol.\n 9p: Implement TMKDIR\n 9p: Implement TMKNOD\n 9p: Define and implement TSYMLINK for 9P2000.L\n 9p: Define and implement TLINK for 9P2000.L\n 9p: Define and implement TLINK for 9P2000.L\n 9p: Implement client side of setattr for 9P2000.L protocol.\n 9p: getattr client implementation for 9P2000.L protocol.\n fs/9p: Pass the correct user credentials during attach\n net/9p: Handle the server returned error properly\n 9p: readdir implementation for 9p2000.L\n 9p: Make use of iounit for read/write\n ...\n" }, { "commit": "51102ee5b8853d230e534cbcd0d888f0134738a3", "tree": "5a34844b3040dbc099dd0d3ebc2e6fca0bc65855", "parents": [ "54161df1fb1469d66bce3a3b14d8281adbb69263", "6b0a2996a0c023d84bc27ec7528a6e54cb5ea264" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:33:38 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:33:38 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs: (49 commits)\n xfs simplify and speed up direct I/O completions\n xfs: move aio completion after unwritten extent conversion\n direct-io: move aio_complete into -\u003eend_io\n xfs: fix big endian build\n xfs: clean up xfs_bmap_get_bp\n xfs: simplify xfs_truncate_file\n xfs: kill the b_strat callback in xfs_buf\n xfs: remove obsolete osyncisosync mount option\n xfs: clean up filestreams helpers\n xfs: fix gcc 4.6 set but not read and unused statement warnings\n xfs: Fix build when CONFIG_XFS_POSIX_ACL\u003dn\n xfs: fix unsigned underflow in xfs_free_eofblocks\n xfs: use GFP_NOFS for page cache allocation\n xfs: fix memory reclaim recursion deadlock on locked inode buffer\n xfs: fix xfs_trans_add_item() lockdep warnings\n xfs: simplify and remove xfs_ireclaim\n xfs: don\u0027t block on buffer read errors\n xfs: move inode shrinker unregister even earlier\n xfs: remove a dmapi leftover\n xfs: writepage always has buffers\n ...\n" }, { "commit": "be82ae0238b0453afcf4a76f0512b7dde34ba500", "tree": "aaa3f5f11fd51fd73365ee1a2164aad9a03de060", "parents": [ "4b4fd27c0b5ec638a1f06ced9226fd95229dbbf0", "7b70c4275f28702b76b273c8534c38f8313812e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:31:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:31:24 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (291 commits)\n ARM: AMBA: Add pclk support to AMBA bus infrastructure\n ARM: 6278/2: fix regression in RealView after the introduction of pclk\n ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128\n ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY\n ARM: 6246/1: mmci: support larger MMCIDATALENGTH register\n ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants\n ARM: 6244/1: mmci: add variant data and default MCICLOCK support\n ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback\n ARM: 6274/1: add global control registers definition header file for nuc900\n mx2_camera: fix type of dma buffer virtual address pointer\n mx2_camera: Add soc_camera support for i.MX25/i.MX27\n arm/imx/gpio: add spinlock protection\n ARM: Add support for the LPC32XX arch\n ARM: LPC32XX: Arch config menu supoport and makefiles\n ARM: LPC32XX: Phytec 3250 platform support\n ARM: LPC32XX: Misc support functions\n ARM: LPC32XX: Serial support code\n ARM: LPC32XX: System suspend support\n ARM: LPC32XX: GPIO, timer, and IRQ drivers\n ARM: LPC32XX: Clock driver\n ...\n" }, { "commit": "b126468e08d92aaeffa58ef04d70e417241dadc1", "tree": "545b5ec0fd26e03a77db5009ff42ee01bcc11343", "parents": [ "9fe6206f400646a2322096b56c59891d530e8d51" ], "author": { "name": "Fang Wenqi", "email": "anton.fang@gmail.com", "time": "Tue Jun 01 02:43:06 2010 +0000" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 10:37:17 2010 -0500" }, "message": "virtio_9p.h needs \u003clinux/types.h\u003e\n\nFound with makes headers_check:\ninclude/linux/virtio_9p.h:15: found __[us]{8,16,32,64} type without #include \u003clinux/types.h\u003e\n\nSigned-off-by: Fang Wenqi \u003cantonf@turbolinux.com.cn\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "6b0a2996a0c023d84bc27ec7528a6e54cb5ea264", "tree": "9fa9a85d5d871b3cb3c28daf57d8ef8f05becd66", "parents": [ "209fb87a259ead17e966627b7f053d16a96898da", "9fe6206f400646a2322096b56c59891d530e8d51" ], "author": { "name": "Alex Elder", "email": "aelder@sgi.com", "time": "Mon Aug 02 10:24:57 2010 -0500" }, "committer": { "name": "Alex Elder", "email": "aelder@sgi.com", "time": "Mon Aug 02 10:24:57 2010 -0500" }, "message": "Merge branch \u0027v2.6.35\u0027\n" }, { "commit": "77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5", "tree": "f08c0c2dab44348919ec296254c3cc39d34e9f85", "parents": [ "a63ecd835f075b21d7d5cef9580447f5fbb36263" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Aug 01 13:40:40 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 01 15:10:01 2010 -0700" }, "message": "NFS: Fix a typo in include/linux/nfs_fs.h\n\nnfs_commit_inode() needs to be defined irrespectively of whether or not\nwe are supporting NFSv3 and NFSv4.\n\nAllow the compiler to optimise away code in the NFSv2-only case by\nconverting it into an inlined stub function.\n\nReported-and-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b70c4275f28702b76b273c8534c38f8313812e9", "tree": "1df2229ca02466bd1adda814ac5c37aa0a597db1", "parents": [ "ceb0885d3b01bb2e2f18765770e212914f2864be", "a20df564d15bd28e3df24e1c65b885bd74d23f17" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/kernel/entry-armv.S\n\tarch/arm/kernel/setup.c\n\tarch/arm/mm/init.c\n" }, { "commit": "ceb0885d3b01bb2e2f18765770e212914f2864be", "tree": "0952c90cd49704a9172e985ca491d79b60c40bc8", "parents": [ "b31fc7af78e17b0203e1cd5a195c590e8adeae0d", "08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:02 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:02 2010 +0100" }, "message": "Merge branch \u0027misc\u0027 into devel\n\nConflicts:\n\tarch/arm/mm/init.c\n" }, { "commit": "b31fc7af78e17b0203e1cd5a195c590e8adeae0d", "tree": "4032893d60c28e28a39bace2c48483352f626ba9", "parents": [ "f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0", "4037242c4f5ff77afe61bf07ca1e8a99490219e5", "a0fb007bf0c7de9ae361a9ad3821df4c69d4d2d9", "cea0bb1bc59b94625e60b69aaa9ad6749d5b57dd", "7d63397574c874a05e071987248c44fcf13eccf1", "a9deb137e4eb94d0a4fa0c3535b2c056d9363bef", "39ae702cd3b8b9d30693b73ad1a3d74c799b5b1a", "f4f5e28d2ee02e3b68da4a8b6156f3b4872d03be", "7cfe249475fdd82ad3c2767a9b906cc775dab868", "4bd48940190a34fe5a78a1595ec7756edf36b18a", "a3e5bb42898d10cff1d054d4b115d4dd608c0566" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:19:35 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:19:35 2010 +0100" }, "message": "Merge branches \u0027at91\u0027, \u0027ep93xx\u0027, \u0027kexec\u0027, \u0027iop\u0027, \u0027lmb\u0027, \u0027nomadik\u0027, \u0027nuc\u0027, \u0027pl\u0027, \u0027spear\u0027 and \u0027versatile\u0027 into devel\n" }, { "commit": "7cfe249475fdd82ad3c2767a9b906cc775dab868", "tree": "a4344e847f32fd7e7f111eaecb09415e6286af1c", "parents": [ "06385e490996d885c93fa03ce6e5374e4674a5cb" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 15 10:47:14 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 13:07:27 2010 +0100" }, "message": "ARM: AMBA: Add pclk support to AMBA bus infrastructure\n\nSome platforms gate the pclk (APB - the bus - clock) to the peripherals\nfor power saving, along with the functional clock. When devices are\naccessed without pclk enabled, the kernel will oops.\n\nThis gives them two options:\n\n1. Leave all clocks on all the time.\n2. Attempt to gate pclk along with the functional clock.\n\n(With some hardware, pclk and the functional clock are gated by a single\nbit in a register.)\n\n(1) has the disadvantage that it causes increased power usage, which is\nbad news for battery operated devices. (2) can lead to kernel oops if\nregisters are accessed without the functional clock being enabled.\n\nSo, introduce the apb_pclk signal in such a way existing drivers don\u0027t\nneed to be updated. Essentially, this means we guarantee that:\n\n1. pclk will be enabled whenever the driver is bound to a device -\n from probe() to remove() time.\n2. pclk will also be enabled when reading the primecell IDs from the device.\n\nIn order to allow drivers to be incrementally updated to achieve greater\npower savings, we provide two additional calls to allow drivers to\nmanage the pclk - amba_pclk_enable()/amba_pclk_disable().\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "b608b283a962caaa280756bc8563016a71712acf", "tree": "217a745ab305219fab676d4a215c1a709004bd57", "parents": [ "674b2222920012244ca59978b356b25412a8dcc7" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Jul 30 15:31:54 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Jul 30 15:38:42 2010 -0400" }, "message": "NFS: kswapd must not block in nfs_release_page\n\nSee https://bugzilla.kernel.org/show_bug.cgi?id\u003d16056\n\nIf other processes are blocked waiting for kswapd to free up some memory so\nthat they can make progress, then we cannot allow kswapd to block on those\nprocesses.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "8f92054e7ca1d3a3ae50fb42d2253ac8730d9b2a", "tree": "29d1bcf78bf04fe41c7e811f806f58d655c41f9f", "parents": [ "de09a9771a5346029f4d11e4ac886be7f9bfdd75" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jul 29 12:45:55 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 29 15:16:18 2010 -0700" }, "message": "CRED: Fix __task_cred()\u0027s lockdep check and banner comment\n\nFix __task_cred()\u0027s lockdep check by removing the following validation\ncondition:\n\n\tlockdep_tasklist_lock_is_held()\n\nas commit_creds() does not take the tasklist_lock, and nor do most of the\nfunctions that call it, so this check is pointless and it can prevent\ndetection of the RCU lock not being held if the tasklist_lock is held.\n\nInstead, add the following validation condition:\n\n\ttask-\u003eexit_state \u003e\u003d 0\n\nto permit the access if the target task is dead and therefore unable to change\nits own credentials.\n\nFix __task_cred()\u0027s comment to:\n\n (1) discard the bit that says that the caller must prevent the target task\n from being deleted. That shouldn\u0027t need saying.\n\n (2) Add a comment indicating the result of __task_cred() should not be passed\n directly to get_cred(), but rather than get_task_cred() should be used\n instead.\n\nAlso put a note into the documentation to enforce this point there too.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de09a9771a5346029f4d11e4ac886be7f9bfdd75", "tree": "ccce9e75753c98a9f38075d54ab98aa4b89e66c7", "parents": [ "540ad6b62b3a188a53b51cac81d8a60d40e29fbd" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jul 29 12:45:49 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 29 15:16:17 2010 -0700" }, "message": "CRED: Fix get_task_cred() and task_state() to not resurrect dead credentials\n\nIt\u0027s possible for get_task_cred() as it currently stands to \u0027corrupt\u0027 a set of\ncredentials by incrementing their usage count after their replacement by the\ntask being accessed.\n\nWhat happens is that get_task_cred() can race with commit_creds():\n\n\tTASK_1\t\t\tTASK_2\t\t\tRCU_CLEANER\n\t--\u003eget_task_cred(TASK_2)\n\trcu_read_lock()\n\t__cred \u003d __task_cred(TASK_2)\n\t\t\t\t--\u003ecommit_creds()\n\t\t\t\told_cred \u003d TASK_2-\u003ereal_cred\n\t\t\t\tTASK_2-\u003ereal_cred \u003d ...\n\t\t\t\tput_cred(old_cred)\n\t\t\t\t call_rcu(old_cred)\n\t\t[__cred-\u003eusage \u003d\u003d 0]\n\tget_cred(__cred)\n\t\t[__cred-\u003eusage \u003d\u003d 1]\n\trcu_read_unlock()\n\t\t\t\t\t\t\t--\u003eput_cred_rcu()\n\t\t\t\t\t\t\t[__cred-\u003eusage \u003d\u003d 1]\n\t\t\t\t\t\t\tpanic()\n\nHowever, since a tasks credentials are generally not changed very often, we can\nreasonably make use of a loop involving reading the creds pointer and using\natomic_inc_not_zero() to attempt to increment it if it hasn\u0027t already hit zero.\n\nIf successful, we can safely return the credentials in the knowledge that, even\nif the task we\u0027re accessing has released them, they haven\u0027t gone to the RCU\ncleanup code.\n\nWe then change task_state() in procfs to use get_task_cred() rather than\ncalling get_cred() on the result of __task_cred(), as that suffers from the\nsame problem.\n\nWithout this change, a BUG_ON in __put_cred() or in put_cred_rcu() can be\ntripped when it is noticed that the usage count is not zero as it ought to be,\nfor example:\n\nkernel BUG at kernel/cred.c:168!\ninvalid opcode: 0000 [#1] SMP\nlast sysfs file: /sys/kernel/mm/ksm/run\nCPU 0\nPid: 2436, comm: master Not tainted 2.6.33.3-85.fc13.x86_64 #1 0HR330/OptiPlex\n745\nRIP: 0010:[\u003cffffffff81069881\u003e] [\u003cffffffff81069881\u003e] __put_cred+0xc/0x45\nRSP: 0018:ffff88019e7e9eb8 EFLAGS: 00010202\nRAX: 0000000000000001 RBX: ffff880161514480 RCX: 00000000ffffffff\nRDX: 00000000ffffffff RSI: ffff880140c690c0 RDI: ffff880140c690c0\nRBP: ffff88019e7e9eb8 R08: 00000000000000d0 R09: 0000000000000000\nR10: 0000000000000001 R11: 0000000000000040 R12: ffff880140c690c0\nR13: ffff88019e77aea0 R14: 00007fff336b0a5c R15: 0000000000000001\nFS: 00007f12f50d97c0(0000) GS:ffff880007400000(0000) knlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\nCR2: 00007f8f461bc000 CR3: 00000001b26ce000 CR4: 00000000000006f0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess master (pid: 2436, threadinfo ffff88019e7e8000, task ffff88019e77aea0)\nStack:\n ffff88019e7e9ec8 ffffffff810698cd ffff88019e7e9ef8 ffffffff81069b45\n\u003c0\u003e ffff880161514180 ffff880161514480 ffff880161514180 0000000000000000\n\u003c0\u003e ffff88019e7e9f28 ffffffff8106aace 0000000000000001 0000000000000246\nCall Trace:\n [\u003cffffffff810698cd\u003e] put_cred+0x13/0x15\n [\u003cffffffff81069b45\u003e] commit_creds+0x16b/0x175\n [\u003cffffffff8106aace\u003e] set_current_groups+0x47/0x4e\n [\u003cffffffff8106ac89\u003e] sys_setgroups+0xf6/0x105\n [\u003cffffffff81009b02\u003e] system_call_fastpath+0x16/0x1b\nCode: 48 8d 71 ff e8 7e 4e 15 00 85 c0 78 0b 8b 75 ec 48 89 df e8 ef 4a 15 00\n48 83 c4 18 5b c9 c3 55 8b 07 8b 07 48 89 e5 85 c0 74 04 \u003c0f\u003e 0b eb fe 65 48 8b\n04 25 00 cc 00 00 48 3b b8 58 04 00 00 75\nRIP [\u003cffffffff81069881\u003e] __put_cred+0xc/0x45\n RSP \u003cffff88019e7e9eb8\u003e\n---[ end trace df391256a100ebdd ]---\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "129961ecaf21c9ee899ad9067d917c1aa172fb7a", "tree": "49eafdcf4d6ac490ecdd92c36c285817872eaf34", "parents": [ "392c57a2ec811db37ae45adc513704cf92ba3e69", "cccf59abea4e1c36322e365d6e61ff7de1f3ee07" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:02 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:02 2010 +0100" }, "message": "Merge branch \u0027wells/lpc32xx-arch_v2\u0027 of git://git.lpclinux.com/linux-2.6-lpc into devel-stable\n" }, { "commit": "bb8f563c848faa113059973f68c24a3bb6a9585e", "tree": "7ce9952411dd8ba1e9f438a62d586d9078f06212", "parents": [ "f5e2574e734650bbeb801a31cc99e628f9a027af" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:53:57 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:39:05 2010 +0100" }, "message": "ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback\n\nPlatforms may have some external power control which need to be\ncontrolled from board specific code. Rename the translate_vdd()\ncallback to vdd_handler() and pass it the power mode.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8785eb1e7ca0292c04007fc7768e1599e0c6cef3", "tree": "8016acc3d90f4af72940ce3b85beaeb25fe8326d", "parents": [ "a6f80fb7b5986fda663d94079d3bba0937a6b6ff", "8b24599e72c9aee1ea1187e29cb9c5de9f449cce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 28 19:59:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 28 19:59:55 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:\n davinci: da850/omap-l138 evm: account for DEFDCDC{2,3} being tied high\n regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register\n wm8350-regulator: fix wm8350_register_regulator error handling\n ab3100: fix off-by-one value range checking for voltage selector\n" }, { "commit": "7d14831e21060fbfbfe8453460ac19205f4ce1c2", "tree": "f62423f7c13f9cfe1b555638dda8ab17fbca4777", "parents": [ "e9a1c5129de1caf4526b8df5f200ff628b2ffab4" ], "author": { "name": "Anuj Aggarwal", "email": "anuj.aggarwal@ti.com", "time": "Mon Jul 12 17:54:06 2010 +0530" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Wed Jul 28 15:09:26 2010 +0100" }, "message": "regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register\n\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n\nIn TPS6507x, depending on the status of DEFDCDC{2,3} pin either\nDEFDCDC{2,3}_LOW or DEFDCDC{2,3}_HIGH register needs to be read or\nprogrammed to change the output voltage.\n\nThe current driver assumes DEFDCDC{2,3} pins are always tied low\nand thus operates only on DEFDCDC{2,3}_LOW register. This need\nnot always be the case (as is found on OMAP-L138 EVM).\n\nUnfortunately, software cannot read the status of DEFDCDC{2,3} pins.\nSo, this information is passed through platform data depending on\nhow the board is wired.\n\nSigned-off-by: Anuj Aggarwal \u003canuj.aggarwal@ti.com\u003e\nSigned-off-by: Sekhar Nori \u003cnsekhar@ti.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "a376bca61096c7a79393e8125b7ad4757ccff19c", "tree": "87bb6aeff773e334a620b3a9aed6b2771cfb9bca", "parents": [ "1a041a23da7c77b53c71fe11b4f940388bee37b1", "5447080cfa3c77154498dfbf225367ac85b4c2b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 27 09:21:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 27 09:21:00 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n s2io: fixing DBG_PRINT() macro\n ath9k: fix dma direction for map/unmap in ath_rx_tasklet\n net: dev_forward_skb should call nf_reset\n net sched: fix race in mirred device removal\n tun: avoid BUG, dump packet on GSO errors\n bonding: set device in RLB ARP packet handler\n wimax/i2400m: Add PID \u0026 VID for Intel WiMAX 6250\n ipv6: Don\u0027t add routes to ipv6 disabled interfaces.\n net: Fix skb_copy_expand() handling of -\u003ecsum_start\n net: Fix corruption of skb csum field in pskb_expand_head() of net/core/skbuff.c\n macvtap: Limit packet queue length\n ixgbe/igb: catch invalid VF settings\n bnx2x: Advance a module version\n bnx2x: Protect statistics ramrod and sequence number\n bnx2x: Protect a SM state change\n wireless: use netif_rx_ni in ieee80211_send_layer2_update\n" }, { "commit": "ac3e3fb424d44109dda3b1a3459e1b30fa60ac4a", "tree": "b7e537c307e8fe2ed9a2bf0828b4e9f933adb31d", "parents": [ "ec489aa8f993f8d2ec962ce113071faac482aa27" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Jun 02 20:40:22 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:43:47 2010 +0100" }, "message": "ARM: 6158/2: PL011 baudrate extension for ST-Ericssons derivative\n\nImplementation of the ST-Ericsson baudrate extension in the PL011\nblock. In this modified variant it is possible to change the\nsampling factor from 16 to 8, and thanks to this we can get higher\nbaudrates while still using the same peripheral clock.\n\nAlso replace the simple division to determine the baud divisor\nwith DIV_ROUND_CLOSEST() rather than a simple integer division.\n\nCc: Alessandro Rubini \u003crubini@unipv.it\u003e\nCc: Jerzy Kasenberg \u003cjerzy.kasenberg@tieto.com\u003e\nSigned-off-by: Marcin Mielczarczyk \u003cmarcin.mielczarczyk@tieto.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ec489aa8f993f8d2ec962ce113071faac482aa27", "tree": "fa7a56687acb12f7bf928da04296a83b5ce0be10", "parents": [ "c58bbd39f876955be6e072748fdfe2b671f9d939" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Jun 02 08:13:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:43:47 2010 +0100" }, "message": "ARM: 6157/2: PL011 TX/RX split of LCR for ST-Ericssons derivative\n\nIn the ST-Ericsson version of the PL011 the TX and RX have different\ncontrol registers.\n\nCc: Alessandro Rubini \u003crubini@unipv.it\u003e\nSigned-off-by: Marcin Mielczarczyk \u003cmarcin.mielczarczyk@tieto.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "98864ff58dd2b8ef9e72b0d2c70f34e7ff24a2ee", "tree": "87f93ed777f090220acb3cc066c85abe4b863d12", "parents": [ "8d717a52d1b0959128be5134dd12608e8e4f2115" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat May 22 23:59:11 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 08:48:23 2010 +0100" }, "message": "ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "40e2e97316af6e62affab7a392e792494b8d9dde", "tree": "981ce3b464467893683d47f52ae5d35fdd32d46a", "parents": [ "696123fca877905696591829c97a2cef11c8d048" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Sun Jul 18 21:17:09 2010 +0000" }, "committer": { "name": "Alex Elder", "email": "aelder@sgi.com", "time": "Mon Jul 26 16:09:02 2010 -0500" }, "message": "direct-io: move aio_complete into -\u003eend_io\n\nFilesystems with unwritten extent support must not complete an AIO request\nuntil the transaction to convert the extent has been commited. That means\nthe aio_complete calls needs to be moved into the -\u003eend_io callback so\nthat the filesystem can control when to call it exactly.\n\nThis makes a bit of a mess out of dio_complete and the -\u003eend_io callback\nprototype even more complicated.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nReviewed-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Alex Elder \u003caelder@sgi.com\u003e\n" }, { "commit": "72ad5d77fb981963edae15eee8196c80238f5ed0", "tree": "a6fa9a0b9ba924fd2dd91debf3e8ab04e8084338", "parents": [ "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jul 23 22:59:09 2010 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jul 24 23:26:09 2010 -0400" }, "message": "ACPI / Sleep: Allow the NVS saving to be skipped during suspend to RAM\n\nCommit 2a6b69765ad794389f2fc3e14a0afa1a995221c2\n(ACPI: Store NVS state even when entering suspend to RAM) caused the\nACPI suspend code save the NVS area during suspend and restore it\nduring resume unconditionally, although it is known that some systems\nneed to use acpi_sleep\u003ds4_nonvs for hibernation to work. To allow\nthe affected systems to avoid saving and restoring the NVS area\nduring suspend to RAM and resume, introduce kernel command line\noption acpi_sleep\u003dnonvs and make acpi_sleep\u003ds4_nonvs work as its\nalias temporarily (add acpi_sleep\u003ds4_nonvs to the feature removal\nfile).\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16396 .\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-and-tested-by: tomas m \u003ctmezzadra@gmail.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "8a35747a5d13b99e076b0222729e0caa48cb69b6", "tree": "387e2840fe46edd9cc36027cf188778f2c5ab1ff", "parents": [ "bded64a7ff82f6af56426a4ff2483888e5ad5fe9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jul 21 21:44:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:08:56 2010 -0700" }, "message": "macvtap: Limit packet queue length\n\nMark Wagner reported OOM symptoms when sending UDP traffic over\na macvtap link to a kvm receiver.\n\nThis appears to be caused by the fact that macvtap packet queues\nare unlimited in length. This means that if the receiver can\u0027t\nkeep up with the rate of flow, then we will hit OOM. Of course\nit gets worse if the OOM killer then decides to kill the receiver.\n\nThis patch imposes a cap on the packet queue length, in the same\nway as the tuntap driver, using the device TX queue length.\n\nPlease note that macvtap currently has no way of giving congestion\nnotification, that means the software device TX queue cannot be\nused and packets will always be dropped once the macvtap driver\nqueue fills up.\n\nThis shouldn\u0027t be a great problem for the scenario where macvtap\nis used to feed a kvm receiver, as the traffic is most likely\nexternal in origin so congestion notification can\u0027t be applied\nanyway.\n\nOf course, if anybody decides to complain about guest-to-guest\nUDP packet loss down the track, then we may have to revisit this.\n\nIncidentally, this patch also fixes a real memory leak when\nmacvtap_get_queue fails.\n\nChris Wright noticed that for this patch to work, we need a\nnon-zero TX queue length. This patch includes his work to change\nthe default macvtap TX queue length to 500.\n\nReported-by: Mark Wagner \u003cmwagner@redhat.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e916beab22e00d95345bfa4f48981f2c88885f61", "tree": "8a50022d6ad51fe3d328f6987adf61a210fd3b08", "parents": [ "4c0c03ca54f72fdd5912516ad0a23ec5cf01bda7", "edd63cb6b91024332d6983fc51058ac1ef0c081e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:44:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:44:26 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:\n sysrq,kdb: Use __handle_sysrq() for kdb\u0027s sysrq function\n debug_core,kdb: fix kgdb_connected bit set in the wrong place\n Fix merge regression from external kdb to upstream kdb\n repair gdbstub to match the gdbserial protocol specification\n kdb: break out of kdb_ll() when command is terminated\n" }, { "commit": "edd63cb6b91024332d6983fc51058ac1ef0c081e", "tree": "2df04fc5dc35899aa7d4f4c52197f7b492c16c8b", "parents": [ "b0679c63db655fa12007558e267bc0eb1d486fdb" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "message": "sysrq,kdb: Use __handle_sysrq() for kdb\u0027s sysrq function\n\nThe kdb code should not toggle the sysrq state in case an end user\nwants to try and resume the normal kernel execution.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96", "tree": "cadf0fd7e2bcb2d2d2402fcddbda3ec9b53b2c0c", "parents": [ "e0959371b4aaddb9b986019d5cfef93f9801d0ff", "c42750b0261274107ae85c894c088e618a3e38b9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 18:29:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 18:29:25 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/r600: fix possible NULL pointer derefernce\n drm/radeon/kms: add quirk for ASUS HD 3600 board\n include/linux/vgaarb.h: add missing part of include guard\n drm/nouveau: Fix crashes during fbcon init on single head cards.\n drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch\n drm/radeon/kms: fix shared ddc harder\n drm/i915: enable low power render writes on GEN3 hardware.\n drm/i915: Define MI_ARB_STATE bits\n vmwgfx: return -EFAULT if copy_to_user fails\n fb: handle allocation failure in alloc_apertures()\n drm: radeon: check kzalloc() result\n drm/ttm: Fix build on architectures without AGP\n drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics\n drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740\n drm/radeon/kms: fix legacy tv-out pal mode\n" }, { "commit": "a6a1a095ec8ace2912fc280d371eee8ff5da5736", "tree": "35aa89867cddb3480f83aacd0c90f2fee1ab5c94", "parents": [ "7173aeff025a7fed3fa903e362bf773e6258dd47" ], "author": { "name": "Doug Goldstein", "email": "cardoe@gentoo.org", "time": "Tue Jul 20 15:22:25 2010 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 09:51:15 2010 +1000" }, "message": "include/linux/vgaarb.h: add missing part of include guard\n\nvgaarb.h was missing the #define of the #ifndef at the top for the guard\nto prevent multiple #include\u0027s from causing re-define errors\n\nSigned-off-by: Doug Goldstein \u003ccardoe@gentoo.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "844b9a8707f1fcf0482e0c52f44a555e799ccda6", "tree": "c9c095c123c2988b014e39b461eb04411b3a197d", "parents": [ "9d51a6b2487724e8713cd2794cf09ffeee5f6932" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Jul 20 13:24:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:41 2010 -0700" }, "message": "vfs: fix RCU-lockdep false positive due to /proc\n\nIf a single-threaded process does a file-descriptor operation, and some\nother process accesses that same file descriptor via /proc, the current\nrcu_dereference_check_fdtable() can give a false-positive RCU-lockdep\nsplat due to the reference count being increased by the /proc access after\nthe reference-count check in fget_light() but before the check in\nrcu_dereference_check_fdtable().\n\nThis commit prevents this false positive by checking for a single-threaded\nprocess. To avoid #include hell, this commit uses the wrapper for\nthread_group_empty(current) defined by rcu_my_thread_group_empty()\nprovided in a separate commit.\n\nLocated-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nLocated-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.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": "772a2f9b488f4d27c314da5eeabde750b9ead41b", "tree": "2cb96edb617d659b26cad8c603d664cfa0cd1373", "parents": [ "bbb642f9c9a43dbe45ffe14935397a2a34100263" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu Jul 15 10:39:47 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 15:24:09 2010 +1000" }, "message": "fb: handle allocation failure in alloc_apertures()\n\nIf the kzalloc() fails we should return NULL. All the places that call\nalloc_apertures() check for this already.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: James Simmons \u003cjsimmons@infradead.org\u003e\nAcked-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7f8275d0d660c146de6ee3017e1e2e594c49e820", "tree": "884db927118b44102750b5168ee36ef4b8b5cb4e", "parents": [ "d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Mon Jul 19 14:56:17 2010 +1000" }, "committer": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Mon Jul 19 14:56:17 2010 +1000" }, "message": "mm: add context argument to shrinker callback\n\nThe current shrinker implementation requires the registered callback\nto have global state to work from. This makes it difficult to shrink\ncaches that are not global (e.g. per-filesystem caches). Pass the shrinker\nstructure to the callback so that users can embed the shrinker structure\nin the context the shrinker needs to operate on and get back to it in the\ncallback via container_of().\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "2044f2282d7558c765270d78e19dbdcf6190ca71", "tree": "03b2c4d211fa8e7e2ef8c489d28a16442f030d57", "parents": [ "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d", "58c84eda07560a6b75b03e8d3b26d6eddfc14011" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: fall back to original BIOS BAR addresses\n" }, { "commit": "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d", "tree": "39f23bd918c4dcda4359ebd9b8f188b9cb5e25b1", "parents": [ "cd9f040df6ce46573760a507cb88192d05d27d86", "5453258d532e72731b0829e4fefd36dd611a2fff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 10:09:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 10:09:25 2010 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:\n ocfs2: Silence gcc warning in ocfs2_write_zero_page().\n jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions\n ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node\n ocfs2: Don\u0027t duplicate pages past i_size during CoW.\n ocfs2: tighten up strlen() checking\n ocfs2: Make xattr reflink work with new local alloc reservation.\n ocfs2: make xattr extension work with new local alloc reservation.\n ocfs2: Remove the redundant cpu_to_le64.\n ocfs2/dlm: don\u0027t access beyond bitmap size\n ocfs2: No need to zero pages past i_size.\n ocfs2: Zero the tail cluster when extending past i_size.\n ocfs2: When zero extending, do it by page.\n ocfs2: Limit default local alloc size within bitmap range.\n ocfs2: Move orphan scan work to ocfs2_wq.\n fs/ocfs2/dlm: Add missing spin_unlock\n" }, { "commit": "2f495c398edca50ac251c134f1995a2fb3c06cb7", "tree": "85551c64ef485373807a2733287aafc458881a10", "parents": [ "43b56074b69f3b6d0296e7986e792c7adb1d89c6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jun 21 13:20:46 2010 +1000" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Jul 16 22:01:58 2010 -0400" }, "message": "net/phy/marvell: Expose IDs and flags in a .h and add dns323 LEDs setup flag\n\nThis moves the various known Marvell PHY IDs to include/linux/marvell_phy.h\nalong with dev_flags definitions for use by the driver.\n\nI then added a flag that changes the PHY init code to setup the LEDs\nconfig to the values needed to operate a dns323 rev C1 NAS.\n\nI moved the existing \"resistance\" flag to the .h as well, though I\u0027ve\nbeen unable to find whoever sets this to convert it to use that constant.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Nicolas Pitre \u003cnico@fluxnic.net\u003e\n" }, { "commit": "58c84eda07560a6b75b03e8d3b26d6eddfc14011", "tree": "0104345d24d5fb79842ffd563ea69fdf2906931d", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe" ], "author": { "name": "Bjorn Helgaas", "email": "bjorn.helgaas@hp.com", "time": "Thu Jul 15 09:41:42 2010 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 16 11:39:48 2010 -0700" }, "message": "PCI: fall back to original BIOS BAR addresses\n\nIf we fail to assign resources to a PCI BAR, this patch makes us try the\noriginal address from BIOS rather than leaving it disabled.\n\nLinux tries to make sure all PCI device BARs are inside the upstream\nPCI host bridge or P2P bridge apertures, reassigning BARs if necessary.\nWindows does similar reassignment.\n\nBefore this patch, if we could not move a BAR into an aperture, we left\nthe resource unassigned, i.e., at address zero. Windows leaves such BARs\nat the original BIOS addresses, and this patch makes Linux do the same.\n\nThis is a bit ugly because we disable the resource long before we try to\nreassign it, so we have to keep track of the BIOS BAR address somewhere.\nFor lack of a better place, I put it in the struct pci_dev.\n\nI think it would be cleaner to attempt the assignment immediately when the\nclaim fails, so we could easily remember the original address. But we\ncurrently claim motherboard resources in the middle, after attempting to\nclaim PCI resources and before assigning new PCI resources, and changing\nthat is a fairly big job.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16263\n\nReported-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nTested-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nSigned-off-by: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "f469461df6ff822f71b8737bda86eea20f16ff93", "tree": "d7605dd5846725ed6949621084a5652782d9b02d", "parents": [ "79140bc486fac016249f3d1d67ec9a39ebed9ad9", "44a54f787c0abcf75a2ed49b8ec8b2b512468f73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 11:26:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 11:26:33 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing: Add alignment to syscall metadata declarations\n perf: Sync callchains with period based hits\n perf: Resurrect flat callchains\n perf: Version String fix, for fallback if not from git\n perf: Version String fix, using kernel version\n" }, { "commit": "cc10b6ffd39ef982f86de68d95e5811df82cf819", "tree": "cb6f24f40d0211513321b5230b87efc022aeed1f", "parents": [ "042bd1ff6cf255e71689db913786dbb6bb79542d", "5b39187fad6faefae5ce1a1e997651d4e382b135" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: w90p910_ts - fix call to setup_timer()\n Input: synaptics - fix wrong dimensions check\n Input: i8042 - mark stubs in i8042.h \"static inline\"\n" }, { "commit": "13ceef099edd2b70c5a6f3a9ef5d6d97cda2e096", "tree": "5d65c397e9e85abe11a6fb0ebf3a69e8a4e91e0d", "parents": [ "a39953dd95ff10e311083d94f4f95c348cb22464" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Jul 14 07:56:33 2010 +0200" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 15 15:17:47 2010 -0700" }, "message": "jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions\n\nOCFS2 uses t_commit trigger to compute and store checksum of the just\ncommitted blocks. When a buffer has b_frozen_data, checksum is computed\nfor it instead of b_data but this can result in an old checksum being\nwritten to the filesystem in the following scenario:\n\n1) transaction1 is opened\n2) handle1 is opened\n3) journal_access(handle1, bh)\n - This sets jh-\u003eb_transaction to transaction1\n4) modify(bh)\n5) journal_dirty(handle1, bh)\n6) handle1 is closed\n7) start committing transaction1, opening transaction2\n8) handle2 is opened\n9) journal_access(handle2, bh)\n - This copies off b_frozen_data to make it safe for transaction1 to commit.\n jh-\u003eb_next_transaction is set to transaction2.\n10) jbd2_journal_write_metadata() checksums b_frozen_data\n11) the journal correctly writes b_frozen_data to the disk journal\n12) handle2 is closed\n - There was no dirty call for the bh on handle2, so it is never queued for\n any more journal operation\n13) Checkpointing finally happens, and it just spools the bh via normal buffer\nwriteback. This will write b_data, which was never triggered on and thus\ncontains a wrong (old) checksum.\n\nThis patch fixes the problem by calling the trigger at the moment data is\nfrozen for journal commit - i.e., either when b_frozen_data is created by\ndo_get_write_access or just before we write a buffer to the log if\nb_frozen_data does not exist. We also rename the trigger to t_frozen as\nthat better describes when it is called.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Mark Fasheh \u003cmfasheh@suse.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "95f72d1ed41a66f1c1c29c24d479de81a0bea36f", "tree": "bd92b3804ff0bea083d69af0ede52f99ab34c0af", "parents": [ "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Jul 12 14:36:09 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 14 17:14:00 2010 +1000" }, "message": "lmb: rename to memblock\n\nvia following scripts\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/lmb/memblock/g\u0027 \\\n -e \u0027s/LMB/MEMBLOCK/g\u0027 \\\n $FILES\n\n for N in $(find . -name lmb.[ch]); do\n M\u003d$(echo $N | sed \u0027s/lmb/memblock/g\u0027)\n mv $N $M\n done\n\nand remove some wrong change like lmbench and dlmb etc.\n\nalso move memblock.c from lib/ to mm/\n\nSuggested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "44a54f787c0abcf75a2ed49b8ec8b2b512468f73", "tree": "debbf5656caf6260aa4d6fc276dd043624527822", "parents": [ "108553e1f3c45a92d23681a378ad9e4c3230eebc" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Jul 09 15:41:44 2010 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Jul 09 15:53:04 2010 -0400" }, "message": "tracing: Add alignment to syscall metadata declarations\n\nFor some reason if we declare a static variable and then assign it\nlater, and the assignment contains a __attribute__((__aligned__(#))),\nsome versions of gcc will ignore it.\n\nThis caused the syscall meta data to not be compact in its section\nand caused a kernel oops when the section was being read.\n\nThe fix for these versions of gcc seems to be to add the aligned\nattribute to the declaration as well.\n\nThis fixes the BZ regression:\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d16353\n\nReported-by: Zeev Tarantov \u003czeev.tarantov@gmail.com\u003e\nTested-by: Zeev Tarantov \u003czeev.tarantov@gmail.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003cAANLkTinkKVmB0fpVeqUkMeqe3ZYeXJdI8xDuzJEOjYwh@mail.gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "c77e9e68269bf50573ce130b5d95ff6e539dbcf8", "tree": "99edc1b070717e18f5958f934bc3921cfed2ce1f", "parents": [ "31016e9941be85e8c487b1f3c45d253eda356715", "83ba7b071f30f7c01f72518ad72d5cd203c27502" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:06:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:06:40 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n writeback: simplify the write back thread queue\n writeback: split writeback_inodes_wb\n writeback: remove writeback_inodes_wbc\n fs-writeback: fix kernel-doc warnings\n splice: check f_mode for seekable file\n splice: direct_splice_actor() should not use pos in sd\n" }, { "commit": "2aa72f612144a0a7d4b0b22ae7c122692ac6a013", "tree": "8af2d2ac975887a04b4e4109de3d785f7046979b", "parents": [ "78178c7d6e127fff6dba027315fd6914304b05cf", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits)\n NET: SB1250: Initialize .owner\n vxge: show startup message with KERN_INFO\n ll_temac: Fix missing iounmaps\n bridge: Clear IPCB before possible entry into IP stack\n bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference\n net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n net/ne: fix memory leak in ne_drv_probe()\n xfrm: fix xfrm by MARK logic\n virtio_net: fix oom handling on tx\n virtio_net: do not reschedule rx refill forever\n s2io: resolve statistics issues\n linux/net.h: fix kernel-doc warnings\n net: decreasing real_num_tx_queues needs to flush qdisc\n sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n qlge: fix a eeh handler to not add a pending timer\n qlge: Replacing add_timer() to mod_timer()\n usbnet: Set parent device early for netdev_printk()\n net: Revert \"rndis_host: Poll status channel before control channel\"\n netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT\n drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h\n ...\n" }, { "commit": "140236b4b1c749c9b795ea3d11558a0eb5a3a080", "tree": "b720aa99ca2fc8bc012777c98d321b994c1730d7", "parents": [ "47a716cf0ca981b9549ec9815122ada7a0ff707c" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Thu Jun 10 13:56:33 2010 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 06 17:32:07 2010 -0700" }, "message": "VFS: introduce s_dirty accessors\n\nThis patch introduces 3 VFS accessors: \u0027sb_mark_dirty()\u0027,\n\u0027sb_mark_clean()\u0027, and \u0027sb_is_dirty()\u0027. They simply\nset \u0027sb-\u003es_dirt\u0027 or test \u0027sb-\u003es_dirt\u0027. The plan is to make\nevery FS use these accessors later instead of manipulating\nthe \u0027sb-\u003es_dirt\u0027 flag directly.\n\nUltimately, this change is a preparation for the periodic\nsuperblock synchronization optimization which is about\npreventing the \"sync_supers\" kernel thread from waking up\neven if there is nothing to synchronize.\n\nThis patch does not do any functional change, just adds\naccessor functions.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "47a716cf0ca981b9549ec9815122ada7a0ff707c", "tree": "9b949cce3f111c41478b6bbe404b7fdf525ef45f", "parents": [ "1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd", "b945d6b2554d550fe95caadc61e521c0ad71fb9c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 06 17:16:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 06 17:16:09 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rbtree: Undo augmented trees performance damage and regression\n x86, Calgary: Limit the max PHB number to 256\n" }, { "commit": "83ba7b071f30f7c01f72518ad72d5cd203c27502", "tree": "4737320dcce72cfff4d87d835e4f78428eca7ef5", "parents": [ "edadfb10ba35da7253541e4155aa92eff758ebe6" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Jul 06 08:59:53 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 06 08:59:53 2010 +0200" }, "message": "writeback: simplify the write back thread queue\n\nFirst remove items from work_list as soon as we start working on them. This\nmeans we don\u0027t have to track any pending or visited state and can get\nrid of all the RCU magic freeing the work items - we can simply free\nthem once the operation has finished. Second use a real completion for\ntracking synchronous requests - if the caller sets the completion pointer\nwe complete it, otherwise use it as a boolean indicator that we can free\nthe work item directly. Third unify struct wb_writeback_args and struct\nbdi_work into a single data structure, wb_writeback_work. Previous we\nset all parameters into a struct wb_writeback_args, copied it into\nstruct bdi_work, copied it again on the stack to use it there. Instead\nof just allocate one structure dynamically or on the stack and use it\nall the way through the stack.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "edadfb10ba35da7253541e4155aa92eff758ebe6", "tree": "a3c676f7b2c9b301d7e1948febeaba76ea1c5850", "parents": [ "9c3a8ee8a1d72c5c0d7fbdf426d80e270ddfa54c" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Thu Jun 10 12:07:54 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 06 08:54:08 2010 +0200" }, "message": "writeback: split writeback_inodes_wb\n\nThe case where we have a superblock doesn\u0027t require a loop here as we scan\nover all inodes in writeback_sb_inodes. Split it out into a separate helper\nto make the code simpler. This also allows to get rid of the sb member in\nstruct writeback_control, which was rather out of place there.\n\nAlso update the comments in writeback_sb_inodes that explain the handling\nof inodes from wrong superblocks.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "9c3a8ee8a1d72c5c0d7fbdf426d80e270ddfa54c", "tree": "fa131760a61f66afeede852622ede0d716965489", "parents": [ "06d738fa9155ff16dba3d7e501ba4581d01a98cb" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Thu Jun 10 12:07:27 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 06 08:54:03 2010 +0200" }, "message": "writeback: remove writeback_inodes_wbc\n\nThis was just an odd wrapper around writeback_inodes_wb. Removing this\nalso allows to get rid of the bdi member of struct writeback_control\nwhich was rather out of place there.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "bcfcc450baaaa44afc1d3c51ef96a53338ff0eb2", "tree": "123a988524aec67145c9b6becfdd6d5993525e87", "parents": [ "3390712a474abdcd3de10024dd1062e5928d381c" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 02 07:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 20:08:05 2010 -0700" }, "message": "net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n\nnetif_vdbg() was originally defined as entirely equivalent to\nnetdev_vdbg(), but I assume that it was intended to take the same\nparameters as netif_dbg() etc. (Currently it is only used by the\nsfc driver, in which I worked on that assumption.)\n\nIn commit a4ed89c I changed the definition used when VERBOSE_DEBUG is\nnot defined, but I failed to notice that the definition used when\nVERBOSE_DEBUG is defined was also not as I expected. Change that to\nmatch netif_dbg() as well.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b945d6b2554d550fe95caadc61e521c0ad71fb9c", "tree": "0b76cdb978bead82188de40cae6d24bd88d71b7d", "parents": [ "d596043d71ff0d7b3d0bead19b1d68c55f003093" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Sat May 29 15:31:43 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 05 14:43:50 2010 +0200" }, "message": "rbtree: Undo augmented trees performance damage and regression\n\nReimplement augmented RB-trees without sprinkling extra branches\nall over the RB-tree code (which lives in the scheduler hot path).\n\nThis approach is \u0027borrowed\u0027 from Fabio\u0027s BFQ implementation and\nrelies on traversing the rebalance path after the RB-tree-op to\ncorrect the heap property for insertion/removal and make up for\nthe damage done by the tree rotations.\n\nFor insertion the rebalance path is trivially that from the new\nnode upwards to the root, for removal it is that from the deepest\nnode in the path from the to be removed node that will still\nbe around after the removal.\n\n[ This patch also fixes a video driver regression reported by\n Ali Gholami Rudi - the memtype-\u003esubtree_max_end was updated\n incorrectly. ]\n\nAcked-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nAcked-by: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nTested-by: Ali Gholami Rudi \u003cali@rudi.ir\u003e\nCc: Fabio Checconi \u003cfabio@gandalf.sssup.it\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003c1275414172.27810.27961.camel@twins\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ff49d74ad383f54041378144ca1a229ee9aeaa59", "tree": "6f37335e313c9a680db8d4e4ce00d17aa11a099b", "parents": [ "e3668dd83ba5958429984286efbc3055be5344c4" ], "author": { "name": "Yehuda Sadeh", "email": "yehuda@hq.newdream.net", "time": "Sat Jul 03 13:07:35 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 04 20:17:22 2010 -0700" }, "message": "module: initialize module dynamic debug later\n\nWe should initialize the module dynamic debug datastructures\nonly after determining that the module is not loaded yet. This\nfixes a bug that introduced in 2.6.35-rc2, where when a trying\nto load a module twice, we also load it\u0027s dynamic printing data\ntwice which causes all sorts of nasty issues. Also handle\nthe dynamic debug cleanup later on failure.\n\nSigned-off-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (removed a #ifdef)\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e2aec372ff4b7e78e79c308104a860ae0ed20950", "tree": "0a399810f9a506121bc7effb0a9127792527ea36", "parents": [ "f0796d5c73e59786d09a1e617689d1d415f2db44" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu Jul 01 13:18:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:08 2010 -0700" }, "message": "linux/net.h: fix kernel-doc warnings\n\nFix kernel-doc warnings in linux/net.h:\n\nWarning(include/linux/net.h:151): No description found for parameter \u0027wq\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027fasync_list\u0027 description in \u0027socket\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027wait\u0027 description in \u0027socket\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "123f94f22e3d283dfe68742b269c245b0501ad82", "tree": "1d40043b0909f309cf77204ea87be9e61f143e79", "parents": [ "4b78c119f0ba715b4e29b190bf4d7bce810ea0d6", "8c215bd3890c347dfb6a2db4779755f8b9c298a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 02 09:52:58 2010 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Cure nr_iowait_cpu() users\n init: Fix comment\n init, sched: Fix race between init and kthreadd\n" }, { "commit": "826456989f1e9fe15daf2183c630ea9c7ab7c46d", "tree": "fa5dec62b73dfad09ad49f1e2797a0e303bd194b", "parents": [ "980533b018fda7ae4c4fb6863b75a0e282d2ffd2", "1529c69adce1e95f7ae72f0441590c226bbac7fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:40:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 18:40:54 2010 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1\n ahci,ata_generic: let ata_generic handle new MBP w/ MCP89\n libahci: Fix bug in storing EM messages\n" }, { "commit": "c6353b4520788e34098bbf61c73fb9618ca7fdd6", "tree": "89146e7b8e282b907021bae657b4bf18c74d9858", "parents": [ "f9ce889b8f8384ee29e1be4b34091a932e6e40f3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jun 17 11:42:22 2010 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Jul 01 15:34:46 2010 -0400" }, "message": "ahci,ata_generic: let ata_generic handle new MBP w/ MCP89\n\nFor yet unknown reason, MCP89 on MBP 7,1 doesn\u0027t work w/ ahci under\nlinux but the controller doesn\u0027t require explicit mode setting and\nworks fine with ata_generic. Make ahci ignore the controller on MBP\n7,1 and let ata_generic take it for now.\n\nReported in bko#15923.\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d15923\n\nNVIDIA is investigating why ahci mode doesn\u0027t work.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Peer Chen \u003cpchen@nvidia.com\u003e\nCc: stable@kernel.org\nReported-by: Anders Østhus \u003cgrapz666@gmail.com\u003e\nReported-by: Andreas Graf \u003candreas_graf@csgraf.de\u003e\nReported-by: Benoit Gschwind \u003cgschwind@gnu-log.net\u003e\nReported-by: Damien Cassou \u003cdamien.cassou@gmail.com\u003e\nReported-by: tixetsal@juno.com\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "bf4f42b441919417386beb2f9c58e802e7de89df", "tree": "39fce2e84056f6c2d7cb1966289bfb52cd6ffdab", "parents": [ "1e31b0ffbb3b10133044e9c4bec4bd4b3f278229", "2f9c6b0a91a050669dd6df487174de6b96c2774a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 01 09:36:49 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)\n drm/radeon/kms: remove rv100 bios connector quirk\n drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode\n DRM / radeon / KMS: Fix hibernation regression related to radeon PM (was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300)\n drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2)\n drm/radeon: add quirk to make HP nx6125 laptop resume.\n drm/radeon/kms: add some missing regs to evergreen gpu init\n drm/radeon/kms: fix typos in evergreen command checker\n drm/radeon/kms: avoid oops on mac r4xx cards\n fb: fix colliding defines for fb flags.\n drm/radeon/kms: Force HDP_NONSURF to maximum size\n drm/radeon/kms: disable frac fb dividers for rs6xx\n drm/radeon/kms: don\u0027t read attempt to read bios from VRAM on unposted GPU.\n drm/radeon/kms: fix typo in evergreen_gpu_init\n drm/radeon/kms: return ret in cursor_set failure path\n drm/ttm: non pooled page allocation should have GFP_USER set\n drm/radeon/r100/r200: fix calculation of compressed cube maps\n drm/radeon/r200: handle more hw tex coord types\n drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx\n drm/radeon: add fake RN50 table for powerpc\n drm/fb: Fix video\u003d mode computation\n ...\n" }, { "commit": "8c215bd3890c347dfb6a2db4779755f8b9c298a9", "tree": "e6bd5de8a028babe9ec75f744977bd1424df106c", "parents": [ "9715856922bf8475f5428c29b6f4a9eebc97d391" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Thu Jul 01 09:07:17 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jul 01 09:39:48 2010 +0200" }, "message": "sched: Cure nr_iowait_cpu() users\n\nCommit 0224cf4c5e (sched: Intoduce get_cpu_iowait_time_us())\nbroke things by not making sure preemption was indeed disabled\nby the callers of nr_iowait_cpu() which took the iowait value of\nthe current cpu.\n\nThis resulted in a heap of preempt warnings. Cure this by making\nnr_iowait_cpu() take a cpu number and fix up the callers to pass\nin the right number.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arjan van de Ven \u003carjan@infradead.org\u003e\nCc: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: linux-pm@lists.linux-foundation.org\nLKML-Reference: \u003c1277968037.1868.120.camel@laptop\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b26c949755c06ec79e55a75817210083bd78fc9a", "tree": "6ca63a7ca5f6f5130b223b6e4b1ae9606e4e940a", "parents": [ "46fcd2b3dbf58a448b621d3d2f492a0e90223a3a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 23 11:35:41 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 01 11:59:34 2010 +1000" }, "message": "fb: fix colliding defines for fb flags.\n\nWhen I added the flags I must have been using a 25 line terminal and missed the following flags.\n\nThe collided with flag has one user in staging despite being in-tree for 5 years.\n\nI\u0027m happy to push this via my drm tree unless someone really wants to do it.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439", "tree": "705bd91dafd562a38d3833edb30297abf0516459", "parents": [ "08e554b17bfdc2682599c8c2770b088a0187a405" ], "author": { "name": "Saeed Bishara", "email": "saeed@marvell.com", "time": "Sun Jun 27 00:26:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:01:11 2010 -0700" }, "message": "mv643xx_eth: use sw csum for big packets\n\nSome controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size.\n\nSigned-off-by: Saeed Bishara \u003csaeed@marvell.com\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c59690fa484c04ab96fe932241b569a09755a4d2", "tree": "ebc009b73b806007868a2a6f13357dfe90d89132", "parents": [ "3267a87f9dc38d036571ff0880533d9ae8989f01" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Wed Jun 30 00:53:53 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jun 30 01:21:38 2010 -0700" }, "message": "Input: i8042 - mark stubs in i8042.h \"static inline\"\n\nOtherwise we may run into following:\n\ndrivers/platform/built-in.o: In function `i8042_lock_chip\u0027:\n/home/test/ws2/projects/linux-2.6/include/linux/i8042.h:50: multiple definition of `i8042_lock_chip\u0027\ndrivers/input/serio/built-in.o:/home/test/ws2/projects/linux-2.6/include/linux/i8042.h:50: first defined here\n...\nmake[1]: *** [drivers/built-in.o] Error 1\nmake: *** [drivers] Error 2\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "9c695203a7ddbe49dba5f22f4c941d24f47475df", "tree": "0dcfa624ecb7c5810f7062fe950bf3f0de2e55b2", "parents": [ "2952095c6b2eefd068dda0dee6317cf95155a304" ], "author": { "name": "Mikael Pettersson", "email": "mikpe@it.uu.se", "time": "Tue Jun 29 15:05:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 15:29:31 2010 -0700" }, "message": "compiler-gcc.h: gcc-4.5 needs noclone and noinline on __naked functions\n\nA __naked function is defined in C but with a body completely implemented\nby asm(), including any prologue and epilogue. These asm() bodies expect\nstandard calling conventions for parameter passing. Older GCCs implement\nthat correctly, but 4.[56] currently do not, see GCC PR44290. In the\nLinux kernel this breaks ARM, causing most arch/arm/mm/copypage-*.c\nmodules to get miscompiled, resulting in kernel crashes during bootup.\n\nPart of the kernel fix is to augment the __naked function attribute to\nalso imply noinline and noclone. This patch implements that, and has been\nverified to fix boot failures with gcc-4.5 compiled 2.6.34 and 2.6.35-rc1\nkernels. The patch is a no-op with older GCCs.\n\nSigned-off-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: Khem Raj \u003craj.khem@gmail.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: \u003cstable@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": "984bc9601f64fd341b8573021d7c999f1f1499a9", "tree": "06c616a6285b00d1e577902face3e8a986370b34", "parents": [ "57439f878afafefad8836ebf5c49da2a0a746105", "1b99973f1c82707e46e8cb9416865a1e955e8f8c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:42:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:42:52 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n block: Don\u0027t count_vm_events for discard bio in submit_bio.\n cfq: fix recursive call in cfq_blkiocg_update_completion_stats()\n cfq-iosched: Fixed boot warning with BLK_CGROUP\u003dy and CFQ_GROUP_IOSCHED\u003dn\n cfq: Don\u0027t allow queue merges for queues that have no process references\n block: fix DISCARD_BARRIER requests\n cciss: set SCSI max cmd len to 16, as default is wrong\n cpqarray: fix two more wrong section type\n cpqarray: fix wrong __init type on pci probe function\n drbd: Fixed a race between disk-attach and unexpected state changes\n writeback: fix pin_sb_for_writeback\n writeback: add missing requeue_io in writeback_inodes_wb\n writeback: simplify and split bdi_start_writeback\n writeback: simplify wakeup_flusher_threads\n writeback: fix writeback_inodes_wb from writeback_inodes_sb\n writeback: enforce s_umount locking in writeback_inodes_sb\n writeback: queue work on stack in writeback_inodes_sb\n writeback: fix writeback completion notifications\n" }, { "commit": "57439f878afafefad8836ebf5c49da2a0a746105", "tree": "ec11dd35704aa37d77a5fd8404fda57f297a3834", "parents": [ "5904b3b81d25166e5e39b9727645bb47937618e3" ], "author": { "name": "npiggin@suse.de", "email": "npiggin@suse.de", "time": "Thu Jun 24 13:02:14 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 29 10:38:22 2010 -0700" }, "message": "fs: fix superblock iteration race\n\nlist_for_each_entry_safe is not suitable to protect against concurrent\nmodification of the list. 6754af6 introduced a race in sb walking.\n\nlist_for_each_entry can use the trick of pinning the current entry in\nthe list before we drop and retake the lock because it subsequently\nfollows cur-\u003enext. However list_for_each_entry_safe saves n\u003dcur-\u003enext\nfor following before entering the loop body, so when the lock is\ndropped, n may be deleted.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Frank Mayhar \u003cfmayhar@google.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bf988435bd5b53529f4408a8efb1f433f6ddfda9", "tree": "7805f577d019f587146b4fd1cf642faacfec2f14", "parents": [ "db048b69037e7fa6a7d9e95a1271a50dc08ae233" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 28 08:45:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 01:00:29 2010 -0700" }, "message": "ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH\n\nstruct ethtool_rxnfc was originally defined in 2.6.27 for the\nETHTOOL_{G,S}RXFH command with only the cmd, flow_type and data\nfields. It was then extended in 2.6.30 to support various additional\ncommands. These commands should have been defined to use a new\nstructure, but it is too late to change that now.\n\nSince user-space may still be using the old structure definition\nfor the ETHTOOL_{G,S}RXFH commands, and since they do not need the\nadditional fields, only copy the originally defined fields to and\nfrom user-space.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5904b3b81d25166e5e39b9727645bb47937618e3", "tree": "2a306f8b0cdea354b3ebc157623dededcf471091", "parents": [ "f3866db8f7534ba8bbb342bebcf5ede542035528", "b70e4f0529c089b00d0a6da13106db4de1ada4c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:24:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:24:43 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing: Fix undeclared ENOSYS in include/linux/tracepoint.h\n perf record: prevent kill(0, SIGTERM);\n perf session: Remove threads from tree on PERF_RECORD_EXIT\n perf/tracing: Fix regression of perf losing kprobe events\n perf_events: Fix Intel Westmere event constraints\n perf record: Don\u0027t call newt functions when not initialized\n" }, { "commit": "f014d937d61f47761f961eba903feb2ffa1793aa", "tree": "4a6a9441b21711e34d567a8066950548935b9b3a", "parents": [ "cf91b415c8419513ada650a932bfb32a526d4d98", "0d98bb2656e9bd2dfda2d089db1fe1dbdab41504" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:18:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 28 12:18:30 2010 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Prevent compiler from optimising the sched_avg_update() loop\n sched: Fix over-scheduling bug\n sched: Fix PROVE_RCU vs cpu_cgroup\n" }, { "commit": "b70e4f0529c089b00d0a6da13106db4de1ada4c7", "tree": "d0c8fdf2272966d5c5db97c7456bb2919afd78ff", "parents": [ "5ffc88819c84098e3f39185a38f8f7f7f8b210df" ], "author": { "name": "Wu Zhangjin", "email": "wuzhangjin@gmail.com", "time": "Mon Jun 21 19:09:09 2010 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jun 21 12:23:36 2010 -0400" }, "message": "tracing: Fix undeclared ENOSYS in include/linux/tracepoint.h\n\nThe header file include/linux/tracepoint.h may be included without\ninclude/linux/errno.h and then the compiler will fail on building for\nundelcared ENOSYS. This patch fixes this problem via including \u003clinux/errno.h\u003e\nto include/linux/tracepoint.h.\n\nSigned-off-by: Wu Zhangjin \u003cwuzhangjin@gmail.com\u003e\nLKML-Reference: \u003c1277118549-622-1-git-send-email-wuzhangjin@gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "da931a931da85218add949266238c54b5fecd37f", "tree": "63f4e081715b00b403bf45d705a636a29d80a7e9", "parents": [ "f5c5f040b565435e9a85898dc87ab365395e0603" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 09:52:37 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 15 09:56:01 2010 +1000" }, "message": "agp: drop vmalloc flag.\n\nSince the code that was too ugly to live is upstream, we can use it now,\ninstead of rolling our own.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "575f552012ec0cd6591fd85ee996d5a5ad1a669a", "tree": "86b9882f04e75e2fb1046f9c82f8c82c86810c80", "parents": [ "29cb48594b873f6193d6327097e504bd3e2314de", "dc66c74de6f4238020db3e2041d4aca5c5b3e9bc" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 12:54:57 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 14 12:54:57 2010 +0200" }, "message": "Merge branch \u0027for-jens\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "dc66c74de6f4238020db3e2041d4aca5c5b3e9bc", "tree": "8df9cdd2f1672217a210e624f4613744e57450e0", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Wed Jun 02 14:31:29 2010 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon Jun 14 12:19:41 2010 +0200" }, "message": "drbd: Fixed a race between disk-attach and unexpected state changes\n\nThis was a very hard to trigger race condition.\n\nIf we got a state packet from the peer, after drbd_nl_disk() has\nalready changed the disk state to D_NEGOTIATING but\nafter_state_ch() was not yet run by the worker, then receive_state()\nmight called drbd_sync_handshake(), which in turn crashed\nwhen accessing p_uuid.\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "42de5532f4a58a52a60bdd8bd4f80f9f210dd65b", "tree": "f624579c4c27e1ffcba5e4141fcc0877c3a6ae56", "parents": [ "e9e8b4dd142da3b6cbf301ba922804d6cdc31a17", "2a6b69765ad794389f2fc3e14a0afa1a995221c2" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 01:15:40 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Jun 12 01:15:40 2010 -0400" }, "message": "Merge branch \u0027bugzilla-13931-sleep-nvs\u0027 into release\n\nConflicts:\n\tdrivers/acpi/sleep.c\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "4cea8706c39023f5f721c88dd0ae17a097a39c98", "tree": "7eb589399dc10944cde2802d68adb5511405446f", "parents": [ "7ae1277a5202109a31d8f81ac99d4a53278dab84", "e79aa8671033535c2e9ffc0a68010ae49ed5734c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 14:20:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 14:20:03 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n wimax/i2400m: fix missing endian correction read in fw loader\n net8139: fix a race at the end of NAPI\n pktgen: Fix accuracy of inter-packet delay.\n pkt_sched: gen_estimator: add a new lock\n net: deliver skbs on inactive slaves to exact matches\n ipv6: fix ICMP6_MIB_OUTERRORS\n r8169: fix mdio_read and update mdio_write according to hw specs\n gianfar: Revive the driver for eTSEC devices (disable timestamping)\n caif: fix a couple range checks\n phylib: Add support for the LXT973 phy.\n net: Print num_rx_queues imbalance warning only when there are allocated queues\n" }, { "commit": "c5444198ca210498e8ac0ba121b4cd3537aa12f7", "tree": "c423d38fe1ac7f51a48e455a19ecbe2354811fca", "parents": [ "b8c2f3474f1077599ec6e90c2f263f17055cc3d8" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Jun 08 18:15:15 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Jun 11 12:58:08 2010 +0200" }, "message": "writeback: simplify and split bdi_start_writeback\n\nbdi_start_writeback now never gets a superblock passed, so we can just remove\nthat case. And to further untangle the code and flatten the call stack\nsplit it into two trivial helpers for it\u0027s two callers.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "597a264b1a9c7e36d1728f677c66c5c1f7e3b837", "tree": "22db16f0a7b54ece127e127e152e9172456d9e1c", "parents": [ "00d9d6a185de89edc0649ca4ead58f0283dfcbac" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jun 03 09:30:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:23:34 2010 -0700" }, "message": "net: deliver skbs on inactive slaves to exact matches\n\nCurrently, the accelerated receive path for VLAN\u0027s will\ndrop packets if the real device is an inactive slave and\nis not one of the special pkts tested for in\nskb_bond_should_drop(). This behavior is different then\nthe non-accelerated path and for pkts over a bonded vlan.\n\nFor example,\n\nvlanx -\u003e bond0 -\u003e ethx\n\nwill be dropped in the vlan path and not delivered to any\npacket handlers at all. However,\n\nbond0 -\u003e vlanx -\u003e ethx\n\nand\n\nbond0 -\u003e ethx\n\nwill be delivered to handlers that match the exact dev,\nbecause the VLAN path checks the real_dev which is not a\nslave and netif_recv_skb() doesn\u0027t drop frames but only\ndelivers them to exact matches.\n\nThis patch adds a sk_buff flag which is used for tagging\nskbs that would previously been dropped and allows the\nskb to continue to skb_netif_recv(). Here we add\nlogic to check for the deliver_no_wcard flag and if it\nis set only deliver to handlers that match exactly. This\nmakes both paths above consistent and gives pkt handlers\na way to identify skbs that come from inactive slaves.\nWithout this patch in some configurations skbs will be\ndelivered to handlers with exact matches and in others\nbe dropped out right in the vlan path.\n\nI have tested the following 4 configurations in failover modes\nand load balancing modes.\n\n# bond0 -\u003e ethx\n\n# vlanx -\u003e bond0 -\u003e ethx\n\n# bond0 -\u003e vlanx -\u003e ethx\n\n# bond0 -\u003e ethx\n |\n vlanx -\u003e --\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "dd4c4f17d722ffeb2515bf781400675a30fcead7" }