)]}' { "log": [ { "commit": "2721745501a26d0dc3b88c0d2f3aa11471891388", "tree": "e9c09622b11ad7d9317b4b01824374a852867c28", "parents": [ "761965eab38d2cbc59c36e355c59609e3a04705a" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 16:52:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 05 15:20:19 2011 -0500" }, "message": "net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.\n\nTo reflect the fact that a refrence is not obtained to the\nresulting neighbour entry.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Roland Dreier \u003croland@purestorage.com\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": "78a8a36fe0b2cee5a0a7360107815cbcad5b4003", "tree": "1abf45fa898ed4e31a131328b0e182f29a72300a", "parents": [ "04a6f4417bfd17c3860e8fb37387cb78265ffe44", "ccb1352e76cff0524e7ccb2074826a092dd13016" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 03 22:53:31 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 03 22:53:31 2011 -0500" }, "message": "Merge branch \u0027for-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch\n" }, { "commit": "04a6f4417bfd17c3860e8fb37387cb78265ffe44", "tree": "510ac1d7b69dc5ebcc0ab53130442274f70e3652", "parents": [ "3830847396fa6d7f9a5fec0ca9819c47ac8a64e8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 03 18:29:30 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 03 18:29:30 2011 -0500" }, "message": "ipv6: Kill ndisc_get_neigh() inline helper.\n\nIt\u0027s only used in net/ipv6/route.c and the NULL device check is\nsuperfluous for all of the existing call sites.\n\nJust expand the __ndisc_lookup_errno() call at each location.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "75f2811c6460ccc59d83c66059943ce9c9f81a18", "tree": "49373cf5f5b11358aeb587209ad270496f751609", "parents": [ "396cf9430505cfba529a2f2a037d782719fa5844" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Nov 30 17:05:51 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:10 2011 -0800" }, "message": "ipv6: Add fragment reporting to ipv6_skip_exthdr().\n\nWhile parsing through IPv6 extension headers, fragment headers are\nskipped making them invisible to the caller. This reports the\nfragment offset of the last header in order to make it possible to\ndetermine whether the packet is fragmented and, if so whether it is\na first or last fragment.\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": "263ba61d3b19508dfb003c215ec5d23f882b4f87", "tree": "1f00fe8aeaff938b6e6706d145f761c5990fc28e", "parents": [ "340e8dc1fb4032b6c8334c9bff20b2aec42ecfd8" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Thu Nov 10 19:14:37 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:05 2011 -0800" }, "message": "genetlink: Add genl_notify()\n\nOpen vSwitch uses Generic Netlink interface for communication\nbetween userspace and kernel module. genl_notify() is used\nfor sending notification back to userspace.\n\ngenl_notify() is analogous to rtnl_notify() but uses genl_sock\ninstead of rtnl.\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": "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": "84f9307c5da84a7c8513e7607dc8427d2cbd63e3", "tree": "f34fb0525284d97e2b10870afd8e021cc45ef44c", "parents": [ "898f73585bbe4bdbb471636ecdede071f7473e51" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Nov 30 19:00:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 13:28:54 2011 -0500" }, "message": "ipv4: use a 64bit load/store in output path\n\ngcc compiler is smart enough to use a single load/store if we\nmemcpy(dptr, sptr, 8) on x86_64, regardless of\nCONFIG_CC_OPTIMIZE_FOR_SIZE\n\nIn IP header, daddr immediately follows saddr, this wont change in the\nfuture. We only need to make sure our flowi4 (saddr,daddr) fields wont\nbreak the rule.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\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": "ea1f51beff4ddd0234c59a125290aeb355cf62b2", "tree": "c8e891e261fe9a7477e11c825947feae828f6279", "parents": [ "fc33cc72423ed3474cd51bc8bd7c1cdc22a78e1a" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Nov 30 22:07:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 11:41:06 2011 -0500" }, "message": "dsa: Include linux/if_ether.h to fix build error\n\nInclude linux/if_ether.h to fix below build errors:\n\n CC arch/arm/mach-kirkwood/common.o\nIn file included from arch/arm/mach-kirkwood/common.c:19:\ninclude/net/dsa.h: In function \u0027dsa_uses_dsa_tags\u0027:\ninclude/net/dsa.h:192: error: \u0027ETH_P_DSA\u0027 undeclared (first use in this function)\ninclude/net/dsa.h:192: error: (Each undeclared identifier is reported only once\ninclude/net/dsa.h:192: error: for each function it appears in.)\ninclude/net/dsa.h: In function \u0027dsa_uses_trailer_tags\u0027:\ninclude/net/dsa.h:197: error: \u0027ETH_P_TRAILER\u0027 undeclared (first use in this function)\nmake[1]: *** [arch/arm/mach-kirkwood/common.o] Error 1\nmake: *** [arch/arm/mach-kirkwood] Error 2\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8aa953d03eea1190fdde03089947bba09e5399fe", "tree": "d82df2f70b5c4e2934e6adb35ac9867e877dbc53", "parents": [ "e977b4cf637ebb545db14bff76d590490b2fb4bf" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Wed Nov 30 13:02:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 23:30:48 2011 -0500" }, "message": "caif: Remove unused attributes from struct cflayer\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e977b4cf637ebb545db14bff76d590490b2fb4bf", "tree": "97be37eb44c04150cfc521ebbf6f88a5b0ea9efb", "parents": [ "7c18d2205ea76eef9674e59e1ecae4f332a53e9e" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Wed Nov 30 09:22:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 23:30:48 2011 -0500" }, "message": "caif: Remove unused enum and parameter in cfserl\n\nRemove unused enum cfcnfg_phy_type and the parameter to cfserl_create.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c18d2205ea76eef9674e59e1ecae4f332a53e9e", "tree": "2d6ed4be50e52408b8806ca67f0bd6fb15362efa", "parents": [ "200c5a3b387c415e49639ee0f6de37804522b745" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Wed Nov 30 09:22:47 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 23:30:48 2011 -0500" }, "message": "caif: Restructure how link caif link layer enroll\n\nEnrolling CAIF link layers are refactored.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea6a5d3b97b768561db6358f15e4c84ced0f4f7e", "tree": "9f9e41800756d04c0edbfdeb8d8e35fb2273b6fd", "parents": [ "917fbdb32f37e9a93b00bb12ee83532982982df3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Nov 30 12:10:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 23:27:22 2011 -0500" }, "message": "sch_red: fix red_calc_qavg_from_idle_time\n\nSince commit a4a710c4a7490587 (pkt_sched: Change PSCHED_SHIFT from 10 to\n6) it seems RED/GRED are broken.\n\nred_calc_qavg_from_idle_time() computes a delay in us units, but this\ndelay is now 16 times bigger than real delay, so the final qavg result\nsmaller than expected.\n\nUse standard kernel time services since there is no need to obfuscate\nthem.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7bc0f28c7a0cd19f40e5a6e4d0a117db9a4e4cd5", "tree": "4cdbf530b8ed94f73907327dd21f8303085cfc09", "parents": [ "99d2f47aa9d3ad40daa6ee0770e91b95b71082f0" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Wed Nov 30 12:20:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@drr.davemloft.net", "time": "Wed Nov 30 23:18:35 2011 -0500" }, "message": "netem: rate extension\n\nCurrently netem is not in the ability to emulate channel bandwidth. Only static\ndelay (and optional random jitter) can be configured.\n\nTo emulate the channel rate the token bucket filter (sch_tbf) can be used. But\nTBF has some major emulation flaws. The buffer (token bucket depth/rate) cannot\nbe 0. Also the idea behind TBF is that the credit (token in buckets) fills if\nno packet is transmitted. So that there is always a \"positive\" credit for new\npackets. In real life this behavior contradicts the law of nature where\nnothing can travel faster as speed of light. E.g.: on an emulated 1000 byte/s\nlink a small IPv4/TCP SYN packet with ~50 byte require ~0.05 seconds - not 0\nseconds.\n\nNetem is an excellent place to implement a rate limiting feature: static\ndelay is already implemented, tfifo already has time information and the\nuser can skip TBF configuration completely.\n\nThis patch implement rate feature which can be configured via tc. e.g:\n\n\ttc qdisc add dev eth0 root netem rate 10kbit\n\nTo emulate a link of 5000byte/s and add an additional static delay of 10ms:\n\n\ttc qdisc add dev eth0 root netem delay 10ms rate 5KBps\n\nNote: similar to TBF the rate extension is bounded to the kernel timing\nsystem. Depending on the architecture timer granularity, higher rates (e.g.\n10mbit/s and higher) tend to transmission bursts. Also note: further queues\nliving in network adaptors; see ethtool(8).\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@drr.davemloft.net\u003e\n" }, { "commit": "cd5b49bce361caeb7488f5fa801326bcd799f6f2", "tree": "37063123bc28d0de6d8639be6d11273b6f792675", "parents": [ "8cd7920370a3715ccbd1c98bf33f172b8837dc0b", "98014be39bda8277a5ad130bb274ed6eb18b74df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 30 16:23:59 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 30 16:23:59 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)\n ARM: ux500: update defconfig\n ARM: u300: update defconfig\n ARM: at91: enable additional boards in existing soc defconfig files\n ARM: at91: refresh soc defconfig files for 3.2\n ARM: at91: rename defconfig files appropriately\n ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as module\n ARM: OMAP2+: Remove empty io.h\n ARM: OMAP2: select ARM_AMBA if OMAP3_EMU is defined\n ARM: OMAP: smartreflex: fix IRQ handling bug\n ARM: OMAP: PM: only register TWL with voltage layer when device is present\n ARM: OMAP: hwmod: Fix the addr space, irq, dma count APIs\n arm: mx28: fix bit operation in clock setting\n ARM: imx: export imx_ioremap\n ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 code\n ARM: mx5: Fix checkpatch warnings in cpu-imx5.c\n MAINTAINERS: Add missing directory\n ARM: imx: drop \u0027ARCH_MX31\u0027 and \u0027ARCH_MX35\u0027\n ARM: imx6q: move clock register map to machine_desc.map_io\n ARM: pxa168/gplugd: add the correct SSP device\n ARM: Update mach-types to fix mxs build breakage\n ...\n" }, { "commit": "32092ecf0644e91070f9eff4f6e1edda8f90aecc", "tree": "3e2e2a111364f08653b79fd7404346e9f4b5ee84", "parents": [ "da6a8fa0275e2178c44a875374cae80d057538d1" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:51:03 2011 -0500" }, "message": "atm: clip: Use device neigh support on top of \"arp_tbl\".\n\nInstead of instantiating an entire new neigh_table instance\njust for ATM handling, use the neigh device private facility.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da6a8fa0275e2178c44a875374cae80d057538d1", "tree": "6a9df6b3b9e268ca463fdb47d9041883acc923ea", "parents": [ "869759b9e4160fb8a8d25bc3b4ce3b658523aebb" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:48:03 2011 -0500" }, "message": "neigh: Add device constructor/destructor capability.\n\nIf the neigh entry has device private state, it will need\nconstructor/destructor ops.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "869759b9e4160fb8a8d25bc3b4ce3b658523aebb", "tree": "73c7c66ee11e4426c582502be33ba0907225bf91", "parents": [ "76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:44 2011 -0500" }, "message": "atm: clip: Convert over to neighbour_priv()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "596b9b68ef118f7409afbc78487263e08ef96261", "tree": "0def3e591a0d5ede89e85339e35da3072f09330c", "parents": [ "5b8b0060cbd6332ae5d1fa0bec0e8e211248d0e7" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:43 2011 -0500" }, "message": "neigh: Add infrastructure for allocating device neigh privates.\n\nnetdev-\u003eneigh_priv_len records the private area length.\n\nThis will trigger for neigh_table objects which set tbl-\u003eentry_size\nto zero, and the first instances of this will be forthcoming.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b8b0060cbd6332ae5d1fa0bec0e8e211248d0e7", "tree": "40ba4f43e875c830aefc3aef42fc05510b624922", "parents": [ "1026fec8739663621d64216ba939c23bc1d089b7" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:43 2011 -0500" }, "message": "neigh: Get rid of neigh_table-\u003ekmem_cachep\n\nWe are going to alloc for device specific private areas for\nneighbour entries, and in order to do that we have to move\naway from the fixed allocation size enforced by using\nneigh_table-\u003ekmem_cachep\n\nAs a nice side effect we can now use kfree_rcu().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1026fec8739663621d64216ba939c23bc1d089b7", "tree": "d8ba40edf7952d1c2fa2b832fdfceeb537fcb145", "parents": [ "449fa023bca5b53bd924d91a27ffd34807fdeb80" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:43 2011 -0500" }, "message": "neigh: Create mechanism for generic neigh private areas.\n\nThe implementation private sits right after the primary_key memory.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8cd7920370a3715ccbd1c98bf33f172b8837dc0b", "tree": "6ee969f2a1e235ed37348f841c3f15a03cfdff1e", "parents": [ "57db53b07429c0d648f48727dd6c7c2b64c5708d", "f7bc83d87d242917ca0ee041ed509f57f361dd56" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 29 14:43:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 29 14:43:22 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM: Update comments describing device power management callbacks\n PM / Sleep: Update documentation related to system wakeup\n PM / Runtime: Make documentation follow the new behavior of irq_safe\n PM / Sleep: Correct inaccurate information in devices.txt\n PM / Domains: Document how PM domains are used by the PM core\n PM / Hibernate: Do not leak memory in error/test code paths\n" }, { "commit": "4d77d2b567ec66a443792d99e96ac760991d80d0", "tree": "8724a150e73cf33fd8a2f36f2b2432af3a78a3e8", "parents": [ "c3940999b29ca7d6ad9b37b827a058c90fd51992" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 28 20:30:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 13:17:03 2011 -0500" }, "message": "flow_dissector: use a 64bit load/store\n\nLe lundi 28 novembre 2011 à 19:06 -0500, David Miller a écrit :\n\u003e From: Dimitris Michailidis \u003cdm@chelsio.com\u003e\n\u003e Date: Mon, 28 Nov 2011 08:25:39 -0800\n\u003e\n\u003e \u003e\u003e +bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys\n\u003e \u003e\u003e *flow)\n\u003e \u003e\u003e +{\n\u003e \u003e\u003e +\tint poff, nhoff \u003d skb_network_offset(skb);\n\u003e \u003e\u003e +\tu8 ip_proto;\n\u003e \u003e\u003e +\tu16 proto \u003d skb-\u003eprotocol;\n\u003e \u003e\n\u003e \u003e __be16 instead of u16 for proto?\n\u003e\n\u003e I\u0027ll take care of this when I apply these patches.\n\n( CC trimmed )\n\nThanks David !\n\nHere is a small patch to use one 64bit load/store on x86_64 instead of\ntwo 32bit load/stores.\n\n[PATCH net-next] flow_dissector: use a 64bit load/store\n\ngcc compiler is smart enough to use a single load/store if we\nmemcpy(dptr, sptr, 8) on x86_64, regardless of\nCONFIG_CC_OPTIMIZE_FOR_SIZE\n\nIn IP header, daddr immediately follows saddr, this wont change in the\nfuture. We only need to make sure our flow_keys (src,dst) fields wont\nbreak the rule.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "114cf5802165ee93e3ab461c9c505cd94a08b800", "tree": "88208dddd7c1e90f5e1a840ad0ad7afcea991050", "parents": [ "927fbec13e40648d3c87cbb1daaac5b1fb9c8775" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:33:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "bql: Byte queue limits\n\nNetworking stack support for byte queue limits, uses dynamic queue\nlimits library. Byte queue limits are maintained per transmit queue,\nand a dql structure has been added to netdev_queue structure for this\npurpose.\n\nConfiguration of bql is in the tx-\u003cn\u003e sysfs directory for the queue\nunder the byte_queue_limits directory. Configuration includes:\nlimit_min, bql minimum limit\nlimit_max, bql maximum limit\nhold_time, bql slack hold time\n\nAlso under the directory are:\nlimit, current byte limit\ninflight, current number of bytes on the queue\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c5d67bd78c5dc540e3461c36fb3d389fbe0de4c3", "tree": "e0536d39c7f01adc4b6041806aea15deccee8a8b", "parents": [ "7346649826382b769cfadf4a2fe8a84d060c55e9" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:32:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "net: Add netdev interfaces for recording sends/comp\n\nAdd interfaces for drivers to call for recording number of packets and\nbytes at send time and transmit completion. Also, added a function to\n\"reset\" a queue. These will be used by Byte Queue Limits.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7346649826382b769cfadf4a2fe8a84d060c55e9", "tree": "0241cce453992881f61d3fbc4f9baf7eb0578135", "parents": [ "75957ba36c05b979701e9ec64b37819adc12f830" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:32:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "net: Add queue state xoff flag for stack\n\nCreate separate queue state flags so that either the stack or drivers\ncan turn on XOFF. Added a set of functions used in the stack to determine\nif a queue is really stopped (either by stack or driver)\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75957ba36c05b979701e9ec64b37819adc12f830", "tree": "c980b8489d6c09cc71ce80f61fb892e3c8806c96", "parents": [ "85c10f28286148ee5cdba1d22c81936ff160596e" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Nov 28 16:32:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 12:46:19 2011 -0500" }, "message": "dql: Dynamic queue limits\n\nImplementation of dynamic queue limits (dql). This is a libary which\nallows a queue limit to be dynamically managed. The goal of dql is\nto set the queue limit, number of objects to the queue, to be minimized\nwithout allowing the queue to be starved.\n\ndql would be used with a queue which has these properties:\n\n1) Objects are queued up to some limit which can be expressed as a\n count of objects.\n2) Periodically a completion process executes which retires consumed\n objects.\n3) Starvation occurs when limit has been reached, all queued data has\n actually been consumed but completion processing has not yet run,\n so queuing new data is blocked.\n4) Minimizing the amount of queued data is desirable.\n\nA canonical example of such a queue would be a NIC HW transmit queue.\n\nThe queue limit is dynamic, it will increase or decrease over time\ndepending on the workload. The queue limit is recalculated each time\ncompletion processing is done. Increases occur when the queue is\nstarved and can exponentially increase over successive intervals.\nDecreases occur when more data is being maintained in the queue than\nneeded to prevent starvation. The number of extra objects, or \"slack\",\nis measured over successive intervals, and to avoid hysteresis the\nlimit is only reduced by the miminum slack seen over a configurable\ntime period.\n\ndql API provides routines to manage the queue:\n- dql_init is called to intialize the dql structure\n- dql_reset is called to reset dynamic values\n- dql_queued called when objects are being enqueued\n- dql_avail returns availability in the queue\n- dql_completed is called when objects have be consumed in the queue\n\nConfiguration consists of:\n- max_limit, maximum limit\n- min_limit, minimum limit\n- slack_hold_time, time to measure instances of slack before reducing\n queue limit\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98014be39bda8277a5ad130bb274ed6eb18b74df", "tree": "974620a47c9350ff9b3c06ffd2b49470bbda72ab", "parents": [ "55135dfbf3dd83cb3e98deed8271b62d188404e1", "6e2a587eb99267367409097b70cb2d61b09e5269" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 29 14:50:17 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 29 14:50:17 2011 +0000" }, "message": "Merge branch \u0027defconfigs-for-arnd\u0027 of git://git.linaro.org/people/triad/linux-stericsson into fixes\n" }, { "commit": "c1baa88431fe0fe4fad492dece4177a7735f89cf", "tree": "3513c0018bd149625aa999b82c0ed6097a55a267", "parents": [ "a5e5c37434eb182cf50cec90d9736d9a9a390116", "70e9942f17a6193e9172a804e6569a8806633d6b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 01:20:55 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 01:20:55 2011 -0500" }, "message": "Merge branch \u0027nf\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "6b5a5c0dbb11dcff4e1b0f1ef87a723197948ed4", "tree": "3e9958d845a385f94e44bd64d081de218835865b", "parents": [ "befc93fe76177b3b6ee1e3351b58293866f43aa6" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Mon Nov 21 17:15:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 00:29:41 2011 -0500" }, "message": "tcp: do not scale TSO segment size with reordering degree\n\nSince 2005 (c1b4a7e69576d65efc31a8cea0714173c2841244)\ntcp_tso_should_defer has been using tcp_max_burst() as a target limit\nfor deciding how large to make outgoing TSO packets when not using\nsysctl_tcp_tso_win_divisor. But since 2008\n(dd9e0dda66ba38a2ddd1405ac279894260dc5c36) tcp_max_burst() returns the\nreordering degree. We should not have tcp_tso_should_defer attempt to\nbuild larger segments just because there is more reordering. This\ncommit splits the notion of deferral size used in TSO from the notion\nof burst size used in cwnd moderation, and returns the TSO deferral\nlimit to its original value.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8f0b86996c88081095124d16b869e8d8a1c02c5", "tree": "c8ae0274df112c03a9029625aec9e3eb4e2e7026", "parents": [ "fa67a04497c03a1ead12cd896262de14980311e8" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sun Nov 27 17:06:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 00:21:36 2011 -0500" }, "message": "dsa: Move all definitions needed by drivers into \u003cnet/dsa.h\u003e\n\nAny headers included by drivers should be under include/, and\nany definitions they use are not really private to the core as\nthe name \"dsa_priv.h\" suggests.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8317e2047ef7d70dd76bf1d571fecaa8d4deb06f", "tree": "c400a600a4eb00da224b4e59e76396655e853d07", "parents": [ "2c55a3d08ade44a778c182c220a7907ec65d5fb8", "39338b56382ac640614851a80e0bd71994cc664d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 28 19:21:10 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 28 19:21:10 2011 -0500" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n" }, { "commit": "0744dd00c1b1be99a25b62b1b48df440e82e57e0", "tree": "94bff02f61657c4b02709f472dcb56f9dc927a18", "parents": [ "de0396f4003a24a57875b35f2996fdaa47bc1d0d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 28 05:22:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 28 19:09:07 2011 -0500" }, "message": "net: introduce skb_flow_dissect()\n\nWe use at least two flow dissectors in network stack, with known\nlimitations and code duplication.\n\nIntroduce skb_flow_dissect() to factorize this, highly inspired from\nexisting dissector from __skb_get_rxhash()\n\nNote : We extensively use skb_header_pointer(), this permits us to not\ntouch skb at all.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5cac98dd06bc43a7baab3523184f70fd359e9f35", "tree": "454623a8d7ba16e94b97d9e3107f0ac4c43164d9", "parents": [ "c4860ba2e11261a541632ceee8267ca490d9eb98" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Sun Nov 27 21:14:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 28 18:07:29 2011 -0500" }, "message": "net: Fix corruption in /proc/*/net/dev_mcast\n\nI just hit this during my testing. Isn\u0027t there another bug lurking?\n\nBUG kmalloc-8: Redzone overwritten\n\nINFO: 0xc0000000de9dec48-0xc0000000de9dec4b. First byte 0x0 instead of 0xcc\nINFO: Allocated in .__seq_open_private+0x30/0xa0 age\u003d0 cpu\u003d5 pid\u003d3896\n\t.__kmalloc+0x1e0/0x2d0\n\t.__seq_open_private+0x30/0xa0\n\t.seq_open_net+0x60/0xe0\n\t.dev_mc_seq_open+0x4c/0x70\n\t.proc_reg_open+0xd8/0x260\n\t.__dentry_open.clone.11+0x2b8/0x400\n\t.do_last+0xf4/0x950\n\t.path_openat+0xf8/0x480\n\t.do_filp_open+0x48/0xc0\n\t.do_sys_open+0x140/0x250\n\tsyscall_exit+0x0/0x40\n\ndev_mc_seq_ops uses dev_seq_start/next/stop but only allocates\nsizeof(struct seq_net_private) of private data, whereas it expects\nsizeof(struct dev_iter_state):\n\nstruct dev_iter_state {\n\tstruct seq_net_private p;\n\tunsigned int pos; /* bucket \u003c\u003c BUCKET_SPACE + offset */\n};\n\nCreate dev_seq_open_ops and use it so we don\u0027t have to expose\nstruct dev_iter_state.\n\n[ Problem added by commit f04565ddf52e4 (dev: use name hash for\n dev_seq_ops) -Eric ]\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f7bc83d87d242917ca0ee041ed509f57f361dd56", "tree": "653cda4900d19c8193141dd3f9035f24a933c7ba", "parents": [ "fafba48d4dd6fcbb1fd7ac4ab0ba22ef45b9796c" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Nov 23 21:20:32 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Nov 28 22:14:55 2011 +0100" }, "message": "PM: Update comments describing device power management callbacks\n\nThe comments describing device power management callbacks in\ninclude/pm.h are outdated and somewhat confusing, so make them\nreflect the reality more accurately.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "cb3599926e3e7b3678583195effa61a03026ab0e", "tree": "775419d69e8732ba3f4933d3b7a07e98ae555458", "parents": [ "4244cb482e8eab18142162a27c8829a04585863a", "f6f8285132907757ef84ef8dae0a1244b8cde6ac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 11:27:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 11:27:57 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n pstore: pass allocated memory region back to caller\n" }, { "commit": "39338b56382ac640614851a80e0bd71994cc664d", "tree": "c319e23181be286b1d320c29f755a81e5ef61172", "parents": [ "8b7ff200010600ef7cd9d002f9f8f97edfc7578e", "eb1852b10593dc3ca73e02bf9ac4753a5a464905" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 28 14:11:18 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 28 14:11:18 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": "4244cb482e8eab18142162a27c8829a04585863a", "tree": "d13911f08bdf40ac17426c959ef9f76bb61c81ab", "parents": [ "f02877ce3ca8f87a086e3fc98bb9e022bbec70ec", "b7b996da27e6f8b518a7c7753fa5b6dff2df6899" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 09:05:23 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 09:05:23 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/exynos: fixed wrong err ptr usage and destroy call in exeception\n drm/exynos: Add disable of manager\n drm/exynos: include linux/module.h\n drm/exynos: fix vblank bug.\n drm/exynos: changed buffer structure.\n drm/exynos: removed unnecessary variable.\n drm/exynos: use gem create function generically\n drm/exynos: checked for null pointer\n drm/exynos: added crtc dpms for disable crtc\n drm/exynos: removed meaningless parameter from fbdev update\n drm/exynos: restored kernel_fb_list when reiniting fb_helper\n drm/exynos: changed exynos_drm_display to exynos_drm_display_ops\n drm/exynos: added manager object to connector\n drm/exynos: fixed converting between display mode and timing\n drm/exynos: fixed connector flag with hpd and interlace scan for hdmi\n drm/exynos: added kms poll for handling hpd event\n" }, { "commit": "c28800a9c3caaf387d85ac665a25ebe99e480295", "tree": "401ba805709a65a9f5c1919b3dc763c70b64b38f", "parents": [ "ce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22", "27c9cd7e601632b3794e1c3344d37b86917ffb43" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 08:43:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 28 08:43:52 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 hrtimer: Fix extra wakeups from __remove_hrtimer()\n timekeeping: add arch_offset hook to ktime_get functions\n clocksource: Avoid selecting mult values that might overflow when adjusted\n time: Improve documentation of timekeeeping_adjust()\n" }, { "commit": "b7b996da27e6f8b518a7c7753fa5b6dff2df6899", "tree": "26fcabc7cbfd2ec81c13bec2649f1999b13a8eaa", "parents": [ "caca6a03d365883564885f2c1da3e88dcf65d139", "ca22e3cc25f180859561f36d51bf21278db5ae11" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 28 14:17:09 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 28 14:17:09 2011 +0000" }, "message": "Merge branch \u0027exynos-drm\u0027 of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes\n\n* \u0027exynos-drm\u0027 of git://git.infradead.org/users/kmpark/linux-samsung:\n drm/exynos: fixed wrong err ptr usage and destroy call in exeception\n drm/exynos: Add disable of manager\n drm/exynos: include linux/module.h\n drm/exynos: fix vblank bug.\n drm/exynos: changed buffer structure.\n drm/exynos: removed unnecessary variable.\n drm/exynos: use gem create function generically\n drm/exynos: checked for null pointer\n drm/exynos: added crtc dpms for disable crtc\n drm/exynos: removed meaningless parameter from fbdev update\n drm/exynos: restored kernel_fb_list when reiniting fb_helper\n drm/exynos: changed exynos_drm_display to exynos_drm_display_ops\n drm/exynos: added manager object to connector\n drm/exynos: fixed converting between display mode and timing\n drm/exynos: fixed connector flag with hpd and interlace scan for hdmi\n drm/exynos: added kms poll for handling hpd event\n" }, { "commit": "60d6fe99e4a507f77b63c090eb8aacb67e21687a", "tree": "52473d54554d44fbaf2b020fd203965b934ccaeb", "parents": [ "559a9f1d354b577af28f84181751820ff7d29feb" ], "author": { "name": "Amir Vadai", "email": "amirv@mellanox.co.il", "time": "Sat Nov 26 19:55:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 27 17:17:04 2011 -0500" }, "message": "net/mlx4_en: adding loopback support\n\nDevice must be in promiscuous mode or DMAC must be same as the host MAC, or\nelse packet will be dropped by the HW rx filtering.\n\nSigned-off-by: Amir Vadai \u003camirv@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "559a9f1d354b577af28f84181751820ff7d29feb", "tree": "e148a9161da5a03d8778e05d1492955f8d38e0ac", "parents": [ "f0ab34f011d805ce5b1a341409c9c26f0fc8252b" ], "author": { "name": "Oren Duer", "email": "oren@mellanox.co.il", "time": "Sat Nov 26 19:55:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 27 17:17:04 2011 -0500" }, "message": "net/mlx4_en: fix WOL handlers were always looking at port2 capability bit\n\nThere are 2 capability bits for WOL, one for each port.\nWOL handlers were looking only on the second bit, regardless of the port.\n\nSigned-off-by: Oren Duer \u003coren@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "876f6e67d1c617c098c67934a8d00b065bb9688b", "tree": "1d66f498806971c4369f6d152046bcb163ee528f", "parents": [ "fd4f862717ece652a76b4bb6c6d2c9656dbf0f7e" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Sat Nov 26 19:54:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 27 17:17:03 2011 -0500" }, "message": "net/mlx4: move RSS related definitions to be global\n\nTowards adding RSS support for IB drivers/application who use\nthe mlx4 HW, make the RSS related definitions global and change\nthe mlx4_en driver to use them.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: Shlomo Pongratz \u003cshlomop@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de68dca1816660b0d3ac89fa59ffb410007a143f", "tree": "9a31e87c6e0504627df25d3a1d39ca7825dcd779", "parents": [ "0884d7aa24e15e72b3c07f7da910a13bb7df3592" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Nov 26 12:13:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 19:16:37 2011 -0500" }, "message": "inet: add a redirect generation id in inetpeer\n\nNow inetpeer is the place where we cache redirect information for ipv4\ndestinations, we must be able to invalidate informations when a route is\nadded/removed on host.\n\nAs inetpeer is not yet namespace aware, this patch adds a shared\nredirect_genid, and a per inetpeer redirect_genid. This might be changed\nlater if inetpeer becomes ns aware.\n\nCache information for one inerpeer is valid as long as its\nredirect_genid has the same value than global redirect_genid.\n\nReported-by: Arkadiusz Miśkiewicz \u003ca.miskiewicz@gmail.com\u003e\nTested-by: Arkadiusz Miśkiewicz \u003ca.miskiewicz@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "49f5ed4250c757cb19d953fcac2737a35ca14d76", "tree": "065c6a559b1b8b0a81f62f100804694a05659484", "parents": [ "021ac8d387594bdf51d9a279b2f9e9defb614c9b" ], "author": { "name": "chas williams - CONTRACTOR", "email": "chas@cmf.nrl.navy.mil", "time": "Tue Nov 22 12:51:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 16:40:30 2011 -0500" }, "message": "atm: eliminate atm_guess_pdu2truesize()\n\nSigned-off-by: Chas Williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "072bc80156729f853e8bcafe1b17c48c74462887", "tree": "fd48bf8aa8e730a75ea40375275e75afa0d2994e", "parents": [ "b30f8bdcfa7dd05f4268348f3388ff903132f28e" ], "author": { "name": "Ben Dooks", "email": "ben@simtec.co.uk", "time": "Mon Nov 21 08:57:57 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:59:39 2011 -0500" }, "message": "eeprom_93cx6: Add write support\n\nAdd support for writing data to EEPROM.\n\nSigned-off-by: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Linux Kernel \u003clinux-kernel@vger.kernel.org\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b30f8bdcfa7dd05f4268348f3388ff903132f28e", "tree": "6781a42fe2cfe8eacc2ba981cab8cec594f7bfef", "parents": [ "e9008ee99c77207b2f6aee67e5f849b1e1400a11" ], "author": { "name": "Ben Dooks", "email": "ben@simtec.co.uk", "time": "Mon Nov 21 08:57:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:59:38 2011 -0500" }, "message": "eeprom_93cx6: Add data direction control.\n\nSome devices need to know if the data is to be output or read, so add a\ndata direction into the eeprom structure to tell the driver whether the\ndata line should be driven.\n\nThe user in this case is the Micrel KS8851 which has a direction\ncontrol for the EEPROM data line and thus needs to know whether\nto drive it (writing) or to tristate it for receiving.\n\nSigned-off-by: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d11ead75672d655652dbfc1b1a2c359e5b65536d", "tree": "5b70f38a5650839c104a3a2355794f7dd726e164", "parents": [ "34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Nov 25 14:40:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:48:16 2011 -0500" }, "message": "net: Use IS_ENABLED() in netdevice.h as appropriate\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6", "tree": "8646a156a13e68babdc8daa85bec607c68bc7800", "parents": [ "3d825ede8c79a4799a6a3c34719551c7c1908b96" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Nov 25 14:38:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:48:16 2011 -0500" }, "message": "dsa: Allow core and drivers to be built as modules\n\nChange the kconfig types to tristate and adjust the condition for\ndeclaring net_device::dsa_ptr to allow for this.\n\nAdjust the makefile so that if NET_DSA_MV88E6123_61_65\u003dy and\nNET_DSA_MV88E6131\u003dm or vice versa then both drivers are built-in. We\ncould leave these options as bool and make NET_DSA_MV88E6XXX a\nuser-selected option, but that would break existing configurations.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf50dcc24f82a6dc2bce523eec2a979eb1b106e2", "tree": "579bd064fc0ee8475ca5c8e5d5f6295b82247c3a", "parents": [ "6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Nov 25 14:32:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:48:14 2011 -0500" }, "message": "dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions\n\neth_type_trans() will use these functions if DSA is enabled, which\nblocks building DSA as a module.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c", "tree": "cd71e597bbbe677820bb229c6aedbad412758959", "parents": [ "d6f03f29f7cdf064289f941bf0b838348e996e65", "fc0b927d9a5024e138c4318fe19a590f23e3eeec" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/ipv4/inet_diag.c\n" }, { "commit": "b8400f3718a11c9b0ca400705cddf94f3132c1c3", "tree": "88bb6045e4ebcb8cfc4b9f85f4818952428d1885", "parents": [ "618f9bc74a039da76fa027ac2600c5b785b964c5" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Wed Nov 23 02:14:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:29:51 2011 -0500" }, "message": "route: struct rtable can be const in rt_is_input_route and rt_is_output_route\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "618f9bc74a039da76fa027ac2600c5b785b964c5", "tree": "ff69bc14b711c9c9d4c691d2a8c262401d62c8c9", "parents": [ "ebb762f27fed083cb993a0816393aba4615f6544" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Wed Nov 23 02:13:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:29:51 2011 -0500" }, "message": "net: Move mtu handling down to the protocol depended handlers\n\nWe move all mtu handling from dst_mtu() down to the protocol\nlayer. So each protocol can implement the mtu handling in\na different manner.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ebb762f27fed083cb993a0816393aba4615f6544", "tree": "c065070f78d4a272d99183606d103519426bb344", "parents": [ "6b600b26c0215bf9ed04062ecfacf0bc20e2588c" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Wed Nov 23 02:12:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:29:50 2011 -0500" }, "message": "net: Rename the dst_opt default_mtu method to mtu\n\nWe plan to invoke the dst_opt-\u003edefault_mtu() method unconditioally\nfrom dst_mtu(). So rename the method to dst_opt-\u003emtu() to match\nthe name with the new meaning.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b82e65d65c90faecc408bcdc14a0229736ed193", "tree": "2cf5fd4f4df01c6488afd0046325405381a73e36", "parents": [ "8174a06eba10a43375d1dd6f74c58a71519e3be5", "e6af578c5305be693a1bc7f4dc7b51dd82d41425" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 20:19:31 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 20:19:31 2011 -0800" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n virtio-pci: make reset operation safer\n virtio-mmio: Correct the name of the guest features selector\n virtio: add HAS_IOMEM dependency to MMIO platform bus driver\n" }, { "commit": "e6af578c5305be693a1bc7f4dc7b51dd82d41425", "tree": "7276a130a2d2eddf84660ec2573298e26611a442", "parents": [ "fe1a7fe2c4456679b3402f04268bdfafca7b127a" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 17 17:41:15 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Nov 24 13:04:48 2011 +1030" }, "message": "virtio-pci: make reset operation safer\n\nvirtio pci device reset actually just does an I/O\nwrite, which in PCI is really posted, that is it\ncan complete on CPU before the device has received it.\n\nFurther, interrupts might have been pending on\nanother CPU, so device callback might get invoked after reset.\n\nThis conflicts with how drivers use reset, which is typically:\n\treset\n\tunregister\na callback running after reset completed can race with\nunregister, potentially leading to use after free bugs.\n\nFix by flushing out the write, and flushing pending interrupts.\n\nThis assumes that device is never reset from\nits vq/config callbacks, or in parallel with being\nadded/removed, document this assumption.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "fe1a7fe2c4456679b3402f04268bdfafca7b127a", "tree": "e792020a75a1cd7b2b8d4d41aae7c223d1ade046", "parents": [ "bd20817f733ceb0291e0449106307ffc939006ba" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Tue Nov 15 16:17:18 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Nov 24 13:04:47 2011 +1030" }, "message": "virtio-mmio: Correct the name of the guest features selector\n\nGuest features selector spelling mistake.\n\nCc: Pawel Moll \u003cpawel.moll@arm.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: virtualization@lists.linux-foundation.org\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "ac8a48106be49c422575ddc7531b776f8eb49610", "tree": "d770975ffc9cebfcbb2d3ad40b0601a8d1e77c32", "parents": [ "67c170a24fc6669f8f7c0864d75caadef0a8e5e6" ], "author": { "name": "Li Wei", "email": "lw@cn.fujitsu.com", "time": "Tue Nov 22 23:33:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 23 19:19:32 2011 -0500" }, "message": "ipv4: Save nexthop address of LSRR/SSRR option to IPCB.\n\nWe can not update iph-\u003edaddr in ip_options_rcv_srr(), It is too early.\nWhen some exception ocurred later (eg. in ip_forward() when goto\nsr_failed) we need the ip header be identical to the original one as\nICMP need it.\n\nAdd a field \u0027nexthop\u0027 in struct ip_options to save nexthop of LSRR\nor SSRR option.\n\nSigned-off-by: Li Wei \u003clw@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "09521577ca7718b6c83f095ca4f0d474b01a8378", "tree": "56bbc5f0ac255f36a0935d3ba4e0a4702203dc66", "parents": [ "de7badf1adc7cc95269ac4b435da23c169018a3e", "4cac2eb158c6da0c761689345c6cc5df788a6292" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 14:58:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 14:58:46 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:\n PCI hotplug: shpchp: don\u0027t blindly claim non-AMD 0x7450 device IDs\n PCI: pciehp: wait 100 ms after Link Training check\n PCI: pciehp: wait 1000 ms before Link Training check\n PCI: pciehp: Retrieve link speed after link is trained\n PCI: Let PCI_PRI depend on PCI\n PCI: Fix compile errors with PCI_ATS and !PCI_IOV\n PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug\n" }, { "commit": "b079d671f88322733010082a590f59885eafd62e", "tree": "6e824cdc1f62da9516ebc2f851229b6535a33028", "parents": [ "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37", "b923d40dd4211c4ef7d4efa2bd81b7ca1d8744c1" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Nov 23 14:57:37 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Nov 23 14:57:37 2011 -0800" }, "message": "Merge branch \u0027hwmod_dss_fixes_3.2rc\u0027 of git://git.pwsan.com/linux-2.6 into fixes-dss\n" }, { "commit": "8c2152286aabe753519d7627a2992625b97e4b20", "tree": "8208f86c22fd74c30701c827be69a85a40af015a", "parents": [ "1f2149c1df50c8c712950872675f46e6e44629f0" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Wed Nov 23 15:52:58 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 23 15:52:58 2011 -0500" }, "message": "netprio_cgroup: Fix build break\n\nI broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS\u003dn.\nThis patch corrects it by moving the offending struct into an ifdef\nCONFIG_CGROUPS block. Also clean up a few needless defines and inline functions\nthat don\u0027t get called if CONFIG_CGROUPS isn\u0027t defined while Im at it.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5907c5f8adbd0bb7ab69124520304e5b25c8eb5e", "tree": "c3e1bc99f41c74b369293c74a1752e57e538f706", "parents": [ "0a2c986557b964453f8deeaf56f6d88bf3e65e92", "eff245c82f115059648cdce95dd68bb940f2b006" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:50:05 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:50:05 2011 -0800" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: Make i2cdev_notifier_call static\n i2c: Delete ANY_I2C_BUS\n i2c: Fix device name for 10-bit slave address\n i2c-algo-bit: Generate correct i2c address sequence for 10-bit target\n" }, { "commit": "0a2c986557b964453f8deeaf56f6d88bf3e65e92", "tree": "7b27e1afff3e5380826d62b2f5bb50533ade4fec", "parents": [ "2d0f2400a49be3a177695eda381d91fec18cbd0e", "780dc9ba4eb682a89be48d5b814feae6722a19e0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:49:39 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:49:39 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: TPS65910: Fix VDD1/2 voltage selector count\n" }, { "commit": "2d0f2400a49be3a177695eda381d91fec18cbd0e", "tree": "312234f4144e7626aa49a678e13f4e8361884260", "parents": [ "b4bbb02934e4511d9083f15c23e90703482e84ad", "a5cd335165e31db9dbab636fd29895d41da55dd2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:47:25 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 23 09:47:25 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (31 commits)\n drm: integer overflow in drm_mode_dirtyfb_ioctl()\n drivers/gpu/vga/vgaarb.c: add missing kfree\n drm/radeon/kms/atom: unify i2c gpio table handling\n drm/radeon/kms: fix up gpio i2c mask bits for r4xx for real\n ttm: Don\u0027t return the bo reserved on error path\n drm/radeon/kms: add a CS ioctl flag not to rewrite tiling flags in the CS\n drm/i915: Fix inconsistent backlight level during disabled\n drm, i915: Fix memory leak in i915_gem_busy_ioctl().\n drm/i915: Use DPCD value for max DP lanes.\n drm/i915: Initiate DP link training only on the lanes we\u0027ll be using\n drm/i915: Remove trailing white space\n drm/i915: Try harder during dp pattern 1 link training\n drm/i915: Make DP prepare/commit consistent with DP dpms\n drm/i915: Let panel power sequencing hardware do its job\n drm/i915: Treat PCH eDP like DP in most places\n drm/i915: Remove link_status field from intel_dp structure\n drm/i915: Move common PCH_PP_CONTROL setup to ironlake_get_pp_control\n drm/i915: Module parameters using \u0027-1\u0027 as default must be signed type\n drm/i915: Turn on another required clock gating bit on gen6.\n drm/i915: Turn on a required 3D clock gating bit on Sandybridge.\n ...\n" }, { "commit": "780dc9ba4eb682a89be48d5b814feae6722a19e0", "tree": "5ddac04630d0bcaf0405c4f5f08793ca68c3439c", "parents": [ "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "Afzal Mohammed", "email": "afzal@ti.com", "time": "Tue Nov 08 18:54:10 2011 +0530" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Nov 23 14:03:52 2011 +0000" }, "message": "regulator: TPS65910: Fix VDD1/2 voltage selector count\n\nCount of selector voltage is required for regulator_set_voltage\nto work via set_voltage_sel. VDD1/2 currently have it as zero,\nso regulator_set_voltage won\u0027t work for VDD1/2.\nUpdate count (n_voltages) for VDD1/2.\n\nOutput Voltage \u003d (step value * 12.5 mV + 562.5 mV) * gain\n\nWith above expr, number of voltages that can be selected is\nstep value count * gain count\n\nconstant for gain count will be called VDD1_2_NUM_VOLT_COARSE\n\nexisting constant for step value count is VDD1_2_NUM_VOLTS,\nuse VDD1_2_NUM_VOLT_FINE instead to make clear that step value\nis not the only component in deciding selectable voltage count\n\nSigned-off-by: Afzal Mohammed \u003cafzal@ti.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "67820021dc9c8da37f773025190280f55f3626d4", "tree": "44957ea27a84752357b502b6b36abe64d39c6a39", "parents": [ "cbb44514048a250647c6c6b3df27ff62cb71f7d5" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Nov 23 11:33:07 2011 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Nov 23 11:33:07 2011 +0100" }, "message": "i2c: Delete ANY_I2C_BUS\n\nLast piece of code using ANY_I2C_BUS was deleted almost 2 years ago,\nso ANY_I2C_BUS can go away as well.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "a5cd335165e31db9dbab636fd29895d41da55dd2", "tree": "4d01d5801047b466c44c40231773e66a9dfb704d", "parents": [ "c916874d60d9daf2e2d5f4f622b185ef57deb6a4" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Wed Nov 23 01:12:01 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 23 08:59:28 2011 +0000" }, "message": "drm: integer overflow in drm_mode_dirtyfb_ioctl()\n\nThere is a potential integer overflow in drm_mode_dirtyfb_ioctl()\nif userspace passes in a large num_clips. The call to kmalloc would\nallocate a small buffer, and the call to fb-\u003efuncs-\u003edirty may result\nin a memory corruption.\n\nReported-by: Haogang Chen \u003chaogangchen@gmail.com\u003e\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1f2149c1df50c8c712950872675f46e6e44629f0", "tree": "a33a556696e27611b6b38cdcbb6de9315f483bd4", "parents": [ "84b405011166e663fe9ef56c29b1d76f59b35568" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Nov 22 10:57:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:43:32 2011 -0500" }, "message": "net: remove netdev_alloc_page and use __GFP_COLD\n\nGiven we dont use anymore the struct net_device *dev argument, and this\ninterface brings litle benefit, remove netdev_{alloc|free}_page(), to\ndebloat include/linux/skbuff.h a bit.\n\n(Some drivers used a mix of these interfaces and alloc_pages())\n\nWhen allocating a page given to device for DMA transfer (device to\nmemory), it makes sense to use a cold one (__GFP_COLD)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nCC: Dimitris Michailidis \u003cdm@chelsio.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e3fd7a06dc20b2d8ec6892233ad2012968fe7b6", "tree": "da3fbec7672ac6b967dfa31cec6c88f468a57fa2", "parents": [ "40ba84993d66469d336099c5af74c3da5b73e28d" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Nov 21 03:39:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:43:32 2011 -0500" }, "message": "net: remove ipv6_addr_copy()\n\nC assignment can handle struct in6_addr copying.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5eccdf5e06eb67779716ae26142402a1ae9b012c", "tree": "1e4d46e97b4d5bdfb4e33fc452e68e129c4dfe1a", "parents": [ "20e994a05b33b186a22a3b9e922df4cce644daac" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Nov 21 06:53:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:37:01 2011 -0500" }, "message": "tc: comment spelling fixes\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "26bff940dd975499c6c47438d4395d7d215911e8", "tree": "7b6774138e3033d7ab6df080419740083caee2ae", "parents": [ "3ee32fee65ef6a4a8a4188e913be7dd90ba9e058" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 22 06:46:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 15:27:18 2011 -0500" }, "message": "xfrm: optimize ipv4 selector matching\n\nCurrent addr_match() is errh, under-optimized.\n\nCompiler doesn\u0027t know that memcmp() branch doesn\u0027t trigger for IPv4.\nAlso, pass addresses by value -- they fit into register.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bc1421e34ecfe0bd4b26dc3232b7d5e25179144", "tree": "783ed95187915c06757a260b637308919b35d5a0", "parents": [ "202ff1c26c768efeead20b388556eda265dc8352" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Tue Nov 22 05:10:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 15:22:23 2011 -0500" }, "message": "net: add network priority cgroup infrastructure (v4)\n\nThis patch adds in the infrastructure code to create the network priority\ncgroup. The cgroup, in addition to the standard processes file creates two\ncontrol files:\n\n1) prioidx - This is a read-only file that exports the index of this cgroup.\nThis is a value that is both arbitrary and unique to a cgroup in this subsystem,\nand is used to index the per-device priority map\n\n2) priomap - This is a writeable file. On read it reports a table of 2-tuples\n\u003cname:priority\u003e where name is the name of a network interface and priority is\nindicates the priority assigned to frames egresessing on the named interface and\noriginating from a pid in this cgroup\n\nThis cgroup allows for skb priority to be set prior to a root qdisc getting\nselected. This is benenficial for DCB enabled systems, in that it allows for any\napplication to use dcb configured priorities so without application modification\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nCC: Robert Love \u003crobert.w.love@intel.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "570e57bcbcc4df5581b1e9c806ab2b16e96ea7d3", "tree": "ce1275a45614d7249b2fbf55f87f423a409e7b50", "parents": [ "a2d7ec58ac09f30ab726f216827f7c7095b2a98f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 21 19:51:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 15:15:57 2011 -0500" }, "message": "atm: use SKB_TRUESIZE() in atm_guess_pdu2truesize()\n\nSKB_TRUESIZE() provides a better approximation of expected skb truesize.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "515db09338704a6ad7d27b5f1e33820d3052edd2", "tree": "74f915531710303397d34069b325c2be7a5ac93c", "parents": [ "30be52e44fd4276d768efffb55d424fb682e6505", "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Nov 22 14:05:46 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Nov 22 14:05:46 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux\n\nConflicts:\n\tdrivers/net/wireless/iwlegacy/iwl-debugfs.c\n\tdrivers/net/wireless/iwlegacy/iwl-rx.c\n\tdrivers/net/wireless/iwlegacy/iwl-scan.c\n\tdrivers/net/wireless/iwlegacy/iwl-tx.c\n\tinclude/net/bluetooth/bluetooth.h\n" }, { "commit": "e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd", "tree": "3f5d705161f24c6a9dc36c1947ce7f81e53db41b", "parents": [ "af36d15f58a3560617f1497ae011c3192049e40e", "62e4a76987eab2b7fa952546614bc83e5bfc9d3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:54:15 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:54:15 2011 -0800" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFS: Revert pnfs ugliness from the generic NFS read code path\n SUNRPC: destroy freshly allocated transport in case of sockaddr init error\n NFS: Fix a regression in the referral code\n nfs: move nfs_file_operations declaration to bottom of file.c (try #2)\n nfs: when attempting to open a directory, fall back on normal lookup (try #5)\n" }, { "commit": "8ba8ed54de4dd79bb88ab6cd7dbf2e83d58d6d57", "tree": "d4d1c687f1b7f58783103b43a04618d8e4019bba", "parents": [ "bbbc4791cd48ac12996e43c0033b504c79b53639", "468e6a20afaccb67e2a7d7f60d301f90e1c6f301" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:22:48 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 22 08:22:48 2011 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: remove vm_dirties and task-\u003edirties\n writeback: hard throttle 1000+ dd on a slow USB stick\n mm: Make task in balance_dirty_pages() killable\n" }, { "commit": "3b9abc7e48561b0b140ee267e190bc1031f82ff3", "tree": "ec5d8174f89cb8555c74eb3eb770054aa22fc724", "parents": [ "0cda56962b883cd5e7aa036350e5a0283a88c590", "0c73c08ec73dbe080b9ec56696ee21d32754d918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:46 2011 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n TTY: ldisc, wait for ldisc infinitely in hangup\n TTY: ldisc, move wait idle to caller\n TTY: ldisc, allow waiting for ldisc arbitrarily long\n Revert \"tty/serial: Prevent drop of DCD on suspend for Tegra UARTs\"\n RS485: fix inconsistencies in the meaning of some variables\n pch_uart: Fix DMA resource leak issue\n serial,mfd: Fix CMSPAR setup\n tty/serial: Prevent drop of DCD on suspend for Tegra UARTs\n pch_uart: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor\n pch_uart: Support new device LAPIS Semiconductor ML7831 IOH\n pch_uart: Fix hw-flow control issue\n tty: hvc_dcc: Fix duplicate character inputs\n jsm: Change maintainership\n" }, { "commit": "0cda56962b883cd5e7aa036350e5a0283a88c590", "tree": "acb54a8550f3d768a45ad297761f8f6cba90d19e", "parents": [ "b0d81664a0092d8f6df7742b5aee6fcfd326b36c", "91a13c281d7d4648c0b32dede11a0144c4e7984c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 20:36:26 2011 -0800" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n drivers/base/node.c: fix compilation error with older versions of gcc\n uio: documentation fixups\n device.h: Fix struct member documentation\n" }, { "commit": "70e9942f17a6193e9172a804e6569a8806633d6b", "tree": "5cb0fe0a38a99aa51b70c01f7a7e729480ec5c73", "parents": [ "5e2afba4ecd7931ea06e6fa116ab28e6943dbd42" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Nov 22 00:16:51 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Nov 22 00:34:47 2011 +0100" }, "message": "netfilter: nf_conntrack: make event callback registration per-netns\n\nThis patch fixes an oops that can be triggered following this recipe:\n\n0) make sure nf_conntrack_netlink and nf_conntrack_ipv4 are loaded.\n1) container is started.\n2) connect to it via lxc-console.\n3) generate some traffic with the container to create some conntrack\n entries in its table.\n4) stop the container: you hit one oops because the conntrack table\n cleanup tries to report the destroy event to user-space but the\n per-netns nfnetlink socket has already gone (as the nfnetlink\n socket is per-netns but event callback registration is global).\n\nTo fix this situation, we make the ctnl_notifier per-netns so the\ncallback is registered/unregistered if the container is\ncreated/destroyed.\n\nAlex Bligh and Alexey Dobriyan originally proposed one small patch to\ncheck if the nfnetlink socket is gone in nfnetlink_has_listeners,\nbut this is a very visited path for events, thus, it may reduce\nperformance and it looks a bit hackish to check for the nfnetlink\nsocket only to workaround this situation. As a result, I decided\nto follow the bigger path choice, which seems to look nicer to me.\n\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nReported-by: Alex Bligh \u003calex@alex.org.uk\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "a2d7ec58ac09f30ab726f216827f7c7095b2a98f", "tree": "1b733090406abc18c42308e84703dcb703e15125", "parents": [ "9205fd9ccab8ef51ad771c1917eed7b2f2225d45" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Nov 18 17:32:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 16:38:08 2011 -0500" }, "message": "netfilter: use jump_label for nf_hooks\n\nOn configs where CONFIG_JUMP_LABEL\u003dy, we can replace in fast path a\nload/compare/conditional jump by a single jump with no dcache reference.\n\nJump target is modified as soon as nf_hooks[pf][hook] switches from\nempty state to non empty states. jump_label state is kept outside of\nnf_hooks array so has no cost on cpu caches.\n\nThis patch removes the test on CONFIG_NETFILTER_DEBUG : No need to call\nnf_hook_slow() at all if nf_hooks[pf][hook] is empty, this didnt give\nuseful information, but slowed down things a lot.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e7c8926b2f4e3453b8aeb39cd814d2af3fec24f", "tree": "e22df42bf84d6ea3cb67ae0e332d7d7d10cca4b4", "parents": [ "dd76986b0e398978ca32dd60c1b7dc50ab4e9ae1" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Fri Nov 18 11:31:59 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:22:06 2011 -0500" }, "message": "wireless: Support ht-capabilities over-rides.\n\nThis allows users to disable features such as HT, HT40,\nand to modify the MCS, AMPDU, and AMSDU settings for\ndrivers that support it.\n\nThe MCS, AMPDU, and AMSDU features that may be disabled are\nare reported in the phy-info netlink message as a mask.\n\nAttemping to disable features that are not supported will\ntake no affect, but will not return errors. This is to aid\nbackwards compatibility in user-space apps that may not be\nclever enough to deal with parsing the the capabilities mask.\n\nThis patch only enables the infrastructure. An additional\npatch will enable the feature in mac80211.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "dd76986b0e398978ca32dd60c1b7dc50ab4e9ae1", "tree": "fea61a3dcb75a0c90e772b2beeaf4edb49ae7b50", "parents": [ "80b998993d97d8a13589f8462e62a60298c72cf2" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Nov 18 16:54:50 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:20:49 2011 -0500" }, "message": "cfg80211/mac80211: Revert \"move information element parsing logic to cfg80211\"\n\nNo other driver ever ended up using this, and\nthe commit forgot to move the prototype so no\ndriver could have used it. Revert it, if any\ndriver shows up and needs it it can be moved\nagain, but until then it\u0027s more efficient to\nhave it in mac80211 where the only user is.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7c4ef7122cef54dc49562eea35cbfaf0f44faa0b", "tree": "97cc3b8e602c432375fbe0cdeea9aac8ecbb0fbd", "parents": [ "f2dc7989bf821a0ca78289b32f16078c76c88e7e" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Nov 18 15:33:48 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:20:49 2011 -0500" }, "message": "cfg80211: add flags for off-channel capabilities\n\nCurrently mac80211 implements these for all devices,\nbut given restrictions of some devices that isn\u0027t\nreally true, so prepare for being able to remove the\ncapability for some mac80211 devices.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Kalle Valo \u003ckvalo@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "11127e9121d4dd9da868cf0fd89dcac35f7f0fa3", "tree": "8cb16ecbd5942679c18934064b935a7e256a77da", "parents": [ "74e4dbfd57a38c4ec4131cebdbfa3d621d38dd6a" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Nov 16 16:02:47 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:20:43 2011 -0500" }, "message": "mac80211: transmit fragment list to drivers\n\nDrivers can usually handle fragmented packets\nmuch easier when they get the entire list of\nfragments at once. The only thing they need to\ndo is keep enough space on the queues for up\nto ten fragments of a single MSDU.\n\nThis allows them to implement this with a new\noperation tx_frags.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b68e6b3b33b208c5690355fd9804ea65cc53d3a5", "tree": "0a7e3e90519d9dfaeb1c79de176172940be553a3", "parents": [ "8b60b07805d557542160d852874fa6a1b969184e" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@qca.qualcomm.com", "time": "Tue Oct 11 10:59:03 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:20:41 2011 -0500" }, "message": "cfg80211: pass DFS region to drivers through reg_notifier()\n\nThis grants drivers access to the DFS region that a\nregulatory domain belongs to.\n\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8b60b07805d557542160d852874fa6a1b969184e", "tree": "74b96b63c62cf7cef9684c19bda8f8d51ceabe0d", "parents": [ "4713e962c5d98901890c446843ae4e0a9d37b7b3" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@qca.qualcomm.com", "time": "Tue Oct 11 10:59:02 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Nov 21 16:20:41 2011 -0500" }, "message": "cfg80211: process regulatory DFS region for countries\n\nThe wireless-regdb now has support for mapping a country to\none DFS region. CRDA sends this to us now so process it\nso we can provide that hint to drivers. This will later be\nused by code for processing DFS in a way that meets the\ncriteria for the DFS region the country belongs to.\n\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "37f07023d30708b5da091fe6d6be9b60783c6d82", "tree": "e4f576abd841cdeddc6cbdc9da6b083277784295", "parents": [ "b8ffdbd05f8692cdadccd04464271e48b1e8d439" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu Nov 17 14:30:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 15:27:19 2011 -0500" }, "message": "net: Change mii to ethtool advertisement function names\n\nThis patch implements advice by Ben Hutchings to change the mii side of\nthe function names to look more like the register whose values they\nconvert. New LPA translation functions have been added as well.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c292fe4aae5aa5c089633bc40342d27c8275306a", "tree": "84c6898327eb35c3c20c1728eaff8ca19094ddeb", "parents": [ "7758c4d6e9371efa04a1cf1b124bbf9cc43e830e", "224736d9113ab4a7cf3f05c05377492bd99b4b02" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 12:11:13 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 21 12:11:13 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n libceph: Allocate larger oid buffer in request msgs\n ceph: initialize root dentry\n ceph: fix iput race when queueing inode work\n" }, { "commit": "efd0bf97deeddd9ba53daabfc470a1399c6b0b2d", "tree": "eec56da5fbc796bac7c67f1990a18f5e0a304059", "parents": [ "f8a15af093b19b86d56933c8757cee298d0f32a8", "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nThe forcedeth changes had a conflict with the conversion over\nto atomic u64 statistics in net-next.\n\nThe libertas cfg.c code had a conflict with the bss reference\ncounting fix by John Linville in net-next.\n\nConflicts:\n\tdrivers/net/ethernet/nvidia/forcedeth.c\n\tdrivers/net/wireless/libertas/cfg.c\n" }, { "commit": "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82", "tree": "54dd0130534a0e20195f45ece12421c604064d01", "parents": [ "a4cc3889f7e2c3f2fd15b492822c889fed5e1800", "9cc20b268a5a14f5e57b8ad405a83513ab0d78dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:59:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:59:33 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: (86 commits)\n ipv4: fix redirect handling\n ping: dont increment ICMP_MIB_INERRORS\n sky2: fix hang in napi_disable\n sky2: enforce minimum ring size\n bonding: Don\u0027t allow mode change via sysfs with slaves present\n f_phonet: fix page offset of first received fragment\n stmmac: fix pm functions avoiding sleep on spinlock\n stmmac: remove spin_lock in stmmac_ioctl.\n stmmac: parameters auto-tuning through HW cap reg\n stmmac: fix advertising 1000Base capabilties for non GMII iface\n stmmac: use mdelay on timeout of sw reset\n sky2: version 1.30\n sky2: used fixed RSS key\n sky2: reduce default Tx ring size\n sky2: rename up/down functions\n sky2: pci posting issues\n sky2: fix hang on shutdown (and other irq issues)\n r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list\n MAINTAINERS: change email address for shemminger\n pch_gbe: Move #include of module.h\n ...\n" }, { "commit": "a4cc3889f7e2c3f2fd15b492822c889fed5e1800", "tree": "d455a7392bc48aa44f61346e09b9cab63522d5b9", "parents": [ "bb893d15b564f7711b60e0bc12966d049980582d", "95ef1e52922cf75b1ea2eae54ef886f2cc47eecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:57:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:57:43 2011 -0800" }, "message": "Merge branch \u0027kvm-updates/3.2\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.2\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM guest: prevent tracing recursion with kvmclock\n Revert \"KVM: PPC: Add support for explicit HIOR setting\"\n KVM: VMX: Check for automatic switch msr table overflow\n KVM: VMX: Add support for guest/host-only profiling\n KVM: VMX: add support for switching of PERF_GLOBAL_CTRL\n KVM: s390: announce SYNC_MMU\n KVM: s390: Fix tprot locking\n KVM: s390: handle SIGP sense running intercepts\n KVM: s390: Fix RUNNING flag misinterpretation\n" }, { "commit": "2d360fcbd851b7f9f8c23b1c30b2f3c060fa43e6", "tree": "8228db95030b82921c90b95f353441946af3a677", "parents": [ "a767835f6dc85277e40fbfe69a29c18817d6c00b", "501a708f18ef911328ffd39f39738b8a7862aa8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:33:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 20 14:33:02 2011 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Suspend: Fix bug in suspend statistics update\n PM / Hibernate: Fix the early termination of test modes\n PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset\n PM Sleep: Do not extend wakeup paths to devices with ignore_children set\n PM / driver core: disable device\u0027s runtime PM during shutdown\n PM / devfreq: correct Kconfig dependency\n PM / devfreq: fix use after free in devfreq_remove_device\n PM / shmobile: Avoid restoring the INTCS state during initialization\n PM / devfreq: Remove compiler error after irq.h update\n PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()\n PM / Clocks: Only disable enabled clocks in pm_clk_suspend()\n ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix\n PM / shmobile: Don\u0027t skip debugging output in pd_power_up()\n" }, { "commit": "e70f224c1938af208b64b02c5cec27889fefcaec", "tree": "a247c81526e3b169158693c151efda3c2bc073e9", "parents": [ "6991b8f2a3193397461104a27be417addb8d032b" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Tue Oct 25 01:38:45 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Nov 20 07:53:13 2011 +0000" }, "message": "drm/radeon/kms: add a CS ioctl flag not to rewrite tiling flags in the CS\n\nThis adds a new optional chunk to the CS ioctl that specifies optional flags\nto the CS parser. Why this is useful is explained below. Note that some regs\nno longer need the NOP relocation packet if this feature is enabled.\nTested on r300g and r600g with this flag disabled and enabled.\n\nAssume there are two contexts sharing the same mipmapped tiled texture.\nOne context wants to render into the first mipmap and the other one\nwants to render into the last mipmap. As you probably know, the hardware\nhas a MACRO_SWITCH feature, which turns off macro tiling for small mipmaps,\nbut that only applies to samplers.\n(at least on r300-r500, though later hardware likely behaves the same)\n\nSo we want to just re-set the tiling flags before rendering (writing\npackets), right? ... No. The contexts run in parallel, so they may\nset the tiling flags simultaneously and then fire their command streams\nalso simultaneously. The last one setting the flags wins, the other one\nloses.\n\nAnother problem is when one context wants to render into the first and\nthe last mipmap in one CS. Impossible. It must flush before changing\ntiling flags and do the rendering into the smaller mipmaps in another CS.\n\nYet another problem is that writing copy_blit in userspace would be a mess\ninvolving re-setting tiling flags to please the kernel, and causing races\nwith other contexts at the same time.\n\nThe only way out of this is to send tiling flags with each CS, ideally\nwith each relocation. But we already do that through the registers.\nSo let\u0027s just use what we have in the registers.\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" } ], "next": "a5c86e986f0b2fe779f13cf53ce6e9f467b03950" }