)]}' { "log": [ { "commit": "40d0802b3eb47d57e2d57a5244a18cbbe9632e13", "tree": "fd45987286080e1f711c2448f6fbdc7d362a0241", "parents": [ "250ad8f55c06eb866cfb57f8d3ea6ff961a7d1d7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Aug 26 22:03:08 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 26 22:03:08 2010 -0700" }, "message": "gro: __napi_gro_receive() optimizations\n\ncompare_ether_header() can have a special implementation on 64 bit\narches if CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is defined.\n\n__napi_gro_receive() and vlan_gro_common() can avoid a conditional\nbranch to perform device match.\n\nOn x86_64, __napi_gro_receive() has now 38 instructions instead of 53\n\nAs gcc-4.4.3 still choose to not inline it, add inline keyword to this\nperformance critical function.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "145ce502e44b57c074c72cfdc855557e19026999", "tree": "fd663feae03f5c5f4a31ceecd6a61e790344b8b3", "parents": [ "dee06e4702b5a64b9ca81e650d66223c5b3e7f14" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Aug 24 13:21:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 26 14:11:48 2010 -0700" }, "message": "net/sctp: Use pr_fmt and pr_\u003clevel\u003e\n\nChange SCTP_DEBUG_PRINTK and SCTP_DEBUG_PRINTK_IPADDR to\nuse do { print } while (0) guards.\nAdd SCTP_DEBUG_PRINTK_CONT to fix errors in log when\nlines were continued.\nAdd #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\nAdd a missing newline in \"Failed bind hash alloc\"\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad01b7d480a4a135f974afd5c617c417e0b0542f", "tree": "bd69865fb4bb323e697d46c8b0365ec1774a9696", "parents": [ "ac75791aa943c7953521cb4fa7728bf51f9abd2d" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Mon Aug 23 20:40:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 16:30:51 2010 -0700" }, "message": "stmmac: make ioaddr \u0027void __iomem *\u0027 rather than unsigned long\n\nThis avoids unnecessary casting and adds the ioaddr in the\nprivate structure.\nThis patch also removes many warning when compile the driver.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e569aa78ba01f7f66e016a4d57310fd041524d17", "tree": "eaedc03d42ee2bf6200fc07b080a99bad103def3", "parents": [ "4562487a00445eab96311365ba15c41dc4d043cd", "268bae0b6879f238ba57f5f801958d1254e136f7" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 25 14:51:42 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 25 14:51:42 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n\nConflicts:\n\tdrivers/net/wireless/libertas/if_sdio.c\n" }, { "commit": "0533943c5c45cce2e26432bf0a6b8e114757c897", "tree": "8405db10a70b0a2a9f4c04528e4bcffdbb7189c6", "parents": [ "d7e1a487d31933deba742c1bd3ffe0f73220b729" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Aug 24 03:46:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 24 14:57:09 2010 -0700" }, "message": "mlx4_en: UDP RSS support\n\nAdding capability for RSS for UDP traffic, hashing is done based on\nIP addresses and UDP port number.\nThe support depends on HW/FW capabilities.\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7699517db435fd24143bd32dd644275e3eeb4c86", "tree": "e39bad6758eb4172cd4bafe481803c8f752a2630", "parents": [ "e7c1c2c46201e46f8ce817196507d2ffd3dafd8e" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Aug 24 03:46:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 24 14:54:51 2010 -0700" }, "message": "mlx4_en: Fixing report in Ethtool get_settings\n\nThe report now based on query from FW, giving the correct tranciever type\nand link speed.\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e7c1c2c46201e46f8ce817196507d2ffd3dafd8e", "tree": "33579da64d2c5dc4502518496097dcf9737e9eb4", "parents": [ "3005ad40b95168aad530f1179cff47411b3ea8da" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Tue Aug 24 03:46:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 24 14:54:51 2010 -0700" }, "message": "mlx4_en: Added self diagnostics test implementation\n\nThe selftest includes 5 features:\n1. Interrupt test: Executing commands and receiving command completion\n on all our interrupt vectors.\n2. Link test: Verifying we are connected to valid link partner.\n3. Speed test: Check that we negotiated link speed correctly.\n4. Registers test: Activate HW health check command.\n5. Loopback test: Send a packet on loopback interface and catch it on RX side.\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2e3143e3c46ede22336316b3ff4746727c0d93a", "tree": "28fa33bc3ef923614066377e5a954b88cb87148a", "parents": [ "5a46790ca4c40fdb6ed5336d7d6b593c96326b31" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Tue Aug 24 14:48:10 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 24 14:48:10 2010 -0700" }, "message": "tc: add meta match on receive hash\n\nTrivial extension to existing meta data match rules to allow\nmatching on skb receive hash value.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a46790ca4c40fdb6ed5336d7d6b593c96326b31", "tree": "84ca2e08453f06361a593484550783110e03c207", "parents": [ "ec550d246e38e1b4ea8604b5c71ccb72e38f3290" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Aug 24 14:46:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 24 14:46:53 2010 -0700" }, "message": "include/linux/if_ether.h: Remove unused #define MAC_FMT\n\nLast use was removed, so remove the #define.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d70e96932de55fb2c05b1c0af1dff178651a9b77", "tree": "aa79113a4fffbc5e3163effd3949ad39e31a71c0", "parents": [ "672ddeffeb2afad18fe1a2fc5aa14a07b4da1551" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Aug 19 16:11:27 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Aug 24 16:32:06 2010 -0400" }, "message": "cfg80211: add some documentation\n\nAdd some documentation for cfg80211. I\u0027m hoping some of\nthe regulatory documentation will be filled by somebody\nmore familiar with it, hint hint! :)\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2a5fb7b088f8418958775774dda9427d6c73c522", "tree": "8636210464e45eea32025d685ddeb367f595b6a0", "parents": [ "633dd1ea683d907af944bcd9814092efe9869b05" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Aug 18 17:44:36 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Aug 24 16:32:04 2010 -0400" }, "message": "nl80211: some documentation fixes\n\nThe nl80211 documentation is currently never\ngenerated, so problems have accumulated. Fix\nmost of the trivial ones.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "633dd1ea683d907af944bcd9814092efe9869b05", "tree": "ac03a42f4c14ac66689df6b069d35cc763687677", "parents": [ "7273b9700b74e8c26b612207aea47effb0e530bf" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Aug 18 15:01:23 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Aug 24 16:32:04 2010 -0400" }, "message": "mac80211: fix docbook\n\nFix a small problem in the documentation for\nieee80211_request_smps, and a now erroneous\ninclusion of enum ieee80211_key_alg, which no\nlonger exists after the change to ciphers.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d2730b2a6a019d14455556019d744ab051e6554b", "tree": "e1321ef2496cd0061071df0e1e9adfb1fa317534", "parents": [ "e723ef305c36785c08af9463b3a3ec369dfcedcb" ], "author": { "name": "Gábor Stefanik", "email": "netrolller.3d@gmail.com", "time": "Mon Aug 16 22:39:16 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Aug 24 16:28:11 2010 -0400" }, "message": "b43: N-PHY: Implement MAC PHY clock set\n\nSigned-off-by: Gábor Stefanik \u003cnetrolller.3d@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2e161f78e5f63a7f9fd25a766bb7f816a01eb14a", "tree": "befd44feeb1f47da1f41e6fc310a223ad67030ff", "parents": [ "ac4c977d16d843f12901595c91773dddb65768a9" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Aug 12 15:38:38 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Aug 24 16:27:56 2010 -0400" }, "message": "cfg80211/mac80211: extensible frame processing\n\nAllow userspace to register for more than just\naction frames by giving the frame subtype, and\nmake it possible to use this in various modes\nas well.\n\nWith some tweaks and some added functionality\nthis will, in the future, also be usable in AP\nmode and be able to replace the cooked monitor\ninterface currently used in that case.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "633adf1ad1c92c02bd3f10bbd73737a969179378", "tree": "3f23d54719a1742d9326d61b6820147185cdb60c", "parents": [ "b68b3c4d92ff2440414137763477648e6db6c96f" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Aug 12 14:49:58 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Aug 24 16:27:54 2010 -0400" }, "message": "cfg80211: mark ieee80211_hdrlen const\n\nThis function analyses only its single, value-passed\nargument, and has no side effects. Thus it can be\nconst, which makes mac80211 smaller, for example:\n\n text\t data\t bss\t dec\t hex\tfilename\n 362518\t 16720\t 884\t 380122\t 5ccda\tmac80211.ko (before)\n 362358\t 16720\t 884\t 379962\t 5cc3a\tmac80211.ko (after)\n\na 160 byte saving in text size, and an optimisation\nbecause the function won\u0027t be called as often.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1726442e115a9e58f40747d009a5b4f303e0840a", "tree": "fbf95da050125bfa0656292c54bd856cf113db37", "parents": [ "0fdc100bdc4b7ab61ed632962c76dfe539047296" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Mon Aug 23 16:26:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 20:43:17 2010 -0700" }, "message": "net: increase the size of priv_flags and add IFF_OVS_DATAPATH\n\nIFF_OVS_DATAPATH is a place-holder for the Open vSwitch datapath\nwhich I am preparing to submit for merging.\n\nAs all 16 bits of priv_flags are already assigned flags, also increase\nthe size of priv_flags to 32 bits.\n\nUnfortunately, by my calculations this increases the size of\nstruct net_device by 4 bytes on 32bit architectures and\n8 bytes on 64 bit architectures. I couldn\u0027t see an obvious\nway to avoid that.\n\nCc: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b230ed8ec96c933047dd0625cf95f739e4939a6", "tree": "517e761a804a2b2f9631b755abcbf525240b916e", "parents": [ "231cc2aaf14bad3b2325be0b19b8385ff5e75485" ], "author": { "name": "Rasesh Mody", "email": "rmody@brocade.com", "time": "Mon Aug 23 20:24:12 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 20:24:12 2010 -0700" }, "message": "bna: Brocade 10Gb Ethernet device driver\n\nThis is patch 1/6 which contains linux driver source for\nBrocade\u0027s BR1010/BR1020 10Gb CEE capable ethernet adapter.\n\nSigned-off-by: Debashis Dutt \u003cddutt@brocade.com\u003e\nSigned-off-by: Rasesh Mody \u003crmody@brocade.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21dc330157454046dd7c494961277d76e1c957fe", "tree": "4f030efa8d82f7eb9676acd4cfc74921a6d29972", "parents": [ "2d4833aae65589ba4317dd325fe20c8b25c14173" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 00:13:46 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 00:13:46 2010 -0700" }, "message": "net: Rename skb_has_frags to skb_has_frag_list\n\nSKBs can be \"fragmented\" in two ways, via a page array (called\nskb_shinfo(skb)-\u003efrags[]) and via a list of SKBs (called\nskb_shinfo(skb)-\u003efrag_list).\n\nSince skb_has_frags() tests the latter, it\u0027s name is confusing\nsince it sounds more like it\u0027s testing the former.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2d4833aae65589ba4317dd325fe20c8b25c14173", "tree": "231672eb67197387f94bfda9a0995ddd002dbfbd", "parents": [ "f3c58aceaa3f237ba43735805f4677950327b8ee", "6a6d01d374d03bd2f90030200cb78567444addc4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 22:37:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 22:37:04 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tinclude/linux/if_pppox.h\n\nFix conflict between Changli\u0027s __packed header file fixes and\nthe new PPTP driver.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "09cd2b99c6cdd1e14e84c1febca2fb91e9f4e5ba", "tree": "87d9c912d5d73a1017773a5b0d30d564e8a7895c", "parents": [ "48d3ff82698cb0094684aed70446e0a5cbb1a4d0" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sun Aug 22 17:25:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 21:15:39 2010 -0700" }, "message": "header: fix broken headers for user space\n\n__packed is only defined in kernel space, so we should use\n__attribute__((packed)) for the code shared between kernel and user space.\n\nTwo __attribute() annotations are replaced with __attribute__() too.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fcb12fd2236f49aa8fdc1568ed4ebdfe4fddc6b5", "tree": "e4d20f6190bd00156add89f0b0c42c2a8c30bfc1", "parents": [ "cd709aa90648195e5b5823fa90eb0b3fb0e78ee4" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sun Aug 22 16:41:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 21:09:04 2010 -0700" }, "message": "net: rds: remove duplication type definitions\n\n__be* are defined in linux/types.h now, and in fact, rds.h isn\u0027t exported\nto user space even.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05532121da0728eaedac2a0a5c3cecad3a95d765", "tree": "1b1ff9e02b87527868c7698f0369d00d4c86a0a0", "parents": [ "2436243a39de56f03d38c74139261cc61bea8456" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sun Aug 22 21:03:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 21:03:33 2010 -0700" }, "message": "net: 802.1q: make vlan_hwaccel_do_receive() return void\n\nvlan_hwaccel_do_receive() always returns 0, so make it return void.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d8287fc864643beaf1623c92aceb1ab38eae0648", "tree": "f24ab1748d6b96fe612e9d2744680d1f128ce38e", "parents": [ "773bc97397ea2cfc2ff3c075f712aaf376ed7cb0" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sun Aug 22 18:37:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 18:37:27 2010 -0700" }, "message": "net: use __be16 instead of u16 for the userspace code\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "739a91ef0625e0e4a40b835f4f891313c47915df", "tree": "bfcb025c8b446a81e82f0b57ad76168996ce49bc", "parents": [ "81ce790bd75d49a0d119f5d7b27405e1d9b1bd57" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Aug 21 06:23:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:40:14 2010 -0700" }, "message": "net_sched: cls_flow: add key rxhash\n\nWe can use rxhash to classify the traffic into flows. As rxhash maybe\nsupplied by NIC or RPS, it is cheaper.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81ce790bd75d49a0d119f5d7b27405e1d9b1bd57", "tree": "205553c0d932bb81951c77aaed1e7e8b97473248", "parents": [ "d3c6e7ad09cebbad1a3dea077668062136626fd2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Aug 19 23:51:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:32:31 2010 -0700" }, "message": "irda: use net_device_stats from struct net_device\n\nstruct net_device has its own struct net_device_stats member, so use\nthis one instead of a private copy in the irlan_cb struct.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3c6e7ad09cebbad1a3dea077668062136626fd2", "tree": "698022508a8d8c76a5d2cf55e50232079d6b1f42", "parents": [ "c3227e546c574172e77616270a16a04eae561b8f", "48d3ff82698cb0094684aed70446e0a5cbb1a4d0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:32:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:32:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "00959ade36acadc00e757f87060bf6e4501d545f", "tree": "9bfe790d4a8b63b0e6653388da73dfd777eea8ff", "parents": [ "1003489e06c04d807c783a8958f2ccc9aed7a244" ], "author": { "name": "Dmitry Kozlov", "email": "xeb@mail.ru", "time": "Sat Aug 21 23:05:39 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:05:39 2010 -0700" }, "message": "PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)\n\nPPP: introduce \"pptp\" module which implements point-to-point tunneling protocol using pppox framework\nNET: introduce the \"gre\" module for demultiplexing GRE packets on version criteria\n (required to pptp and ip_gre may coexists)\nNET: ip_gre: update to use the \"gre\" module\n\nThis patch introduces then pptp support to the linux kernel which\ndramatically speeds up pptp vpn connections and decreases cpu usage in\ncomparison of existing user-space implementation\n(poptop/pptpclient). There is accel-pptp project\n(https://sourceforge.net/projects/accel-pptp/) to utilize this module,\nit contains plugin for pppd to use pptp in client-mode and modified\npptpd (poptop) to build high-performance pptp NAS.\n\nThere was many changes from initial submitted patch, most important are:\n1. using rcu instead of read-write locks\n2. using static bitmap instead of dynamically allocated\n3. using vmalloc for memory allocation instead of BITS_PER_LONG + __get_free_pages\n4. fixed many coding style issues\nThanks to Eric Dumazet.\n\nSigned-off-by: Dmitry Kozlov \u003cxeb@mail.ru\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb4d40654505e47aa9d2035bb97f631fa61d14b4", "tree": "bed2a1c5026e9797c0ed48c67c48b050e7f07e3c", "parents": [ "49e8ab03ebcacd8e37660ffec20c0c46721a2800" ], "author": { "name": "Grégoire Baron", "email": "baronchon@n7mm.org", "time": "Wed Aug 18 13:10:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 20 01:42:59 2010 -0700" }, "message": "net/sched: add ACT_CSUM action to update packets checksums\n\nnet/sched: add ACT_CSUM action to update packets checksums\n\nACT_CSUM can be called just after ACT_PEDIT in order to re-compute some\naltered checksums in IPv4 and IPv6 packets. The following checksums are\nsupported by this patch:\n - IPv4: IPv4 header, ICMP, IGMP, TCP, UDP \u0026 UDPLite\n - IPv6: ICMPv6, TCP, UDP \u0026 UDPLite\nIt\u0027s possible to request in the same action to update different kind of\nchecksums, if the packets flow mix TCP, UDP and UDPLite, ...\n\nAn example of usage is done in the associated iproute2 patch.\n\nVersion 3 changes:\n - remove useless goto instructions\n - improve IPv6 hop options decoding\n\nVersion 2 changes:\n - coding style correction\n - remove useless arguments of some functions\n - use stack in tcf_csum_dump()\n - add tcf_csum_skb_nextlayer() to factor code\n\nSigned-off-by: Gregoire Baron \u003cbaronchon@n7mm.org\u003e\nAcked-by: jamal \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e760702ed8333588f9f21e7bf6597873993006f1", "tree": "75a0be41c269d953a48edfa3d052a08352f85bcd", "parents": [ "dbe5775bbc00116ed5699babfe17c54f32eb34c3" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Aug 17 19:03:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 17:16:23 2010 -0700" }, "message": "net: introduce proto_ports_offset()\n\nIntroduce proto_ports_offset() for getting the position of the ports or\nSPI in the message of a protocol.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2244d07bfa2097cb00600da91c715a8aa547917e", "tree": "44d67d9ffba3697fffeb05c13e88aa76ebc3fd4a", "parents": [ "4d5870ec103e6569851b9710f0093f072b08439a" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Tue Aug 17 08:59:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 00:08:30 2010 -0700" }, "message": "net: simplify flags for tx timestamping\n\nThis patch removes the abstraction introduced by the union skb_shared_tx in\nthe shared skb data.\n\nThe access of the different union elements at several places led to some\nconfusion about accessing the shared tx_flags e.g. in skb_orphan_try().\n\n http://marc.info/?l\u003dlinux-netdev\u0026m\u003d128084897415886\u0026w\u003d2\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e243f5b6de35b6fc394bc2e1e1737afe538e7e0c", "tree": "fac660342a3ceb80099e2cb39ead0465c5530312", "parents": [ "a49f37eed22b74221f271811ea41323654e40dad" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Aug 15 10:03:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 18 23:34:26 2010 -0700" }, "message": "netfilter: fix userspace header warning\n\n\"make headers_check\" issued the following warning:\n\n CHECK include/linux/netfilter (64 files)\nusr/include/linux/netfilter/xt_ipvs.h:19: found __[us]{8,16,32,64} type without #include \u003clinux/types.h\u003e\n\nFix this by as suggested including linux/types.h.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a49f37eed22b74221f271811ea41323654e40dad", "tree": "479815196c1fa81aeb9df013eff572f1c63b759e", "parents": [ "e5093aec2e6b60c3df2420057ffab9ed4a6d2792" ], "author": { "name": "Sachin Sanap", "email": "ssanap@marvell.com", "time": "Fri Aug 13 21:22:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 18 23:30:42 2010 -0700" }, "message": "net: add Fast Ethernet driver for PXA168.\n\nSigned-off-by: Sachin Sanap \u003cssanap@marvell.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1565c7c1c4c8e931bdba66abc8aa6f141a406872", "tree": "2e2f732e113faa24f4b0e7c804b37bf4283595c3", "parents": [ "bfb564e7391340638afe4ad67744a8f3858e7566" ], "author": { "name": "Krishna Kumar", "email": "krkumar2@in.ibm.com", "time": "Wed Aug 04 06:15:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:25 2010 -0700" }, "message": "macvtap: Implement multiqueue for macvtap driver\n\nImplement multiqueue facility for macvtap driver. The idea is that\na macvtap device can be opened multiple times and the fd\u0027s can be\nused to register eg, as backend for vhost.\n\nSigned-off-by: Krishna Kumar \u003ckrkumar2@in.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfb564e7391340638afe4ad67744a8f3858e7566", "tree": "7f079d9c3f020d52efb555db414476c463584967", "parents": [ "6891dd25d3f82e50979b27fde1980aa96320b975" ], "author": { "name": "Krishna Kumar", "email": "krkumar2@in.ibm.com", "time": "Wed Aug 04 06:15:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:24 2010 -0700" }, "message": "core: Factor out flow calculation from get_rps_cpu\n\nFactor out flow calculation code from get_rps_cpu, since other\nfunctions can use the same code.\n\nRevisions:\n\nv2 (Ben): Separate flow calcuation out and use in select queue.\nv3 (Arnd): Don\u0027t re-implement MIN.\nv4 (Changli): skb-\u003edata points to ethernet header in macvtap, and\n\tmake a fast path. Tested macvtap with this patch.\nv5 (Changli):\n\t- Cache skb-\u003erxhash in skb_get_rxhash\n\t- macvtap may not have pow(2) queues, so change code for\n\t queue selection.\n (Arnd):\n\t- Use first available queue if all fails.\n\nSigned-off-by: Krishna Kumar \u003ckrkumar2@in.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "97359d1235eaf634fe706c9faa6e40181cc95fb8", "tree": "5799455c94622eaa6a4fb065bd3b5c350bb705e0", "parents": [ "915a824e30c503157c38115eb6a85f60bb653738" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Aug 10 09:46:38 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 16 16:45:11 2010 -0400" }, "message": "mac80211: use cipher suite selectors\n\nCurrently, mac80211 translates the cfg80211\ncipher suite selectors into ALG_* values.\nThat isn\u0027t all too useful, and some drivers\nbenefit from the distinction between WEP40\nand WEP104 as well. Therefore, convert it\nall to use the cipher suite selectors.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Gertjan van Wingerde \u003cgwingerde@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "04600794958f1833f5571c6cde40f260ab557f55", "tree": "e3e816cb3e99d40c18bffc618cf42dfa11d25c6e", "parents": [ "d1f5b7a34aa5ff703c4966ea2652d4212ac75940" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Aug 05 17:45:15 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 16 15:26:40 2010 -0400" }, "message": "cfg80211: support sysfs namespaces\n\nEnable using network namespaces with\nwireless devices even when sysfs is\nenabled using the same infrastructure\nthat was built for netdevs.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d1f5b7a34aa5ff703c4966ea2652d4212ac75940", "tree": "ecc8f06625bf4e48334420586d7e16f9645aa1e4", "parents": [ "7da7cc1d42d8ce02cca16df8c021e6d657f1f8fd" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Aug 05 17:05:55 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 16 15:26:40 2010 -0400" }, "message": "mac80211: allow drivers to request SM PS mode change\n\nSometimes drivers have more information than the\nstack about how their antennas/chains are used,\nand may require that the SM PS mode be changed.\nThis could happen, for example, when detecting\nthat the user disconnected an antenna. Thus this\npatch introduces API to allow drivers to request\nSM PS mode changes.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7da7cc1d42d8ce02cca16df8c021e6d657f1f8fd", "tree": "3d18e0b36edfcc015d27f66890cf4a8d60c45bda", "parents": [ "1fdaa46e9f26ccbab5e0eb8c4d4f8e1fbf32c7df" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Aug 05 17:02:38 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 16 15:26:40 2010 -0400" }, "message": "mac80211: per interface idle notification\n\nSometimes we don\u0027t just need to know whether or\nnot the device is idle, but also per interface.\nThis adds that reporting capability to mac80211.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9714d315d28aef77a097fe905b25cc273c3d72ad", "tree": "0ae1150b0723e925785ce774c3554f29fda050f6", "parents": [ "84c164a34ffe67908a932a2d641ec1a80c2d5435", "6ccf15a1a76d2ff915cdef6ae4d12d0170087118" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 16 14:40:44 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 16 14:40:44 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "4e6cbfd09c66893e5134c9896e9af353c2322b66", "tree": "274e8374c2b097058a5152da3bf6cf62d99dbad7", "parents": [ "68e887ef21dfd9adcf896ef92a9676bf9036a0aa" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 16:14:13 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 16 14:39:46 2010 -0400" }, "message": "mac80211: support use of NAPI for bottom-half processing\n\nThis patch implement basic infrastructure to support use of NAPI by\nmac80211-based hardware drivers.\n\nBecause mac80211 devices can support multiple netdevs, a dummy netdev\nis used for interfacing with the NAPI code in the core of the network\nstack. That structure is hidden from the hardware drivers, but the\nactual napi_struct is exposed in the ieee80211_hw structure so that the\npoll routines in drivers can retrieve that structure. Hardware drivers\ncan also specify their own weight value for NAPI polling.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2245ba2a3a975656bb303dfaa115accaa4667083", "tree": "cbeb348c43d58461d851907373c34a7b9a985e41", "parents": [ "e2e96c663639a3361bb1a84e666887d308c6c87e", "95ee46aa8698f2000647dfb362400fadbb5807cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:37:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:37:07 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n gcc-4.6: ACPI: fix unused but set variables in ACPI\n ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS\n ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS\n ACPI processor: remove deprecated ACPI procfs I/F\n ACPI power_resource: remove unused procfs I/F\n ACPI: remove deprecated ACPI procfs I/F\n ACPI: introduce drivers/acpi/sysfs.c\n ACPI: introduce module parameter acpi.aml_debug_output\n ACPI: introduce drivers/acpi/debugfs.c\n ACPI, APEI, ERST debug support\n ACPI, APEI, Manage GHES as platform devices\n ACPI, APEI, Rename CPER and GHES severity constants\n ACPI, APEI, Fix a typo of error path of apei_resources_request\n ACPI / ACPICA: Fix reference counting problems with GPE handlers\n ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device\n ACPI / Sleep: Drop acpi_suspend_finish()\n ACPI / Sleep: Consolidate suspend and hibernation routines\n ACPI / Wakeup: Simplify enabling of wakeup devices\n ACPI / Sleep: Rework enabling wakeup devices\n ACPI / Sleep: Free NVS copy if suspending of devices fails\n\nFixed up totally buggered \"ACPI: fix unused but set variables in ACPI\"\npatch that doesn\u0027t even compile in the merge.\n\nThanks to Sedat Dilek \u003csedat.dilek@googlemail.com\u003e for noticing the\nbreakage before I even pulled. And a big \"Grrr..\" at Len for not even\nbothering to compile the tree before asking me to pull.\n" }, { "commit": "7a1b29a82ba76427de791098c095ce31dab9333d", "tree": "077a1563ce243b6ac619397a0b7904623a28de50", "parents": [ "d7824370e26325c881b665350ce64fb0a4fde24a", "a5854dd7f30c3849edf9b9711362e2dd51d3f855" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:31:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:31:43 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: don\u0027t validate CROSS_COMPILE needlessly\n arch/tile: export only COMMAND_LINE_SIZE to userspace.\n arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN\n arch/tile: Rename the hweight() implementations to __arch_hweight()\n arch/tile: extend syscall ABI to set r1 on return as well.\n arch/tile: Various cleanups.\n arch/tile: support backtracing on TILE-Gx\n arch/tile: Fix a couple of issues with the COMPAT code for TILE-Gx.\n arch/tile: Use separate, better minsec values for clocksource and sched_clock.\n arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.\n arch: tile: mm: pgtable.c: Removed duplicated #include\n arch: tile: kernel/proc.c Removed duplicated #include\n Add fanotify syscalls to \u003casm-generic/unistd.h\u003e.\n arch/tile: support new kunmap_atomic() naming convention.\n tile: remove unused ISA_DMA_THRESHOLD define\n\nConflicts in arch/tile/configs/tile_defconfig (pick the mainline version\nwith the reduced defconfig).\n" }, { "commit": "95ee46aa8698f2000647dfb362400fadbb5807cf", "tree": "e5a05c7297f997e191c73091934e42e3195c0e40", "parents": [ "cfa806f059801dbe7e435745eb2e187c8bfe1e7f", "92fa5bd9a946b6e7aab6764e7312e4e3d9bed295" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Aug 15 01:06:31 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Aug 15 01:06:31 2010 -0400" }, "message": "Merge branch \u0027linus\u0027 into release\n\nConflicts:\n\tdrivers/acpi/debug.c\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "d09fe55510257f1acd21ea80a9bdd7c72b5895b3", "tree": "8de6e26f254167fabbc66b4de6f03a44bb57acde", "parents": [ "06af7eb043c02822072cea862fce1b7c74115e8f" ], "author": { "name": "Zhang Rui", "email": "rui.zhang@intel.com", "time": "Thu Jul 15 10:46:41 2010 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Aug 15 00:31:45 2010 -0400" }, "message": "ACPI processor: remove deprecated ACPI procfs I/F\n\nRemove deprecated ACPI processor procfs I/F, including:\n/proc/acpi/processor/CPUX/power\n/proc/acpi/processor/CPUX/limit\n/proc/acpi/processor/CPUX/info\n\n/proc/acpi/processor/CPUX/throttling still exists,\nas we don\u0027t have sysfs I/F available for now.\n\nSigned-off-by: Zhang Rui \u003crui.zhang@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "c172cb73bc79fe69915b1a1a48e374aa4b1f8a59", "tree": "eb3d6415914968441c063f7282e824b14b5a5edb", "parents": [ "e8eb6228094bcf0c84d9aa32b6363e78da68e1f5", "28f4f8a9def2b1f3a6066bae791c77043ec49524" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Aug 15 00:25:40 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Aug 15 00:25:40 2010 -0400" }, "message": "Merge branch \u0027acpica-gpe\u0027 into release\n" }, { "commit": "ecd8ee0955a2f21914c2e2ffff82541211c5bd43", "tree": "3987f3d505482a00e9a1d2c44b340d0b71f66d75", "parents": [ "feb29c5175e61d0f1ec2cbcaccdfa55e588780be", "c637e4861c7db8165d0f438db3829e7878c96059" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Aug 14 23:55:57 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Aug 14 23:55:57 2010 -0400" }, "message": "Merge branch \u0027procfs-cleanup\u0027 into release\n" }, { "commit": "c637e4861c7db8165d0f438db3829e7878c96059", "tree": "7cb2621815f1861d0e333cced6bf993f1b38c4e0", "parents": [ "a25ee9200eef07377e1703697afbb5d81f89e500" ], "author": { "name": "Zhang Rui", "email": "rui.zhang@intel.com", "time": "Thu Jul 15 10:46:17 2010 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Aug 14 23:02:14 2010 -0400" }, "message": "ACPI: introduce module parameter acpi.aml_debug_output\n\nIntroduce module parameter acpi.aml_debug_output.\n\nWith acpi.aml_debug_output set, we can get AML debug object output\n(Store (AAA, Debug)), even with CONFIG_ACPI_DEBUG cleared.\n\nTogether with the runtime custom method mechanism,\nwe can debug AML code problems without rebuilding the kernel.\n\nSigned-off-by: Zhang Rui \u003crui.zhang@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "5d7cb157025b3b4852f38e6e5e97d06ef12c1d78", "tree": "09831b553687b51749ed99dbabaf3687a4e4bd2a", "parents": [ "fc58fb180755cdeda3ce58776eef94a01b37a1c1", "8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 16:21:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 16:21:50 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:\n defconfig reduction\n kbuild: drop unifdef-y support\n archs: replace unifdef-y with header-y\n include: replace unifdef-y with header-y\n" }, { "commit": "d310ad0c9d6354affc8abdcfb189ae1a434f18ae", "tree": "b4daa9dc377e30087b6433a6ab95cc9ef0768528", "parents": [ "c29c08b59875fe053471cf9eb66f8cfef39bc509", "f279941863f0d39fa8285b84449b52b8286a254b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 14:57:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 14:57:58 2010 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (22 commits)\n hwmon: (via-cputemp) Remove bogus \"SHOW\" global variable\n hwmon: jc42 depends on I2C\n hwmon: (pc87427) Add a maintainer\n hwmon: (pc87427) Move sysfs file removal to a separate function\n hwmon: (pc87427) Add temperature monitoring support\n hwmon: (pc87427) Add support for the second logical device\n hwmon: (pc87427) Add support for manual fan speed control\n hwmon: (pc87427) Minor style cleanups\n hwmon: (pc87427) Handle disabled fan inputs properly\n hwmon: (w83627ehf) Add support for W83667HG-B\n hwmon: (w83627ehf) Driver cleanup\n hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller\n hwmon: Remove in[0-*]_fault from sysfs-interface\n hwmon: Add 4 current alarm/beep attributes to sysfs-interface\n hwmon: Add 3 critical limit attributes to sysfs-interface\n hwmon: (asc7621) Clean up and improve detect function\n hwmon: (it87) Export labels for internal sensors\n hwmon: (lm75) Add suspend/resume feature\n hwmon: (emc1403) Add power support\n hwmon: (ltc4245) Expose all GPIO pins as analog voltages\n ...\n" }, { "commit": "60641aa1f379820e99ac7f45a38b43795670c741", "tree": "a4a68780ba75bbf8f2fc96dba880ea39da2c717b", "parents": [ "c29c08b59875fe053471cf9eb66f8cfef39bc509" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 10:15:12 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:51 2010 +0200" }, "message": "include: replace unifdef-y with header-y\n\nunifdef-y and header-y has same semantic.\nSo there is no need to have both.\n\nDrop the unifdef-y variant and sort all lines again\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "5950ec8d3e47a08ec0b678a0e0ba5d1b9b62dd8e", "tree": "8cac7d3dadf50be14b2ac0441e61ecd8935f27e0", "parents": [ "b9783dcebe952bf73449fe70a19ee4814adc81a0" ], "author": { "name": "Ira W. Snyder", "email": "iws@ovro.caltech.edu", "time": "Sat Aug 14 21:08:49 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Aug 14 21:08:49 2010 +0200" }, "message": "hwmon: (ltc4245) Expose all GPIO pins as analog voltages\n\nAdd support for exposing all GPIO pins as analog voltages. Though this is\nnot an ideal use of the chip, some hardware engineers may decide that the\nLTC4245 meets their design requirements when studying the datasheet.\n\nThe GPIO pins are sampled in round-robin fashion, meaning that a slow\nreader will see stale data. A userspace application can detect this,\nbecause it will get -EAGAIN when reading from a sysfs file which contains\nstale data.\n\nUsers can choose to use this feature on a per-chip basis by using either\nplatform data or the OF device tree (where applicable).\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "b171aa27700c78511086a759383b033949c9d7f0", "tree": "2775b0682ea342dd49c5b997de248da73ec83049", "parents": [ "11ac552477e32835cb6970bf0a70c210807f5673", "b4225885deb569f7afcf1f3a9f069f74cc9db591" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:54:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:54:09 2010 -0700" }, "message": "Merge branch \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/amba_pl022: Fix probe and remove hook section annotations.\n spi/mpc5121: change annotations for probe and remove functions\n spi/bitbang: reinitialize transfer parameters for every message\n spi/spi-gpio: add support for controllers without MISO or MOSI pin\n spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes\n SPI100k: Fix 8-bit and RX-only transfers\n spi/mmc_spi: mmc_spi adaptations for SPI bus locking API\n spi/mmc_spi: SPI bus locking API, using mutex\n\nFix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to \u0027struct\nof_device\u0027 \u003d\u003e \u0027struct platform_device\u0027 rename and __init/__exit to\n__devinit/__devexit fix.\n" }, { "commit": "10041d2d14688e207d0d829095147aa82c1f211b", "tree": "57ef361d05e6bbffe3ec490ca9110878a6e969e2", "parents": [ "4914c7f881845367b9198631a014ab466329b9e5", "b19dd42faf413b4705d4adb38521e82d73fa4249" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 17:52:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 17:52:35 2010 -0700" }, "message": "Merge branch \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing\n\n* \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:\n bkl: Remove locked .ioctl file operation\n v4l: Remove reference to bkl ioctl in compat ioctl handling\n logfs: kill BKL\n" }, { "commit": "7d72e6fa56c4100b9669efe0044f77ed9eb785a1", "tree": "5e90bf4969809a1ab20b97432b85be20ccfaa1f4", "parents": [ "ba00376b0b13f234d839541a7b36a5bf5c2a4036", "2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 19:59:15 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 19:59:15 2010 -0400" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "c7887325230aec47d47a32562a6e26014a0fafca", "tree": "10535943dace59ddb01d3440aa582bc4640e8016", "parents": [ "b84ae4a1401a731ef5fee987c0cb08743838dda7" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Aug 11 11:26:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 16:53:13 2010 -0700" }, "message": "Mark arguments to certain syscalls as being const\n\nMark arguments to certain system calls as being const where they should be but\naren\u0027t. The list includes:\n\n (*) The filename arguments of various stat syscalls, execve(), various utimes\n syscalls and some mount syscalls.\n\n (*) The filename arguments of some syscall helpers relating to the above.\n\n (*) The buffer argument of various write syscalls.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b19dd42faf413b4705d4adb38521e82d73fa4249", "tree": "fbfdea065c3772b2de2c37238af6afcad2e42934", "parents": [ "c6d7ba8b12636923f3e30997dec69bed58e176b6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Jul 04 00:15:10 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat Aug 14 00:24:24 2010 +0200" }, "message": "bkl: Remove locked .ioctl file operation\n\nThe last user is gone, so we can safely remove this\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "e259f191f2244df04a7746fac1df8aa68ebd0106", "tree": "e466b1d9018e23a5e06216368a4885059eb89849", "parents": [ "c7dcf87a6881bf796faee83003163eb3de41a309" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Fri Aug 13 09:39:18 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 12:03:24 2010 -0700" }, "message": "dma-mapping: fix build errors on !HAS_DMA architectures\n\ncommit 4565f0170dfc849b3629c27d769db800467baa62 \"dma-mapping: unify\ndma_get_cache_alignment implementations\" causes build errors on\n!HAS_DMA architectures/platforms like s390 and sun3:\n\ninclude/linux/dma-mapping.h:145: error: static declaration of \u0027dma_get_cache_alignment\u0027 follows non-static declaration\ninclude/asm-generic/dma-mapping-broken.h:73: error: previous declaration of \u0027dma_get_cache_alignment\u0027 was here\n\nFix this by adding an explicit ifdef.\n\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f2c779583e9646097b57599f8efeb8eca7bd654", "tree": "aa7c88eb4f4deb668cba56e6f1fddd8dcc5006cf", "parents": [ "2897c684d1d5140e0e0302e73660c7cb97981b27", "3c09e2647b5e1f1f9fd383971468823c2505e1b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:12 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: (30 commits)\n ctcm: rename READ/WRITE defines to avoid redefinitions\n claw: rename READ/WRITE defines to avoid redefinitions\n phylib: available for any speed ethernet\n can: add limit for nframes and clean up signed/unsigned variables\n pkt_sched: Check .walk and .leaf class handlers\n pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops\n caif-spi: Bugfix SPI_DATA_POS settings were inverted.\n caif: Bugfix - Increase default headroom size for control channel.\n net: make netpoll_rx return bool for !CONFIG_NETPOLL\n Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size\n Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM\n Bluetooth: Change default L2CAP ERTM retransmit timeout\n Bluetooth: Fix endianness issue with L2CAP MPS configuration\n net: Use NET_XMIT_SUCCESS where possible.\n isdn: mISDN: call pci_disable_device() if pci_probe() failed\n isdn: avm: call pci_disable_device() if pci_probe() failed\n isdn: avm: call pci_disable_device() if pci_probe() failed\n usbnet: rx_submit() should return an error code.\n pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles\n pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles\n ...\n" }, { "commit": "fad9e93e5490e1f2c54f5e7c8418952bc55200a1", "tree": "e227d6f353b74dd3e821c20a213c2ec418bc530e", "parents": [ "b77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Wed Aug 11 11:07:24 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:08:37 2010 -0400" }, "message": "Add fanotify syscalls to \u003casm-generic/unistd.h\u003e.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "2069601b3f0ea38170d4b509b89f3ca0a373bdc1", "tree": "647002d4c3814bd3d95d16ef7edef1757de8554f", "parents": [ "ad41a1e0cab07c5125456e8d38e5b1ab148d04aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 14:23:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 14:23:04 2010 -0700" }, "message": "Revert \"fsnotify: store struct file not struct path\"\n\nThis reverts commit 3bcf3860a4ff9bbc522820b4b765e65e4deceb3e (and the\naccompanying commit c1e5c954020e \"vfs/fsnotify: fsnotify_close can delay\nthe final work in fput\" that was a horribly ugly hack to make it work at\nall).\n\nThe \u0027struct file\u0027 approach not only causes that disgusting hack, it\nsomehow breaks pulseaudio, probably due to some other subtlety with\nf_count handling.\n\nFix up various conflicts due to later fsnotify work.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8357422d4bf33bc2c35884d4016c3fc9efbbc1d2", "tree": "5779dfe36de828d3ef2dacfda48b7961cdc44525", "parents": [ "1021a645344d4a77333e19e60d37b9343be0d7b7", "959eb4e5592cc0b0b07db0ca30d2b1efd790020f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:16:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:16:46 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (33 commits)\n dm mpath: support discard\n dm stripe: support discards\n dm: split discard requests on target boundaries\n dm stripe: optimize sector division\n dm stripe: move sector translation to a function\n dm: error return error for discards\n dm delay: support discard\n dm: zero silently drop discards\n dm: use dm_target_offset macro\n dm: factor out max_io_len_target_boundary\n dm: use common __issue_target_request for flush and discard support\n dm: linear support discard\n dm crypt: simplify crypt_ctr\n dm crypt: simplify crypt_config destruction logic\n dm: allow autoloading of dm mod\n dm: rename map_info flush_request to target_request_nr\n dm ioctl: refactor dm_table_complete\n dm snapshot: implement merge\n dm: do not initialise full request queue when bio based\n dm ioctl: make bio or request based device type immutable\n ...\n" }, { "commit": "1021a645344d4a77333e19e60d37b9343be0d7b7", "tree": "7a78ab55f27f97209ed1b85ccfd88c6d5b8416d3", "parents": [ "7367f5b013fee33f7d40a5a10a39d5134f529ec8", "28957a5467bab9ed51a237d21e31055fad987887" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:15:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:15:10 2010 -0700" }, "message": "Merge branch \u0027hwpoison\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6\n\n* \u0027hwpoison\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:\n hugetlb: add missing unlock in avoidcopy path in hugetlb_cow()\n hwpoison: rename CONFIG\n HWPOISON, hugetlb: support hwpoison injection for hugepage\n HWPOISON, hugetlb: detect hwpoison in hugetlb code\n HWPOISON, hugetlb: isolate corrupted hugepage\n HWPOISON, hugetlb: maintain mce_bad_pages in handling hugepage error\n HWPOISON, hugetlb: set/clear PG_hwpoison bits on hugepage\n HWPOISON, hugetlb: enable error handling path for hugepage\n hugetlb, rmap: add reverse mapping for hugepage\n hugetlb: move definition of is_vm_hugetlb_page() to hugepage_inline.h\n\nFix up trivial conflicts in mm/memory-failure.c\n" }, { "commit": "7367f5b013fee33f7d40a5a10a39d5134f529ec8", "tree": "aaf1366025364174d93c1ad33c79da4fd58aa917", "parents": [ "ce4327d372af7e2f2d403286e9904ab012e72827", "a8e026c785b3fecef0ef5c00c15223542c4db8f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:08:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:08:10 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://neil.brown.name/md\n\n* \u0027for-linus\u0027 of git://neil.brown.name/md:\n Further tidyup of raid6 naming in lib/raid6\n Make lib/raid6/test build correctly.\n Rename raid6 files now they\u0027re in a \u0027raid6\u0027 directory.\n" }, { "commit": "1c00650c233c404fadf9347329214d55283bd17a", "tree": "9de7cda2fe2e54411cc24ff3befd758c9cb9cd74", "parents": [ "26df0766a73a859bb93dc58e747c5028557a23fd", "7f528135da9704d67db1f727162024b078e1cd8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:06:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:06:29 2010 -0700" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: I2C bus multiplexer driver pca954x\n i2c: Multiplexed I2C bus core support\n i2c: Use a separate mutex for userspace client lists\n i2c: Make i2c_default_probe self-sufficient\n i2c: Drop dummy variable\n i2c: Move adapter locking helpers to i2c-core\n V4L/DVB: Use custom I2C probing function mechanism\n i2c: Add support for custom probe function\n i2c-dev: Use memdup_user\n i2c-dev: Remove unnecessary kmalloc casts\n" }, { "commit": "26df0766a73a859bb93dc58e747c5028557a23fd", "tree": "4776de567425a7fb66ca9a87228309f9c84de633", "parents": [ "580287628cdd99366b10c9050c4479b387283be8", "a6de51b2787012ba3ab62c7d50df1b749b83d5f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "message": "Merge branch \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits)\n param: don\u0027t deref arg in __same_type() checks\n param: update drivers/acpi/debug.c to new scheme\n param: use module_param in drivers/message/fusion/mptbase.c\n ide: use module_param_named rather than module_param_call\n param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme\n param: lock if_sdio\u0027s lbs_helper_name and lbs_fw_name against sysfs changes.\n param: lock myri10ge_fw_name against sysfs changes.\n param: simple locking for sysfs-writable charp parameters\n param: remove unnecessary writable charp\n param: add kerneldoc to moduleparam.h\n param: locking for kernel parameters\n param: make param sections const.\n param: use free hook for charp (fix leak of charp parameters)\n param: add a free hook to kernel_param_ops.\n param: silence .init.text references from param ops\n Add param ops struct for hvc_iucv driver.\n nfs: update for module_param_named API change\n AppArmor: update for module_param_named API change\n param: use ops in struct kernel_param, rather than get and set fns directly\n param: move the EXPORT_SYMBOL to after the definitions.\n ...\n" }, { "commit": "580287628cdd99366b10c9050c4479b387283be8", "tree": "754d9fe5d15db31497e45d542e816895d20a7e92", "parents": [ "e83ddb335468cdd9ea6e9767eb30b64d8ff176ce", "120be663285f80e3501e36ccbb92e7143585fd93" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:30 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: (22 commits)\n regulator: Remove default DEBUG define from TPS6586x\n regulator: tps6507x - add missing platform_set_drvdata in tps6507x_pmic_probe\n regulator: tps6586x - add regulator_unregister() in tps6586x_regulator_remove()\n mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler\n regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()\n regulator: max8660 - fix a memory leak in max8660_remove()\n regulator: max1586 - fix a memory leak in max1586_pmic_remove()\n regulator: Default GPIO controlled WM8994 regulators to disabled\n regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()\n max8998: fix off-by-one value range checking\n regulator: tps6586x: fix millivolt return values and SM2 table\n regulator: tps6586x: add dependancy on MFD_TPS6585x\n regulator: add TPS6586X regulator driver\n regulator: MAX8998: set_voltage bugfix. ramp_up delay and min/max voltage\n regulator: add support for regulators on the ab8500 MFD\n ab8500-mfd: add regulator support to ab8500 mfd device\n tps65023: Allow registering similar TPS65021\n drivers: regulators: depend on MFD_MAX8998\n drivers: regulator: add Maxim 8998 driver\n ISL6271A voltage regulator support.\n ...\n" }, { "commit": "e83ddb335468cdd9ea6e9767eb30b64d8ff176ce", "tree": "af7ca0b5be74b713970149efaebe682596523252", "parents": [ "14a4fa20a10d76eb98b7feb25be60735217929ba", "d0a11693967295772d2a7c22b6b37eb20684e709" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:06 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (40 commits)\n mfd: Fix incorrect kfree(i2c) in wm8994-core i2c_driver probe\n mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe\n mfd: Fix incorrect kfree(i2c) in tps6507x i2c_driver probe\n mfd: Add TPS6586x driver\n mfd: Use macros instead of some constant magic numbers for menelaus\n mfd: Fix menelaus mmc slot 2 misconfiguration\n mfd: Missing slab.h includes\n mfd: Fix wrong wm8350-core kfree in error path\n mfd: Fix wm8994_device_init() return value\n mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path\n mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit\n mfd: Fix tc6387xb resource reclaim\n mfd: Fix wrong goto labels for tc6393xb error handling\n mfd: Get rid of now unused mc13783 private header\n hwmon: Don\u0027t access struct mc13783 directly from mc13783-adc\n mfd: New mc13783 function exposing flags\n mfd: Check jz4740-adc kmalloc() result\n mfd: Fix jz4740-adc resource reclaim in probe error path\n mfd: Add WM8321 support\n mfd: Add stmpe auto sleep feature\n ...\n" }, { "commit": "16bb85bc12e7d0b066b1471185f3889cb1ceb382", "tree": "88f7bb3ff052ea0e68d5416853d8fd68a508d8e7", "parents": [ "4936a3b90d79dd8775c6ac23c2cf2dcebe29abde", "f59f5bcb605f40d418aceb6f6047069435ffac72" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:58:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:58:33 2010 -0700" }, "message": "Merge git://git.infradead.org/battery-2.6\n\n* git://git.infradead.org/battery-2.6:\n intel_mid_battery: Fix battery scaling\n intel_mid_battery: Fix the argument order to intel_scu_ipc_command\n olpc_battery: Fix build failure caused by sysfs changes\n Add s3c-adc-battery driver\n Intel MID platform battery driver\n\nFix up trivial conflicts (battery drivers added from different branches)\nin drivers/power/{Kconfig,Makefile}\n" }, { "commit": "4936a3b90d79dd8775c6ac23c2cf2dcebe29abde", "tree": "ab4fb288fd00bb50b5aebcc93fa476cc2c1d53be", "parents": [ "deda2e81961e96be4f2c09328baca4710a2fd1a0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Aug 09 14:20:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:53:39 2010 -0700" }, "message": "x86/hpet: Use the FSEC_PER_SEC constant for femto-second periods\n\nThe current computation, introduced with f12a15be63, of FSEC_PER_SEC using\nthe multiplication of (FSEC_PER_NSEC * NSEC_PER_SEC) is performed only\nwith 32bit integers on small machines, resulting in an overflow and a\n*very* short intervals being programmed. An interrupt storm follows.\n\nNote that we also have to specify FSEC_PER_SEC as being long long to\novercome the same limitations.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "12fdff3fc2483f906ae6404a6e8dcf2550310b6f", "tree": "a79fb1365fce7c7529655a8802d6d6bf8509b374", "parents": [ "1490cf5f0cb07dd49cdab4bceb769d7f711d7ca6" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Aug 12 16:54:57 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:51:35 2010 -0700" }, "message": "Add a dummy printk function for the maintenance of unused printks\n\nAdd a dummy printk function for the maintenance of unused printks through gcc\nformat checking, and also so that side-effect checking is maintained too.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aa9f56b66d278aba2f278c75761b7e19fbaca97a", "tree": "f1a9a0e68b07a3a1a0643389cb5ff838366a2d32", "parents": [ "58d4ea65b98f154f3326b038eecda32f90b46ea8", "31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:21:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:21:39 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (55 commits)\n io-mapping: move asm include inside the config option\n vgaarb: drop vga.h include\n drm/radeon: Add probing of clocks from device-tree\n drm/radeon: drop old and broken mesa warning\n drm/radeon: Fix pci_map_page() error checking\n drm: Remove count_lock for calling lastclose() after 58474713 (v2)\n drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx\n drm/radeon/kms: another r6xx/r7xx CS checker fix\n DRM: Replace kmalloc/memset combos with kzalloc\n drm: expand gamma_set\n drm/edid: Split mode lists out to their own header for readability\n drm/edid: Rewrite mode parse to use the generic detailed block walk\n drm/edid: Add detailed block walk for VTB extensions\n drm/edid: Add detailed block walk for CEA extensions\n drm: Remove unused fields from drm_display_info\n drm: Use ENOENT consistently for the error return for an unmatched handle.\n drm/radeon/kms: mark 3D power states as performance\n drm: Only set DPMS once on the CRTC not after every encoder.\n drm/radeon/kms: add additional quirk for Acer rv620 laptop\n drm: Propagate error code from fb_create()\n ...\n\nFix up trivial conflicts in drivers/gpu/drm/drm_edid.c\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "tree": "db129d45fba03e3e59392410d0f35ba7d3e438e6", "parents": [ "d862b13bc8cbab9692fbe0ef44c40d0488b81af1", "fe96eb404e33b59bb39f7050205f7c56c1c7d686" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:09:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:09:41 2010 -0700" }, "message": "Merge branch \u0027stable/xen-swiotlb-0.8.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/xen-swiotlb-0.8.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n x86: Detect whether we should use Xen SWIOTLB.\n pci-swiotlb-xen: Add glue code to setup dma_ops utilizing xen_swiotlb_* functions.\n swiotlb-xen: SWIOTLB library for Xen PV guest with PCI passthrough.\n xen/mmu: inhibit vmap aliases rather than trying to clear them out\n vmap: add flag to allow lazy unmap to be disabled at runtime\n xen: Add xen_create_contiguous_region\n xen: Rename the balloon lock\n xen: Allow unprivileged Xen domains to create iomap pages\n xen: use _PAGE_IOMAP in ioremap to do machine mappings\n\nFix up trivial conflicts (adding both xen swiotlb and xen pci platform\ndriver setup close to each other) in drivers/xen/{Kconfig,Makefile} and\ninclude/xen/xen-ops.h\n" }, { "commit": "8d57a98ccd0b4489003473979da8f5a1363ba7a3", "tree": "2982997ce66bb6a92c020b7189966c3097095fd7", "parents": [ "93caf8e69eac763f6a20cf253ace8e7fc1ab7953" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "block: add secure discard\n\nSecure discard is the same as discard except that all copies of the\ndiscarded sectors (perhaps created by garbage collection) must also be\nerased.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Kyungmin Park \u003ckmpark@infradead.org\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dfe86cba7676d58db8de7e623f5e72f1b0d3ca35", "tree": "ed7e6a267c50e0ba2374dc6895515d7a100961a3", "parents": [ "81d73a32d775ae9674ea6edf0b5b721fc3bc57d9" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "mmc: add erase, secure erase, trim and secure trim operations\n\nSD/MMC cards tend to support an erase operation. In addition, eMMC v4.4\ncards can support secure erase, trim and secure trim operations that are\nall variants of the basic erase command.\n\nSD/MMC device attributes \"erase_size\" and \"preferred_erase_size\" have been\nadded.\n\n\"erase_size\" is the minimum size, in bytes, of an erase operation. For\nMMC, \"erase_size\" is the erase group size reported by the card. Note that\n\"erase_size\" does not apply to trim or secure trim operations where the\nminimum size is always one 512 byte sector. For SD, \"erase_size\" is 512\nif the card is block-addressed, 0 otherwise.\n\nSD/MMC cards can erase an arbitrarily large area up to and\nincluding the whole card. When erasing a large area it may\nbe desirable to do it in smaller chunks for three reasons:\n\n 1. A single erase command will make all other I/O on the card\n wait. This is not a problem if the whole card is being erased, but\n erasing one partition will make I/O for another partition on the\n same card wait for the duration of the erase - which could be a\n several minutes.\n\n 2. To be able to inform the user of erase progress.\n\n 3. The erase timeout becomes too large to be very useful.\n Because the erase timeout contains a margin which is multiplied by\n the size of the erase area, the value can end up being several\n minutes for large areas.\n\n\"erase_size\" is not the most efficient unit to erase (especially for SD\nwhere it is just one sector), hence \"preferred_erase_size\" provides a good\nchunk size for erasing large areas.\n\nFor MMC, \"preferred_erase_size\" is the high-capacity erase size if a card\nspecifies one, otherwise it is based on the capacity of the card.\n\nFor SD, \"preferred_erase_size\" is the allocation unit size specified by\nthe card.\n\n\"preferred_erase_size\" is in bytes.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Kyungmin Park \u003ckmpark@infradead.org\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "81d73a32d775ae9674ea6edf0b5b721fc3bc57d9", "tree": "c4097c3c7715a128cf54252b2ff906d3d8946ae0", "parents": [ "a50aeb40144982eb766053309b6fc33e14ca46f0" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Aug 11 14:17:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "mm: fix writeback_in_progress()\n\nCommit 83ba7b071f3 (\"writeback: simplify the write back thread queue\")\nbroke writeback_in_progress() as in that commit we started to remove work\nitems from the list at the moment we start working on them and not at the\nmoment they are finished. Thus if the flusher thread was doing some work\nbut there was no other work queued, writeback_in_progress() returned\nfalse. This could in particular cause unnecessary queueing of background\nwriteback from balance_dirty_pages() or writeout work from\nwriteback_sb_if_idle().\n\nThis patch fixes the problem by introducing a bit in the bdi state which\nindicates that the flusher thread is processing some work and uses this\nbit for writeback_in_progress() test.\n\nNOTE: Both callsites of writeback_in_progress() (namely,\nwriteback_inodes_sb_if_idle() and balance_dirty_pages()) would actually\nneed a different information than what writeback_in_progress() provides.\nThey would need to know whether *the kind of writeback they are going to\nsubmit* is already queued. But this information isn\u0027t that simple to\nprovide so let\u0027s fix writeback_in_progress() for the time being.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nAcked-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "16c4042f08919f447d6b2a55679546c9b97c7264", "tree": "0248b64d46237854ebe67efe8c742cb5878d8611", "parents": [ "e50e37201ae2e7d6a52e87815759e6481f0bcfb9" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Wed Aug 11 14:17:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:29 2010 -0700" }, "message": "writeback: avoid unnecessary calculation of bdi dirty thresholds\n\nSplit get_dirty_limits() into global_dirty_limits()+bdi_dirty_limit(), so\nthat the latter can be avoided when under global dirty background\nthreshold (which is the normal state for most systems).\n\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Dave Chinner \u003cdavid@fromorbit.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0a7992c90828a65281c3c9cf180be3b432d277b2", "tree": "41ecaca813576608b8eed10cabb9d8f3ab312dfa", "parents": [ "d78a3eda6985e74bc21a23362f27526f73e71649" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Aug 11 14:17:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:29 2010 -0700" }, "message": "acpi: fix bogus preemption logic\n\nThe ACPI_PREEMPTION_POINT() logic was introduced in commit 8bd108d\n(ACPICA: add preemption point after each opcode parse). The follow up\ncommits abe1dfab6, 138d15692, c084ca70 tried to fix the preemption logic\nback and forth, but nobody noticed that the usage of\nin_atomic_preempt_off() in that context is wrong.\n\nThe check which guards the call of cond_resched() is:\n\n if (!in_atomic_preempt_off() \u0026\u0026 !irqs_disabled())\n\nin_atomic_preempt_off() is not intended for general use as the comment\nabove the macro definition clearly says:\n\n * Check whether we were atomic before we did preempt_disable():\n * (used by the scheduler, *after* releasing the kernel lock)\n\nOn a CONFIG_PREEMPT\u003dn kernel the usage of in_atomic_preempt_off() works by\naccident, but with CONFIG_PREEMPT\u003dy it\u0027s just broken.\n\nThe whole purpose of the ACPI_PREEMPTION_POINT() is to reduce the latency\non a CONFIG_PREEMPT\u003dn kernel, so make ACPI_PREEMPTION_POINT() depend on\nCONFIG_PREEMPT\u003dn and remove the in_atomic_preempt_off() check.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16210\n\n[akpm@linux-foundation.org: fix build]\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Francois Valenduc \u003cfrancois.valenduc@tvcablenet.be\u003e\nCc: Lin Ming \u003cming.m.lin@intel.com\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": "c6c193326384aecfd668c8f271799a44dbc74c1a", "tree": "58df734fad40389f64641a6f757d245b6274a93e", "parents": [ "1c888e2e3824a3f7565b4d96ede423cb9a9a28b7" ], "author": { "name": "Mike Rapoport", "email": "mike@compulab.co.il", "time": "Wed Aug 11 01:11:04 2010 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu Aug 12 11:28:12 2010 +0200" }, "message": "mfd: Add TPS6586x driver\n\nAdd mfd core driver for TPS6586x PMICs family.\nThe driver provides I/O access for the sub-device drivers and performs\nregstration of the sub-devices based on the platform requirements.\nIn addition it implements GPIOlib interface for the chip GPIOs.\n\nTODO:\n - add interrupt support\n - add platform data for PWM, backlight leds and charger\n\nSigned-off-by: Mike Rapoport \u003cmike@compulab.co.il\u003e\nSigned-off-by: Mike Rapoport \u003cmike.rapoport@gmail.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "b6e6d54cab7633dd2216ede77ccd00cdaebd77ad", "tree": "8997e19d67a0d081bb7f34a2f0f89663998507b8", "parents": [ "eaf06ee22594ac90cdd0279483b06c1db1667e01" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Aug 02 15:48:04 2010 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu Aug 12 11:28:04 2010 +0200" }, "message": "mfd: Get rid of now unused mc13783 private header\n\nThis adds all remaining definitions that are used by the core driver\nto the .c file.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "3b16bb539c558cd523ea380653d4bf24a8c9e833", "tree": "a1a8f7304ff1e6257e29015df9ab5e901aa0e759", "parents": [ "789133b7b4dd4915550733af5dc005ca89121c73" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Aug 02 11:14:17 2010 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu Aug 12 11:28:03 2010 +0200" }, "message": "mfd: New mc13783 function exposing flags\n\nThis is needed for the mc13783-adc driver to decide if a touch screen is\nconnected. If so some channels are not available as generic hwmon inputs.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "5981f4e65cb455a820b3d07b8e4bac506233f3ea", "tree": "541a0ba41593bda73d1ce9b3ce004de43dcccd85", "parents": [ "3faeb35ccc57e1af70c54b82063fdf4a88846084" ], "author": { "name": "Sundar R Iyer", "email": "sundar.iyer@stericsson.com", "time": "Wed Jul 21 11:41:07 2010 +0530" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu Aug 12 11:28:00 2010 +0200" }, "message": "mfd: Add stmpe auto sleep feature\n\nSome STMPE devices support entering sleep mode automatically on a\nspecified timeout of inactivity on the I2C bus with the host system.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Sundar R Iyer \u003csundar.iyer@stericsson.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "9accdc1bf239ef20c0fe12ceff2a7532374fd7cd", "tree": "a95f7cee64d3db64c2a0e8a7c45c88042a0d5790", "parents": [ "91f4debf5e2df904e7fade530bd1a6d182efd72c" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Jul 08 21:09:51 2010 +0900" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu Aug 12 11:27:58 2010 +0200" }, "message": "mfd: Add additional WM8994 GPIO functions\n\nLater revisions of the WM8994 add some more GPIO functions, define them\nin the header file.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "91f4debf5e2df904e7fade530bd1a6d182efd72c", "tree": "263ca3ab3ca3a52e011c4500f9afc051190ad023", "parents": [ "b12c35e22d102172cd2a69581f939ec9a70a7942" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Mon Jul 12 03:48:08 2010 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu Aug 12 11:27:58 2010 +0200" }, "message": "mfd: Add JZ4740 ADC driver\n\nThis patch adds a MFD driver for the JZ4740 ADC unit. The driver is used to\ndemultiplex IRQs and synchronize access to shared registers between the\nbattery, hwmon and (future) touchscreen driver.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "27e34995e1a863c1e9beba30e51dfe2a083f918d", "tree": "e7ad3ee4794a3c2cf7d3922610335a6391c987c8", "parents": [ "d2d272a965baeb3d78f843374bc48f0cbce8ac3d" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Fri Jul 02 16:52:08 2010 +0530" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu Aug 12 11:27:24 2010 +0200" }, "message": "mfd: Add STMPE I/O Expander support\n\nAdd support for the STMPE family of I/O Expanders from\nSTMicroelectronics. These devices include upto 24 gpios and a varying\nselection of blocks, including PWM, keypad, and touchscreen controllers.\nThis patch adds the MFD core.\n\n[l.fu@pengutronix.de: fix stmpe811 enable hook]\n[l.fu@pengutronix.de: add touchscreen platform data]\nAcked-by: Luotao Fu \u003cl.fu@pengutronix.de\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "56a67df766039666f61fb15b079f713e44a735ae", "tree": "cfeeb4f0a151b440293da593c723e9982368a58f", "parents": [ "06a426cee9b35505aeb7516a67bd26496ca7ed08" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Thu Aug 12 04:14:10 2010 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Thu Aug 12 04:14:10 2010 +0100" }, "message": "dm: factor out max_io_len_target_boundary\n\nSplit max_io_len_target_boundary out of max_io_len so that the discard\nsupport can make use of it without duplicating max_io_len code.\n\nAvoiding max_io_len\u0027s split_io logic enables DM\u0027s discard support to\nsubmit the entire discard request to a target. But discards must still\nbe split on target boundaries.\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "5ae89a8720c28caf35c4e53711d77df2856c404e", "tree": "712ddc158309d7ad77e3c19e70f0ae9fafb94446", "parents": [ "5ebaee6d290279d1df6ce45d6d54de8cfc473273" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Thu Aug 12 04:14:08 2010 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Thu Aug 12 04:14:08 2010 +0100" }, "message": "dm: linear support discard\n\nAllow discards to be passed through to linear mappings if at least one\nunderlying device supports it. Discards will be forwarded only to\ndevices that support them.\n\nA target that supports discards should set num_discard_requests to\nindicate how many times each discard request must be submitted to it.\n\nVerify table\u0027s underlying devices support discards prior to setting the\nassociated DM device as capable of discards (via QUEUE_FLAG_DISCARD).\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nReviewed-by: Joe Thornber \u003cthornber@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "7e507eb6432afdd798d4c6dccf949b8c43ef151c", "tree": "a9c91e310bfd8e26c326f094eade79f5baf1ee25", "parents": [ "57cba5d3658d9fdc019c6af14a2d80aefa651e56" ], "author": { "name": "Peter Rajnoha", "email": "prajnoha@redhat.com", "time": "Thu Aug 12 04:14:05 2010 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Thu Aug 12 04:14:05 2010 +0100" }, "message": "dm: allow autoloading of dm mod\n\nAdd devname:mapper/control and MAPPER_CTRL_MINOR module alias\nto support dm-mod module autoloading.\n\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Peter Rajnoha \u003cprajnoha@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "57cba5d3658d9fdc019c6af14a2d80aefa651e56", "tree": "4905a162b6785e1a1228b8870d8011cf9035147a", "parents": [ "26803b9f06d365122fae82e7554a66ef8278e0bb" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Thu Aug 12 04:14:04 2010 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Thu Aug 12 04:14:04 2010 +0100" }, "message": "dm: rename map_info flush_request to target_request_nr\n\n\u0027target_request_nr\u0027 is a more generic name that reflects the fact that\nit will be used for both flush and discard support.\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "a5664dad7e1a278d2915c2bf79cf42250e12d7db", "tree": "3bdbe17f12376c63ea05100c2597757e01dc95e2", "parents": [ "708e929513502fb050c0a3c3ee267cab5b056ded" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Thu Aug 12 04:14:01 2010 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Thu Aug 12 04:14:01 2010 +0100" }, "message": "dm ioctl: make bio or request based device type immutable\n\nDetermine whether a mapped device is bio-based or request-based when\nloading its first (inactive) table and don\u0027t allow that to be changed\nlater.\n\nThis patch performs different device initialisation in each of the two\ncases. (We don\u0027t think it\u0027s necessary to add code to support changing\nbetween the two types.)\n\nAllowed md-\u003etype transitions:\n DM_TYPE_NONE to DM_TYPE_BIO_BASED\n DM_TYPE_NONE to DM_TYPE_REQUEST_BASED\n\nWe now prevent table_load from replacing the inactive table with a\nconflicting type of table even after an explicit table_clear.\n\nIntroduce \u0027type_lock\u0027 into the struct mapped_device to protect md-\u003etype\nand to prepare for the next patch that will change the queue\ninitialization and allocate memory while md-\u003etype_lock is held.\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nAcked-by: Kiyoshi Ueda \u003ck-ueda@ct.jp.nec.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n\n drivers/md/dm-ioctl.c | 15 +++++++++++++++\n drivers/md/dm.c | 37 ++++++++++++++++++++++++++++++-------\n drivers/md/dm.h | 5 +++++\n include/linux/dm-ioctl.h | 4 ++--\n 4 files changed, 52 insertions(+), 9 deletions(-)\n" }, { "commit": "31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8", "tree": "7e6201c46c031894b7c356c4d9d9992fcc04d0f7", "parents": [ "71beefe8c0b9e12ed4ac9fe13b98a035ddeaf8eb" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 12 11:47:50 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 12 11:47:50 2010 +1000" }, "message": "io-mapping: move asm include inside the config option\n\nnouveau starting using these APIs, the first on non-x86 hw, and this\ninclude isn\u0027t required on anything with real amounts of vmalloc space.\n\nthis fixes a build problem on powerpc.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "71beefe8c0b9e12ed4ac9fe13b98a035ddeaf8eb", "tree": "207f7026d3d7a24fd31c1ed49e74fb17de2c7160", "parents": [ "7b044f40108700b02d4f6aae2836e0d84a11fc04" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 12 11:44:50 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 12 11:47:26 2010 +1000" }, "message": "vgaarb: drop vga.h include\n\nWe don\u0027t actually need this include on any platform.\n\nbuilt on powerpc + x86, reported on m68k.\n\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d5302fe41ffb28d0a48be6a71becba36d3453ae0", "tree": "02414f0dc4ad18b6a6a096efb69046281248dd2b", "parents": [ "cc4589ebfae6f8dbb5cf880a0a67eedab3416492" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Aug 12 06:38:24 2010 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Thu Aug 12 06:38:24 2010 +1000" }, "message": "Make lib/raid6/test build correctly.\n\nSome bit-rot needs to be cleaned out.\n\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "5af568cbd55f60b5a1d174f621b273e4f585dc35", "tree": "7cdc1afeb267519133a29ac595df21278c556c8c", "parents": [ "062e27ec1b49d12bdb1ecc94d74b5fee5a5775db", "66a362a2aa8ffa72670259fa15e2a77a01cc2217" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:23:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:23:32 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n isofs: Fix lseek() to position beyond 4 GB\n vfs: remove unused MNT_STRICTATIME\n vfs: show unreachable paths in getcwd and proc\n vfs: only add \" (deleted)\" where necessary\n vfs: add prepend_path() helper\n vfs: __d_path: dont prepend the name of the root dentry\n ia64: perfmon: add d_dname method\n vfs: add helpers to get root and pwd\n cachefiles: use path_get instead of lone dget\n fs/sysv/super.c: add support for non-PDP11 v7 filesystems\n V7: Adjust sanity checks for some volumes\n Add v7 alias\n v9fs: fixup for inode_setattr being removed\n\nManual merge to take Al\u0027s version of the fs/sysv/super.c file: it merged\ncleanly, but Al had removed an unnecessary header include, so his side\nwas better.\n" }, { "commit": "7f528135da9704d67db1f727162024b078e1cd8f", "tree": "53261ac3cdfbbac4a727843b72453a6f7f1cb080", "parents": [ "0826374bff57411d239f2fcb15da3c35af0a93cd" ], "author": { "name": "Michael Lawnick", "email": "ml.lawnick@gmx.de", "time": "Wed Aug 11 18:21:03 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:21:03 2010 +0200" }, "message": "i2c: I2C bus multiplexer driver pca954x\n\nI2C driver for PCA954x I2C multiplexer series.\n\nSigned-off-by: Michael Lawnick \u003cml.lawnick@gmx.de\u003e\nAcked-by: Rodolfo Giometti \u003cgiometti@linux.it\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "0826374bff57411d239f2fcb15da3c35af0a93cd", "tree": "514d4361cfc9cc546306612de3464def7fe8a7cd", "parents": [ "dafc50d141c27959dbd3a1cfe9857a86d23402a7" ], "author": { "name": "Michael Lawnick", "email": "ml.lawnick@gmx.de", "time": "Wed Aug 11 18:21:02 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:21:02 2010 +0200" }, "message": "i2c: Multiplexed I2C bus core support\n\nAdd multiplexed bus core support. I2C multiplexer and switches\nlike pca954x get instantiated as new adapters per port.\n\nSigned-off-by: Michael Lawnick \u003cml.lawnick@gmx.de\u003e\nAcked-by: Rodolfo Giometti \u003cgiometti@linux.it\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "dafc50d141c27959dbd3a1cfe9857a86d23402a7", "tree": "565aea94308f40813540f06d7bbcb322ae92eeed", "parents": [ "8031d79baedabd44590d047d97a310eb0e0e4e0c" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:21:01 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:21:01 2010 +0200" }, "message": "i2c: Use a separate mutex for userspace client lists\n\nMoving userspace-instantiated clients to separate lists wasn\u0027t nearly\nenough to avoid deadlocks in multiplexed bus cases. We also want to\nhave a dedicated mutex to protect each list.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Michael Lawnick \u003cml.lawnick@gmx.de\u003e\n" }, { "commit": "fe61e07e9ebc890c70d97a1f72ddaad4bee2d848", "tree": "e6ab84f0c09c555899884f2b730d205e3244dd8f", "parents": [ "d44f19d586b6113fb5db10e1a36457f0db3b01aa" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:58 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:58 2010 +0200" }, "message": "i2c: Move adapter locking helpers to i2c-core\n\nUninline i2c adapter locking helper functions, move them to i2c-core,\nand use them in i2c-core itself. The functions are still exported for\nexternal users. This makes future updates to the locking model (which\nwill be needed for multiplexing support) possible and transparent.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Michael Lawnick \u003cml.lawnick@gmx.de\u003e\n" }, { "commit": "d44f19d586b6113fb5db10e1a36457f0db3b01aa", "tree": "d1bd292c092874aad3cd97faea3baf7599d6ae02", "parents": [ "9a94241afcc9a481691a9c29b7460217925b59b8" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:57 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:57 2010 +0200" }, "message": "V4L/DVB: Use custom I2C probing function mechanism\n\nNow that i2c-core offers the possibility to provide custom probing\nfunction for I2C devices, let\u0027s make use of it.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "9a94241afcc9a481691a9c29b7460217925b59b8", "tree": "7f2d42935422a228686bcd8680dc97ff8a1005bc", "parents": [ "f1c2e33c295de423db5740647bfaa5e2ad139192" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:56 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Aug 11 18:20:56 2010 +0200" }, "message": "i2c: Add support for custom probe function\n\nThe probe method used by i2c_new_probed_device() may not be suitable\nfor all cases. Let the caller provide its own, optional probe\nfunction.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" } ], "next": "636d17427b1ef0e97bd9df9b3b0e0f314ff889d3" }