)]}' { "log": [ { "commit": "2d0a03460a8a0c611843500735096ff799aa8510", "tree": "7de71ec848af910d0075a1175381015ded556fe6", "parents": [ "04fafe4ed76f5547856f4c464bec5bf948afb498" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:46 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:06 2010 -0700" }, "message": "Bluetooth: Reassigned copyright to Code Aurora Forum\n\nQualcomm, Inc. has reassigned rights to Code Aurora Forum. Accordingly,\nas files are modified by Code Aurora Forum members, the copyright\nstatement will be updated.\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "04fafe4ed76f5547856f4c464bec5bf948afb498", "tree": "6e16cc046b1686048efb36cb278b33ad7842f4dd", "parents": [ "7452d24cfb91e84f9be61beda5ad68d2a56d0938" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:45 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Remove extraneous white space\n\nDeleted extraneous white space from the end of several lines\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "f03585689fdff4ae256edd45a35bc2dd83d3684a", "tree": "be1516aa354aa742f2d5b69a91de0561febaffc4", "parents": [ "95ffa97827371ede501615d9bd048eb5b49e8fe1" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Tue May 18 13:20:32 2010 +0200" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Add blacklist support for incoming connections\n\nIn some circumstances it could be desirable to reject incoming\nconnections on the baseband level. This patch adds this feature through\ntwo new ioctl\u0027s: HCIBLOCKADDR and HCIUNBLOCKADDR. Both take a simple\nBluetooth address as a parameter. BDADDR_ANY can be used with\nHCIUNBLOCKADDR to remove all devices from the blacklist.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "11fe883936980fe242869d671092a466cf1db3e3", "tree": "14ff24e81eb4326e94eb5aa6432a1dd55cef5ece", "parents": [ "70d4bf6d467a330ccc947df9b2608e329d9e7708", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/vhost/net.c\n\tnet/bridge/br_device.c\n\nFix merge conflict in drivers/vhost/net.c with guidance from\nStephen Rothwell.\n\nRevert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d\nsince net-next-2.6 has fixes that make bridge netpoll work properly thus\nwe don\u0027t need it disabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e7c38157c61649e66f853d7b9f109119b8361448", "tree": "177568b25a74f50fbc876d983a4fae1dae7ea468", "parents": [ "5ae482e01d60bd4e8fc181f78355047e52999ce8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 22:01:26 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 22:01:26 2010 -0700" }, "message": "ipv6: Make IP6CB(skb)-\u003enhoff 16-bit.\n\nEven with jumbograms I cannot see any way in which we would need\nto records a larger than 65535 valued next-header offset.\n\nThe maximum extension header length is (256 \u003c\u003c 3) \u003d\u003d 2048.\nThere are only a handful of extension headers specified which\nwe\u0027d even accept (say 5 or 6), therefore the largest next-header\noffset we\u0027d ever have to contend with is something less than\nsay 16k.\n\nTherefore make it a u16 instead of a u32.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd27290a593f80cb99e95287cb29c72c0d57608b", "tree": "c12dfb1cb4cfd7f7d65e34fcf53797685ec66670", "parents": [ "db5dda905759c931ceb8f3f2fcfd7719009acc98" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jul 19 09:35:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 09:35:40 2010 -0700" }, "message": "net: 64bit stats for netdev_queue\n\nSince struct netdev_queue tx_bytes/tx_packets/tx_dropped are already\nprotected by _xmit_lock, its easy to convert these fields to u64 instead\nof unsigned long.\nThis completes 64bit stats for devices using them (vlan, macvlan, ...)\n\nStrictly, we could avoid the locking in dev_txq_stats_fold() on 64bit\narches, but its slow path and we prefer keep it simple.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c1f19b51d1d87f3e3bb7e6648f43f7d57ed2da6b", "tree": "d9525359409e3493b48e8676717cc11ed69b640a", "parents": [ "15f0127d1d189fda3294b7823e3e654afca54055" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:49:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:26 2010 -0700" }, "message": "net: support time stamping in phy devices.\n\nThis patch adds a new networking option to allow hardware time stamps\nfrom PHY devices. When enabled, likely candidates among incoming and\noutgoing network packets are offered to the PHY driver for possible\ntime stamping. When accepted by the PHY driver, incoming packets are\ndeferred for later delivery by the driver.\n\nThe patch also adds phylib driver methods for the SIOCSHWTSTAMP ioctl\nand callbacks for transmit and receive time stamping. Drivers may\noptionally implement these functions.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "15f0127d1d189fda3294b7823e3e654afca54055", "tree": "adc92669c93feabf1fe2264797700de36980467f", "parents": [ "28b041139e344ecd0f144d6205b004ae354cfa1e" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:49:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:26 2010 -0700" }, "message": "net: added a BPF to help drivers detect PTP packets.\n\nCertain kinds of hardware time stamping units in both MACs and PHYs have\nthe limitation that they can only time stamp PTP packets. Drivers for such\nhardware are left with the task of correctly matching skbs to time stamps.\nThis patch adds a BPF that drivers can use to classify PTP packets when\nneeded.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28b041139e344ecd0f144d6205b004ae354cfa1e", "tree": "7fc0e05d01717da0410a7b3252b0cac3fc8db81d", "parents": [ "4507a71507d4ff37e9a499c4241b7701ed1feab4" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:48:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:25 2010 -0700" }, "message": "net: preserve ifreq parameter when calling generic phy_mii_ioctl().\n\nThe phy_mii_ioctl() function unnecessarily throws away the original ifreq.\nWe need access to the ifreq in order to support PHYs that can perform\nhardware time stamping.\n\nTwo maverick drivers filter the ioctl commands passed to phy_mii_ioctl().\nThis is unnecessary since phylib will check the command in any case.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4507a71507d4ff37e9a499c4241b7701ed1feab4", "tree": "775ff8a11852f37ebc78363cf41729221cd92718", "parents": [ "ad1afb00393915a51c21b1ae8704562bf036855f" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:48:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:25 2010 -0700" }, "message": "net: add driver hook for tx time stamping.\n\nThis patch adds a hook for transmit time stamps. The transmit hook\nallows a software fallback for transmit time stamps, for MACs\nlacking time stamping hardware. Using the hook will still require\nadding an inline function call to each MAC driver.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f86586fa48a94c7a9c7f36650a2e0e4a947881c9", "tree": "d977100a3c72dcaeaeb90c0b776b36c2e8a57b90", "parents": [ "6ce28c6f55fe636c322ea909794cf19b20ef4b6b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "message": "tcp: sizeof struct tcp_skb_cb is 44\n\nCorrect comment stating sizeof(struct tcp_skb_cb) is 36 or 40, since its\n44 bytes, since commit 951dbc8ac714b04 ([IPV6]: Move nextheader offset\nto the IP6CB).\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0f77d0eae0c58a5a9691a067ada112ceeae2d00", "tree": "2bab159a95f51e32dbb4eb2d554328de3190c678", "parents": [ "91a72a70594e5212c97705ca6a694bd307f7a26b" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "message": "net: fix problem in reading sock TX queue\n\nFix problem in reading the tx_queue recorded in a socket. In\ndev_pick_tx, the TX queue is read by doing a check with\nsk_tx_queue_recorded on the socket, followed by a sk_tx_queue_get.\nThe problem is that there is not mutual exclusion across these\ncalls in the socket so it it is possible that the queue in the\nsock can be invalidated after sk_tx_queue_recorded is called so\nthat sk_tx_queue get returns -1, which sets 65535 in queue_index\nand thus dev_pick_tx returns 65536 which is a bogus queue and\ncan cause crash in dev_queue_xmit.\n\nWe fix this by only calling sk_tx_queue_get which does the proper\nchecks. The interface is that sk_tx_queue_get returns the TX queue\nif the sock argument is non-NULL and TX queue is recorded, else it\nreturns -1. sk_tx_queue_recorded is no longer used so it can be\ncompletely removed.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ba42910073f8432934d61a6c08b1023c408fb62", "tree": "4f74648133eaf6cbea26d59c43d34e7153648f5d", "parents": [ "53d3176b282cc105493babb0fef36c8b873f6201" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:46 2010 -0700" }, "message": "inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()\n\na new boolean flag no_autobind is added to structure proto to avoid the autobind\ncalls when the protocol is TCP. Then sock_rps_record_flow() is called int the\nTCP\u0027s sendmsg() and sendpage() pathes.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 4 ++++\n include/net/sock.h | 1 +\n include/net/tcp.h | 8 ++++----\n net/ipv4/af_inet.c | 15 +++++++++------\n net/ipv4/tcp.c | 11 +++++------\n net/ipv4/tcp_ipv4.c | 3 +++\n net/ipv6/af_inet6.c | 8 ++++----\n net/ipv6/tcp_ipv6.c | 3 +++\n 8 files changed, 33 insertions(+), 20 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "53d3176b282cc105493babb0fef36c8b873f6201", "tree": "2571bb37b0e292b7b2fbbd6b056661584260c9bf", "parents": [ "dbe000ed3f3033e8e6321d79023c827faf649c4d" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:45 2010 -0700" }, "message": "net: cleanups\n\nremove useless blanks.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 55 ++++-------\n include/net/tcp.h | 222 +++++++++++++++++-----------------------------\n include/net/udp.h | 38 +++----\n 3 files changed, 123 insertions(+), 192 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d77535162e736c47978d5c01469c56e1781dc91b", "tree": "7210d55197b283c72bb8c74a0aeb8cd386b21a74", "parents": [ "3cfde79c6c7c8002375c4a8e5be7f602fbb9675d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 09 09:12:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 17:41:57 2010 -0700" }, "message": "net: Document that dev_get_stats() returns the given pointer\n\nDocument that dev_get_stats() returns the same stats pointer it was\ngiven. Remove const qualification from the returned pointer since the\ncaller may do what it likes with that structure.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3cfde79c6c7c8002375c4a8e5be7f602fbb9675d", "tree": "53fe969e9f8bb45531c1e84c82e822ff47ea015c", "parents": [ "cc7b86c1a8f207c8aa77aad6941475d8294a83c4" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 09 09:11:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 17:41:56 2010 -0700" }, "message": "net: Get rid of rtnl_link_stats64 / net_device_stats union\n\nIn commit be1f3c2c027cc5ad735df6a45a542ed1db7ec48b \"net: Enable 64-bit\nnet device statistics on 32-bit architectures\" I redefined struct\nnet_device_stats so that it could be used in a union with struct\nrtnl_link_stats64, avoiding the need for explicit copying or\nconversion between the two. However, this is unsafe because there is\nno locking required and no lock consistently held around calls to\ndev_get_stats() and use of the statistics structure it returns.\n\nIn commit 28172739f0a276eb8d6ca917b3974c2edb036da3 \"net: fix 64 bit\ncounters on 32 bit arches\" Eric Dumazet dealt with that problem by\nrequiring callers of dev_get_stats() to provide storage for the\nresult. This means that the net_device::stats64 field and the padding\nin struct net_device_stats are now redundant, so remove them.\n\nUpdate the comment on net_device_ops::ndo_get_stats64 to reflect its\nnew usage.\n\nChange dev_txq_stats_fold() to use struct rtnl_link_stats64, since\nthat is what all its callers are really using and it is no longer\ngoing to be compatible with struct net_device_stats.\n\nEric Dumazet suggested the separate function for the structure\nconversion.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7313bb8f3dd6e28bcf9c42adfd54a5cf9a4949e0", "tree": "65d8486a2ff4aabc23e0b021f068dd3788081923", "parents": [ "68dc9d36c19aa1fd1633427b419d5e1f44753e8a" ], "author": { "name": "Karl Hiramoto", "email": "karl@hiramoto.org", "time": "Thu Jul 08 20:55:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 00:09:20 2010 -0700" }, "message": "atm: propagate signal changes via notifier\n\nAdd notifier chain for changes in atm_dev.\n\nClients like br2684 will call register_atmdevice_notifier() to be notified of\nchanges. Drivers will call atm_dev_signal_change() to notify clients like\nbr2684 of the change.\n\nOn DSL and ATM devices it\u0027s usefull to have a know if you have a carrier\nsignal. netdevice LOWER_UP changes can be propagated to userspace via netlink\nmonitor.\n\nSigned-off-by: Karl Hiramoto \u003ckarl@hiramoto.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597e608a8492d662736c9bc6aa507dbf1cadc17d", "tree": "6c330cdd0a4809f67dd191b37e34f5b4318cef78", "parents": [ "acbc0f039ff4b93da737c91937b7c70018ded39f", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "28172739f0a276eb8d6ca917b3974c2edb036da3", "tree": "b1dc00cfa20c209992e247c6f73601f609f9ca3b", "parents": [ "217d32dc5f299c483ca0d3c8cc6811c72c0339c4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jul 07 14:58:56 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 14:58:56 2010 -0700" }, "message": "net: fix 64 bit counters on 32 bit arches\n\nThere is a small possibility that a reader gets incorrect values on 32\nbit arches. SNMP applications could catch incorrect counters when a\n32bit high part is changed by another stats consumer/provider.\n\nOne way to solve this is to add a rtnl_link_stats64 param to all\nndo_get_stats64() methods, and also add such a parameter to\ndev_get_stats().\n\nRule is that we are not allowed to use dev-\u003estats64 as a temporary\nstorage for 64bit stats, but a caller provided area (usually on stack)\n\nOld drivers (only providing get_stats() method) need no changes.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bcfcc450baaaa44afc1d3c51ef96a53338ff0eb2", "tree": "123a988524aec67145c9b6becfdd6d5993525e87", "parents": [ "3390712a474abdcd3de10024dd1062e5928d381c" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 02 07:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 20:08:05 2010 -0700" }, "message": "net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n\nnetif_vdbg() was originally defined as entirely equivalent to\nnetdev_vdbg(), but I assume that it was intended to take the same\nparameters as netif_dbg() etc. (Currently it is only used by the\nsfc driver, in which I worked on that assumption.)\n\nIn commit a4ed89c I changed the definition used when VERBOSE_DEBUG is\nnot defined, but I failed to notice that the definition used when\nVERBOSE_DEBUG is defined was also not as I expected. Change that to\nmatch netif_dbg() as well.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f45f4321d2c977c9eff77e5a5225f3cd2140eb20", "tree": "20cae33624bd063d5b0298f66353ef509ee60d52", "parents": [ "256df2f3879efdb2e9808bdb1b54b16fbb11fa38" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:19 2010 -0700" }, "message": "netdevice.h: Change netif_\u003clevel\u003e macros to call netdev_\u003clevel\u003e functions\n\nReduces text ~300 bytes of text (woohoo!) in an x86 defconfig\n\n$ size vmlinux*\n text\t data\t bss\t dec\t hex\tfilename\n7198526\t 720112\t1366288\t9284926\t 8dad3e\tvmlinux\n7198862\t 720112\t1366288\t9285262\t 8dae8e\tvmlinux.netdev\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "256df2f3879efdb2e9808bdb1b54b16fbb11fa38", "tree": "ec7bd8e1e6d7d7066542420641ccd68e98e42bfa", "parents": [ "99bcf217183e02ebae46373896fba7f12d588001" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:18 2010 -0700" }, "message": "netdevice.h net/core/dev.c: Convert netdev_\u003clevel\u003e logging macros to functions\n\nReduces an x86 defconfig text and data ~2k.\ntext is smaller, data is larger.\n\n$ size vmlinux*\n text\t data\t bss\t dec\t hex\tfilename\n7198862\t 720112\t1366288\t9285262\t 8dae8e\tvmlinux\n7205273\t 716016\t1366288\t9287577\t 8db799\tvmlinux.device_h\n\nUses %pV and struct va_format\nFormat arguments are verified before printk\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99bcf217183e02ebae46373896fba7f12d588001", "tree": "03210a8c57e33b2b5073f80f9a7f818c84f4c83a", "parents": [ "7db6f5fb65a82af03229eef104dc9899c5eecf33" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:17 2010 -0700" }, "message": "device.h drivers/base/core.c Convert dev_\u003clevel\u003e logging macros to functions\n\nReduces an x86 defconfig text and data ~55k, .6% smaller.\n\n$ size vmlinux*\n text\t data\t bss\t dec\t hex\tfilename\n7205273\t 716016\t1366288\t9287577\t 8db799\tvmlinux\n7258890\t 719768\t1366288\t9344946\t 8e97b2\tvmlinux.master\n\nUses %pV and struct va_format\nFormat arguments are verified before printk\n\nThe dev_info macro is converted to _dev_info because there are\nexisting uses of variables named dev_info in the kernel tree\nlike drivers/net/pcmcia/pcnet_cs.c\n\nA dev_info macro is created to call _dev_info\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7db6f5fb65a82af03229eef104dc9899c5eecf33", "tree": "fb7a83297d8bf2680df9616ebf58bec89229ff3b", "parents": [ "e490c1defec4236a6a131fe2d13bf7ba787c02f8" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:17 2010 -0700" }, "message": "vsprintf: Recursive vsnprintf: Add \"%pV\", struct va_format\n\nAdd the ability to print a format and va_list from a structure pointer\n\nAllows __dev_printk to be implemented as a single printk while\nminimizing string space duplication.\n\n%pV should not be used without some mechanism to verify the\nformat and argument use ala __attribute__(format (printf(...))).\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e490c1defec4236a6a131fe2d13bf7ba787c02f8", "tree": "132325ca88cc86a74345a93b2774c5ca284b038a", "parents": [ "0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba", "4df53d8bab65cf2c18daebd51a5a4847e03f1943" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "e2aec372ff4b7e78e79c308104a860ae0ed20950", "tree": "0a399810f9a506121bc7effb0a9127792527ea36", "parents": [ "f0796d5c73e59786d09a1e617689d1d415f2db44" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu Jul 01 13:18:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:08 2010 -0700" }, "message": "linux/net.h: fix kernel-doc warnings\n\nFix kernel-doc warnings in linux/net.h:\n\nWarning(include/linux/net.h:151): No description found for parameter \u0027wq\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027fasync_list\u0027 description in \u0027socket\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027wait\u0027 description in \u0027socket\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403", "tree": "0982d46258047f208c26068252457179f5f13bdf", "parents": [ "7ae80abdba0644e12ac17da567a2db1efc1bf8a8" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n\nWhen calling qdisc_reset() the qdisc lock needs to be held. In\nthis case there is at least one driver i4l which is using this\nwithout holding the lock. Add the locking here.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05318bc905467237d4aa68a701f6e92a2b332218", "tree": "3b7577383bca50aeb442568aa16cf8f2167b8694", "parents": [ "ea812ca1b06113597adcd8e70c0f84a413d97544", "88c1f4f6dffe66e2fed8e7e3276e091ee850bed0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/libertas/host.h\n" }, { "commit": "a5b6ee291e39e285e021cf251dbcf770c83cd74e", "tree": "4fa96af8095cda9949fff3e79e2c5e8ef7328dbd", "parents": [ "cbf2d604a1cd77944a795bb8dbe844eaa38b44c8" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Jun 30 05:05:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 14:09:37 2010 -0700" }, "message": "ethtool: Add support for control of RX flow hash indirection\n\nMany NICs use an indirection table to map an RX flow hash value to one\nof an arbitrary number of queues (not necessarily a power of 2). It\ncan be useful to remove some queues from this indirection table so\nthat they are only used for flows that are specifically filtered\nthere. It may also be useful to weight the mapping to account for\nuser processes with the same CPU-affinity as the RX interrupts.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1437ce3983bcbc0447a0dedcd644c14fe833d266", "tree": "073ba0dc60127b08b65fbcca4d0d7c15318c08f8", "parents": [ "b3003be36a3c9215cd17182349981581de269048" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Jun 30 02:44:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 14:09:35 2010 -0700" }, "message": "ethtool: Change ethtool_op_set_flags to validate flags\n\nethtool_op_set_flags() does not check for unsupported flags, and has\nno way of doing so. This means it is not suitable for use as a\ndefault implementation of ethtool_ops::set_flags.\n\nAdd a \u0027supported\u0027 parameter specifying the flags that the driver and\nhardware support, validate the requested flags against this, and\nchange all current callers to pass this parameter.\n\nChange some other trivial implementations of ethtool_ops::set_flags to\ncall ethtool_op_set_flags().\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nReviewed-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6bebca92c663fb216c072193945946f3807ca7f", "tree": "fd797f062fa19d2ee470cf33c9b475bff08e2545", "parents": [ "4ce3c183fcade7f4b30a33dae90cd774c3d9e094" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Jun 29 04:39:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:44:29 2010 -0700" }, "message": "fragment: add fast path for in-order fragments\n\nadd fast path for in-order fragments\n\nAs the fragments are sent in order in most of OSes, such as Windows, Darwin and\nFreeBSD, it is likely the new fragments are at the end of the inet_frag_queue.\nIn the fast path, we check if the skb at the end of the inet_frag_queue is the\nprev we expect.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_frag.h | 1 +\n net/ipv4/ip_fragment.c | 12 ++++++++++++\n net/ipv6/reassembly.c | 11 +++++++++++\n 3 files changed, 24 insertions(+)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ce3c183fcade7f4b30a33dae90cd774c3d9e094", "tree": "84d5a130da50096fdbeb7fffea596dffe2cebd80", "parents": [ "f3eb62d2cc7da7bea4b394dd06f6bc738aa284e7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "message": "snmp: 64bit ipstats_mib for all arches\n\n/proc/net/snmp and /proc/net/netstat expose SNMP counters.\n\nWidth of these counters is either 32 or 64 bits, depending on the size\nof \"unsigned long\" in kernel.\n\nThis means user program parsing these files must already be prepared to\ndeal with 64bit values, regardless of user program being 32 or 64 bit.\n\nThis patch introduces 64bit snmp values for IPSTAT mib, where some\ncounters can wrap pretty fast if they are 32bit wide.\n\n# netstat -s|egrep \"InOctets|OutOctets\"\n InOctets: 244068329096\n OutOctets: 244069348848\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439", "tree": "705bd91dafd562a38d3833edb30297abf0516459", "parents": [ "08e554b17bfdc2682599c8c2770b088a0187a405" ], "author": { "name": "Saeed Bishara", "email": "saeed@marvell.com", "time": "Sun Jun 27 00:26:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:01:11 2010 -0700" }, "message": "mv643xx_eth: use sw csum for big packets\n\nSome controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size.\n\nSigned-off-by: Saeed Bishara \u003csaeed@marvell.com\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "787a34456dc34bdd75b29cebb53cb09c727674d6", "tree": "370e65e5ea2536072c4067d600cdb6c4f3b7106a", "parents": [ "511d934f4496076898e45aaa09e0c85376eb16ee" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Wed Jun 30 06:08:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 12:06:52 2010 -0700" }, "message": "net/neighbour.h: fix typo\n\n\u0027Shoul\u0027 must be \u0027should\u0027.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "afd2a5ca1ef6ffe1f9fd0846ae39795527ead555", "tree": "9a9cecf9faa5b39a9ec575a6dc34df371cf698e9", "parents": [ "9cf4cb05c9634eda4b51db1f55fecdec4a145a57" ], "author": { "name": "Gertjan van Wingerde", "email": "gwingerde@gmail.com", "time": "Tue Jun 29 21:43:44 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 30 15:00:50 2010 -0400" }, "message": "eeprom_93cx6: Add support for 93c86 EEPROMs.\n\nSigned-off-by: Gertjan van Wingerde \u003cgwingerde@gmail.com\u003e\nSigned-off-by: Ivo van Doorn \u003cIvDoorn@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4efd7e833591721bec21cc4730a7f6261417840f", "tree": "9982ea86ad73f1142842070f4d9d1bf83ba318a0", "parents": [ "d3ead2413cb99d3e6265577b12537434e229d8c2" ], "author": { "name": "Andreas Steffen", "email": "andreas.steffen@strongswan.org", "time": "Wed Jun 30 10:41:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:43:31 2010 -0700" }, "message": "xfrm: fix XFRMA_MARK extraction in xfrm_mark_get\n\nDetermine the size of the xfrm_mark struct, not of its pointer.\n\nSigned-off-by: Andreas Steffen \u003candreas.steffen@strongswan.org\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf988435bd5b53529f4408a8efb1f433f6ddfda9", "tree": "7805f577d019f587146b4fd1cf642faacfec2f14", "parents": [ "db048b69037e7fa6a7d9e95a1271a50dc08ae233" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 28 08:45:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 01:00:29 2010 -0700" }, "message": "ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH\n\nstruct ethtool_rxnfc was originally defined in 2.6.27 for the\nETHTOOL_{G,S}RXFH command with only the cmd, flow_type and data\nfields. It was then extended in 2.6.30 to support various additional\ncommands. These commands should have been defined to use a new\nstructure, but it is too late to change that now.\n\nSince user-space may still be using the old structure definition\nfor the ETHTOOL_{G,S}RXFH commands, and since they do not need the\nadditional fields, only copy the originally defined fields to and\nfrom user-space.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "529d6dad5bc69de14cdd24831e2a14264e93daa4", "tree": "a89d7b8cdd3692e96a64c5d7196bcefc9f1e7f24", "parents": [ "01eebb53a65996dfbfb892bf5eb21ae831fbe3a6" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "message": "caif-driver: Add CAIF-SPI Protocol driver.\n\nThis patch introduces the CAIF SPI Protocol Driver for\nCAIF Link Layer.\n\nThis driver implements a platform driver to accommodate for a\nplatform specific SPI device. A general platform driver is not\npossible as there are no SPI Slave side Kernel API defined.\nA sample CAIF SPI Platform device can be found in\n.../Documentation/networking/caif/spi_porting.txt\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "210d6de78c5d7c785fc532556cea340e517955e1", "tree": "e4bbac89a8bc16154f51ad61e140be1b7bd2b92d", "parents": [ "c4ead4c595cd54cf7b1a184d4f888ce0d7cce7d4" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 24 16:25:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:32 2010 -0700" }, "message": "act_mirred: don\u0027t clone skb when skb isn\u0027t shared\n\ndon\u0027t clone skb when skb isn\u0027t shared\n\nWhen the tcf_action is TC_ACT_STOLEN, and the skb isn\u0027t shared, we don\u0027t need\nto clone a new skb. As the skb will be freed after this function returns, we\ncan use it freely once we get a reference to it.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/sch_generic.h | 11 +++++++++--\n net/sched/act_mirred.c | 6 +++---\n 2 files changed, 12 insertions(+), 5 deletions(-)\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc66154efe163a80f269d448572f7906756e9338", "tree": "89c9996c9790a84958a756eed77b9780a785ff19", "parents": [ "33d91f00c73ba0012bce18c1690cb8313ca7adaa" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 24 00:54:21 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:30 2010 -0700" }, "message": "macvlan: 64 bit rx counters\n\nUse u64_stats_sync infrastructure to implement 64bit stats.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33d91f00c73ba0012bce18c1690cb8313ca7adaa", "tree": "71a927098b248685af4dede30d443ef73c344d16", "parents": [ "7a9b2d59507d85569b8a456688ef40cf2ac73e48" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 24 00:54:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:30 2010 -0700" }, "message": "net: u64_stats_fetch_begin_bh() and u64_stats_fetch_retry_bh()\n\n- Must disable preemption in case of 32bit UP in u64_stats_fetch_begin()\nand u64_stats_fetch_retry()\n\n- Add new u64_stats_fetch_begin_bh() and u64_stats_fetch_retry_bh() for\nnetwork usage, disabling BH on 32bit UP only.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b6b3ecc71a0664d44ed8d087d583aee98fbf492a", "tree": "078e92d78578d3a8833dd225f71a6b2a982ea5be", "parents": [ "a095cfc40ec7ebe63e9532383c5b5c2a27b14075" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 24 00:04:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:29 2010 -0700" }, "message": "net: u64_stats_sync improvements\n\n- Add a comment about interrupts:\n\n6) If counter might be written by an interrupt, readers should block\ninterrupts.\n\n- Fix a typo in sample of use.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7eb9282cd0efac08b8377cbd5037ba297c77e3f7", "tree": "7dcb6e149c96e27da69a75ff828de9681c6636f8", "parents": [ "cf377eb4aeded926375d4d0fe0b66ba95f0521e1" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:16:08 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:16:08 2010 +0200" }, "message": "netfilter: ipt_LOG/ip6t_LOG: add option to print decoded MAC header\n\nThe LOG targets print the entire MAC header as one long string, which is not\nreadable very well:\n\nIN\u003deth0 OUT\u003d MAC\u003d00:15:f2:24:91:f8:00:1b:24:dc:61:e6:08:00 ...\n\nAdd an option to decode known header formats (currently just ARPHRD_ETHER devices)\nin their individual fields:\n\nIN\u003deth0 OUT\u003d MACSRC\u003d00:1b:24:dc:61:e6 MACDST\u003d00:15:f2:24:91:f8 MACPROTO\u003d0800 ...\nIN\u003deth0 OUT\u003d MACSRC\u003d00:1b:24:dc:61:e6 MACDST\u003d00:15:f2:24:91:f8 MACPROTO\u003d86dd ...\n\nThe option needs to be explicitly enabled by userspace to avoid breaking\nexisting parsers.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "172d69e63c7f1e8300d0e1c1bbd8eb0f630faa15", "tree": "c71118ddc86186e235a920b9529c457db5e9aae5", "parents": [ "734f614bc1e7c6bf075d201f6bd9a555b8b4a984" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jun 21 11:48:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:00:03 2010 -0700" }, "message": "syncookies: add support for ECN\n\nAllows use of ECN when syncookies are in effect by encoding ecn_ok\ninto the syn-ack tcp timestamp.\n\nWhile at it, remove a uneeded #ifdef CONFIG_SYN_COOKIES.\nWith CONFIG_SYN_COOKIES\u003dnm want_cookie is ifdef\u0027d to 0 and gcc\nremoves the \"if (0)\".\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1823e4c80eeae2a774c75569ce3035070e5ee009", "tree": "bdc1bdf4a67027193312ad584924ca8a986a064c", "parents": [ "5eaa0bd81f93225b6d1972b373ed00ca763052b2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 22 20:58:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:17 2010 -0700" }, "message": "snmp: add align parameter to snmp_mib_init()\n\nIn preparation for 64bit snmp counters for some mibs,\nadd an \u0027align\u0027 parameter to snmp_mib_init(), instead\nof assuming mibs only contain \u0027unsigned long\u0027 fields.\n\nCallers can use __alignof__(type) to provide correct\nalignment.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCC: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCC: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "01f2f3f6ef4d076c0c10a8a7b42624416d56b523", "tree": "188ee181f2fe21e42f402c4a955cb6ea2e70f118", "parents": [ "bd97a63f7d9892b4536f331d263c2695cc52d08c" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Sat Jun 19 17:05:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:12 2010 -0700" }, "message": "net: optimize Berkeley Packet Filter (BPF) processing\n\nGcc is currenlty not in the ability to optimize the switch statement in\nsk_run_filter() because of dense case labels. This patch replace the\nOR\u0027d labels with ordered sequenced case labels. The sk_chk_filter()\nfunction is modified to patch/replace the original OPCODES in a\nordered but equivalent form. gcc is now in the ability to transform the\nswitch statement in sk_run_filter into a jump table of complexity O(1).\n\nUntil this patch gcc generates a sequence of conditional branches (O(n) of 567\nbyte .text segment size (arch x86_64):\n\n7ff: 8b 06 mov (%rsi),%eax\n801: 66 83 f8 35 cmp $0x35,%ax\n805: 0f 84 d0 02 00 00 je adb \u003csk_run_filter+0x31d\u003e\n80b: 0f 87 07 01 00 00 ja 918 \u003csk_run_filter+0x15a\u003e\n811: 66 83 f8 15 cmp $0x15,%ax\n815: 0f 84 c5 02 00 00 je ae0 \u003csk_run_filter+0x322\u003e\n81b: 77 73 ja 890 \u003csk_run_filter+0xd2\u003e\n81d: 66 83 f8 04 cmp $0x4,%ax\n821: 0f 84 17 02 00 00 je a3e \u003csk_run_filter+0x280\u003e\n827: 77 29 ja 852 \u003csk_run_filter+0x94\u003e\n829: 66 83 f8 01 cmp $0x1,%ax\n[...]\n\nWith the modification the compiler translate the switch statement into\nthe following jump table fragment:\n\n7ff: 66 83 3e 2c cmpw $0x2c,(%rsi)\n803: 0f 87 1f 02 00 00 ja a28 \u003csk_run_filter+0x26a\u003e\n809: 0f b7 06 movzwl (%rsi),%eax\n80c: ff 24 c5 00 00 00 00 jmpq *0x0(,%rax,8)\n813: 44 89 e3 mov %r12d,%ebx\n816: e9 43 03 00 00 jmpq b5e \u003csk_run_filter+0x3a0\u003e\n81b: 41 89 dc mov %ebx,%r12d\n81e: e9 3b 03 00 00 jmpq b5e \u003csk_run_filter+0x3a0\u003e\n\nFurthermore, I reordered the instructions to reduce cache line misses by\norder the most common instruction to the start.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8756201ba4189bca3ee1a6ec4e290f467ee09ab", "tree": "309d40a10f68ffc971de4f16d26d16a0dccc0693", "parents": [ "fe6fb552858f686f39e33d7b0a33fe56dacea0bf" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "message": "netfilter: xt_connbytes: Force CT accounting to be enabled\n\nCheck at rule install time that CT accounting is enabled. Force it\nto be enabled if not while also emitting a warning since this is not\nthe default state.\n\nThis is in preparation for deprecating CONFIG_NF_CT_ACCT upon which\nCONFIG_NETFILTER_XT_MATCH_CONNBYTES depended being set.\n\nAdded 2 CT accounting support functions:\n\nnf_ct_acct_enabled() - Get CT accounting state.\nnf_ct_set_acct() - Enable/disable CT accountuing.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nAcked-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "7a938f80264f2cbfb0c0841b450eab42a8093281", "tree": "ae883f1c9a1170efc64b7f33db96f7989ad422a3", "parents": [ "fcb26ec5b18d88bb22366799d056dc3630d0e895" ], "author": { "name": "Dmitry Baryshkov", "email": "dbaryshkov@gmail.com", "time": "Wed Jun 16 23:02:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 21:30:09 2010 -0700" }, "message": "broadcom: Add 5241 support\n\nThis patch adds the 5241 PHY ID to the broadcom module.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fcb26ec5b18d88bb22366799d056dc3630d0e895", "tree": "ba164d38c89938e4f39d4d41dacddd1f2fd144c2", "parents": [ "deb0d7c740a008a4e26806317497549b0e8907eb" ], "author": { "name": "Dmitry Baryshkov", "email": "dbaryshkov@gmail.com", "time": "Wed Jun 16 23:02:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 21:30:09 2010 -0700" }, "message": "broadcom: move all PHY_ID\u0027s to header\n\nMove all PHY IDs to brcmphy.h header for completeness and unification of code.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98d2ff8bec82fc35fe2008a187a5fef9241dab10", "tree": "5a443d79168c325aad8af755a88eca2a76342816", "parents": [ "fa61cf70a6ae1089e459e4b59b2e8d8e90d8535e" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 23 12:12:38 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 24 15:42:37 2010 -0400" }, "message": "nl80211: Add option to adjust transmit power\n\nThis patch adds transmit power setting type and transmit power level attributes\nto NL80211_CMD_SET_WIPHY in order to facilitate adjusting of the transmit power\nlevel of the device.\n\nThe added attributes allow selection of automatic, limited or fixed transmit\npower level, with the level definable in signed mBm format.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fa61cf70a6ae1089e459e4b59b2e8d8e90d8535e", "tree": "1bd81709faaa15fb207de7db4df1ceed96374208", "parents": [ "a185045c8da1ec6627236b4ade0d949b15da43b3" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 23 12:12:37 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 24 15:42:33 2010 -0400" }, "message": "cfg80211/mac80211: Update set_tx_power to use mBm instead of dBm units\n\nIn preparation for a TX power setting interface in the nl80211, change the\n.set_tx_power function to use mBm units instead of dBm for greater accuracy and\nsmaller power levels.\n\nAlso, already in advance move the tx_power_setting enumeration to nl80211.\n\nThis change affects the .tx_set_power function prototype. As a result, the\ncorresponding changes are needed to modules using it. These are mac80211,\niwmc3200wifi and rndis_wlan.\n\nCc: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nCc: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nAcked-by: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nAcked-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8244132ea89cdd128003f5b9980fab50d8d36d72", "tree": "c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95", "parents": [ "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/ip_output.c\n" }, { "commit": "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "tree": "eed7535663f6333a1dc68861d8cd7b98d8050d4d", "parents": [ "01fc3e86c6379cc4c78c529a1bad1b8179b726aa" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Tue Jun 15 01:07:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 13:16:38 2010 -0700" }, "message": "net - IP_NODEFRAG option for IPv4 socket\n\nthis patch is implementing IP_NODEFRAG option for IPv4 socket.\nThe reason is, there\u0027s no other way to send out the packet with user\ncustomized header of the reassembly part.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "16b8a4761cbe5082cd35641c066d7c4b6b83cdca", "tree": "1721b297633a798beb166a4c8778edb1a8a474ad", "parents": [ "6afff0caa721211e8c04bdc7627ee3bff95bcb95" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 22 10:22:17 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 12:59:47 2010 -0700" }, "message": "net: Introduce u64_stats_sync infrastructure\n\nTo properly implement 64bits network statistics on 32bit or 64bit hosts,\nwe provide one new type and four methods, to ease conversions.\n\nStats producer should use following template granted it already got an\nexclusive access to counters (include/linux/u64_stats_sync.h contains\nsome documentation about details)\n\n u64_stats_update_begin(\u0026stats-\u003esyncp);\n stats-\u003ebytes64 +\u003d len;\n stats-\u003epackets64++;\n u64_stats_update_end(\u0026stats-\u003esyncp);\n\nWhile a consumer should use following template to get consistent\nsnapshot :\n\n u64 tbytes, tpackets;\n unsigned int start;\n\n do {\n start \u003d u64_stats_fetch_begin(\u0026stats-\u003esyncp);\n tbytes \u003d stats-\u003ebytes64;\n tpackets \u003d stats-\u003epackets64;\n } while (u64_stats_fetch_retry(\u0026stats-\u003elock, syncp));\n\nSuggested by David Miller, and comments courtesy of Nick Piggin.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1dc8d8c06d4002be4d1373fc06f25cd589be47e1", "tree": "c9e3a60ae07df56604f5e81a89900f6df975f102", "parents": [ "17f085df92ba74a4dc88744cbc7a699c231f8728" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Jun 21 13:45:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 12:58:40 2010 -0700" }, "message": "net: Fix a typo in netlink.h\n\nFix a typo in include/net/netlink.h\nshould be finalize instead of finanlize\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f1c14b2e3b1805d3e9e6a306d07f5371ea703a7", "tree": "ad5d96e60d1ff4e91f5b23d7ae13884581ae2441", "parents": [ "8ceedea7c2600a1018d20f67e766c0773b59391a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 23 00:32:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:48:19 2010 -0700" }, "message": "snmp: fix SNMP_ADD_STATS()\n\ncommit aa2ea0586d9d (tcp: fix outsegs stat for TSO segments) incorrectly\nassumed SNMP_ADD_STATS() was used from BH context.\n\nFix this using mib[!in_softirq()] instead of mib[0]\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "26ec037f9841e49cc5c615deb8e1e73e5beab2ca", "tree": "a7c4a77d173dd8759ed413a60b2941cbb1fca899", "parents": [ "c68cd6cc21eb329c47ff020ff7412bf58176984e" ], "author": { "name": "Nick Chalk", "email": "nick@loadbalancer.org", "time": "Tue Jun 22 08:07:01 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 22 08:07:01 2010 +0200" }, "message": "IPVS: one-packet scheduling\n\nAllow one-packet scheduling for UDP connections. When the fwmark-based or\nnormal virtual service is marked with \u0027-o\u0027 or \u0027--ops\u0027 options all\nconnections are created only to schedule one packet. Useful to schedule UDP\npackets from same client port to different real servers. Recommended with\nRR or WRR schedulers (the connections are not visible with ipvsadm -L).\n\nSigned-off-by: Nick Chalk \u003cnick@loadbalancer.org\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f90754c15f47063671aea55268a9dd6a37b51492", "tree": "197c239a813e426d8a675449927e381352ad4875", "parents": [ "fb63bc41772259701a827e9a6117219a7393554f" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Mon Jun 21 08:59:39 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 21 15:39:59 2010 -0400" }, "message": "mac80211: Add interface for driver to temporarily disable dynamic ps\n\nThis mechanism introduced in this patch applies (at least) for hardware\ndesigns using a single shared antenna for both WLAN and BT. In these designs,\nthe antenna must be toggled between WLAN and BT.\n\nIn those hardware, managing WLAN co-existence with Bluetooth requires WLAN\nfull power save whenever there is Bluetooth activity in order for WLAN to be\nable to periodically relinquish the antenna to be used for BT. This is because\nBT can only access the shared antenna when WLAN is idle or asleep.\n\nSome hardware, for instance the wl1271, are able to indicate to the host\nwhenever there is BT traffic. In essence, the hardware will send an indication\nto the host whenever there is, for example, SCO traffic or A2DP traffic, and\nwill send another indication when the traffic is over.\n\nThe hardware gets information of Bluetooth traffic via hardware co-existence\ncontrol lines - these lines are used to negotiate the shared antenna\nownership. The hardware will give the antenna to BT whenever WLAN is sleeping.\n\nThis patch adds the interface to mac80211 to facilitate temporarily disabling\nof dynamic power save as per request of the WLAN driver. This interface will\nimmediately force WLAN to full powersave, hence allowing BT coexistence as\ndescribed above.\n\nIn these kind of shared antenna desings, when WLAN powersave is fully disabled,\nBluetooth will not work simultaneously with WLAN at all. This patch does not\naddress that problem. This interface will not change PSM state, so if PSM is\ndisabled it will remain so. Solving this problem requires knowledge about BT\nstate, and is best done in user-space.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "69ad78208ecf4c392f3d323ed050423847c24104", "tree": "cf2eba4f98a98b6e4a9820b8ce058cb2fc217596", "parents": [ "2aa40aef9debc77d55cc87a50d335b6fe97fbeb0" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:07 2010 -0700" }, "message": "caif: Add debug connection type for CAIF.\n\nAdded new CAIF protocol type CAIFPROTO_DEBUG for accessing\nCAIF debug on the ST Ericsson modems.\n\nThere are two debug servers on the modem, one for radio related\ndebug (CAIF_RADIO_DEBUG_SERVICE) and the other for\ncommunication/application related debug (CAIF_COM_DEBUG_SERVICE).\n\nThe debug connection can contain trace debug printouts or\ninteractive debug used for debugging and test.\n\nDebug connections can be of type STREAM or SEQPACKET.\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2aa40aef9debc77d55cc87a50d335b6fe97fbeb0", "tree": "0dccf47cf6cb861c7efa72601fab9511760c7e74", "parents": [ "a7da1f55a826c621251874e7684c234972fc3216" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:06 2010 -0700" }, "message": "caif: Use link layer MTU instead of fixed MTU\n\nPreviously CAIF supported maximum transfer size of ~4050.\nThe transfer size is now calculated dynamically based on the\nlink layers mtu size.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a7da1f55a826c621251874e7684c234972fc3216", "tree": "e5c66620b9cfe00ed62233665002a0acf5fc1004", "parents": [ "b1c74247b9e29ae3bfdf133862328c309bc9cf14" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:05 2010 -0700" }, "message": "caif: Bugfix - RFM must support segmentation.\n\nCAIF Remote File Manager may send or receive more than 4050 bytes.\nDue to this The CAIF RFM service have to support segmentation.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1c74247b9e29ae3bfdf133862328c309bc9cf14", "tree": "a20cd55d47036a22e3857d382ed505436a366efe", "parents": [ "c14c643b3d91cc741425c058968672228c310927" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:05 2010 -0700" }, "message": "caif: Bugfix not all services uses flow-ctrl.\n\nFlow control is not used by all CAIF services.\nThe usage of flow control is now part of the gerneal\ninitialization function for CAIF Services.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb9c03d8a6893517737b16fdbeb54be3c73b3023", "tree": "35fa0d1defaaf94641963a49126d7bb475ffa4c6", "parents": [ "4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee", "abf52f86aa0a49a7377350cafa8f218c4cd227e7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 14:19:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 14:19:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "c68cd6cc21eb329c47ff020ff7412bf58176984e", "tree": "2e49be79c66d550b37fc494e22b5e31b39a8bc38", "parents": [ "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "message": "netfilter: nf_nat: support user-specified SNAT rules in LOCAL_IN\n\n2.6.34 introduced \u0027conntrack zones\u0027 to deal with cases where packets\nfrom multiple identical networks are handled by conntrack/NAT. Packets\nare looped through veth devices, during which they are NATed to private\naddresses, after which they can continue normally through the stack\nand possibly have NAT rules applied a second time.\n\nThis works well, but is needlessly complicated for cases where only\na single SNAT/DNAT mapping needs to be applied to these packets. In that\ncase, all that needs to be done is to assign each network to a seperate\nzone and perform NAT as usual. However this doesn\u0027t work for packets\ndestined for the machine performing NAT itself since its corrently not\npossible to configure SNAT mappings for the LOCAL_IN chain.\n\nThis patch adds a new INPUT chain to the NAT table and changes the\ntargets performing SNAT to be usable in that chain.\n\nExample usage with two identical networks (192.168.0.0/24) on eth0/eth1:\n\niptables -t raw -A PREROUTING -i eth0 -j CT --zone 1\niptables -t raw -A PREROUTING -i eth0 -j MARK --set-mark 1\niptables -t raw -A PREROUTING -i eth1 -j CT --zone 2\niptabels -t raw -A PREROUTING -i eth1 -j MARK --set-mark 2\n\niptables -t nat -A INPUT -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A POSTROUTING -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A INPUT -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\niptables -t nat -A POSTROUTING -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\n\niptables -t raw -A PREROUTING -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A OUTPUT -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A PREROUTING -d 10.0.1.0/24 -j CT --zone 2\niptables -t raw -A OUTPUT -d 10.0.1.0/24 -j CT --zone 2\n\niptables -t nat -A PREROUTING -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A PREROUTING -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d29c0c5c332131f1151cf33995e2f01299b9234f", "tree": "6d7f0b2d4420e45e51a7afb2fef398989386bb6e", "parents": [ "3924773a5a82622167524bdd48799dc0452c57f8" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jun 14 20:21:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 18:07:52 2010 -0700" }, "message": "udp: Add UFO to NETIF_F_SOFTWARE_GSO\n\nThis patch adds UFO to the list of GSO features with a software\nfallback. This allows UFO to be used even if the hardware does\nnot support it.\n\nIn particular, this allows us to test the UFO fallback, as it\nhas been reported to not work in some cases.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7361c36c5224519b258219fe3d0e8abc865d8134", "tree": "7987367633b4729dff0afa2180862a2ce919f3cb", "parents": [ "257b5358b32f17e0603b6ff57b13610b0e02348f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:34:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:58:16 2010 -0700" }, "message": "af_unix: Allow credentials to work across user and pid namespaces.\n\nIn unix_skb_parms store pointers to struct pid and struct cred instead\nof raw uid, gid, and pid values, then translate the credentials on\nreception into values that are meaningful in the receiving processes\nnamespaces.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "257b5358b32f17e0603b6ff57b13610b0e02348f", "tree": "15c4887d45eb6ccfe32f5e67b5c0009e1e8dae6c", "parents": [ "b47030c71dfd6c8cd5cb6e551b6f7f7cfc96f6a6" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:32:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:56 2010 -0700" }, "message": "scm: Capture the full credentials of the scm sender.\n\nStart capturing not only the userspace pid, uid and gid values of the\nsending process but also the struct pid and struct cred of the sending\nprocess as well.\n\nThis is in preparation for properly supporting SCM_CREDENTIALS for\nsockets that have different uid and/or pid namespaces at the different\nends.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge@hallyn.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "109f6e39fa07c48f580125f531f46cb7c245b528", "tree": "9ec97679c227394a44ebede5768f92d970cea6eb", "parents": [ "3f551f9436c05a3b5eccdd6e94733df5bb98d2a5" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:30:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:55 2010 -0700" }, "message": "af_unix: Allow SO_PEERCRED to work across namespaces.\n\nUse struct pid and struct cred to store the peer credentials on struct\nsock. This gives enough information to convert the peer credential\ninformation to a value relative to whatever namespace the socket is in\nat the time.\n\nThis removes nasty surprises when using SO_PEERCRED on socket\nconnetions where the processes on either side are in different pid and\nuser namespaces.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f551f9436c05a3b5eccdd6e94733df5bb98d2a5", "tree": "ee5a9148797994682a4553e817e96b721303f3ec", "parents": [ "5c1469de7545a35a16ff2b902e217044a7d2f8a5" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:28:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:35 2010 -0700" }, "message": "sock: Introduce cred_to_ucred\n\nTo keep the coming code clear and to allow both the sock\ncode and the scm code to share the logic introduce a\nfuction to translate from struct cred to struct ucred.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5c1469de7545a35a16ff2b902e217044a7d2f8a5", "tree": "2a3b48da4dab1516234633ee5e71766801210e49", "parents": [ "812e876e842488221aa54cb4587a8a33445cfa9e" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:28:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:34 2010 -0700" }, "message": "user_ns: Introduce user_nsmap_uid and user_ns_map_gid.\n\nDefine what happens when a we view a uid from one user_namespace\nin another user_namepece.\n\n- If the user namespaces are the same no mapping is necessary.\n\n- For most cases of difference use overflowuid and overflowgid,\n the uid and gid currently used for 16bit apis when we have a 32bit uid\n that does fit in 16bits. Effectively the situation is the same,\n we want to return a uid or gid that is not assigned to any user.\n\n- For the case when we happen to be mapping the uid or gid of the\n creator of the target user namespace use uid 0 and gid as confusing\n that user with root is not a problem.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Serge E. Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "812e876e842488221aa54cb4587a8a33445cfa9e", "tree": "cb8475918fc3c9a9cf624e643bb679af34e0c24e", "parents": [ "434d7b380f2bfc2161b9aaee2cada177a4a4261f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:27:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:34 2010 -0700" }, "message": "scm: Reorder scm_cookie.\n\nReorder the fields in scm_cookie so they pack better on 64bit.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c76368174ed2359739f1b7b8a9c042b1ef839c4", "tree": "143aa28c9438b24154bc3d1e36b432a534eca50c", "parents": [ "317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "message": "syncookies: check decoded options against sysctl settings\n\nDiscard the ACK if we find options that do not match current sysctl\nsettings.\n\nPreviously it was possible to create a connection with sack, wscale,\netc. enabled even if the feature was disabled via sysctl.\n\nAlso remove an unneeded call to tcp_sack_reset() in\ncookie_check_timestamp: Both call sites (cookie_v4_check,\ncookie_v6_check) zero \"struct tcp_options_received\", hand it to\ntcp_parse_options() (which does not change tcp_opt-\u003enum_sacks/dsack)\nand then call cookie_check_timestamp().\n\nEven if num_sacks/dsacks were changed, the structure is allocated on\nthe stack and after cookie_check_timestamp returns only a few selected\nmembers are copied to the inet_request_sock.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55", "tree": "c2a042e1c8bb96b7fdeadf658309ead1b6e8dabc", "parents": [ "fdb93f8ac39aa5902f3d264edd50dffcabfdd13b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 16 04:52:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 11:55:39 2010 -0700" }, "message": "inetpeer: restore small inet_peer structures\n\nAddition of rcu_head to struct inet_peer added 16bytes on 64bit arches.\n\nThats a bit unfortunate, since old size was exactly 64 bytes.\n\nThis can be solved, using an union between this rcu_head an four fields,\nthat are normally used only when a refcount is taken on inet_peer.\nrcu_head is used only when refcnt\u003d-1, right before structure freeing.\n\nAdd a inet_peer_refcheck() function to check this assertion for a while.\n\nWe can bring back SLAB_HWCACHE_ALIGN qualifier in kmem cache creation.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d5f31fbfd8fa3836a918592032853c41d1797c3d", "tree": "b5b2e10650d93e3e7c86a8caa1f9ee55fa6ff83f", "parents": [ "9f70b0fcecd134890affe627aa2823591313a413" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jun 15 21:44:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 21:44:29 2010 -0700" }, "message": "netpoll: Use correct primitives for RCU dereferencing\n\nNow that RCU debugging checks for matching rcu_dereference calls\nand rcu_read_lock, we need to use the correct primitives or face\nnasty warnings.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5933dd2f028cdcbb4b3169dca594324704ba10ae", "tree": "c49d33589cf1ee2047ed4aa00f700e7ddb090447", "parents": [ "a95d8c88bea0c93505e1d143d075f112be2b25e3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 15 18:16:43 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 18:16:43 2010 -0700" }, "message": "net: NET_SKB_PAD should depend on L1_CACHE_BYTES\n\nIn old kernels, NET_SKB_PAD was defined to 16.\n\nThen commit d6301d3dd1c2 (net: Increase default NET_SKB_PAD to 32), and\ncommit 18e8c134f4e9 (net: Increase NET_SKB_PAD to 64 bytes) increased it\nto 64.\n\nWhile first patch was governed by network stack needs, second was more\ndriven by performance issues on current hardware. Real intent was to\nalign data on a cache line boundary.\n\nSo use max(32, L1_CACHE_BYTES) instead of 64, to be more generic.\n\nRemove microblaze and powerpc own NET_SKB_PAD definitions.\n\nThanks to Alexander Duyck and David Miller for their comments.\n\nSuggested-by: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "82695d9b186dcefe9bd119b53521deec20858f19", "tree": "077cf91b62365763b920b101ee3710274b36bfc3", "parents": [ "4fcc3d3409b0ab37c1f790e04a1f7c984b436167" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 15 15:08:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 15:08:48 2010 -0700" }, "message": "net: Fix error in comment on net_device_ops::ndo_get_stats\n\nndo_get_stats still returns struct net_device_stats *; there is\nno struct net_device_stats64.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa1039e73cc2cf834e99c09d2033d5d2675357b9", "tree": "0db06e4adddaf0f77b4e8de170710b74a17375e4", "parents": [ "7b34a4644b4342896e0c1967b8f953213ea4a990" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 15 08:23:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 14:23:38 2010 -0700" }, "message": "inetpeer: RCU conversion\n\ninetpeer currently uses an AVL tree protected by an rwlock.\n\nIt\u0027s possible to make most lookups use RCU\n\n1) Add a struct rcu_head to struct inet_peer\n\n2) add a lookup_rcu_bh() helper to perform lockless and opportunistic\nlookup. This is a normal function, not a macro like lookup().\n\n3) Add a limit to number of links followed by lookup_rcu_bh(). This is\nneeded in case we fall in a loop.\n\n4) add an smp_wmb() in link_to_pool() right before node insert.\n\n5) make unlink_from_pool() use atomic_cmpxchg() to make sure it can take\nlast reference to an inet_peer, since lockless readers could increase\nrefcount, even while we hold peers.lock.\n\n6) Delay struct inet_peer freeing after rcu grace period so that\nlookup_rcu_bh() cannot crash.\n\n7) inet_getpeer() first attempts lockless lookup.\n Note this lookup can fail even if target is in AVL tree, but a\nconcurrent writer can let tree in a non correct form.\n If this attemps fails, lock is taken a regular lookup is performed\nagain.\n\n8) convert peers.lock from rwlock to a spinlock\n\n9) Remove SLAB_HWCACHE_ALIGN when peer_cachep is created, because\nrcu_head adds 16 bytes on 64bit arches, doubling effective size (64 -\u003e\n128 bytes)\nIn a future patch, this is probably possible to revert this part, if rcu\nfield is put in an union to share space with rid, ip_id_count, tcp_ts \u0026\ntcp_ts_stamp. These fields being manipulated only with refcnt \u003e 0.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8", "tree": "a1041342f31a626baf3a08d09d5c81a65dd8ef28", "parents": [ "a3433f35a55f7604742cae620c6dc6edfc70db6a", "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "ff61638105db6f5832ef8700436ba6aa6d3a2fda", "tree": "ff55ef6186cd46d87ca4e54efbbe82f5ecc68f1e", "parents": [ "685429623f88d84f98bd5daffc3c427c408740d4" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 09 09:51:52 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 15 16:00:48 2010 -0400" }, "message": "mac80211: Fix ps-qos network latency handling\n\nThe ps-qos latency handling is broken. It uses predetermined latency values\nto select specific dynamic PS timeouts. With common AP configurations, these\nvalues overlap with beacon interval and are therefore essentially useless\n(for network latencies less than the beacon interval, PSM is disabled.)\n\nThis patch remedies the problem by replacing the predetermined network latency\nvalues with one high value (1900ms) which is used to go trigger full psm. For\nbackwards compatibility, the value 2000ms is still mapped to a dynamic ps\ntimeout of 100ms.\n\nCurrently also the mac80211 internal value for storing user space configured\ndynamic PSM values is incorrectly in the driver visible ieee80211_conf struct.\nMove it to the ieee80211_local struct.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a3433f35a55f7604742cae620c6dc6edfc70db6a", "tree": "4ce6d169e402c03a48319a9db4055cc31df00d42", "parents": [ "f350a0a87374418635689471606454abc7beaa3a" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jun 12 14:01:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:56:19 2010 -0700" }, "message": "tcp: unify tcp flag macros\n\nunify tcp flag macros: TCPHDR_FIN, TCPHDR_SYN, TCPHDR_RST, TCPHDR_PSH,\nTCPHDR_ACK, TCPHDR_URG, TCPHDR_ECE and TCPHDR_CWR. TCBCB_FLAG_* are replaced\nwith the corresponding TCPHDR_*.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/tcp.h | 24 ++++++-------\n net/ipv4/tcp.c | 8 ++--\n net/ipv4/tcp_input.c | 2 -\n net/ipv4/tcp_output.c | 59 ++++++++++++++++-----------------\n net/netfilter/nf_conntrack_proto_tcp.c | 32 ++++++-----------\n net/netfilter/xt_TCPMSS.c | 4 --\n 6 files changed, 58 insertions(+), 71 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f350a0a87374418635689471606454abc7beaa3a", "tree": "c8210542a9848f6b5953b58d2ba1dbfb11715f14", "parents": [ "a35e2c1b6d90544b3c688783869817628e5f9607" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Jun 15 06:50:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:48:58 2010 -0700" }, "message": "bridge: use rx_handler_data pointer to store net_bridge_port pointer\n\nRegister net_bridge_port pointer as rx_handler data pointer. As br_port is\nremoved from struct net_device, another netdev priv_flag is added to indicate\nthe device serves as a bridge port. Also rcuized pointers are now correctly\ndereferenced in br_fdb.c and in netfilter parts.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a35e2c1b6d90544b3c688783869817628e5f9607", "tree": "64fa6bc6b772248acfb92b5743c5f0d475126891", "parents": [ "93e2c32b5cb2ad92ceb1d7a4684f20a0d25bf530" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Jun 15 03:27:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:47:12 2010 -0700" }, "message": "macvlan: use rx_handler_data pointer to store macvlan_port pointer V2\n\nRegister macvlan_port pointer as rx_handler data pointer. As macvlan_port is\nremoved from struct net_device, another netdev priv_flag is added to indicate\nthe device serves as a macvlan port.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93e2c32b5cb2ad92ceb1d7a4684f20a0d25bf530", "tree": "c15af2642af01702097ade735506d15d7a910c54", "parents": [ "91d2c34a4eed32876ca333b0ca44f3bc56645805" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Jun 10 03:34:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:47:11 2010 -0700" }, "message": "net: add rx_handler data pointer\n\nAdd possibility to register rx_handler data pointer along with a rx_handler.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c18370f5b2949d9cca519355f33690b75e1e7c8b", "tree": "8e3a2e741bacf9121d2f2b4351d3e8efb640c818", "parents": [ "8fdd95ec162a8fbac7f41d6f54f90402fe3e8cb1" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 10 16:12:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 10:58:40 2010 -0700" }, "message": "netpoll: Add netpoll_tx_running\n\nThis patch adds the helper netpoll_tx_running for use within\nndo_start_xmit. It returns non-zero if ndo_start_xmit is being\ninvoked by netpoll, and zero otherwise.\n\nThis is currently implemented by simply looking at the hardirq\ncount. This is because for all non-netpoll uses of ndo_start_xmit,\nIRQs must be enabled while netpoll always disables IRQs before\ncalling ndo_start_xmit.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8fdd95ec162a8fbac7f41d6f54f90402fe3e8cb1", "tree": "e326d2640054c986fd5458719a45c4ef630953a8", "parents": [ "4247e161b12f8dffb7ee3ee07bc5e61f714ebe2d" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 10 16:12:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 10:58:40 2010 -0700" }, "message": "netpoll: Allow netpoll_setup/cleanup recursion\n\nThis patch adds the functions __netpoll_setup/__netpoll_cleanup\nwhich is designed to be called recursively through ndo_netpoll_seutp.\n\nThey must be called with RTNL held, and the caller must initialise\nnp-\u003edev and ensure that it has a valid reference count.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4247e161b12f8dffb7ee3ee07bc5e61f714ebe2d", "tree": "95edfebfb67abcfb95b1865ce8d78e44c1c153c5", "parents": [ "dbaa154178341689faaa08fbf40b94ae5ca1d6c0" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 10 16:12:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 10:58:39 2010 -0700" }, "message": "netpoll: Add ndo_netpoll_setup\n\nThis patch adds ndo_netpoll_setup as the initialisation primitive\nto complement ndo_netpoll_cleanup.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de85d99eb7b595f6751550184b94c1e2f74a828b", "tree": "950eea4329bfb2b5d94f2e242a86c36cf1fd49fc", "parents": [ "36655042f9873efc2a90d251b9aef9b6b79d75d8" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 10 16:12:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 10:58:38 2010 -0700" }, "message": "netpoll: Fix RCU usage\n\nThe use of RCU in netpoll is incorrect in a number of places:\n\n1) The initial setting is lacking a write barrier.\n2) The synchronize_rcu is in the wrong place.\n3) Read barriers are missing.\n4) Some places are even missing rcu_read_lock.\n5) npinfo is zeroed after freeing.\n\nThis patch fixes those issues. As most users are in BH context,\nthis also converts the RCU usage to the BH variant.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae", "tree": "194f22e8216a1b9ee2c0dd019142202d73a7dc87", "parents": [ "0902b469bd25065aa0688c3cee6f11744c817e7c", "1ab6c163dee279559e3a62d774af7e4c4c9b4c67" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tinclude/net/netfilter/xt_rateest.h\n\tnet/bridge/br_netfilter.c\n\tnet/netfilter/nf_conntrack_core.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0902b469bd25065aa0688c3cee6f11744c817e7c", "tree": "b7e1516da57ee49d98de0789a19fc283b50bf1de", "parents": [ "d73f33b168831e53972fbf7c85db87950a41436c" ], "author": { "name": "Luciano Coelho", "email": "luciano.coelho@nokia.com", "time": "Tue Jun 15 15:04:00 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 15:04:00 2010 +0200" }, "message": "netfilter: xtables: idletimer target implementation\n\nThis patch implements an idletimer Xtables target that can be used to\nidentify when interfaces have been idle for a certain period of time.\n\nTimers are identified by labels and are created when a rule is set with a new\nlabel. The rules also take a timeout value (in seconds) as an option. If\nmore than one rule uses the same timer label, the timer will be restarted\nwhenever any of the rules get a hit.\n\nOne entry for each timer is created in sysfs. This attribute contains the\ntimer remaining for the timer to expire. The attributes are located under\nthe xt_idletimer class:\n\n/sys/class/xt_idletimer/timers/\u003clabel\u003e\n\nWhen the timer expires, the target module sends a sysfs notification to the\nuserspace, which can then decide what to do (eg. disconnect to save power).\n\nCc: Timo Teras \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: Luciano Coelho \u003cluciano.coelho@nokia.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "1be3b5fe9dffe3300f995584d8f996dd20e29412", "tree": "45f5e99951d237f7216bf59bb482d2d8d1a12f3e", "parents": [ "6b08f516244abda22c07b5e7db10ef109dc43f2d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 14 08:53:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 23:13:06 2010 -0700" }, "message": "ethtool: Revert incorrect indentation changes\n\ncommit 97f8aefbbfb5aa5c9944e5fa8149f1fdaf71c7b6 \"net: fix ethtool\ncoding style errors and warnings\" changed the indentation of several\nmacro definitions in ethtool.h. These definitions line up in the diff\nwhere there is an extra character at the start of each line, but not\nin the resulting file.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "685429623f88d84f98bd5daffc3c427c408740d4", "tree": "d50f119094dd3fb7668f837dbe50857d11bb4fa3", "parents": [ "5ea096c0c85e80335889539899af9a4717976e0b" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 09 13:43:26 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:42:31 2010 -0400" }, "message": "mac80211: Fix circular locking dependency in ARP filter handling\n\nThere is a circular locking dependency when configuring the\nhardware ARP filters on association, occurring when flushing the mac80211\nworkqueue. This is what happens:\n\n[ 92.026800] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 92.030507] [ INFO: possible circular locking dependency detected ]\n[ 92.030507] 2.6.34-04781-g2b2c009 #85\n[ 92.030507] -------------------------------------------------------\n[ 92.030507] modprobe/5225 is trying to acquire lock:\n[ 92.030507] ((wiphy_name(local-\u003ehw.wiphy))){+.+.+.}, at: [\u003cffffffff8105b5c0\u003e] flush_workq\nueue+0x0/0xb0\n[ 92.030507]\n[ 92.030507] but task is already holding lock:\n[ 92.030507] (rtnl_mutex){+.+.+.}, at: [\u003cffffffff812b9ce2\u003e] rtnl_lock+0x12/0x20\n[ 92.030507]\n[ 92.030507] which lock already depends on the new lock.\n[ 92.030507]\n[ 92.030507]\n[ 92.030507] the existing dependency chain (in reverse order) is:\n[ 92.030507]\n[ 92.030507] -\u003e #2 (rtnl_mutex){+.+.+.}:\n[ 92.030507] [\u003cffffffff810761fb\u003e] lock_acquire+0xdb/0x110\n[ 92.030507] [\u003cffffffff81341754\u003e] mutex_lock_nested+0x44/0x300\n[ 92.030507] [\u003cffffffff812b9ce2\u003e] rtnl_lock+0x12/0x20\n[ 92.030507] [\u003cffffffffa022d47c\u003e] ieee80211_assoc_done+0x6c/0xe0 [mac80211]\n[ 92.030507] [\u003cffffffffa022f2ad\u003e] ieee80211_work_work+0x31d/0x1280 [mac80211]\n\n[ 92.030507] -\u003e #1 ((\u0026local-\u003ework_work)){+.+.+.}:\n[ 92.030507] [\u003cffffffff810761fb\u003e] lock_acquire+0xdb/0x110\n[ 92.030507] [\u003cffffffff8105a51a\u003e] worker_thread+0x22a/0x370\n[ 92.030507] [\u003cffffffff8105ecc6\u003e] kthread+0x96/0xb0\n[ 92.030507] [\u003cffffffff81003a94\u003e] kernel_thread_helper+0x4/0x10\n[ 92.030507]\n[ 92.030507] -\u003e #0 ((wiphy_name(local-\u003ehw.wiphy))){+.+.+.}:\n[ 92.030507] [\u003cffffffff81075fdc\u003e] __lock_acquire+0x1c0c/0x1d50\n[ 92.030507] [\u003cffffffff810761fb\u003e] lock_acquire+0xdb/0x110\n[ 92.030507] [\u003cffffffff8105b60e\u003e] flush_workqueue+0x4e/0xb0\n[ 92.030507] [\u003cffffffffa023ff7b\u003e] ieee80211_stop_device+0x2b/0xb0 [mac80211]\n[ 92.030507] [\u003cffffffffa0231635\u003e] ieee80211_stop+0x3e5/0x680 [mac80211]\n\nThe locking in this case is quite complex. Fix the problem by rewriting the\nway the hardware ARP filter list is handled - i.e. make a copy of the address\nlist to the bss_conf struct, and provide that list to the hardware driver\nwhen needed.\n\nThe current patch will enable filtering also in promiscuous mode. This may need\nto be changed in the future.\n\nReported-by: Reinette Chatre \u003creinette.chatre@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": "fbd2c8dcbc69616d2e15b8a269a86b3a05d45aea", "tree": "4ae08bd02d5e0d317828300f3255824df732e4b3", "parents": [ "7b9a4b001971c89f35d55180867753a612d17458" ], "author": { "name": "Teemu Paasikivi", "email": "ext-teemu.3.paasikivi@nokia.com", "time": "Mon Jun 14 12:55:31 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:39:34 2010 -0400" }, "message": "mac80211: Set basic rates while joining ibss network\n\nThis patch adds support to nl80211 and mac80211 to set basic rates when\njoining/creating ibss network.\n\nOriginal patch was posted by Johannes Berg on the linux-wireless posting list.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: Teemu Paasikivi \u003cext-teemu.3.paasikivi@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "85ad181ea78861f69b007599cec9e6ba33fcdf8a", "tree": "ea92b4f7aa6d09ee11ee865a11f6426e809468ba", "parents": [ "cfcdbde35e2b621cf56bedc38a3a81e8c28addb9" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jun 10 10:21:49 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:39:28 2010 -0400" }, "message": "mac80211: allow drivers to sleep in ampdu_action\n\nAllow drivers to sleep, and indicate this in\nthe documentation. ath9k has some locking I\ndon\u0027t understand, so keep it safe and disable\nBHs in it, all other drivers look fine with\nthe context change.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5d22c89b9bea17a0e48e7534a9b237885e2c0809", "tree": "ed4f1de2efaa41368a2774adc0e07d903f65ed98", "parents": [ "a622ab72b4dcfdf53e24b16e9530cb876979a00c" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jun 10 10:21:40 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:39:27 2010 -0400" }, "message": "mac80211: remove non-irqsafe aggregation callbacks\n\nThe non-irqsafe aggregation start/stop done\ncallbacks are currently only used by ath9k_htc,\nand can cause callbacks into the driver again.\nThis might lead to locking issues, which will\nonly get worse as we modify locking. To avoid\ntrouble, remove the non-irqsafe versions and\nchange ath9k_htc to use those instead.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f5c5440d40a24c5dc8030cde0a03debe87de4afb", "tree": "2dacda8f2134860488dad9783dbcc7ef970f2985", "parents": [ "bed1be20867d17a3eb2fb5e1613ebdc50c83b8aa" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 14 16:15:23 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 14 16:15:23 2010 +0200" }, "message": "netfilter: nfnetlink_log: RCU conversion, part 2\n\n- must use atomic_inc_not_zero() in instance_lookup_get()\n\n- must use hlist_add_head_rcu() instead of hlist_add_head()\n\n- must use hlist_del_rcu() instead of hlist_del()\n\n- Introduce NFULNL_COPY_DISABLED to stop lockless reader from using an\ninstance, before we do final instance_put() on it.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "be1f3c2c027cc5ad735df6a45a542ed1db7ec48b", "tree": "c97815a7cf25ea62e8f3a6b3597cfa8957f40b81", "parents": [ "d19b51499967baddf4f9f12a0067146c2554527a" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 08 07:19:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 15:51:22 2010 -0700" }, "message": "net: Enable 64-bit net device statistics on 32-bit architectures\n\nUse struct rtnl_link_stats64 as the statistics structure.\n\nOn 32-bit architectures, insert 32 bits of padding after/before each\nfield of struct net_device_stats to make its layout compatible with\nstruct rtnl_link_stats64. Add an anonymous union in net_device; move\nstats into the union and add struct rtnl_link_stats64 stats64.\n\nAdd net_device_ops::ndo_get_stats64, implementations of which will\nreturn a pointer to struct rtnl_link_stats64. Drivers that implement\nthis operation must not update the structure asynchronously.\n\nChange dev_get_stats() to call ndo_get_stats64 if available, and to\nreturn a pointer to struct rtnl_link_stats64. Change callers of\ndev_get_stats() accordingly.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c7de2cf053420d63bac85133469c965d4b1083e1", "tree": "b56f7c96d01e25f79fe1f9b7e5305265e92214d9", "parents": [ "cbd6890c5987cd7115147e1dd2c10d729afabb08" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 02:09:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 18:37:08 2010 -0700" }, "message": "pkt_sched: gen_kill_estimator() rcu fixes\n\ngen_kill_estimator() API is incomplete or not well documented, since\ncaller should make sure an RCU grace period is respected before\nfreeing stats_lock.\n\nThis was partially addressed in commit 5d944c640b4\n(gen_estimator: deadlock fix), but same problem exist for all\ngen_kill_estimator() users, if lock they use is not already RCU\nprotected.\n\nA code review shows xt_RATEEST.c, act_api.c, act_police.c have this\nproblem. Other are ok because they use qdisc lock, already RCU\nprotected.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62522d36d74a843e78d17f2dffc90468c6762803", "tree": "d9d21de6724425c1b0ba12991e0865556aeda6b4", "parents": [ "a71fba97295db924c0b90266e9833e5059fead24", "e79aa8671033535c2e9ffc0a68010ae49ed5734c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:32:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:32:31 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "14599f1e341ee219abdd15f4eee5872d6f2d29f1", "tree": "3875181429010e58416ab34e6c06ef42de52e756", "parents": [ "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf", "832c10fd733893f86c63bde1c65b005d5a2fe346" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 11:34:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 11:34:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/wl12xx/wl1271.h\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.h\n" } ], "next": "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf" }