)]}' { "log": [ { "commit": "c5e1fd8ccae09f574d6f978c90c2b968ee29030c", "tree": "e4485dc086ce76c4ff2ff551246255f5de0a250b", "parents": [ "60b778ce519625102d3f72a2071ea72a05e990ce", "ceb98d03eac5704820f2ac1f370c9ff385e3a9f5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 25 02:21:45 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 25 02:21:45 2011 -0500" }, "message": "Merge branch \u0027nf-next\u0027 of git://1984.lsi.us.es/net-next\n" }, { "commit": "ceb98d03eac5704820f2ac1f370c9ff385e3a9f5", "tree": "ae01b67bc105d3d8039b9dd53b893215407866c2", "parents": [ "9413902796f56f6209e19dd54e840ed46950612c" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Dec 23 14:28:59 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Dec 25 02:43:17 2011 +0100" }, "message": "netfilter: xtables: add nfacct match to support extended accounting\n\nThis patch adds the match that allows to perform extended\naccounting. It requires the new nfnetlink_acct infrastructure.\n\n # iptables -I INPUT -p tcp --sport 80 -m nfacct --nfacct-name http-traffic\n # iptables -I OUTPUT -p tcp --dport 80 -m nfacct --nfacct-name http-traffic\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "9413902796f56f6209e19dd54e840ed46950612c", "tree": "d03b478f7b5e11305cebd5ff26e7342dde7456b4", "parents": [ "80e60e67bc4bbfe61b61a344f542af23e16abdbf" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Dec 23 14:19:50 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Dec 25 02:43:03 2011 +0100" }, "message": "netfilter: add extended accounting infrastructure over nfnetlink\n\nWe currently have two ways to account traffic in netfilter:\n\n- iptables chain and rule counters:\n\n # iptables -L -n -v\nChain INPUT (policy DROP 3 packets, 867 bytes)\n pkts bytes target prot opt in out source destination\n 8 1104 ACCEPT all -- lo * 0.0.0.0/0 0.0.0.0/0\n\n- use flow-based accounting provided by ctnetlink:\n\n # conntrack -L\ntcp 6 431999 ESTABLISHED src\u003d192.168.1.130 dst\u003d212.106.219.168 sport\u003d58152 dport\u003d80 packets\u003d47 bytes\u003d7654 src\u003d212.106.219.168 dst\u003d192.168.1.130 sport\u003d80 dport\u003d58152 packets\u003d49 bytes\u003d66340 [ASSURED] mark\u003d0 use\u003d1\n\nWhile trying to display real-time accounting statistics, we require\nto pool the kernel periodically to obtain this information. This is\nOK if the number of flows is relatively low. However, in case that\nthe number of flows is huge, we can spend a considerable amount of\ncycles to iterate over the list of flows that have been obtained.\n\nMoreover, if we want to obtain the sum of the flow accounting results\nthat match some criteria, we have to iterate over the whole list of\nexisting flows, look for matchings and update the counters.\n\nThis patch adds the extended accounting infrastructure for\nnfnetlink which aims to allow displaying real-time traffic accounting\nwithout the need of complicated and resource-consuming implementation\nin user-space. Basically, this new infrastructure allows you to create\naccounting objects. One accounting object is composed of packet and\nbyte counters.\n\nIn order to manipulate create accounting objects, you require the\nnew libnetfilter_acct library. It contains several examples of use:\n\nlibnetfilter_acct/examples# ./nfacct-add http-traffic\nlibnetfilter_acct/examples# ./nfacct-get\nhttp-traffic \u003d { pkts \u003d 000000000000, bytes \u003d 000000000000 };\n\nThen, you can use one of this accounting objects in several iptables\nrules using the new nfacct match (which comes in a follow-up patch):\n\n # iptables -I INPUT -p tcp --sport 80 -m nfacct --nfacct-name http-traffic\n # iptables -I OUTPUT -p tcp --dport 80 -m nfacct --nfacct-name http-traffic\n\nThe idea is simple: if one packet matches the rule, the nfacct match\nupdates the counters.\n\nThanks to Patrick McHardy, Eric Dumazet, Changli Gao for reviewing and\nproviding feedback for this contribution.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "60b778ce519625102d3f72a2071ea72a05e990ce", "tree": "ecae42cc8809809287e10007643370eaed7e3055", "parents": [ "035c4c16bea2814890c64c657d177e91cec1f473" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Dec 24 06:56:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 24 16:13:27 2011 -0500" }, "message": "rfs: better sizing of dev_flow_table\n\nAim of this patch is to provide full range of rps_flow_cnt on 64bit arches.\n\nTheorical limit on number of flows is 2^32\n\nFix some buggy RPS/RFS macros as well.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Tom Herbert \u003ctherbert@google.com\u003e\nCC: Xi Wang \u003cxi.wang@gmail.com\u003e\nCC: Laurent Chavey \u003cchavey@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "abb434cb0539fb355c1c921f8fd761efbbac3462", "tree": "24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6", "parents": [ "2494654d4890316e7340fb8b3458daad0474a1b9", "6350323ad8def2ac00d77cdee3b79c9b9fba75c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/bluetooth/l2cap_core.c\n\nJust two overlapping changes, one added an initialization of\na local variable, and another change added a new local variable.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d4dde5215779f4099730194ad30624fdba3d8b2", "tree": "5f0faa91f3359f3335f9063ebb1246db29c8289a", "parents": [ "f87ce5b254d4eb5b5ec2bfcc78d714fa0e249288" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Thu Dec 22 23:39:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 16:51:18 2011 -0500" }, "message": "net: only use a single page of slop in MAX_SKB_FRAGS\n\nIn order to accommodate a 64K buffer we need 64K/PAGE_SIZE plus one more page\nin order to allow for a buffer which does not start on a page boundary.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cbc9f2f4fcd70d5a627558ca9a881fa9391abf69", "tree": "37bc0efbcc8fda2250bca77bbd681167c96a2598", "parents": [ "3d058d7bc2c5671ae630e0b463be8a69b5783fb9" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Dec 23 13:59:49 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Dec 23 14:36:43 2011 +0100" }, "message": "netfilter: nf_nat: export NAT definitions to userspace\n\nExport the NAT definitions to userspace. So far userspace (specifically,\niptables) has been copying the headers files from include/net. Also\nrename some structures and definitions in preparation for IPv6 NAT.\nSince these have never been officially exported, this doesn\u0027t affect\nexisting userspace code.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "3d058d7bc2c5671ae630e0b463be8a69b5783fb9", "tree": "f500c32545d26357da5d2ea1e8e63e64af8bbc35", "parents": [ "c4042a339f40fe00d85e31055b1c0808dd025539" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Dec 18 01:55:54 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Dec 23 14:36:39 2011 +0100" }, "message": "netfilter: rework user-space expectation helper support\n\nThis partially reworks bc01befdcf3e40979eb518085a075cbf0aacede0\nwhich added userspace expectation support.\n\nThis patch removes the nf_ct_userspace_expect_list since now we\nforce to use the new iptables CT target feature to add the helper\nextension for conntracks that have attached expectations from\nuserspace.\n\nA new version of the proof-of-concept code to implement userspace\nhelpers from userspace is available at:\n\nhttp://people.netfilter.org/pablo/userspace-conntrack-helpers/nf-ftp-helper-POC.tar.bz2\n\nThis patch also modifies the CT target to allow to set the\nconntrack\u0027s userspace helper status flags. This flag is used\nto tell the conntrack system to explicitly allocate the helper\nextension.\n\nThis helper extension is useful to link the userspace expectations\nwith the master conntrack that is being tracked from one userspace\nhelper.\n\nThis feature fixes a problem in the current approach of the\nuserspace helper support. Basically, if the master conntrack that\nhas got a userspace expectation vanishes, the expectations point to\none invalid memory address. Thus, triggering an oops in the\nexpectation deletion event path.\n\nI decided not to add a new revision of the CT target because\nI only needed to add a new flag for it. I\u0027ll document in this\nissue in the iptables manpage. I have also changed the return\nvalue from EINVAL to EOPNOTSUPP if one flag not supported is\nspecified. Thus, in the future adding new features that only\nrequire a new flag can be added without a new revision.\n\nThere is no official code using this in userspace (apart from\nthe proof-of-concept) that uses this infrastructure but there\nwill be some by beginning 2012.\n\nReported-by: Sam Roberts \u003cvieuxtech@gmail.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "ab56222a32b9dbaae19c1d37f07b0ac4fc3c27ec", "tree": "ce5eff7879a1d80c419835171de13e52c24afdfb", "parents": [ "08f4fc9da9a04d59f5c937e06e375158abb68206" ], "author": { "name": "Vijay Subramanian", "email": "subramanian.vijay@gmail.com", "time": "Tue Dec 20 13:23:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 21 01:03:23 2011 -0500" }, "message": "tcp: Replace constants with #define macros\n\nto record the state of SACK/FACK and DSACK for better readability and maintenance.\n\nSigned-off-by: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5fbd305dd2b661a243013cf444d2a32bfec2f701", "tree": "4e90099fef21c0ad7aec77d772b12a0b2094d64e", "parents": [ "a205b082189bf914959a667a5c83ea145bba3fb5", "b1b73d095084e754562961c443aa8f6587a55f8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:42:38 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:42:38 2011 -0800" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n time/clocksource: Fix kernel-doc warnings\n rtc: m41t80: Workaround broken alarm functionality\n rtc: Expire alarms after the time is set.\n" }, { "commit": "447f219190bf0368b8b36cf60155744cb43510df", "tree": "7e6c95b20ea8fe8f819fceb7399602df72061c48", "parents": [ "72be84f1c21c0ddba1081291072d7acc9ccddf5f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 19 15:04:41 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 19 15:04:41 2011 -0500" }, "message": "Revert \"net: Remove unused neighbour layer ops.\"\n\nThis reverts commit 5c3ddec73d01a1fae9409c197078cb02c42238c3.\n\nS390 qeth driver actually still uses the setup ops.\n\nReported-by: Frank Blaschka \u003cblaschka@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d0fc7b61191c9433a4f738987b89e1d962eb637", "tree": "f538c085fefdeddd321a66ed0fb54a0cd86cbf34", "parents": [ "58a60168d12c4e5be21c29420a3de4a41ef3470f" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Mon Dec 19 04:00:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 19 14:57:07 2011 -0500" }, "message": "mlx4_core: Changing link sensing logic\n\nNew FW can give clues to driver regarding default port type\nand whether or not we should default to link sensing on the port.\n\n2 bits are added to QUERY_PORT command:\n1. suggested_type: This bit gives a hint whether the default port type should be\n IB or Ethernet.\n The driver will use this hint in case the user didn\u0027t specify explicitly the link layer\n type he wants to set.\n2. default_sense: If this bit is set, we would sense the port type on start-up\n and default the port to link sensing\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "58a60168d12c4e5be21c29420a3de4a41ef3470f", "tree": "407a7f5c7ef86a4346577ce1860bf686d40d4b93", "parents": [ "9f6e20cee6253c4ca5faacba8dbd09ebe70132ed" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Mon Dec 19 04:00:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 19 14:57:06 2011 -0500" }, "message": "mlx4: capability for link sensing\n\nFor ConnectX3 devices, we allow link sensing only if FW explicitly\nreported it supports the feature.\nFor older versions (ConnectX1 and 2), if the card supports both link layer types\n(Ethenet and Infiniband), link sensing is supported.\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f6e20cee6253c4ca5faacba8dbd09ebe70132ed", "tree": "0dbcdabca91864daaf174bb014a5f46316880403", "parents": [ "d1d182e00d72300e05b18e28372fab003d8d4a58", "5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 19 13:54:26 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 19 13:54:26 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "b1b73d095084e754562961c443aa8f6587a55f8e", "tree": "f2927ab364b329175442b6abece86cba3528f969", "parents": [ "c3b79770e51ab1fd4201f3b54edf30113b9ce74f" ], "author": { "name": "Kusanagi Kouichi", "email": "slash@ac.auone-net.jp", "time": "Mon Dec 19 18:13:19 2011 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 19 11:41:40 2011 +0100" }, "message": "time/clocksource: Fix kernel-doc warnings\n\nFix various KernelDoc build warnings.\n\nSigned-off-by: Kusanagi Kouichi \u003cslash@ac.auone-net.jp\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLink: http://lkml.kernel.org/r/20111219091320.0D5AF6FC03D@msa105.auone-net.jp\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "2cfab8d74ebfbe06ce2947117945c4f45a5915ec", "tree": "787c8b82533e6f8c358f53ac4aefb2e5e8fd3e2d", "parents": [ "5885b9b3f030f9b430f6b1c7fa396c885033f2f8", "3b5c78a35cf7511c15e09a9b0ffab290a42d9bcf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 16 11:27:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 16 11:27:56 2011 -0800" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~keithp/linux\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~keithp/linux:\n drm/i915/dp: Dither down to 6bpc if it makes the mode fit\n drm/i915: enable semaphores on per-device defaults\n drm/i915: don\u0027t set unpin_work if vblank_get fails\n drm/i915: By default, enable RC6 on IVB and SNB when reasonable\n iommu: Export intel_iommu_enabled to signal when iommu is in use\n drm/i915/sdvo: Include LVDS panels for the IS_DIGITAL check\n drm/i915: prevent division by zero when asking for chipset power\n drm/i915: add PCH info to i915_capabilities\n drm/i915: set the right SDVO transcoder for CPT\n drm/i915: no-lvds quirk for ASUS AT5NM10T-I\n drm/i915: Treat pre-gen4 backlight duty cycle value consistently\n drm/i915: Hook up Ivybridge eDP\n drm/i915: add multi-threaded forcewake support\n" }, { "commit": "278bc4296bd64ffd1d3913b487dc8a520e423a7a", "tree": "87781870cf9b96398a90fae6ebe1dae6d43d9ea4", "parents": [ "7850f63f1620512631445b901ae11cd149e7375c" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Dec 15 13:56:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:53:18 2011 -0500" }, "message": "ethtool: Define and apply a default policy for RX flow hash indirection\n\nAll drivers that support modification of the RX flow hash indirection\ntable initialise it in the same way: RX rings are assigned to table\nentries in rotation. Make that default policy explicit by having them\ncall a ethtool_rxfh_indir_default() function.\n\nIn the ethtool core, add support for a zero size value for\nETHTOOL_SRXFHINDIR, which resets the table to this default.\n\nPartly-suggested-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Shreyas N Bhatewara \u003csbhatewara@vmware.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7850f63f1620512631445b901ae11cd149e7375c", "tree": "d26a5f049dcf3634c4bf9e1b86915d201fab3836", "parents": [ "14596f7006297b67516e2b6a2b26bcb11fe08fb3" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Dec 15 13:55:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:52:47 2011 -0500" }, "message": "ethtool: Centralise validation of ETHTOOL_{G, S}RXFHINDIR parameters\n\nAdd a new ethtool operation (get_rxfh_indir_size) to get the\nindirectional table size. Use this to validate the user buffer size\nbefore calling get_rxfh_indir or set_rxfh_indir. Use get_rxnfc to get\nthe number of RX rings, and validate the contents of the new\nindirection table before calling set_rxfh_indir. Remove this\nvalidation from drivers.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Dimitris Michailidis \u003cdm@chelsio.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14596f7006297b67516e2b6a2b26bcb11fe08fb3", "tree": "02356cc1106bba9a80cd5664e60313a27992863f", "parents": [ "5d531aaa64a06622874f06e5068b8eefca048feb" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Dec 15 13:51:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:52:47 2011 -0500" }, "message": "ethtool: Clarify use of size field for ETHTOOL_GRXFHINDIR\n\nIn order to find out the device\u0027s RX flow hash table size, ethtool\ninitially uses ETHTOOL_GRXFHINDIR with a buffer size of zero. This\nmust be supported, but it is not necessary to support any other user\nbuffer size less than the device table size.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cbf391958afb9b82c72324a15891eb3102200085", "tree": "33230c7964b3b2119a84696afe4299a8a385f937", "parents": [ "2aac7a2cb0d9d8c65fc7dde3e19e46b3e878d23d" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:46:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:29 2011 -0500" }, "message": "unix_diag: Receive queue lenght NLA\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2aac7a2cb0d9d8c65fc7dde3e19e46b3e878d23d", "tree": "a2308c69d4a03fdb99596f336b7cdfeb6692c7a8", "parents": [ "ac02be8d96af9f66a4de86781ee9facc2dff99d4" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:46:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:28 2011 -0500" }, "message": "unix_diag: Pending connections IDs NLA\n\nWhen establishing a unix connection on stream sockets the\nserver end receives an skb with socket in its receive queue.\n\nReport who is waiting for these ends to be accepted for\nlistening sockets via NLA.\n\nThere\u0027s a lokcing issue with this -- the unix sk state lock is\nrequired to access the peer, and it is taken under the listening\nsk\u0027s queue lock. Strictly speaking the queue lock should be taken\ninside the state lock, but since in this case these two sockets\nare different it shouldn\u0027t lead to deadlock.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ac02be8d96af9f66a4de86781ee9facc2dff99d4", "tree": "f9a7ef71f50d5bda679f8603cbfa53c0d4092df4", "parents": [ "5f7b0569460b7d8d01ca776430a00505a68b7584" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:45:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:28 2011 -0500" }, "message": "unix_diag: Unix peer inode NLA\n\nReport the peer socket inode ID as NLA. With this it\u0027s finally\npossible to find out the other end of an interesting unix connection.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5f7b0569460b7d8d01ca776430a00505a68b7584", "tree": "f67c5033fb1fe17b45e4b45cbbb162428216f37d", "parents": [ "f5248b48a64c221dd6157ab9cbee5a36ee45e6ed" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:45:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:28 2011 -0500" }, "message": "unix_diag: Unix inode info NLA\n\nActually, the socket path if it\u0027s not anonymous doesn\u0027t give\na clue to which file the socket is bound to. Even if the path\nis absolute, it can be unlinked and then new socket can be\nbound to it.\n\nWith this NLA it\u0027s possible to check which file a particular\nsocket is really bound to.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f5248b48a64c221dd6157ab9cbee5a36ee45e6ed", "tree": "f03c84d11417f77827060f48e1bf09435a28c25b", "parents": [ "5d3cae8bc39dd38d1aa5fd4bbc788c7b43fcaa71" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:45:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:28 2011 -0500" }, "message": "unix_diag: Unix socket name NLA\n\nReport the sun_path when requested as NLA. With leading \u0027\\0\u0027 if\npresent but without the leading AF_UNIX bits.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22931d3b906cd0a1726a49a09713f9220a5fab8a", "tree": "33e303ac5be89b1490e6beabd311ca3e6d6860bc", "parents": [ "fa7ff56f75add89bbedaf2dfcfa8f6661e8e8b3a" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:44:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:27 2011 -0500" }, "message": "unix_diag: Basic module skeleton\n\nIncludes basic module_init/_exit functionality, dump/get_exact stubs\nand declares the basic API structures for request and response.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f65c1b534b99aef1809b893387b295963821549f", "tree": "0718e1598b4d01c4c1817a3c663a312616f0dddd", "parents": [ "aec8dc62f66199aef153d86e1f90d9c1d14696e3" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:43:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:27 2011 -0500" }, "message": "sock_diag: Generalize requests cookies managements\n\nThe sk address is used as a cookie between dump/get_exact calls.\nIt will be required for unix socket sdumping, so move it from\ninet_diag to sock_diag.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e7c466e58eb1ff9bf49c2f3902622dc11a8c7022", "tree": "3b946527f5d7f9a014245c3d421c87c3b3a966ff", "parents": [ "b26e478f8fd5b575684f021b05a5c6236ebb911a" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Dec 15 02:42:42 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 13:48:27 2011 -0500" }, "message": "sock_diag: Move the SOCK_DIAG_BY_FAMILY cmd declaration\n\nIt should belong to sock_diag, not inet_diag.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0d78ee89c4ac1e99dda52f304baf82bd2a6c946", "tree": "2aa8b6869b6daaefa1e7914849098337ce7f6283", "parents": [ "6f12d2ee52dcf97dcefdadbd500e7650311eaa6a", "4eabc941259f9d8c8fb71746d3f30c87e1d9e49b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 16 10:05:14 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 16 10:05:14 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: don\u0027t kick empty queue in blk_drain_queue()\n block/swim3: Locking fixes\n loop: Fix discard_alignment default setting\n cfq-iosched: fix cfq_cic_link() race confition\n cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails\n cciss: fix flush cache transfer length\n cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler\n loop: fix loop block driver discard and encryption comment\n block: initialize request_queue\u0027s numa node during\n" }, { "commit": "8bc1f85c02a20a59956b00b3acea12c04dce9ae8", "tree": "259cc3a7b192afbde9c4b2bf066f0e1a3e4b3999", "parents": [ "522200858093a6f31af9830672109f6d9807dd1e" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Wed Nov 23 16:42:14 2011 -0200" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Dec 16 08:49:57 2011 -0800" }, "message": "iommu: Export intel_iommu_enabled to signal when iommu is in use\n\nIn i915 driver, we do not enable either rc6 or semaphores on SNB when dmar\nis enabled. The new \u0027intel_iommu_enabled\u0027 variable signals when the\niommu code is in operation.\n\nCc: Ted Phelps \u003cphelps@gnusto.com\u003e\nCc: Peter \u003cpab1612@gmail.com\u003e\nCc: Lukas Hejtmanek \u003cxhejtman@fi.muni.cz\u003e\nCc: Andrew Lutomirski \u003cluto@mit.edu\u003e\nCC: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "bdd90d5e36a55271beb957b3d7ca3e29b2a90207", "tree": "79243e73e6c64217bc676507504b72a2d59fc096", "parents": [ "d83023daa219486e9aa139d423308a045bf0438b" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Dec 14 12:20:27 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Dec 15 14:45:45 2011 -0500" }, "message": "cfg80211: validate nl80211 station handling better\n\nThe nl80211 station handling code is a bit messy\nand doesn\u0027t do a lot of validation. It seems like\nthis could be an issue for drivers that don\u0027t use\nmac80211 to validate everything.\n\nAs cfg80211 doesn\u0027t keep station state, move the\nvalidation of allowing supported_rates to change\nfor TDLS only in station mode to mac80211.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "888bdaa9b2c426dcca214e6efd388080938082cb", "tree": "4f9d9ae8e99318effaaf4e12391cddecd4c9e9da", "parents": [ "f943cbe6fb71d1389dd8684b9b4181e49f8e870c" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Wed Dec 14 23:34:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 15 11:59:44 2011 -0500" }, "message": "Move limit definitions outside CONFIG_INET\n\nThey need to be available for other protocols as well, since\nthey are used in sock.c openly\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCC: Hiroyouki Kamezawa \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d646960f7986fefb460a2b062d5ccc8ccfeacc3a", "tree": "0624d338715a8d275a39fbfce074df5c5d2783f5", "parents": [ "361f3cb7f9cfdb82c80926d0e7843c098c034545" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Dec 14 16:43:12 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Dec 14 14:50:13 2011 -0500" }, "message": "NFC: Initial LLCP support\n\nThis patch is an initial implementation for the NFC Logical Link Control\nprotocol. It\u0027s also known as NFC peer to peer mode.\nThis is a basic implementation as it lacks SDP (services Discovery\nProtocol), frames aggregation support, and frame rejecion parsing.\nFollow up patches will implement those missing features.\nThis code has been tested against a Nexus S phone implementing LLCP 1.0.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1ed28f610653e9b18433c6d87e9d333b7e3e886e", "tree": "176dbd0bfee9c16ef615d6178a26cd1b125e7527", "parents": [ "db81a62451b24eaef59f41e6fb312a88e1a83454" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Dec 14 16:43:09 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Dec 14 14:50:12 2011 -0500" }, "message": "NFC: Add a DEP link control netlink command\n\nNFC-DEP (Data Exchange Protocol) is an NFC MAC layer.\nThis command allows to enable and disable the DEP link on to which e.g.\nLLCP can run.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5c3ddec73d01a1fae9409c197078cb02c42238c3", "tree": "574936e32ed759ed90cc5d6b29add6cfe825e734", "parents": [ "6edf91da43017b15b45604fcd332c19e3000c535" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 16:44:22 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 16:44:22 2011 -0500" }, "message": "net: Remove unused neighbour layer ops.\n\nIt\u0027s simpler to just keep these things out until there is a real user\nof them, so we can see what the needs actually are, rather than keep\nthese things around as useless overhead.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "084455524f0d46dd210b4397898aff73579b97e8", "tree": "a3442d404394c8525965a30097238e5b66540427", "parents": [ "9d08f10d355afd500310738ff09b4d921a447102" ], "author": { "name": "Arend van Spriel", "email": "arend@broadcom.com", "time": "Thu Dec 08 15:06:42 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 13 15:31:27 2011 -0500" }, "message": "bcma: use static keyword for inline function declaration in bcma.h\n\nJust scratching an itch here, but it makes more sense to use the\nstatic keyword if you think about how the compiler treats inline\nfunctions.\n\nReviewed-by: Pieter-Paul Giesberts \u003cpieterpg@broadcom.com\u003e\nReviewed-by: Alwin Beukers \u003calwin@broadcom.com\u003e\nSigned-off-by: Arend van Spriel \u003carend@broadcom.com\u003e\nSigned-off-by: Franky Lin \u003cfrankyl@broadcom.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9d08f10d355afd500310738ff09b4d921a447102", "tree": "85748639950c04f299d81c784eb68a059ee7c449", "parents": [ "ffb2756511a90091185e9be0652cc10eee0890d0" ], "author": { "name": "Arend van Spriel", "email": "arend@broadcom.com", "time": "Thu Dec 08 15:06:41 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 13 15:31:24 2011 -0500" }, "message": "bcma: add set/mask macros for 16-bit register access\n\nThe BCMA header only had definitions for 32-bit register access. Used\nthose as a template for the 16-bit flavour. Also changed them to inline\nfunctions to be on the safe side. As offset parameter is used twice there\nwould be a problem when used like this: bcma_set32(core, offset++, val);\n\nReviewed-by: Pieter-Paul Giesberts \u003cpieterpg@broadcom.com\u003e\nReviewed-by: Alwin Beukers \u003calwin@broadcom.com\u003e\nSigned-off-by: Arend van Spriel \u003carend@broadcom.com\u003e\nSigned-off-by: Franky Lin \u003cfrankyl@broadcom.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "aee5ed563d56c713d2a51d6f16e08b83fd9665d5", "tree": "f647a9745a4640f9e11eebe414d9e109fb9d79b2", "parents": [ "8a5ac6ecd56756ee72588627aa23ab6cf9b790db" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Thu Dec 08 18:02:22 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 13 15:30:52 2011 -0500" }, "message": "bcma: extract FEM info from SPROM\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8a5ac6ecd56756ee72588627aa23ab6cf9b790db", "tree": "de3fea105315782161688cd7a9c22634422e1fd6", "parents": [ "adf5ace5d8161b962afe90e77922728a425b6933" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Thu Dec 08 18:02:21 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 13 15:30:49 2011 -0500" }, "message": "ssb: extract FEM info from SPROM\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8cb25e14fe80d0fac42412364df573eb3e8e83cc", "tree": "5472f45b7ab1d41415dffe8ea661b1fc57bd68b7", "parents": [ "42624d4913a00219a8fdbb4bafd634d1d843be85" ], "author": { "name": "Helmut Schaa", "email": "helmut.schaa@googlemail.com", "time": "Thu Dec 08 13:11:54 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 13 15:30:40 2011 -0500" }, "message": "ieee80211: Introduce ieee80211_is_first_frag\n\nSigned-off-by: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ab9c17a009ee8eb8c667f22dc0be0709effceab9", "tree": "b85acd5d8cf28a42ef5f7361ef43b4195b89912d", "parents": [ "d81c7186aa16a0da9e39961af6bad0c855a5d684" ], "author": { "name": "Jack Morgenstein", "email": "jackm@dev.mellanox.co.il", "time": "Tue Dec 13 04:18:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 13:56:08 2011 -0500" }, "message": "mlx4_core: Modify driver initialization flow to accommodate SRIOV for Ethernet\n\n1. Added module parameters sr_iov and probe_vf for controlling enablement of\n SRIOV mode.\n2. Increased default max num-qps, num-mpts and log_num_macs to accomodate\n SRIOV mode\n3. Added port_type_array as a module parameter to allow driver startup with\n ports configured as desired.\n In SRIOV mode, only ETH is supported, and this array is ignored; otherwise,\n for the case where the FW supports both port types (ETH and IB), the\n port_type_array parameter is used.\n By default, the port_type_array is set to configure both ports as IB.\n4. When running in sriov mode, the master needs to initialize the ICM eq table\n to hold the eq\u0027s for itself and also for all the slaves.\n5. mlx4_set_port_mask() now invoked from mlx4_init_hca, instead of in mlx4_dev_cap.\n6. Introduced sriov VF (slave) device startup/teardown logic (mainly procedures\n mlx4_init_slave, mlx4_slave_exit, mlx4_slave_cap, mlx4_slave_exit and flow\n modifications in __mlx4_init_one, mlx4_init_hca, and mlx4_setup_hca).\n VFs obtain their startup information from the PF (master) device via the\n comm channel.\n7. In SRIOV mode (both PF and VF), MSI_X must be enabled, or the driver\n aborts loading the device.\n8. Do not allow setting port type via sysfs when running in SRIOV mode.\n9. mlx4_get_ownership: Currently, only one PF is supported by the driver.\n If the HCA is burned with FW which enables more than one PF, only one\n of the PFs is allowed to run. The first one up grabs a FW ownership\n semaphone -- all other PFs will find that semaphore taken, and the\n driver will not allow them to run.\n\nSigned-off-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: Liran Liss \u003cliranl@mellanox.co.il\u003e\nSigned-off-by: Marcel Apfelbaum \u003cmarcela@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b8fb2867ca2736a715a88067fd0ec2904777cbe", "tree": "507a7645aaeda05151045157756e1a828e60fe11", "parents": [ "5b4c4d36860ef1c411d0669ffc15090417a33389" ], "author": { "name": "Marcel Apfelbaum", "email": "marcela@dev.mellanox.co.il", "time": "Tue Dec 13 04:16:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 13:56:07 2011 -0500" }, "message": "mlx4_core: mtts resources units changed to offset\n\nIn the previous implementation mtts are managed by:\n1. order - log(mtt segments), \u0027mtt segment\u0027 groups several mtts together.\n2. first_seg - segment location relative to mtt table.\nIn the current implementation:\n1. order - log(mtts) rather than segments\n2. offset - mtt index in mtt table\n\nNote: The actual mtt allocation is made in segments but it is\n transparent to callers.\n\nRational: The mtt resource holders are not interested on how the allocation\n of mtt is done, but rather on how they will use it.\n\nSigned-off-by: Marcel Apfelbaum \u003cmarcela@dev.mellanox.co.il\u003e\nReviewed-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ffe455ad04681f3fc48eef595fe526a795f809a3", "tree": "ba21abb4371d780357dd1a91810dd171ce3b05b2", "parents": [ "0ec2c0f86d31ab36547307f133b0016006bdc6b5" ], "author": { "name": "Eugenia Emantayev", "email": "eugenia@mellanox.co.il", "time": "Tue Dec 13 04:16:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 13:56:07 2011 -0500" }, "message": "mlx4: Ethernet port management modifications\n\nThe physical port is now common to the PF and VFs.\nThe port resources and configuration is managed by the PF, VFs can\nonly influence the MTU of the port, it is set as max among all functions,\nEach function allocates RX buffers of required size to meet it\u0027s MTU enforcement.\nPort management code was moved to mlx4_core, as the mlx4_en module is\nvirtualization unaware\n\nMove handling qp functionality to mlx4_get_eth_qp/mlx4_put_eth_qp\nincluding reserve/release range and add/release unicast steering.\nLet mlx4_register/unregister_mac deal only with MAC (un)registration.\n\nSigned-off-by: Eugenia Emantayev \u003ceugenia@mellanox.co.il\u003e\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f5311ac109b21c9b47118655a5b6d887bcc686f8", "tree": "08b36eb29661485c60f101bb9f3f50be8a0eff2c", "parents": [ "f9baff509f8a05a79626defdbdf4f4aa4efd373b" ], "author": { "name": "Jack Morgenstein", "email": "jackm@dev.mellanox.co.il", "time": "Tue Dec 13 04:12:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 13:56:05 2011 -0500" }, "message": "mlx4_core: Reduce number of PD bits to 17\n\nWhen SRIOV is enabled on the chip (at FW burning time),\nthe HCA uses only 17 bits for the PD. The remaining 7 high-order bits\nare ignored.\n\nChange the allocator to return only 17 bits for the PD. The MSB 7\nbits will be used to encode the slave number for consistency\nchecking later on in the resource tracker.\n\nSigned-off-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9baff509f8a05a79626defdbdf4f4aa4efd373b", "tree": "d4f0e425cd8c8999775f0f135c9825e3bbdc180c", "parents": [ "65dab25deb8da7dba4b6dd0145a9143be7f8369f" ], "author": { "name": "Jack Morgenstein", "email": "jackm@dev.mellanox.co.il", "time": "Tue Dec 13 04:10:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 13:56:05 2011 -0500" }, "message": "mlx4_core: Add \"native\" argument to mlx4_cmd and its callers (where needed)\n\nFor SRIOV, some Hypervisor commands can be executed directly (native \u003d 1).\nOthers should go through the command wrapper flow (for tracking resource\nusage, for example, or for changing some HCA configurations that slaves\nneed to be notified of).\n\nThis patch sets the groundwork for this capability -- adding the correct\nvalue of \"native\" in each case.\n\nNote that if SRIOV is not activated, this parameter has no effect.\n\nSigned-off-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65dab25deb8da7dba4b6dd0145a9143be7f8369f", "tree": "a494864c9c97eef341f30529d71feceb08dcdb64", "parents": [ "623ed84b1f9553bc962c2aca92f488aa6f27ecd1" ], "author": { "name": "Jack Morgenstein", "email": "jackm@dev.mellanox.co.il", "time": "Tue Dec 13 04:10:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 13:56:05 2011 -0500" }, "message": "mlx4: Extanding port_mask functionality\n\nPort mask now has additional state.\nPort can be set as \"none\". In this case neither the mlx4_en or mlx4_ib\ndrivers take ownership of the port.\nIn multifunction mode there is an option to set the vfs as single ported devices.\n(in single function mode, both physical ports belong to same function)\n\nSigned-off-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "623ed84b1f9553bc962c2aca92f488aa6f27ecd1", "tree": "e83f5c25e071e3dcef12122166a1996c0027c612", "parents": [ "9f048bfba15a22d1d1ce0c1f44567fa16bed4d25" ], "author": { "name": "Jack Morgenstein", "email": "jackm@dev.mellanox.co.il", "time": "Tue Dec 13 04:10:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 13 13:56:05 2011 -0500" }, "message": "mlx4_core: initial header-file changes for SRIOV support\n\nThese changes will not affect module operation as yet. They\nare only to get some structs and enums in place for use by\nsubsequent patches (making those smaller).\n\nAdded here:\n* sriov state structs and inlines (mlx4_is_master/slave/mfunc)\n* comm-channel and vhcr support structures\n* enum values for new FW and comm-channel virtual commands\n (i.e., commands, passed via the comm channel to the PF-driver).\n* prototypes for many command wrapper functions (used by the\n PF context for processing FW commands passed to it by the VFs).\n* struct mlx4_eqe is moved from eq.c to mlx4.h (it will be used\n by other mlx4_core source files).\n\nSigned-off-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "13c07b0286d340275f2d97adf085cecda37ede37", "tree": "1171b73c8261ddc0c47817f765c470260c8d2699", "parents": [ "12870da5c3ace563902babdfa10d824fdbd4ce88" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 12 22:06:55 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 12 22:06:55 2011 -0800" }, "message": "linux/log2.h: Fix rounddown_pow_of_two(1)\n\nExactly like roundup_pow_of_two(1), the rounddown version was buggy for\nthe case of a compile-time constant \u00271\u0027 argument. Probably because it\noriginated from the same code, sharing history with the roundup version\nfrom before the bugfix (for that one, see commit 1a06a52ee1b0: \"Fix\nroundup_pow_of_two(1)\").\n\nHowever, unlike the roundup version, the fix for rounddown is to just\nremove the broken special case entirely. It\u0027s simply not needed - the\ngeneric code\n\n 1UL \u003c\u003c ilog2(n)\n\ndoes the right thing for the constant \u00271\u0027 argment too. The only reason\nroundup needed that special case was because rounding up does so by\nsubtracting one from the argument (and then adding one to the result)\ncausing the obvious problems with \"ilog2(0)\".\n\nBut rounddown doesn\u0027t do any of that, since ilog2() naturally truncates\n(ie \"rounds down\") to the right rounded down value. And without the\nilog2(0) case, there\u0027s no reason for the special case that had the wrong\nvalue.\n\ntl;dr: rounddown_pow_of_two(1) should be 1, not 0.\n\nAcked-by: Dmitry Torokhov \u003cdtor@vmware.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "71fe5ccac7ede00526de490a2df10ebcd39c4c11", "tree": "f327328400e51b47d47f6957d010496ff7e308aa", "parents": [ "dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50", "49df78074963c97e25debc3c67b72f059111607d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 12 20:06:13 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 12 20:06:13 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: core: Fix deadlock when the CONFIG_MMC_UNSAFE_RESUME is not defined\n mmc: sdhci-s3c: Remove old and misprototyped suspend operations\n mmc: tmio: fix clock gating on platforms with a .set_pwr() method\n mmc: sh_mmcif: fix clock gating on platforms with a .down_pwr() method\n mmc: core: Fix typo at mmc_card_sleep\n mmc: core: Fix power_off_notify during suspend\n mmc: core: Fix setting power notify state variable for non-eMMC\n mmc: core: Add quirk for long data read time\n mmc: Add module.h include to sdhci-cns3xxx.c\n mmc: mxcmmc: fix falling back to PIO\n mmc: omap_hsmmc: DMA unmap only once in case of MMC error\n" }, { "commit": "90b41a1cd44cc4e507b554ae5a36562a1ba9a4e8", "tree": "4206cd6caab2dcec1d3937d5c0eed04085a153a4", "parents": [ "c7c6575f254e5621a8408c29bdab0d704c3fab6e" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Mon Dec 12 14:30:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:44:48 2011 -0500" }, "message": "netem: add cell concept to simulate special MAC behavior\n\nThis extension can be used to simulate special link layer\ncharacteristics. Simulate because packet data is not modified, only the\ncalculation base is changed to delay a packet based on the original\npacket size and artificial cell information.\n\npacket_overhead can be used to simulate a link layer header compression\nscheme (e.g. set packet_overhead to -20) or with a positive\npacket_overhead value an additional MAC header can be simulated. It is\nalso possible to \"replace\" the 14 byte Ethernet header with something\nelse.\n\ncell_size and cell_overhead can be used to simulate link layer schemes,\nbased on cells, like some TDMA schemes. Another application area are MAC\nschemes using a link layer fragmentation with a (small) header each.\nCell size is the maximum amount of data bytes within one cell. Cell\noverhead is an additional variable to change the per-cell-overhead\n(e.g. 5 byte header per fragment).\n\nExample (5 kbit/s, 20 byte per packet overhead, cell-size 100 byte, per\ncell overhead 5 byte):\n\n tc qdisc add dev eth0 root netem rate 5kbit 20 100 5\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1a4c0b37c296e600ffe08edb0db2dc1b8f550d7", "tree": "5c3675582cbbdc99f720aa1dcc1821e26c2be1ab", "parents": [ "e1aab161e0135aafcd439be20b4f35e4b0922d95" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Sun Dec 11 21:47:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:04:10 2011 -0500" }, "message": "tcp memory pressure controls\n\nThis patch introduces memory pressure controls for the tcp\nprotocol. It uses the generic socket memory pressure code\nintroduced in earlier patches, and fills in the\nnecessary data in cg_proto struct.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujtisu.com\u003e\nCC: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1aab161e0135aafcd439be20b4f35e4b0922d95", "tree": "d0bcdf7a34a34020079238027b431ffc6dece307", "parents": [ "180d8cd942ce336b2c869d324855c40c5db478ad" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Sun Dec 11 21:47:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:04:10 2011 -0500" }, "message": "socket: initial cgroup code.\n\nThe goal of this work is to move the memory pressure tcp\ncontrols to a cgroup, instead of just relying on global\nconditions.\n\nTo avoid excessive overhead in the network fast paths,\nthe code that accounts allocated memory to a cgroup is\nhidden inside a static_branch(). This branch is patched out\nuntil the first non-root cgroup is created. So when nobody\nis using cgroups, even if it is mounted, no significant performance\npenalty should be seen.\n\nThis patch handles the generic part of the code, and has nothing\ntcp-specific.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujtsu.com\u003e\nCC: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2abba4921b945a6f8aca36fcba634c22797ba78", "tree": "77b06167aba97c7400759547fffdb38805ff6bd6", "parents": [ "dfd56b8b38fff3586f36232db58e1e9f7885a605", "b6a27d1e6b8e163dee054c9cd03639c62756c2e2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 12 14:19:43 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 12 14:19:43 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "dfd56b8b38fff3586f36232db58e1e9f7885a605", "tree": "64c7142ebf4625939f68bd3603f1d37bacb20a73", "parents": [ "1ded132d4c3442aa3a619c94c245d7b5e0eb9731" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Dec 10 09:48:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 11 18:25:16 2011 -0500" }, "message": "net: use IS_ENABLED(CONFIG_IPV6)\n\nInstead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6de5fc9cf7de334912de4cfd2d06eb2d744d2afe", "tree": "473198b98663f0e84fc69b70f2fca12dad7f9b9c", "parents": [ "7833c66b2d764a3c883c2f5cc60cd8a6266dae15" ], "author": { "name": "Stefan Nilsson XK", "email": "stefan.xk.nilsson@stericsson.com", "time": "Thu Nov 03 09:44:12 2011 +0100" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sat Dec 10 16:18:35 2011 -0500" }, "message": "mmc: core: Add quirk for long data read time\n\nAdds a quirk that sets the data read timeout to a fixed value instead\nof relying on the information in the CSD. The timeout value chosen\nis 300ms since that has proven enough for the problematic cards found,\nbut could be increased if other cards require this.\n\nThis patch also enables this quirk for certain Micron cards known to\nhave this problem.\n\nSigned-off-by: Stefan Nilsson XK \u003cstefan.xk.nilsson@stericsson.com\u003e\nSigned-off-by: Ulf Hansson \u003culf.hansson@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "1942c518ca017f376b267a7c5e78c15d37202442", "tree": "9ead5443adf15f2264240c928ff2514349fdcade", "parents": [ "3c4d05c8056724aff3abc20650807dd828fded54" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:23:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Generalize inet_diag dump and get_exact calls\n\nIntroduce two callbacks in inet_diag_handler -- one for dumping all\nsockets (with filters) and the other one for dumping a single sk.\n\nReplace direct calls to icsk handlers with indirect calls to callbacks\nprovided by handlers.\n\nMake existing TCP and DCCP handlers use provided helpers for icsk-s.\n\nThe UDP diag module will provide its own.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c4d05c8056724aff3abc20650807dd828fded54", "tree": "5aed510034ceed980de3409587cbce8845229e77", "parents": [ "8d07d1518a074a08b90be02eee5ee15e60ac9779" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:23:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Introduce the inet socket dumping routine\n\nThe existing inet_csk_diag_fill dumps the inet connection sock info\ninto the netlink inet_diag_message. Prepare this routine to be able\nto dump only the inet_sock part of a socket if the icsk part is missing.\n\nThis will be used by UDP diag module when dumping UDP sockets.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d07d1518a074a08b90be02eee5ee15e60ac9779", "tree": "2409c19b8dc9b5cedf4160900e87ea987c2f892a", "parents": [ "efb3cb428dcde2356802b3f93e152efa7abc5a62" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:22:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Introduce the byte-code run on an inet socket\n\nThe upcoming UDP module will require exactly this ability, so just\nmove the existing code to provide one.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b005ab4ef8805dc4604848c9d2ccca9d71f8fc46", "tree": "c0a057c74dae2fbcc3118a69b0ca3ed5504d3029", "parents": [ "87c22ea52e1bb467f58b3e9a71509fccb70c7bd3" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:21:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:08 2011 -0500" }, "message": "inet_diag: Export inet diag cookie checking routine\n\nThe netlink diag susbsys stores sk address bits in the nl message\nas a \"cookie\" and uses one when dumps details about particular\nsocket.\n\nThe same will be required for udp diag module, so introduce a heler\nin inet_diag module\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7b35eadd7eee2e0b42421ce3efbc30f1c3c745e5", "tree": "068ff7b5ba08d957978a63fedad6c2d86af48ed2", "parents": [ "a73ed26bbae7327370c5bd298f07de78df9e3466" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 09 06:21:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 14:14:07 2011 -0500" }, "message": "inet_diag: Remove indirect sizeof from inet diag handlers\n\nThere\u0027s an info_size value stored on inet_diag_handler, but for existing\ncode this value is effectively constant, so just use sizeof(struct tcp_info)\nwhere required.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a73ed26bbae7327370c5bd298f07de78df9e3466", "tree": "3c7a04e638261cdd16c324ecd07e303e72fac3b9", "parents": [ "0221cd51543972782af558c527e4ac58b32049fa" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Dec 09 02:46:45 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 09 13:46:15 2011 -0500" }, "message": "sch_red: generalize accurate MAX_P support to RED/GRED/CHOKE\n\nNow RED uses a Q0.32 number to store max_p (max probability), allow\nRED/GRED/CHOKE to use/report full resolution at config/dump time.\n\nOld tc binaries are non aware of new attributes, and still set/get Plog.\n\nNew tc binary set/get both Plog and max_p for backward compatibility,\nthey display \"probability value\" if they get max_p from new kernels.\n\n# tc -d qdisc show dev ...\n...\nqdisc red 10: parent 1:1 limit 360Kb min 30Kb max 90Kb ecn ewma 5\nprobability 0.09 Scell_log 15\n\nMake sure we avoid potential divides by 0 in reciprocal_value(), if\n(max_th - min_th) is big.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "53523d5263dce1a3e3662c612f7050a4569071ad", "tree": "bc2ec3f77fcead18065c9642f456d9f6f50eb725", "parents": [ "592d44a5f8458892c007c61b9cfa677efede5e1e", "0c90547b4a3fcee184db4d54ffc1a4fb17fd54d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 09 08:08:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 09 08:08:57 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: use new generic {enable,disable}_percpu_irq() routines\n drivers/net/ethernet/tile: use skb_frag_page() API\n asm-generic/unistd.h: support new process_vm_{readv,write} syscalls\n arch/tile: fix double-free bug in homecache_free_pages()\n arch/tile: add a few #includes and an EXPORT to catch up with kernel changes.\n" }, { "commit": "83aeeada7c69f35e5100b27ec354335597a7a488", "tree": "44644e68f303368feba7c8ba3e0e0991d6238ada", "parents": [ "635697c663f38106063d5659f0cf2e45afcd4bb5" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu Dec 08 14:33:54 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 09 07:50:27 2011 -0800" }, "message": "vmscan: use atomic-long for shrinker batching\n\nUse atomic-long operations instead of looping around cmpxchg().\n\n[akpm@linux-foundation.org: massage atomic.h inclusions]\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Dave Chinner \u003cdavid@fromorbit.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8af2a218de38f51ea4b4fa48cac1273319ae260c", "tree": "07a4557322b79878096172355fb02ab2bae3f432", "parents": [ "57459185a19b0246866479522b77cbb9732201d1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Dec 08 06:06:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:43 2011 -0500" }, "message": "sch_red: Adaptative RED AQM\n\nAdaptative RED AQM for linux, based on paper from Sally FLoyd,\nRamakrishna Gummadi, and Scott Shenker, August 2001 :\n\nhttp://icir.org/floyd/papers/adaptiveRed.pdf\n\nGoal of Adaptative RED is to make max_p a dynamic value between 1% and\n50% to reach the target average queue : (max_th - min_th) / 2\n\nEvery 500 ms:\n if (avg \u003e target and max_p \u003c\u003d 0.5)\n increase max_p : max_p +\u003d alpha;\n else if (avg \u003c target and max_p \u003e\u003d 0.01)\n decrease max_p : max_p *\u003d beta;\n\ntarget :[min_th + 0.4*(min_th - max_th),\n min_th + 0.6*(min_th - max_th)].\nalpha : min(0.01, max_p / 4)\nbeta : 0.9\nmax_P is a Q0.32 fixed point number (unsigned, with 32 bits mantissa)\n\nChanges against our RED implementation are :\n\nmax_p is no longer a negative power of two (1/(2^Plog)), but a Q0.32\nfixed point number, to allow full range described in Adatative paper.\n\nTo deliver a random number, we now use a reciprocal divide (thats really\na multiply), but this operation is done once per marked/droped packet\nwhen in RED_BETWEEN_TRESH window, so added cost (compared to previous\nAND operation) is near zero.\n\ndump operation gives current max_p value in a new TCA_RED_MAX_P\nattribute.\n\nExample on a 10Mbit link :\n\ntc qdisc add dev $DEV parent 1:1 handle 10: est 1sec 8sec red \\\n limit 400000 min 30000 max 90000 avpkt 1000 \\\n burst 55 ecn adaptative bandwidth 10Mbit\n\n# tc -s -d qdisc show dev eth3\n...\nqdisc red 10: parent 1:1 limit 400000b min 30000b max 90000b ecn\nadaptative ewma 5 max_p\u003d0.113335 Scell_log 15\n Sent 50414282 bytes 34504 pkt (dropped 35, overlimits 1392 requeues 0)\n rate 9749Kbit 831pps backlog 72056b 16p requeues 0\n marked 1357 early 35 pdrop 0 other 0\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "348a1443cc4303c72cf1ee3b26e476fec8e7b5fa", "tree": "da134720dcdf4ce0cf8ba0f49cd9ee6b5dd0036b", "parents": [ "5b9ea6e022e9ba0fe39cb349ac40361f78d5da5b" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:42 2011 -0500" }, "message": "vlan: introduce functions to do mass addition/deletion of vids by another device\n\nIntroduce functions handy to copy vlan ids from one driver\u0027s list to\nanother.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b9ea6e022e9ba0fe39cb349ac40361f78d5da5b", "tree": "11f0de492ee799fd4174f79ac6aae4c3533beb25", "parents": [ "87002b03baabd2b8f6281ab6411ed88d24958de1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:42 2011 -0500" }, "message": "vlan: introduce vid list with reference counting\n\nThis allows to keep track of vids needed to be in rx vlan filters of\ndevices even if they are used in bond/team etc.\n\nvlan_info as well as vlan_group previously was, is allocated when first\nvid is added and dealocated whan last vid is deleted.\n\nvlan_group definition is moved to private header.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87002b03baabd2b8f6281ab6411ed88d24958de1", "tree": "0e5730c0d1ba887488ba420d4ea89a230f272c51", "parents": [ "8e586137e6b63af1e881b328466ab5ffbe562510" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:42 2011 -0500" }, "message": "net: introduce vlan_vid_[add/del] and use them instead of direct [add/kill]_vid ndo calls\n\nThis patch adds wrapper for ndo_vlan_rx_add_vid/ndo_vlan_rx_kill_vid\nfunctions. Check for NETIF_F_HW_VLAN_FILTER feature is done in this\nwrapper.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e586137e6b63af1e881b328466ab5ffbe562510", "tree": "da0767e1b1361aa24bd32f485453079e31854c0c", "parents": [ "7da82c06ded105bf601bfa0eafc92e84eb0ceeed" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 19:52:37 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:52:37 2011 -0500" }, "message": "net: make vlan ndo_vlan_rx_[add/kill]_vid return error value\n\nLet caller know the result of adding/removing vlan id to/from vlan\nfilter.\n\nIn some drivers I make those functions to just return 0. But in those\nwhere there is able to see if hw setup went correctly, return value is\nset appropriately.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7da82c06ded105bf601bfa0eafc92e84eb0ceeed", "tree": "68d8787014addfab287626fcf36446437df9c7aa", "parents": [ "6626873980475f303367f7b709f4703b571cf854" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Dec 08 04:11:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:51:30 2011 -0500" }, "message": "vlan: rename vlan_dev_info to vlan_dev_priv\n\nAs this structure is priv, name it approprietely. Also for pointer to it\nuse name \"vlan\".\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d", "tree": "4eddd981d5fb92e4570e6f1814a9aa192c5ad3e8", "parents": [ "0052d812599fb0327792b6c3f4257b26dcc13239", "1b04b739f4c1d053bebb29657fb69bf03f180a97" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Thu Dec 08 13:08:10 2011 +0200" }, "committer": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Thu Dec 08 13:08:10 2011 +0200" }, "message": "Merge branch \u0027wl12xx-next\u0027 into for-linville\n" }, { "commit": "3172f8fe1ca1d432b196efad453c0ceb89302075", "tree": "0b9e8af7ea9ee9883ff1a834357694254200335a", "parents": [ "b835c0f47f725d864bf2545f10c733b754bb6d51", "02125a826459a6ad142f8d91c5b6357562f96615" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 07 08:14:42 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 07 08:14:42 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API\n" }, { "commit": "02125a826459a6ad142f8d91c5b6357562f96615", "tree": "8c9d9860aef93917d9b8cc6d471fe68b58ce7a9d", "parents": [ "5611cc4572e889b62a7b4c72a413536bf6a9c416" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Dec 05 08:43:34 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Dec 06 23:57:18 2011 -0500" }, "message": "fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API\n\n__d_path() API is asking for trouble and in case of apparmor d_namespace_path()\ngetting just that. The root cause is that when __d_path() misses the root\nit had been told to look for, it stores the location of the most remote ancestor\nin *root. Without grabbing references. Sure, at the moment of call it had\nbeen pinned down by what we have in *path. And if we raced with umount -l, we\ncould have very well stopped at vfsmount/dentry that got freed as soon as\nprepend_path() dropped vfsmount_lock.\n\nIt is safe to compare these pointers with pre-existing (and known to be still\nalive) vfsmount and dentry, as long as all we are asking is \"is it the same\naddress?\". Dereferencing is not safe and apparmor ended up stepping into\nthat. d_namespace_path() really wants to examine the place where we stopped,\neven if it\u0027s not connected to our namespace. As the result, it looked\nat -\u003ed_sb-\u003es_magic of a dentry that might\u0027ve been already freed by that point.\nAll other callers had been careful enough to avoid that, but it\u0027s really\na bad interface - it invites that kind of trouble.\n\nThe fix is fairly straightforward, even though it\u0027s bigger than I\u0027d like:\n\t* prepend_path() root argument becomes const.\n\t* __d_path() is never called with NULL/NULL root. It was a kludge\nto start with. Instead, we have an explicit function - d_absolute_root().\nSame as __d_path(), except that it doesn\u0027t get root passed and stops where\nit stops. apparmor and tomoyo are using it.\n\t* __d_path() returns NULL on path outside of root. The main\ncaller is show_mountinfo() and that\u0027s precisely what we pass root for - to\nskip those outside chroot jail. Those who don\u0027t want that can (and do)\nuse d_path().\n\t* __d_path() root argument becomes const. Everyone agrees, I hope.\n\t* apparmor does *NOT* try to use __d_path() or any of its variants\nwhen it sees that path-\u003emnt is an internal vfsmount. In that case it\u0027s\ndefinitely not mounted anywhere and dentry_path() is exactly what we want\nthere. Handling of sysctl()-triggered weirdness is moved to that place.\n\t* if apparmor is asked to do pathname relative to chroot jail\nand __d_path() tells it we it\u0027s not in that jail, the sucker just calls\nd_absolute_path() instead. That\u0027s the other remaining caller of __d_path(),\nBTW.\n * seq_path_root() does _NOT_ return -ENAMETOOLONG (it\u0027s stupid anyway -\nthe normal seq_file logics will take care of growing the buffer and redoing\nthe call of -\u003eshow() just fine). However, if it gets path not reachable\nfrom root, it returns SEQ_SKIP. The only caller adjusted (i.e. stopped\nignoring the return value as it used to do).\n\nReviewed-by: John Johansen \u003cjohn.johansen@canonical.com\u003e\nACKed-by: John Johansen \u003cjohn.johansen@canonical.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "959327c7842e8621e28b89acea7d57ff02b60972", "tree": "b00de195fa401186228796abdcd16812862fbf4d", "parents": [ "f84ea779c25dabc90956f1c329e5e5c501ea96cc", "b835c0f47f725d864bf2545f10c733b754bb6d51" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 21:10:05 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 21:10:05 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "3df6eaea76a9e1351b539541c0314129a0e4b10c", "tree": "d5dcdafdcf236e3293eeca39db9715292389e88b", "parents": [ "aa5b549215f85cf48a7040bc9d33c4dae0c7d11a" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Dec 06 10:39:40 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 06 16:07:07 2011 -0500" }, "message": "mac80211: accept public action frames with mismatched BSSID\n\nArik\u0027s patch \"mac80211: allow action frames with unknown\nBSSID in GO mode\" allowed any action frames in P2P mode\nto go through, but only to cooked monitor interfaces as\nthe IEEE80211_RX_RA_MATCH was still cleared. As a result\nmy no-monitor patches broke invitation responses.\n\nInstead of allowing any action frames in P2P GO mode to\ngo through with a wrong BSSID like that patch did, allow\nall public action frames. They will never be processed\nby mac80211, but can be reported via nl80211 then.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "54858ee5bf659f80a784303e41ee8898fd163f98", "tree": "46901bbd75f8dacfe9677e8d17085508d918d325", "parents": [ "2b50b8f58803f4c8521c6aa5401ed01cd36a1f77" ], "author": { "name": "Alexander Simon", "email": "an.alexsimon@googlemail.com", "time": "Wed Nov 30 16:56:32 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 06 16:05:24 2011 -0500" }, "message": "nl80211: Parse channel type attribute in an ibss join request\n\nPrepare cfg80211 for IBSS HT:\n * extend cfg80211 ibss struct with channel_type\n * Check if extension channel can be used\n * Export can_beacon_sec_chan for use in mac80211 (will be called\n from ibss.c later).\n\nSigned-off-by: Alexander Simon \u003can.alexsimon@googlemail.com\u003e\n[siwu@hrz.tu-chemnitz.de: Updates]\n* fix cfg80211_can_beacon_ext_chan comment\n* remove implicit channel_type enum assumptions\n* remove radar channel flags check\n* add HT IBSS feature flag\n* reword commit message\n\nSigned-off-by: Simon Wunderlich \u003csiwu@hrz.tu-chemnitz.de\u003e\nSigned-off-by: Mathias Kretschmer \u003cmathias.kretschmer@fokus.fraunhofer.de\u003e\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "091c0f86bad6bb0b003dff2f6195508e29548648", "tree": "d04ef2b42ae456c2f281728413405c2e6af34880", "parents": [ "4fb1db334aa2569281481a09840650e7be28161d", "ddf6e0e50723b62ac76ed18eb53e9417c6eefba7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 06 11:54:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 06 11:54:33 2011 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n ftrace: Fix hash record accounting bug\n perf: Fix parsing of __print_flags() in TP_printk()\n jump_label: jump_label_inc may return before the code is patched\n ftrace: Remove force undef config value left for testing\n tracing: Restore system filter behavior\n tracing: fix event_subsystem ref counting\n" }, { "commit": "126fdc3249c9ced2a0d20f916858fec26a445f61", "tree": "3472fb17cbe27014ee45c70535dc96ad7ae28195", "parents": [ "d366477a52f1df29fa066ffb18e4e6101ee2ad04" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:58:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:58:01 2011 -0500" }, "message": "inet_diag: Introduce new inet_diag_req header\n\nThis one coinsides with the sock_diag_req in the beginning and\ncontains only used fields from its previous analogue.\n\nThe existing code is patched to use the _compat version of it\nfor now.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d366477a52f1df29fa066ffb18e4e6101ee2ad04", "tree": "267a65f626108423f73ef6dc0040b3b3171f7b45", "parents": [ "f13c95f0e255e6d21762259875295cc212e6bc32" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:58:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:58:01 2011 -0500" }, "message": "sock_diag: Initial skeleton\n\nWhen receiving the SOCK_DIAG_BY_FAMILY message we have to find the\nhandler for provided family and pass the nl message to it.\n\nThis patch describes an infrastructure to work with such nandlers\nand implements stubs for AF_INET(6) ones.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d34172dfdb762a306cdf58b547aa10d798622ec", "tree": "5ad5bbd9117ea444eb06b0519c61f77576818d79", "parents": [ "7f1fb60c4fc9fb29fbb406ac8c4cfb4e59e168d6" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:57:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:58:01 2011 -0500" }, "message": "sock_diag: Introduce new message type\n\nThis type will run the family+protocol based socket dumping.\nAlso prepare the stub function for it.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f1fb60c4fc9fb29fbb406ac8c4cfb4e59e168d6", "tree": "c099fd6899f382c439e29aed54c912ee95453324", "parents": [ "d5f43c1ea4260807a894150b680fa0a0dd386259" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Dec 06 07:56:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 06 13:57:36 2011 -0500" }, "message": "inet_diag: Partly rename inet_ to sock_\n\nThe ultimate goal is to get the sock_diag module, that works in\nfamily+protocol terms. Currently this is suitable to do on the\ninet_diag basis, so rename parts of the code. It will be moved\nto sock_diag.c later.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d39aeaf260e7d1ec6a677beed230a0406d0069a6", "tree": "1f5881fc037eaf55e83d56b09cfb194274419ce4", "parents": [ "40e4783ee62ac656a9a0fa3b512b6aee4f07d2d1", "d7a4858c0fde8383f7aa494eda0fba6bef3f2fec" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 06 10:47:12 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 06 10:47:12 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "45e713efe2fa574b6662e7fb63fae9497c5e03d4", "tree": "c22ff1bcc6641c8f950a2ffa257649794238ee35", "parents": [ "232ea344550c4a099d35d9df552509d6748a31c0", "61ed26e388ac67da262bb1a95d0474e4cabd4b0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:15 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:15 2011 -0800" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n intr_remapping: Fix section mismatch in ir_dev_scope_init()\n intel-iommu: Fix section mismatch in dmar_parse_rmrr_atsr_dev()\n x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions\n x86, AMD: Correct align_va_addr documentation\n x86/rtc, mrst: Don\u0027t register a platform RTC device for for Intel MID platforms\n x86/mrst: Battery fixes\n x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode\n x86: Fix \"Acer Aspire 1\" reboot hang\n x86/mtrr: Resolve inconsistency with Intel processor manual\n x86: Document rdmsr_safe restrictions\n x86, microcode: Fix the failure path of microcode update driver init code\n Add TAINT_FIRMWARE_WORKAROUND on MTRR fixup\n x86/mpparse: Account for bus types other than ISA and PCI\n x86, mrst: Change the pmic_gpio device type to IPC\n mrst: Added some platform data for the SFI translations\n x86,mrst: Power control commands update\n x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot\n x86, UV: Fix UV2 hub part number\n x86: Add user_mode_vm check in stack_overflow_check\n" }, { "commit": "232ea344550c4a099d35d9df552509d6748a31c0", "tree": "2b4a1c351d290537fdf18cc5bed78bf43536f175", "parents": [ "40c043b077c6e377c8440d71563c055d0c4f0f0a", "dc440d10e1668b15fe704a23adb9b53fbbb24a44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:00 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:54:00 2011 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf: Fix loss of notification with multi-event\n perf, x86: Force IBS LVT offset assignment for family 10h\n perf, x86: Disable PEBS on SandyBridge chips\n trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call-\u003efilter\n perf session: Fix crash with invalid CPU list\n perf python: Fix undefined symbol problem\n perf/x86: Enable raw event access to Intel offcore events\n perf: Don\u0027t use -ENOSPC for out of PMU resources\n perf: Do not set task_ctx pointer in cpuctx if there are no events in the context\n perf/x86: Fix PEBS instruction unwind\n oprofile, x86: Fix crash when unloading module (nmi timer mode)\n oprofile: Fix crash when unloading module (hr timer mode)\n" }, { "commit": "7125faceabe43067293d0c9e2ef7154ecea51721", "tree": "9de559e9280843d02d9a70976fbad23428161189", "parents": [ "35337c834124d2893b7fe4ba683c7639e6c37e0c", "4cecf6d401a01d054afc1e5f605bcbfe553cb9b9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:50:24 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:50:24 2011 -0800" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched, x86: Avoid unnecessary overflow in sched_clock\n sched: Fix buglet in return_cfs_rq_runtime()\n sched: Avoid SMT siblings in select_idle_sibling() if possible\n sched: Set the command name of the idle tasks in SMP kernels\n sched, rt: Provide means of disabling cross-cpu bandwidth sharing\n sched: Document wait_for_completion_*() return values\n sched_fair: Fix a typo in the comment describing update_sd_lb_stats\n sched: Add a comment to effective_load() since it\u0027s a pain\n" }, { "commit": "63afe12f4be3b08597ae41ce7c0837bfc106b0ac", "tree": "c434034afbb125f4cd65b22777ded6c0fd359d70", "parents": [ "5d91c2d00a0fc10448f49b52b344e5619b99765a" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sun Dec 04 11:22:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 05 18:27:56 2011 -0500" }, "message": "if_ether.h: Add IEEE 802.1 Local Experimental Ethertype 1.\n\nAdd EthType 0x88b5.\nThis Ethertype value is available for public use for prototype and\nvendor-specific protocol development,as defined in Amendment 802a\nto IEEE Std 802.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27b14b56af081ec7edeefb3a38b2c9577cc5ef48", "tree": "841e01c8d64fdf08b88c8a76de3272b4630ed145", "parents": [ "cb59974742aea24adf6637eb0c4b8e7b48bca6fb" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Tue Nov 01 09:09:35 2011 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Dec 05 13:28:45 2011 -0500" }, "message": "tracing: Restore system filter behavior\n\nThough not all events have field \u0027prev_pid\u0027, it was allowed to do this:\n\n # echo \u0027prev_pid \u003d\u003d 100\u0027 \u003e events/sched/filter\n\nbut commit 75b8e98263fdb0bfbdeba60d4db463259f1fe8a2 (tracing/filter: Swap\nentire filter of events) broke it without any reason.\n\nLink: http://lkml.kernel.org/r/4EAF46CF.8040408@cn.fujitsu.com\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "f62ef5f3e9cff065aa845e2b7f487e1810b8e57e", "tree": "a519167c3e222ff162c66f5ace104a54562732de", "parents": [ "8360ee2f74bda2b794bdf4e23ab19d8b4e93807f" ], "author": { "name": "Andreas Herrmann", "email": "andreas.herrmann3@amd.com", "time": "Fri Dec 02 08:21:43 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 05 18:13:11 2011 +0100" }, "message": "x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions\n\nI\u0027ve received complaints that the numa_node attribute for family\n15h model 00-0fh (e.g. Interlagos) northbridge functions shows\n-1 instead of the proper node ID.\n\nCorrect this with attached quirks (similar to quirks for other\nAMD CPU families used in multi-socket systems).\n\nSigned-off-by: Andreas Herrmann \u003candreas.herrmann3@amd.com\u003e\nCc: Frank Arnold \u003cfrank.arnold@amd.com\u003e\nCc: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nLink: http://lkml.kernel.org/r/20111202072143.GA31916@alberich.amd.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "10c6db110d0eb4466b59812c49088ab56218fc2e", "tree": "d1d4e8debcf7415df49ce691b4c3da7443919f11", "parents": [ "16e5294e5f8303756a179cf218e37dfb9ed34417" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Sat Nov 26 02:47:31 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 05 09:33:03 2011 +0100" }, "message": "perf: Fix loss of notification with multi-event\n\nWhen you do:\n $ perf record -e cycles,cycles,cycles noploop 10\n\nYou expect about 10,000 samples for each event, i.e., 10s at\n1000samples/sec. However, this is not what\u0027s happening. You\nget much fewer samples, maybe 3700 samples/event:\n\n$ perf report -D | tail -15\nAggregated stats:\n TOTAL events: 10998\n MMAP events: 66\n COMM events: 2\n SAMPLE events: 10930\ncycles stats:\n TOTAL events: 3644\n SAMPLE events: 3644\ncycles stats:\n TOTAL events: 3642\n SAMPLE events: 3642\ncycles stats:\n TOTAL events: 3644\n SAMPLE events: 3644\n\nOn a Intel Nehalem or even AMD64, there are 4 counters capable\nof measuring cycles, so there is plenty of space to measure those\nevents without multiplexing (even with the NMI watchdog active).\nAnd even with multiplexing, we\u0027d expect roughly the same number\nof samples per event.\n\nThe root of the problem was that when the event that caused the buffer\nto become full was not the first event passed on the cmdline, the user\nnotification would get lost. The notification was sent to the file\ndescriptor of the overflowed event but the perf tool was not polling\non it. The perf tool aggregates all samples into a single buffer,\ni.e., the buffer of the first event. Consequently, it assumes\nnotifications for any event will come via that descriptor.\n\nThe seemingly straight forward solution of moving the waitq into the\nringbuffer object doesn\u0027t work because of life-time issues. One could\nperf_event_set_output() on a fd that you\u0027re also blocking on and cause\nthe old rb object to be freed while its waitq would still be\nreferenced by the blocked thread -\u003e FAIL.\n\nTherefore link all events to the ringbuffer and broadcast the wakeup\nfrom the ringbuffer object to all possible events that could be waited\nupon. This is rather ugly, and we\u0027re open to better solutions but it\nworks for now.\n\nReported-by: Stephane Eranian \u003ceranian@google.com\u003e\nFinished-by: Stephane Eranian \u003ceranian@google.com\u003e\nReviewed-by: Stephane Eranian \u003ceranian@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20111126014731.GA7030@quad\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8f97339d3feb662037b86a925e692017c0b32323", "tree": "5e8b9f9fbad5ece09154bca4fd04dda83f49f015", "parents": [ "6fc01438a94702bd160cb1b89203d9b97ae68ced" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jul 04 22:48:10 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Dec 04 22:43:37 2011 +0100" }, "message": "netfilter: add ipv4 reverse path filter match\n\nThis tries to do the same thing as fib_validate_source(), but differs\nin several aspects.\n\nThe most important difference is that the reverse path filter built into\nfib_validate_source uses the oif as iif when performing the reverse\nlookup. We do not do this, as the oif is not yet known by the time the\nPREROUTING hook is invoked.\n\nWe can\u0027t wait until FORWARD chain because by the time FORWARD is invoked\nipv4 forward path may have already sent icmp messages is response\nto to-be-discarded-via-rpfilter packets.\n\nTo avoid the such an additional lookup in PREROUTING, Patrick McHardy\nsuggested to attach the path information directly in the match\n(i.e., just do what the standard ipv4 path does a bit earlier in PREROUTING).\n\nThis works, but it also has a few caveats. Most importantly, when using\nmarks in PREROUTING to re-route traffic based on the nfmark, -m rpfilter\nwould have to be used after the nfmark has been set; otherwise the nfmark\nwould have no effect (because the route is already attached).\n\nAnother problem would be interaction with -j TPROXY, as this target sets an\nnfmark and uses ACCEPT instead of continue, i.e. such a version of\n-m rpfilter cannot be used for the initial to-be-intercepted packets.\n\nIn case in turns out that the oif is required, we can add Patricks\nsuggestion with a new match option (e.g. --rpf-use-oif) to keep ruleset\ncompatibility.\n\nAnother difference to current builtin ipv4 rpfilter is that packets subject to ipsec\ntransformation are not automatically excluded. If you want this, simply\ncombine -m rpfilter with the policy match.\n\nPackets arriving on loopback interfaces always match.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "117632e64d2a5f464e491fe221d7169a3814a77b", "tree": "88f3a036305da54a62835d900553dda9bc846a8f", "parents": [ "c2e4e25afcc8ae1835a6100089f1f9fd3a362430" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Dec 03 21:39:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 04 13:20:39 2011 -0500" }, "message": "tcp: take care of misalignments\n\nWe discovered that TCP stack could retransmit misaligned skbs if a\nmalicious peer acknowledged sub MSS frame. This currently can happen\nonly if output interface is non SG enabled : If SG is enabled, tcp\nbuilds headless skbs (all payload is included in fragments), so the tcp\ntrimming process only removes parts of skb fragments, header stay\naligned.\n\nSome arches cant handle misalignments, so force a head reallocation and\nshrink headroom to MAX_TCP_HEADER.\n\nDont care about misaligments on x86 and PPC (or other arches setting\nNET_IP_ALIGN to 0)\n\nThis patch introduces __pskb_copy() which can specify the headroom of\nnew head, and pskb_copy() becomes a wrapper on top of __pskb_copy()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a67ba43d30bf8c1cfdc2615439455302d2408453", "tree": "5f8e653549c3c5ab7a92dd2aa6196cd57c9b954a", "parents": [ "c2851a9b1caa420c2cdbd517617166990e3723c0" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Thu Dec 01 12:54:31 2011 -0500" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sat Dec 03 15:31:48 2011 -0500" }, "message": "asm-generic/unistd.h: support new process_vm_{readv,write} syscalls\n\nAlso prototype the \"compat\" functions so they can be referenced\nfrom C code.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ccb1352e76cff0524e7ccb2074826a092dd13016", "tree": "9122ceff5d75ec64e327a9fad4ad2013744c2999", "parents": [ "75f2811c6460ccc59d83c66059943ce9c9f81a18" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Tue Oct 25 19:26:31 2011 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:17 2011 -0800" }, "message": "net: Add Open vSwitch kernel components.\n\nOpen vSwitch is a multilayer Ethernet switch targeted at virtualized\nenvironments. In addition to supporting a variety of features\nexpected in a traditional hardware switch, it enables fine-grained\nprogrammatic extension and flow-based control of the network.\nThis control is useful in a wide variety of applications but is\nparticularly important in multi-server virtualization deployments,\nwhich are often characterized by highly dynamic endpoints and the need\nto maintain logical abstractions for multiple tenants.\n\nThe Open vSwitch datapath provides an in-kernel fast path for packet\nforwarding. It is complemented by a userspace daemon, ovs-vswitchd,\nwhich is able to accept configuration from a variety of sources and\ntranslate it into packet processing rules.\n\nSee http://openvswitch.org for more information and userspace\nutilities.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "396cf9430505cfba529a2f2a037d782719fa5844", "tree": "d628b40d09c5e608d1bd41ac14f64774c8fddf10", "parents": [ "b4e16611c4e1cd98765269c8fdaf43f96baa57b1" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Fri Nov 18 13:15:54 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:09 2011 -0800" }, "message": "vlan: Move vlan_set_encap_proto() to vlan header file\n\nOpen vSwitch needs this function for vlan handling.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "b4e16611c4e1cd98765269c8fdaf43f96baa57b1", "tree": "3ca0f230d24748d51726c7e5bb392529a8d65009", "parents": [ "86b1309c7e411b7c25dc0dc7a092582a4d291044" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Nov 19 16:21:37 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:08 2011 -0800" }, "message": "genetlink: Add rcu_dereference_genl and genl_dereference.\n\nThis adds rcu_dereference_genl and genl_dereference, which are genl\nvariants of the RTNL functions to enforce proper locking with lockdep\nand sparse.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "86b1309c7e411b7c25dc0dc7a092582a4d291044", "tree": "b2557cbe0441d1d762e87a56e105bff6581c13e9", "parents": [ "263ba61d3b19508dfb003c215ec5d23f882b4f87" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Thu Nov 10 19:14:51 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:07 2011 -0800" }, "message": "genetlink: Add lockdep_genl_is_held().\n\nOpen vSwitch uses genl_mutex locking to protect datapath\ndata-structures like flow-table, flow-actions. Following patch adds\nlockdep_genl_is_held() which is used for rcu annotation to prove\nlocking.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "b3613118eb30a589d971e4eccbbb2a1314f5dfd4", "tree": "868c1ee59e1b5c19a4f2e43716400d0001a994e5", "parents": [ "7505afe28c16a8d386624930a018d0052c75d687", "5983fe2b29df5885880d7fa3b91aca306c7564ef" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "0efebaa72d3b8cf377c45930c78e1a0969d6355a", "tree": "d2ca6e400a32d502160b4dc0678d57805f6e9ae7", "parents": [ "5983fe2b29df5885880d7fa3b91aca306c7564ef", "cf54d47c13c2b171f946289de445102c676d4258" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 02 08:10:51 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 02 08:10:51 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Fix S3/S4 problem on machines with VREF-pin mute-LED\n ALSA: hda_intel - revert a quirk that affect VIA chipsets\n ALSA: hda - Avoid touching mute-VREF pin for IDT codecs\n firmware: Sigma: Fix endianess issues\n firmware: Sigma: Skip header during CRC generation\n firmware: Sigma: Prevent out of bounds memory access\n ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer\n ASoC: Supply dcs_codes for newer WM1811 revisions\n ASoC: Error out if we can\u0027t generate a LRCLK at all for WM8994\n ASoC: Correct name of Speyside Main Speaker widget\n ASoC: skip resume of soc-audio devices without codecs\n ASoC: cs42l51: Fix off-by-one for reg_cache_size\n ASoC: drop support for PlayPaq with WM8510\n ASoC: mpc8610: tell the CS4270 codec that it\u0027s the master\n ASoC: cs4720: use snd_soc_cache_sync()\n ASoC: SAMSUNG: Fix build error\n ASoC: max9877: Update register if either val or val2 is changed\n ASoC: Fix wrong define for AD1836_ADC_WORD_OFFSET\n" }, { "commit": "5983fe2b29df5885880d7fa3b91aca306c7564ef", "tree": "c9d968a776b7d1f8dc446d2857f6cefddec6edb0", "parents": [ "5611cc4572e889b62a7b4c72a413536bf6a9c416", "3ced1be5490f5c415d51a1e5918beeb9239d546b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 01 20:09:08 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 01 20:09:08 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (73 commits)\n netfilter: Remove ADVANCED dependency from NF_CONNTRACK_NETBIOS_NS\n ipv4: flush route cache after change accept_local\n sch_red: fix red_change\n Revert \"udp: remove redundant variable\"\n bridge: master device stuck in no-carrier state forever when in user-stp mode\n ipv4: Perform peer validation on cached route lookup.\n net/core: fix rollback handler in register_netdevice_notifier\n sch_red: fix red_calc_qavg_from_idle_time\n bonding: only use primary address for ARP\n ipv4: fix lockdep splat in rt_cache_seq_show\n sch_teql: fix lockdep splat\n net: fec: Select the FEC driver by default for i.MX SoCs\n isdn: avoid copying too long drvid\n isdn: make sure strings are null terminated\n netlabel: Fix build problems when IPv6 is not enabled\n sctp: better integer overflow check in sctp_auth_create_key()\n sctp: integer overflow in sctp_auth_create_key()\n ipv6: Set mcast_hops to IPV6_DEFAULT_MCASTHOPS when -1 was given.\n net: Fix corruption in /proc/*/net/dev_mcast\n mac80211: fix race between the AGG SM and the Tx data path\n ...\n" }, { "commit": "65698610f58153eb7621be3fb4f57ca318b19c60", "tree": "0a75e810c5b2572a82d9b7c6ce5e68d3629431c9", "parents": [ "84f9307c5da84a7c8513e7607dc8427d2cbd63e3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 14:16:04 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 14:16:04 2011 -0500" }, "message": "net: Make ndo_neigh_destroy return void.\n\nThe return value isn\u0027t used.\n\nSuggested by Ben Hucthings.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a367c3a82557cd11a04949ef2160658987fa772", "tree": "bec35118af9683ded1f4a8430fa66a9d63d78ed7", "parents": [ "d7d75960ea74e524d75ba8b067523471f39a7bf3" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 30 23:41:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 13:09:31 2011 -0500" }, "message": "can: cc770: add driver core for the Bosch CC770 and Intel AN82527\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e4da3fbfbd1de56d2367653e3823e6445e49f8a9", "tree": "f69f424f731b89a75f881967903ff2f38f4b6a92", "parents": [ "b693289406f0b8ca70ab77e745be6196d5740eb0", "ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Thu Dec 01 12:14:48 2011 +0200" }, "committer": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Thu Dec 01 12:14:48 2011 +0200" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next\n" } ], "next": "7bc0f28c7a0cd19f40e5a6e4d0a117db9a4e4cd5" }