)]}' { "log": [ { "commit": "597d8c717856f6094837850f3eb4850820b36451", "tree": "44c1b1115df6a80f6cee3684a01cdbc18b034134", "parents": [ "682137f7e6bc78e3c324874c0c213123ddc5e261", "9db2f1bec36805e57a003f7bb90e003815d96de8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)\n sky2: Fix oops in sky2_xmit_frame() after TX timeout\n Documentation/3c509: document ethtool support\n af_packet: Don\u0027t use skb after dev_queue_xmit()\n vxge: use pci_dma_mapping_error to test return value\n netfilter: ebtables: enforce CAP_NET_ADMIN\n e1000e: fix and commonize code for setting the receive address registers\n e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value\n e1000e: perform 10/100 adaptive IFS only on parts that support it\n e1000e: don\u0027t accumulate PHY statistics on PHY read failure\n e1000e: call pci_save_state() after pci_restore_state()\n netxen: update version to 4.0.72\n netxen: fix set mac addr\n netxen: fix smatch warning\n netxen: fix tx ring memory leak\n tcp: update the netstamp_needed counter when cloning sockets\n TI DaVinci EMAC: Handle emac module clock correctly.\n dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips\n ixgbe: Fix compiler warning about variable being used uninitialized\n netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()\n mv643xx_eth: don\u0027t include cache padding in rx desc buffer size\n ...\n\nFix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c\n" }, { "commit": "eb70df13ee52dbc0f2c0ffd8ed34a8cd27440baf", "tree": "9026781435cdaf46b8414f4596903dd7d5f2e5ae", "parents": [ "fa15e99b6bb44aa86b241a43ca8c509e91f80153" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Jan 10 22:04:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 11 15:39:42 2010 -0800" }, "message": "af_packet: Don\u0027t use skb after dev_queue_xmit()\n\ntpacket_snd() can change and kfree an skb after dev_queue_xmit(),\nwhich is illegal.\n\nWith debugging by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\n\nReported-by: Michael Breuer \u003cmbreuer@majjas.com\u003e\nWith help from: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nTested-by: Michael Breuer\u003cmbreuer@majjas.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e2b6d02cca533715d6be40fdfc32d3cc47333358", "tree": "0b5acc01e1d464f4bd9c133f7cee0de3df7cbc61", "parents": [ "9035a6450d124a7787e5e3272b630a79d201555f", "56335936de1a41c8978fde62b2158af77ddc7258" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 08 13:55:14 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 08 13:55:14 2010 -0800" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n nfs: fix oops in nfs_rename()\n sunrpc: fix build-time warning\n sunrpc: on successful gss error pipe write, don\u0027t return error\n SUNRPC: Fix the return value in gss_import_sec_context()\n SUNRPC: Fix up an error return value in gss_import_sec_context_kerberos()\n" }, { "commit": "31b683b6444c4d207126b07f433e0e66da142264", "tree": "928c76934b43ef60ea62c22a340ad09b210a996b", "parents": [ "b7a9216c5a3205a6d721972bfd012c4eb5950e9c", "dce766af541f6605fa9889892c0280bab31c66ab" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 13:15:47 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 13:15:47 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "dce766af541f6605fa9889892c0280bab31c66ab", "tree": "fd9a11a09bf038336429f33dc092333aa745edb1", "parents": [ "aaff23a95aea5f000895f50d90e91f1e2f727002" ], "author": { "name": "Florian Westphal", "email": "fwestphal@astaro.com", "time": "Fri Jan 08 17:31:24 2010 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 08 17:31:24 2010 +0100" }, "message": "netfilter: ebtables: enforce CAP_NET_ADMIN\n\nnormal users are currently allowed to set/modify ebtables rules.\nRestrict it to processes with CAP_NET_ADMIN.\n\nNote that this cannot be reproduced with unmodified ebtables binary\nbecause it uses SOCK_RAW.\n\nSigned-off-by: Florian Westphal \u003cfwestphal@astaro.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "704da560c0a0120d8869187f511491a00951a1d3", "tree": "9dddcbc4142ca794d065f366a69cf523abe3f4b1", "parents": [ "1ca518b64b4b5865b677f292322e893fa89997d4" ], "author": { "name": "Octavian Purdila", "email": "opurdila@ixiacom.com", "time": "Fri Jan 08 00:00:09 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 00:00:09 2010 -0800" }, "message": "tcp: update the netstamp_needed counter when cloning sockets\n\nThis fixes a netstamp_needed accounting issue when the listen socket\nhas SO_TIMESTAMP set:\n\n s \u003d socket(AF_INET, SOCK_STREAM, 0);\n setsockopt(s, SOL_SOCKET, SO_TIMESTAMP, 1); -\u003e netstamp_needed \u003d 1\n bind(s, ...);\n listen(s, ...);\n s2 \u003d accept(s, ...); -\u003e netstamp_needed \u003d 1\n close(s2); -\u003e netstamp_needed \u003d 0\n close(s); -\u003e netstamp_needed \u003d -1\n\nSigned-off-by: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aaff23a95aea5f000895f50d90e91f1e2f727002", "tree": "54b592b3a7f05517a6ce9854c07b7f5b959d36fb", "parents": [ "04bcef2a83f40c6db24222b27a52892cba39dffb" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 07 18:33:18 2010 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 07 18:33:18 2010 +0100" }, "message": "netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()\n\nAs noticed by Dan Carpenter \u003cerror27@gmail.com\u003e, update_nl_seq()\ncurrently contains an out of bounds read of the seq_aft_nl array\nwhen looking for the oldest sequence number position.\n\nFix it to only compare valid positions.\n\nCc: stable@kernel.org\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "7ad6848c7e81a603605fad3f3575841aab004eea", "tree": "c95cc3473a2c47d6dedbbe5bc1a298546fc4127f", "parents": [ "58933c643f86651decc4818cf680f9ec3b0460d2" ], "author": { "name": "Octavian Purdila", "email": "opurdila@ixiacom.com", "time": "Wed Jan 06 20:37:01 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 06 20:37:01 2010 -0800" }, "message": "ip: fix mc_loop checks for tunnels with multicast outer addresses\n\nWhen we have L3 tunnels with different inner/outer families\n(i.e. IPV4/IPV6) which use a multicast address as the outer tunnel\ndestination address, multicast packets will be loopbacked back to the\nsending socket even if IP*_MULTICAST_LOOP is set to disabled.\n\nThe mc_loop flag is present in the family specific part of the socket\n(e.g. the IPv4 or IPv4 specific part). setsockopt sets the inner\nfamily mc_loop flag. When the packet is pushed through the L3 tunnel\nit will eventually be processed by the outer family which if different\nwill check the flag in a different part of the socket then it was set.\n\nSigned-off-by: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93939f4e5df30e6229a0b5257fdcaf3faf88471c", "tree": "f30acb3e4a35ea96b342f3b1dd25700e7b531def", "parents": [ "b1c0ec8966fa79891b796f58bf2bda1026ca5566", "b292cf9ce70d221c3f04ff62db5ab13d9a249ca8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 06 18:10:15 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 06 18:10:15 2010 -0800" }, "message": "Merge branch \u0027for-2.6.33\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.33\u0027 of git://linux-nfs.org/~bfields/linux:\n sunrpc: fix peername failed on closed listener\n nfsd: make sure data is on disk before calling -\u003efsync\n nfsd: fix \"insecure\" export option\n" }, { "commit": "b292cf9ce70d221c3f04ff62db5ab13d9a249ca8", "tree": "00da53660b4b14d9310905d4cae9c63ec6588054", "parents": [ "7211a4e859ad070b28545c06e0a6cb60b3b8aa31" ], "author": { "name": "Xiaotian Feng", "email": "dfeng@redhat.com", "time": "Thu Dec 31 10:52:36 2009 +0800" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Wed Jan 06 17:38:04 2010 -0500" }, "message": "sunrpc: fix peername failed on closed listener\n\nThere\u0027re some warnings of \"nfsd: peername failed (err 107)!\"\nsocket error -107 means Transport endpoint is not connected.\nThis warning message was outputed by svc_tcp_accept() [net/sunrpc/svcsock.c],\nwhen kernel_getpeername returns -107. This means socket might be CLOSED.\n\nAnd svc_tcp_accept was called by svc_recv() [net/sunrpc/svc_xprt.c]\n\n if (test_bit(XPT_LISTENER, \u0026xprt-\u003expt_flags)) {\n \u003csnip\u003e\n newxpt \u003d xprt-\u003expt_ops-\u003expo_accept(xprt);\n \u003csnip\u003e\n\nSo this might happen when xprt-\u003expt_flags has both XPT_LISTENER and XPT_CLOSE.\n\nLet\u0027s take a look at commit b0401d72, this commit has moved the close\nprocessing after do recvfrom method, but this commit also introduces this\nwarnings, if the xpt_flags has both XPT_LISTENER and XPT_CLOSED, we should\nclose it, not accpet then close.\n\nSigned-off-by: Xiaotian Feng \u003cdfeng@redhat.com\u003e\nCc: J. Bruce Fields \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: stable@kernel.org\nSigned-off-by: J. Bruce Fields \u003cbfields@citi.umich.edu\u003e\n" }, { "commit": "6c8530993e1fdf1d6af0403e796fe14d80b4b097", "tree": "1f4e2b4bbc1087684696e41c2f8304d2aaaae179", "parents": [ "486bad2e40e938cd68fd853b7a9fa3115a9d3a4a" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Jan 06 17:26:27 2010 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Jan 06 17:30:05 2010 -0500" }, "message": "sunrpc: fix build-time warning\n\nFix auth_gss printk format warning:\n\nnet/sunrpc/auth_gss/auth_gss.c:660: warning: format \u0027%ld\u0027 expects type \u0027long int\u0027, but argument 3 has type \u0027ssize_t\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "04bcef2a83f40c6db24222b27a52892cba39dffb", "tree": "0fdd15422ad26fa2b49f0712c73495477ed8b838", "parents": [ "ae24e578de02b87cce3dc59248c29b2ecb071e9e" ], "author": { "name": "Arjan van de Ven", "email": "arjan@linux.intel.com", "time": "Mon Jan 04 16:37:12 2010 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jan 04 16:37:12 2010 +0100" }, "message": "ipvs: Add boundary check on ioctl arguments\n\nThe ipvs code has a nifty system for doing the size of ioctl command\ncopies; it defines an array with values into which it indexes the cmd\nto find the right length.\n\nUnfortunately, the ipvs code forgot to check if the cmd was in the\nrange that the array provides, allowing for an index outside of the\narray, which then gives a \"garbage\" result into the length, which\nthen gets used for copying into a stack buffer.\n\nFix this by adding sanity checks on these as well as the copy size.\n\n[ horms@verge.net.au: adjusted limit to IP_VS_SO_GET_MAX ]\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "8ffd32083c849dcf476e56e6c5f728c80797ecdd", "tree": "a721db1db6b73c458c3602747d59c27197f655dd", "parents": [ "1f731b63752dac76ff4dbf568a08ff2e3663316f" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon Dec 21 14:25:06 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 03 21:25:53 2010 -0800" }, "message": "net/sctp/socket.c: squish warning\n\nnet/sctp/socket.c: In function \u0027sctp_setsockopt_autoclose\u0027:\nnet/sctp/socket.c:2090: warning: comparison is always false due to limited range of data type\n\nCc: Andrei Pelinescu-Onciul \u003candrei@iptel.org\u003e\nCc: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1f731b63752dac76ff4dbf568a08ff2e3663316f", "tree": "452db46db4863269d7368afcafdf2f071c803c11", "parents": [ "35bb5cadc8c7b1462df57e32e08d964f1be7a75c" ], "author": { "name": "Bernard Pidoux F6BVP", "email": "f6bvp@free.fr", "time": "Thu Dec 17 05:25:18 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 03 21:21:16 2010 -0800" }, "message": "rose_loopback_timer sets VC number \u003c\u003d ROSE_DEFAULT_MAXVC\n\ncat /proc/net/rose displayed a rose sockets abnormal lci value, i.e.\ngreater than maximum number of VCs per neighbour allowed.\nThis number prevents further test of lci value during rose operations.\n\nExample (lines shortened) :\n[bernard]# cat /proc/net/rose\ndest_addr dest_call src_addr src_call dev lci neigh st vs vr va\n* * 2080175520 F6BVP-1 rose0 000 00000 0 0 0 0\n2080175520 FPAD-0 2080175520 WP-0 rose0 FFE 00001 3 0 0 0\n\nHere are the default parameters :\n\nlinux/include/net/rose.h:#define ROSE_DEFAULT_MAXVC 50 /* Maximum number of VCs per neighbour */\nlinux/net/rose/af_rose.c:int sysctl_rose_maximum_vcs \u003d ROSE_DEFAULT_MAXVC;\n\nWith the following patch, rose_loopback_timer() attributes a VC number\nwithin limits.\n\nSigned-off-by: Bernard Pidoux \u003cf6bvp@amsat.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c3bf4906fba0d8871572b3f50fc036aade093e4d", "tree": "90d673b38febfa503085bba10515f6bc51b490a0", "parents": [ "f39edadd1533713a5ed8ba31887ea6c93d137083", "7f9d3577e2603ca279c3176b696eba392f21cbe2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 30 12:37:35 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 30 12:37:35 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (74 commits)\n Revert \"b43: Enforce DMA descriptor memory constraints\"\n iwmc3200wifi: fix array out-of-boundary access\n wl1251: timeout one too soon in wl1251_boot_run_firmware()\n mac80211: fix propagation of failed hardware reconfigurations\n mac80211: fix race with suspend and dynamic_ps_disable_work\n ath9k: fix missed error codes in the tx status check\n ath9k: wake hardware during AMPDU TX actions\n ath9k: wake hardware for interface IBSS/AP/Mesh removal\n ath9k: fix suspend by waking device prior to stop\n cfg80211: fix error path in cfg80211_wext_siwscan\n wl1271_cmd.c: cleanup char \u003d\u003e u8\n iwlwifi: Storage class should be before const qualifier\n ath9k: Storage class should be before const qualifier\n cfg80211: fix race between deauth and assoc response\n wireless: remove remaining qual code\n rt2x00: Add USB ID for Linksys WUSB 600N rev 2.\n ath5k: fix SWI calibration interrupt storm\n mac80211: fix ibss join with fixed-bssid\n libertas: Remove carrier signaling from the scan code\n orinoco: fix GFP_KERNEL in orinoco_set_key with interrupts disabled\n ...\n" }, { "commit": "7f9d3577e2603ca279c3176b696eba392f21cbe2", "tree": "e2135eddba600910cdebb54c8b01de53473ecefb", "parents": [ "96c5340147584481ef0c0afbb5423f7563c1d24a", "55afc80b2ab100618c17af77915f75307b6bd5d1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 29 19:44:25 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 29 19:44:25 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "24feda0084722189468a65e20019cdd8ef99702b", "tree": "815fdd018e7b1146546dc520208567cae75dd398", "parents": [ "b98c06b6debfe84c90200143bb1102f312f50a33" ], "author": { "name": "Luis R. Rodriguez", "email": "lrodriguez@atheros.com", "time": "Thu Dec 24 15:38:22 2009 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 28 16:20:05 2009 -0500" }, "message": "mac80211: fix propagation of failed hardware reconfigurations\n\nmac80211 does not propagate failed hardware reconfiguration\nrequests. For suspend and resume this is important due to all\nthe possible issues that can come out of the suspend \u003c-\u003e resume\ncycle. Not propagating the error means cfg80211 will assume\nthe resume for the device went through fine and mac80211 will\ncontinue on trying to poke at the hardware, enable timers,\nqueue work, and so on for a device which is completley\nunfunctional.\n\nThe least we can do is to propagate device start issues and\nwarn when this occurs upon resume. A side effect of this patch\nis we also now propagate the start errors upon harware\nreconfigurations (non-suspend), but this should also be desirable\nanyway, there is not point in continuing to reconfigure a\ndevice if mac80211 was unable to start the device.\n\nFor further details refer to the thread:\n\nhttp://marc.info/?t\u003d126151038700001\u0026r\u003d1\u0026w\u003d2\n\nCc: stable@kernel.org\nSigned-off-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b98c06b6debfe84c90200143bb1102f312f50a33", "tree": "65b8aba72d4350e3a77372e77796353a5ec3f580", "parents": [ "5b479a076de091590423a9e6dfc2584126b28761" ], "author": { "name": "Luis R. Rodriguez", "email": "lrodriguez@atheros.com", "time": "Thu Dec 24 15:26:09 2009 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 28 16:20:04 2009 -0500" }, "message": "mac80211: fix race with suspend and dynamic_ps_disable_work\n\nWhen mac80211 suspends it calls a driver\u0027s suspend callback\nas a last step and after that the driver assumes no calls will\nbe made to it until we resume and its start callback is kicked.\nIf such calls are made, however, suspend can end up throwing\nhardware in an unexpected state and making the device unusable\nupon resume.\n\nFix this by preventing mac80211 to schedule dynamic_ps_disable_work\nby checking for when mac80211 starts to suspend and starts\nquiescing. Frames should be allowed to go through though as\nthat is part of the quiescing steps and we do not flush the\nmac80211 workqueue since it was already done towards the\nbeginning of suspend cycle.\n\nThe other mac80211 issue will be hanled in the next patch.\n\nFor further details see refer to the thread:\n\nhttp://marc.info/?t\u003d126144866100001\u0026r\u003d1\u0026w\u003d2\n\nCc: stable@kernel.org\nSigned-off-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "65486c8b30498dd274eea2c542696f22b63fe5b8", "tree": "4bcbeb24ce1655c275f2e1780cacefaf2b306781", "parents": [ "befabac2d8e4925b97c5eebc78ecc4b2079fd9dd" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Wed Dec 23 15:33:35 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 28 16:19:58 2009 -0500" }, "message": "cfg80211: fix error path in cfg80211_wext_siwscan\n\nIf there\u0027s an invalid channel or SSID, the code leaks\nthe scan request. Always free the scan request, unless\nit was successfully given to the driver.\n\nReported-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nAcked-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3bdb2d48c5f58c781a4099c99044384a23620884", "tree": "055d3730d54c5f07716813bf144505f98880bc42", "parents": [ "671adc93b6472eaa0142a88d096c945f7b07893a" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Wed Dec 23 13:12:05 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 28 16:19:54 2009 -0500" }, "message": "cfg80211: fix race between deauth and assoc response\n\nJoseph Nahmias reported, in http://bugs.debian.org/562016,\nthat he was getting the following warning (with some log\naround the issue):\n\n ath0: direct probe to AP 00:11:95:77:e0:b0 (try 1)\n ath0: direct probe responded\n ath0: authenticate with AP 00:11:95:77:e0:b0 (try 1)\n ath0: authenticated\n ath0: associate with AP 00:11:95:77:e0:b0 (try 1)\n ath0: deauthenticating from 00:11:95:77:e0:b0 by local choice (reason\u003d3)\n ath0: direct probe to AP 00:11:95:77:e0:b0 (try 1)\n ath0: RX AssocResp from 00:11:95:77:e0:b0 (capab\u003d0x421 status\u003d0 aid\u003d2)\n ath0: associated\n ------------[ cut here ]------------\n WARNING: at net/wireless/mlme.c:97 cfg80211_send_rx_assoc+0x14d/0x152 [cfg80211]()\n Hardware name: 7658CTO\n ...\n Pid: 761, comm: phy0 Not tainted 2.6.32-trunk-686 #1\n Call Trace:\n [\u003cc1030a5d\u003e] ? warn_slowpath_common+0x5e/0x8a\n [\u003cc1030a93\u003e] ? warn_slowpath_null+0xa/0xc\n [\u003cf86cafc7\u003e] ? cfg80211_send_rx_assoc+0x14d/0x152\n ...\n ath0: link becomes ready\n ath0: deauthenticating from 00:11:95:77:e0:b0 by local choice (reason\u003d3)\n ath0: no IPv6 routers present\n ath0: link is not ready\n ath0: direct probe to AP 00:11:95:77:e0:b0 (try 1)\n ath0: direct probe responded\n ath0: authenticate with AP 00:11:95:77:e0:b0 (try 1)\n ath0: authenticated\n ath0: associate with AP 00:11:95:77:e0:b0 (try 1)\n ath0: RX ReassocResp from 00:11:95:77:e0:b0 (capab\u003d0x421 status\u003d0 aid\u003d2)\n ath0: associated\n\nIt is not clear to me how the first \"direct probe\" here\nhappens, but this seems to be a race condition, if the\nuser requests to deauth after requesting assoc, but before\nthe assoc response is received. In that case, it may\nhappen that mac80211 tries to report the assoc success to\ncfg80211, but gets blocked on the wdev lock that is held\nbecause the user is requesting the deauth.\n\nThe result is that we run into a warning. This is mostly\nharmless, but maybe cause an unexpected event to be sent\nto userspace; we\u0027d send an assoc success event although\nuserspace was no longer expecting that.\n\nTo fix this, remove the warning and check whether the\nrace happened and in that case abort processing.\n\nReported-by: Joseph Nahmias \u003cjoe@nahmias.net\u003e\nCc: stable@kernel.org\nCc: 562016-quiet@bugs.debian.org\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2e10d330f8d5f039fa1e00baf59435ab0f11c722", "tree": "7b2c2aeba62e99ee670d061bc926312050cdee0d", "parents": [ "659c8e5243caf14564155ad8421404f044dd8031" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sun Dec 20 19:07:09 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 28 15:56:35 2009 -0500" }, "message": "mac80211: fix ibss join with fixed-bssid\n\nWhen fixed bssid is requested when joining an ibss network, incoming\nbeacons that match the configured bssid cause mac80211 to create new\nsta entries, even before the ibss interface is in joined state.\nWhen that happens, it fails to bring up the interface entirely, because\nit checks for existing sta entries before joining.\nThis patch fixes this bug by refusing to create sta info entries before\nthe interface is fully operational.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "96c5340147584481ef0c0afbb5423f7563c1d24a", "tree": "85f4a2ddd61e28c705b4a86ff683933fe1b3d4c7", "parents": [ "c99a3d2e04c63a795e13c26d6f2982731e1f1ae0" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Fri Dec 25 23:30:02 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 26 20:24:46 2009 -0800" }, "message": "NET: XFRM: Fix spelling of neighbour.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n net/xfrm/xfrm_policy.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28f6aeea3f12d37bd258b2c0d5ba891bff4ec479", "tree": "fadf8801f14420d7aac5d0a22812da8773c7f836", "parents": [ "4a6e47a460ce55e283063fc3f7391c8ea46bea27" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Fri Dec 25 17:30:22 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 25 17:30:22 2009 -0800" }, "message": "net: restore ip source validation\n\nwhen using policy routing and the skb mark:\nthere are cases where a back path validation requires us\nto use a different routing table for src ip validation than\nthe one used for mapping ingress dst ip.\nOne such a case is transparent proxying where we pretend to be\nthe destination system and therefore the local table\nis used for incoming packets but possibly a main table would\nbe used on outbound.\nMake the default behavior to allow the above and if users\nneed to turn on the symmetry via sysctl src_valid_mark\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f466dba1832f05006cf6caa9be41fb98d11cb848", "tree": "d6bd5846aed13f269f3e6e1406b1a26abebc5bcd", "parents": [ "c0d7a0212becebe11ffe6979ee3d6f1c4104568d" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Dec 23 22:02:57 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 23 22:02:57 2009 -0800" }, "message": "pktgen: ndo_start_xmit can return NET_XMIT_xxx values\n\nThis updates pktgen so that it does not decrement skb-\u003eusers\nwhen it receives valid NET_XMIT_xxx values. These are now\nvalid return values from ndo_start_xmit in net-next-2.6.\nThey also indicate the skb has been consumed.\n\nThis fixes pktgen to work correctly with vlan devices.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7acd72eb85f1c7a15e8b5eb554994949241737f1", "tree": "76712bb9f38690d8cf9c2f91bef811e4413d1aa3", "parents": [ "e64c026dd09b73faf20707711402fc5ed55a8e70" ], "author": { "name": "Stefani Seibold", "email": "stefani@seibold.net", "time": "Mon Dec 21 14:37:28 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 22 14:17:56 2009 -0800" }, "message": "kfifo: rename kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...\n\nrename kfifo_put... into kfifo_in... to prevent miss use of old non in\nkernel-tree drivers\n\nditto for kfifo_get... -\u003e kfifo_out...\n\nImprove the prototypes of kfifo_in and kfifo_out to make the kerneldoc\nannotations more readable.\n\nAdd mini \"howto porting to the new API\" in kfifo.h\n\nSigned-off-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e64c026dd09b73faf20707711402fc5ed55a8e70", "tree": "4780736e021824f15329a0826eff3cc27d3f9646", "parents": [ "c1e13f25674ed564948ecb7dfe5f83e578892896" ], "author": { "name": "Stefani Seibold", "email": "stefani@seibold.net", "time": "Mon Dec 21 14:37:28 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 22 14:17:56 2009 -0800" }, "message": "kfifo: cleanup namespace\n\nchange name of __kfifo_* functions to kfifo_*, because the prefix __kfifo\nshould be reserved for internal functions only.\n\nSigned-off-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c1e13f25674ed564948ecb7dfe5f83e578892896", "tree": "24fac07b3e2b66dff01c3127b34077de1de4c101", "parents": [ "45465487897a1c6d508b14b904dc5777f7ec7e04" ], "author": { "name": "Stefani Seibold", "email": "stefani@seibold.net", "time": "Mon Dec 21 14:37:27 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 22 14:17:56 2009 -0800" }, "message": "kfifo: move out spinlock\n\nMove the pointer to the spinlock out of struct kfifo. Most users in\ntree do not actually use a spinlock, so the few exceptions now have to\ncall kfifo_{get,put}_locked, which takes an extra argument to a\nspinlock.\n\nSigned-off-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "45465487897a1c6d508b14b904dc5777f7ec7e04", "tree": "935c8dae68dc793ff2f795d57cf027531475cd53", "parents": [ "2ec91eec47f713e3d158ba5b28a24a85a2cf3650" ], "author": { "name": "Stefani Seibold", "email": "stefani@seibold.net", "time": "Mon Dec 21 14:37:26 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 22 14:17:55 2009 -0800" }, "message": "kfifo: move struct kfifo in place\n\nThis is a new generic kernel FIFO implementation.\n\nThe current kernel fifo API is not very widely used, because it has to\nmany constrains. Only 17 files in the current 2.6.31-rc5 used it.\nFIFO\u0027s are like list\u0027s a very basic thing and a kfifo API which handles\nthe most use case would save a lot of development time and memory\nresources.\n\nI think this are the reasons why kfifo is not in use:\n\n - The API is to simple, important functions are missing\n - A fifo can be only allocated dynamically\n - There is a requirement of a spinlock whether you need it or not\n - There is no support for data records inside a fifo\n\nSo I decided to extend the kfifo in a more generic way without blowing up\nthe API to much. The new API has the following benefits:\n\n - Generic usage: For kernel internal use and/or device driver.\n - Provide an API for the most use case.\n - Slim API: The whole API provides 25 functions.\n - Linux style habit.\n - DECLARE_KFIFO, DEFINE_KFIFO and INIT_KFIFO Macros\n - Direct copy_to_user from the fifo and copy_from_user into the fifo.\n - The kfifo itself is an in place member of the using data structure, this save an\n indirection access and does not waste the kernel allocator.\n - Lockless access: if only one reader and one writer is active on the fifo,\n which is the common use case, no additional locking is necessary.\n - Remove spinlock - give the user the freedom of choice what kind of locking to use if\n one is required.\n - Ability to handle records. Three type of records are supported:\n - Variable length records between 0-255 bytes, with a record size\n field of 1 bytes.\n - Variable length records between 0-65535 bytes, with a record size\n field of 2 bytes.\n - Fixed size records, which no record size field.\n - Preserve memory resource.\n - Performance!\n - Easy to use!\n\nThis patch:\n\nSince most users want to have the kfifo as part of another object,\nreorganize the code to allow including struct kfifo in another data\nstructure. This requires changing the kfifo_alloc and kfifo_init\nprototypes so that we pass an existing kfifo pointer into them. This\npatch changes the implementation and all existing users.\n\n[akpm@linux-foundation.org: fix warning]\nSigned-off-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ae24e578de02b87cce3dc59248c29b2ecb071e9e", "tree": "aa8bca747bb40bd0763f0fcac20ad0b2ce0f567b", "parents": [ "258c889362aa95d0ab534b38ce8c15d3009705b1" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Tue Dec 22 09:42:06 2009 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Dec 22 09:42:06 2009 +0100" }, "message": "ipvs: ip_vs_wrr.c: use lib/gcd.c\n\nRemove the private version of the greatest common divider to use\nlib/gcd.c, the latter also implementing the a \u003c b case.\n\n[akpm@linux-foundation.org: repair neighboring whitespace because the diff looked odd]\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nCc: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nAcked-by: Simon Horman \u003chorms@verge.net.au\u003e\nCc: Julius Volz \u003cjuliusv@google.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "ed4b2019a62e2208a8370461dd91ed4de2c9fc8f", "tree": "2910816b23718e9cebd20be9eae2b6876edd849b", "parents": [ "b74665606962456af7f92b1e448cee30ce70967b", "92c6f8d849178582fc527aaf1e51dd37a74767d3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 21 11:54:49 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 21 11:54:49 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "292be57e152ef6881089a62298c6ec885ed46f0e", "tree": "2f6d79a372be4d6659c7eb393cd7f57ecb1ee869", "parents": [ "1814f2da5ebd7a516805e0a62047cb45eee10bdc", "b74665606962456af7f92b1e448cee30ce70967b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 21 10:12:25 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 21 10:12:25 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n bnx2: Fix bnx2_netif_stop() merge error.\n gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC\n gianfar: Fix stats support\n gianfar: Fix a filer bug\n bnx2: fixing a timout error due not refreshing TX timers correctly\n can/at91: don\u0027t check platform_get_irq\u0027s return value against zero\n mISDN: use DECLARE_COMPLETION_ONSTACK for non-constant completion\n bnx2: reset_task is crashing the kernel. Fixing it.\n ipv6: fix an oops when force unload ipv6 module\n TI DaVinci EMAC: Fix MDIO bus frequency configuration\n e100: Fix broken cbs accounting due to missing memset.\n broadcom: bcm54xx_shadow_read() errors ignored in bcm54xx_adjust_rxrefclk()\n e1000e: LED settings in EEPROM ignored on 82571 and 82572\n netxen: use module parameter correctly\n netns: fix net.ipv6.route.gc_min_interval_ms in netns\n Bluetooth: Prevent ill-timed autosuspend in USB driver\n Bluetooth: Fix L2CAP locking scheme regression\n Bluetooth: Ack L2CAP I-frames before retransmit missing packet\n Bluetooth: Fix unset of RemoteBusy flag for L2CAP\n Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()\n" }, { "commit": "0183826b58a2712ffe608bc3302447be3e6a3ab8", "tree": "df85bb225c3260628fc99d2e1a1b42a160cd49ff", "parents": [ "9a418af5df03ad133cd8c8f6742b75e542db6392" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Thu Dec 17 16:16:53 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 21 11:32:28 2009 -0500" }, "message": "mac80211: fix WMM AP settings application\n\nMy\n commit 77fdaa12cea26c204cc12c312fe40bc0f3dcdfd8\n Author: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\n Date: Tue Jul 7 03:45:17 2009 +0200\n\n mac80211: rework MLME for multiple authentications\n\ninadvertedly broke WMM because it removed, along with\na bunch of other now useless initialisations, the line\ninitialising sdata-\u003eu.mgd.wmm_last_param_set to -1\nwhich would make it adopt any WMM parameter set. If,\nas is usually the case, the AP uses WMM parameter set\nsequence number zero, we\u0027d never update it until the\nAP changes the sequence number.\n\nAdd the missing initialisation back to get the WMM\nsettings from the AP applied locally.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: stable@kernel.org [2.6.31+]\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9a418af5df03ad133cd8c8f6742b75e542db6392", "tree": "c439a797e8fa475e348763c544f0f3be57862b56", "parents": [ "8585c2b896861aacd15337c3c7e58ad114e6cf60" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Thu Dec 17 13:55:48 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 21 11:32:27 2009 -0500" }, "message": "mac80211: fix peer HT capabilities\n\nI noticed yesterday, because Jeff had noticed\na speed regression, cf. bug\nhttp://bugzilla.intellinuxwireless.org/show_bug.cgi?id\u003d2138\nthat the SM PS settings for peers were wrong.\nInstead of overwriting the SM PS settings with\nthe local bits, we need to keep the remote bits.\n\nThe bug was part of the original HT code from\nover two years ago, but unfortunately nobody\nnoticed that it makes no sense -- we shouldn\u0027t\nbe overwriting the peer\u0027s setting with our own\nbut rather keep it intact when masking the peer\ncapabilities with our own.\n\nWhile fixing that, I noticed that the masking of\ncapabilities is completely useless for most of\nthe bits, so also fix those other bits.\n\nFinally, I also noticed that PSMP_SUPPORT no\nlonger exists in the final 802.11n version, so\nalso remove that.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3705e11a21bcdffe7422ee7870e1b23fe4ac70f4", "tree": "80212be3720cb7cab44c1c4b809dc7d4a133aecb", "parents": [ "f9c4171e01f6befdf5d15346070b819d341c9c73" ], "author": { "name": "Yang Hongyang", "email": "yanghy@cn.fujitsu.com", "time": "Fri Dec 18 20:25:13 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 18 20:25:13 2009 -0800" }, "message": "ipv6: fix an oops when force unload ipv6 module\n\nWhen I do an ipv6 module force unload,I got the following oops:\n#rmmod -f ipv6\n------------[ cut here ]------------\nkernel BUG at mm/slub.c:2969!\ninvalid opcode: 0000 [#1] SMP\nlast sysfs file: /sys/devices/pci0000:00/0000:00:11.0/0000:02:03.0/net/eth2/ifindex\nModules linked in: ipv6(-) dm_multipath uinput ppdev tpm_tis tpm tpm_bios pcspkr pcnet32 mii parport_pc i2c_piix4 parport i2c_core floppy mptspi mptscsih mptbase scsi_transport_spi\n\nPid: 2530, comm: rmmod Tainted: G R 2.6.32 #2 440BX Desktop Reference Platform/VMware Virtual Platform\nEIP: 0060:[\u003cc04b73f2\u003e] EFLAGS: 00010246 CPU: 0\nEIP is at kfree+0x6a/0xdd\nEAX: 00000000 EBX: c09e86bc ECX: c043e4dd EDX: c14293e0\nESI: e141f1d8 EDI: e140fc31 EBP: dec58ef0 ESP: dec58ed0\n DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068\nProcess rmmod (pid: 2530, ti\u003ddec58000 task\u003ddecb1940 task.ti\u003ddec58000)\nStack:\n c14293e0 00000282 df624240 c0897d08 c09e86bc c09e86bc e141f1d8 dec58f1c\n\u003c0\u003e dec58f00 e140fc31 c09e84c4 e141f1bc dec58f14 c0689d21 dec58f1c e141f1bc\n\u003c0\u003e 00000000 dec58f2c c0689eff c09e84d8 c09e84d8 e141f1bc bff33a90 dec58f38\nCall Trace:\n [\u003ce140fc31\u003e] ? ipv6_frags_exit_net+0x22/0x32 [ipv6]\n [\u003cc0689d21\u003e] ? ops_exit_list+0x19/0x3d\n [\u003cc0689eff\u003e] ? unregister_pernet_operations+0x2a/0x51\n [\u003cc0689f70\u003e] ? unregister_pernet_subsys+0x17/0x24\n [\u003ce140fbfe\u003e] ? ipv6_frag_exit+0x21/0x32 [ipv6]\n [\u003ce141a361\u003e] ? inet6_exit+0x47/0x122 [ipv6]\n [\u003cc045f5de\u003e] ? sys_delete_module+0x198/0x1f6\n [\u003cc04a8acf\u003e] ? remove_vma+0x57/0x5d\n [\u003cc070f63f\u003e] ? do_page_fault+0x2e7/0x315\n [\u003cc0403218\u003e] ? sysenter_do_call+0x12/0x28\nCode: 86 00 00 00 40 c1 e8 0c c1 e0 05 01 d0 89 45 e0 66 83 38 00 79 06 8b 40 0c 89 45 e0 8b 55 e0 8b 02 84 c0 78 14 66 a9 00 c0 75 04 \u003c0f\u003e 0b eb fe 8b 45 e0 e8 35 15 fe ff eb 5d 8b 45 04 8b 55 e0 89\nEIP: [\u003cc04b73f2\u003e] kfree+0x6a/0xdd SS:ESP 0068:dec58ed0\n---[ end trace 4475d1a5b0afa7e5 ]---\n\nIt\u0027s because in ip6_frags_ns_sysctl_register,\n\"table\" only alloced when \"net\" is not equals\nto \"init_net\".So when we free \"table\" in \nip6_frags_ns_sysctl_unregister,we should check\nthis first.\n\nThis patch fix the problem.\n\nSigned-off-by: Yang Hongyang \u003cyanghy@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c69fabe789b0eb468a0c7031ae7bb850760aea8", "tree": "037e504110bfc23d6fadecb41dc21645e8c58333", "parents": [ "652fd781a52ad6e24b908cd8b83d12699754f253" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Fri Dec 18 20:11:03 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 18 20:11:03 2009 -0800" }, "message": "netns: fix net.ipv6.route.gc_min_interval_ms in netns\n\nsysctl table was copied, all right, but -\u003edata for net.ipv6.route.gc_min_interval_ms\nwas not reinitialized for \"!\u003d \u0026init_net\" case.\n\nIn init_net everthing works by accident due to correct -\u003edata initialization\nin source table.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "486bad2e40e938cd68fd853b7a9fa3115a9d3a4a", "tree": "498636e706df917e28e62844b16ef05299c2704a", "parents": [ "b891e4a05ef6beac85465295a032431577c66b16" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Fri Dec 18 16:28:20 2009 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Dec 18 16:28:20 2009 -0500" }, "message": "sunrpc: on successful gss error pipe write, don\u0027t return error\n\nWhen handling the gssd downcall, the kernel should distinguish between a\nsuccessful downcall that contains an error code and a failed downcall\n(i.e. where the parsing failed or some other sort of problem occurred).\n\nIn the former case, gss_pipe_downcall should be returning the number of\nbytes written to the pipe instead of an error. In the event of other\nerrors, we generally want the initiating task to retry the upcall so\nwe set msg.errno to -EAGAIN. An unexpected error code here is a bug\nhowever, so BUG() in that case.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b891e4a05ef6beac85465295a032431577c66b16", "tree": "832ee6823036cdcfc7a2b52d7960faebbaa035cc", "parents": [ "14ace024b1e16d2bb9445c8387494fbbd820a738" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Dec 18 16:28:12 2009 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Dec 18 16:28:12 2009 -0500" }, "message": "SUNRPC: Fix the return value in gss_import_sec_context()\n\nIf the context allocation fails, it will return GSS_S_FAILURE, which is\nneither a valid error code, nor is it even negative.\n\nReturn ENOMEM instead...\n\nReported-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "14ace024b1e16d2bb9445c8387494fbbd820a738", "tree": "aff02ba8b2f86894cea54ab308c28e9cc04fe979", "parents": [ "55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Dec 18 16:28:05 2009 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Dec 18 16:28:05 2009 -0500" }, "message": "SUNRPC: Fix up an error return value in gss_import_sec_context_kerberos()\n\nIf the context allocation fails, the function currently returns a random\nerror code, since the variable \u0027p\u0027 still points to a valid memory location.\n\nEnsure that it returns ENOMEM...\n\nCc: stable@kernel.org\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b13f5860447a98daf0358a51fbff66154ac0663a", "tree": "fc4c752e4b8ab5649d421955de3de399953f12d9", "parents": [ "186ee8cf0130993dea8ab8867ff1af8a148f9ae6" ], "author": { "name": "Andrei Emeltchenko", "email": "andrei.emeltchenko@nokia.com", "time": "Tue Dec 15 11:38:04 2009 +0200" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Thu Dec 17 12:07:25 2009 -0800" }, "message": "Bluetooth: Fix L2CAP locking scheme regression\n\nWhen locking was introduced the error path branch was not taken\ninto account. Error was found in sparse code checking. Kudos to\nJani Nikula.\n\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@nokia.com\u003e\nAcked-by: Gustavo F. Padovan \u003cgustavo@las.ic.unicamp.br\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "186ee8cf0130993dea8ab8867ff1af8a148f9ae6", "tree": "dd65c1c454625194b85f6c458ccf96c1a7ef062a", "parents": [ "186de9a33803c7ee20d9af75c9049b50e68a3a08" ], "author": { "name": "Gustavo F. Padovan", "email": "gustavo@las.ic.unicamp.br", "time": "Tue Dec 15 20:13:27 2009 -0200" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Thu Dec 17 12:06:23 2009 -0800" }, "message": "Bluetooth: Ack L2CAP I-frames before retransmit missing packet\n\nMoving the Ack to before l2cap_retransmit_frame() we can avoid the\ncase where txWindow is full and the packet can\u0027t be retransmited.\n\nSigned-off-by: Gustavo F. Padovan \u003cgustavo@las.ic.unicamp.br\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "186de9a33803c7ee20d9af75c9049b50e68a3a08", "tree": "4ec1d2f0b8c7624271cbbff21c6b8b134203574f", "parents": [ "971beb83aeb2a309175682cf5683d64fd4591841" ], "author": { "name": "Gustavo F. Padovan", "email": "gustavo@las.ic.unicamp.br", "time": "Tue Dec 15 15:56:34 2009 -0200" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Thu Dec 17 12:04:08 2009 -0800" }, "message": "Bluetooth: Fix unset of RemoteBusy flag for L2CAP\n\nRemoteBusy flag need to be unset before l2cap_ertm_send(), otherwise\nl2cap_ertm_send() will return without sending packets because it checks\nthat flag before start sending.\n\nSigned-off-by: Gustavo F. Padovan \u003cgustavo@las.ic.unicamp.br\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "971beb83aeb2a309175682cf5683d64fd4591841", "tree": "0d119998a04d94bb41da4b22d2c310c569ae3b4f", "parents": [ "503914cf4a4b5dbe3f844e0a92f412ae99fde70e" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Mon Dec 07 14:23:21 2009 +0100" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Thu Dec 17 11:47:20 2009 -0800" }, "message": "Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()\n\nReturn the PTR_ERR of the correct pointer.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "a3a065e3f13da8a3470ed09c7f38aad256083726", "tree": "03e36f66709fe3d1679b0f0036f2ad3449d92dee", "parents": [ "b9aff027b2c1d6019d237382c78fd396f9de2ea5" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Wed Nov 18 05:30:19 2009 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 17 10:51:40 2009 -0500" }, "message": "fs: no games with DCACHE_UNHASHED\n\nFilesystems outside the regular namespace do not have to clear DCACHE_UNHASHED\nin order to have a working /proc/$pid/fd/XXX. Nothing in proc prevents the\nfd link from being used if its dentry is not in the hash.\n\nAlso, it does not get put into the dcache hash if DCACHE_UNHASHED is clear;\nthat depends on the filesystem calling d_add or d_rehash.\n\nSo delete the misleading comments and needless code.\n\nAcked-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "bac5e54c29f352d962a2447d22735316b347b9f1", "tree": "7642993fa93164835ffaa2dacd341388193f1979", "parents": [ "529e89430d6c0d64db8ac474cb95e68e2527c79a", "c05c4edd876b7ae92787d1295868afcb89b6a348" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 12:04:02 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 12:04:02 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)\n direct I/O fallback sync simplification\n ocfs: stop using do_sync_mapping_range\n cleanup blockdev_direct_IO locking\n make generic_acl slightly more generic\n sanitize xattr handler prototypes\n libfs: move EXPORT_SYMBOL for d_alloc_name\n vfs: force reval of target when following LAST_BIND symlinks (try #7)\n ima: limit imbalance msg\n Untangling ima mess, part 3: kill dead code in ima\n Untangling ima mess, part 2: deal with counters\n Untangling ima mess, part 1: alloc_file()\n O_TRUNC open shouldn\u0027t fail after file truncation\n ima: call ima_inode_free ima_inode_free\n IMA: clean up the IMA counts updating code\n ima: only insert at inode creation time\n ima: valid return code from ima_inode_alloc\n fs: move get_empty_filp() deffinition to internal.h\n Sanitize exec_permission_lite()\n Kill cached_lookup() and real_lookup()\n Kill path_lookup_open()\n ...\n\nTrivial conflicts in fs/direct-io.c\n" }, { "commit": "e4bdda1bc3123a9e65f4dd93a23041fde8ed3dc2", "tree": "c2f75cc08bb4c5cbd9103e14399ea5ab66ce960d", "parents": [ "74f3ae743427b87e43b5cb9f4257021ae8ad4267", "380454126f1357db9270f9d1ca05dfe1a6e4ad47" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:47:44 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:47:44 2009 -0800" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFSv4: Fix a regression in the NFSv4 state manager\n NFSv4: Release the sequence id before restarting a CLOSE rpc call\n nfs41: fix session fore channel negotiation\n nfs41: do not zero seqid portion of stateid on close\n nfs: run state manager in privileged mode\n nfs: make recovery state manager operations privileged\n nfs: enforce FIFO ordering of operations trying to acquire slot\n rpc: add a new priority in RPC task\n nfs: remove rpc_task argument from nfs4_find_slot\n rpc: add rpc_queue_empty function\n nfs: change nfs4_do_setlk params to identify recovery type\n nfs: do not do a LOOKUP after open\n nfs: minor cleanup of session draining\n" }, { "commit": "37c24b37fb2454e95136139d10bb6828967105bf", "tree": "d5c3fa61fa689567caeb2a7cb5891473e444ff7d", "parents": [ "5ac4d630eb87656bd4dc313b910776d54d88ea28", "7663dacd926584093dfc350892792054692b6cb3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:43:34 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:43:34 2009 -0800" }, "message": "Merge branch \u0027for-2.6.33\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.33\u0027 of git://linux-nfs.org/~bfields/linux: (42 commits)\n nfsd: remove pointless paths in file headers\n nfsd: move most of nfsfh.h to fs/nfsd\n nfsd: remove unused field rq_reffh\n nfsd: enable V4ROOT exports\n nfsd: make V4ROOT exports read-only\n nfsd: restrict filehandles accepted in V4ROOT case\n nfsd: allow exports of symlinks\n nfsd: filter readdir results in V4ROOT case\n nfsd: filter lookup results in V4ROOT case\n nfsd4: don\u0027t continue \"under\" mounts in V4ROOT case\n nfsd: introduce export flag for v4 pseudoroot\n nfsd: let \"insecure\" flag vary by pseudoflavor\n nfsd: new interface to advertise export features\n nfsd: Move private headers to source directory\n vfs: nfsctl.c un-used nfsd #includes\n lockd: Remove un-used nfsd headers #includes\n s390: remove un-used nfsd #includes\n sparc: remove un-used nfsd #includes\n parsic: remove un-used nfsd #includes\n compat.c: Remove dependence on nfsd private headers\n ...\n" }, { "commit": "59be2e04e50ac9947e4356c10099f49977f5f74d", "tree": "56aa00a4499a1543da8728cb84b10bec5b211280", "parents": [ "e69381b4175ba162229646f6753ff1d87c24d468", "503914cf4a4b5dbe3f844e0a92f412ae99fde70e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:33:18 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:33:18 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)\n net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2\n ixgbe: allow tx of pre-formatted vlan tagged packets\n ixgbe: Fix 82598 premature copper PHY link indicatation\n ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters\n bcm63xx_enet: fix compilation failure after get_stats_count removal\n packet: dont call sleeping functions while holding rcu_read_lock()\n tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.\n ipvs: zero usvc and udest\n netfilter: fix crashes in bridge netfilter caused by fragment jumps\n ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery\n sky2: leave PCI config space writeable\n sky2: print Optima chip name\n x25: Update maintainer.\n ipvs: fix synchronization on connection close\n netfilter: xtables: document minimal required version\n drivers/net/bonding/: : use pr_fmt\n can: CAN_MCP251X should depend on HAS_DMA\n drivers/net/usb: Correct code taking the size of a pointer\n drivers/net/cpmac.c: Correct code taking the size of a pointer\n drivers/net/sfc: Correct code taking the size of a pointer\n ...\n" }, { "commit": "e69381b4175ba162229646f6753ff1d87c24d468", "tree": "ac4c03f6a0a1a0426832aa4f5c3b7732080c51cc", "parents": [ "238ccbb050a243e935bb3fc679c2e4bbff7004aa", "14f369d1d61e7ac6578c54ca9ce3caaf4072412c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:32:31 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:32:31 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (45 commits)\n RDMA/cxgb3: Fix error paths in post_send and post_recv\n RDMA/nes: Fix stale ARP issue\n RDMA/nes: FIN during MPA startup causes timeout\n RDMA/nes: Free kmap() resources\n RDMA/nes: Check for zero STag\n RDMA/nes: Fix Xansation test crash on cm_node ref_count\n RDMA/nes: Abnormal listener exit causes loopback node crash\n RDMA/nes: Fix crash in nes_accept()\n RDMA/nes: Resource not freed for REJECTed connections\n RDMA/nes: MPA request/response error checking\n RDMA/nes: Fix query of ORD values\n RDMA/nes: Fix MAX_CM_BUFFER define\n RDMA/nes: Pass correct size to ioremap_nocache()\n RDMA/nes: Update copyright and branding string\n RDMA/nes: Add max_cqe check to nes_create_cq()\n RDMA/nes: Clean up struct nes_qp\n RDMA/nes: Implement IB_SIGNAL_ALL_WR as an iWARP extension\n RDMA/nes: Add additional SFP+ PHY uC status check and PHY reset\n RDMA/nes: Correct fast memory registration implementation\n IB/ehca: Fix error paths in post_send and post_recv\n ...\n" }, { "commit": "2c48b9c45579a9b5e3e74694eebf3d2451f3dbd3", "tree": "cecbf786ae0650368a8136bdd90910e05d9b95c3", "parents": [ "a95161aaa801c18c52b2e7cf3d6b4b141c00a20a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Aug 09 00:52:35 2009 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 16 12:16:42 2009 -0500" }, "message": "switch alloc_file() to passing struct path\n\n... and have the caller grab both mnt and dentry; kill\nleak in infiniband, while we are at it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "cc3808f8c354889982e7e323050f1e50ad99a009", "tree": "60c07432cf9f5d4b7bac5a07abcb6bf81aa91b7b", "parents": [ "6b18662e239a032f908b7f6e164bdf7e2e0a32c9" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Aug 06 09:43:59 2009 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 16 12:16:42 2009 -0500" }, "message": "switch sock_alloc_file() to alloc_file()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6b18662e239a032f908b7f6e164bdf7e2e0a32c9", "tree": "b63bf63d7d2b0d0fac2529a3c3bd906f85388c79", "parents": [ "7cbe66b6b53b6615f1033bd5b3dbad8162886373" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Aug 06 02:02:43 2009 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 16 12:16:41 2009 -0500" }, "message": "9p connect fixes\n\n* if we fail in p9_conn_create(), we shouldn\u0027t leak references to struct file.\n Logics in -\u003eclose() doesn\u0027t help - -\u003etrans is already gone by the time it\u0027s\n called.\n* sock_create_kern() can fail.\n* use of sock_map_fd() is all fscked up; I\u0027d fixed most of that, but the\n rest will have to wait for a bit more work in net/socket.c (we still are\n violating the basic rule of working with descriptor table: \"once the reference\n is installed there, don\u0027t rely on finding it there again\").\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7cbe66b6b53b6615f1033bd5b3dbad8162886373", "tree": "d7e0a229155fec3e3841d9d3272d0ae1a3a393eb", "parents": [ "198de4d7ac3a0f1351c6377ff657950457ed0038" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 05 19:59:08 2009 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 16 12:16:41 2009 -0500" }, "message": "merge sock_alloc_fd/sock_attach_fd into a new helper\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "198de4d7ac3a0f1351c6377ff657950457ed0038", "tree": "0451461b303cc3d4d514acadc09b8dee1a260818", "parents": [ "732741274d0269718ba20c520cf72530bb038641" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 05 19:29:23 2009 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 16 12:16:41 2009 -0500" }, "message": "reorder alloc_fd/attach_fd in socketpair()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "28dfef8febe48f59cf1e7596e1992a6a1893ca24", "tree": "eb2df6dd75e72db066062950f91c9ab2e8215280", "parents": [ "5116fa2b3a0a3ec625a10445ae45667f094c125b" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Dec 15 16:46:48 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 07:20:05 2009 -0800" }, "message": "const: constify remaining pipe_buf_operations\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a35ca80c1db7279c3c0655063f6d3490e399b17", "tree": "3ff2f23730c2bc6ea8af20232d02dad65ae63f0a", "parents": [ "81e839efc22361e3fa7ee36f99fd57c57d0d1871" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Dec 15 05:47:03 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 15 21:12:21 2009 -0800" }, "message": "packet: dont call sleeping functions while holding rcu_read_lock()\n\ncommit 654d1f8a019dfa06d (packet: less dev_put() calls)\nintroduced a problem, calling potentially sleeping functions from a\nrcu_read_lock() protected section.\n\nFix this by releasing lock before the sock_wmalloc()/memcpy_fromiovec() calls.\n\nAfter skb allocation and copy from user space, we redo device\nlookup and appropriate tests.\n\nReported-and-tested-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81e839efc22361e3fa7ee36f99fd57c57d0d1871", "tree": "eac3550c8773ff0e6ccb91c280b930efc50b0e42", "parents": [ "bb5b7c11263dbbe78253cd05945a6bf8f55add8e", "258c889362aa95d0ab534b38ce8c15d3009705b1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 15 21:08:53 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 15 21:08:53 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "bb5b7c11263dbbe78253cd05945a6bf8f55add8e", "tree": "7a639cbd6d6ad968ca22427f2b8697aadb37a907", "parents": [ "166a0fd4c788ec7f10ca8194ec6d526afa12db75" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 15 20:56:42 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 15 20:56:42 2009 -0800" }, "message": "tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.\n\nIt creates a regression, triggering badness for SYN_RECV\nsockets, for example:\n\n[19148.022102] Badness at net/ipv4/inet_connection_sock.c:293\n[19148.022570] NIP: c02a0914 LR: c02a0904 CTR: 00000000\n[19148.023035] REGS: eeecbd30 TRAP: 0700 Not tainted (2.6.32)\n[19148.023496] MSR: 00029032 \u003cEE,ME,CE,IR,DR\u003e CR: 24002442 XER: 00000000\n[19148.024012] TASK \u003d eee9a820[1756] \u0027privoxy\u0027 THREAD: eeeca000\n\nThis is likely caused by the change in the \u0027estab\u0027 parameter\npassed to tcp_parse_options() when invoked by the functions\nin net/ipv4/tcp_minisocks.c\n\nBut even if that is fixed, the -\u003econn_request() changes made in\nthis patch series is fundamentally wrong. They try to use the\nlistening socket\u0027s \u0027dst\u0027 to probe the route settings. The\nlistening socket doesn\u0027t even have a route, and you can\u0027t\nget the right route (the child request one) until much later\nafter we setup all of the state, and it must be done by hand.\n\nThis stuff really isn\u0027t ready, so the best thing to do is a\nfull revert. This reverts the following commits:\n\nf55017a93f1a74d50244b1254b9a2bd7ac9bbf7d\n022c3f7d82f0f1c68018696f2f027b87b9bb45c2\n1aba721eba1d84a2defce45b950272cee1e6c72a\ncda42ebd67ee5fdf09d7057b5a4584d36fe8a335\n345cda2fd695534be5a4494f1b59da9daed33663\ndc343475ed062e13fc260acccaab91d7d80fd5b2\n05eaade2782fb0c90d3034fd7a7d5a16266182bb\n6a2a2d6bf8581216e08be15fcb563cfd6c430e1e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "689cf5c15baf603a8041565ff0bd0d65d1634fd7", "tree": "83fc6e666f0c099486cfcdb41b40c02d9fa163b7", "parents": [ "cf3b01b54880debb01ea7d471123da5887a7c2cb" ], "author": { "name": "Alexandros Batsakis", "email": "batsakis@netapp.com", "time": "Mon Dec 14 21:27:56 2009 -0800" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Dec 15 13:55:18 2009 -0500" }, "message": "nfs: enforce FIFO ordering of operations trying to acquire slot\n\nSigned-off-by: Alexandros Batsakis \u003cbatsakis@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "48f186124220794fce85ed1439fc32f16f69d3e2", "tree": "c200395b4238a19d6653b23a43537ac29b7b8cf4", "parents": [ "afe6c27ccb8cc31ce8ed0bd3589ce549f523c8e7" ], "author": { "name": "Alexandros Batsakis", "email": "batsakis@netapp.com", "time": "Mon Dec 14 21:27:53 2009 -0800" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Dec 15 13:51:17 2009 -0500" }, "message": "rpc: add rpc_queue_empty function\n\nSigned-off-by: Alexandros Batsakis \u003cbatsakis@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "e7d2860b690d4f3bed6824757c540579638e3d1e", "tree": "84268ee28893256fd6a6a7e1d4474f61dbee74e7", "parents": [ "84c95c9acf088c99d8793d78036b67faa5d0b851" ], "author": { "name": "André Goddard Rosa", "email": "andre.goddard@gmail.com", "time": "Mon Dec 14 18:01:06 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:32 2009 -0800" }, "message": "tree-wide: convert open calls to remove spaces to skip_spaces() lib function\n\nMakes use of skip_spaces() defined in lib/string.c for removing leading\nspaces from strings all over the tree.\n\nIt decreases lib.a code size by 47 bytes and reuses the function tree-wide:\n text data bss dec hex filename\n 64688 584 592 65864 10148 (TOTALS-BEFORE)\n 64641 584 592 65817 10119 (TOTALS-AFTER)\n\nAlso, while at it, if we see (*str \u0026\u0026 isspace(*str)), we can be sure to\nremove the first condition (*str) as the second one (isspace(*str)) also\nevaluates to 0 whenever *str \u003d\u003d 0, making it redundant. In other words,\n\"a char equals zero is never a space\".\n\nJulia Lawall tried the semantic patch (http://coccinelle.lip6.fr) below,\nand found occurrences of this pattern on 3 more files:\n drivers/leds/led-class.c\n drivers/leds/ledtrig-timer.c\n drivers/video/output.c\n\n@@\nexpression str;\n@@\n\n( // ignore skip_spaces cases\nwhile (*str \u0026\u0026 isspace(*str)) { \\(str++;\\|++str;\\) }\n|\n- *str \u0026\u0026\nisspace(*str)\n)\n\nSigned-off-by: André Goddard Rosa \u003candre.goddard@gmail.com\u003e\nCc: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: \u003clinux-ext4@vger.kernel.org\u003e\nCc: Samuel Ortiz \u003csamuel@sortiz.org\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "471452104b8520337ae2fb48c4e61cd4896e025d", "tree": "8594ae4a8362014e3cccf72a4e8834cdbb610bdd", "parents": [ "0ead0f84e81a41c3e98aeceab04af8ab1bb08d1f" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Dec 14 18:00:08 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:25 2009 -0800" }, "message": "const: constify remaining dev_pm_ops\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "258c889362aa95d0ab534b38ce8c15d3009705b1", "tree": "227a7a3df0dfd8d094edfd2ff350011605c202a3", "parents": [ "8fa9ff6849bb86c59cc2ea9faadf3cb2d5223497" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Tue Dec 15 17:01:25 2009 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Dec 15 17:01:25 2009 +0100" }, "message": "ipvs: zero usvc and udest\n\nMake sure that any otherwise uninitialised fields of usvc are zero.\n\nThis has been obvserved to cause a problem whereby the port of\nfwmark services may end up as a non-zero value which causes\nscheduling of a destination server to fail for persisitent services.\n\nAs observed by Deon van der Merwe \u003cdvdm@truteq.co.za\u003e.\nThis fix suggested by Julian Anastasov \u003cja@ssi.bg\u003e.\n\nFor good measure also zero udest.\n\nCc: Deon van der Merwe \u003cdvdm@truteq.co.za\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nCc: stable@kernel.org\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "8fa9ff6849bb86c59cc2ea9faadf3cb2d5223497", "tree": "42c1cc382a9cfbb2907ab1471418404f874d53f2", "parents": [ "0b5ccb2ee250136dd7385b1c7da28417d0d4d32d" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Dec 15 16:59:59 2009 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Dec 15 16:59:59 2009 +0100" }, "message": "netfilter: fix crashes in bridge netfilter caused by fragment jumps\n\nWhen fragments from bridge netfilter are passed to IPv4 or IPv6 conntrack\nand a reassembly queue with the same fragment key already exists from\nreassembling a similar packet received on a different device (f.i. with\nmulticasted fragments), the reassembled packet might continue on a different\ncodepath than where the head fragment originated. This can cause crashes\nin bridge netfilter when a fragment received on a non-bridge device (and\nthus with skb-\u003enf_bridge \u003d\u003d NULL) continues through the bridge netfilter\ncode.\n\nAdd a new reassembly identifier for packets originating from bridge\nnetfilter and use it to put those packets in insolated queues.\n\nFixes http://bugzilla.kernel.org/show_bug.cgi?id\u003d14805\n\nReported-and-Tested-by: Chong Qiao \u003cqiaochong@loongson.cn\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0b5ccb2ee250136dd7385b1c7da28417d0d4d32d", "tree": "b0630141672471d5c800867cd8dbee425308bc73", "parents": [ "9abfe315de96aa5c9878b2f627542bc54901c6e9" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Dec 15 16:59:18 2009 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Dec 15 16:59:18 2009 +0100" }, "message": "ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery\n\nCurrently the same reassembly queue might be used for packets reassembled\nby conntrack in different positions in the stack (PREROUTING/LOCAL_OUT),\nas well as local delivery. This can cause \"packet jumps\" when the fragment\ncompleting a reassembled packet is queued from a different position in the\nstack than the previous ones.\n\nAdd a \"user\" identifier to the reassembly queue key to seperate the queues\nof each caller, similar to what we do for IPv4.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d24deb2580823ab0b8425790c6f5d18e2ff749d8", "tree": "e19fa93ccf306ea54508492a141721a1e4cc3a30", "parents": [ "b2ec153a637409bd87952d44409905b7d98418b8" ], "author": { "name": "Gertjan van Wingerde", "email": "gwingerde@gmail.com", "time": "Fri Dec 04 23:46:54 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 14 14:22:31 2009 -0500" }, "message": "mac80211: Add define for TX headroom reserved by mac80211 itself.\n\nAdd a definition of the amount of TX headroom reserved by mac80211 itself\nfor its own purposes. Also add BUILD_BUG_ON to validate the value.\nThis define can then be used by drivers to request additional TX headroom\nin the most efficient manner.\n\nSigned-off-by: Gertjan van Wingerde \u003cgwingerde@gmail.com\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9abfe315de96aa5c9878b2f627542bc54901c6e9", "tree": "2526c6e877437a0949dd4707f5ae1b6d398a9f5d", "parents": [ "7a92263705435d046d37a0990d0edfcb517f7ad3" ], "author": { "name": "Xiaotian Feng", "email": "dfeng@redhat.com", "time": "Mon Dec 14 16:38:21 2009 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Dec 14 16:38:21 2009 +0100" }, "message": "ipvs: fix synchronization on connection close\n\ncommit 9d3a0de makes slaves expire as they would do on the master\nwith much shorter timeouts. But it introduces another problem:\nWhen we close a connection, on master server the connection became\nCLOSE_WAIT/TIME_WAIT, it was synced to slaves, but if master is\nfinished within it\u0027s timeouts (CLOSE), it will not be synced to\nslaves. Then slaves will be kept on CLOSE_WAIT/TIME_WAIT until\ntimeout reaches. Thus we should also sync with CLOSE.\n\nCc: Wensong Zhang \u003cwensong@linux-vs.org\u003e\nCc: Simon Horman \u003chorms@verge.net.au\u003e\nCc: Julian Anastasov \u003cja@ssi.bg\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Xiaotian Feng \u003cdfeng@redhat.com\u003e\nAcked-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d90a909e1f3e006a1d57fe11fd417173b6494701", "tree": "72893da9ed5083b44dbb8d778d648e114d351a0a", "parents": [ "5781b2356cbecb0b73b06ec8c3897cabdfdd0928" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sat Dec 12 22:11:15 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 13 19:45:22 2009 -0800" }, "message": "net: Fix userspace RTM_NEWLINK notifications.\n\nI received some bug reports about userspace programs having problems\nbecause after RTM_NEWLINK was received they could not immediate access\nfiles under /proc/sys/net/ because they had not been registered yet.\n\nThe original problem was trivially fixed by moving the userspace\nnotification from rtnetlink_event() to the end of\nregister_netdevice().\n\nWhen testing that change I discovered I was still getting RTM_NEWLINK\nevents before I could access proc and I was also getting RTM_NEWLINK\nevents after I was seeing RTM_DELLINK. Things practically guaranteed\nto confuse userspace.\n\nAfter a little more investigation these extra notifications proved to\nbe from the new notifiers NETDEV_POST_INIT and NETDEV_UNREGISTER_BATCH\nhitting the default case in rtnetlink_event, and triggering\nunnecessary RTM_NEWLINK messages.\n\nrtnetlink_event now explicitly handles NETDEV_UNREGISTER_BATCH and\nNETDEV_POST_INIT to avoid sending the incorrect userspace\nnotifications.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@aristanetworks.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5781b2356cbecb0b73b06ec8c3897cabdfdd0928", "tree": "7da5613b163aa7a942561aabc0284950583ee314", "parents": [ "e1187b3be72be59625e445b186007e6eae27fef1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Dec 13 19:32:39 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 13 19:32:39 2009 -0800" }, "message": "udp: udp_lib_get_port() fix\n\nNow we can have a large udp hash table, udp_lib_get_port() loop\nshould be converted to a do {} while (cond) form,\nor we dont enter it at all if hash table size is exactly 65536.\n\nReported-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52c9948b1fd80381ba5a9a87dcc4fbe3cf4979b8", "tree": "7bca6a20560f428442f18450df0948774f982df0", "parents": [ "f40542532e96dda5506eb76badea322f2ae4731c", "190f38e5cedc910940b1da9015f00458c18f97b4" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Dec 13 13:56:27 2009 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Dec 13 13:56:27 2009 -0500" }, "message": "Merge branch \u0027nfs-for-2.6.33\u0027\n" }, { "commit": "501706565b2d4d2d40d0d301d5411ede099b8a6f", "tree": "142a18bf1f1e74a09dbfa27540b893ade0fd797d", "parents": [ "e93737b0f0159a61772894943199fd3b6f315641", "2fe77b81c77eed92c4c0439f74c8148a295b4a86" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 11 17:12:17 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 11 17:12:17 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tinclude/net/tcp.h\n" }, { "commit": "e93737b0f0159a61772894943199fd3b6f315641", "tree": "feaa10bd2419f2a1bad89bcf4880bc8399339873", "parents": [ "bbb84619c378414118fd4f1778125cd246c71e53" ], "author": { "name": "Krishna Kumar", "email": "krkumar2@in.ibm.com", "time": "Tue Dec 08 22:26:02 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 11 15:11:45 2009 -0800" }, "message": "net: Handle NETREG_UNINITIALIZED devices correctly\n\nFix two problems:\n\n1. If unregister_netdevice_many() is called with both registered\n and unregistered devices, rollback_registered_many() bails out\n when it reaches the first unregistered device. The processing\n of the prior registered devices is unfinished, and the\n remaining devices are skipped, and possible registered netdev\u0027s\n are leaked/unregistered.\n\n2. System hangs or panics depending on how the devices are passed,\n since when netdev_run_todo() runs, some devices were not fully\n processed.\n\nTested by passing intermingled unregistered and registered vlan\ndevices to unregister_netdevice_many() as follows:\n\t1. dev, fake_dev1, fake_dev2: hangs in run_todo\n\t (\"unregister_netdevice: waiting for eth1.100 to become\n\t free. Usage count \u003d 1\")\n\t2. fake_dev1, dev, fake_dev2: failure during de-registration\n\t and next registration, followed by a vlan driver Oops\n\t during subsequent registration.\n\nConfirmed that the patch fixes both cases.\n\nSigned-off-by: Krishna Kumar \u003ckrkumar2@in.ibm.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c20a66f474e890dd8cc34e124632cd85e4165899", "tree": "e311e92cf7de876e9b8c2b9ab4103d31fde63f18", "parents": [ "de039f02d877af52b8d0fe77878b8343a0f99d8b" ], "author": { "name": "Martin Willi", "email": "martin@strongswan.org", "time": "Wed Dec 09 06:11:15 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 11 15:07:57 2009 -0800" }, "message": "xfrm: Fix truncation length of authentication algorithms installed via PF_KEY\n\nCommit 4447bb33f09444920a8f1d89e1540137429351b6 (\"xfrm: Store aalg in\nxfrm_state with a user specified truncation length\") breaks\ninstallation of authentication algorithms via PF_KEY, as the state\nspecific truncation length is not installed with the algorithms\ndefault truncation length. This patch initializes state properly to\nthe default if installed via PF_KEY.\n\nSigned-off-by: Martin Willi \u003cmartin@strongswan.org\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de039f02d877af52b8d0fe77878b8343a0f99d8b", "tree": "81d312952e828bddb53ff5d540f37b0ce8b202f6", "parents": [ "60c2ffd3d2cf12008747d920ae118df119006003" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Dec 09 20:59:15 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 11 15:07:57 2009 -0800" }, "message": "net: use compat helper functions in compat_sys_recvmmsg\n\nUse (get|put)_compat_timespec helper functions to simplify the code.\n\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60c2ffd3d2cf12008747d920ae118df119006003", "tree": "7b4e86de5eed6a5377bba5a875b326420fe3503b", "parents": [ "ccdddf500f2b1b8e88ac8e3d4dfc15cce9f73886" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Dec 09 20:58:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 11 15:07:56 2009 -0800" }, "message": "net: fix compat_sys_recvmmsg parameter type\n\ncompat_sys_recvmmsg has a compat_timespec parameter and not a\ntimespec parameter. This way we also get rid of an odd cast.\n\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65182b9fb004220f250d4269c864cf0f1f372e85", "tree": "e5adad187645a03b9acc523296be9d0fc4f4a1eb", "parents": [ "7b324d28a94dac5a451e8cba66e8d324601e5b9a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Dec 09 15:11:22 2009 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Dec 10 16:21:51 2009 -0500" }, "message": "wireless: update old static regulatory domain rules\n\nUpdate \"US\" and \"JP\" for current rules, and replace \"EU\" rules with the\nworld roaming domain (since it was only a pseudo-domain anyway).\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7b324d28a94dac5a451e8cba66e8d324601e5b9a", "tree": "d633782fad15ae57560cfebb5ff5c3c78af5d610", "parents": [ "5d618cb81aeea19879975cd1f9a1e707694dfd7c" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Wed Dec 09 18:43:01 2009 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Dec 10 16:12:52 2009 -0500" }, "message": "mac80211: Revert \u0027Use correct sign for mesh active path refresh\u0027\n\nThe patch (\"mac80211: Use correct sign for mesh active path\nrefresh.\") was actually a bug. Reverted it and improved the\nexplanation of how mesh path refresh works.\n\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: Andrey Yurovsky \u003candrey@cozybit.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5d618cb81aeea19879975cd1f9a1e707694dfd7c", "tree": "1998238244c80531e09526eba11b9d3530e46622", "parents": [ "0c3cee72a403e3b4992a5478c9c33d668c246c22" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Wed Dec 09 18:43:00 2009 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Dec 10 16:09:52 2009 -0500" }, "message": "mac80211: Fixed bug in mesh portal paths\n\nPaths to mesh portals were being timed out immediately after each use in\nintermediate forwarding nodes. mppath-\u003eexp_time is set to the expiration time\nso assigning it to jiffies was marking the path as expired.\n\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: Andrey Yurovsky \u003candrey@cozybit.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0c3cee72a403e3b4992a5478c9c33d668c246c22", "tree": "964883c4d5c80485b82d293832e9fb57e32661df", "parents": [ "214ac9a4ead6cb254451c09d9c8234a76693feb1" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Dec 09 20:25:59 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Dec 10 16:09:52 2009 -0500" }, "message": "net/mac80211: Correct size given to memset\n\nMemset should be given the size of the structure, not the size of the pointer.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\ntype T;\nT *x;\nexpression E;\n@@\n\nmemset(x, E, sizeof(\n+ *\n x))\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8", "tree": "856ba96302a36014736747e8464f80eeb827bbdd", "parents": [ "f6c4c8195b5e7878823caa1181be404d9e86d369", "d014d043869cdc591f3a33243d3481fa4479c2d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)\n tree-wide: fix misspelling of \"definition\" in comments\n reiserfs: fix misspelling of \"journaled\"\n doc: Fix a typo in slub.txt.\n inotify: remove superfluous return code check\n hdlc: spelling fix in find_pvc() comment\n doc: fix regulator docs cut-and-pasteism\n mtd: Fix comment in Kconfig\n doc: Fix IRQ chip docs\n tree-wide: fix assorted typos all over the place\n drivers/ata/libata-sff.c: comment spelling fixes\n fix typos/grammos in Documentation/edac.txt\n sysctl: add missing comments\n fs/debugfs/inode.c: fix comment typos\n sgivwfb: Make use of ARRAY_SIZE.\n sky2: fix sky2_link_down copy/paste comment error\n tree-wide: fix typos \"couter\" -\u003e \"counter\"\n tree-wide: fix typos \"offest\" -\u003e \"offset\"\n fix kerneldoc for set_irq_msi()\n spidev: fix double \"of of\" in comment\n comment typo fix: sybsystem -\u003e subsystem\n ...\n" }, { "commit": "053e324f67b9921fe7de0c4cbc720d29cb4bf207", "tree": "ba596460f4a0a42e7ac3d44f89e9f556c5e3ea8a", "parents": [ "e4ee5d4dfd9536ec60e5cb0bd439ede3e9d361a0" ], "author": { "name": "Suresh Jayaraman", "email": "sjayaraman@suse.de", "time": "Wed Dec 09 23:15:22 2009 +0530" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Dec 09 16:23:18 2009 -0500" }, "message": "rpc: remove unneeded function parameter in gss_add_msg()\n\nThe pointer to struct gss_auth parameter in gss_add_msg is not really needed\nafter commit 5b7ddd4a. Zap it.\n\nSigned-off-by: Suresh Jayaraman \u003csjayaraman@suse.de\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "19deffbeba930030cfaf000b920333c6ba99ad52", "tree": "3d014a0815c83124d428f68bc4135e13a873cbdc", "parents": [ "d55fb891f9da8ee17374349ff482b2715623b7e5" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Dec 08 17:10:13 2009 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Dec 09 15:10:08 2009 -0500" }, "message": "wireless: correctly report signal value for IEEE80211_HW_SIGNAL_UNSPEC\n\nThis part was missed in \"cfg80211: implement get_wireless_stats\",\nprobably because sta_set_sinfo already existed and was only handling\ndBm signals.\n\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d55fb891f9da8ee17374349ff482b2715623b7e5", "tree": "2013400579647e4d20b737077647cb6d066a7d67", "parents": [ "43de004b6c197b0ea408bdebf4f14afdead74b63" ], "author": { "name": "Vivek Natarajan", "email": "vnatarajan@atheros.com", "time": "Tue Nov 24 11:54:10 2009 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Dec 09 15:10:08 2009 -0500" }, "message": "cfg80211: Clear encryption privacy when key off is done.\n\nWhen the current_bss is not set, \u0027iwconfig \u003ciface\u003e key off\u0027 does not\nclear the private flag. Hence after we connect with WEP to an AP and\nthen try to connect with another non-WEP AP, it does not work.\nThis issue will not be seen if supplicant is used.\n\nSigned-off-by: Vivek Natarajan \u003cvnatarajan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "77722b177a1606669c0b95dde03347e37d13b8fe", "tree": "73c646300d1e7909ec163a371b6d7d7bf9d2f7f5", "parents": [ "2f7de5710a4d394920405febc2a9937c69e16dda" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Tue Dec 08 20:54:11 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:56:12 2009 -0800" }, "message": "tcp: fix retrans_stamp advancing in error cases\n\nIt can happen, that tcp_retransmit_skb fails due to some error.\nIn such cases we might end up into a state where tp-\u003eretrans_out\nis zero but that\u0027s only because we removed the TCPCB_SACKED_RETRANS\nbit from a segment but couldn\u0027t retransmit it because of the error\nthat happened. Therefore some assumptions that retrans_out checks\nare based do not necessarily hold, as there still can be an old\nretransmission but that is only visible in TCPCB_EVER_RETRANS bit.\nAs retransmission happen in sequential order (except for some very\nrare corner cases), it\u0027s enough to check the head skb for that bit.\n\nMain reason for all this complexity is the fact that connection dying\ntime now depends on the validity of the retrans_stamp, in particular,\nthat successive retransmissions of a segment must not advance\nretrans_stamp under any conditions. It seems after quick thinking that\nthis has relatively low impact as eventually TCP will go into CA_Loss\nand either use the existing check for !retrans_stamp case or send a\nretransmission successfully, setting a new base time for the dying\ntimer (can happen only once). At worst, the dying time will be\napproximately the double of the intented time. In addition,\ntcp_packet_delayed() will return wrong result (has some cc aspects\nbut due to rarity of these errors, it\u0027s hardly an issue).\n\nOne of retrans_stamp clearing happens indirectly through first going\ninto CA_Open state and then a later ACK lets the clearing to happen.\nThus tcp_try_keep_open has to be modified too.\n\nThanks to Damian Lukowski \u003cdamian@tvk.rwth-aachen.de\u003e for hinting\nthat this possibility exists (though the particular case discussed\ndidn\u0027t after all have it happening but was just a debug patch\nartifact).\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f7de5710a4d394920405febc2a9937c69e16dda", "tree": "8f038451b643f68ab399009e769a74678feb5546", "parents": [ "07f29bc5bbae4e53e982ab956fed7207990a7786" ], "author": { "name": "Damian Lukowski", "email": "damian@tvk.rwth-aachen.de", "time": "Mon Dec 07 06:06:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:56:11 2009 -0800" }, "message": "tcp: Stalling connections: Move timeout calculation routine\n\nThis patch moves retransmits_timed_out() from include/net/tcp.h\nto tcp_timer.c, where it is used.\n\nReported-by: Frederic Leroy \u003cfredo@starox.org\u003e\nSigned-off-by: Damian Lukowski \u003cdamian@tvk.rwth-aachen.de\u003e\nAcked-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a", "tree": "8b15d52b73905f89184c91fb146c1b216d71bc8f", "parents": [ "504bb3b58e7314e0fe026da280e8168c1314be3d" ], "author": { "name": "chas williams - CONTRACTOR", "email": "chas@cmf.nrl.navy.mil", "time": "Fri Dec 04 11:06:32 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:22:31 2009 -0800" }, "message": "atm: [br2684] allow routed mode operation again\n\nin routed mode, we don\u0027t have a hardware address so netdev_ops doesnt\nneed to validate our hardware address via .ndo_validate_addr\n\nReported-by: Manuel Fuentes \u003cmfuentes@agenciaefe.com\u003e\nSigned-off-by: Chas Williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb0445887a45a3705522aac6c2d8367e90358792", "tree": "12b489c8b9a1092fafa558c0496ef2ef1c3f7b6c", "parents": [ "2a8875e73ffb18165ceb245f99c2ccad77378051" ], "author": { "name": "chas williams - CONTRACTOR", "email": "chas@cmf.nrl.navy.mil", "time": "Fri Dec 04 05:19:30 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:22:30 2009 -0800" }, "message": "atm: [lec] initialize .netdev_ops before calling register_netdev()\n\nfix oops when initializing lane interfaces. lec should probably be\nchanged to use alloc_netdev() instead.\n\nSigned-off-by: Chas Williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a8875e73ffb18165ceb245f99c2ccad77378051", "tree": "f2a443bef4aec863b9b4143e528357518db0b89c", "parents": [ "3cdaedae635b17ce23c738ce7d364b442310cdec" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Dec 08 20:19:53 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:19:53 2009 -0800" }, "message": "[PATCH] tcp: documents timewait refcnt tricks \n\nAdds kerneldoc for inet_twsk_unhash() \u0026 inet_twsk_bind_unhash().\n\nWith help from Randy Dunlap.\n\nSuggested-by: Evgeniy Polyakov \u003czbr@ioremap.net\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3cdaedae635b17ce23c738ce7d364b442310cdec", "tree": "af07cdf6c31cca8d1a094bd104efa65e1e95e270", "parents": [ "9327f7053e3993c125944fdb137a0618319ef2a0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Dec 04 03:47:42 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:17:51 2009 -0800" }, "message": "tcp: Fix a connect() race with timewait sockets\n\nWhen we find a timewait connection in __inet_hash_connect() and reuse\nit for a new connection request, we have a race window, releasing bind\nlist lock and reacquiring it in __inet_twsk_kill() to remove timewait\nsocket from list.\n\nAnother thread might find the timewait socket we already chose, leading to\nlist corruption and crashes.\n\nFix is to remove timewait socket from bind list before releasing the bind lock.\n\nNote: This problem happens if sysctl_tcp_tw_reuse is set.\n\nReported-by: kapil dakhane \u003ckdakhane@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9327f7053e3993c125944fdb137a0618319ef2a0", "tree": "3cee7de049a2468bef930b1832c42bd1b2e69e9a", "parents": [ "74757d49016a8b06ca028196886641d7aeb78de5" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Dec 04 03:46:54 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:17:51 2009 -0800" }, "message": "tcp: Fix a connect() race with timewait sockets\n\nFirst patch changes __inet_hash_nolisten() and __inet6_hash()\nto get a timewait parameter to be able to unhash it from ehash\nat same time the new socket is inserted in hash.\n\nThis makes sure timewait socket wont be found by a concurrent\nwriter in __inet_check_established()\n\nReported-by: kapil dakhane \u003ckdakhane@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3dc789320e1b310cb505dcd94512c279abcd5e1c", "tree": "b6173953ccff6c9bfd83096c97027c2d338287d1", "parents": [ "e61444d9209821469ed0d5a9128dcf2e494533ea" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:07:54 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:07:54 2009 -0800" }, "message": "tcp: Remove runtime check that can never be true.\n\nGCC even warns about it, as reported by Andrew Morton:\n\nnet/ipv4/tcp.c: In function \u0027do_tcp_getsockopt\u0027:\nnet/ipv4/tcp.c:2544: warning: comparison is always false due to limited range of data type\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e61444d9209821469ed0d5a9128dcf2e494533ea", "tree": "17b406ce83e925da011d2b463ddf278b821c365d", "parents": [ "a252e749f1ae17e43ccc5824f7b1b5854417c98b", "6a213afd058436dbbd01098d7422c6a0073c39b5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 13:44:44 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 13:44:44 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "a252e749f1ae17e43ccc5824f7b1b5854417c98b", "tree": "0398ece85ef2e5ec63780ec892921a589e7a4d71", "parents": [ "6035ccd8e9e40bb654fbfdef325902ab531679a5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 12:51:22 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 12:51:22 2009 -0800" }, "message": "sctp: fix compile error due to sysctl mismerge\n\nI messed up the merge in d7fc02c7bae7b1cf69269992cf880a43a350cdaa, where\nthe conflict in question wasn\u0027t just about CTL_UNNUMBERED being removed,\nbut the \u0027strategy\u0027 field is too (sysctl handling is now done through the\n/proc interface, with no duplicate protocols for reading the data).\n\nReported-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4ee5d4dfd9536ec60e5cb0bd439ede3e9d361a0", "tree": "ea154524598a31134835a6be0843caf8310b06a0", "parents": [ "7cab89b275fd5647e72b781ac41b58a214640334", "480e3243df156e39eea6c91057e2ae612a6bbe19" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Dec 08 14:36:53 2009 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Dec 08 14:36:53 2009 -0500" }, "message": "Merge branch \u0027bugfixes\u0027 into nfs-for-next\n" }, { "commit": "480e3243df156e39eea6c91057e2ae612a6bbe19", "tree": "c9a37151b853c4118de309738db8580b34b0148f", "parents": [ "1185a552e3d78807031f4021c5edb60d3e8838f1" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Tue Dec 08 13:13:03 2009 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Dec 08 13:13:03 2009 -0500" }, "message": "SUNRPC: IS_ERR/PTR_ERR confusion\n\nIS_ERR returns 1 or 0, PTR_ERR returns the error value.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d7fc02c7bae7b1cf69269992cf880a43a350cdaa", "tree": "a43d56fa72913a1cc98a0bbebe054d08581b3a7c", "parents": [ "ee1262dbc65ce0b6234a915d8432171e8d77f518", "28b4d5cc17c20786848cdc07b7ea237a309776bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:55:01 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:55:01 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)\n mac80211: fix reorder buffer release\n iwmc3200wifi: Enable wimax core through module parameter\n iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter\n iwmc3200wifi: Coex table command does not expect a response\n iwmc3200wifi: Update wiwi priority table\n iwlwifi: driver version track kernel version\n iwlwifi: indicate uCode type when fail dump error/event log\n iwl3945: remove duplicated event logging code\n b43: fix two warnings\n ipw2100: fix rebooting hang with driver loaded\n cfg80211: indent regulatory messages with spaces\n iwmc3200wifi: fix NULL pointer dereference in pmkid update\n mac80211: Fix TX status reporting for injected data frames\n ath9k: enable 2GHz band only if the device supports it\n airo: Fix integer overflow warning\n rt2x00: Fix padding bug on L2PAD devices.\n WE: Fix set events not propagated\n b43legacy: avoid PPC fault during resume\n b43: avoid PPC fault during resume\n tcp: fix a timewait refcnt race\n ...\n\nFix up conflicts due to sysctl cleanups (dead sysctl_check code and\nCTL_UNNUMBERED removed) in\n\tkernel/sysctl_check.c\n\tnet/ipv4/sysctl_net_ipv4.c\n\tnet/ipv6/addrconf.c\n\tnet/sctp/sysctl.c\n" }, { "commit": "1557d33007f63dd96e5d15f33af389378e5f2e54", "tree": "06d05722b2ba5d2a67532f779fa8a88efe3c88f1", "parents": [ "6ec22f9b037fc0c2e00ddb7023fad279c365324d", "c656ae95d1c5c8ed5763356263ace2d03087efec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:38:50 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:38:50 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)\n security/tomoyo: Remove now unnecessary handling of security_sysctl.\n security/tomoyo: Add a special case to handle accesses through the internal proc mount.\n sysctl: Drop \u0026 in front of every proc_handler.\n sysctl: Remove CTL_NONE and CTL_UNNUMBERED\n sysctl: kill dead ctl_handler definitions.\n sysctl: Remove the last of the generic binary sysctl support\n sysctl net: Remove unused binary sysctl code\n sysctl security/tomoyo: Don\u0027t look at ctl_name\n sysctl arm: Remove binary sysctl support\n sysctl x86: Remove dead binary sysctl support\n sysctl sh: Remove dead binary sysctl support\n sysctl powerpc: Remove dead binary sysctl support\n sysctl ia64: Remove dead binary sysctl support\n sysctl s390: Remove dead sysctl binary support\n sysctl frv: Remove dead binary sysctl support\n sysctl mips/lasat: Remove dead binary sysctl support\n sysctl drivers: Remove dead binary sysctl support\n sysctl crypto: Remove dead binary sysctl support\n sysctl security/keys: Remove dead binary sysctl support\n sysctl kernel: Remove binary sysctl logic\n ...\n" }, { "commit": "1814077fd12a9cdf478c10076e9c42094e9d9250", "tree": "802c2703cfc1bb4230b52d0f56277e6a3df98ab8", "parents": [ "02f7f1793023bd8e5e277ad349f6f43f8c284fb0" ], "author": { "name": "Vasanthakumar Thiagarajan", "email": "vasanth@atheros.com", "time": "Fri Dec 04 17:41:34 2009 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 07 16:51:24 2009 -0500" }, "message": "mac80211: Fix bug in computing crc over dynamic IEs in beacon\n\nOn a 32-bit machine, BIT() macro does not give the required\nbit value if the bit is mroe than 31. In ieee802_11_parse_elems_crc(),\nBIT() is suppossed to get the bit value more than 31 (42 (id of ERP_INFO_IE),\n37 (CHANNEL_SWITCH_IE), (42), 32 (POWER_CONSTRAINT_IE), 45 (HT_CAP_IE),\n61 (HT_INFO_IE)). As we do not get the required bit value for the above\nIEs, crc over these IEs are never calculated, so any dynamic change in these\nIEs after the association is not really handled on 32-bit platforms.\nThis patch fixes this issue.\n\nCc: stable@kernel.org\nSigned-off-by: Vasanthakumar Thiagarajan \u003cvasanth@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "02f7f1793023bd8e5e277ad349f6f43f8c284fb0", "tree": "20ddc6990b49b2bdae0bf6c324348922e1c30201", "parents": [ "16cec43da50c4b4702653ca710549fd3457a4e6c" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Dec 03 20:45:07 2009 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 07 16:51:23 2009 -0500" }, "message": "net/rfkill/core.c: work around gcc-4.0.2 silliness\n\nnet/rfkill/core.c: In function \u0027rfkill_type_show\u0027:\nnet/rfkill/core.c:610: warning: control may reach end of non-void function \u0027rfkill_get_type_str\u0027 being inlined\n\nA gcc bug, but simple enough to squish.\n\nCc: John W. Linville \u003clinville@tuxdriver.com\u003e\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7c3f4bbedc241ddcd3abe1f419c356e625231da1", "tree": "98b1141a86d4ac65ae930e1c0cb15cd6a17d2a01", "parents": [ "bc83b6819289c031c439a5aa18ba0fd539d14f3e" ], "author": { "name": "Vivek Natarajan", "email": "vnatarajan@atheros.com", "time": "Mon Nov 30 16:50:53 2009 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 07 16:51:18 2009 -0500" }, "message": "mac80211: Fix dynamic power save for scanning.\n\nNot only ps_sdata but also IEEE80211_CONF_PS is to be considered\nbefore restoring PS in scan_ps_disable(). For instance, when ps_sdata\nis set but CONF_PS is not set just because the dynamic timer is still\nrunning, a sw scan leads to setting of CONF_PS in scan_ps_disable\ninstead of restarting the dynamic PS timer.\nAlso for the above case, a null data frame is to be sent after\nreturning to operating channel which was not happening with the\ncurrent implementation. This patch fixes this too.\n\nSigned-off-by: Vivek Natarajan \u003cvnatarajan@atheros.com\u003e\nReviewed-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "bc83b6819289c031c439a5aa18ba0fd539d14f3e", "tree": "3e94213703b0a72086a721d78d436919c4dd1dcf", "parents": [ "c14589eb3080636a2f71ebaf21ab9fd70ffc20cc" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Sun Nov 29 12:19:06 2009 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Dec 07 16:51:18 2009 -0500" }, "message": "mac80211: recalculate idle later in MLME\n\nhwsim testing has revealed that when the MLME\nrecalculates the idle state of the device, it\nsometimes does so before sending the final\ndeauthentication or disassociation frame. This\npatch changes the place where the idle state\nis recalculated, but of course driver transmit\nis typically asynchronous while configuration\nis expected to be synchronous, so it doesn\u0027t\nfix all possible cases yet.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" } ], "next": "d014d043869cdc591f3a33243d3481fa4479c2d0" }