)]}' { "log": [ { "commit": "dfb8fb96ae2b5126cd0c08c0ccd7c42e1f46568a", "tree": "9727f43bae819ece67c1c9bc26b3cb52e236e5ce", "parents": [ "67c9660831f6b6b76866a0838466c83765ffbbd3" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Fri Sep 17 03:23:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 17 16:12:56 2010 -0700" }, "message": "stmmac: add CSR Clock range selection\n\nThis patch adds the CSR Clock range selection.\n\nOriginal patch from Johannes Stezenbach fixed the CSR\nin the stmmac_mdio. We agreed to provide this through\nthe platform instead of.\nAlso thanks to Johannes for having tested it on ARM.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: Johannes Stezenbach \u003cjs@sig21.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cd13539b8bc9ae884e6d8d9374c594adff4304e4", "tree": "6adc13bc1dfe5da2480f5d2186e2719f5f2b713f", "parents": [ "94767632623c7bf5b16a0cf963ec93a8ad9acca4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 16 02:58:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 16 21:58:44 2010 -0700" }, "message": "net: shrinks struct net_device\n\ncommit ab95bfe01 (net: replace hooks in __netif_receive_skb) added\nrx_handler at wrong place, between two cache line aligned objects,\ncreating a big hole (a full cache line)\n\nMove rx_handler and rx_handler_data before rx_queue, filling existing\nhole.\n\nMove master field in the cache line(s) used in receive path.\n\nThis saves 64 bytes (or L1_CACHE_BYTES), and avoids two possible\ncache misses in receive path.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95ae6b228f814fc0528d0506ee9f18ac333d6851", "tree": "d5287f3dee478e1bd5fa79e63192447c5bc91e92", "parents": [ "9e0064a5456fd75fd7c70f6f3692c7f732f91a65" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 15 04:04:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 22:06:05 2010 -0700" }, "message": "ipv4: ip_ptr cleanups\n\ndev-\u003eip_ptr is protected by rtnl and rcu.\n\nYet some places dont use appropriate primitives and/or locking rules.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "507215f8d04f9e61f38c975e61d93bcafd30815f", "tree": "79a88610eaf8abcc3f160ca0ced0a1b4e72dfd80", "parents": [ "b6a563b2af4ec5b0363cf89869ba234c0e2cd3da" ], "author": { "name": "Rémi Denis-Courmont", "email": "remi.denis-courmont@nokia.com", "time": "Wed Sep 15 12:30:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 21:31:33 2010 -0700" }, "message": "Phonet: list subscribed resources via proc_fs\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7417fa83c1a8b75a03bd9b9b358999f38e771eab", "tree": "7abf2eb2df05e1ca8ed96cd94b6fe026c8a57972", "parents": [ "4e3d16ce5e82648d7f4dfd28b6cf8fe2e9a9efc3" ], "author": { "name": "Rémi Denis-Courmont", "email": "remi.denis-courmont@nokia.com", "time": "Wed Sep 15 12:30:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 21:31:32 2010 -0700" }, "message": "Phonet: hook resource routing to userspace via ioctl()\u0027s\n\nI wish we could use something cleaner, such as bind(). But that would\nnot work since resource subscription is orthogonal/in addition to the\nnormal object ID allocated via bind(). This is similar to multicasting\nwhich also uses ioctl()\u0027s.\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e3d16ce5e82648d7f4dfd28b6cf8fe2e9a9efc3", "tree": "d212f0e503a4db4c2b04a0457250bba940205f39", "parents": [ "6482f554e2b9cbe733d63124765104f29cf0c9ad" ], "author": { "name": "Rémi Denis-Courmont", "email": "remi.denis-courmont@nokia.com", "time": "Wed Sep 15 12:30:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 21:31:32 2010 -0700" }, "message": "Phonet: resource routing backend\n\nWhen both destination device and object are nul, Phonet routes the\npacket according to the resource field. In fact, this is the most\ncommon pattern when sending Phonet \"request\" packets. In this case,\nthe packet is delivered to whichever endpoint (socket) has\nregistered the resource.\n\nThis adds a new table so that Linux processes can register their\nPhonet sockets to Phonet resources, if they have adequate privileges.\n\n(Namespace support is not implemented at the moment.)\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6482f554e2b9cbe733d63124765104f29cf0c9ad", "tree": "464efc6726b6c183f820152edd14f03dda4a59ad", "parents": [ "7fedd7e5dfeb0f6bd69ee120b5c44a5e49892e47" ], "author": { "name": "Rémi Denis-Courmont", "email": "remi.denis-courmont@nokia.com", "time": "Wed Sep 15 12:19:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 21:31:31 2010 -0700" }, "message": "Phonet: remove dangling pipe if an endpoint is closed early\n\nClosing a pipe endpoint is not normally allowed by the Phonet pipe,\nother than as a side after-effect of removing the pipe between two\nendpoints. But there is no way to prevent Linux userspace processes\nfrom being killed or suffering from bugs, so this can still happen.\nWe might as well forcefully close Phonet pipe endpoints then.\n\nThe cellular modem supports only a few existing pipes at a time. So we\nreally should not leak them. This change instructs the modem to destroy\nthe pipe if either of the pipe\u0027s endpoint (Linux socket) is closed too\nearly.\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7dff59efbb0e8b0f81c95fd40379c0d0c757c808", "tree": "17651e0f5ef9b4a4b00352b52351a3fc23ac4671", "parents": [ "e0de7c93b950b9e784894efc4b529c6958cb747a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 15 11:07:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 19:29:45 2010 -0700" }, "message": "net: add rtnl_dereference()\n\nWe sometime want to dereference an rcu protected pointer while\nholding RTNL. Use a macro to hide all lockdep details.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0de7c93b950b9e784894efc4b529c6958cb747a", "tree": "49a86ecc91a43e7d86fab75b3c36753d340c11d2", "parents": [ "e035587305011432ee07f69f9738b3c7ef7f3684" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Sep 14 09:13:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 14:42:13 2010 -0700" }, "message": "ethtool: Remove unimplemented flow specification types\n\nstruct ethtool_rawip4_spec and struct ethtool_ether_spec are neither\ncommented nor used by any driver, so remove them. Adjust padding in\nthe user-visible unions that included these structures.\n\nFix references to struct ethtool_rawip4_spec in\nethtool_get_rx_ntuple(), which should use struct ethtool_usrip4_spec.\n\nstruct ethtool_usrip4_spec cannot hold IPv6 host addresses and there\nis no separate structure that can, so remove ETH_RX_NFC_IP6 and the\nreference to it in niu.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e035587305011432ee07f69f9738b3c7ef7f3684", "tree": "46037f2bdd25de4a939c5ba2bd200aded357b418", "parents": [ "f833c4c181e4e948758b7b252322f50273100d30" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Sep 14 09:10:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 14:42:13 2010 -0700" }, "message": "ethtool: Complete kernel-doc comments for RX flow filter and hash control\n\nThere are now several interfaces within the ethtool API for getting\nand setting RX flow filtering and hashing behaviour, most of which are\npoorly documented. This adds kernel-doc comments for all these\ninterfaces, based on the existing incomplete comments and on the\ninitial implementations.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55b1804c678e679e1018671bd40b583eab124689", "tree": "6bf100ba8bca953b5ccd2c05773f442ea748a8fb", "parents": [ "030bda0d416babd0cf34e584086f815b1c9d417c" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Sep 13 18:24:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 14 20:22:05 2010 -0700" }, "message": "net/irda: Use static const char * const where possible\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e548833df83c3554229eff0672900bfe958b45fd", "tree": "85efc4a76dc356593d6d394776aeb845dc580fb6", "parents": [ "cbd9da7be869f676afc204e1a664163778c770bd", "053d8f6622701f849fda2ca2c9ae596c13599ba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/main.c\n" }, { "commit": "053d8f6622701f849fda2ca2c9ae596c13599ba9", "tree": "e5dd90cca3a69bc993b5aa860a9eeb8c9178450a", "parents": [ "c9cedbba0fc591e1c0587f838932ca3f3c6fec57", "615cc2211c17ed05a2a5d94abdac6c340a8ea508" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 21:59:51 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 21:59:51 2010 -0700" }, "message": "Merge branch \u0027vhost-net\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n" }, { "commit": "cf0ac2b8a759fecbefd80f890c6dbe80ba65fd95", "tree": "d5feaeef197dc681d1cdab2e8070ac31f0c43141", "parents": [ "f27e21a813e2c4ca74b30a5443602e75b146db9b", "905d64c89e2a9d71d0606904b7c3908633db6072" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 14:58:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 14:58:11 2010 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://oss.oracle.com/git/agrover/linux-2.6\n" }, { "commit": "e199e6136ce6b151e6638ae93dca60748424d900", "tree": "0d66e0b5d227c36b005e4f5537f4bbcfc6ed4904", "parents": [ "972c40b5bee429c84ba727f8ac0a08292bc5dc3d", "d56557af19867edb8c0e96f8e26399698a08857f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 23:49:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 23:49:04 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "719f835853a92f6090258114a72ffe41f09155cd", "tree": "a077b05397bf07a096be7f07b50375c5ed918ac2", "parents": [ "ae2688d59b5f861dc70a091d003773975d2ae7fb" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 08 05:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 21:45:01 2010 -0700" }, "message": "udp: add rehash on connect()\n\ncommit 30fff923 introduced in linux-2.6.33 (udp: bind() optimisation)\nadded a secondary hash on UDP, hashed on (local addr, local port).\n\nProblem is that following sequence :\n\nfd \u003d socket(...)\nconnect(fd, \u0026remote, ...)\n\nnot only selects remote end point (address and port), but also sets\nlocal address, while UDP stack stored in secondary hash table the socket\nwhile its local address was INADDR_ANY (or ipv6 equivalent)\n\nSequence is :\n - autobind() : choose a random local port, insert socket in hash tables\n [while local address is INADDR_ANY]\n - connect() : set remote address and port, change local address to IP\n given by a route lookup.\n\nWhen an incoming UDP frame comes, if more than 10 sockets are found in\nprimary hash table, we switch to secondary table, and fail to find\nsocket because its local address changed.\n\nOne solution to this problem is to rehash datagram socket if needed.\n\nWe add a new rehash(struct socket *) method in \"struct proto\", and\nimplement this method for UDP v4 \u0026 v6, using a common helper.\n\nThis rehashing only takes care of secondary hash table, since primary\nhash (based on local port only) is not changed.\n\nReported-by: Krzysztof Piotr Oledzki \u003cole@ans.pl\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Krzysztof Piotr Oledzki \u003cole@ans.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "905d64c89e2a9d71d0606904b7c3908633db6072", "tree": "ae1f56d4eedebec1a75441d6a66b97aea3e5fe5f", "parents": [ "a46f561b774d90d8616473d56696e7d44fa1c9f1" ], "author": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Sep 08 18:03:54 2010 -0700" }, "committer": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Sep 08 18:16:55 2010 -0700" }, "message": "RDS: Remove dead struct from rds.h\n\nflows are an obsolete date type.\n\nSigned-off-by: Andy Grover \u003candy.grover@oracle.com\u003e\n" }, { "commit": "a46f561b774d90d8616473d56696e7d44fa1c9f1", "tree": "acfffa1745ee08a8ea863143df745a6e734855e2", "parents": [ "fd128dfa50cfc4f2959dc4aa5d7468d33b988332" ], "author": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Aug 25 09:34:10 2010 -0700" }, "committer": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Sep 08 18:16:54 2010 -0700" }, "message": "RDS: rds.h: Replace u_int[size]_t with uint[size]_t\n\nReplace e.g. u_int32_t types with the more common uint32_t.\n\nReported-by: Matthew Wilcox \u003cwilly@linux.intel.com\u003e\nSigned-off-by: Andy Grover \u003candy.grover@oracle.com\u003e\n" }, { "commit": "fd128dfa50cfc4f2959dc4aa5d7468d33b988332", "tree": "af53d62ccf9558091ea1d19d5653f913e642d472", "parents": [ "20c72bd5f5f902e5a8745d51573699605bf8d21c" ], "author": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Aug 25 09:32:17 2010 -0700" }, "committer": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Sep 08 18:16:52 2010 -0700" }, "message": "RDS: Add rds.h to exported headers list\n\nAlso, a number of changes were made based on the assumption that\nrds.h wasn\u0027t exported, so roll these back.\n\nSigned-off-by: Andy Grover \u003candy.grover@oracle.com\u003e\n" }, { "commit": "20c72bd5f5f902e5a8745d51573699605bf8d21c", "tree": "6df337e07d423a0859ab92f25525570e134baba1", "parents": [ "59f740a6aeb2cde2f79fe0df38262d4c1ef35cd8" ], "author": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Aug 25 05:51:28 2010 -0700" }, "committer": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Sep 08 18:16:51 2010 -0700" }, "message": "RDS: Implement masked atomic operations\n\nAdd two CMSGs for masked versions of cswp and fadd. args\nstruct modified to use a union for different atomic op type\u0027s\narguments. Change IB to do masked atomic ops. Atomic op type\nin rds_message similarly unionized.\n\nSigned-off-by: Andy Grover \u003candy.grover@oracle.com\u003e\n" }, { "commit": "2c3a5f9abb1dc5efdab8ba9a568b1661c65fd1e3", "tree": "72b6a4c5298fecf46637987fd8ae42296dc90a97", "parents": [ "7e3bd65ebfd5d6cd76b8b979920c632d6e6b4b2a" ], "author": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Mon Mar 01 16:10:40 2010 -0800" }, "committer": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Sep 08 18:12:06 2010 -0700" }, "message": "RDS: Add flag for silent ops. Do atomic op before RDMA\n\nAdd a flag to the API so users can indicate they want\nsilent operations. This is needed because silent ops\ncannot be used with USE_ONCE MRs, so we can\u0027t just\nassume silent.\n\nAlso, change send_xmit to do atomic op before rdma op if\nboth are present, and centralize the hairy logic to determine if\nwe want to attempt silent, or not.\n\nSigned-off-by: Andy Grover \u003candy.grover@oracle.com\u003e\n" }, { "commit": "15133f6e67d8d646d0744336b4daa3135452cb0d", "tree": "e5675d5a3ab240edc9a66af6b891dd75fa9eabae", "parents": [ "a63273d4992603979ddb181b6a8f07082839b39f" ], "author": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Tue Jan 12 14:33:38 2010 -0800" }, "committer": { "name": "Andy Grover", "email": "andy.grover@oracle.com", "time": "Wed Sep 08 18:11:41 2010 -0700" }, "message": "RDS: Implement atomic operations\n\nImplement a CMSG-based interface to do FADD and CSWP ops.\n\nAlter send routines to handle atomic ops.\n\nAdd atomic counters to stats.\n\nAdd xmit_atomic() to struct rds_transport\n\nInline rds_ib_send_unmap_rdma into unmap_rm\n\nSigned-off-by: Andy Grover \u003candy.grover@oracle.com\u003e\n" }, { "commit": "a6e0fc8514d41dfdd98b1d15cacc432cf040f8af", "tree": "48a6b7cbae9fa0637b7f134b2d204740af783237", "parents": [ "a7a4f1c1a52912eb8b3bd4d8f628d83a8b5d69dd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 08 14:15:32 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 14:15:32 2010 -0700" }, "message": "net: introduce rcu_dereference_rtnl\n\nWe use rcu_dereference_check(p, rcu_read_lock_held() ||\nlockdep_rtnl_is_held()) several times in network stack.\n\nMore usages to come too, so its time to create a helper.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e3634169bcc0cce33c815865d62ab378739f7389", "tree": "80165f1b0d8d7035734b7fe797083dbd9391781e", "parents": [ "cc28a20e77b261eb4e80c84abd621e810302f435" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Sep 07 05:55:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 13:42:22 2010 -0700" }, "message": "include/net/raw.h: Convert raw_seq_private macro to inline\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6523ce1525e88c598c75a1a6b8c4edddfa9defe8", "tree": "c3439e9c509676a0c29cd81fdaa65ad2632b903c", "parents": [ "64289c8e6851bca0e589e064c9a5c9fbd6ae5dd4" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Sun Sep 05 18:02:29 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 10:39:57 2010 -0700" }, "message": "ipvs: fix active FTP\n\n- Do not create expectation when forwarding the PORT\n command to avoid blocking the connection. The problem is that\n nf_conntrack_ftp.c:help() tries to create the same expectation later in\n POST_ROUTING and drops the packet with \"dropping packet\" message after\n failure in nf_ct_expect_related.\n\n- Change ip_vs_update_conntrack to alter the conntrack\n for related connections from real server. If we do not alter the reply in\n this direction the next packet from client sent to vport 20 comes as NEW\n connection. We alter it but may be some collision happens for both\n conntracks and the second conntrack gets destroyed immediately. The\n connection stucks too.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d56557af19867edb8c0e96f8e26399698a08857f", "tree": "2d98f87962a5a08839371ed90b9eaa7f256bea36", "parents": [ "fa2925cf90e612cb9c10c45d0cb8a7c7332e56a7", "17134d96735115644cc2f0e2b1bab51ca6e3ab95" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 16:00:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 16:00:17 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: bus speed strings should be const\n PCI hotplug: Fix build with CONFIG_ACPI unset\n PCI: PCIe: Remove the port driver module exit routine\n PCI: PCIe: Move PCIe PME code to the pcie directory\n PCI: PCIe: Disable PCIe port services during port initialization\n PCI: PCIe: Ask BIOS for control of all native services at once\n ACPI/PCI: Negotiate _OSC control bits before requesting them\n ACPI/PCI: Do not preserve _OSC control bits returned by a query\n ACPI/PCI: Make acpi_pci_query_osc() return control bits\n ACPI/PCI: Reorder checks in acpi_pci_osc_control_set()\n PCI: PCIe: Introduce commad line switch for disabling port services\n PCI: PCIe AER: Introduce pci_aer_available()\n x86/PCI: only define pci_domain_nr if PCI and PCI_DOMAINS are set\n PCI: provide stub pci_domain_nr function for !CONFIG_PCI configs\n" }, { "commit": "a44a553f827f28d46130c9818dbcb95f4262b96c", "tree": "44bd46b1604eb93f15196193a99725f94138af41", "parents": [ "ce7db282a3830f57f5b05ec48288c23a5c4d66d5", "93f68f1ef787d97ab688f78a01f446e85bb9a496" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:34:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:34:37 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/pseries: Correct rtas_data_buf locking in dlpar code\n powerpc/85xx: Add P1021 PCI IDs and quirks\n arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put to avoid memory leak\n arch/powerpc/platforms/83xx/mpc837x_mds.c: Add missing iounmap\n fsl_rio: fix compile errors\n powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock\n powerpc/85xx: Fix compilation of mpc85xx_mds.c\n powerpc: Don\u0027t use kernel stack with translation off\n powerpc/perf_event: Reduce latency of calling perf_event_do_pending\n powerpc/kexec: Adds correct calling convention for kexec purgatory\n" }, { "commit": "ce7db282a3830f57f5b05ec48288c23a5c4d66d5", "tree": "8e191c4b2ffa1658d5c014da5cc6230fc58c1a59", "parents": [ "cd4d4fc4137502f88ee871fc015a934dc28535e3", "54157c44471f5e266508ac08d270f2bc5857e8bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:08:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:08:37 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: fix a mismatch between code and comment\n percpu: fix a memory leak in pcpu_extend_area_map()\n percpu: add __percpu notations to UP allocator\n percpu: handle __percpu notations in UP accessors\n" }, { "commit": "cd4d4fc4137502f88ee871fc015a934dc28535e3", "tree": "09dfa0627996ca80d0fcc936b6fbd5080ee6e9d7", "parents": [ "608307e6de2631e37f55f106a7cbbc560cb12751", "9c37547ab62f88aac3e1e3c2065b611f811de9b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:08:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:08:17 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: use zalloc_cpumask_var() for gcwq-\u003emayday_mask\n workqueue: fix GCWQ_DISASSOCIATED initialization\n workqueue: Add a workqueue chapter to the tracepoint docbook\n workqueue: fix cwq-\u003enr_active underflow\n workqueue: improve destroy_workqueue() debuggability\n workqueue: mark lock acquisition on worker_maybe_bind_and_lock()\n workqueue: annotate lock context change\n workqueue: free rescuer on destroy_workqueue\n" }, { "commit": "608a5ffc3ee0d6f4aff53e902659201eeaeb9c06", "tree": "38658ba63eb2fccaf9f3d23112c84a31a40e257f", "parents": [ "78f220a84f464ff1a74d1b646e9b96bdddc47050", "6eb68d6f3bf1707d5d816ea9242b7d38f25b942e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:04:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 07 14:04:09 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver\n serial: bfin_sport_uart: restore transmit frame sync fix\n serial: fix port type conflict between NS16550A \u0026 U6_16550A\n MAINTAINERS: orphan isicom\n vt: Fix console corruption on driver hand-over.\n" }, { "commit": "f8f235e5bbf4e61f3e0886a44afb1dc4cfe8f337", "tree": "9211554f0542ce636aa1f14ffe58cfa832efa04d", "parents": [ "93f5f7f1249e76a5e8afbdab53f90b10c41fdb61" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Fri Aug 27 11:08:57 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 07 11:16:43 2010 +0100" }, "message": "agp/intel: Fix cache control for Sandybridge\n\nSandybridge GTT has new cache control bits in PTE, which controls\ngraphics page cache in LLC or LLC/MLC, so we need to extend the mask\nfunction to respect the new bits.\n\nAnd set cache control to always LLC only by default on Gen6.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "73457f0f836956747e0394320be2163c050e96ef", "tree": "ec0b11057cce5d93800876f4a89a2bcdbc91b69e", "parents": [ "0b5d404e349c0236b11466c0a4785520c0be6982" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri Aug 06 01:59:14 2010 +0300" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Sep 05 17:01:37 2010 +0300" }, "message": "cgroups: fix API thinko\n\ncgroup_attach_task_current_cg API that have upstream is backwards: we\nreally need an API to attach to the cgroups from another process A to\nthe current one.\n\nIn our case (vhost), a priveledged user wants to attach it\u0027s task to cgroups\nfrom a less priveledged one, the API makes us run it in the other\ntask\u0027s context, and this fails.\n\nSo let\u0027s make the API generic and just pass in \u0027from\u0027 and \u0027to\u0027 tasks.\nAdd an inline wrapper for cgroup_attach_task_current_cg to avoid\nbreaking bisect.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Paul Menage \u003cmenage@google.com\u003e\n" }, { "commit": "71cad0554956de87c3fc413b1eac9313887eb14f", "tree": "c1b7e900fe2329d689042a1ccf49842135a38a67", "parents": [ "d86b3001a1a6f9b8be15e5e060338de085d2bbbc" ], "author": { "name": "Philippe Langlais", "email": "philippe.langlais@stericsson.com", "time": "Tue Aug 31 14:19:09 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Sep 03 17:29:04 2010 -0700" }, "message": "serial: fix port type conflict between NS16550A \u0026 U6_16550A\n\nBug seen by Dr. David Alan Gilbert with sparse\n\nSigned-off-by: Philippe Langlais \u003cphilippe.langlais@stericsson.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "3fb5a991916091a908d53608a5899240039fb51e", "tree": "fa8e5855de904daffba92bd177fa57ee85641521", "parents": [ "323f30b361b2e6febb9065ab4a1a5298acb66ac1" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Sep 02 15:42:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 03 09:55:24 2010 -0700" }, "message": "cls_cgroup: Fix rcu lockdep warning\n\nDave reported an rcu lockdep warning on 2.6.35.4 kernel\n\ntask-\u003ecgroups and task-\u003ecgroups-\u003esubsys[i] are protected by RCU.\nSo we avoid accessing invalid pointers here. This might happen,\nfor example, when you are deref-ing those pointers while someone\nmove @task from one cgroup to another.\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc8acf2c8c3e43fcc192762a9f964b3e9a17748b", "tree": "e3a91392771a22390e59c24fcb7bad3045ce17d1", "parents": [ "7162f6691e9d39d8d866574687cddb3f1ec65d72" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 02 13:07:41 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 02 19:06:22 2010 -0700" }, "message": "drivers/net: avoid some skb-\u003eip_summed initializations\n\nfresh skbs have ip_summed set to CHECKSUM_NONE (0)\n\nWe can avoid setting again skb-\u003eip_summed to CHECKSUM_NONE in drivers.\n\nIntroduce skb_checksum_none_assert() helper so that we keep this\nassertion documented in driver sources.\n\nChange most occurrences of :\n\nskb-\u003eip_summed \u003d CHECKSUM_NONE;\n\nby :\n\nskb_checksum_none_assert(skb);\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7162f6691e9d39d8d866574687cddb3f1ec65d72", "tree": "c511679caf5c825ede4728870c513f92f4f1616b", "parents": [ "250e061e1d3e26600236a3dd9172e7f5f5916c00", "78ab952717b62c0ba6ca7f7a27eaa0486685e45f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 02 12:45:44 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 02 12:45:44 2010 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "78ab952717b62c0ba6ca7f7a27eaa0486685e45f", "tree": "a4ab2bfc578f279fc6847031f501d84c75057531", "parents": [ "3e502e63586920f219ed2590f69c1f5a8888cfa4", "85f72bc839705294b32b6c16b491c0422f0a71b3" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Sep 02 13:30:07 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Sep 02 13:30:07 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" }, { "commit": "c68839963426d42bdb2c915b435f9860d060e645", "tree": "b7ade0bcf08dc6c2a8465cb78bec556079c7c963", "parents": [ "8ed2163ff3b6abc5143d46dea73e523b22a6f987" ], "author": { "name": "Peter Meerwald", "email": "pmeerw@pmeerw.net", "time": "Thu Sep 02 04:06:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 02 10:12:05 2010 -0700" }, "message": "net: Improve comments in include/linux/phy.h\n\nCorrect state range of PHY bus addresses (i.e. 0-31) in comment,\nmake spelling of PHY consistent in comments.\n\nSigned-off-by: Peter Meerwald \u003cpmeerw@pmeerw.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "86cac58b71227cc34a3d0e78f19585c0eff49ea3", "tree": "e3329c4599474c12f17b0de5b2e8e4ff92233853", "parents": [ "aed5029ead26fe47527d9e9f2052cf56b72543f0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Aug 31 18:25:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 01 10:57:55 2010 -0700" }, "message": "skge: add GRO support\n\n- napi_gro_flush() is exported from net/core/dev.c, to avoid\n an irq_save/irq_restore in the packet receive path.\n- use napi_gro_receive() instead of netif_receive_skb()\n- use napi_gro_flush() before calling __napi_complete()\n- turn on NETIF_F_GRO by default\n- Tested on a Marvell 88E8001 Gigabit NIC\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a28dec2f26013aad89446b1f708f948617bc28a2", "tree": "61f9c219e8dc8318bc7f75e5b4c3d7382c8faa85", "parents": [ "5aac4d73dc234fe7be91679b547af2436d7f8d1e" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Sun Aug 08 18:03:33 2010 +0400" }, "committer": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Tue Aug 31 16:44:24 2010 -0500" }, "message": "powerpc/85xx: Add P1021 PCI IDs and quirks\n\nThis is needed for proper PCI-E support on P1021 SoCs.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\n" }, { "commit": "4dc89133f49b8cfd77ba7e83f5960aed63aaa99e", "tree": "7629fa72b5a13cbf48d43659bb396984caf7362a", "parents": [ "ba4fd9d8282f7f856f2287fe8be784d1dfdda28b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Aug 31 07:40:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 31 13:37:06 2010 -0700" }, "message": "net: add a comment on netdev-\u003elast_rx\n\nAs some driver authors seem to reintroduce dev-\u003elast_rx use,\nadd a comment to strongly discourage this.\n\nSince commit 6cf3f41e6c0 (bonding, net: Move last_rx update into bonding\nrecv logic), network drivers dont need to update last_rx themselves,\nunless they use this field to implement a timeout.\n\nNot updating last_rx helps not dirtying a cache line, improving\nperformance in SMP.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d5b99ae82f8742e3bb1f8634fd11ac36ea19ee1", "tree": "45ecec91f84d6038e2eeba2dd81d5cee7c07e599", "parents": [ "89858ad14307a398961a0f1414b04053c1475e4f" ], "author": { "name": "Gerrit Renker", "email": "gerrit@erg.abdn.ac.uk", "time": "Sun Aug 29 19:27:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 30 13:50:44 2010 -0700" }, "message": "TCP: update initial windows according to RFC 5681\n\nThis updates the use of larger initial windows, as originally specified in\nRFC 3390, to use the newer IW values specified in RFC 5681, section 3.1.\n\nThe changes made in RFC 5681 are:\n a) the setting now is more clearly specified in units of segments (as the\n comments by John Heffner emphasized, this was not very clear in RFC 3390);\n b) for connections with 1095 \u003c SMSS \u003c\u003d 2190 there is now a change:\n - RFC 3390 says that IW \u003c\u003d 4380,\n - RFC 5681 says that IW \u003d 3 * SMSS \u003c\u003d 6570.\n\nSince RFC 3390 is older and \"only\" proposed standard, whereas the newer RFC 5681\nis already draft standard, it seems preferable to use the newer IW variant.\n\nSigned-off-by: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22b71c8f4f3db8df92f5e7b081c265bc56c0bd2f", "tree": "b913f63369b09ad703ed52a42b367455785ef3af", "parents": [ "d26eeb07fd02de31848b59d19687daff0e93532f" ], "author": { "name": "Gerrit Renker", "email": "gerrit@erg.abdn.ac.uk", "time": "Sun Aug 29 19:23:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 30 13:45:26 2010 -0700" }, "message": "tcp/dccp: Consolidate common code for RFC 3390 conversion\n\nThis patch consolidates initial-window code common to TCP and CCID-2:\n * TCP uses RFC 3390 in a packet-oriented manner (tcp_input.c) and\n * CCID-2 uses RFC 3390 in packet-oriented manner (RFC 4341).\n\nSigned-off-by: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dca43c75e7e545694a9dd6288553f55c53e2a3a3", "tree": "4df6b0b295ecd571fa95004b486d9af1636d6a30", "parents": [ "409456b10f87b28303643fec37543103f9ada00c" ], "author": { "name": "Jerry Chu", "email": "hkchu@google.com", "time": "Fri Aug 27 19:13:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 30 13:23:33 2010 -0700" }, "message": "tcp: Add TCP_USER_TIMEOUT socket option.\n\nThis patch provides a \"user timeout\" support as described in RFC793. The\nsocket option is also needed for the the local half of RFC5482 \"TCP User\nTimeout Option\".\n\nTCP_USER_TIMEOUT is a TCP level socket option that takes an unsigned int,\nwhen \u003e 0, to specify the maximum amount of time in ms that transmitted\ndata may remain unacknowledged before TCP will forcefully close the\ncorresponding connection and return ETIMEDOUT to the application. If\n0 is given, TCP will continue to use the system default.\n\nIncreasing the user timeouts allows a TCP connection to survive extended\nperiods without end-to-end connectivity. Decreasing the user timeouts\nallows applications to \"fail fast\" if so desired. Otherwise it may take\nupto 20 minutes with the current system defaults in a normal WAN\nenvironment.\n\nThe socket option can be made during any state of a TCP connection, but\nis only effective during the synchronized states of a connection\n(ESTABLISHED, FIN-WAIT-1, FIN-WAIT-2, CLOSE-WAIT, CLOSING, or LAST-ACK).\nMoreover, when used with the TCP keepalive (SO_KEEPALIVE) option,\nTCP_USER_TIMEOUT will overtake keepalive to determine when to close a\nconnection due to keepalive failure.\n\nThe option does not change in anyway when TCP retransmits a packet, nor\nwhen a keepalive probe will be sent.\n\nThis option, like many others, will be inherited by an acceptor from its\nlistener.\n\nSigned-off-by: H.K. Jerry Chu \u003chkchu@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "409456b10f87b28303643fec37543103f9ada00c", "tree": "f45d3b953de9dbda4f7d8486b48afa0c59395cd7", "parents": [ "2c70b5196262f29b10eb1886293e0c2d75dc3dd9" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Sun Aug 29 21:57:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 29 21:57:55 2010 -0700" }, "message": "net: fix datapath typo\n\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "29cfcddc0e745b515ec360ffe2ee4e7a4015efd8", "tree": "1682b6caaf84d4863e65b2e4e387afa6a972146f", "parents": [ "303fd2c2ce5addef1aacac962a5b099cc0af71ea", "c34186ed008229e7f7e3f1de8e6acf6374995358" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 15:42:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 15:42:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n net/ipv4: Eliminate kstrdup memory leak\n net/caif/cfrfml.c: use asm/unaligned.h\n ax25: missplaced sock_put(sk)\n qlge: reset the chip before freeing the buffers\n l2tp: test for ethernet header in l2tp_eth_dev_recv()\n tcp: select(writefds) don\u0027t hang up when a peer close connection\n tcp: fix three tcp sysctls tuning\n tcp: Combat per-cpu skew in orphan tests.\n pxa168_eth: silence gcc warnings\n pxa168_eth: update call to phy_mii_ioctl()\n pxa168_eth: fix error handling in prope\n pxa168_eth: remove unneeded null check\n phylib: Fix race between returning phydev and calling adjust_link\n caif-driver: add HAS_DMA dependency\n 3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_tx\n qlcnic: fix poll implementation\n netxen: fix poll implementation\n bridge: netfilter: fix a memory leak\n" }, { "commit": "30c0f6a04975d557f3c1a4e640b3808b1231c3ef", "tree": "eefc2a8d97765342cb5c2c16d98e5d02e9ebf98a", "parents": [ "e933424c4823596ed231648eeb602b5209960ff6", "92b4678efa8ce0de9b1e01a74e3d13c4002a4136" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 14:11:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 14:11:04 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/users/eparis/notify\n\n* \u0027for-linus\u0027 of git://git.infradead.org/users/eparis/notify:\n fsnotify: drop two useless bools in the fnsotify main loop\n fsnotify: fix list walk order\n fanotify: Return EPERM when a process is not privileged\n fanotify: resize pid and reorder structure\n fanotify: drop duplicate pr_debug statement\n fanotify: flush outstanding perm requests on group destroy\n fsnotify: fix ignored mask handling between inode and vfsmount marks\n fanotify: add MAINTAINERS entry\n fsnotify: reset used_inode and used_vfsmount on each pass\n fanotify: do not dereference inode_mark when it is unset\n" }, { "commit": "06f01e73ef1064d81b010e84941b01a15e2745ed", "tree": "0e528b67016e187a22027f329852e14867e65dee", "parents": [ "51bbd47d3641beb4a8c2a35d55488c859b60c82d", "04cbe1de6fbda9649a6f25666194e6955d3e717e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 14:08:38 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 14:08:38 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n vgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARB\n drm/radeon/kms: add missing scratch update in dp_detect\n drm/modes: Fix CVT-R modeline generation\n drm: fix regression in drm locking since BKL removal.\n drm/radeon/kms: remove stray radeon_i2c_destroy\n drm: mm: fix range restricted allocations\n drm/nouveau: drop drm_global_mutex before sleeping in submission path\n drm: export drm_global_mutex for drivers to use\n drm/nv20: Don\u0027t use pushbuf calls on the original nv20.\n drm/nouveau: Fix TMDS on some DCB1.5 boards.\n drm/nouveau: Fix backlight control on PPC machines with an internal TMDS panel.\n drm/nv30: Apply modesetting to the correct slave encoder\n drm/nouveau: Use a helper function to match PCI device/subsystem IDs.\n drm/nv50: add dcb type 14 to enum to prevent compiler complaint\n" }, { "commit": "bad849b3dc0fae1297c8d47f846f8d202a6145ed", "tree": "d3802e46cbda7f6df30a9b0378e15a8343572a19", "parents": [ "0a3b6e452b403f6e0cf3000da87b19e0fd9c4ba3" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Aug 26 16:00:34 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 14:01:03 2010 -0700" }, "message": "NOMMU: Stub out vm_get_page_prot() if there\u0027s no MMU\n\nStub out vm_get_page_prot() if there\u0027s no MMU.\n\nThis was added by commit 804af2cf6e7a (\"[AGPGART] remove private page\nprotection map\") and is used in commit c07fbfd17e61 (\"fbmem: VM_IO set,\nbut not propagated\") in the fbmem video driver, but the function doesn\u0027t\nexist on NOMMU, resulting in an undefined symbol at link time.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2637d139fb9a1bd428a003b7671fda40a034854f", "tree": "7983e0776c95990a545f83275682614e16a71167", "parents": [ "494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b", "288933c02b440621d9c8e7bb5f232cfb7bdef7df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 13:55:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 13:55:31 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()\n Input: mousedev - fix regression of inverting axes\n Input: uinput - add devname alias to allow module on-demand load\n Input: hil_kbd - fix compile error\n USB: drop tty argument from usb_serial_handle_sysrq_char()\n Input: sysrq - drop tty argument form handle_sysrq()\n Input: sysrq - drop tty argument from sysrq ops handlers\n" }, { "commit": "0fb85621df4f9f7c663c6c77c302e821a832c95e", "tree": "b5bcb8e79ad6197ba161dbf9687755bb281b83aa", "parents": [ "ff8d6e983185ce19fa92bb836eb52b589957be65" ], "author": { "name": "Tvrtko Ursulin", "email": "tvrtko.ursulin@sophos.com", "time": "Fri Aug 20 10:02:15 2010 +0100" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Fri Aug 27 19:54:09 2010 -0400" }, "message": "fanotify: resize pid and reorder structure\n\nresize pid and reorder the fanotify_event_metadata so it is naturally\naligned and we can work towards dropping the packed attributed\n\nSigned-off-by: Tvrtko Ursulin \u003ctvrtko.ursulin@sophos.com\u003e\nCc: Andreas Dilger \u003cadilger@dilger.ca\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "34d4bc4d41d282a66dafe1b01a7d46bad468cefb", "tree": "ac0936b00f1ebd037be32fd0e5f304f26366e6c0", "parents": [ "87490f6db38999fee7f6d3dbecc5b94730c7e010" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Aug 27 12:35:58 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 27 13:53:31 2010 -0400" }, "message": "mac80211: support runtime interface type changes\n\nAdd support to mac80211 for changing the interface\ntype even when the interface is UP, if the driver\nsupports it.\n\nTo achieve this\n * add a new driver callback for switching,\n * split some of the interface up/down code out\n into new functions (do_open/do_stop), and\n * maintain an own __SDATA_RUNNING bit that will\n not be set during interface type, so that any\n other code doesn\u0027t use the interface.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c0692b8fe29fb4d4dad33487aabf3ed7e1e880c0", "tree": "39c0c74c2270a285e1a0cfc7958ced7368cf28a6", "parents": [ "3ffc2a905b1faae4c0fe39d66f0752c3a4cbb3c7" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Aug 27 14:26:53 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 27 13:27:07 2010 -0400" }, "message": "cfg80211: allow changing port control protocol\n\nSome vendor specified mechanisms for 802.1X-style\nfunctionality use a different protocol than EAP\n(even if EAP is vendor-extensible). Allow setting\nthe ethertype for the protocol when a driver has\nsupport for this. The default if unspecified is\nEAP, of course.\n\nNote: This is suitable only for station mode, not\n for AP implementation.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8789d459bc5e837bf37d261453df96ef54018d7b", "tree": "5dbcabe5807de84f9119ab3654b998fd65ac0a40", "parents": [ "5f33c92d188add2a22ec524c03e0ab097e303d52" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Aug 26 13:30:26 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 27 13:27:06 2010 -0400" }, "message": "mac80211: allow scan to complete from any context\n\nThe ieee80211_scan_completed() function was a frequent\nsource of potential deadlocks, since it is called by\ndrivers but may call back into drivers, so drivers had\nto make sure to call it without any locks held, which\nfrequently lead to more complex code in drivers. Avoid\nthat problem by allowing the function to be called in\nany context, and queueing the actual work it does.\nAlso update the documentation for it to indicate this.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "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": "04cbe1de6fbda9649a6f25666194e6955d3e717e", "tree": "cfa16f6b8319bfef9db8a5e9ada9ab030644a55e", "parents": [ "30f4437202daa5315a1033b2084ddce96fea99b6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Aug 19 21:29:43 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Aug 27 09:10:44 2010 +1000" }, "message": "vgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARB\n\nFix link failure without the vga arbitrator.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\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": "4c5f7d7a1e6cf20ad515dad8a63c0813fac5bcea", "tree": "f49374562261f98bb92d0b4773d300eb2cc11d82", "parents": [ "31c726f0963cd022680dacd0c9f0036d7e12a8b2" ], "author": { "name": "Kalle Valo", "email": "kvalo@adurom.com", "time": "Sun Aug 22 22:46:28 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 25 14:33:19 2010 -0400" }, "message": "wl12xx: change contact person for the include file\n\nLuciano should be the contact person for the include/linux/spi/wl12xx.h file.\n\nSigned-off-by: Kalle Valo \u003ckvalo@adurom.com\u003e\nAcked-by: Luciano Coelho \u003cluciano.coelho@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2738bd682df546f34654ed3d59dfc9ebe8d04979", "tree": "ba5dfd4694157d7f35c538b99550d16d437a2097", "parents": [ "ff67bb86d448c26cb9110e9681669dc4a8aa5e0a" ], "author": { "name": "Bob Copeland", "email": "me@bobcopeland.com", "time": "Sat Aug 21 16:39:01 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 25 14:33:17 2010 -0400" }, "message": "mac80211: trivial spelling fixes\n\nFix spelling and readability of a few lines of kernel doc:\n\n s/issueing/issuing/g\n s/approriate/appropriate/g\n s/supported by simply/supported simply by/\n s/IEEE80211_HW_BEACON_FILTERING/IEEE80211_HW_BEACON_FILTER/g\n\nSigned-off-by: Bob Copeland \u003cme@bobcopeland.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ad1af0fedba14f82b240a03fe20eb9b2fdbd0357", "tree": "4d53aa8bc2d9df782aa792e52670ab55c7a44d5b", "parents": [ "b2bc85631e72485b984bcd202a104591874babba" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 02:27:49 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 02:27:49 2010 -0700" }, "message": "tcp: Combat per-cpu skew in orphan tests.\n\nAs reported by Anton Blanchard when we use\npercpu_counter_read_positive() to make our orphan socket limit checks,\nthe check can be off by up to num_cpus_online() * batch (which is 32\nby default) which on a 128 cpu machine can be as large as the default\norphan limit itself.\n\nFix this by doing the full expensive sum check if the optimized check\ntriggers.\n\nReported-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "8a2e8e5dec7e29c56a46ba176c664ab6a3d04118", "tree": "57da96451bead4986dfcd82aadf47ba2c05745ac", "parents": [ "e41e704bc4f49057fc68b643108366e6e6781aa3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Aug 25 10:33:56 2010 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Aug 25 10:33:56 2010 +0200" }, "message": "workqueue: fix cwq-\u003enr_active underflow\n\ncwq-\u003enr_active is used to keep track of how many work items are active\nfor the cpu workqueue, where \u0027active\u0027 is defined as either pending on\nglobal worklist or executing. This is used to implement the\nmax_active limit and workqueue freezing. If a work item is queued\nafter nr_active has already reached max_active, the work item doesn\u0027t\nincrement nr_active and is put on the delayed queue and gets activated\nlater as previous active work items retire.\n\ntry_to_grab_pending() which is used in the cancellation path\nunconditionally decremented nr_active whether the work item being\ncancelled is currently active or delayed, so cancelling a delayed work\nitem makes nr_active underflow. This breaks max_active enforcement\nand triggers BUG_ON() in destroy_workqueue() later on.\n\nThis patch fixes this bug by adding a flag WORK_STRUCT_DELAYED, which\nis set while a work item in on the delayed list and making\ntry_to_grab_pending() decrement nr_active iff the work item is\ncurrently active.\n\nThe addition of the flag enlarges cwq alignment to 256 bytes which is\ngetting a bit too large. It\u0027s scheduled to be reduced back to 128\nbytes by merging WORK_STRUCT_PENDING and WORK_STRUCT_CWQ in the next\ndevel cycle.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\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": "75fb60f26befb59dbfa05cb122972642b7bdd219", "tree": "be015dd00e7748e45f3691f04a16c204546b3026", "parents": [ "2b8fd9186d9275b07aef43e5bb4e98cd571f9a7d" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Aug 23 23:53:11 2010 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Aug 24 13:44:40 2010 -0700" }, "message": "ACPI/PCI: Negotiate _OSC control bits before requesting them \n\nIt is possible that the BIOS will not grant control of all _OSC\nfeatures requested via acpi_pci_osc_control_set(), so it is\nrecommended to negotiate the final set of _OSC features with the\nquery flag set before calling _OSC to request control of these\nfeatures.\n\nTo implement it, rework acpi_pci_osc_control_set() so that the caller\ncan specify the mask of _OSC control bits to negotiate and the mask\nof _OSC control bits that are absolutely necessary to it. Then,\nacpi_pci_osc_control_set() will run _OSC queries in a loop until\nthe mask of _OSC control bits returned by the BIOS is equal to the\nmask passed to it. Also, before running the _OSC request\nacpi_pci_osc_control_set() will check if the caller\u0027s required\ncontrol bits are present in the final mask.\n\nUsing this mechanism we will be able to avoid situations in which the\nBIOS doesn\u0027t grant control of certain _OSC features, because they\ndepend on some other _OSC features that have not been requested.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "2b8fd9186d9275b07aef43e5bb4e98cd571f9a7d", "tree": "8ddae8c12e8dabfffb3eed75aff0f3121b955e9c", "parents": [ "ab8e8957a2ae21c0f036476c6db13e949be730ac" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Aug 23 23:55:59 2010 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Aug 24 13:44:17 2010 -0700" }, "message": "ACPI/PCI: Do not preserve _OSC control bits returned by a query \n\nThere is the assumption in acpi_pci_osc_control_set() that it is\nalways sufficient to compare the mask of _OSC control bits to be\nrequested with the result of an _OSC query where all of the known\ncontrol bits have been checked. However, in general, that need not\nbe the case. For example, if an _OSC feature A depends on an _OSC\nfeature B and control of A, B plus another _OSC feature C is\nrequested simultaneously, the BIOS may return A, B, C, while it would\nonly return C if A and C were requested without B.\n\nThat may result in passing a wrong mask of _OSC control bits to an\n_OSC control request, in which case the BIOS may only grant control\nof a subset of the requested features. Moreover, acpi_pci_run_osc()\nwill return error code if that happens and the caller of\nacpi_pci_osc_control_set() will not know that it\u0027s been granted\ncontrol of some _OSC features. Consequently, the system will\ngenerally not work as expected.\n\nApart from this acpi_pci_osc_control_set() always uses the mask\nof _OSC control bits returned by the very first invocation of\nacpi_pci_query_osc(), but that is done with the second argument\nequal to OSC_PCI_SEGMENT_GROUPS_SUPPORT which generally happens\nto affect the returned _OSC control bits.\n\nFor these reasons, make acpi_pci_osc_control_set() always check if\ncontrol of the requested _OSC features will be granted before making\nthe final control request. As a result, the osc_control_qry and\nosc_queried members of struct acpi_pci_root are not necessary any\nmore, so drop them and remove the remaining code referring to them.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\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": "502adf5778f4151dcba3f64dd6ed322151f3712c", "tree": "ad14adb37dedaefabdaf93b08ab9d32bc140ed81", "parents": [ "3b6c5507a69861e80c26f21d04601c674cbeec3d", "c6db67cda735d8ace5f19c3831240e1408679790" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 12:21:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 12:21:49 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n watchdog: Don\u0027t throttle the watchdog\n tracing: Fix timer tracing\n" }, { "commit": "8ca3eb08097f6839b2206e2242db4179aee3cfb3", "tree": "32b9f033230d615d248fa0bbfa1a0c644a422ed8", "parents": [ "9559fcdbff4f93d29af04478bbc48294519424f5" ], "author": { "name": "Luck, Tony", "email": "tony.luck@intel.com", "time": "Tue Aug 24 11:44:18 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 12:13:20 2010 -0700" }, "message": "guard page for stacks that grow upwards\n\npa-risc and ia64 have stacks that grow upwards. Check that\nthey do not run into other mappings. By making VM_GROWSUP\n0x0 on architectures that do not ever use it, we can avoid\nsome unpleasant #ifdefs in check_stack_guard_page().\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e41e704bc4f49057fc68b643108366e6e6781aa3", "tree": "8cc85208970ba0c9adf533903243e28c506f23ae", "parents": [ "972fa1c5316d18c8297123e08e9b6930ca34f888" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Aug 24 14:22:47 2010 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Aug 24 18:01:32 2010 +0200" }, "message": "workqueue: improve destroy_workqueue() debuggability\n\nNow that the worklist is global, having works pending after wq\ndestruction can easily lead to oops and destroy_workqueue() have\nseveral BUG_ON()s to catch these cases. Unfortunately, BUG_ON()\ndoesn\u0027t tell much about how the work became pending after the final\nflush_workqueue().\n\nThis patch adds WQ_DYING which is set before the final flush begins.\nIf a work is requested to be queued on a dying workqueue,\nWARN_ON_ONCE() is triggered and the request is ignored. This clearly\nindicates which caller is trying to queue a work on a dying workqueue\nand keeps the system working in most cases.\n\nLocking rule comment is updated such that the \u0027I\u0027 rule includes\nmodifying the field from destruction path.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "6d87f207c04370681b9a710b8dbed0f567491e49", "tree": "b6ca4ab9f7358f2ec8088fbadcb5f078a9c022f2", "parents": [ "d20de763548f9948f4534fc816155d8ee48e1d35", "f6e6e7799ebcad40fa15e4015beca2d776554302" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 00:21:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 00:21:02 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n kobject_uevent: fix typo in comments\n firmware_class: fix typo in error path\n kobject: Break the kobject namespace defs into their own header\n" }, { "commit": "d20de763548f9948f4534fc816155d8ee48e1d35", "tree": "66343a0f3a7dc134fab7cfd97f25d8efd5a8de65", "parents": [ "d1b113bb028999e82a8528e1484be8c23fb5a7d9", "70ddd47f7d56f17b40f78d21d6f653c84617e450" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 00:20:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 00:20:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (29 commits)\n ARM: imx: fix build failure concerning otg/ulpi\n USB: ftdi_sio: add product ID for Lenz LI-USB\n USB: adutux: fix misuse of return value of copy_to_user()\n USB: iowarrior: fix misuse of return value of copy_to_user()\n USB: xHCI: update ring dequeue pointer when process missed tds\n USB: xhci: Remove buggy assignment in next_trb()\n USB: ftdi_sio: Add ID for Ionics PlugComputer\n USB: serial: io_ti.c: don\u0027t return 0 if writing the download record failed\n USB: otg: twl4030: fix wrong assumption of starting state\n USB: gadget: Return -ENOMEM on memory allocation failure\n USB: gadget: fix composite kernel-doc warnings\n USB: ssu100: set tty_flags in ssu100_process_packet\n USB: ssu100: add disconnect function for ssu100\n USB: serial: export symbol usb_serial_generic_disconnect\n USB: ssu100: rework logic for TIOCMIWAIT\n USB: ssu100: add register parameter to ssu100_setregister\n USB: ssu100: remove duplicate #defines in ssu100\n USB: ssu100: refine process_packet in ssu100\n USB: ssu100: add locking for port private data in ssu100\n USB: r8a66597-udc: return -ENOMEM if kzalloc() fails\n ...\n" }, { "commit": "d187abb9a83e6c6b6e9f2ca17962bdeafb4bc903", "tree": "16eb22b79042d50834eb2be839d7cb240317c823", "parents": [ "6b8f1ca5581bf9783069cd6bde65ba7a3a470aab" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Aug 11 12:07:13 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 23 20:50:16 2010 -0700" }, "message": "USB: gadget: fix composite kernel-doc warnings\n\nWarning(include/linux/usb/composite.h:284): No description found for parameter \u0027disconnect\u0027\nWarning(drivers/usb/gadget/composite.c:744): No description found for parameter \u0027c\u0027\nWarning(drivers/usb/gadget/composite.c:744): Excess function parameter \u0027cdev\u0027 description in \u0027usb_string_ids_n\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\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": "d1b113bb028999e82a8528e1484be8c23fb5a7d9", "tree": "18be926b8f7721e98d6a4517ced58b54937645fb", "parents": [ "9c5ea3675dbe4853eea747542da257c3e6f18de2", "cca77b7c81876d819a5806f408b3c29b5b61a815" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:30:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:30:30 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: (27 commits)\n netfilter: fix CONFIG_COMPAT support\n isdn/avm: fix build when PCMCIA is not enabled\n header: fix broken headers for user space\n e1000e: don\u0027t check for alternate MAC addr on parts that don\u0027t support it\n e1000e: disable ASPM L1 on 82573\n ll_temac: Fix poll implementation\n netxen: fix a race in netxen_nic_get_stats()\n qlnic: fix a race in qlcnic_get_stats()\n irda: fix a race in irlan_eth_xmit()\n net: sh_eth: remove unused variable\n netxen: update version 4.0.74\n netxen: fix inconsistent lock state\n vlan: Match underlying dev carrier on vlan add\n ibmveth: Fix opps during MTU change on an active device\n ehea: Fix synchronization between HW and SW send queue\n bnx2x: Update bnx2x version to 1.52.53-4\n bnx2x: Fix PHY locking problem\n rds: fix a leak of kernel memory\n netlink: fix compat recvmsg\n netfilter: fix userspace header warning\n ...\n" }, { "commit": "c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394", "tree": "d159b9722131e32288cd66030ee002e1ed808602", "parents": [ "c70662ec47191eb235bb1d0a1466b923b7a08a94", "9c35e90c6fcf7f5baf27a63d9565e9f47633f299" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:29:18 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:29:18 2010 -0700" }, "message": "Merge branch \u0027for-upstream/pvhvm\u0027 of git://xenbits.xensource.com/people/ianc/linux-2.6\n\n* \u0027for-upstream/pvhvm\u0027 of git://xenbits.xensource.com/people/ianc/linux-2.6:\n xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield\n xen: pvhvm: rename xen_emul_unplug\u003dignore to \u003dunnnecessary\n xen: pvhvm: allow user to request no emulated device unplug\n" }, { "commit": "ee005577aa3b89f5291fe73be2054d375d23f5eb", "tree": "50fc586c3a3b6bdc73d68d103e2554544060e8bf", "parents": [ "2e9e018ecd836d92cc4735b4d878d8b20c08b070", "d03330383c9255cdb184dd33594e89c3542f191b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:28:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:28:03 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: (33 commits)\n drm/radeon/kms: fix typo in radeon_compute_pll_gain\n drm/radeon/kms: try to detect tv vs monitor for underscan\n drm/radeon/kms: fix sideport detection on newer rs880 boards\n drm/radeon: fix passing wrong type to gem object create.\n drm/radeon/kms: set encoder type to DVI for HDMI on evergreen\n drm/radeon/kms: add back missing break in info ioctl\n drm/radeon/kms: don\u0027t enable MSIs on AGP boards\n drm/radeon/kms: fix agp mode setup on cards that use pcie bridges\n drm: move dereference below check\n drm: fix end of loop test\n drm/radeon/kms: rework radeon_dp_detect() logic\n drm/radeon/kms: add missing asic callback assignment for evergreen\n drm/radeon/kms/DCE3+: switch pads to ddc mode when going i2c\n drm/radeon/kms/pm: bail early if nothing\u0027s changing\n drm/radeon/kms/atom: clean up dig atom handling\n drm/radeon/kms: DCE3/4 transmitter fixes\n drm/radeon/kms: rework encoder handling\n drm/radeon/kms: DCE3/4 AdjustPixelPll updates\n drm/radeon: Fix stack data leak\n drm/radeon/kms: fix GTT/VRAM overlapping test\n ...\n" }, { "commit": "8488a38f4d2f43bd55a3e0db4cd57a5bef3af6d6", "tree": "104acb0de25090fa4982c24799c2d3d414b9b192", "parents": [ "9ee47476d6734c9deb9ae9ab05d963302f6b6150" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Aug 11 15:01:02 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Aug 23 18:12:46 2010 -0700" }, "message": "kobject: Break the kobject namespace defs into their own header\n\nBreak the kobject namespace defs into their own header to avoid a header file\ninclusion ordering problem between linux/sysfs.h and linux/kobject.h.\n\nThis fixes the build breakage on older versions of gcc.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Eric Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9c35e90c6fcf7f5baf27a63d9565e9f47633f299", "tree": "c3e311c13f4c1815c729c70f6c20b79175673236", "parents": [ "1dc7ce99b091a11cce0f34456c1ffcb928f17edd" ], "author": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Mon Aug 23 12:01:35 2010 +0100" }, "committer": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Mon Aug 23 12:01:35 2010 +0100" }, "message": "xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield\n\nby defining in terms of (1\u003c\u003cN).\n\nXEN_UNPLUG_UNNECESSARY and XEN_UNPLUG_NEVER are only used within the\nkernel and are not defined as a bit on the unplug IO port. Therefore\nuse a bit which is outside the potentially valid range of the 16 bit\nIO port.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nAcked-by: Jeremy Fitzhardinge \u003cjeremy.fitzhardinge@citrix.com\u003e\nAcked-by: Stefano Stabellini \u003cStefano.Stabellini@eu.citrix.com\u003e\n" }, { "commit": "1dc7ce99b091a11cce0f34456c1ffcb928f17edd", "tree": "b9f125fc324a86ff4af64fb0799d20330f61084c", "parents": [ "c93a4dfb31f2c023da3ad1238c352452f2cc0e05" ], "author": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Mon Aug 23 11:59:29 2010 +0100" }, "committer": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Mon Aug 23 11:59:29 2010 +0100" }, "message": "xen: pvhvm: rename xen_emul_unplug\u003dignore to \u003dunnnecessary\n\nIt is not immediately clear what this option causes to become\nignored. The actual meaning is that it is not necessary to unplug the\nemulated devices to safely use the PV ones, even if the platform does\nnot support the unplug protocol. (pressumably the user will only add\nthis option if they have ensured that their domain configuration is\nsafe).\n\nI think xen_emul_unplug\u003dunnecessary better captures this.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nAcked-by: Jeremy Fitzhardinge \u003cjeremy.fitzhardinge@citrix.com\u003e\nAcked-by: Stefano Stabellini \u003cStefano.Stabellini@eu.citrix.com\u003e\n" }, { "commit": "c93a4dfb31f2c023da3ad1238c352452f2cc0e05", "tree": "c141f9f1773a8f132fbd653eaf81a0ec95f4d06f", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Mon Aug 23 11:59:28 2010 +0100" }, "committer": { "name": "Ian Campbell", "email": "ian.campbell@citrix.com", "time": "Mon Aug 23 11:59:28 2010 +0100" }, "message": "xen: pvhvm: allow user to request no emulated device unplug\n\nthis allows the user to disable pvhvm and revert to emulated devices\nin case of a system misconfiguration (e.g. initramfs with only\nemulated drivers in it).\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nAcked-by: Jeremy Fitzhardinge \u003cjeremy.fitzhardinge@citrix.com\u003e\nAcked-by: Stefano Stabellini \u003cStefano.Stabellini@eu.citrix.com\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": "2eebf582c9b3106abb9c33f4fc0a347fb9391037", "tree": "0fab23d7e456713815890fc01a148132b9b857f8", "parents": [ "84e1ab4d875922c034db7f4f814ac445a20a14bd" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Wed Aug 18 12:25:50 2010 -0400" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Sun Aug 22 20:28:16 2010 -0400" }, "message": "fanotify: flush outstanding perm requests on group destroy\n\nWhen an fanotify listener is closing it may cause a deadlock between the\nlistener and the original task doing an fs operation. If the original task\nis waiting for a permissions response it will be holding the srcu lock. The\nlistener cannot clean up and exit until after that srcu lock is syncronized.\nThus deadlock. The fix introduced here is to stop accepting new permissions\nevents when a listener is shutting down and to grant permission for all\noutstanding events. Thus the original task will eventually release the srcu\nlock and the listener can complete shutdown.\n\nReported-by: Andreas Gruenbacher \u003cagruen@suse.de\u003e\nCc: Andreas Gruenbacher \u003cagruen@suse.de\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "bc584c5107bfd97e2aa41c798e3b213bcdd4eae7", "tree": "13cb518e2f4f2aac46aefbbaacb6e4fa3fbb58a2", "parents": [ "a28e0852d45e65d9edf249c36e432b5e0a80f01d", "1ab335d8f85792e3b107ff8237d53cf64db714df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 22 10:08:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 22 10:08:52 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:\n slab: fix object alignment\n slub: add missing __percpu markup in mm/slub_def.h\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" } ], "next": "81ce790bd75d49a0d119f5d7b27405e1d9b1bd57" }