)]}' { "log": [ { "commit": "0fd08c5545a806c960a6597fae4a2e656eb7ead9", "tree": "027dfcc65f600afe6a4b19ab72c472fe3f0f24fa", "parents": [ "7921127e297ea203b794c4a1c3ef3eb0ee52acbf", "d1205f87bbb8040c1408bbd9e0a720310b2b0b9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 09:41:02 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 09:41:02 2011 +1000" }, "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: NFSv4 readdir loses entries\n NFS: Micro-optimize nfs4_decode_dirent()\n NFS: Fix an NFS client lockdep issue\n NFS construct consistent co_ownerid for v4.1\n NFS: nfs_wcc_update_inode() should set nfsi-\u003eattr_gencount\n NFS improve pnfs_put_deviceid_cache debug print\n NFS fix cb_sequence error processing\n NFS do not find client in NFSv4 pg_authenticate\n NLM: Fix \"kernel BUG at fs/lockd/host.c:417!\" or \".../host.c:283!\"\n NFS: Prevent memory allocation failure in nfsacl_encode()\n NFS: nfsacl_{encode,decode} should return signed integer\n NFS: Fix \"kernel BUG at fs/nfs/nfs3xdr.c:1338!\"\n NFS: Fix \"kernel BUG at fs/aio.c:554!\"\n NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds().\n NFS: fix handling of malloc failure during nfs_flush_multi()\n" }, { "commit": "7cc2edb83447775a34ed3bf9d29d8295a434b523", "tree": "cdcbae599c95d6902fcb29989c75810b08f04707", "parents": [ "34c92049ac15dcb731dc455d165b4c3c1df569cf" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:41:03 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:41:03 2011 -0800" }, "message": "xfrm6: Don\u0027t forget to propagate peer into ipsec route.\n\nLike ipv4, we have to propagate the ipv6 route peer into\nthe ipsec top-level route during instantiation.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b6941d8b103fe95d1a90b7996046be9ee0e55e4", "tree": "03c4e26abb8d6212741c3821061f2f40f2b5c8ec", "parents": [ "de221bd5eb5e754806fcc39c40bb12b96515d9c5", "acd9f9cc305ca2e5da2a39f6f6160cd4b476e38b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 11:49:49 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 11:49:49 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "44f5324b5d13ef2187729d949eca442689627f39", "tree": "1b53aabed696b8b3099ac2872a7bfe5d5ce24ad3", "parents": [ "73a8bd74e2618990dbb218c3d82f53e60acd9af0" ], "author": { "name": "Jerry Chu", "email": "hkchu@google.com", "time": "Tue Jan 25 13:46:30 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 25 13:46:30 2011 -0800" }, "message": "TCP: fix a bug that triggers large number of TCP RST by mistake\n\nThis patch fixes a bug that causes TCP RST packets to be generated\non otherwise correctly behaved applications, e.g., no unread data\non close,..., etc. To trigger the bug, at least two conditions must\nbe met:\n\n1. The FIN flag is set on the last data packet, i.e., it\u0027s not on a\nseparate, FIN only packet.\n2. The size of the last data chunk on the receive side matches\nexactly with the size of buffer posted by the receiver, and the\nreceiver closes the socket without any further read attempt.\n\nThis bug was first noticed on our netperf based testbed for our IW10\nproposal to IETF where a large number of RST packets were observed.\nnetperf\u0027s read side code meets the condition 2 above 100%.\n\nBefore the fix, tcp_data_queue() will queue the last skb that meets\ncondition 1 to sk_receive_queue even though it has fully copied out\n(skb_copy_datagram_iovec()) the data. Then if condition 2 is also met,\ntcp_recvmsg() often returns all the copied out data successfully\nwithout actually consuming the skb, due to a check\n\"if ((chunk \u003d len - tp-\u003eucopy.len) !\u003d 0) {\"\nand\n\"len -\u003d chunk;\"\nafter tcp_prequeue_process() that causes \"len\" to become 0 and an\nearly exit from the big while loop.\n\nI don\u0027t see any reason not to free the skb whose data have been fully\nconsumed in tcp_data_queue(), regardless of the FIN flag. We won\u0027t\nget there if MSG_PEEK is on. Am I missing some arcane cases related\nto urgent data?\n\nSigned-off-by: H.K. Jerry Chu \u003chkchu@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb3e554b4b3a56386ef5214dbe0e3935a350178b", "tree": "7c107dadb64f044c7747c41e369f9780ab611cb1", "parents": [ "bdc4bf652bc0271ba8f1f25bbd3dbac90bead44e" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Jan 24 19:28:49 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 25 16:28:56 2011 -0500" }, "message": "mac80211: fix a crash in ieee80211_beacon_get_tim on change_interface\n\nSome drivers (e.g. ath9k) do not always disable beacons when they\u0027re\nsupposed to. When an interface is changed using the change_interface op,\nthe mode specific sdata part is in an undefined state and trying to\nget a beacon at this point can produce weird crashes.\n\nTo fix this, add a check for ieee80211_sdata_running before using\nanything from the sdata.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "73a8bd74e2618990dbb218c3d82f53e60acd9af0", "tree": "6bc0dddddd6a5f76a6d0a6adb41d466814cbc023", "parents": [ "de0368d5fec7b9ef95228510f2edb79610beb448" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 23 23:27:15 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 25 12:49:08 2011 -0800" }, "message": "ipv6: Revert \u0027administrative down\u0027 address handling changes.\n\nThis reverts the following set of commits:\n\nd1ed113f1669390da9898da3beddcc058d938587 (\"ipv6: remove duplicate neigh_ifdown\")\n29ba5fed1bbd09c2cba890798c8f9eaab251401d (\"ipv6: don\u0027t flush routes when setting loopback down\")\n9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46 (\"ipv6: fix missing in6_ifa_put in addrconf\")\n2de795707294972f6c34bae9de713e502c431296 (\"ipv6: addrconf: don\u0027t remove address state on ifdown if the address is being kept\")\n8595805aafc8b077e01804c9a3668e9aa3510e89 (\"IPv6: only notify protocols if address is compeletely gone\")\n27bdb2abcc5edb3526e25407b74bf17d1872c329 (\"IPv6: keep tentative addresses in hash table\")\n93fa159abe50d3c55c7f83622d3f5c09b6e06f4b (\"IPv6: keep route for tentative address\")\n8f37ada5b5f6bfb4d251a7f510f249cb855b77b3 (\"IPv6: fix race between cleanup and add/delete address\")\n84e8b803f1e16f3a2b8b80f80a63fa2f2f8a9be6 (\"IPv6: addrconf notify when address is unavailable\")\ndc2b99f71ef477a31020511876ab4403fb7c4420 (\"IPv6: keep permanent addresses on admin down\")\n\nbecause the core semantic change to ipv6 address handling on ifdown\nhas broken some things, in particular \"disable_ipv6\" sysctl handling.\n\nStephen has made several attempts to get things back in working order,\nbut nothing has restored disable_ipv6 fully yet.\n\nReported-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nTested-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "778be232a207e79088ba70d832ac25dfea6fbf1a", "tree": "307249459e5ef45c4b3651c7fc5c454cdb3e0c92", "parents": [ "80c30e8de4f81851b1f712bcc596e11d53bc76f1" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Jan 25 15:38:01 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jan 25 15:26:51 2011 -0500" }, "message": "NFS do not find client in NFSv4 pg_authenticate\n\nThe information required to find the nfs_client cooresponding to the incoming\nback channel request is contained in the NFS layer. Perform minimal checking\nin the RPC layer pg_authenticate method, and push more detailed checking into\nthe NFS layer where the nfs_client can be found.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b7c7d01aaed1f71d9afe815a569f0a81465a1744", "tree": "69d2d061d327713f3c1acc574507edbbb4a5ccb6", "parents": [ "d80bc0fd262ef840ed4e82593ad6416fa1ba3fc4" ], "author": { "name": "Eugene Teo", "email": "eugeneteo@kernel.org", "time": "Mon Jan 24 21:05:17 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 21:05:17 2011 -0800" }, "message": "net: clear heap allocation for ethtool_get_regs()\n\nThere is a conflict between commit b00916b1 and a77f5db3. This patch resolves\nthe conflict by clearing the heap allocation in ethtool_get_regs().\n\nCc: stable@kernel.org\nSigned-off-by: Eugene Teo \u003ceugeneteo@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d80bc0fd262ef840ed4e82593ad6416fa1ba3fc4", "tree": "3a6af0460cad71f1b2efa4acae895dfe2a52634a", "parents": [ "3dce38a02d6370dca690cd923619d4b00024b723" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 16:01:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 16:01:58 2011 -0800" }, "message": "ipv6: Always clone offlink routes.\n\nDo not handle PMTU vs. route lookup creation any differently\nwrt. offlink routes, always clone them.\n\nReported-by: PK \u003crunningdoglackey@yahoo.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3dce38a02d6370dca690cd923619d4b00024b723", "tree": "84fc1c9c7af139fa805d9d28b29dfb1fd8f1a158", "parents": [ "5955e7524790a2c8972487ab43347c28a1931521" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Fri Jan 21 16:35:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 15:19:55 2011 -0800" }, "message": "dcbnl: make get_app handling symmetric for IEEE and CEE DCBx\n\nThe IEEE get/set app handlers use generic routines and do not\nrequire the net_device to implement the dcbnl_ops routines. This\npatch makes it symmetric so user space and drivers do not have\nto handle the CEE version and IEEE DCBx versions differently.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd0273c5033630b8673554cd39660435d1ab2ac4", "tree": "e13f583f7848dcc1c620f3e4598e22f96a2d8efc", "parents": [ "3408404a4c2a4eead9d73b0bbbfe3f225b65f492" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 24 14:41:20 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:41:20 2011 -0800" }, "message": "tcp: fix bug in listening_get_next()\n\ncommit a8b690f98baf9fb19 (tcp: Fix slowness in read /proc/net/tcp)\nintroduced a bug in handling of SYN_RECV sockets.\n\nst-\u003eoffset represents number of sockets found since beginning of\nlistening_hash[st-\u003ebucket].\n\nWe should not reset st-\u003eoffset when iterating through\nsyn_table[st-\u003esbucket], or else if more than ~25 sockets (if\nPAGE_SIZE\u003d4096) are in SYN_RECV state, we exit from listening_get_next()\nwith a too small st-\u003eoffset\n\nNext time we enter tcp_seek_last_pos(), we are not able to seek past\nalready found sockets.\n\nReported-by: PK \u003crunningdoglackey@yahoo.com\u003e\nCC: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3408404a4c2a4eead9d73b0bbbfe3f225b65f492", "tree": "b0be5af0a2886a3f5bc075d94c4c621ff6802973", "parents": [ "d1dc7abf2fafa34b0ffcd070fd59405aa9c0a4d8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:37:46 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:38:09 2011 -0800" }, "message": "inetpeer: Use correct AVL tree base pointer in inet_getpeer().\n\nFamily was hard-coded to AF_INET but should be daddr-\u003efamily.\n\nThis fixes crashes when unlinking ipv6 peer entries, since the\nunlink code was looking up the base pointer properly.\n\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1dc7abf2fafa34b0ffcd070fd59405aa9c0a4d8", "tree": "c527ec6ca85cae2243d172b28e41369ef0e514ac", "parents": [ "e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb" ], "author": { "name": "Michal Schmidt", "email": "mschmidt@redhat.com", "time": "Mon Jan 24 12:08:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:27:18 2011 -0800" }, "message": "GRO: fix merging a paged skb after non-paged skbs\n\nSuppose that several linear skbs of the same flow were received by GRO. They\nwere thus merged into one skb with a frag_list. Then a new skb of the same flow\narrives, but it is a paged skb with data starting in its frags[].\n\nBefore adding the skb to the frag_list skb_gro_receive() will of course adjust\nthe skb to throw away the headers. It correctly modifies the page_offset and\nsize of the frag, but it leaves incorrect information in the skb:\n -\u003edata_len is not decreased at all.\n -\u003elen is decreased only by headlen, as if no change were done to the frag.\nLater in a receiving process this causes skb_copy_datagram_iovec() to return\n-EFAULT and this is seen in userspace as the result of the recv() syscall.\n\nIn practice the bug can be reproduced with the sfc driver. By default the\ndriver uses an adaptive scheme when it switches between using\nnapi_gro_receive() (with skbs) and napi_gro_frags() (with pages). The bug is\nreproduced when under rx load with enough successful GRO merging the driver\ndecides to switch from the former to the latter.\n\nManual control is also possible, so reproducing this is easy with netcat:\n - on machine1 (with sfc): nc -l 12345 \u003e /dev/null\n - on machine2: nc machine1 12345 \u003c /dev/zero\n - on machine1:\n echo 1 \u003e /sys/module/sfc/parameters/rx_alloc_method # use skbs\n echo 2 \u003e /sys/module/sfc/parameters/rx_alloc_method # use pages\n - See that nc has quit suddenly.\n\n[v2: Modified by Eric Dumazet to avoid advancing skb-\u003edata past the end\n and to use a temporary variable.]\n\nSigned-off-by: Michal Schmidt \u003cmschmidt@redhat.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb", "tree": "6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb", "parents": [ "c506653d35249bb4738bb139c24362e1ae724bc1", "ec30f343d61391ab23705e50a525da1d55395780" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 13:17:06 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 13:17:06 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "c506653d35249bb4738bb139c24362e1ae724bc1", "tree": "24fdcd4d25b8e0fd14c4074f3ef3673d3c7f6eb3", "parents": [ "0a0b7a5f7a043d86a95990d3227cf7e823ae52ac" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 24 13:16:16 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 13:16:16 2011 -0800" }, "message": "net: arp_ioctl() must hold RTNL\n\nCommit 941666c2e3e0 \"net: RCU conversion of dev_getbyhwaddr() and\narp_ioctl()\" introduced a regression, reported by Jamie Heilman.\n\"arp -Ds 192.168.2.41 eth0 pub\" triggered the ASSERT_RTNL() assert\nin pneigh_lookup()\n\nRemoving RTNL requirement from arp_ioctl() was a mistake, just revert\nthat part.\n\nReported-by: Jamie Heilman \u003cjamie@audible.transient.net\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "577d6a7c3a0e273e115c65a148b71be6c1950f69", "tree": "3094a0b019ab4f81a2a0bc460635b9ee56cd2768", "parents": [ "b75be4204e7871869b2c268c00783703197aaa7d" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:32:52 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jan 24 14:32:54 2011 +1030" }, "message": "module: fix missing semicolons in MODULE macro usage\n\nYou always needed them when you were a module, but the builtin versions\nof the macros used to be more lenient.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "9190b3b3208d052d98cb601fcc192f3f71a5658b", "tree": "b642a00320a1b35e33741fcd162072724f228fbf", "parents": [ "b30532515f0a62bfe17207ab00883dd262497006" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 23:31:33 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 23:31:33 2011 -0800" }, "message": "net_sched: accurate bytes/packets stats/rates\n\nIn commit 44b8288308ac9d (net_sched: pfifo_head_drop problem), we fixed\na problem with pfifo_head drops that incorrectly decreased\nsch-\u003ebstats.bytes and sch-\u003ebstats.packets\n\nSeveral qdiscs (CHOKe, SFQ, pfifo_head, ...) are able to drop a\npreviously enqueued packet, and bstats cannot be changed, so\nbstats/rates are not accurate (over estimated)\n\nThis patch changes the qdisc_bstats updates to be done at dequeue() time\ninstead of enqueue() time. bstats counters no longer account for dropped\nframes, and rates are more correct, since enqueue() bursts dont have\neffect on dequeue() rate.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1268afe676ee9431a229fc68a2efb0dad4d5852f", "tree": "c252b969a51bd97317415cfc3b6465441f1b8aec", "parents": [ "c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470", "4580ccc04ddd8c17a470573a7fdb8def2e036dfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -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: (41 commits)\n sctp: user perfect name for Delayed SACK Timer option\n net: fix can_checksum_protocol() arguments swap\n Revert \"netlink: test for all flags of the NLM_F_DUMP composite\"\n gianfar: Fix misleading indentation in startup_gfar()\n net/irda/sh_irda: return to RX mode when TX error\n net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.\n USB CDC NCM: tx_fixup() race condition fix\n ns83820: Avoid bad pointer deref in ns83820_init_one().\n ipv6: Silence privacy extensions initialization\n bnx2x: Update bnx2x version to 1.62.00-4\n bnx2x: Fix AER setting for BCM57712\n bnx2x: Fix BCM84823 LED behavior\n bnx2x: Mark full duplex on some external PHYs\n bnx2x: Fix BCM8073/BCM8727 microcode loading\n bnx2x: LED fix for BCM8727 over BCM57712\n bnx2x: Common init will be executed only once after POR\n bnx2x: Swap BCM8073 PHY polarity if required\n iwlwifi: fix valid chain reading from EEPROM\n ath5k: fix locking in tx_complete_poll_work\n ath9k_hw: do PA offset calibration only on longcal interval\n ...\n" }, { "commit": "4580ccc04ddd8c17a470573a7fdb8def2e036dfa", "tree": "09c0d4c275c95b70b7e859b0449019fb791fc09c", "parents": [ "d402786ea4f8433774a812d6b8635e737425cddd" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Tue Jan 18 22:39:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 19 16:51:29 2011 -0800" }, "message": "sctp: user perfect name for Delayed SACK Timer option\n\nThe option name of Delayed SACK Timer should be SCTP_DELAYED_SACK,\nnot SCTP_DELAYED_ACK.\n\nLeft SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK,\nfor making compatibility with existing applications.\n\nReference:\n8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK)\n（http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nAcked-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d402786ea4f8433774a812d6b8635e737425cddd", "tree": "65c31c4cccccc6b28027dc7e20f50baaaf497657", "parents": [ "b8f3ab4290f1e720166e888ea2a1d1d44c4d15dd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 19 00:51:36 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 19 14:15:21 2011 -0800" }, "message": "net: fix can_checksum_protocol() arguments swap\n\ncommit 0363466866d901fbc (net offloading: Convert checksums to use\ncentrally computed features.) mistakenly swapped can_checksum_protocol()\narguments.\n\nThis broke IPv6 on bnx2 for instance, on NIC without TCPv6 checksum\noffloads.\n\nReported-by: Hans de Bruin \u003cjmdebruin@xmsnet.nl\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b8f3ab4290f1e720166e888ea2a1d1d44c4d15dd", "tree": "88d5b71b27ed9ca0b5d67bd6ae61f592fb61fdc5", "parents": [ "ff76015f3bdfbc482c723cb4f2559cef84d178ca" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 12:40:38 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 19 13:34:20 2011 -0800" }, "message": "Revert \"netlink: test for all flags of the NLM_F_DUMP composite\"\n\nThis reverts commit 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf.\n\nIt breaks several things including the avahi daemon.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "765c2a964b49bd06b61a52991519281c85d82b67", "tree": "e646cb50bd43f9a74583391805529d3397934f42", "parents": [ "d00ef24fc2923b65fdd440dc6445903e965841ac" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Wed Jan 19 12:06:52 2011 +0530" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:43:11 2011 -0200" }, "message": "Bluetooth: Fix race condition with conn-\u003esec_level\n\nThe conn-\u003esec_level value is supposed to represent the current level of\nsecurity that the connection has. However, by assigning to it before\nrequesting authentication it will have the wrong value during the\nauthentication procedure. To fix this a pending_sec_level variable is\nadded which is used to track the desired security level while making\nsure that sec_level always represents the current level of security.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "d00ef24fc2923b65fdd440dc6445903e965841ac", "tree": "679ed038188e94ddde990e3ec1d31fc56055f9bf", "parents": [ "8556edd32f01c50a3c99e44dc2c3b1252ea59605" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Wed Jan 19 12:06:51 2011 +0530" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:40:43 2011 -0200" }, "message": "Bluetooth: Fix authentication request for L2CAP raw sockets\n\nWhen there is an existing connection l2cap_check_security needs to be\ncalled to ensure that the security level of the new socket is fulfilled.\nNormally l2cap_do_start takes care of this, but that function doesn\u0027t\nget called for SOCK_RAW type sockets. This patch adds the necessary\nl2cap_check_security call to the appropriate branch in l2cap_do_connect.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "8556edd32f01c50a3c99e44dc2c3b1252ea59605", "tree": "b0e9d426b7a17ad201c782d4e0c09fbddfe81730", "parents": [ "65cf686ee102b7eb0477a4bab82ff227071a0258" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Wed Jan 19 12:06:50 2011 +0530" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:40:43 2011 -0200" }, "message": "Bluetooth: Create a unified auth_type evaluation function\n\nThe logic for determining the needed auth_type for an L2CAP socket is\nrather complicated and has so far been duplicated in\nl2cap_check_security as well as l2cap_do_connect. Additionally the\nl2cap_check_security code was completely missing the handling of\nSOCK_RAW type sockets. This patch creates a unified function for the\nevaluation and makes l2cap_do_connect and l2cap_check_security use that\nfunction.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "65cf686ee102b7eb0477a4bab82ff227071a0258", "tree": "e710dde434f53139dd11b9d61d5a0c33f17f1e3a", "parents": [ "88644bb9fee591b2743a881923263bc28df4cded" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Wed Jan 19 12:06:49 2011 +0530" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:40:43 2011 -0200" }, "message": "Bluetooth: Fix MITM protection requirement preservation\n\nIf an existing connection has a MITM protection requirement (the first\nbit of the auth_type) then that requirement should not be cleared by new\nsockets that reuse the ACL but don\u0027t have that requirement.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "88644bb9fee591b2743a881923263bc28df4cded", "tree": "f544155e89e9c622fcc2a59c797e6da659370a13", "parents": [ "683d949a7fbf33c244670e34d35c460e0d6558cb" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Wed Jan 19 12:06:48 2011 +0530" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:40:42 2011 -0200" }, "message": "Revert \"Bluetooth: Update sec_level/auth_type for already existing connections\"\n\nThis reverts commit 045309820afe047920a50de25634dab46a1e851d. That\ncommit is wrong for two reasons:\n\n- The conn-\u003esec_level shouldn\u0027t be updated without performing\nauthentication first (as it\u0027s supposed to represent the level of\nsecurity that the existing connection has)\n\n- A higher auth_type value doesn\u0027t mean \"more secure\" like the commit\nseems to assume. E.g. dedicated bonding with MITM protection is 0x03\nwhereas general bonding without MITM protection is 0x04. hci_conn_auth\nalready takes care of updating conn-\u003eauth_type so hci_connect doesn\u0027t\nneed to do it.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "683d949a7fbf33c244670e34d35c460e0d6558cb", "tree": "fafa2f5c18d72466e859e7ade3f6a84d84bb7224", "parents": [ "e2e0cacbd4b0c7c69c7591d37c243f2363aeaa71" ], "author": { "name": "Lukáš Turek", "email": "8an@praha12.net", "time": "Wed Jan 05 02:43:59 2011 +0100" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:40:42 2011 -0200" }, "message": "Bluetooth: Never deallocate a session when some DLC points to it\n\nFix a bug introduced in commit 9cf5b0ea3a7f1432c61029f7aaf4b8b338628884:\nfunction rfcomm_recv_ua calls rfcomm_session_put without checking that\nthe session is not referenced by some DLC. If the session is freed, that\nDLC would refer to deallocated memory, causing an oops later, as shown\nin this bug report: https://bugzilla.kernel.org/show_bug.cgi?id\u003d15994\n\nSigned-off-by: Lukas Turek \u003c8an@praha12.net\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "e2e0cacbd4b0c7c69c7591d37c243f2363aeaa71", "tree": "cf94370f2989dc0d18c770ef5c32161d91c8b24f", "parents": [ "4571928fc73589e9c5217cd069d2c0b4ff1818a8" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Tue Jan 04 12:08:50 2011 +0200" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:40:42 2011 -0200" }, "message": "Bluetooth: Fix leaking blacklist when unregistering a hci device\n\nThe blacklist should be freed before the hci device gets unregistered.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "4571928fc73589e9c5217cd069d2c0b4ff1818a8", "tree": "6269ec7fd6734029956e528da626d21bf4b170cb", "parents": [ "86e09287e4f8c81831b4d4118a48597565f0d21b" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Fri Jan 14 14:59:44 2011 +0100" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:40:42 2011 -0200" }, "message": "Bluetooth: l2cap: fix misuse of logical operation in place of bitop\n\nCC: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nCC: \"Gustavo F. Padovan\" \u003cpadovan@profusion.mobi\u003e\nCC: João Paulo Rechi Vita \u003cjprvita@profusion.mobi\u003e\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "6ee400aafb60289b78fcde5ebccd8c4973fc53f4", "tree": "d2cf34a95277a35836bbbb898a15d3dfa45e4368", "parents": [ "f742aa8acb7e50a383f6d2b00b1c52e081970d38" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Mon Jan 17 20:46:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 16:13:50 2011 -0800" }, "message": "net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.\n\nIn netif_skb_features() we return only the features that are valid for vlans\nif we have a vlan packet. However, we should not mask out NETIF_F_HW_VLAN_TX\nsince it enables transmission of vlan tags and is obviously valid.\n\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2fdc1c8093255f9da877d7b9ce3f46c2098377dc", "tree": "aaf2ce878a25db10ce5509d5e9931d6e68184f06", "parents": [ "6aefc522a8680f7b5a794f14dc78d6eab1cfdc37" ], "author": { "name": "Romain Francoise", "email": "romain@orebokech.com", "time": "Mon Jan 17 07:59:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 16:13:49 2011 -0800" }, "message": "ipv6: Silence privacy extensions initialization\n\nWhen a network namespace is created (via CLONE_NEWNET), the loopback\ninterface is automatically added to the new namespace, triggering a\nprintk in ipv6_add_dev() if CONFIG_IPV6_PRIVACY is set.\n\nThis is problematic for applications which use CLONE_NEWNET as\npart of a sandbox, like Chromium\u0027s suid sandbox or recent versions of\nvsftpd. On a busy machine, it can lead to thousands of useless\n\"lo: Disabled Privacy Extensions\" messages appearing in dmesg.\n\nIt\u0027s easy enough to check the status of privacy extensions via the\nuse_tempaddr sysctl, so just removing the printk seems like the most\nsensible solution.\n\nSigned-off-by: Romain Francoise \u003cromain@orebokech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f966a13f92913ce8cbd35bc7f066553c9f3d41b0", "tree": "5039770cf62f69317c974775190cc4f5919f8398", "parents": [ "7e96fbf2320782fb8f0970928026105cd34b41bd", "38d59392b29437af3a702209b6a5196ef01f79a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 12:50:19 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 12:50:19 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "01a859014b35deb6cc63b1dc2808ca7a0e10a4de", "tree": "28334f820b4ce3218a643cda0967aaf63886f4a0", "parents": [ "5e5073280379d38e86ade471daa7443b553fc839" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Jan 15 03:06:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 15 20:58:11 2011 -0800" }, "message": "caif: checking the wrong variable\n\nIn the original code we check if (servl \u003d\u003d NULL) twice. The first time\nshould print the message that cfmuxl_remove_uplayer() failed and set\n\"ret\" correctly, but instead it just returns success. The second check\nshould be checking the value of \"ret\" instead of \"servl\".\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e5073280379d38e86ade471daa7443b553fc839", "tree": "18b76f530ec22b57b36de68b985ad32444066dcc", "parents": [ "d78c68efa84ff312f3663dbf921b1e3485232205" ], "author": { "name": "Kurt Van Dijck", "email": "kurt.van.dijck@eia.be", "time": "Sat Jan 15 20:56:42 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 15 20:56:42 2011 -0800" }, "message": "can: test size of struct sockaddr in sendmsg\n\nThis patch makes the CAN socket code conform to the manpage of sendmsg.\n\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nAcked-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d78c68efa84ff312f3663dbf921b1e3485232205", "tree": "e2c6e640d747bdd815ce3795f6c37f8f4ca1161d", "parents": [ "16c0f9362433a76f01d174bb8b9c87b9a96198ee", "aa0adb1a85e159cf57f0e11282bc6c9e3606a5f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 15 20:48:28 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 15 20:48:28 2011 -0800" }, "message": "Merge branch \u0027for-david\u0027 of git://git.open-mesh.org/ecsv/linux-merge\n" }, { "commit": "aa0adb1a85e159cf57f0e11282bc6c9e3606a5f3", "tree": "19406bf80804801e85cf0182f5037ddfc656465e", "parents": [ "ed7809d9c41b514115ddffaa860694393c2016b3" ], "author": { "name": "Sven Eckelmann", "email": "sven@narfation.org", "time": "Sat Jan 15 14:39:43 2011 +0000" }, "committer": { "name": "Sven Eckelmann", "email": "sven@narfation.org", "time": "Sun Jan 16 03:25:19 2011 +0100" }, "message": "batman-adv: Use \"__attribute__\" shortcut macros\n\nLinux 2.6.21 defines different macros for __attribute__ which are also\nused inside batman-adv. The next version of checkpatch.pl warns about\nthe usage of __attribute__((packed))).\n\nLinux 2.6.33 defines an extra macro __always_unused which is used to\nassist source code analyzers and can be used to removed the last\nexisting __attribute__ inside the source code.\n\nSigned-off-by: Sven Eckelmann \u003csven@narfation.org\u003e\n" }, { "commit": "d018b6f4f1539f3679fbdc2d02d58d09e76be84a", "tree": "317b9e04d8e7a73a4d07c69a5cb5455ec34f47e5", "parents": [ "18bce371ae09af6c20ee62c1092a4d1d0e84dd49", "0f73f2c5a3ebb957ee66718c903c17ed71a4fc2e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -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: (47 commits)\n GRETH: resolve SMP issues and other problems\n GRETH: handle frame error interrupts\n GRETH: avoid writing bad speed/duplex when setting transfer mode\n GRETH: fixed skb buffer memory leak on frame errors\n GRETH: GBit transmit descriptor handling optimization\n GRETH: fix opening/closing\n GRETH: added raw AMBA vendor/device number to match against.\n cassini: Fix build bustage on x86.\n e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs\n e1000e: update Copyright for 2011\n e1000: Avoid unhandled IRQ\n r8169: keep firmware in memory.\n netdev: tilepro: Use is_unicast_ether_addr helper\n etherdevice.h: Add is_unicast_ether_addr function\n ks8695net: Use default implementation of ethtool_ops::get_link\n ks8695net: Disable non-working ethtool operations\n USB CDC NCM: Don\u0027t deref NULL in cdc_ncm_rx_fixup() and don\u0027t use uninitialized variable.\n vxge: Remember to release firmware after upgrading firmware\n netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr\n ipsec: update MAX_AH_AUTH_LEN to support sha512\n ...\n" }, { "commit": "18bce371ae09af6c20ee62c1092a4d1d0e84dd49", "tree": "f3467fafd8e49392e3f6efef7b88a7b4dd3b7b06", "parents": [ "ec08bdb148767f1193f5f3028749ed865ac27181", "a8f2800b4f7b76cecb7209cb6a7d2b14904fc711" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:17:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:17:26 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.38\u0027 of git://linux-nfs.org/~bfields/linux: (62 commits)\n nfsd4: fix callback restarting\n nfsd: break lease on unlink, link, and rename\n nfsd4: break lease on nfsd setattr\n nfsd: don\u0027t support msnfs export option\n nfsd4: initialize cb_per_client\n nfsd4: allow restarting callbacks\n nfsd4: simplify nfsd4_cb_prepare\n nfsd4: give out delegations more quickly in 4.1 case\n nfsd4: add helper function to run callbacks\n nfsd4: make sure sequence flags are set after destroy_session\n nfsd4: re-probe callback on connection loss\n nfsd4: set sequence flag when backchannel is down\n nfsd4: keep finer-grained callback status\n rpc: allow xprt_class-\u003esetup to return a preexisting xprt\n rpc: keep backchannel xprt as long as server connection\n rpc: move sk_bc_xprt to svc_xprt\n nfsd4: allow backchannel recovery\n nfsd4: support BIND_CONN_TO_SESSION\n nfsd4: modify session list under cl_lock\n Documentation: fl_mylease no longer exists\n ...\n\nFix up conflicts in fs/nfsd/vfs.c with the vfs-scale work. The\nvfs-scale work touched some msnfs cases, and this merge removes support\nfor that entirely, so the conflict was trivial to resolve.\n" }, { "commit": "e1fcc7e2a719d139322fab3f47cfbd4340cf3d82", "tree": "47ded32567f59d0f3e0e130727e06a8aa31df86b", "parents": [ "ba28b93a5227cc69ec811507f7d85ac25fa20fe2" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Jan 14 15:56:31 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 09:25:11 2011 -0800" }, "message": "rxrpc: rxrpc_workqueue isn\u0027t used during memory reclaim\n\nrxrpc_workqueue isn\u0027t depended upon while reclaiming memory. Convert\nto alloc_workqueue() without WQ_MEM_RECLAIM.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: linux-afs@lists.infradead.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1ac9ad1394fa542ac7ae0dc943ee3cda678799fa", "tree": "d846be421ed68f4fc612ae7c061783dab73d5fa2", "parents": [ "1949e084bfd143c76e22c0b37f370d6e7bf4bfdd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 12 12:13:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 13 21:44:34 2011 -0800" }, "message": "net: remove dev_txq_stats_fold()\n\nAfter recent changes, (percpu stats on vlan/tunnels...), we dont need\nanymore per struct netdev_queue tx_bytes/tx_packets/tx_dropped counters.\n\nOnly remaining users are ixgbe, sch_teql, gianfar \u0026 macvlan :\n\n1) ixgbe can be converted to use existing tx_ring counters.\n\n2) macvlan incremented txq-\u003etx_dropped, it can use the\ndev-\u003estats.tx_dropped counter.\n\n3) sch_teql : almost revert ab35cd4b8f42 (Use net_device internal stats)\n Now we have ndo_get_stats64(), use it, even for \"unsigned long\"\nfields (No need to bring back a struct net_device_stats)\n\n4) gianfar adds a stats structure per tx queue to hold\ntx_bytes/tx_packets\n\nThis removes a lockdep warning (and possible lockup) in rndis gadget,\ncalling dev_get_stats() from hard IRQ context.\n\nRef: http://www.spinics.net/lists/netdev/msg149202.html\n\nReported-by: Neil Jones \u003cneiljay@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nCC: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nCC: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nCC: Sandeep Gopalpet \u003csandeep.kumar@freescale.com\u003e\nCC: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ed7809d9c41b514115ddffaa860694393c2016b3", "tree": "ef0e14d7477b2363f787ace24b683a439ea103f2", "parents": [ "53320fe3bb1b1eef1aaff8dd47aae530ebeeb1e5" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Thu Jan 13 21:53:38 2011 +0100" }, "committer": { "name": "Sven Eckelmann", "email": "sven@narfation.org", "time": "Thu Jan 13 22:11:12 2011 +0100" }, "message": "batman-adv: Even Batman should not dereference NULL pointers\n\nThere\u0027s a problem in net/batman-adv/unicast.c::frag_send_skb().\ndev_alloc_skb() allocates memory and may fail, thus returning NULL. If\nthis happens we\u0027ll pass a NULL pointer on to skb_split() which in turn\nhands it to skb_split_inside_header() from where it gets passed to\nskb_put() that lets skb_tail_pointer() play with it and that function\ndereferences it. And thus the bat dies.\n\nWhile I was at it I also moved the call to dev_alloc_skb() above the\nassignment to \u0027unicast_packet\u0027 since there\u0027s no reason to do that\nassignment if the memory allocation fails.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Sven Eckelmann \u003csven@narfation.org\u003e\n" }, { "commit": "82694f764dad783a123394e2220b92b9be721b43", "tree": "3ff12e550b9048a153a20d2b9583bc75491196f7", "parents": [ "681c4d07dd5b2ce2ad9f6dbbf7841e479fbc7754" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Wed Jan 12 15:18:11 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jan 13 15:46:45 2011 -0500" }, "message": "mac80211: use maximum number of AMPDU frames as default in BA RX\n\nWhen the buffer size is set to zero in the block ack parameter set\nfield, we should use the maximum supported number of subframes. The\nexisting code was bogus and was doing some unnecessary calculations\nthat lead to wrong values.\n\nThanks Johannes for helping me figure this one out.\n\nCc: stable@kernel.org\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "681c4d07dd5b2ce2ad9f6dbbf7841e479fbc7754", "tree": "095ffe7e63cc61951095b5642a38136557502a21", "parents": [ "8d661f1e462d50bd83de87ee628aaf820ce3c66c" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Jan 12 13:40:33 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jan 13 15:46:45 2011 -0500" }, "message": "mac80211: fix lockdep warning\n\nSince the introduction of the fixes for the\nreorder timer, mac80211 will cause lockdep\nwarnings because lockdep confuses\nlocal-\u003eskb_queue and local-\u003erx_skb_queue\nand treats their lock as the same.\n\nHowever, their locks are different, and are\nvalid in different contexts (the former is\nused in IRQ context, the latter in BH only)\nand the only thing to be done is mark the\nformer as a different lock class so that\nlockdep can tell the difference.\n\nReported-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nReported-by: Sujith \u003cm.sujith@gmail.com\u003e\nReported-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nTested-by: Sujith \u003cm.sujith@gmail.com\u003e\nTested-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1949e084bfd143c76e22c0b37f370d6e7bf4bfdd", "tree": "56fddb33e3a268fc7514dc718ec1a242b15a960d", "parents": [ "3806b4f3b6115ce324b7125844f9e6acc80d34ec", "f31e8d4982653b39fe312f9938be0f49dd9ab5fa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 13 12:34:21 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 13 12:34:21 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net-2.6\n" }, { "commit": "b2034d474b7e1e8578bd5c2977024b51693269d9", "tree": "e43969bf7c2ba89884c2580f56978826f1014520", "parents": [ "27d189c02ba25851973c8582e419c0bded9f7e5b", "924241575a85249b9d410e38f5b2fcad9035e45c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:27:28 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:27:28 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (41 commits)\n fs: add documentation on fallocate hole punching\n Gfs2: fail if we try to use hole punch\n Btrfs: fail if we try to use hole punch\n Ext4: fail if we try to use hole punch\n Ocfs2: handle hole punching via fallocate properly\n XFS: handle hole punching via fallocate properly\n fs: add hole punching to fallocate\n vfs: pass struct file to do_truncate on O_TRUNC opens (try #2)\n fix signedness mess in rw_verify_area() on 64bit architectures\n fs: fix kernel-doc for dcache::prepend_path\n fs: fix kernel-doc for dcache::d_validate\n sanitize ecryptfs -\u003emount()\n switch afs\n move internal-only parts of ncpfs headers to fs/ncpfs\n switch ncpfs\n switch 9p\n pass default dentry_operations to mount_pseudo()\n switch hostfs\n switch affs\n switch configfs\n ...\n" }, { "commit": "27d189c02ba25851973c8582e419c0bded9f7e5b", "tree": "be142d664bc4e3cec7ab2878a243343f46e897ee", "parents": [ "a1703154200c390ab03c10224c586e815d3e31e8", "55db8387a5e8d07407f0b7c6b2526417a2bc6243" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:58 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:58 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)\n hwrng: via_rng - Fix memory scribbling on some CPUs\n crypto: padlock - Move padlock.h into include/crypto\n hwrng: via_rng - Fix asm constraints\n crypto: n2 - use __devexit not __exit in n2_unregister_algs\n crypto: mark crypto workqueues CPU_INTENSIVE\n crypto: mv_cesa - dont return PTR_ERR() of wrong pointer\n crypto: ripemd - Set module author and update email address\n crypto: omap-sham - backlog handling fix\n crypto: gf128mul - Remove experimental tag\n crypto: af_alg - fix af_alg memory_allocated data type\n crypto: aesni-intel - Fixed build with binutils 2.16\n crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets\n net: Add missing lockdep class names for af_alg\n include: Install linux/if_alg.h for user-space crypto API\n crypto: omap-aes - checkpatch --file warning fixes\n crypto: omap-aes - initialize aes module once per request\n crypto: omap-aes - unnecessary code removed\n crypto: omap-aes - error handling implementation improved\n crypto: omap-aes - redundant locking is removed\n crypto: omap-aes - DMA initialization fixes for OMAP off mode\n ...\n" }, { "commit": "a1703154200c390ab03c10224c586e815d3e31e8", "tree": "df90865eed3cfdf7af8664b5453a90e09d17480a", "parents": [ "67b5ad9a63caa2ce56ddd2b22b802dae00d72c13", "766fc43973b16f9becb6b7402b3e052dbb84adee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:24 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:25:24 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: fix cleanup when trying to mount inexistent image\n net/ceph: make ceph_msgr_wq non-reentrant\n ceph: fsc-\u003e*_wq\u0027s aren\u0027t used in memory reclaim path\n ceph: Always free allocated memory in osdmap_decode()\n ceph: Makefile: Remove unnessary code\n ceph: associate requests with opening sessions\n ceph: drop redundant r_mds field\n ceph: implement DIRLAYOUTHASH feature to get dir layout from MDS\n ceph: add dir_layout to inode\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "f31e8d4982653b39fe312f9938be0f49dd9ab5fa", "tree": "32ec35631317568dc98cdc178a6950216b3149c9", "parents": [ "2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 13 14:19:55 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 13 17:03:39 2011 +0100" }, "message": "netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()\n\nThis patch fixes a loop in ctnetlink_get_conntrack() that can be\ntriggered if you use the same socket to receive events and to\nperform a GET operation. Under heavy load, netlink_unicast()\nmay return -EAGAIN, this error code is reserved in nfnetlink for\nthe module load-on-demand. Instead, we return -ENOBUFS which is\nthe appropriate error code that has to be propagated to\nuser-space.\n\nReported-by: Holger Eitzenberger \u003cholger@eitzenberger.org\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "3806b4f3b6115ce324b7125844f9e6acc80d34ec", "tree": "bddebf5e1fb71ac62530b416f978dfcea48cf8c9", "parents": [ "838b4dc6d8a6bd83a93077ebc6873712c65bf85e" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Jan 12 14:50:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 19:00:40 2011 -0800" }, "message": "eth: fix new kernel-doc warning\n\nFix new kernel-doc warning (copy-paste typo):\n\nWarning(net/ethernet/eth.c:366): No description found for parameter \u0027rxqs\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "464143c911df98d4913932534485113a0a14aa74", "tree": "4df3953e3cbba8931b6305aa6d16981f1a93de6c", "parents": [ "bb1231052e265e960d902ab32e67c5ccdabc9434", "2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:58:40 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:58:40 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net-2.6\n" }, { "commit": "72b43d0898e97f588293b4a24b33c58c46633d81", "tree": "748983e66c649af362b170b3dbd9411e8f87a2d2", "parents": [ "12252771691aaf4935206367e0917a8f697acfcb" ], "author": { "name": "Alexey Kuznetsov", "email": "kuznet@ms2.inr.ac.ru", "time": "Wed Jan 12 08:34:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:51:55 2011 -0800" }, "message": "inet6: prevent network storms caused by linux IPv6 routers\n\nLinux IPv6 forwards unicast packets, which are link layer multicasts...\nThe hole was present since day one. I was 100% this check is there, but it is not.\n\nThe problem shows itself, f.e. when Microsoft Network Load Balancer runs on a network.\nThis software resolves IPv6 unicast addresses to multicast MAC addresses.\n\nSigned-off-by: Alexey Kuznetsov \u003ckuznet@ms2.inr.ac.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c74a1cbb3cac348f276fabc381758f5b0b4713b2", "tree": "5b403590e41b5e91fce25c69d50a23b920b3497f", "parents": [ "f772c4a6a320ec25d94ba951881474eeef1b7f48" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jan 12 16:59:34 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jan 12 20:03:43 2011 -0500" }, "message": "pass default dentry_operations to mount_pseudo()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f363e45fd1184219b472ea549cb7e192e24ef4d2", "tree": "1332feb2f7a0a47ce482a0fd4ee9afb547a27090", "parents": [ "01e6acc4ea4c284c44bfb3d46c76f4ae580c6435" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Jan 03 14:49:46 2011 +0100" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Wed Jan 12 15:15:14 2011 -0800" }, "message": "net/ceph: make ceph_msgr_wq non-reentrant\n\nceph messenger code does a rather complex dancing around multithread\nworkqueue to make sure the same work item isn\u0027t executed concurrently\non different CPUs. This restriction can be provided by workqueue with\nWQ_NON_REENTRANT.\n\nMake ceph_msgr_wq non-reentrant workqueue with the default concurrency\nlevel and remove the QUEUED/BUSY logic.\n\n* This removes backoff handling in con_work() but it couldn\u0027t reliably\n block execution of con_work() to begin with - queue_con() can be\n called after the work started but before BUSY is set. It seems that\n it was an optimization for a rather cold path and can be safely\n removed.\n\n* The number of concurrent work items is bound by the number of\n connections and connetions are independent from each other. With\n the default concurrency level, different connections will be\n executed independently.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Sage Weil \u003csage@newdream.net\u003e\nCc: ceph-devel@vger.kernel.org\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "b0aee3516d84c05240065a53f238ba7a718f56b9", "tree": "13877be944725cd055782289fe0260ac69cb87f8", "parents": [ "582c86e69045f37da8be445c265f72a7a73b18c6" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Fri Dec 24 23:01:12 2010 +0100" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Wed Jan 12 15:15:14 2011 -0800" }, "message": "ceph: Always free allocated memory in osdmap_decode()\n\nAlways free memory allocated to \u0027pi\u0027 in\nnet/ceph/osdmap.c::osdmap_decode().\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "6c0f3af72cb1622a66962a1180c36ef8c41be8e2", "tree": "66e415bf31ea31a3e9360c0ce624fd20b6050c89", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Nov 16 11:14:34 2010 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Wed Jan 12 15:15:12 2011 -0800" }, "message": "ceph: add dir_layout to inode\n\nAdd a ceph_dir_layout to the inode, and calculate dentry hash values based\non the parent directory\u0027s specified dir_hash function. This is needed\nbecause the old default Linux dcache hash function is extremely week and\nleads to a poor distribution of files among dir fragments.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa", "tree": "df97dadb97bf3c9b46b7c557d8ac14b9ab1c17b3", "parents": [ "2f46e07995734a363608e974a82fd05d5b610750" ], "author": { "name": "KOVACS Krisztian", "email": "hidden@balabit.hu", "time": "Wed Jan 12 20:25:08 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Jan 12 20:25:08 2011 +0100" }, "message": "netfilter: fix compilation when conntrack is disabled but tproxy is enabled\n\nThe IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but\nfailed to update the #ifdef stanzas guarding the defragmentation related\nfields and code in skbuff and conntrack related code in nf_defrag_ipv6.c.\n\nThis patch adds the required #ifdefs so that IPv6 tproxy can truly be used\nwithout connection tracking.\n\nOriginal report:\nhttp://marc.info/?l\u003dlinux-netdev\u0026m\u003d129010118516341\u0026w\u003d2\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "5b919f833d9d60588d026ad82d17f17e8872c7a9", "tree": "bfeb93a19ef9e9f1b88574fb7ccc9a37e2c9ced5", "parents": [ "343a8d13aae58dec562dbb5c7d48a53e9b847871" ], "author": { "name": "Kees Cook", "email": "kees.cook@canonical.com", "time": "Wed Jan 12 00:34:49 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 00:34:49 2011 -0800" }, "message": "net: ax25: fix information leak to userland harder\n\nCommit fe10ae53384e48c51996941b7720ee16995cbcb7 adds a memset() to clear\nthe structure being sent back to userspace, but accidentally used the\nwrong size.\n\nReported-by: Brad Spengler \u003cspender@grsecurity.net\u003e\nSigned-off-by: Kees Cook \u003ckees.cook@canonical.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4162cf64973df51fc885825bc9ca4d055891c49f", "tree": "f218c7bd298f4d41be94d08a314eb9fbc3fcb4ea", "parents": [ "fb7b5a956992fdc53d0b9c8ea29b51b92839dc1b", "343a8d13aae58dec562dbb5c7d48a53e9b847871" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:32:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:32:41 2011 -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: (67 commits)\n cxgb4vf: recover from failure in cxgb4vf_open()\n netfilter: ebtables: make broute table work again\n netfilter: fix race in conntrack between dump_table and destroy\n ah: reload pointers to skb data after calling skb_cow_data()\n ah: update maximum truncated ICV length\n xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC\n ehea: Increase the skb array usage\n net/fec: remove config FEC2 as it\u0027s used nowhere\n pcnet_cs: add new_id\n tcp: disallow bind() to reuse addr/port\n net/r8169: Update the function of parsing firmware\n net: ppp: use {get,put}_unaligned_be{16,32}\n CAIF: Fix IPv6 support in receive path for GPRS/3G\n arp: allow to invalidate specific ARP entries\n net_sched: factorize qdisc stats handling\n mlx4: Call alloc_etherdev to allocate RX and TX queues\n net: Add alloc_netdev_mqs function\n caif: don\u0027t set connection request param size before copying data\n cxgb4vf: fix mailbox data/control coherency domain race\n qlcnic: change module parameter permissions\n ...\n" }, { "commit": "60dbb011df9764294284cc3e70f935eaa462e15e", "tree": "7bf7672001c3fc87850895577f22c0f6dc4c1138", "parents": [ "4b0ef1f223be4e092632b4152ceec5627ac10f59", "2f46e07995734a363608e974a82fd05d5b610750" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 11 15:43:03 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 11 15:43:03 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net-2.6\n" }, { "commit": "b9d919a4ac6cf031b8e065f82ad8f1b0c9ed74b1", "tree": "3139b066396956fd3794df0cb1aa74dcc9f1cb28", "parents": [ "7c955fca3e1d8132982148267d9efcafae849bb6", "357f54d6b38252737116a6d631f6ac28ded018ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 15:11:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 15:11:56 2011 -0800" }, "message": "Merge branch \u0027nfs-for-2.6.38\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.38\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (89 commits)\n NFS fix the setting of exchange id flag\n NFS: Don\u0027t use vm_map_ram() in readdir\n NFSv4: Ensure continued open and lockowner name uniqueness\n NFS: Move cl_delegations to the nfs_server struct\n NFS: Introduce nfs_detach_delegations()\n NFS: Move cl_state_owners and related fields to the nfs_server struct\n NFS: Allow walking nfs_client.cl_superblocks list outside client.c\n pnfs: layout roc code\n pnfs: update nfs4_callback_recallany to handle layouts\n pnfs: add CB_LAYOUTRECALL handling\n pnfs: CB_LAYOUTRECALL xdr code\n pnfs: change lo refcounting to atomic_t\n pnfs: check that partial LAYOUTGET return is ignored\n pnfs: add layout to client list before sending rpc\n pnfs: serialize LAYOUTGET(openstateid)\n pnfs: layoutget rpc code cleanup\n pnfs: change how lsegs are removed from layout list\n pnfs: change layout state seqlock to a spinlock\n pnfs: add prefix to struct pnfs_layout_hdr fields\n pnfs: add prefix to struct pnfs_layout_segment fields\n ...\n" }, { "commit": "13ee6ac579574a2a95e982b19920fd2495dce8cd", "tree": "b1cfcae34d29ce1494254d814fc92e23a426ef71", "parents": [ "83723d60717f8da0f53f91cf42a845ed56c09662" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Tue Jan 11 23:54:42 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Jan 11 23:54:42 2011 +0100" }, "message": "netfilter: fix race in conntrack between dump_table and destroy\n\nThe netlink interface to dump the connection tracking table has a race\nwhen entries are deleted at the same time. A customer reported a crash\nand the backtrace showed thatctnetlink_dump_table was running while a\nconntrack entry was being destroyed.\n(see https://bugzilla.vyatta.com/show_bug.cgi?id\u003d6402).\n\nAccording to RCU documentation, when using hlist_nulls the reader\nmust handle the case of seeing a deleted entry and not proceed\nfurther down the linked list. The old code would continue\nwhich caused the scan to walk into the free list.\n\nThis patch uses locking (rather than RCU) for this operation which\nis guaranteed safe, and no longer requires getting reference while\ndoing dump operation.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "4b0ef1f223be4e092632b4152ceec5627ac10f59", "tree": "79472554ddc96359cdfe07f6b4967dabe9cb5eaa", "parents": [ "e44f391187495e0deaf7b9f0077e94f270837d1a" ], "author": { "name": "Dang Hongwu", "email": "hongwu.dang@6wind.com", "time": "Tue Jan 11 07:13:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 11 14:03:10 2011 -0800" }, "message": "ah: reload pointers to skb data after calling skb_cow_data()\n\nskb_cow_data() may allocate a new data buffer, so pointers on\nskb should be set after this function.\n\nBug was introduced by commit dff3bb06 (\"ah4: convert to ahash\")\nand 8631e9bd (\"ah6: convert to ahash\").\n\nSigned-off-by: Wang Xuefu \u003cxuefu.wang@6wind.com\u003e\nAcked-by: Krzysztof Witek \u003ckrzysztof.witek@6wind.com\u003e\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa6dd8a2c89861d05621ce7e2880e485bec22fba", "tree": "8636aee24a084dc6b530cc8c0e06c283429d037e", "parents": [ "f76957fc8fc4fa9735f01e59653b2792b077de06" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Tue Jan 11 08:04:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 11 14:03:09 2011 -0800" }, "message": "xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC\n\nMaximum trunc length is defined by MAX_AH_AUTH_LEN (in bytes)\nand need to be checked when this value is set (in bits) by\nthe user. In ah4.c and ah6.c a BUG_ON() checks this condiftion.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c191a836a908d1dd6b40c503741f91b914de3348", "tree": "98ab4ed7316d55bb014f758e590fec2811694f30", "parents": [ "42b82dc19dfdcab931fb67175996a881ce254145" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jan 11 01:14:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 11 14:03:07 2011 -0800" }, "message": "tcp: disallow bind() to reuse addr/port\n\ninet_csk_bind_conflict() logic currently disallows a bind() if\nit finds a friend socket (a socket bound on same address/port)\nsatisfying a set of conditions :\n\n1) Current (to be bound) socket doesnt have sk_reuse set\nOR\n2) other socket doesnt have sk_reuse set\nOR\n3) other socket is in LISTEN state\n\nWe should add the CLOSE state in the 3) condition, in order to avoid two\nREUSEADDR sockets in CLOSE state with same local address/port, since\nthis can deny further operations.\n\nNote : a prior patch tried to address the problem in a different (and\nbuggy) way. (commit fda48a0d7a8412ced tcp: bind() fix when many ports\nare bound).\n\nReported-by: Gaspar Chilingarov \u003cgasparch@gmail.com\u003e\nReported-by: Daniel Baluta \u003cdaniel.baluta@gmail.com\u003e\nTested-by: Daniel Baluta \u003cdaniel.baluta@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": "f0418aa4b1103f959d64dc18273efa04ee0140e9", "tree": "01457cfe70d614dcdb12759247212602c2c2c008", "parents": [ "99de8ea962bbc11a51ad4c52e3dc93bee5f6ba70" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Wed Dec 08 13:48:19 2010 -0500" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Jan 11 15:04:10 2011 -0500" }, "message": "rpc: allow xprt_class-\u003esetup to return a preexisting xprt\n\nThis allows us to reuse the xprt associated with a server connection if\none has already been set up.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "99de8ea962bbc11a51ad4c52e3dc93bee5f6ba70", "tree": "1cda6aaeabe8fc4e3502104005c06a3888bb0bf4", "parents": [ "d75faea330dbd1873c9094e9926ae306590c0998" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Wed Dec 08 12:45:44 2010 -0500" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Jan 11 15:04:10 2011 -0500" }, "message": "rpc: keep backchannel xprt as long as server connection\n\nMultiple backchannels can share the same tcp connection; from rfc 5661 section\n2.10.3.1:\n\n\tA connection\u0027s association with a session is not exclusive. A\n\tconnection associated with the channel(s) of one session may be\n\tsimultaneously associated with the channel(s) of other sessions\n\tincluding sessions associated with other client IDs.\n\nHowever, multiple backchannels share a connection, they must all share\nthe same xid stream (hence the same rpc_xprt); the only way we have to\nmatch replies with calls at the rpc layer is using the xid.\n\nSo, keep the rpc_xprt around as long as the connection lasts, in case\nwe\u0027re asked to use the connection as a backchannel again.\n\nRequests to create new backchannel clients over a given server\nconnection should results in creating new clients that reuse the\nexisting rpc_xprt.\n\nBut to start, just reject attempts to associate multiple rpc_xprt\u0027s with\nthe same underlying bc_xprt.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "d75faea330dbd1873c9094e9926ae306590c0998", "tree": "36b8e50ad2d94c75e77dacd98ff02036ddd0f65f", "parents": [ "dcbeaa68dbbdacbbb330a86c7fc95a28473fc209" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Nov 30 19:15:01 2010 -0500" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Jan 11 15:04:10 2011 -0500" }, "message": "rpc: move sk_bc_xprt to svc_xprt\n\nThis seems obviously transport-level information even if it\u0027s currently\nused only by the server socket code.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "a2c50f69168deec3f7e47644eb4ef4f8a3ee6910", "tree": "987197653dcdbf3d33a7c678dbef9cc884f36afa", "parents": [ "8c3df3e58cde676de4df9363c00f37dbfce08e5c", "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Jan 11 10:28:36 2011 -0500" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Jan 11 15:02:19 2011 -0500" }, "message": "Merge commit \u0027v2.6.37\u0027 into for-2.6.38-incoming\n\nI made a slight mess of Documentation/filesystems/Locking; resolve\nconflicts with upstream before fixing it up.\n" }, { "commit": "219fd58be62d01e30224c7af919dea77b7e392a8", "tree": "88db8ad84951f7e0c265175627f379f79d26a88c", "parents": [ "af7542fc8ac678ce69dbd5c9643c52897b47c66f" ], "author": { "name": "M. Mohan Kumar", "email": "mohan@in.ibm.com", "time": "Mon Jan 10 14:23:53 2011 -0600" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Jan 11 09:58:07 2011 -0600" }, "message": "net/9p: Use proper data types\n\nUse proper data types for storing the count of the binary blob and\nlength of a string. Without this patch length calculation of string will\nalways result in -1 because of comparision between signed and unsigned\ninteger.\n\nSigned-off-by: M. Mohan Kumar \u003cmohan@in.ibm.com\u003e\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "d7b92affba524e0ca848a5ab60649fb91190d9b5", "tree": "fef6752b8b022fb4b92018e3a0039a964cd0d979", "parents": [ "545ecdc3b3a2fe0b54a3053bf8bf85321bbca7da" ], "author": { "name": "Kumar Sanghvi", "email": "kumar.sanghvi@stericsson.com", "time": "Fri Jan 07 01:57:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 16:12:00 2011 -0800" }, "message": "CAIF: Fix IPv6 support in receive path for GPRS/3G\n\nChecks version field of IP in the receive path for GPRS/3G data\nand appropriately sets the value of skb-\u003eprotocol.\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "545ecdc3b3a2fe0b54a3053bf8bf85321bbca7da", "tree": "2ece08798301e13a05f2d8b05e4e743105903f05", "parents": [ "bfe0d0298f2a67d94d58c39ea904a999aeeb7c3c" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Sat Jan 08 13:57:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 16:10:37 2011 -0800" }, "message": "arp: allow to invalidate specific ARP entries\n\nIPv4 over firewire needs to be able to remove ARP entries\nfrom the ARP cache that belong to nodes that are removed, because\nIPv4 over firewire uses ARP packets for private information\nabout nodes.\n\nThis information becomes invalid as soon as node drops\noff the bus and when it reconnects, its only possible\nto start talking to it after it responded to an ARP packet.\nBut ARP cache prevents such packets from being sent.\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfe0d0298f2a67d94d58c39ea904a999aeeb7c3c", "tree": "5a6f966ebabe8d88d6d6c78c61411e325150927f", "parents": [ "f1593d2298acca8b6680100d622911827edb8b0a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jan 09 08:30:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 16:07:54 2011 -0800" }, "message": "net_sched: factorize qdisc stats handling\n\nHTB takes into account skb is segmented in stats updates.\nGeneralize this to all schedulers.\n\nThey should use qdisc_bstats_update() helper instead of manipulating\nbstats.bytes and bstats.packets\n\nAdd bstats_update() helper too for classes that use\ngnet_stats_basic_packed fields.\n\nNote : Right now, TCQ_F_CAN_BYPASS shortcurt can be taken only if no\nstab is setup on qdisc.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36909ea43814cba34f7c921e99cba33d770a54e1", "tree": "294b44411dc7939e152aa1002f9f5fe9868751f6", "parents": [ "91b5c98c2e062f982423686c77b8bf31f37fa196" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Sun Jan 09 19:36:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 16:05:30 2011 -0800" }, "message": "net: Add alloc_netdev_mqs function\n\nAdded alloc_netdev_mqs function which allows the number of transmit and\nreceive queues to be specified independenty. alloc_netdev_mq was\nchanged to a macro to call the new function. Also added\nalloc_etherdev_mqs with same purpose.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91b5c98c2e062f982423686c77b8bf31f37fa196", "tree": "02faff8ec23c12bf139ae6adf501e77417346250", "parents": [ "80ce3f67e75ffa14ad99b26457a7e9558b8b001a" ], "author": { "name": "Dan Rosenberg", "email": "drosenberg@vsecurity.com", "time": "Mon Jan 10 16:00:54 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 16:00:54 2011 -0800" }, "message": "caif: don\u0027t set connection request param size before copying data\n\nThe size field should not be set until after the data is successfully\ncopied in.\n\nSigned-off-by: Dan Rosenberg \u003cdrosenberg@vsecurity.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "facb4edc1e0e849ea98e147a821e60d6d6272c0a", "tree": "4de1206d197e889690b622593ab785b318d1905f", "parents": [ "c599bd6b9ac8926b03e6bf332a8c14ae2ffb43a3" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Jan 10 04:06:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 13:33:17 2011 -0800" }, "message": "phonet: some signedness bugs\n\nDan Rosenberg pointed out that there were some signed comparison bugs\nin the phonet protocol.\n\nhttp://marc.info/?l\u003dfull-disclosure\u0026m\u003d129424528425330\u0026w\u003d2\n\nThe problem is that we check for array overflows but \"protocol\" is\nsigned and we don\u0027t check for array underflows. If you have already\nhave CAP_SYS_ADMIN then you could use the bugs to get root, or someone\ncould cause an oops by mistake.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68c404b18f6fba404b2753622d0459c68ee128ae", "tree": "c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3", "parents": [ "d035c36c58dd9183ad6aa7875dea89893faedb55", "6650239a4b01077e80d5a4468562756d77afaa59" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jan 10 14:48:02 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jan 10 14:48:02 2011 -0500" }, "message": "Merge branch \u0027bugfixes\u0027 into nfs-for-2.6.38\n\nConflicts:\n\tfs/nfs/nfs2xdr.c\n\tfs/nfs/nfs3xdr.c\n\tfs/nfs/nfs4xdr.c\n" }, { "commit": "6650239a4b01077e80d5a4468562756d77afaa59", "tree": "505c9a1dc26c26608ce6a5981093a6357d4f3638", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jan 08 17:45:38 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jan 10 14:45:01 2011 -0500" }, "message": "NFS: Don\u0027t use vm_map_ram() in readdir\n\nvm_map_ram() is not available on NOMMU platforms, and causes trouble\non incoherrent architectures such as ARM when we access the page data\nthrough both the direct and the virtual mapping.\n\nThe alternative is to use the direct mapping to access page data\nfor the case when we are not crossing a page boundary, but to copy\nthe data into a linear scratch buffer when we are accessing data\nthat spans page boundaries.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nTested-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nCc: stable@kernel.org [2.6.37]\n" }, { "commit": "83723d60717f8da0f53f91cf42a845ed56c09662", "tree": "9d32edc2c6dc4849e63d422f8dad42606b2f984f", "parents": [ "45b9f509b7f5d2d792b3c03b78ddc8ec543e921b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 10 20:11:38 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Jan 10 20:11:38 2011 +0100" }, "message": "netfilter: x_tables: dont block BH while reading counters\n\nUsing \"iptables -L\" with a lot of rules have a too big BH latency.\nJesper mentioned ~6 ms and worried of frame drops.\n\nSwitch to a per_cpu seqlock scheme, so that taking a snapshot of\ncounters doesnt need to block BH (for this cpu, but also other cpus).\n\nThis adds two increments on seqlock sequence per ipt_do_table() call,\nits a reasonable cost for allowing \"iptables -L\" not block BH\nprocessing.\n\nReported-by: Jesper Dangaard Brouer \u003chawk@comx.dk\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Jesper Dangaard Brouer \u003chawk@comx.dk\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "0363466866d901fbc658f4e63dd61e7cc93dd0af", "tree": "5d2b3f272bb00b51a310ce4fa330817b82c8d346", "parents": [ "02932ce9e2c136e6fab2571c8e0dd69ae8ec9853" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sun Jan 09 06:23:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:35:35 2011 -0800" }, "message": "net offloading: Convert checksums to use centrally computed features.\n\nIn order to compute the features for other offloads (primarily\nscatter/gather), we need to first check the ability of the NIC to\noffload the checksum for the packet. Since we have already computed\nthis, we can directly use the result instead of figuring it out\nagain.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "02932ce9e2c136e6fab2571c8e0dd69ae8ec9853", "tree": "fd79af457060855375d9297755c48f5105912638", "parents": [ "91ecb63c074d802f8cf103f1dafb4aed24d0f24c" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sun Jan 09 06:23:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:35:35 2011 -0800" }, "message": "net offloading: Convert skb_need_linearize() to use precomputed features.\n\nThis switches skb_need_linearize() to use the features that have\nbeen centrally computed. In doing so, this fixes a problem where\nscatter/gather should not be used because the card does not support\nchecksum offloading on that type of packet. On device registration\nwe only check that some form of checksum offloading is available if\nscatter/gatther is enabled but we must also check at transmission\ntime. Examples of this include IPv6 or vlan packets on a NIC that\nonly supports IPv4 offloading.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91ecb63c074d802f8cf103f1dafb4aed24d0f24c", "tree": "b35dd6b8de64ceeeee22dad0ee8f2794a662d401", "parents": [ "fc741216db156994c554ac31c1151fe0e00d8f0e" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sun Jan 09 06:23:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:35:34 2011 -0800" }, "message": "net offloading: Convert dev_gso_segment() to use precomputed features.\n\nThis switches dev_gso_segment() to use the device features computed\nby the centralized routine. In doing so, it fixes a problem where\nit would always use dev-\u003efeatures, instead of those appropriate\nto the number of vlan tags if any are present.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc741216db156994c554ac31c1151fe0e00d8f0e", "tree": "692c6278f1c20e4452620adee1ea3cd05d878819", "parents": [ "f01a5236bd4b140198fbcc550f085e8361fd73fa" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sun Jan 09 06:23:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:35:34 2011 -0800" }, "message": "net offloading: Pass features into netif_needs_gso().\n\nNow that there is a single function that can compute the device\nfeatures relevant to a packet, we don\u0027t want to run it for each\noffload. This converts netif_needs_gso() to take the features\nof the device, rather than computing them itself.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f01a5236bd4b140198fbcc550f085e8361fd73fa", "tree": "01d122dcd3aa7e8e1f84f11f74f5c30593a5f850", "parents": [ "9497a0518e8183959e45da05f317f1cb36f2cd7c" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sun Jan 09 06:23:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:35:33 2011 -0800" }, "message": "net offloading: Generalize netif_get_vlan_features().\n\nnetif_get_vlan_features() is currently only used by netif_needs_gso(),\nso it only concerns itself with GSO features. However, several other\nplaces also should take into account the contents of the packet when\ndeciding whether to offload to hardware. This generalizes the function\nto return features about all of the various forms of offloading. Since\noffloads tend to be linked together, this avoids duplicating the logic\nin each location (i.e. the scatter/gather code also needs the checksum\nlogic).\n\nSuggested-by: Michał Mirosław \u003cmirqus@gmail.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9497a0518e8183959e45da05f317f1cb36f2cd7c", "tree": "7215c99aa1927d2357f53431d590f77ef8b3e0ef", "parents": [ "eee3a96c6368f47df8df5bd4ed1843600652b337" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sun Jan 09 06:23:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:35:33 2011 -0800" }, "message": "net offloading: Accept NETIF_F_HW_CSUM for all protocols.\n\nWe currently only have software fallback for one type of checksum: the\nTCP/UDP one\u0027s complement. This means that a protocol that uses hardware\noffloading for a different type of checksum (FCoE, SCTP) must directly\ncheck the device\u0027s features and do the right thing ahead of time. By\nthe time we get to dev_can_checksum(), we\u0027re only deciding whether to\napply the one algorithm in software or hardware. NETIF_F_HW_CSUM has the\nsame capabilities as the software version, so we should always use it if\npresent. The primary advantage of this is multiply tagged vlans can use\nhardware checksumming.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "697d0e338c7fd392cf73bf120150ab6e5516a3a3", "tree": "3592607af5daf822e9e7e562a7e60bf17ead01e1", "parents": [ "928c41e7a15d1164bb725f3445575f4651b5b9f0" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Sat Jan 08 17:41:42 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 16:26:51 2011 -0800" }, "message": "net: fix kernel-doc warning in core/filter.c\n\nFix new kernel-doc notation warning in net/core/filter.c:\n\nWarning(net/core/filter.c:172): No description found for parameter \u0027fentry\u0027\nWarning(net/core/filter.c:172): Excess function parameter \u0027filter\u0027 description in \u0027sk_run_filter\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ab03c2b1478f2438d2c80204f7fef65b1bca9cf", "tree": "a130abc7a3cc2d5c326b1bbdad80c06e741db3fd", "parents": [ "dba5a68ae147d0672d4b9259f3ece37777f8b2fa" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Fri Jan 07 03:15:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 16:25:03 2011 -0800" }, "message": "netlink: test for all flags of the NLM_F_DUMP composite\n\nDue to NLM_F_DUMP is composed of two bits, NLM_F_ROOT | NLM_F_MATCH,\nwhen doing \"if (x \u0026 NLM_F_DUMP)\", it tests for _either_ of the bits\nbeing set. Because NLM_F_MATCH\u0027s value overlaps with NLM_F_EXCL,\nnon-dump requests with NLM_F_EXCL set are mistaken as dump requests.\n\nSubstitute the condition to test for _all_ bits being set.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nAcked-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14934efab62201c176c620bd598b34b59acb6796", "tree": "4262474eb8dc55decb9b88c3a42d1aaed74b4074", "parents": [ "86aa77854f47ab6f5f9c687507af1f57d2b89004", "bfbb23466adcbc77facea3046b44f75530079472" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 16:16:57 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 16:16:57 2011 -0800" }, "message": "Merge branch \u0027dccp\u0027 of git://eden-feed.erg.abdn.ac.uk/net-next-2.6\n" }, { "commit": "23d69b09b78c4876e134f104a3814c30747c53f1", "tree": "40744de4f4126c21027ce537264524095e0e7979", "parents": [ "e744070fd4ff9d3114277e52d77afa21579adce2", "569ff2de2e1c8ac67c8df3a7367d46d0d9460a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)\n usb: don\u0027t use flush_scheduled_work()\n speedtch: don\u0027t abuse struct delayed_work\n media/video: don\u0027t use flush_scheduled_work()\n media/video: explicitly flush request_module work\n ioc4: use static work_struct for ioc4_load_modules()\n init: don\u0027t call flush_scheduled_work() from do_initcalls()\n s390: don\u0027t use flush_scheduled_work()\n rtc: don\u0027t use flush_scheduled_work()\n mmc: update workqueue usages\n mfd: update workqueue usages\n dvb: don\u0027t use flush_scheduled_work()\n leds-wm8350: don\u0027t use flush_scheduled_work()\n mISDN: don\u0027t use flush_scheduled_work()\n macintosh/ams: don\u0027t use flush_scheduled_work()\n vmwgfx: don\u0027t use flush_scheduled_work()\n tpm: don\u0027t use flush_scheduled_work()\n sonypi: don\u0027t use flush_scheduled_work()\n hvsi: don\u0027t use flush_scheduled_work()\n xen: don\u0027t use flush_scheduled_work()\n gdrom: don\u0027t use flush_scheduled_work()\n ...\n\nFixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c\nas per Tejun.\n" }, { "commit": "fb5131e1880ea1ba3ba7197cd5cc66c9c288f715", "tree": "f0d9f25f9079727b9ead5a2b4cc85a0fea9b4668", "parents": [ "d074b104cefcb6e8ded55a53e62fed59a246f55d", "8e1023016cf17152972b98bce6c144834a4916d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 14:50:50 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 14:50:50 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6: (65 commits)\n [S390] prevent unneccesary loops_per_jiffy recalculation\n [S390] cpuinfo: use get_online_cpus() instead of preempt_disable()\n [S390] smp: remove cpu hotplug messages\n [S390] mutex: enable spinning mutex on s390\n [S390] mutex: Introduce arch_mutex_cpu_relax()\n [S390] cio: fix ccwgroup unregistration race condition\n [S390] perf: add DWARF register lookup for s390\n [S390] cleanup ftrace backend functions\n [S390] ptrace cleanup\n [S390] smp/idle: call init_idle() before starting a new cpu\n [S390] smp: delay idle task creation\n [S390] dasd: Correct retry counter for terminated I/O.\n [S390] dasd: Add support for raw ECKD access.\n [S390] dasd: Prevent deadlock during suspend/resume.\n [S390] dasd: Improve handling of stolen DASD reservation\n [S390] dasd: do path verification for paths added at runtime\n [S390] dasd: add High Performance FICON multitrack support\n [S390] cio: reduce memory consumption of itcw structures\n [S390] nmi: enable machine checks early\n [S390] qeth: buffer count imbalance\n ...\n" }, { "commit": "b4a45f5fe8078bfc10837dbd5b98735058bc4698", "tree": "df6f13a27610a3ec7eb4a661448cd779a8f84c79", "parents": [ "01539ba2a706ab7d35fc0667dff919ade7f87d63", "b3e19d924b6eaf2ca7d22cba99a517c5171007b6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 08:56:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 08:56:33 2011 -0800" }, "message": "Merge branch \u0027vfs-scale-working\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin\n\n* \u0027vfs-scale-working\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 commits)\n fs: scale mntget/mntput\n fs: rename vfsmount counter helpers\n fs: implement faster dentry memcmp\n fs: prefetch inode data in dcache lookup\n fs: improve scalability of pseudo filesystems\n fs: dcache per-inode inode alias locking\n fs: dcache per-bucket dcache hash locking\n bit_spinlock: add required includes\n kernel: add bl_list\n xfs: provide simple rcu-walk ACL implementation\n btrfs: provide simple rcu-walk ACL implementation\n ext2,3,4: provide simple rcu-walk ACL implementation\n fs: provide simple rcu-walk generic_check_acl implementation\n fs: provide rcu-walk aware permission i_ops\n fs: rcu-walk aware d_revalidate method\n fs: cache optimise dentry and inode for rcu-walk\n fs: dcache reduce branches in lookup path\n fs: dcache remove d_mounted\n fs: fs_struct use seqlock\n fs: rcu-walk for path lookup\n ...\n" }, { "commit": "bfbb23466adcbc77facea3046b44f75530079472", "tree": "31e28ac15e808861cd261e9600c4e7642d8aa73f", "parents": [ "763dadd47c884853a22f2f19ea27e58431303ff3" ], "author": { "name": "Gerrit Renker", "email": "gerrit@erg.abdn.ac.uk", "time": "Sun Jan 02 18:15:58 2011 +0100" }, "committer": { "name": "Gerrit Renker", "email": "gerrit@erg.abdn.ac.uk", "time": "Fri Jan 07 12:22:44 2011 +0100" }, "message": "dccp: make upper bound for seq_window consistent on 32/64 bit\n\nThe \u0027seq_window\u0027 sysctl sets the initial value for the DCCP Sequence Window,\nwhich may range from 32..2^46-1 (RFC 4340, 7.5.2). The patch sets the upper\nbound consistently to 2^32-1 on both 32 and 64 bit systems, which should be\nsufficient - with a RTT of 1sec and 1-byte packets, a seq_window of 2^32-1\ncorresponds to a link speed of 34 Gbps.\n\nSigned-off-by: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\n" }, { "commit": "763dadd47c884853a22f2f19ea27e58431303ff3", "tree": "9ee3daff6fe649578d3fabdc0a1fcf8252b7b660", "parents": [ "2cf5be93d1b704f342ad423a49f0e78d73939e66" ], "author": { "name": "Samuel Jero", "email": "sj323707@ohio.edu", "time": "Thu Dec 30 12:15:41 2010 +0100" }, "committer": { "name": "Gerrit Renker", "email": "gerrit@erg.abdn.ac.uk", "time": "Fri Jan 07 12:22:43 2011 +0100" }, "message": "dccp: fix bug in updating the GSR\n\nCurrently dccp_check_seqno allows any valid packet to update the Greatest\nSequence Number Received, even if that packet\u0027s sequence number is less than\nthe current GSR. This patch adds a check to make sure that the new packet\u0027s\nsequence number is greater than GSR.\n\nSigned-off-by: Samuel Jero \u003csj323707@ohio.edu\u003e\nSigned-off-by: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\n" }, { "commit": "2cf5be93d1b704f342ad423a49f0e78d73939e66", "tree": "5d0e0435c71e775134d0e2374c97db78a46d3198", "parents": [ "4e3dbdb1392a83bd21a6ff8f6bc785495058d37c" ], "author": { "name": "Samuel Jero", "email": "sj323707@ohio.edu", "time": "Thu Dec 30 12:15:16 2010 +0100" }, "committer": { "name": "Gerrit Renker", "email": "gerrit@erg.abdn.ac.uk", "time": "Fri Jan 07 12:22:43 2011 +0100" }, "message": "dccp: fix return value for sequence-invalid packets\n\nCurrently dccp_check_seqno returns 0 (indicating a valid packet) if the\nacknowledgment number is out of bounds and the sync that RFC 4340 mandates at\nthis point is currently being rate-limited. This function should return -1,\nindicating an invalid packet.\n\nSigned-off-by: Samuel Jero \u003csj323707@ohio.edu\u003e\nAcked-by: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\n" }, { "commit": "b3e19d924b6eaf2ca7d22cba99a517c5171007b6", "tree": "8c1fa4074114a883a4e2de2f7d12eb29ed91bdf1", "parents": [ "c6653a838b1b2738561aff0b8c0f62a9b714bdd9" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:11 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:33 2011 +1100" }, "message": "fs: scale mntget/mntput\n\nThe problem that this patch aims to fix is vfsmount refcounting scalability.\nWe need to take a reference on the vfsmount for every successful path lookup,\nwhich often go to the same mount point.\n\nThe fundamental difficulty is that a \"simple\" reference count can never be made\nscalable, because any time a reference is dropped, we must check whether that\nwas the last reference. To do that requires communication with all other CPUs\nthat may have taken a reference count.\n\nWe can make refcounts more scalable in a couple of ways, involving keeping\ndistributed counters, and checking for the global-zero condition less\nfrequently.\n\n- check the global sum once every interval (this will delay zero detection\n for some interval, so it\u0027s probably a showstopper for vfsmounts).\n\n- keep a local count and only taking the global sum when local reaches 0 (this\n is difficult for vfsmounts, because we can\u0027t hold preempt off for the life of\n a reference, so a counter would need to be per-thread or tied strongly to a\n particular CPU which requires more locking).\n\n- keep a local difference of increments and decrements, which allows us to sum\n the total difference and hence find the refcount when summing all CPUs. Then,\n keep a single integer \"long\" refcount for slow and long lasting references,\n and only take the global sum of local counters when the long refcount is 0.\n\nThis last scheme is what I implemented here. Attached mounts and process root\nand working directory references are \"long\" references, and everything else is\na short reference.\n\nThis allows scalable vfsmount references during path walking over mounted\nsubtrees and unattached (lazy umounted) mounts with processes still running\nin them.\n\nThis results in one fewer atomic op in the fastpath: mntget is now just a\nper-CPU inc, rather than an atomic inc; and mntput just requires a spinlock\nand non-atomic decrement in the common case. However code is otherwise bigger\nand heavier, so single threaded performance is basically a wash.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "4b936885ab04dc6e0bb0ef35e0e23c1a7364d9e5", "tree": "a0173d27c1ce39f173be404d269c2f15144072ab", "parents": [ "873feea09ebc980cbd3631b767356ce1eee65ec1" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:07 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:32 2011 +1100" }, "message": "fs: improve scalability of pseudo filesystems\n\nRegardless of how much we possibly try to scale dcache, there is likely\nalways going to be some fundamental contention when adding or removing children\nunder the same parent. Pseudo filesystems do not seem need to have connected\ndentries because by definition they are disconnected.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "fb045adb99d9b7c562dc7fef834857f78249daa1", "tree": "1fd6a4024fffeec568abe100d730589bfdb81c38", "parents": [ "5f57cbcc02cf18f6b22ef4066bb10afeb8f930ff" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:49:55 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:28 2011 +1100" }, "message": "fs: dcache reduce branches in lookup path\n\nReduce some branches and memory accesses in dcache lookup by adding dentry\nflags to indicate common d_ops are set, rather than having to check them.\nThis saves a pointer memory access (dentry-\u003ed_op) in common path lookup\nsituations, and saves another pointer load and branch in cases where we\nhave d_op but not the particular operation.\n\nPatched with:\n\ngit grep -E \u0027[.\u003e]([[:space:]])*d_op([[:space:]])*\u003d\u0027 | xargs sed -e \u0027s/\\([^\\t ]*\\)-\u003ed_op \u003d \\(.*\\);/d_set_d_op(\\1, \\2);/\u0027 -e \u0027s/\\([^\\t ]*\\)\\.d_op \u003d \\(.*\\);/d_set_d_op(\\\u0026\\1, \\2);/\u0027 -i\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "ff0c7d15f9787b7e8c601533c015295cc68329f8", "tree": "e3db53950b8ed78e542ab35a3cd3a6eaee26eccd", "parents": [ "fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:49:50 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:26 2011 +1100" }, "message": "fs: avoid inode RCU freeing for pseudo fs\n\nPseudo filesystems that don\u0027t put inode on RCU list or reachable by\nrcu-walk dentries do not need to RCU free their inodes.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9", "tree": "203e0f73883e4c26b5597e36042386a1237dab35", "parents": [ "77812a1ef139d84270d27faacc0630c887411013" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:49:49 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:26 2011 +1100" }, "message": "fs: icache RCU free inodes\n\nRCU free the struct inode. This will allow:\n\n- Subsequent store-free path walking patch. The inode must be consulted for\n permissions when walking, so an RCU inode reference is a must.\n- sb_inode_list_lock to be moved inside i_lock because sb list walkers who want\n to take i_lock no longer need to take sb_inode_list_lock to walk the list in\n the first place. This will simplify and optimize locking.\n- Could remove some nested trylock loops in dcache code\n- Could potentially simplify things a bit in VM land. Do not need to take the\n page lock to follow page-\u003emapping.\n\nThe downsides of this is the performance cost of using RCU. In a simple\ncreat/unlink microbenchmark, performance drops by about 10% due to inability to\nreuse cache-hot slab objects. As iterations increase and RCU freeing starts\nkicking over, this increases to about 20%.\n\nIn cases where inode lifetimes are longer (ie. many inodes may be allocated\nduring the average life span of a single inode), a lot of this cache reuse is\nnot applicable, so the regression caused by this patch is smaller.\n\nThe cache-hot regression could largely be avoided by using SLAB_DESTROY_BY_RCU,\nhowever this adds some complexity to list walking and store-free path walking,\nso I prefer to implement this at a later date, if it is shown to be a win in\nreal situations. I haven\u0027t found a regression in any non-micro benchmark so I\ndoubt it will be a problem.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" } ], "next": "fe15ce446beb3a33583af81ffe6c9d01a75314ed" }