)]}' { "log": [ { "commit": "d16cf20e2f2f13411eece7f7fb72c17d141c4a84", "tree": "8154b3db8cdbb4b8d9f35d4c407cfe961253f0b4", "parents": [ "6714cf5465d2803a21c6a46c1ea747795a8889fa" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:45:28 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 20:25:42 2012 +0200" }, "message": "netfilter: remove ip_queue support\n\nThis patch removes ip_queue support which was marked as obsolete\nyears ago. The nfnetlink_queue modules provides more advanced\nuser-space packet queueing mechanism.\n\nThis patch also removes capability code included in SELinux that\nrefers to ip_queue. Otherwise, we break compilation.\n\nSeveral warning has been sent regarding this to the mailing list\nin the past month without anyone rising the hand to stop this\nwith some strong argument.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "6714cf5465d2803a21c6a46c1ea747795a8889fa", "tree": "eccfd714c4d320f4724e15e59b964ddd487e8f09", "parents": [ "9768e1ace458fa4ebf88bc3943fd8fb77113ed9c" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu May 03 02:17:45 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:44:42 2012 +0200" }, "message": "netfilter: nf_conntrack: fix explicit helper attachment and NAT\n\nExplicit helper attachment via the CT target is broken with NAT\nif non-standard ports are used. This problem was hidden behind\nthe automatic helper assignment routine. Thus, it becomes more\nnoticeable now that we can disable the automatic helper assignment\nwith Eric Leblond\u0027s:\n\n9e8ac5a netfilter: nf_ct_helper: allow to disable automatic helper assignment\n\nBasically, nf_conntrack_alter_reply asks for looking up the helper\nup if NAT is enabled. Unfortunately, we don\u0027t have the conntrack\ntemplate at that point anymore.\n\nSince we don\u0027t want to rely on the automatic helper assignment,\nwe can skip the second look-up and stick to the helper that was\nattached by iptables. With the CT target, the user is in full\ncontrol of helper attachment, thus, the policy is to trust what\nthe user explicitly configures via iptables (no automatic magic\nanymore).\n\nInterestingly, this bug was hidden by the automatic helper look-up\ncode. But it can be easily trigger if you attach the helper in\na non-standard port, eg.\n\niptables -I PREROUTING -t raw -p tcp --dport 8888 \\\n\t-j CT --helper ftp\n\nAnd you disabled the automatic helper assignment.\n\nI added the IPS_HELPER_BIT that allows us to differenciate between\na helper that has been explicitly attached and those that have been\nautomatically assigned. I didn\u0027t come up with a better solution\n(having backward compatibility in mind).\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "9768e1ace458fa4ebf88bc3943fd8fb77113ed9c", "tree": "42b47bc693694767bff2820811896a7b1580b58d", "parents": [ "6d8ebc8a27e1b187abfb06dd79b35a393aa9f2a2" ], "author": { "name": "Kelvie Wong", "email": "kelvie@ieee.org", "time": "Wed May 02 14:39:24 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:59 2012 +0200" }, "message": "netfilter: nf_ct_expect: partially implement ctnetlink_change_expect\n\nThis refreshes the \"timeout\" attribute in existing expectations if one is\ngiven.\n\nThe use case for this would be for userspace helpers to extend the lifetime\nof the expectation when requested, as this is not possible right now\nwithout deleting/recreating the expectation.\n\nI use this specifically for forwarding DCERPC traffic through:\n\nDCERPC has a port mapper daemon that chooses a (seemingly) random port for\nfuture traffic to go to. We expect this traffic (with a reasonable\ntimeout), but sometimes the port mapper will tell the client to continue\nusing the same port. This allows us to extend the expectation accordingly.\n\nSigned-off-by: Kelvie Wong \u003ckelvie@ieee.org\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "6d8ebc8a27e1b187abfb06dd79b35a393aa9f2a2", "tree": "071e81e46ed5c3230f56b02c8ee35cbcb64a9ac8", "parents": [ "068d522067294987b16b3971f1aab2141eba4c44" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Apr 30 08:13:50 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:56 2012 +0200" }, "message": "net: export sysctl_[r|w]mem_max symbols needed by ip_vs_sync\n\nTo build ip_vs as a module sysctl_rmem_max and sysctl_wmem_max\nneeds to be exported.\n\nThe dependency was added by \"ipvs: wakeup master thread\" patch.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "068d522067294987b16b3971f1aab2141eba4c44", "tree": "61ad88543420a47ece5545fc7c8bb2a792233244", "parents": [ "d5cce2087455f4d17b11db881ca51a6965be8de0" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Thu Apr 26 11:26:15 2012 -0700" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:54 2012 +0200" }, "message": "ipvs: ip_vs_proto: local functions should not be exposed globally\n\nFunctions not referenced outside of a source file should be marked\nstatic to prevent it from being exposed globally.\n\nThis quiets the sparse warnings:\n\nwarning: symbol \u0027__ipvs_proto_data_get\u0027 was not declared. Should it be static?\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "d5cce2087455f4d17b11db881ca51a6965be8de0", "tree": "289a20602463e4ea9bf3dccf6d3e7e457be5e7a5", "parents": [ "6b324dbfc3dc13f0a7e236d3529c31d6bc4edbfe" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Thu Apr 26 11:17:28 2012 -0700" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:52 2012 +0200" }, "message": "ipvs: ip_vs_ftp: local functions should not be exposed globally\n\nFunctions not referenced outside of a source file should be marked\nstatic to prevent it from being exposed globally.\n\nThis quiets the sparse warnings:\n\nwarning: symbol \u0027ip_vs_ftp_init\u0027 was not declared. Should it be static?\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "6b324dbfc3dc13f0a7e236d3529c31d6bc4edbfe", "tree": "4432b7ddd2b70666b4a91195f888b2e27f73f822", "parents": [ "f73181c8288fc38747ec4f0f3e8a9052ab785cd5" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 09:28:19 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:49 2012 +0200" }, "message": "ipvs: optimize the use of flags in ip_vs_bind_dest\n\n\tcp-\u003eflags is marked volatile but ip_vs_bind_dest\ncan safely modify the flags, so save some CPU cycles by\nusing temp variable.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "f73181c8288fc38747ec4f0f3e8a9052ab785cd5", "tree": "9523b3ba632e051b3d196f3bc6d8b0258e7c4fcd", "parents": [ "749c42b620a9511782bc38d0a88702a42434529e" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:30 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:33 2012 +0200" }, "message": "ipvs: add support for sync threads\n\n\tAllow master and backup servers to use many threads\nfor sync traffic. Add sysctl var \"sync_ports\" to define the\nnumber of threads. Every thread will use single UDP port,\nthread 0 will use the default port 8848 while last thread\nwill use port 8848+sync_ports-1.\n\n\tThe sync traffic for connections is scheduled to many\nmaster threads based on the cp address but one connection is\nalways assigned to same thread to avoid reordering of the\nsync messages.\n\n\tRemove ip_vs_sync_switch_mode because this check\nfor sync mode change is still risky. Instead, check for mode\nchange under sync_buff_lock.\n\n\tMake sure the backup socks do not block on reading.\n\nSpecial thanks to Aleksey Chudov for helping in all tests.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nTested-by: Aleksey Chudov \u003caleksey.chudov@gmail.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "749c42b620a9511782bc38d0a88702a42434529e", "tree": "057b15f2bbd7fad96becdada1dc2ee775482e0b6", "parents": [ "1c003b1580e20ff9f500846677303a695b1837cc" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Tue Apr 24 23:46:40 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:40:10 2012 +0200" }, "message": "ipvs: reduce sync rate with time thresholds\n\n\tAdd two new sysctl vars to control the sync rate with the\nmain idea to reduce the rate for connection templates because\ncurrently it depends on the packet rate for controlled connections.\nThis mechanism should be useful also for normal connections\nwith high traffic.\n\nsync_refresh_period: in seconds, difference in reported connection\n\ttimer that triggers new sync message. It can be used to\n\tavoid sync messages for the specified period (or half of\n\tthe connection timeout if it is lower) if connection state\n\tis not changed from last sync.\n\nsync_retries: integer, 0..3, defines sync retries with period of\n\tsync_refresh_period/8. Useful to protect against loss of\n\tsync messages.\n\n\tAllow sysctl_sync_threshold to be used with\nsysctl_sync_period\u003d0, so that only single sync message is sent\nif sync_refresh_period is also 0.\n\n\tAdd new field \"sync_endtime\" in connection structure to\nhold the reported time when connection expires. The 2 lowest\nbits will represent the retry count.\n\n\tAs the sysctl_sync_period now can be 0 use ACCESS_ONCE to\navoid division by zero.\n\n\tSpecial thanks to Aleksey Chudov for being patient with me,\nfor his extensive reports and helping in all tests.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nTested-by: Aleksey Chudov \u003caleksey.chudov@gmail.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "1c003b1580e20ff9f500846677303a695b1837cc", "tree": "d00c951b6e4c88edd403b4d8ead96a57b9bfc808", "parents": [ "cdcc5e905d59026fbf2e7f74f9cc834203b6207b" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:39:49 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:39:53 2012 +0200" }, "message": "ipvs: wakeup master thread\n\n\tHigh rate of sync messages in master can lead to\noverflowing the socket buffer and dropping the messages.\nFixed sleep of 1 second without wakeup events is not suitable\nfor loaded masters,\n\n\tUse delayed_work to schedule sending for queued messages\nand limit the delay to IPVS_SYNC_SEND_DELAY (20ms). This will\nreduce the rate of wakeups but to avoid sending long bursts we\nwakeup the master thread after IPVS_SYNC_WAKEUP_RATE (8) messages.\n\n\tAdd hard limit for the queued messages before sending\nby using \"sync_qlen_max\" sysctl var. It defaults to 1/32 of\nthe memory pages but actually represents number of messages.\nIt will protect us from allocating large parts of memory\nwhen the sending rate is lower than the queuing rate.\n\n\tAs suggested by Pablo, add new sysctl var\n\"sync_sock_size\" to configure the SNDBUF (master) or\nRCVBUF (slave) socket limit. Default value is 0 (preserve\nsystem defaults).\n\n\tChange the master thread to detect and block on\nSNDBUF overflow, so that we do not drop messages when\nthe socket limit is low but the sync_qlen_max limit is\nnot reached. On ENOBUFS or other errors just drop the\nmessages.\n\n\tChange master thread to enter TASK_INTERRUPTIBLE\nstate early, so that we do not miss wakeups due to messages or\nkthread_should_stop event.\n\nThanks to Pablo Neira Ayuso for his valuable feedback!\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "cdcc5e905d59026fbf2e7f74f9cc834203b6207b", "tree": "3f8c6440384a2d0e753d35f51e344269953a986a", "parents": [ "882a844bd5b3ffa35e059f21ee920cc113985a89" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Tue Apr 24 23:46:38 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:38:31 2012 +0200" }, "message": "ipvs: always update some of the flags bits in backup\n\n\tAs the goal is to mirror the inactconns/activeconns\ncounters in the backup server, make sure the cp-\u003eflags are\nupdated even if cp is still not bound to dest. If cp-\u003eflags\nare not updated ip_vs_bind_dest will rely only on the initial\nflags when updating the counters. To avoid mistakes and\ncomplicated checks for protocol state rely only on the\nIP_VS_CONN_F_INACTIVE bit when updating the counters.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nTested-by: Aleksey Chudov \u003caleksey.chudov@gmail.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "882a844bd5b3ffa35e059f21ee920cc113985a89", "tree": "62cbd6b18cf7a0b2c5aee37b3c4c26c0e62e466f", "parents": [ "06611f82cc0d8b957d6399f11f2799683ad002c3" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Tue Apr 24 23:46:37 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:38:28 2012 +0200" }, "message": "ipvs: fix ip_vs_try_bind_dest to rebind app and transmitter\n\n\tInitially, when the synced connection is created we\nuse the forwarding method provided by master but once we\nbind to destination it can be changed. As result, we must\nupdate the application and the transmitter.\n\n\tAs ip_vs_try_bind_dest is called always for connections\nthat require dest binding, there is no need to validate the\ncp and dest pointers.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "06611f82cc0d8b957d6399f11f2799683ad002c3", "tree": "ebefc1e883130f6470d9338d774ad5aebe6bf5fb", "parents": [ "82cfc062781f29164b151de851f3076b84175fec" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Tue Apr 24 23:46:36 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:38:26 2012 +0200" }, "message": "ipvs: remove check for IP_VS_CONN_F_SYNC from ip_vs_bind_dest\n\n\tAs the IP_VS_CONN_F_INACTIVE bit is properly set\nin cp-\u003eflags for all kind of connections we do not need to\nadd special checks for synced connections when updating\nthe activeconns/inactconns counters for first time. Now\nlogic will look just like in ip_vs_unbind_dest.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "82cfc062781f29164b151de851f3076b84175fec", "tree": "51d7ec1f968db76cc92540ff71908e4dff78c0b3", "parents": [ "9615e61e6f23f18fc192ed44735725bb5b500bad" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Tue Apr 24 23:46:35 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:38:24 2012 +0200" }, "message": "ipvs: ignore IP_VS_CONN_F_NOOUTPUT in backup server\n\n\tAs IP_VS_CONN_F_NOOUTPUT is derived from the\nforwarding method we should get it from conn_flags just\nlike we do it for IP_VS_CONN_F_FWD_MASK bits when binding\nto real server.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "9615e61e6f23f18fc192ed44735725bb5b500bad", "tree": "19a820b7b361647b1e24ed590f49c02d639e6b95", "parents": [ "d6318f08e8d0b95960f74280cdaa7f0e00fd604c" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Sat Apr 14 12:37:47 2012 -0400" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:38:22 2012 +0200" }, "message": "ipvs: use GFP_KERNEL allocation where possible\n\nUse GFP_KERNEL instead of GFP_ATOMIC when registering an ipvs protocol.\n\nThis is safe since it will always run from a process context.\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "d6318f08e8d0b95960f74280cdaa7f0e00fd604c", "tree": "d8153d550fc8894b2e8cbcac3bca36bcbef76b85", "parents": [ "45d4e71a39c3274f982d73688cbee2a4b286c3e3" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 16:49:38 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:37:28 2012 +0200" }, "message": "ipvs: SH scheduler does not need GFP_ATOMIC allocation\n\n Schedulers are initialized and bound to services only\non commands.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "45d4e71a39c3274f982d73688cbee2a4b286c3e3", "tree": "629cd0444d2a4ad1042d59a5b01ed4c89f0c714a", "parents": [ "4f2a94dcb65bcdf20d91d5bffd29b9c836559d17" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 16:49:41 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:37:26 2012 +0200" }, "message": "ipvs: LBLCR scheduler does not need GFP_ATOMIC allocation on init\n\n\tSchedulers are initialized and bound to services only\non commands.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "4f2a94dcb65bcdf20d91d5bffd29b9c836559d17", "tree": "1d44e20c8a3482abde9dcc5cc3ef0e2966a3a879", "parents": [ "4beddbe38cb402ff509efa9dc27d3e9e188902cd" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 16:49:42 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:37:22 2012 +0200" }, "message": "ipvs: WRR scheduler does not need GFP_ATOMIC allocation\n\n\tSchedulers are initialized and bound to services only\non commands.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "4beddbe38cb402ff509efa9dc27d3e9e188902cd", "tree": "fd75cfe36d9fda152bef062f27ce0a5ab28d6229", "parents": [ "748d845ca9cf0e7c7692ec45e4d8cb3a90b31793" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 16:49:39 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:37:20 2012 +0200" }, "message": "ipvs: DH scheduler does not need GFP_ATOMIC allocation\n\n\tSchedulers are initialized and bound to services only\non commands.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "748d845ca9cf0e7c7692ec45e4d8cb3a90b31793", "tree": "e2f44e8b4723796e6d01b1a7aed0a8f9b8d17a5e", "parents": [ "41cff6d5c924eb51704dd6928687fd0494e6c744" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 16:49:40 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:37:17 2012 +0200" }, "message": "ipvs: LBLC scheduler does not need GFP_ATOMIC allocation on init\n\n\tSchedulers are initialized and bound to services only\non commands.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "41cff6d5c924eb51704dd6928687fd0494e6c744", "tree": "c831254ddaaaa4c644dc6e5bc4ef0a67d96d30bd", "parents": [ "4981682cc19733f3ca43d3abd81dd4adbc9005d5" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 16:49:37 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:37:09 2012 +0200" }, "message": "ipvs: timeout tables do not need GFP_ATOMIC allocation\n\n\tThey are called only on initialization.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "4981682cc19733f3ca43d3abd81dd4adbc9005d5", "tree": "6c4583e26b8f12559defc11d0c141011a71e3de1", "parents": [ "ac3a546ac89fdf3c4b50e40039a5a7f6df4dda72" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:36:44 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:36:47 2012 +0200" }, "message": "netfilter: bridge: optionally set indev to vlan\n\nif net.bridge.bridge-nf-filter-vlan-tagged sysctl is enabled, bridge\nnetfilter removes the vlan header temporarily and then feeds the packet\nto ip(6)tables.\n\nWhen the new \"bridge-nf-pass-vlan-input-device\" sysctl is on\n(default off), then bridge netfilter will also set the\nin-interface to the vlan interface; if such an interface exists.\n\nThis is needed to make iptables REDIRECT target work with\n\"vlan-on-top-of-bridge\" setups and to allow use of \"iptables -i\" to\nmatch the vlan device name.\n\nAlso update Documentation with current brnf default settings.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nAcked-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "ac3a546ac89fdf3c4b50e40039a5a7f6df4dda72", "tree": "8fbe86f3e2fcd9c2ba23a7cc0832f60240b07658", "parents": [ "a9006892643a8f4e885b692de0708bcb35a7d530" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Apr 18 06:36:40 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:36:33 2012 +0200" }, "message": "netfilter: nf_conntrack: use this_cpu_inc()\n\nthis_cpu_inc() is IRQ safe and faster than\nlocal_bh_disable()/__this_cpu_inc()/local_bh_enable(), at least on x86.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "a9006892643a8f4e885b692de0708bcb35a7d530", "tree": "de5ba86bb36d05cd859bffb2370a9a3b462722d9", "parents": [ "031d7709f21c778bcb1eed96d790e82b3bee96b5" ], "author": { "name": "Eric Leblond", "email": "eric@regit.org", "time": "Wed Apr 18 11:20:41 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:35:18 2012 +0200" }, "message": "netfilter: nf_ct_helper: allow to disable automatic helper assignment\n\nThis patch allows you to disable automatic conntrack helper\nlookup based on TCP/UDP ports, eg.\n\necho 0 \u003e /proc/sys/net/netfilter/nf_conntrack_helper\n\n[ Note: flows that already got a helper will keep using it even\n if automatic helper assignment has been disabled ]\n\nOnce this behaviour has been disabled, you have to explicitly\nuse the iptables CT target to attach helper to flows.\n\nThere are good reasons to stop supporting automatic helper\nassignment, for further information, please read:\n\nhttp://www.netfilter.org/news.html#2012-04-03\n\nThis patch also adds one message to inform that automatic helper\nassignment is deprecated and it will be removed soon (this is\nspotted only once, with the first flow that gets a helper attached\nto make it as less annoying as possible).\n\nSigned-off-by: Eric Leblond \u003ceric@regit.org\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "031d7709f21c778bcb1eed96d790e82b3bee96b5", "tree": "5b0186ff11d30bc88ed0612905001bb5a06176f4", "parents": [ "97138a1ca7917c11431293e668457f916a610ca5" ], "author": { "name": "Tony Zelenoff", "email": "antonz@parallels.com", "time": "Thu Mar 08 23:35:39 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:17:23 2012 +0200" }, "message": "netfilter: nf_ct_ecache: refactor notifier registration\n\n* ret variable initialization removed as useless\n* similar code strings concatenated and functions code\n flow became more plain\n\nSigned-off-by: Tony Zelenoff \u003cantonz@parallels.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "97138a1ca7917c11431293e668457f916a610ca5", "tree": "569c875e500efe5c172b17e694c208f67a95a682", "parents": [ "4f94a929e4adb0d0ed78d448ff68fe870163c575" ], "author": { "name": "Steve Glendinning", "email": "steve.glendinning@shawell.net", "time": "Fri May 04 00:57:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:43:57 2012 -0400" }, "message": "smsc75xx: let EEPROM determine GPIO/LED settings\n\nThis patch allows the GPIO/LED settings to be configured by the\nEEPROM if present, and only sets the default values (LED outputs\nfor link/activity) when an EEPROM is not detected.\n\nSigned-off-by: Steve Glendinning \u003csteve.glendinning@shawell.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f94a929e4adb0d0ed78d448ff68fe870163c575", "tree": "e9c1afc53b91b8e27fad9d5c570f3256da194ce6", "parents": [ "7749622d7fc958ecfbec67bc76c9e0d861a872d8" ], "author": { "name": "Steve Glendinning", "email": "steve.glendinning@shawell.net", "time": "Fri May 04 00:57:12 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:43:56 2012 -0400" }, "message": "smsc75xx: eliminate unnecessary phy register read\n\nOnly a write is necessary to clear the interrupt status, and we\ndon\u0027t use the value from the preceding read operation. This\npatch eliminates the unnecessary read.\n\nSigned-off-by: Steve Glendinning \u003csteve.glendinning@shawell.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7749622d7fc958ecfbec67bc76c9e0d861a872d8", "tree": "8b1049945caa0332055ca893b4e938330a099f9a", "parents": [ "0d6c4a2e4641bbc556dd74d3aa158c413a972492" ], "author": { "name": "Steve Glendinning", "email": "steve.glendinning@shawell.net", "time": "Fri May 04 00:57:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:43:56 2012 -0400" }, "message": "smsc75xx: replace 0xffff with PHY_INT_SRC_CLEAR_ALL\n\nThis patch defines PHY_INT_SRC_CLEAR_ALL to replace the value 0xffff\nin order to be more self-documenting.\n\nThis patch should make no functional change, it is purely cosmetic.\n\nSigned-off-by: Steve Glendinning \u003csteve.glendinning@shawell.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0d6c4a2e4641bbc556dd74d3aa158c413a972492", "tree": "da944af17682659bb433dc2282dcb48380c14cd1", "parents": [ "6e06c0e2347ec79d0bd5702b2438fe883f784545", "1c430a727fa512500a422ffe4712166c550ea06a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:35:40 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:35:40 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/intel/e1000e/param.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn-rx.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans.h\n\nResolved the iwlwifi conflict with mainline using 3-way diff posted\nby John Linville and Stephen Rothwell. In \u0027net\u0027 we added a bug\nfix to make iwlwifi report a more accurate skb-\u003etruesize but this\nconflicted with RX path changes that happened meanwhile in net-next.\n\nIn e1000e a conflict arose in the validation code for settings of\nadapter-\u003eitr. \u0027net-next\u0027 had more sophisticated logic so that\nlogic was used.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6e06c0e2347ec79d0bd5702b2438fe883f784545", "tree": "3f55976275c94822cd406e7edc549f668901affa", "parents": [ "3a084ddb4bf299a6e898a9a07c89f3917f0713f7", "c70aa540c7a9f67add11ad3161096fb95233aa2e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:05:13 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:05:26 2012 -0400" }, "message": "Merge branch \u0027vhost-net-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n\nMichael S. Tsirkin says:\n\n--------------------\nThere are mostly bugfixes here.\nI hope to merge some more patches by 3.5, in particular\nvlan support fixes are waiting for Eric\u0027s ack,\nand a version of tracepoint patch might be\nready in time, but let\u0027s merge what\u0027s ready so it\u0027s testable.\n\nThis includes a ton of zerocopy fixes by Jason -\ngood stuff but too intrusive for 3.4 and zerocopy is experimental\nanyway.\n\nvirtio supported delayed interrupt for a while now\nso adding support to the virtio tool made sense\n--------------------\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a084ddb4bf299a6e898a9a07c89f3917f0713f7", "tree": "f938915de277b2b9b52ce6dc1308f18d0d083bcd", "parents": [ "416912a129349788372e6ac27ab86bd9b18c8cc0" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu May 03 22:37:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:03:22 2012 -0400" }, "message": "net: IP_MULTICAST_IF setsockopt now recognizes struct mreq\n\nUntil now, struct mreq has not been recognized and it was worked with\nas with struct in_addr. That means imr_multiaddr was copied to\nimr_address. So do recognize struct mreq here and copy that correctly.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "416912a129349788372e6ac27ab86bd9b18c8cc0", "tree": "239766992fc6878f89cce3037f65f757fc880dae", "parents": [ "0ca2997d145268e6b4ef000692061849cdab8348" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines.\n\nThe GPIO pins select which sub bus is connected to the master.\n\nInitially tested with an sn74cbtlv3253 switch device wired into the\nMDIO bus.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ca2997d145268e6b4ef000692061849cdab8348", "tree": "deeca7985f029cae477945e988816889c986e263", "parents": [ "251060220021283eef3652145a41f5b26db97ce5" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: Add MDIO bus multiplexer support.\n\nThis patch adds a somewhat generic framework for MDIO bus\nmultiplexers. It is modeled on the I2C multiplexer.\n\nThe multiplexer is needed if there are multiple PHYs with the same\naddress connected to the same MDIO bus adepter, or if there is\ninsufficient electrical drive capability for all the connected PHY\ndevices.\n\nConceptually it could look something like this:\n\n ------------------\n | Control Signal |\n --------+---------\n |\n --------------- --------+------\n | MDIO MASTER |---| Multiplexer |\n --------------- --+-------+----\n | |\n C C\n h h\n i i\n l l\n d d\n | |\n --------- A B ---------\n | | | | | |\n | PHY@1 +-------+ +---+ PHY@1 |\n | | | | | |\n --------- | | ---------\n --------- | | ---------\n | | | | | |\n | PHY@2 +-------+ +---+ PHY@2 |\n | | | |\n --------- ---------\n\nThis framework configures the bus topology from device tree data. The\nmechanics of switching the multiplexer is left to device specific\ndrivers.\n\nThe follow-on patch contains a multiplexer driven by GPIO lines.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "251060220021283eef3652145a41f5b26db97ce5", "tree": "e04d2a1695e19e959873cf8a6d571a925ca59cc5", "parents": [ "7dc2ce5f12cb5d166140820d5063027dc2449ac1" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: New function: of_mdio_find_bus().\n\nAdd of_mdio_find_bus() which allows an mii_bus to be located given its\nassociated the device tree node.\n\nThis is needed by the follow-on patch to add a driver for MDIO bus\nmultiplexers.\n\nThe of_mdiobus_register() function is modified so that the device tree\nnode is recorded in the mii_bus. Then we can find it again by\niterating over all mdio_bus_class devices.\n\nBecause the OF device tree has now become an integral part of the\nkernel, this can live in mdio_bus.c (which contains the needed\nmdio_bus_class structure) instead of of_mdio.c.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7dc2ce5f12cb5d166140820d5063027dc2449ac1", "tree": "19eb6c0efdc277a61af8fe6089dfc0b620ae8a23", "parents": [ "7fdaadcc2ee4d43eb43c564dbef85b768565cd7a" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:57 2012 -0400" }, "message": "isdn/capi: elliminate capincci_find() in non-middleware case\n\nIf Kernel CAPI is compiled without CONFIG_ISDN_CAPI_MIDDLEWARE,\nthe structure retrieved via capincci_find() is never actually\nused, so don\u0027t compile that function in that case.\n\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7fdaadcc2ee4d43eb43c564dbef85b768565cd7a", "tree": "f2e9c9bfa977b820b510cc2e73860cd0211c1e40", "parents": [ "81fa7b82570ec4337d328e6aee45689455508821" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:57 2012 -0400" }, "message": "isdn/capi: fix readability damage\n\nFix up some of the readibility deterioration caused by the recent\nwhitespace coding style cleanup.\n\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81fa7b82570ec4337d328e6aee45689455508821", "tree": "79cdb018f497a18635ea78a171cd211845e0b605", "parents": [ "7643ffbd02ac46f880f64bed24a85d453b501418" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:56 2012 -0400" }, "message": "isdn/gigaset: unify function return values\n\nVarious functions in the Gigaset driver were using different\nconventions for the meaning of their int return values.\nAlign them to the usual negative error numbers convention.\n\nInspired-by: Julia Lawall \u003cjulia.lawall@lip6.fr\u003e\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7643ffbd02ac46f880f64bed24a85d453b501418", "tree": "b32aef5eb4e317d782cb78c2db24c175c64f9d99", "parents": [ "f86936ff3826558307bf99f0db3220ac8b7ffd8f" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:56 2012 -0400" }, "message": "isdn/gigaset: internal function name cleanup\n\nFunctions clear_at_state and free_strings did the same thing;\ndrop one of them, keeping the more descriptive name.\nDrop a redundant call.\nRename function dealloc_at_states to dealloc_temp_at_states\nto clarify its purpose.\n\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f86936ff3826558307bf99f0db3220ac8b7ffd8f", "tree": "67fd56fe3e00b4c6a82ce14ace83220ab30d13c7", "parents": [ "e055d03dc088a990fe5ea24a2d64033a168da23c" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:56 2012 -0400" }, "message": "isdn/gigaset: fix readability damage\n\nFix up some of the readibility deterioration caused by the recent\nwhitespace coding style cleanup.\n\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e055d03dc088a990fe5ea24a2d64033a168da23c", "tree": "ece413271c28c34b5907689cdb6ecb13d672313e", "parents": [ "62a1cfe052346b96a552b6a9178d412c709711bb" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:56 2012 -0400" }, "message": "isdn/gigaset: improve error handling querying firmware version\n\nAn out-of-place \"OK\" response to the \"AT+GMR\" (get firmware version)\ncommand turns out to be, more often than not, a delayed response to\na previous command rather than an actual error, so continue waiting\nfor the version number in that case.\n\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nCC: stable \u003cstable@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62a1cfe052346b96a552b6a9178d412c709711bb", "tree": "2230cd1ecc1db46c0df433318e3cd0fd8bd8ba68", "parents": [ "8e618aad5348b6e6c5a90e8d97ea643197963b20" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:56 2012 -0400" }, "message": "isdn/gigaset: fix CAPI disconnect B3 handling\n\nIf DISCONNECT_B3_IND was synthesized because of a DISCONNECT_REQ\nwith existing logical connections, the connection state wasn\u0027t\nupdated accordingly. Also the emitted DISCONNECT_B3_IND message\nwasn\u0027t included in the debug log as requested.\nThis patch fixes both of these issues.\n\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nCC: stable \u003cstable@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e618aad5348b6e6c5a90e8d97ea643197963b20", "tree": "11fe2cb5180939cc703444fca5071cfd327f79d5", "parents": [ "8a05ba0812f7a456b3eddf74b127c0d8791742a7" ], "author": { "name": "Tilman Schmidt", "email": "tilman@imap.cc", "time": "Wed Apr 25 13:02:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:37:56 2012 -0400" }, "message": "isdn/gigaset: ratelimit CAPI message dumps\n\nIntroduce a global ratelimit for CAPI message dumps to protect\nagainst possible log flood.\nDrop the ratelimit for ignored messages which is now covered by the\nglobal one.\n\nSigned-off-by: Tilman Schmidt \u003ctilman@imap.cc\u003e\nCC: stable \u003cstable@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c430a727fa512500a422ffe4712166c550ea06a", "tree": "5027e4edc9c66a9e49e0e73ba866f5bb326fadcd", "parents": [ "6eddcb4c82883451aec3be1240f17793370fa62f" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon May 07 15:39:06 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 19:21:29 2012 -0400" }, "message": "net: compare_ether_addr[_64bits]() has no ordering\n\nNeither compare_ether_addr() nor compare_ether_addr_64bits()\n(as it can fall back to the former) have comparison semantics\nlike memcmp() where the sign of the return value indicates sort\norder. We had a bug in the wireless code due to a blind memcmp\nreplacement because of this.\n\nA cursory look suggests that the wireless bug was the only one\ndue to this semantic difference.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a05ba0812f7a456b3eddf74b127c0d8791742a7", "tree": "817cceca66e13db35dd525dc3e61a408e6e7b528", "parents": [ "ec47ea82477404631d49b8e568c71826c9b663ac", "e1abc1bb85549ed5a01a7f49a488002dbe52486c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 11:47:51 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 11:47:51 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next\n" }, { "commit": "ec47ea82477404631d49b8e568c71826c9b663ac", "tree": "8b7890f23ad078d9eccbd4571e0b2da86b04a6a0", "parents": [ "3e24591a19bbda6fcb2cbe383b41b4ba794501bf" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Fri May 04 14:26:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 06 13:13:19 2012 -0400" }, "message": "skb: Add inline helper for getting the skb end offset from head\n\nWith the recent changes for how we compute the skb truesize it occurs to me\nwe are probably going to have a lot of calls to skb_end_pointer -\nskb-\u003ehead. Instead of running all over the place doing that it would make\nmore sense to just make it a separate inline skb_end_offset(skb) that way\nwe can return the correct value without having gcc having to do all the\noptimization to cancel out skb-\u003ehead - skb-\u003ehead.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e24591a19bbda6fcb2cbe383b41b4ba794501bf", "tree": "57cb4a46c8b94397c45ac2e9c43440aae6043015", "parents": [ "9202e31d4632d82bd713fbd7d3fd229c0cd5b9cf" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Fri May 04 14:26:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 06 13:13:19 2012 -0400" }, "message": "skb: Drop \"fastpath\" variable for skb_cloned check in pskb_expand_head\n\nSince there is now only one spot that actually uses \"fastpath\" there isn\u0027t\nmuch point in carrying it. Instead we can just use a check for skb_cloned\nto verify if we can perform the fast-path free for the head or not.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9202e31d4632d82bd713fbd7d3fd229c0cd5b9cf", "tree": "b56378a2c426de615808b32e195b77623d664b3b", "parents": [ "bd14b1b2e29bd6812597f896dde06eaf7c6d2f24" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Fri May 04 14:26:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 06 13:13:19 2012 -0400" }, "message": "skb: Drop bad code from pskb_expand_head\n\nThe fast-path for pskb_expand_head contains a check where the size plus the\nunaligned size of skb_shared_info is compared against the size of the data\nbuffer. This code path has two issues. First is the fact that after the\nrecent changes by Eric Dumazet to __alloc_skb and build_skb the shared info\nis always placed in the optimal spot for a buffer size making this check\nunnecessary. The second issue is the fact that the check doesn\u0027t take into\naccount the aligned size of shared info. As a result the code burns cycles\ndoing a memcpy with nothing actually being shifted.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6eddcb4c82883451aec3be1240f17793370fa62f", "tree": "3cad64a55d1d02863ff574e0e7e20c9620c672d1", "parents": [ "24f06716cd5dbfc3d737ec2a24ac58ef76f68dc7" ], "author": { "name": "Bjørn Mork", "email": "bjorn@mork.no", "time": "Thu Apr 26 02:35:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 06 13:11:55 2012 -0400" }, "message": "cdc_ether: Ignore bogus union descriptor for RNDIS devices\n\nSome RNDIS devices include a bogus CDC Union descriptor pointing\nto non-existing interfaces. The RNDIS code is already prepared\nto handle devices without a CDC Union descriptor by hardwiring\nthe driver to use interfaces 0 and 1, which is correct for the\ndevices with the bogus descriptor as well. So we can reuse the\nexisting workaround.\n\nCc: Markus Kolb \u003clinux-201011@tower-net.de\u003e\nCc: Iker Salmón San Millán \u003cshaola@esdebian.org\u003e\nCc: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nCc: Oliver Neukum \u003coliver@neukum.org\u003e\nCc: 655387@bugs.debian.org\nCc: stable@vger.kernel.org\nSigned-off-by: Bjørn Mork \u003cbjorn@mork.no\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "24f06716cd5dbfc3d737ec2a24ac58ef76f68dc7", "tree": "4d5ab71ca2f173ef85eaebaab8a20a0840cddf11", "parents": [ "6e1344e8088bd2de059a0fee4e15ddf6909fd833" ], "author": { "name": "Ariel Elior", "email": "ariele@broadcom.com", "time": "Sun May 06 07:05:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 06 13:10:38 2012 -0400" }, "message": "bnx2x: bug fix when loading after SAN boot\n\nThis is a bug fix for an \"interface fails to load\" issue.\nThe issue occurs when bnx2x driver loads after UNDI driver was previously\nloaded over the chip. In such a scenario the UNDI driver is loaded and operates\nin the pre-boot kernel, within its own specific host memory address range.\nWhen the pre-boot stage is complete, the real kernel is loaded, in a new and\ndistinct host memory address range. The transition from pre-boot stage to boot\nis asynchronous from UNDI point of view.\n\nA race condition occurs when UNDI driver triggers a DMAE transaction to valid\nhost addresses in the pre-boot stage, when control is diverted to the real\nkernel. This results in access to illegal addresses by our HW as the addresses\nwhich were valid in the preboot stage are no longer considered valid.\nSpecifically, the \u0027was_error\u0027 bit in the pci glue of our device is set. This\ncauses all following pci transactions from chip to host to timeout (in\naccordance to the pci spec).\n\nSigned-off-by: Ariel Elior \u003cariele@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1abc1bb85549ed5a01a7f49a488002dbe52486c", "tree": "10bb9c0ee07569fab349bd0d0ec238367f0a3d45", "parents": [ "a61d3d14227eaa70d45a8c13d15cb9f1abe01f73" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Mon Apr 23 22:27:28 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat May 05 05:18:59 2012 -0700" }, "message": "ixgbe: dcb: IEEE PFC stats and reset logic incorrect\n\nPFC stats are only tabulated when PFC is enabled. However in IEEE\nmode the ieee_pfc pfc_tc bits were not checked and the calculation\nwas aborted.\n\nThis results in statistics not being reported through ethtool and\npossible a false Tx hang occurring when receiving pause frames.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "a61d3d14227eaa70d45a8c13d15cb9f1abe01f73", "tree": "e158550d4182733ade6bd3ffefd39508b03fa181", "parents": [ "1f56f45df9f19cdb87bb90020163046f09df9b45" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri May 04 08:52:03 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat May 05 05:07:36 2012 -0700" }, "message": "e1000e: increase version number\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "1f56f45df9f19cdb87bb90020163046f09df9b45", "tree": "be6b3056c85a34fbc98af38389390d294df79c97", "parents": [ "7b9f7e3500ae118bbd5833425e318647da8901f4" ], "author": { "name": "Richard Alpe", "email": "richard.alpe@ericsson.com", "time": "Fri Apr 20 15:24:50 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat May 05 05:05:22 2012 -0700" }, "message": "e1000e: clear REQ and GNT in EECD (82571 \u0026\u0026 82572)\n\nClear the REQ and GNT bit in the eeprom control register (EECD).\nThis is required if the eeprom is to be accessed with auto read\nEERD register.\n\nAfter a cold reset this doesn\u0027t matter but if PBIST MAC test was\nexecuted before booting, the register was left in a dirty state\n(the 2 bits where set), which caused the read operation to time out\nand returning 0.\n\nReference (page 312):\nhttp://download.intel.com/design/network/manuals/316080.pdf\n\nReported-by: Aleksandar Igic \u003caleksandar.igic@dektech.com.au\u003e\nSigned-off-by: Richard Alpe \u003crichard.alpe@ericsson.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "7b9f7e3500ae118bbd5833425e318647da8901f4", "tree": "d6734f61f08cdfa322ed328f76ee0e43d7cb884b", "parents": [ "bd14b1b2e29bd6812597f896dde06eaf7c6d2f24" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Mar 20 03:47:41 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat May 05 05:01:51 2012 -0700" }, "message": "e1000e: enable forced master/slave on 82577\n\nLike other supported (igp) PHYs, the driver needs to be able to force the\nmaster/slave mode on 82577. Since the code is the same as what already\nexists in the code flow for igp PHYs, move it to a new function to be\ncalled for both flows.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "6e1344e8088bd2de059a0fee4e15ddf6909fd833", "tree": "53ba06e9f568fabdec3d6fae02c7a11025f7f6f5", "parents": [ "8af3994e23b02ef18bde7e5174ef6d902b402677", "3c3052eac295678fd2765552c6a86d5441306cb4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 12:07:15 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 12:07:15 2012 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "bd14b1b2e29bd6812597f896dde06eaf7c6d2f24", "tree": "bd641279d50993e32da8f8d72672bce4e54820bd", "parents": [ "f45ebf3a6be9da051f078b30e7309b6788932189" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Fri May 04 05:14:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 12:05:27 2012 -0400" }, "message": "tcp: be more strict before accepting ECN negociation\n\nIt appears some networks play bad games with the two bits reserved for\nECN. This can trigger false congestion notifications and very slow\ntransferts.\n\nSince RFC 3168 (6.1.1) forbids SYN packets to carry CT bits, we can\ndisable TCP ECN negociation if it happens we receive mangled CT bits in\nthe SYN packet.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Perry Lorier \u003cperryl@google.com\u003e\nCc: Matt Mathis \u003cmattmathis@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Wilmer van der Gaast \u003cwilmer@google.com\u003e\nCc: Ankur Jain \u003cjankur@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Dave Täht \u003cdave.taht@bufferbloat.net\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f45ebf3a6be9da051f078b30e7309b6788932189", "tree": "539bb636aec1ec8542218c54866f724b39164182", "parents": [ "1ea52fbda1629216182a0b0fbee9d65e8bcedd1e" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:56:19 2012 -0400" }, "message": "mISDN: Help to identify the card\n\nWith multiple cards is hard to figure out which port caused trouble\nint the layer2 routines (e.g. got a timeout).\nNow we have the informations in the log output.\n\nSigned-off-by: Karsten Keil \u003ckkeil@linux-pingi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ea52fbda1629216182a0b0fbee9d65e8bcedd1e", "tree": "798dcc87b7ac3c8683fa73e6eb06ee0c5f8c7e77", "parents": [ "c626c127279b265ab293348763e043864d58d42c" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:55:39 2012 -0400" }, "message": "mISDN: Layer1 statemachine fix\n\nThe timer3 and the activation delay timer need to be independent.\nIf timer3 fires do not reqest power up we have to send only INFO 0.\nNow layer1 pass TBR3 again.\n\nSigned-off-by: Karsten Keil \u003ckkeil@linux-pingi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c626c127279b265ab293348763e043864d58d42c", "tree": "476fa67d42bff3a1a27d97818fa66d16bf501a88", "parents": [ "8423e6b212a19d5f02232855dec73196297b5ee9" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:55:05 2012 -0400" }, "message": "mISDN: Make layer1 timer 3 value configurable\n\nFor certification test it is very useful to change the layer1\ntimer3 value on runtime.\n\nSigned-off-by: Karsten Keil \u003ckkeil@linux-pingi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8423e6b212a19d5f02232855dec73196297b5ee9", "tree": "bb244d8d7743d2c078fe817d25a3ae4a37ca3d39", "parents": [ "7ed80fe45d42678fb234bf9d18de6a98cfa9830d" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:32 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:54:27 2012 -0400" }, "message": "mISDN: L2 timeouts need to be queued as L2 event\n\nTo be full preemptiv safe, we cannot handle a L2 timeout in the timer\ncontext itself, we should do all actions via the D-channel thread.\n\nSigned-off-by: Karsten Keil \u003ckkeil@linux-pingi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ed80fe45d42678fb234bf9d18de6a98cfa9830d", "tree": "0967e3bf027d4c90c41c7f841d520f978fca82a0", "parents": [ "82107b73eae812d8c089832b14b24ffe20a5c241" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:31 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:53:59 2012 -0400" }, "message": "mISDN: Fix refcounting bug\n\nUnder some configs it was still not possible to unload the driver,\nbecause the module use count was srewed up.\n\nSigned-off-by: Karsten Keil \u003ckeil@b1-systems.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "82107b73eae812d8c089832b14b24ffe20a5c241", "tree": "71f9aa15dea9fd37aa29cf5aa27e766c792953e3", "parents": [ "17045755193a93fbd2d97db9aad5e726fc8c2a6d" ], "author": { "name": "Andreas Eversberg", "email": "andreas@eversberg.eu", "time": "Fri May 04 04:15:30 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:53:14 2012 -0400" }, "message": "mISDN: Added PH_* state info to tei manager.\n\nTei manager reports current layer 1 state on creation.\nOn state change it reports it to the socket interface.\n\nSigned-off-by: Andreas Eversberg \u003candreas@eversberg.eu\u003e\nSigned-off-by: Karsten Keil \u003ckeil@b1-systems.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "17045755193a93fbd2d97db9aad5e726fc8c2a6d", "tree": "c12afe250c532626d752f4d894f9537e9d292d0c", "parents": [ "041441d0f0d885619d48f8f7682825ace523cf59" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Fri May 04 04:37:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:50:05 2012 -0400" }, "message": "net: sched: factorize code (qdisc_drop())\n\nUse qdisc_drop() helper where possible.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8af3994e23b02ef18bde7e5174ef6d902b402677", "tree": "760e77462115fe9bf3e14117cb34c30cb9077050", "parents": [ "0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311", "dd7f5c9e5cb24f72140206d3e5961b4cc5a84034" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 10:55:50 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 10:55:50 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net\n" }, { "commit": "dd7f5c9e5cb24f72140206d3e5961b4cc5a84034", "tree": "713bb8ea75b9ebf54a2649dcaf932a508d9d3c3e", "parents": [ "dad8a3b3eaa0c2ca25368a0b9f65edca84e27a40" ], "author": { "name": "Andrei Emeltchenko", "email": "andrei.emeltchenko@intel.com", "time": "Sun Mar 25 17:49:25 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 04:00:00 2012 -0700" }, "message": "e1000: Silence sparse warnings by correcting type\n\nSilence sparse warnings shown below:\n...\ndrivers/net/ethernet/intel/e1000/e1000_main.c:3435:17: warning:\n\tcast to restricted __le64\ndrivers/net/ethernet/intel/e1000/e1000_main.c:3435:17: warning:\n\tcast to restricted __le64\n...\n\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "dad8a3b3eaa0c2ca25368a0b9f65edca84e27a40", "tree": "cd99b9b1b78047791f7d7f34d24039032dd200b8", "parents": [ "f525c6d29501eb483f2d6f742d2f1dc0452b924d" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Mon Apr 23 12:22:39 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:58:33 2012 -0700" }, "message": "igb, ixgbe: netdev_tx_reset_queue incorrectly called from tx init path\n\nigb and ixgbe incorrectly call netdev_tx_reset_queue() from\ni{gb|xgbe}_clean_tx_ring() this sort of works in most cases except\nwhen the number of real tx queues changes. When the number of real\ntx queues changes netdev_tx_reset_queue() only gets called on the\nnew number of queues so when we reduce the number of queues we risk\ntriggering the watchdog timer and repeated device resets.\n\nSo this is not only a cosmetic issue but causes real bugs. For\nexample enabling/disabling DCB or FCoE in ixgbe will trigger this.\n\nCC: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: John Bishop \u003cjohnx.bishop@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "041441d0f0d885619d48f8f7682825ace523cf59", "tree": "c1ddc6cb296a46862093138aa1ada4c2cf8f0d0d", "parents": [ "67a79df27163a89fb1ce2191718855288071cbd2" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Thu Apr 19 17:48:48 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:25:24 2012 -0700" }, "message": "ixgbe: Update link flow control to correctly handle multiple packet buffer DCB\n\nThis change updates the link flow control configuration so that we\ncorrectly set the link flow control settings for DCB. Previously we would\nhave to call the fc_enable call 8 times, once for each packet buffer. If\nwe move that logic into the fc_enable call itself we can avoid multiple\nunnecessary register writes.\n\nThis change also corrects an issue in which we were only shifting the water\nmarks for 82599 parts by 6 instead of 10. This was resulting in us only\nusing 1/16 of the packet buffer when flow control was enabled.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "67a79df27163a89fb1ce2191718855288071cbd2", "tree": "af41e8e600339d68036fdd3a6917b7a371ad477a", "parents": [ "dd411ec4a5743f9108a4bce1b9399a856c6d0378" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Thu Apr 19 17:49:56 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:24:25 2012 -0700" }, "message": "ixgbe: Reorder link flow control functions in ixgbe_common.c\n\nWe can avoid many of the forward declarations found in ixgbe_common.c by\njust reordering things so this patch does that to help cleanup the code.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "dd411ec4a5743f9108a4bce1b9399a856c6d0378", "tree": "da2f837afd7d786e29d4d28c7989d70b18a74b7a", "parents": [ "786e9a5f590f367fffad4c528c97d1f1e155a0ef" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Fri Apr 06 04:24:50 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:20:35 2012 -0700" }, "message": "ixgbe: Use __free_pages instead of put_page to release pages\n\nThis change replaces the calls to put_page with calls to __free_page.\n\nSince the FCoE code is able to access order 1 pages I thought it would be a\ngood idea to change things over to using __free_pages since that is the\npreferred approach for freeing pages.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "786e9a5f590f367fffad4c528c97d1f1e155a0ef", "tree": "ec3a983e0061838fc11fa61a10ca78b4ff117d91", "parents": [ "d0bfcdfd484229c63c16cf5787a9e4211a61cc26" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Wed Mar 28 08:03:48 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:19:29 2012 -0700" }, "message": "ixgbe: Make ixgbe_fc_autoneg return void and always set current_mode\n\nThis change makes it so that ixgbe_fc_autoneg is a void and always sets the\ncurrent_mode. Previously if the link was down we would return an error,\nhowever there is no harm in simply treating a link down case as a case in\nwhich autoneg simply failed. This allows us to rely on the return value of\nthe ixgbe_fc_enable call now since there should be no cases where it\nreturns an error that would normally be ignored.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "d0bfcdfd484229c63c16cf5787a9e4211a61cc26", "tree": "759982bb2e2c0e81987145cb498358f4cfd8568f", "parents": [ "a4d4f629167ceb7ed0d7c5811d32ee75afe10612" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Wed Mar 28 08:03:43 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:18:22 2012 -0700" }, "message": "ixgbe: Reorder the ring to q_vector mapping to improve performance\n\nThis change reorders the mapping of rings to q_vectors in the case that the\nnumber of rings exceeds the number of q_vectors. Previously we would\nallocate the first R/N queues to the first q_vector where R is the number\nof rings and N is the number of q_vectors. Instead of doing this we can do\na better job of interleaving the rings to the CPUs by assigning every Nth\nring to the q_vector.\n\nThe below tables illustrate this change for the R \u003d 16 N \u003d 4 case.\n Before patch After patch\nq_vector: 0 1 2 3 0 1 2 3\nRings: 0 4 8 12 0 1 2 3\n 1 5 9 13 4 5 6 7\n 3 6 10 14 8 9 10 11\n 4 7 11 15 12 13 14 15\n\nThis should improve the performance for both DCB or ATR when the number of\nrings exceeds the number of q_vectors allocated by the adapter.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "a4d4f629167ceb7ed0d7c5811d32ee75afe10612", "tree": "3f01dcd92751689d00073932b3badbb0505d619d", "parents": [ "2fbe4526e5aafc9ffa5d85fa4749a7c5b22af6b2" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Wed Mar 28 08:03:32 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:17:21 2012 -0700" }, "message": "ixgbe: Track instances of buffer available but no DMA resources present\n\nThis change makes it so that we can track instances of where a packet was\ndropped due to a packet being received when there are no DMA buffers\navailable in the ring.\n\nFor some reason this was only being enabled with RSC, however it makes\nmore sense to always have this feature on so that we can track any cases\nwhere we might drop a buffer due to an Rx ring being full.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "2fbe4526e5aafc9ffa5d85fa4749a7c5b22af6b2", "tree": "d49b59c7ab233d3280f3054b19fbd3832a8898ca", "parents": [ "d02c70a8ee1738fc2cf6db18df065977bb44fd50" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Apr 19 03:21:47 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:15:06 2012 -0700" }, "message": "e1000e: initial support for i217\n\ni217 is the next-generation LOM that will be available on systems with the\nLynx Point Platform Controller Hub (PCH) chipset from Intel. This patch\nprovides the initial support for the device.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "d02c70a8ee1738fc2cf6db18df065977bb44fd50", "tree": "12fb8cb842cf3811cf668bc2ed8a2d847dd26372", "parents": [ "f19250883fe09dd2b6b5f818d84874837948c546" ], "author": { "name": "Matthew Vick", "email": "matthew.vick@intel.com", "time": "Wed Apr 25 04:45:57 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri May 04 03:13:36 2012 -0700" }, "message": "e1000e: Update driver version number\n\nVersion bump to 1.11.3-k.\n\nSigned-off-by: Matthew Vick \u003cmatthew.vick@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311", "tree": "9a9afdaf58ab356aa457b6f5c8a2e80c85762901", "parents": [ "65e62b502bdaee37b6ea57edc3bb0df2ad1cb858", "13176a89e1c4a0011bd9f576730b0338ecb619ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:21:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:21:05 2012 -0700" }, "message": "Merge tag \u0027mfd-for-linus-3.4-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\nPull second set of MFD fixes from Samuel Ortiz:\n \"This time we only have a one liner fixing an omap-usb build error.\"\n\n* tag \u0027mfd-for-linus-3.4-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Fix build breakage in omap-usb-host.c\n" }, { "commit": "65e62b502bdaee37b6ea57edc3bb0df2ad1cb858", "tree": "e27d0cd698c332a73c02f519e97eb3f7e43c2087", "parents": [ "6b4c555a6bebd3886a20f6947b273398fef24935", "54b3a4d311c98ad94b737802a8b5f2c8c6bfd627" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:19:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:19:48 2012 -0700" }, "message": "Merge branch \u0027efi-vars\u0027 from Matthew Garrett\n\n* efi-vars:\n efivars: Improve variable validation\n" }, { "commit": "54b3a4d311c98ad94b737802a8b5f2c8c6bfd627", "tree": "f31c73c1330a04beb085a1c30a18b102684ef8ae", "parents": [ "fec6c20b570bcf541e581fc97f2e0cbdb9725b98" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Thu May 03 16:50:46 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:19:19 2012 -0700" }, "message": "efivars: Improve variable validation\n\nBen Hutchings pointed out that the validation in efivars was inadequate -\nmost obviously, an entry with size 0 would server as a DoS against the\nkernel. Improve this based on his suggestions.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6b4c555a6bebd3886a20f6947b273398fef24935", "tree": "5226599d5b9336bfee1da8476bba7331654c8b52", "parents": [ "4e78f00261886ed2710460f5ca5253f6ab6007cf", "5f098a3ea72e73ad3733c3280fd5ee04816dc999" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:16:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:16:52 2012 -0700" }, "message": "Merge tag \u0027tag/upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\nPull libata fixes from Jeff Garzik:\n\n1) Fix regression that could cause a misdiagnosis, which in turn could\n lead to an erroneous 3.0 Gbps -\u003e 1.5 downshift, particularly when hotplug\n and suspend/resume is involved.\n\n2) Fix a regression that led to ata%d controller ids being numbered one\n larger than in \u003c\u003d 3.4-rc3 (oh, the horror!). Controller ids should now be\n as expected.\n\n3) add some DT, PCI id\u0027s\n\n4) ata/pata_arasan_cf: minor cpp fixing/cleaning\n\n* tag \u0027tag/upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n ata: ahci_platform: Add synopsys ahci controller in DT\u0027s compatible list\n ata/pata_arasan_cf: Move arasan_cf_pm_ops out of #ifdef, #endif macros\n libata: init ata_print_id to 0\n ahci: Detect Marvell 88SE9172 SATA controller\n libata: skip old error history when counting probe trials\n" }, { "commit": "4e78f00261886ed2710460f5ca5253f6ab6007cf", "tree": "7ad0858c88d92f7f82f29d164959c19520ada919", "parents": [ "f5645b5959c002303fd2480e7bcde2b5232b8f86", "1e4f0b82577e59f23484c99056c96465e202fdd5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:15:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:15:47 2012 -0700" }, "message": "Merge branch \u0027i2c-embedded/for-current\u0027 of git://git.pengutronix.de/git/wsa/linux\n\nPull i2c embedded fixes from Wolfram Sang:\n \"Here are some typical i2c driver bugfixes for 3.4. Missed clock\n handling, improper timeout fixes, hardware wrokarounds... All\n patches have been in linux-next for a few days, too.\"\n\n* \u0027i2c-embedded/for-current\u0027 of git://git.pengutronix.de/git/wsa/linux:\n i2c: mxs: disable QUEUE when sending is done\n i2c: mxs: handle spurious interrupt\n i2c-eg20t: Modify MODULE_AUTHOR\u0027s email address\n i2c-eg20t: change timeout value 50msec to 1000msec\n i2c: tegra: Add delay before resetting the controller after NACK\n i2c: pnx: Disable clk in suspend\n" }, { "commit": "f5645b5959c002303fd2480e7bcde2b5232b8f86", "tree": "3c6e8ea54e708e76bce724bdb60e6b5eac60c1fa", "parents": [ "c42f1d4b523950c4af060f8fc0c7016755d8a3bc", "addde4ec31456c5f1e9b61aae3edcfeb0f338f87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:14:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:14:55 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Just some regression fixes from Ben along with a variable that gcc\n failed to spot is uninitialised.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n nouveau: initialise has_optimus variable.\n drm/nv10/gpio: fix thinko in mask for gpio lines 2-9\n nvc0/fb: shut up PMFB interrupt after the first occurrence\n drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac\n drm/nouveau/bios: fix regression on some nv4x board\n" }, { "commit": "c42f1d4b523950c4af060f8fc0c7016755d8a3bc", "tree": "8322c9c14b0c7055ce924d12c1150d2acb0ea95e", "parents": [ "913a90416918a591e6d5ece036b795c58a08131d", "5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Transfer padding was wrong for full-speed USB in ASIX driver, fix\n from Ingo van Lil.\n\n 2) Propagate the negative packet offset fix into the PowerPC BPF JIT.\n From Jan Seiffert.\n\n 3) dl2k driver\u0027s private ioctls were letting unprivileged tasks make\n MII writes and other ugly bits like that. Fix from Jeff Mahoney.\n\n 4) Fix TX VLAN and RX packet drops in ucc_geth, from Joakim Tjernlund.\n\n 5) OOPS and network namespace fixes in IPVS from Hans Schillstrom and\n Julian Anastasov.\n\n 6) Fix races and sleeping in locked context bugs in drop_monitor, from\n Neil Horman.\n\n 7) Fix link status indication in smsc95xx driver, from Paolo Pisati.\n\n 8) Fix bridge netfilter OOPS, from Peter Huang.\n\n 9) L2TP sendmsg can return on error conditions with the socket lock\n held, oops. Fix from Sasha Levin.\n\n10) udp_diag should return meaningful values for socket memory usage,\n from Shan Wei.\n\n11) Eric Dumazet is so awesome he gets his own section:\n\n Socket memory cgroup code (I never should have applied those\n patches, grumble...) made erroneous changes to\n sk_sockets_allocated_read_positive(). It was changed to\n use percpu_counter_sum_positive (which requires BH disabling)\n instead of percpu_counter_read_positive (which does not).\n Revert back to avoid crashes and lockdep warnings.\n\n Adjust the default tcp_adv_win_scale and tcp_rmem[2] values\n to fix throughput regressions. This is necessary as a result\n of our more precise skb-\u003etruesize tracking.\n\n Fix SKB leak in netem packet scheduler.\n\n12) New device IDs for various bluetooth devices, from Manoj Iyer,\n AceLan Kao, and Steven Harms.\n\n13) Fix command completion race in ipw2200, from Stanislav Yakovlev.\n\n14) Fix rtlwifi oops on unload, from Larry Finger.\n\n15) Fix hard_mtu when adjusting hard_header_len in smsc95xx driver.\n From Stephane Fillod.\n\n16) ehea driver registers it\u0027s IRQ before all the necessary state is\n setup, resulting in crashes. Fix from Thadeu Lima de Souza\n Cascardo.\n\n17) Fix PHY connection failures in davinci_emac driver, from Anatolij\n Gustschin.\n\n18) Missing break; in switch statement in bluetooth\u0027s\n hci_cmd_complete_evt(). Fix from Szymon Janc.\n\n19) Fix queue programming in iwlwifi, from Johannes Berg.\n\n20) Interrupt throttling defaults not being actually programmed into the\n hardware, fix from Jeff Kirsher and Ying Cai.\n\n21) TLAN driver SKB encoding in descriptor busted on 64-bit, fix from\n Benjamin Poirier.\n\n22) Fix blind status block RX producer pointer deref in TG3 driver, from\n Matt Carlson.\n\n23) Promisc and multicast are busted on ehea, fixes from Thadeu Lima de\n Souza Cascardo.\n\n24) Fix crashes in 6lowpan, from Alexander Smirnov.\n\n25) tcp_complete_cwr() needs to be careful to not rewind the CWND to\n ssthresh if ssthresh has the \"infinite\" value. Fix from Yuchung\n Cheng.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)\n sungem: Fix WakeOnLan\n tcp: change tcp_adv_win_scale and tcp_rmem[2]\n net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n drop_monitor: prevent init path from scheduling on the wrong cpu\n usbnet: fix failure handling in usbnet_probe\n usbnet: fix leak of transfer buffer of dev-\u003einterrupt\n ucc_geth: Add 16 bytes to max TX frame for VLANs\n net: ucc_geth, increase no. of HW RX descriptors\n netem: fix possible skb leak\n sky2: fix receive length error in mixed non-VLAN/VLAN traffic\n sky2: propogate rx hash when packet is copied\n net: fix two typos in skbuff.h\n cxgb3: Don\u0027t call cxgb_vlan_mode until q locks are initialized\n ixgbe: fix calling skb_put on nonlinear skb assertion bug\n ixgbe: Fix a memory leak in IEEE DCB\n igbvf: fix the bug when initializing the igbvf\n smsc75xx: enable mac to detect speed/duplex from phy\n smsc75xx: declare smsc75xx\u0027s MII as GMII capable\n smsc75xx: fix phy interrupt acknowledge\n smsc75xx: fix phy init reset loop\n ...\n" }, { "commit": "913a90416918a591e6d5ece036b795c58a08131d", "tree": "f33a75b6d08ffe24ddcc57e35635d0f7ee37693f", "parents": [ "ac001e76546523ec2ef05b2f7001d8fdc588d069", "bdc71c9a87b898e4c380c23b2e3e18071312ecde" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:08:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:08:58 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon fixes from Guenter Roeck:\n \"Fix OOPS seen in coretemp driver if the CPU core ID is too large\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (coretemp) Increase CPU core limit\n hwmon: (coretemp) fix oops on cpu unplug\n" }, { "commit": "f19250883fe09dd2b6b5f818d84874837948c546", "tree": "028b8107cafab2d25983448c7dade4d795386b4d", "parents": [ "64e771bbea58f57e3f14d8942561def7435cebc9" ], "author": { "name": "Sebastian Andrzej Siewior", "email": "bigeasy@linutronix.de", "time": "Thu May 03 20:22:00 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 03 14:54:50 2012 -0400" }, "message": "net/niu: remove one superfluous dma mask check\n\nThe idea here seems to be to get a 44bit DMA mask working and if this\nfails it should fallback to a 32bit DMA mask. The dma_mask variable is\nassigned once to 44bit and never updated. pci_set_dma_mask() and\npci_set_consistent_dma_mask() are both implemented as functions so there\nis no evil macro which might update dma_mask. Looking at the assembly, I\nsee a call to dma_set_mask() followed by dma_supported() and then a jump\npassed the second dma_set_mask(). The only way to get to second\ndma_set_mask() call is by an error code in the first one.\n\nSo I hereby remove the check since it looks superfluous. Please ignore\nthe path if there is black magic involved.\n\nSigned-off-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5f098a3ea72e73ad3733c3280fd5ee04816dc999", "tree": "b88d1396908fa18afe34801335d9cde560f61b1f", "parents": [ "fb9751d471977be402efa1ee5885a17af78cbc55" ], "author": { "name": "Viresh Kumar", "email": "viresh.linux@gmail.com", "time": "Sat Apr 21 17:40:12 2012 +0530" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu May 03 14:08:53 2012 -0400" }, "message": "ata: ahci_platform: Add synopsys ahci controller in DT\u0027s compatible list\n\nSPEAr13xx series of SoCs contain Synopsys AHCI SATA Controller which shares\nahci_platform driver with other controller versions.\n\nThis patch updates DT compatible list for ahci_platform. It also updates and\nrenames binding documentation to more generic name.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "fb9751d471977be402efa1ee5885a17af78cbc55", "tree": "e0ed14418493783f3bba9e2cd6a373e5619785b2", "parents": [ "a78f57af610ea20559e6c63d90876bc262fdbf37" ], "author": { "name": "Viresh Kumar", "email": "viresh.linux@gmail.com", "time": "Sat Apr 21 17:40:09 2012 +0530" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu May 03 14:08:03 2012 -0400" }, "message": "ata/pata_arasan_cf: Move arasan_cf_pm_ops out of #ifdef, #endif macros\n\n#ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move\nthis definition and its usage outside of them.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "a78f57af610ea20559e6c63d90876bc262fdbf37", "tree": "4eed82973a1aa9423d15683801495c4ef8719956", "parents": [ "642d89252201c4155fc3946bf9cdea409e5d263e" ], "author": { "name": "Tero Roponen", "email": "tero.roponen@gmail.com", "time": "Sun Apr 22 11:38:00 2012 +0300" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu May 03 14:07:59 2012 -0400" }, "message": "libata: init ata_print_id to 0\n\nWhen comparing the dmesg between 3.4-rc3 and 3.4-rc4 I found the\nfollowing differences:\n\n -ata1: SATA max UDMA/133 abar m2048@0xf9fff000 port 0xf9fff100 irq 47\n -ata2: SATA max UDMA/133 abar m2048@0xf9fff000 port 0xf9fff180 irq 47\n -ata3: DUMMY\n +ata2: SATA max UDMA/133 abar m2048@0xf9fff000 port 0xf9fff100 irq 47\n +ata3: SATA max UDMA/133 abar m2048@0xf9fff000 port 0xf9fff180 irq 47\n ata4: DUMMY\n ata5: DUMMY\n -ata6: SATA max UDMA/133 abar m2048@0xf9fff000 port 0xf9fff380 irq 47\n +ata6: DUMMY\n +ata7: SATA max UDMA/133 abar m2048@0xf9fff000 port 0xf9fff380 irq 47\n\nThe change of numbering comes from commit 85d6725b7c0d7e3f (\"libata:\nmake ata_print_id atomic\") that changed lines like\n\n\tap-\u003eprint_id \u003d ata_print_id++;\n\t\tto\n\tap-\u003eprint_id \u003d atomic_inc_return(\u0026ata_print_id);\n\nAs the latter behaves like ++ata_print_id, we must initialize\nit to zero to start the numbering from one.\n\nSigned-off-by: Tero Roponen \u003ctero.roponen@gmail.com\u003e\nAcked-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "642d89252201c4155fc3946bf9cdea409e5d263e", "tree": "f6287317640b23fe34233e4227cb07585f73e471", "parents": [ "6868225e3e92399068be9a5f1635752d91012ad5" ], "author": { "name": "Matt Johnson", "email": "johnso87@illinois.edu", "time": "Fri Apr 27 01:42:30 2012 -0500" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu May 03 14:07:40 2012 -0400" }, "message": "ahci: Detect Marvell 88SE9172 SATA controller\n\nThe Marvell 88SE9172 SATA controller (PCI ID 1b4b 917a) already worked\nonce it was detected, but was missing an ahci_pci_tbl entry.\n\nBoot tested on a Gigabyte Z68X-UD3H-B3 motherboard.\n\nSigned-off-by: Matt Johnson \u003cjohnso87@illinois.edu\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "6868225e3e92399068be9a5f1635752d91012ad5", "tree": "c912d32e6e59f6db11b7c0d14cd5542432d0edc9", "parents": [ "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Thu May 03 22:15:07 2012 +0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu May 03 14:05:58 2012 -0400" }, "message": "libata: skip old error history when counting probe trials\n\nCommit d902747(\"[libata] Add ATA transport class\") introduced\nATA_EFLAG_OLD_ER to mark entries in the error ring as cleared.\n\nBut ata_count_probe_trials_cb() didn\u0027t check this flag and it still\ncounts the old error history. So wrong probe trials count is returned\nand it causes problem, for example, SATA link speed is slowed down from\n3.0Gbps to 1.5Gbps.\n\nFix it by checking ATA_EFLAG_OLD_ER in ata_count_probe_trials_cb().\n\nCc: stable \u003cstable@vger.kernel.org\u003e # 2.6.37+\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "64e771bbea58f57e3f14d8942561def7435cebc9", "tree": "6f855692c0366dc91d6f7de2428a12f90cf5a73e", "parents": [ "3a7c1ee4ab89f9250b8f82656a7be0ae14aa3691", "9cd9130d4406a3b1a9226f6d5f8df264f7442a08" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 03 13:30:11 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 03 13:30:11 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next\n" }, { "commit": "3a7c1ee4ab89f9250b8f82656a7be0ae14aa3691", "tree": "9dc10e067f2364fd3590b38cd5db495cd09c32e6", "parents": [ "715dc1f342713816d1be1c37643a2c9e6ee181a7" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Thu May 03 01:09:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 03 13:18:37 2012 -0400" }, "message": "skb: Add skb_head_is_locked helper function\n\nThis patch adds support for a skb_head_is_locked helper function. It is\nmeant to be used any time we are considering transferring the head from\nskb-\u003ehead to a paged frag. If the head is locked it means we cannot remove\nthe head from the skb so it must be copied or we must take the skb as a\nwhole.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "715dc1f342713816d1be1c37643a2c9e6ee181a7", "tree": "493d46be738d5cacba3ba110c2aa35e58e53cb93", "parents": [ "af94bf6db1d58d26f1cdab145b6312ad363254a6" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed May 02 23:33:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 03 13:18:37 2012 -0400" }, "message": "net: Fix truesize accounting in skb_gro_receive()\n\nGRO is very optimistic in skb truesize estimates, only taking into\naccount the used part of fragments.\n\nBe conservative, and use more precise computation, so that bloated GRO\nskbs can be collapsed eventually.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nCc: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nAcked-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c3052eac295678fd2765552c6a86d5441306cb4", "tree": "2feebdcde51f65dc25334fd56cc33e1547a86930", "parents": [ "5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca", "ed90542b0ce5415050c6fbfca324bccaafa69f2f" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 03 11:23:15 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 03 11:23:15 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "ed90542b0ce5415050c6fbfca324bccaafa69f2f", "tree": "bc8426e780dd399259af2f8ba6e775b613714dc8", "parents": [ "9d1ceac5c6f7e77ea914de376ec17ced3eb22e5f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Mar 24 00:29:46 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 03 10:52:30 2012 -0400" }, "message": "iwlwifi: fix skb truesize underestimation\n\nBy default, iwlwifi uses order-1 pages (8 KB) to store incoming frames,\nbut doesnt say so in skb-\u003etruesize.\n\nThis makes very possible to exhaust kernel memory since these skb evade\nnormal socket memory accounting.\n\nAs struct ieee80211_hdr is going to be pulled before calling IP stack,\nthere is no need to use dev_alloc_skb() to reserve NET_SKB_PAD bytes.\nalloc_skb() is ok in this driver, allowing more tailroom.\n\nPull beginning of frame in skb header, in the hope we can reuse order-1\npages in the driver immediately for small frames and reduce their\ntruesize to the minimum (linear skbs)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nCc: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f525c6d29501eb483f2d6f742d2f1dc0452b924d", "tree": "236fa0d16d15c700488f772acb5b509cf65616ad", "parents": [ "ab6039a70bb559b2fb5f363934da67d864ccda2a" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Apr 18 22:42:27 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 03:04:13 2012 -0700" }, "message": "ixgbe: dcb: BIT_APP_UPCHG not set by ixgbe_copy_dcb_cfg()\n\nAfter this commit:\n\ncommit aacc1bea190d731755a65cb8ec31dd756f4e263e\nAuthor: Multanen, Eric W \u003ceric.w.multanen@intel.com\u003e\nDate: Wed Mar 28 07:49:09 2012 +0000\n\n ixgbe: driver fix for link flap\n\nThe BIT_APP_UPCHG bit is no longer set when ixgbe_dcbnl_set_all() is\ncalled. This results in the FCoE app user priority never getting set\nand the driver will not configure the tx_rings correctly for FCoE\npackets which use the SAN MTU and FCoE offloads.\n\nWe resolve this regression by fixing ixgbe_copy_dcb_cfg() to also\ncheck for FCoE application changes. Additionally, we can drop the\nIEEE variants of get_dcb_app() because this path is never called\nwith the IEEE mode enabled.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "ab6039a70bb559b2fb5f363934da67d864ccda2a", "tree": "4d5530f6cd86d1f255691add0d1be18a44a20f72", "parents": [ "5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca" ], "author": { "name": "Don Skidmore", "email": "donald.c.skidmore@intel.com", "time": "Sat Mar 17 05:51:52 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 03:02:43 2012 -0700" }, "message": "ixgbe: fix race condition with shutdown\n\nIt was possible for shutdown to pull the rug out from other driver entry\npoints. Now we just grab the rtnl lock before taking everything apart.\nThanks to Hariharan for noticing this tight race condition.\n\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nCc: Hariharan Nagarajan \u003chanagara@cisco.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "9cd9130d4406a3b1a9226f6d5f8df264f7442a08", "tree": "1ea6f5894c348567af8f2a43167281c4b1dc67e1", "parents": [ "795180d8bf9285bf2308123c21ea59ebc6dcefa2" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Tue Apr 17 04:29:39 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 02:38:38 2012 -0700" }, "message": "ixgbevf: Update version string\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "795180d8bf9285bf2308123c21ea59ebc6dcefa2", "tree": "fc90954d81701a6cc67b52aa3411b89618b19b39", "parents": [ "31a1b3758e41d225695222793e5947e13ddcaba2" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Tue Apr 17 04:29:34 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 02:37:20 2012 -0700" }, "message": "ixgbevf: Make sure jumbo frames are set correctly after PF reset\n\nIf the Physical Function (PF) resets after the VF has set jumbo\nframe MTU then the VF jumbo frame is overwritten. Make sure the\nVF driver always requests proper MTU size after reset\nsynchronization.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Sibai Li \u003csibai.li@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "31a1b3758e41d225695222793e5947e13ddcaba2", "tree": "3a5bfddeace5f3c0abc15de83b7747354caa95e2", "parents": [ "59aed95263bdd0e2b48eb9be5a94346d2d4abf90" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Tue Apr 10 01:56:37 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 02:36:07 2012 -0700" }, "message": "ixgbevf: Add support to recognize 100mb link speed\n\nThe X540 10Gig controller is capable of linking at 100Mbits - add\nsupport for reporting that link speed.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Sibai Li \u003csibai.li@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "59aed95263bdd0e2b48eb9be5a94346d2d4abf90", "tree": "73b9473fafa2bed2e325cb323fb4c3dbb139adab", "parents": [ "d4a4206ebbaf48b55803a7eb34e330530d83a889" ], "author": { "name": "Chris Boot", "email": "bootc@bootc.net", "time": "Tue Apr 24 07:24:58 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 02:32:36 2012 -0700" }, "message": "e1000e: Remove special case for 82573/82574 ASPM L1 disablement\n\nFor the 82573, ASPM L1 gets disabled wholesale so this special-case code\nis not required. For the 82574 the previous patch does the same as for\nthe 82573, disabling L1 on the adapter. Thus, this code is no longer\nrequired and can be removed.\n\nSigned-off-by: Chris Boot \u003cbootc@bootc.net\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "d4a4206ebbaf48b55803a7eb34e330530d83a889", "tree": "7b3dff1ae9a5541745ae969fba32c213aa159ca3", "parents": [ "f6bd5577a39aed21cefd698bc46f70cfeaa0923c" ], "author": { "name": "Chris Boot", "email": "bootc@bootc.net", "time": "Tue Apr 24 07:24:52 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 02:31:22 2012 -0700" }, "message": "e1000e: Disable ASPM L1 on 82574\n\nASPM on the 82574 causes trouble. Currently the driver disables L0s for\nthis NIC but only disables L1 if the MTU is \u003e1500. This patch simply\ncauses L1 to be disabled regardless of the MTU setting.\n\nSigned-off-by: Chris Boot \u003cbootc@bootc.net\u003e\nCc: \"Wyborny, Carolyn\" \u003ccarolyn.wyborny@intel.com\u003e\nCc: Nix \u003cnix@esperi.org.uk\u003e\nLink: https://lkml.org/lkml/2012/3/19/362\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "f6bd5577a39aed21cefd698bc46f70cfeaa0923c", "tree": "aa5b9c51bf2d216e49e55e3f8b8b8a2557ff27c5", "parents": [ "885fe7be4b23d8b9e46cdd87148cefbec926868b" ], "author": { "name": "Matthew Vick", "email": "matthew.vick@intel.com", "time": "Wed Apr 25 08:01:05 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu May 03 02:29:04 2012 -0700" }, "message": "e1000e: Driver workaround for IPv6 Header Extension Erratum.\n\nPreviously, IPv6 extension header parsing was disabled for all devices\nsupported by e1000e when using packet split mode. However, as per a\nsilicon errata, only certain devices need this restriction and will need\nto disable IPv6 extension header parsing for all modes.\n\nSigned-off-by: Matthew Vick \u003cmatthew.vick@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" } ], "next": "885fe7be4b23d8b9e46cdd87148cefbec926868b" }