)]}' { "log": [ { "commit": "00a2470546dd8427325636a711a42c934135dbf5", "tree": "9567002c1ae07a918ccf11ec2a72c6e4831cb535", "parents": [ "5aafdea448fb86412a6f8e46df518c1545d32436", "6df59a84eccd4cad7fcefda3e0c5e55239a3b2dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 25 21:02:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 25 21:02:22 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)\n route: Take the right src and dst addresses in ip_route_newports\n ipv4: Fix nexthop caching wrt. scoping.\n ipv4: Invalidate nexthop cache nh_saddr more correctly.\n net: fix pch_gbe section mismatch warning\n ipv4: fix fib metrics\n mlx4_en: Removing HW info from ethtool -i report.\n net_sched: fix THROTTLED/RUNNING race\n drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region\n drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region\n bonding: fix rx_handler locking\n myri10ge: fix rmmod crash\n mlx4_en: updated driver version to 1.5.4.1\n mlx4_en: Using blue flame support\n mlx4_core: reserve UARs for userspace consumers\n mlx4_core: maintain available field in bitmap allocator\n mlx4: Add blue flame support for kernel consumers\n mlx4_en: Enabling new steering\n mlx4: Add support for promiscuous mode in the new steering model.\n mlx4: generalization of multicast steering.\n mlx4_en: Reporting HW revision in ethtool -i\n ...\n" }, { "commit": "40471856f2e38e9bfa8d605295e8234421110dd6", "tree": "9757e42e40bdbfcff7c52ab133e32b5c2203153b", "parents": [ "ae005cbed12d0b340b04b59d6f5c56e710b3895d", "0acd2201920d0968919f4f5797d63f7b6f2b19d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 25 10:03:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 25 10:03:28 2011 -0700" }, "message": "Merge branch \u0027nfs-for-2.6.39\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.39\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (28 commits)\n Cleanup XDR parsing for LAYOUTGET, GETDEVICEINFO\n NFSv4.1 convert layoutcommit sync to boolean\n NFSv4.1 pnfs_layoutcommit_inode fixes\n NFS: Determine initial mount security\n NFS: use secinfo when crossing mountpoints\n NFS: Add secinfo procedure\n NFS: lookup supports alternate client\n NFS: convert call_sync() to a function\n NFSv4.1 remove temp code that prevented ds commits\n NFSv4.1: layoutcommit\n NFSv4.1: filelayout driver specific code for COMMIT\n NFSv4.1: remove GETATTR from ds commits\n NFSv4.1: add generic layer hooks for pnfs COMMIT\n NFSv4.1: alloc and free commit_buckets\n NFSv4.1: shift filelayout_free_lseg\n NFSv4.1: pull out code from nfs_commit_release\n NFSv4.1: pull error handling out of nfs_commit_list\n NFSv4.1: add callback to nfs4_commit_done\n NFSv4.1: rearrange nfs_commit_rpcsetup\n NFSv4.1: don\u0027t send COMMIT to ds for data sync writes\n ...\n" }, { "commit": "37e826c513883099c298317bad1b3b677b2905fb", "tree": "a032cfe69e0cde179d86eba157cf9dc85d67df86", "parents": [ "436c3b66ec9824a633724ae42de1c416af4f2063" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 18:06:47 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 18:06:47 2011 -0700" }, "message": "ipv4: Fix nexthop caching wrt. scoping.\n\nMove the scope value out of the fib alias entries and into fib_info,\nso that we always use the correct scope when recomputing the nexthop\ncached source address.\n\nReported-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "436c3b66ec9824a633724ae42de1c416af4f2063", "tree": "8da6452386b6e900c4226c9b67694d1ea21e847e", "parents": [ "f7594d42944c0dfca90318f50978a4bdf8504086" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 17:42:21 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 17:42:21 2011 -0700" }, "message": "ipv4: Invalidate nexthop cache nh_saddr more correctly.\n\nAny operation that:\n\n1) Brings up an interface\n2) Adds an IP address to an interface\n3) Deletes an IP address from an interface\n\ncan potentially invalidate the nh_saddr value, requiring\nit to be recomputed.\n\nPerform the recomputation lazily using a generation ID.\n\nReported-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0acd2201920d0968919f4f5797d63f7b6f2b19d4", "tree": "9b241d264f42eff3ff4eeffb67616fca0490e460", "parents": [ "8f70e95f9f4159184f557a1db60c909d7c1bd2e3", "35124a0994fc02545b14b9fa3aad000b3331f1c0" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 24 17:03:14 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 24 17:03:14 2011 -0400" }, "message": "Merge branch \u0027nfs-for-2.6.39\u0027 into nfs-for-next\n" }, { "commit": "fcd13f42c9d6ab7b1024b9b7125a2e8db3cc00b2", "tree": "2c088856e18636a77077cea244e227453782910c", "parents": [ "6f71d7927c9a9efb7d7e9e6d227d5e246a9c5bd7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Mar 24 07:01:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 24 11:49:54 2011 -0700" }, "message": "ipv4: fix fib metrics\n\nAlessandro Suardi reported that we could not change route metrics :\n\nip ro change default .... advmss 1400\n\nThis regression came with commit 9c150e82ac50 (Allocate fib metrics\ndynamically). fib_metrics is no longer an array, but a pointer to an\narray.\n\nReported-by: Alessandro Suardi \u003calessandro.suardi@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Alessandro Suardi \u003calessandro.suardi@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f70e95f9f4159184f557a1db60c909d7c1bd2e3", "tree": "80acf6fa7d35d29ba03798fb6745ad9791f965c9", "parents": [ "7ebb931598cd95cccea10d4bc4c0123a464ea565" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Thu Mar 24 17:12:31 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 24 13:52:42 2011 -0400" }, "message": "NFS: Determine initial mount security\n\nWhen sec\u003d\u003csomething\u003e is not presented as a mount option,\nwe should attempt to determine what security flavor the\nserver is using.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7ebb931598cd95cccea10d4bc4c0123a464ea565", "tree": "dec1af6eefdbbc3ce42346d7c6d407088eaf509e", "parents": [ "5a5ea0d485c9715c86bf858bbdc5f6d373b3db88" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Thu Mar 24 17:12:30 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 24 13:52:42 2011 -0400" }, "message": "NFS: use secinfo when crossing mountpoints\n\nA submount may use different security than the parent\nmount does. We should figure out what sec flavor the\nsubmount uses at mount time.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "dc87c55120b0a5b0c4d731183f8bb348981aba65", "tree": "c5a4f94ed6cc1678072c125f2cae08f04ce4f2b8", "parents": [ "5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4", "4be34b9d69c97211ff4eb00d79078f3c1593804d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 08:20:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 08:20:39 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.39\u0027 of git://linux-nfs.org/~bfields/linux:\n SUNRPC: Remove resource leak in svc_rdma_send_error()\n nfsd: wrong index used in inner loop\n nfsd4: fix comment and remove unused nfsd4_file fields\n nfs41: make sure nfs server return right ca_maxresponsesize_cached\n nfsd: fix compile error\n svcrpc: fix bad argument in unix_domain_find\n nfsd4: fix struct file leak\n nfsd4: minor nfs4state.c reshuffling\n svcrpc: fix rare race on unix_domain creation\n nfsd41: modify the members value of nfsd4_op_flags\n nfsd: add proc file listing kernel\u0027s gss_krb5 enctypes\n gss:krb5 only include enctype numbers in gm_upcall_enctypes\n NFSD, VFS: Remove dead code in nfsd_rename()\n nfsd: kill unused macro definition\n locks: use assign_type()\n" }, { "commit": "e1dc1c81b9d1c823f2a529b9b9cf8bf5dacbce6a", "tree": "fe680c335b011615572390ebf224887e556c9469", "parents": [ "cd7e48c5de223f400bbfe52dc531a70f7b668e8c" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed Mar 23 16:42:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:46:16 2011 -0700" }, "message": "rds: use little-endian bitops\n\nAs a preparation for removing ext2 non-atomic bit operations from\nasm/bitops.h. This converts ext2 non-atomic bit operations to\nlittle-endian bit operations.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Andy Grover \u003candy.grover@oracle.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "12ce22423abacca70bf1dfbcb8543b3e2b74aad4", "tree": "0b88b1e70187c59994c2e0ef0dcc3e6ba888c858", "parents": [ "5140a357ea77527f4a93c5846217417658fdb35d" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed Mar 23 16:41:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:46:10 2011 -0700" }, "message": "rds: stop including asm-generic/bitops/le.h directly\n\nasm-generic/bitops/le.h is only intended to be included directly from\nasm-generic/bitops/ext2-non-atomic.h or asm-generic/bitops/minix-le.h\nwhich implements generic ext2 or minix bit operations.\n\nThis stops including asm-generic/bitops/le.h directly and use ext2\nnon-atomic bit operations instead.\n\nIt seems odd to use ext2_*_bit() on rds, but it will replaced with\n__{set,clear,test}_bit_le() after introducing little endian bit operations\nfor all architectures. This indirect step is necessary to maintain\nbisectability for some architectures which have their own little-endian\nbit operations.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Andy Grover \u003candy.grover@oracle.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eb49a97363f020c1d7eef8bcd93865726b1fa11d", "tree": "c6012d720a51e20fd2b27c45cbe68788652078d1", "parents": [ "406b6f974dae76a5b795d5c251d11c979a4e509b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Mar 23 12:18:15 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:18:15 2011 -0700" }, "message": "ipv4: fix ip_rt_update_pmtu()\n\ncommit 2c8cec5c10bc (Cache learned PMTU information in inetpeer) added\nan extra inet_putpeer() call in ip_rt_update_pmtu().\n\nThis results in various problems, since we can free one inetpeer, while\nit is still in use.\n\nRef: http://www.spinics.net/lists/netdev/msg159121.html\n\nReported-by: Alexander Beregalov \u003ca.beregalov@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": "406b6f974dae76a5b795d5c251d11c979a4e509b", "tree": "0e197be8a5239c8b0c414f7ef3cf91a844a4271c", "parents": [ "f6152737a95bd6c22f0c664b20831aefd48085a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 21:56:23 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 23 12:16:15 2011 -0700" }, "message": "ipv4: Fallback to FIB local table in __ip_dev_find().\n\nIn commit 9435eb1cf0b76b323019cebf8d16762a50a12a19\n(\"ipv4: Implement __ip_dev_find using new interface address hash.\")\nwe reimplemented __ip_dev_find() so that it doesn\u0027t have to\ndo a full FIB table lookup.\n\nInstead, it consults a hash table of addresses configured to\ninterfaces.\n\nThis works identically to the old code in all except one case,\nand that is for loopback subnets.\n\nThe old code would match the loopback device for any IP address\nthat falls within a subnet configured to the loopback device.\n\nHandle this corner case by doing the FIB lookup.\n\nWe could implement this via inet_addr_onlink() but:\n\n1) Someone could configure many addresses to loopback and\n inet_addr_onlink() is a simple list traversal.\n\n2) We know the old code works.\n\nReported-by: Julian Anastasov \u003cja@ssi.bg\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6152737a95bd6c22f0c664b20831aefd48085a8", "tree": "97cecb7a1645b8e24f886ec6924543f70b95e661", "parents": [ "67d4120a1793138bc9f4a6eb61d0fc5298ed97e0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:37:11 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:37:11 2011 -0700" }, "message": "tcp: Make undo_ssthresh arg to tcp_undo_cwr() a bool.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67d4120a1793138bc9f4a6eb61d0fc5298ed97e0", "tree": "24ffa212d26a6048675a2b7f2c1a4371e62c9f6d", "parents": [ "a7bff75b087e7a355838a32efe61707cfa73c194" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Mon Mar 14 10:57:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:36:08 2011 -0700" }, "message": "tcp: avoid cwnd moderation in undo\n\nIn the current undo logic, cwnd is moderated after it was restored\nto the value prior entering fast-recovery. It was moderated first\nin tcp_try_undo_recovery then again in tcp_complete_cwr.\n\nSince the undo indicates recovery was false, these moderations\nare not necessary. If the undo is triggered when most of the\noutstanding data have been acknowledged, the (restored) cwnd is\nfalsely pulled down to a small value.\n\nThis patch removes these cwnd moderations if cwnd is undone\n a) during fast-recovery\n\tb) by receiving DSACKs past fast-recovery\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a7bff75b087e7a355838a32efe61707cfa73c194", "tree": "4e87f5cb94772624b1f035baefb7a6c21586984d", "parents": [ "6a1fef6d000944911df0f160f366111daa10740a" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Tue Mar 22 11:40:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:26:42 2011 -0700" }, "message": "bridge: Fix possibly wrong MLD queries\u0027 ethernet source address\n\nThe ipv6_dev_get_saddr() is currently called with an uninitialized\ndestination address. Although in tests it usually seemed to nevertheless\nalways fetch the right source address, there seems to be a possible race\ncondition.\n\nTherefore this commit changes this, first setting the destination\naddress and only after that fetching the source address.\n\nReported-by: Jan Beulich \u003cJBeulich@novell.com\u003e\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec", "tree": "5286988a4c78be842ea164c24e1acf932d19b4a0", "parents": [ "db138908ccff404b9920f18f6244f4bff2368c04" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Tue Mar 22 19:17:36 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:17:36 2011 -0700" }, "message": "ipv6: ip6_route_output does not modify sk parameter, so make it const\n\nThis avoids explicit cast to avoid \u0027discards qualifiers\u0027\ncompiler warning in a netfilter patch that i\u0027ve been working on.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "94dcf29a11b3d20a28790598d701f98484a969da", "tree": "21c65f6634dcde739bb85cbc019ee273f1427f90", "parents": [ "207205a2ba2655652fe46a60b49838af6c16a919" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Mar 22 16:30:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:01 2011 -0700" }, "message": "kthread: use kthread_create_on_node()\n\nksoftirqd, kworker, migration, and pktgend kthreads can be created with\nkthread_create_on_node(), to get proper NUMA affinities for their stack and\ntask_struct.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nReviewed-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: David Howells \u003cdhowells@redhat.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": "ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81", "tree": "dee8acafa2dfb87cde4ddba68eff5e1c75557469", "parents": [ "0adfc56ce8fdc5c17630434e49f30536ba7b8559", "68da9ba4eeadae86ad42e52b80822fbd56971267" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 16:26:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 16:26:10 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n [net/9p]: Introduce basic flow-control for VirtIO transport.\n 9p: use the updated offset given by generic_write_checks\n [net/9p] Don\u0027t re-pin pages on retrying virtqueue_add_buf().\n [net/9p] Set the condition just before waking up.\n [net/9p] unconditional wake_up to proc waiting for space on VirtIO ring\n fs/9p: Add v9fs_dentry2v9ses\n fs/9p: Attach writeback_fid on first open with WR flag\n fs/9p: Open writeback fid in O_SYNC mode\n fs/9p: Use truncate_setsize instead of vmtruncate\n net/9p: Fix compile warning\n net/9p: Convert the in the 9p rpc call path to GFP_NOFS\n fs/9p: Fix race in initializing writeback fid\n" }, { "commit": "0adfc56ce8fdc5c17630434e49f30536ba7b8559", "tree": "ed63f34e74998a8a1550d4af61b3178e68a5d60d", "parents": [ "f23eb2b2b28547fc70df82dd5049eb39bec5ba12", "59c2be1e4d42c0d4949cecdeef3f37070a1fbc13" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 16:25:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 16:25:25 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: use watch/notify for changes in rbd header\n libceph: add lingering request and watch/notify event framework\n rbd: update email address in Documentation\n ceph: rename dentry_release -\u003e d_release, fix comment\n ceph: add request to the tail of unsafe write list\n ceph: remove request from unsafe list if it is canceled/timed out\n ceph: move readahead default to fs/ceph from libceph\n ceph: add ino32 mount option\n ceph: update common header files\n ceph: remove debugfs debug cruft\n libceph: fix osd request queuing on osdmap updates\n ceph: preserve I_COMPLETE across rename\n libceph: Fix base64-decoding when input ends in newline.\n" }, { "commit": "246408dcd5dfeef2df437ccb0ef4d6ee87805f58", "tree": "681179a81ef914616f33edf83129a716081b9054", "parents": [ "b8413f98f997bb3ed7327e6d7117e7e91ce010c3" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 22 18:40:10 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 22 18:42:33 2011 -0400" }, "message": "SUNRPC: Never reuse the socket port after an xs_close()\n\nIf we call xs_close(), we\u0027re in one of two situations:\n - Autoclose, which means we don\u0027t expect to resend a request\n - bind+connect failed, which probably means the port is in use\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "db138908ccff404b9920f18f6244f4bff2368c04", "tree": "18734f9b833a5f1134fc138a00d9223fc2afa028", "parents": [ "04024b937a6e9b7d4320b5853557cea3930d528c", "8bc8aecdc5e26cfda12dbd6867af4aa67836da6a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 14:36:18 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 14:36:18 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "68da9ba4eeadae86ad42e52b80822fbd56971267", "tree": "c832a4b1ff3e1bf97601183d11dfe7149a0da41c", "parents": [ "aaf0ef1d2bce05cfd06cf29c96a6973df4d0a6a8" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Fri Mar 18 15:49:48 2011 -0700" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 22 16:32:50 2011 -0500" }, "message": "[net/9p]: Introduce basic flow-control for VirtIO transport.\n\nRecent zerocopy work in the 9P VirtIO transport maps and pins\nuser buffers into kernel memory for the server to work on them.\nSince the user process can initiate this kind of pinning with a simple\nread/write call, thousands of IO threads initiated by the user process can\nhog the system resources and could result into denial of service.\n\nThis patch introduces flow control to avoid that extreme scenario.\n\nThe ceiling limit to avoid denial of service attacks is set to relatively\nhigh (nr_free_pagecache_pages()/4) so that it won\u0027t interfere with\nregular usage, but can step in extreme cases to limit the total system\nhang. Since we don\u0027t have a global structure to accommodate this variable,\nI choose the virtio_chan as the home for this.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nReviewed-by: Badari Pulavarty \u003cpbadari@us.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "316ad5501c2098cb2a2a25ed77a0421f1671411c", "tree": "7954b7c8988cf3f41fea54b8243dce6bc3e3ad2d", "parents": [ "a01a984035ea799b14aa5e874dcaeb122f09c4b4" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Mon Mar 14 14:22:41 2011 -0700" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 22 16:32:48 2011 -0500" }, "message": "[net/9p] Don\u0027t re-pin pages on retrying virtqueue_add_buf().\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "a01a984035ea799b14aa5e874dcaeb122f09c4b4", "tree": "7998ac0aab9c53c25dde38710a4ab60ac7d2935f", "parents": [ "53bda3e5b4e91763224ecb7d05dab94d281fd41d" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Mon Mar 14 14:12:49 2011 -0700" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 22 16:32:47 2011 -0500" }, "message": "[net/9p] Set the condition just before waking up.\n\nGiven that the sprious wake-ups are common, we need to move the\ncondition setting right next to the wake_up(). After setting the condition\nto req-\u003estatus \u003d REQ_STATUS_RCVD, sprious wakeups may cause the\nvirtqueue back on the free list for someone else to use.\nThis may result in kernel panic while relasing the pinned pages\nin p9_release_req_pages().\n\nAlso rearranged the while loop in req_done() for better redability.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "53bda3e5b4e91763224ecb7d05dab94d281fd41d", "tree": "0e21d7fd11ff058a9deb37dee53eac68ad42f727", "parents": [ "42869c8adae72366fc6c4f3924ce3d6c3735c4a3" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Tue Mar 08 15:34:20 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 22 16:32:19 2011 -0500" }, "message": "[net/9p] unconditional wake_up to proc waiting for space on VirtIO ring\n\nProcess may wait to get space on VirtIO ring to send a transaction to\nVirtFS server. Current code just does a conditional wake_up() which\nmeans only one process will be woken up even if multiple processes\nare waiting.\n\nThis fix makes the wake_up unconditional. Hence we won\u0027t have any\nprocesses waiting for-ever.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "472e7f9f8b547605ee9670ac803e971c2e3eeac0", "tree": "1b3d9128fb9ee23522b5f7adf4e449d871f50bbb", "parents": [ "eeff66ef6e33925f615d49e6c846263e342ab60e" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Tue Mar 08 16:39:47 2011 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 22 15:43:35 2011 -0500" }, "message": "net/9p: Fix compile warning\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.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": "eeff66ef6e33925f615d49e6c846263e342ab60e", "tree": "588907158fd45ca6c71d5385f98830ecc2bd56ac", "parents": [ "5a7e0a8cf50cf905403f5a498e86d1f97cfcf51b" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Tue Mar 08 16:39:47 2011 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 22 15:43:35 2011 -0500" }, "message": "net/9p: Convert the in the 9p rpc call path to GFP_NOFS\n\nWithout this we can cause reclaim allocation in writepage.\n\n[ 3433.448430] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 3433.449117] [ INFO: inconsistent lock state ]\n[ 3433.449117] 2.6.38-rc5+ #84\n[ 3433.449117] ---------------------------------\n[ 3433.449117] inconsistent {RECLAIM_FS-ON-W} -\u003e {IN-RECLAIM_FS-R} usage.\n[ 3433.449117] kswapd0/505 [HC0[0]:SC0[0]:HE1:SE1] takes:\n[ 3433.449117] (iprune_sem){+++++-}, at: [\u003cffffffff810ebbab\u003e] shrink_icache_memory+0x45/0x2b1\n[ 3433.449117] {RECLAIM_FS-ON-W} state was registered at:\n[ 3433.449117] [\u003cffffffff8107fe5f\u003e] mark_held_locks+0x52/0x70\n[ 3433.449117] [\u003cffffffff8107ff02\u003e] lockdep_trace_alloc+0x85/0x9f\n[ 3433.449117] [\u003cffffffff810d353d\u003e] slab_pre_alloc_hook+0x18/0x3c\n[ 3433.449117] [\u003cffffffff810d3fd5\u003e] kmem_cache_alloc+0x23/0xa2\n[ 3433.449117] [\u003cffffffff8127be77\u003e] idr_pre_get+0x2d/0x6f\n[ 3433.449117] [\u003cffffffff815434eb\u003e] p9_idpool_get+0x30/0xae\n[ 3433.449117] [\u003cffffffff81540123\u003e] p9_client_rpc+0xd7/0x9b0\n[ 3433.449117] [\u003cffffffff815427b0\u003e] p9_client_clunk+0x88/0xdb\n[ 3433.449117] [\u003cffffffff811d56e5\u003e] v9fs_evict_inode+0x3c/0x48\n[ 3433.449117] [\u003cffffffff810eb511\u003e] evict+0x1f/0x87\n[ 3433.449117] [\u003cffffffff810eb5c0\u003e] dispose_list+0x47/0xe3\n[ 3433.449117] [\u003cffffffff810eb8da\u003e] evict_inodes+0x138/0x14f\n[ 3433.449117] [\u003cffffffff810d90e2\u003e] generic_shutdown_super+0x57/0xe8\n[ 3433.449117] [\u003cffffffff810d91e8\u003e] kill_anon_super+0x11/0x50\n[ 3433.449117] [\u003cffffffff811d4951\u003e] v9fs_kill_super+0x49/0xab\n[ 3433.449117] [\u003cffffffff810d926e\u003e] deactivate_locked_super+0x21/0x46\n[ 3433.449117] [\u003cffffffff810d9e84\u003e] deactivate_super+0x40/0x44\n[ 3433.449117] [\u003cffffffff810ef848\u003e] mntput_no_expire+0x100/0x109\n[ 3433.449117] [\u003cffffffff810f0aeb\u003e] sys_umount+0x2f1/0x31c\n[ 3433.449117] [\u003cffffffff8102c87b\u003e] system_call_fastpath+0x16/0x1b\n[ 3433.449117] irq event stamp: 192941\n[ 3433.449117] hardirqs last enabled at (192941): [\u003cffffffff81568dcf\u003e] _raw_spin_unlock_irq+0x2b/0x30\n[ 3433.449117] hardirqs last disabled at (192940): [\u003cffffffff810b5f97\u003e] shrink_inactive_list+0x290/0x2f5\n[ 3433.449117] softirqs last enabled at (188470): [\u003cffffffff8105fd65\u003e] __do_softirq+0x133/0x152\n[ 3433.449117] softirqs last disabled at (188455): [\u003cffffffff8102d7cc\u003e] call_softirq+0x1c/0x28\n[ 3433.449117]\n[ 3433.449117] other info that might help us debug this:\n[ 3433.449117] 1 lock held by kswapd0/505:\n[ 3433.449117] #0: (shrinker_rwsem){++++..}, at: [\u003cffffffff810b52e2\u003e] shrink_slab+0x38/0x15f\n[ 3433.449117]\n[ 3433.449117] stack backtrace:\n[ 3433.449117] Pid: 505, comm: kswapd0 Not tainted 2.6.38-rc5+ #84\n[ 3433.449117] Call Trace:\n[ 3433.449117] [\u003cffffffff8107fbce\u003e] ? valid_state+0x17e/0x191\n[ 3433.449117] [\u003cffffffff81036896\u003e] ? save_stack_trace+0x28/0x45\n[ 3433.449117] [\u003cffffffff81080426\u003e] ? check_usage_forwards+0x0/0x87\n[ 3433.449117] [\u003cffffffff8107fcf4\u003e] ? mark_lock+0x113/0x22c\n[ 3433.449117] [\u003cffffffff8108105f\u003e] ? __lock_acquire+0x37a/0xcf7\n[ 3433.449117] [\u003cffffffff8107fc0e\u003e] ? mark_lock+0x2d/0x22c\n[ 3433.449117] [\u003cffffffff81081077\u003e] ? __lock_acquire+0x392/0xcf7\n[ 3433.449117] [\u003cffffffff810b14d2\u003e] ? determine_dirtyable_memory+0x15/0x28\n[ 3433.449117] [\u003cffffffff81081a33\u003e] ? lock_acquire+0x57/0x6d\n[ 3433.449117] [\u003cffffffff810ebbab\u003e] ? shrink_icache_memory+0x45/0x2b1\n[ 3433.449117] [\u003cffffffff81567d85\u003e] ? down_read+0x47/0x5c\n[ 3433.449117] [\u003cffffffff810ebbab\u003e] ? shrink_icache_memory+0x45/0x2b1\n[ 3433.449117] [\u003cffffffff810ebbab\u003e] ? shrink_icache_memory+0x45/0x2b1\n[ 3433.449117] [\u003cffffffff810b5385\u003e] ? shrink_slab+0xdb/0x15f\n[ 3433.449117] [\u003cffffffff810b69bc\u003e] ? kswapd+0x574/0x96a\n[ 3433.449117] [\u003cffffffff810b6448\u003e] ? kswapd+0x0/0x96a\n[ 3433.449117] [\u003cffffffff810714e2\u003e] ? kthread+0x7d/0x85\n[ 3433.449117] [\u003cffffffff8102d6d4\u003e] ? kernel_thread_helper+0x4/0x10\n[ 3433.449117] [\u003cffffffff81569200\u003e] ? restore_args+0x0/0x30\n[ 3433.449117] [\u003cffffffff81071465\u003e] ? kthread+0x0/0x85\n[ 3433.449117] [\u003cffffffff8102d6d0\u003e] ? kernel_thread_helper+0x0/0x10\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.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": "a40c4f10e3fb96030358e49abd010c1f08446fa3", "tree": "1aa1f6ca618cd021d944f7da7caeb5b182beaee4", "parents": [ "55b00bae111030bd0dfcc898a920e54725aed1bf" ], "author": { "name": "Yehuda Sadeh", "email": "yehuda@hq.newdream.net", "time": "Mon Mar 21 15:07:16 2011 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Mar 22 11:33:55 2011 -0700" }, "message": "libceph: add lingering request and watch/notify event framework\n\nLingering requests are requests that are sent to the OSD normally but\ntracked also after we get a successful request. This keeps the OSD\nconnection open and resends the original request if the object moves to\nanother OSD. The OSD can then send notification messages back to us\nif another client initiates a notify.\n\nThis framework will be used by RBD so that the client gets notification\nwhen a snapshot is created by another node or tool.\n\nSigned-off-by: Yehuda Sadeh \u003cyehuda@hq.newdream.net\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "04024b937a6e9b7d4320b5853557cea3930d528c", "tree": "d14d770251f5b50d9647a662848c64bab034265a", "parents": [ "2d230e2b2c3111cf4a11619f60dcd158ae84e3ab" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Sat Mar 19 12:13:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:06:33 2011 -0700" }, "message": "ipv4: optimize route adding on secondary promotion\n\nOptimize the calling of fib_add_ifaddr for all\nsecondary addresses after the promoted one to start from\ntheir place, not from the new place of the promoted\nsecondary. It will save some CPU cycles because we\nare sure the promoted secondary was first for the subnet\nand all next secondaries do not change their place.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2d230e2b2c3111cf4a11619f60dcd158ae84e3ab", "tree": "4e665cc5ac43116212b44af1f409ef8a140069ef", "parents": [ "e6abbaa2725a43cf5d26c4c2a5dc6c0f6029ea19" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Sat Mar 19 12:13:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:06:33 2011 -0700" }, "message": "ipv4: remove the routes on secondary promotion\n\nThe secondary address promotion relies on fib_sync_down_addr\nto remove all routes created for the secondary addresses when\nthe old primary address is deleted. It does not happen for cases\nwhen the primary address is also in another subnet. Fix that\nby deleting local and broadcast routes for all secondaries while\nthey are on device list and by faking that all addresses from\nthis subnet are to be deleted. It relies on fib_del_ifaddr being\nable to ignore the IPs from the concerned subnet while checking\nfor duplication.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e6abbaa2725a43cf5d26c4c2a5dc6c0f6029ea19", "tree": "65d9d9deb7259322e83fc750b98f4ad9f7a51f56", "parents": [ "74cb3c108bc0f599a4eb40980db8580cfba725c9" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Sat Mar 19 12:13:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:06:32 2011 -0700" }, "message": "ipv4: fix route deletion for IPs on many subnets\n\nAlex Sidorenko reported for problems with local\nroutes left after IP addresses are deleted. It happens\nwhen same IPs are used in more than one subnet for the\ndevice.\n\n\tFix fib_del_ifaddr to restrict the checks for duplicate\nlocal and broadcast addresses only to the IFAs that use\nour primary IFA or another primary IFA with same address.\nAnd we expect the prefsrc to be matched when the routes\nare deleted because it is possible they to differ only by\nprefsrc. This patch prevents local and broadcast routes\nto be leaked until their primary IP is deleted finally\nfrom the box.\n\n\tAs the secondary address promotion needs to delete\nthe routes for all secondaries that used the old primary IFA,\nadd option to ignore these secondaries from the checks and\nto assume they are already deleted, so that we can safely\ndelete the route while these IFAs are still on the device list.\n\nReported-by: Alex Sidorenko \u003calexandre.sidorenko@hp.com\u003e\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "74cb3c108bc0f599a4eb40980db8580cfba725c9", "tree": "4e75f3e98912f917214674fafb09e7d787a029c1", "parents": [ "3c0f3c605b2572c740f66ea39fe2d125399b20aa" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Sat Mar 19 12:13:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:06:31 2011 -0700" }, "message": "ipv4: match prefsrc when deleting routes\n\nfib_table_delete forgets to match the routes by prefsrc.\nCallers can specify known IP in fc_prefsrc and we should remove\nthe exact route. This is needed for cases when same local or\nbroadcast addresses are used in different subnets and the\nroutes differ only in prefsrc. All callers that do not provide\nfc_prefsrc will ignore the route prefsrc as before and will\ndelete the first occurence. That is how the ip route del default\nmagic works.\n\n\tCurrent callers are:\n\n- ip_rt_ioctl where rtentry_to_fib_config provides fc_prefsrc only\nwhen the provided device name matches IP label with colon.\n\n- inet_rtm_delroute where RTA_PREFSRC is optional too\n\n- fib_magic which deals with routes when deleting addresses\nand where the fc_prefsrc is always set with the primary IP\nfor the concerned IFA.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27660515a21bf913e3208ded3f27abd0529fae0e", "tree": "e07baa50f459b227eff6aa0dfbb6041f501bfb90", "parents": [ "736561a01f11114146b1b7f82d486fa9c95828ef" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Fri Mar 18 16:56:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:00:26 2011 -0700" }, "message": "net: implement dev_disable_lro() hw_features compatibility\n\nImplement compatibility with new hw_features for dev_disable_lro().\nThis is a transition path - dev_disable_lro() should be later\nintegrated into netdev_fix_features() after all drivers are converted.\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "736561a01f11114146b1b7f82d486fa9c95828ef", "tree": "804709a3163df1c6e33e2a1da5ec91f719bce17c", "parents": [ "f40f94fc6c3b5a5542d5ed976e9ff69a3b463802" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Mon Mar 21 15:18:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 20:39:24 2011 -0700" }, "message": "IPVS: Use global mutex in ip_vs_app.c\n\nAs part of the work to make IPVS network namespace aware\n__ip_vs_app_mutex was replaced by a per-namespace lock,\nipvs-\u003eapp_mutex. ipvs-\u003eapp_key is also supplied for debugging purposes.\n\nUnfortunately this implementation results in ipvs-\u003eapp_key residing\nin non-static storage which at the very least causes a lockdep warning.\n\nThis patch takes the rather heavy-handed approach of reinstating\n__ip_vs_app_mutex which will cover access to the ipvs-\u003elist_head\nof all network namespaces.\n\n[ 12.610000] IPVS: Creating netns size\u003d2456 id\u003d0\n[ 12.630000] IPVS: Registered protocols (TCP, UDP, SCTP, AH, ESP)\n[ 12.640000] BUG: key ffff880003bbf1a0 not in .data!\n[ 12.640000] ------------[ cut here ]------------\n[ 12.640000] WARNING: at kernel/lockdep.c:2701 lockdep_init_map+0x37b/0x570()\n[ 12.640000] Hardware name: Bochs\n[ 12.640000] Pid: 1, comm: swapper Tainted: G W 2.6.38-kexec-06330-g69b7efe-dirty #122\n[ 12.650000] Call Trace:\n[ 12.650000] [\u003cffffffff8102e685\u003e] warn_slowpath_common+0x75/0xb0\n[ 12.650000] [\u003cffffffff8102e6d5\u003e] warn_slowpath_null+0x15/0x20\n[ 12.650000] [\u003cffffffff8105967b\u003e] lockdep_init_map+0x37b/0x570\n[ 12.650000] [\u003cffffffff8105829d\u003e] ? trace_hardirqs_on+0xd/0x10\n[ 12.650000] [\u003cffffffff81055ad8\u003e] debug_mutex_init+0x38/0x50\n[ 12.650000] [\u003cffffffff8104bc4c\u003e] __mutex_init+0x5c/0x70\n[ 12.650000] [\u003cffffffff81685ee7\u003e] __ip_vs_app_init+0x64/0x86\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.660000] [\u003cffffffff811b1c33\u003e] T.620+0x43/0x170\n[ 12.660000] [\u003cffffffff811b1e9a\u003e] ? register_pernet_subsys+0x1a/0x40\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.660000] [\u003cffffffff811b1db7\u003e] register_pernet_operations+0x57/0xb0\n[ 12.660000] [\u003cffffffff81685a3b\u003e] ? ip_vs_init+0x0/0xff\n[ 12.670000] [\u003cffffffff811b1ea9\u003e] register_pernet_subsys+0x29/0x40\n[ 12.670000] [\u003cffffffff81685f19\u003e] ip_vs_app_init+0x10/0x12\n[ 12.670000] [\u003cffffffff81685a87\u003e] ip_vs_init+0x4c/0xff\n[ 12.670000] [\u003cffffffff8166562c\u003e] do_one_initcall+0x7a/0x12e\n[ 12.670000] [\u003cffffffff8166583e\u003e] kernel_init+0x13e/0x1c2\n[ 12.670000] [\u003cffffffff8128c134\u003e] kernel_thread_helper+0x4/0x10\n[ 12.670000] [\u003cffffffff8128ad40\u003e] ? restore_args+0x0/0x30\n[ 12.680000] [\u003cffffffff81665700\u003e] ? kernel_init+0x0/0x1c2\n[ 12.680000] [\u003cffffffff8128c130\u003e] ? kernel_thread_helper+0x0/0x1global0\n\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Julian Anastasov \u003cja@ssi.bg\u003e\nCc: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f40f94fc6c3b5a5542d5ed976e9ff69a3b463802", "tree": "402248ed54d1700fec2d5785a85e1059b33484f2", "parents": [ "675071a2ef3f4a6d25ee002a7437d50431168344" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Mar 21 10:15:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 20:39:24 2011 -0700" }, "message": "ipvs: fix a typo in __ip_vs_control_init()\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Simon Horman \u003chorms@verge.net.au\u003e\nCc: Julian Anastasov \u003cja@ssi.bg\u003e\nAcked-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d2a8fa96a44ba242de3a6f56acaef7a40a97b97", "tree": "1fd01e0ef3da06d1508481aeb7c3c4994122dff9", "parents": [ "d5cd92448fded12c91f7574e49747c5f7d975a8d" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@aristanetworks.com", "time": "Mon Mar 21 18:23:34 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:23:34 2011 -0700" }, "message": "net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries.\n\nWhen I was fixing issues with unregisgtering tables under /proc/sys/net/ipv6/neigh\nby adding a mount point it appears I missed a critical ordering issue, in the\nipv6 initialization. I had not realized that ipv6_sysctl_register is called\nat the very end of the ipv6 initialization and in particular after we call\nneigh_sysctl_register from ndisc_init.\n\n\"neigh\" needs to be initialized in ipv6_static_sysctl_register which is\nthe first ipv6 table to initialized, and definitely before ndisc_init.\nThis removes the weirdness of duplicate tables while still providing a\n\"neigh\" mount point which prevents races in sysctl unregistering.\n\nThis was initially reported at https://bugzilla.kernel.org/show_bug.cgi?id\u003d31232\nReported-by: sunkan@zappa.cx\nSigned-off-by: Eric W. Biederman \u003cebiederm@aristanetworks.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ac0a121d7906b049dfee3649f886c969fbb3c1b7", "tree": "e6df48f72520923539a66b8d138e17a08db742cb", "parents": [ "4f2d56c45fec7c15169599cab05e9f6df18769d0" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Mon Mar 21 18:20:26 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:20:26 2011 -0700" }, "message": "net: fix incorrect spelling in drop monitor protocol\n\nIt was pointed out to me recently that my spelling could be better :)\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b20e7bbfc7a15a4182730f0936433145992b4b06", "tree": "81df1570eb7840b9ed5b981ad2e437b773448f5a", "parents": [ "674f2115995b7b588cbf3540c9f9b2448a8c7ea8" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Mar 21 18:18:00 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:18:00 2011 -0700" }, "message": "net/appletalk: fix atalk_release use after free\n\nThe BKL removal in appletalk introduced a use-after-free problem,\nwhere atalk_destroy_socket frees a sock, but we still release\nthe socket lock on it.\n\nAn easy fix is to take an extra reference on the sock and sock_put\nit when returning from atalk_release.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "674f2115995b7b588cbf3540c9f9b2448a8c7ea8", "tree": "bd9bd1afa880531f6de70bea970aa198924f8632", "parents": [ "20246a800389fe5442675c59863fec5a4f520c7c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Mar 21 18:16:39 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:16:39 2011 -0700" }, "message": "ipx: fix ipx_release()\n\nCommit b0d0d915d1d1a0 (remove the BKL) added a regression, because\nsock_put() can free memory while we are going to use it later.\n\nFix is to delay sock_put() _after_ release_sock().\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nTested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8aa525a9340da4227797a06221ca08399006635f", "tree": "1a9d41975a68aae50b4905f2da6a3dee3a54b68f", "parents": [ "a454f0ccefbfdbfc0e1aa8a5f8010af5e48b8845" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Mon Mar 21 18:10:25 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:10:25 2011 -0700" }, "message": "l2tp: fix possible oops on l2tp_eth module unload\n\nA struct used in the l2tp_eth driver for registering network namespace\nops was incorrectly marked as __net_initdata, leading to oops when\nmodule unloaded.\n\nBUG: unable to handle kernel paging request at ffffffffa00ec098\nIP: [\u003cffffffff8123dbd8\u003e] ops_exit_list+0x7/0x4b\nPGD 142d067 PUD 1431063 PMD 195da8067 PTE 0\nOops: 0000 [#1] SMP \nlast sysfs file: /sys/module/l2tp_eth/refcnt\nCall Trace:\n [\u003cffffffff8123dc94\u003e] ? unregister_pernet_operations+0x32/0x93\n [\u003cffffffff8123dd20\u003e] ? unregister_pernet_device+0x2b/0x38\n [\u003cffffffff81068b6e\u003e] ? sys_delete_module+0x1b8/0x222\n [\u003cffffffff810c7300\u003e] ? do_munmap+0x254/0x318\n [\u003cffffffff812c64e5\u003e] ? page_fault+0x25/0x30\n [\u003cffffffff812c6952\u003e] ? system_call_fastpath+0x16/0x1b\n\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a454f0ccefbfdbfc0e1aa8a5f8010af5e48b8845", "tree": "359fdf6dbff1494ffe3d5cc8861fb0c0b72cc831", "parents": [ "0e24d34a5b95226cfc335817aefd9cf9744e5659" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Mon Mar 21 18:08:28 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:08:28 2011 -0700" }, "message": "xfrm: Fix initialize repl field of struct xfrm_state\n\nCommit \u0027xfrm: Move IPsec replay detection functions to a separate file\u0027\n (9fdc4883d92d20842c5acea77a4a21bb1574b495)\nintroduce repl field to struct xfrm_state, and only initialize it\nunder SA\u0027s netlink create path, the other path, such as pf_key,\nipcomp/ipcomp6 etc, the repl field remaining uninitialize. So if\nthe SA is created by pf_key, any input packet with SA\u0027s encryption\nalgorithm will cause panic.\n\n int xfrm_input()\n {\n ...\n x-\u003erepl-\u003eadvance(x, seq);\n ...\n }\n\nThis patch fixed it by introduce new function __xfrm_init_state().\n\nPid: 0, comm: swapper Not tainted 2.6.38-next+ #14 Bochs Bochs\nEIP: 0060:[\u003cc078e5d5\u003e] EFLAGS: 00010206 CPU: 0\nEIP is at xfrm_input+0x31c/0x4cc\nEAX: dd839c00 EBX: 00000084 ECX: 00000000 EDX: 01000000\nESI: dd839c00 EDI: de3a0780 EBP: dec1de88 ESP: dec1de64\n DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nProcess swapper (pid: 0, ti\u003ddec1c000 task\u003dc09c0f20 task.ti\u003dc0992000)\nStack:\n 00000000 00000000 00000002 c0ba27c0 00100000 01000000 de3a0798 c0ba27c0\n 00000033 dec1de98 c0786848 00000000 de3a0780 dec1dea4 c0786868 00000000\n dec1debc c074ee56 e1da6b8c de3a0780 c074ed44 de3a07a8 dec1decc c074ef32\nCall Trace:\n [\u003cc0786848\u003e] xfrm4_rcv_encap+0x22/0x27\n [\u003cc0786868\u003e] xfrm4_rcv+0x1b/0x1d\n [\u003cc074ee56\u003e] ip_local_deliver_finish+0x112/0x1b1\n [\u003cc074ed44\u003e] ? ip_local_deliver_finish+0x0/0x1b1\n [\u003cc074ef32\u003e] NF_HOOK.clone.1+0x3d/0x44\n [\u003cc074ef77\u003e] ip_local_deliver+0x3e/0x44\n [\u003cc074ed44\u003e] ? ip_local_deliver_finish+0x0/0x1b1\n [\u003cc074ec03\u003e] ip_rcv_finish+0x30a/0x332\n [\u003cc074e8f9\u003e] ? ip_rcv_finish+0x0/0x332\n [\u003cc074ef32\u003e] NF_HOOK.clone.1+0x3d/0x44\n [\u003cc074f188\u003e] ip_rcv+0x20b/0x247\n [\u003cc074e8f9\u003e] ? ip_rcv_finish+0x0/0x332\n [\u003cc072797d\u003e] __netif_receive_skb+0x373/0x399\n [\u003cc0727bc1\u003e] netif_receive_skb+0x4b/0x51\n [\u003ce0817e2a\u003e] cp_rx_poll+0x210/0x2c4 [8139cp]\n [\u003cc072818f\u003e] net_rx_action+0x9a/0x17d\n [\u003cc0445b5c\u003e] __do_softirq+0xa1/0x149\n [\u003cc0445abb\u003e] ? __do_softirq+0x0/0x149\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f6c7006755b667f9f6c1f3b6f08cd65f75cc471", "tree": "233e96acdc3b627c97267992368ae1cb6cd66a5f", "parents": [ "09adc80c611bb8902daa8ccfe34dbbc009d6befe" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Mon Jan 17 20:34:08 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Mon Mar 21 12:24:19 2011 -0700" }, "message": "libceph: fix osd request queuing on osdmap updates\n\nIf we send a request to osd A, and the request\u0027s pg remaps to osd B and\nthen back to A in quick succession, we need to resend the request to A. The\nold code was only calling kick_requests after processing all incremental\nmaps in a message, so it was very possible to not resend a request that\nneeded to be resent. This would make the osd eventually time out (at least\nwith the current default of osd timeouts enabled).\n\nThe correct approach is to scan requests on every map incremental. This\npatch refactors the kick code in a few ways:\n - all requests are either on req_lru (in flight), req_unsent (ready to\n send), or req_notarget (currently map to no up osd)\n - mapping always done by map_request (previous map_osds)\n - if the mapping changes, we requeue. requests are resent only after all\n map incrementals are processed.\n - some osd reset code is moved out of kick_requests into a separate\n function\n - the \"kick this osd\" functionality is moved to kick_osd_requests, as it\n is unrelated to scanning for request-\u003epg-\u003eosd mapping changes\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "8bc8aecdc5e26cfda12dbd6867af4aa67836da6a", "tree": "a76e8ea6da9ebafe1f7407f304521ed242fab756", "parents": [ "61e1b0b00c793ad5a32fe2181c9f77115fed5dc4" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Mar 21 20:01:00 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 21 15:19:50 2011 -0400" }, "message": "mac80211: initialize sta-\u003elast_rx in sta_info_alloc\n\nThis field is used to determine the inactivity time. When in AP mode,\nhostapd uses it for kicking out inactive clients after a while. Without this\npatch, hostapd immediately deauthenticates a new client if it checks the\ninactivity time before the client sends its first data frame.\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": "961ed183a9fd080cf306c659b8736007e44065a5", "tree": "7bf0a65c184a2c4fc0571ff9af8ce633efc73bcf", "parents": [ "db856674ac69e31946e56085239757cca3f7655f" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Sun Mar 20 15:42:52 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Mar 20 15:42:52 2011 +0100" }, "message": "netfilter: ipt_CLUSTERIP: fix buffer overflow\n\n\u0027buffer\u0027 string is copied from userspace. It is not checked whether it is\nzero terminated. This may lead to overflow inside of simple_strtoul().\nChangli Gao suggested to copy not more than user supplied \u0027size\u0027 bytes.\n\nIt was introduced before the git epoch. Files \"ipt_CLUSTERIP/*\" are\nroot writable only by default, however, on some setups permissions might be\nrelaxed to e.g. network admin user.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nAcked-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "db856674ac69e31946e56085239757cca3f7655f", "tree": "73fc82e92a119dcf1a0ce4e2ca45ef410165776f", "parents": [ "5c1aba467828bf0574ec5754c84884d573f590af" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Mar 20 15:40:06 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Mar 20 15:40:06 2011 +0100" }, "message": "netfilter: xtables: fix reentrancy\n\ncommit f3c5c1bfd4308 (make ip_tables reentrant) introduced a race in\nhandling the stackptr restore, at the end of ipt_do_table()\n\nWe should do it before the call to xt_info_rdunlock_bh(), or we allow\ncpu preemption and another cpu overwrites stackptr of original one.\n\nA second fix is to change the underflow test to check the origptr value\ninstead of 0 to detect underflow, or else we allow a jump from different\nhooks.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5c1aba467828bf0574ec5754c84884d573f590af", "tree": "12973d3d9f15cb6e1f95e2e9f8dd930ad36aa629", "parents": [ "5e0c1eb7e6b61998c7ecd39b7f69a15773d894d4" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Sun Mar 20 15:35:01 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Mar 20 15:35:01 2011 +0100" }, "message": "netfilter: ipset: fix checking the type revision at create command\n\nThe revision of the set type was not checked at the create command: if the\nuserspace sent a valid set type but with not supported revision number,\nit\u0027d create a loop.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5e0c1eb7e6b61998c7ecd39b7f69a15773d894d4", "tree": "4fba9a1410925d0a6d7a8a39aa8cc447e6f9251c", "parents": [ "b26fa4e0275426450238a14158bc1db24bb696e6" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Sun Mar 20 15:33:26 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Mar 20 15:33:26 2011 +0100" }, "message": "netfilter: ipset: fix address ranges at hash:*port* types\n\nThe hash:*port* types with IPv4 silently ignored when address ranges\nwith non TCP/UDP were added/deleted from the set and used the first\naddress from the range only.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e", "tree": "71834e9ccd22d9e7aed7272e805a514664cf8b25", "parents": [ "d870bfb9d366c5d466c0f5419a4ec95a3f71ea8a" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Mar 18 05:27:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:13:12 2011 -0700" }, "message": "bridge: Reset IPCB when entering IP stack on NF_FORWARD\n\nWhenever we enter the IP stack proper from bridge netfilter we\nneed to ensure that the skb is in a form the IP stack expects\nit to be in.\n\nThe entry point on NF_FORWARD did not meet the requirements of\nthe IP stack, therefore leading to potential crashes/panics.\n\nThis patch fixes the problem.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d870bfb9d366c5d466c0f5419a4ec95a3f71ea8a", "tree": "1058c527072d026721499e646765da0e92260444", "parents": [ "3a7da39d165e0c363c294feec119db1427032afd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Mar 18 00:27:27 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:13:12 2011 -0700" }, "message": "vlan: should take into account needed_headroom\n\nCommit c95b819ad7 (gre: Use needed_headroom)\nmade gre use needed_headroom instead of hard_header_len\n\nThis uncover a bug in vlan code.\n\nWe should make sure vlan devices take into account their\nreal_dev-\u003eneeded_headroom or we risk a crash in ipgre_header(), because\nwe dont have enough room to push IP header in skb.\n\nReported-by: Diddi Oscarsson \u003cdiddi@diddi.se\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a7da39d165e0c363c294feec119db1427032afd", "tree": "901e54990fdd90d6f90d27533c36e61858216e34", "parents": [ "5e5069b41d5b82bcadc1dbf73f48476b428c102f" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Mar 17 07:34:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:13:11 2011 -0700" }, "message": "ethtool: Compat handling for struct ethtool_rxnfc\n\nThis structure was accidentally defined such that its layout can\ndiffer between 32-bit and 64-bit processes. Add compat structure\ndefinitions and an ioctl wrapper function.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nCc: stable@kernel.org [2.6.30+]\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e5069b41d5b82bcadc1dbf73f48476b428c102f", "tree": "dd7e2eb386328b0c94ef939d27540c10f11df8e2", "parents": [ "67c5c6cb8129c595f21e88254a3fc6b3b841ae8e" ], "author": { "name": "Roger Luethi", "email": "rl@hellgate.ch", "time": "Thu Mar 17 06:37:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:13:10 2011 -0700" }, "message": "ethtool: __ethtool_set_sg: check for function pointer before using it\n\n__ethtool_set_sg does not check if dev-\u003eethtool_ops-\u003eset_sg is defined\nwhich can result in a NULL pointer dereference when ethtool is used to\nchange SG settings for drivers without SG support.\n\nSigned-off-by: Roger Luethi \u003crl@hellgate.ch\u003e\nReviewed-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67c5c6cb8129c595f21e88254a3fc6b3b841ae8e", "tree": "76b219ead6898d683e477e2fa2579145e792bd0a", "parents": [ "4363c2fddb1399b728ef21ee8101c148a311ea45" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Thu Mar 17 01:40:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:12:15 2011 -0700" }, "message": "econet: 4 byte infoleak to the network\n\nstruct aunhdr has 4 padding bytes between \u0027pad\u0027 and \u0027handle\u0027 fields on\nx86_64. These bytes are not initialized in the variable \u0027ah\u0027 before\nsending \u0027ah\u0027 to the network. This leads to 4 bytes kernel stack\ninfoleak.\n\nThis bug was introduced before the git epoch.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nAcked-by: Phil Blundell \u003cphilb@gnu.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e16b396ce314b2bcdfe6c173fe075bf8e3432368", "tree": "640f0f56f2ea676647af4eb42d32fa56be2ee549", "parents": [ "7fd23a24717a327a66f3c32d11a20a2f169c824f", "e6e8dd5055a974935af1398c8648d4a9359b0ecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)\n doc: CONFIG_UNEVICTABLE_LRU doesn\u0027t exist anymore\n Update cpuset info \u0026 webiste for cgroups\n dcdbas: force SMI to happen when expected\n arch/arm/Kconfig: remove one to many l\u0027s in the word.\n asm-generic/user.h: Fix spelling in comment\n drm: fix printk typo \u0027sracth\u0027\n Remove one to many n\u0027s in a word\n Documentation/filesystems/romfs.txt: fixing link to genromfs\n drivers:scsi Change printk typo initate -\u003e initiate\n serial, pch uart: Remove duplicate inclusion of linux/pci.h header\n fs/eventpoll.c: fix spelling\n mm: Fix out-of-date comments which refers non-existent functions\n drm: Fix printk typo \u0027failled\u0027\n coh901318.c: Change initate to initiate.\n mbox-db5500.c Change initate to initiate.\n edac: correct i82975x error-info reported\n edac: correct i82975x mci initialisation\n edac: correct commented info\n fs: update comments to point correct document\n target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c\n ...\n\nTrivial conflict in fs/eventpoll.c (spelling vs addition)\n" }, { "commit": "7fd23a24717a327a66f3c32d11a20a2f169c824f", "tree": "62a731f3edac9e58427fc27396ad5da8804fa579", "parents": [ "0a95d92c0054e74fb79607ac2df958b7bf295706", "65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:35:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:35:30 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)\n HID: add support for Logitech Driving Force Pro wheel\n HID: hid-ortek: remove spurious reference\n HID: add support for Ortek PKB-1700\n HID: roccat-koneplus: vorrect mode of sysfs attr \u0027sensor\u0027\n HID: hid-ntrig: init settle and mode check\n HID: merge hid-egalax into hid-multitouch\n HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing\n HID: ntrig remove if and drop an indent\n HID: ACRUX - activate the device immediately after binding\n HID: ntrig: apply NO_INIT_REPORTS quirk\n HID: hid-magicmouse: Correct touch orientation direction\n HID: ntrig don\u0027t dereference unclaimed hidinput\n HID: Do not create input devices for feature reports\n HID: bt hidp: send Output reports using SET_REPORT on the Control channel\n HID: hid-sony.c: Fix sending Output reports to the Sixaxis\n HID: add support for Keytouch IEC 60945\n HID: Add HID Report Descriptor to sysfs\n HID: add IRTOUCH infrared USB to hid_have_special_driver\n HID: kernel oops in out_cleanup in function hidinput_connect\n HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)\n ...\n" }, { "commit": "179198373cf374f0ef793f1023c1cdd83b53674d", "tree": "9c7f9e82b936864b9d8cf91b3d4121a3c8d2671c", "parents": [ "374e55251cacfb68d331bb8a574b2de8160aacc2", "8e26de238fd794c8ea56a5c98bf67c40cfeb051d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:40:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 17:40:00 2011 -0700" }, "message": "Merge branch \u0027nfs-for-2.6.39\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.39\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (54 commits)\n RPC: killing RPC tasks races fixed\n xprt: remove redundant check\n SUNRPC: Convert struct rpc_xprt to use atomic_t counters\n SUNRPC: Ensure we always run the tk_callback before tk_action\n sunrpc: fix printk format warning\n xprt: remove redundant null check\n nfs: BKL is no longer needed, so remove the include\n NFS: Fix a warning in fs/nfs/idmap.c\n Cleanup: Factor out some cut-and-paste code.\n cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions.\n NFS: account direct-io into task io accounting\n gss:krb5 only include enctype numbers in gm_upcall_enctypes\n RPCRDMA: Fix FRMR registration/invalidate handling.\n RPCRDMA: Fix to XDR page base interpretation in marshalling logic.\n NFSv4: Send unmapped uid/gids to the server when using auth_sys\n NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattr\n NFSv4: cleanup idmapper functions to take an nfs_server argument\n NFSv4: Send unmapped uid/gids to the server if the idmapper fails\n NFSv4: If the server sends us a numeric uid/gid then accept it\n NFSv4.1: reject zero layout with zeroed stripe unit\n ...\n" }, { "commit": "4be34b9d69c97211ff4eb00d79078f3c1593804d", "tree": "2e6b53f9b195829a7f02ea4b834b817f568426f3", "parents": [ "5a02ab7c3c4580f94d13c683721039855b67cda6" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sat Jan 22 22:40:20 2011 +0100" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Thu Mar 17 14:38:03 2011 -0400" }, "message": "SUNRPC: Remove resource leak in svc_rdma_send_error()\n\nWe leak the memory allocated to \u0027ctxt\u0027 when we return after\n\u0027ib_dma_mapping_error()\u0027 returns !\u003d0.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "8e26de238fd794c8ea56a5c98bf67c40cfeb051d", "tree": "3c8d0e6b1e6e0782b13221ee6c39e5be09552dd9", "parents": [ "ba3c578de274a5438bafbce03f9225936698051c" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Thu Mar 17 18:54:23 2011 +0300" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 17 12:39:00 2011 -0400" }, "message": "RPC: killing RPC tasks races fixed\n\nRPC task RPC_TASK_QUEUED bit is set must be checked before trying to wake up\ntask rpc_killall_tasks() because task-\u003etk_waitqueue can not be set (equal to\nNULL).\nAlso, as Trond Myklebust mentioned, such approach (instead of checking\ntk_waitqueue to NULL) allows us to \"optimise away the call to\nrpc_wake_up_queued_task() altogether for those\ntasks that aren\u0027t queued\".\n\nHere is an example of dereferencing of tk_waitqueue equal to NULL:\n\nCPU 0 \tCPU 1\t\t\t\tCPU 2\n--------------------\t---------------------\t--------------------------\nnfs4_run_open_task\nrpc_run_task\nrpc_execute\nrpc_set_active\nrpc_make_runnable\n(waiting)\n\t\t\trpc_async_schedule\n\t\t\tnfs4_open_prepare\n\t\t\tnfs_wait_on_sequence\n\t\t\t\t\t\tnfs_umount_begin\n\t\t\t\t\t\trpc_killall_tasks\n\t\t\t\t\t\trpc_wake_up_task\n\t\t\t\t\t\trpc_wake_up_queued_task\n\t\t\t\t\t\tspin_lock(tk_waitqueue \u003d\u003d NULL)\n\t\t\t\t\t\tBUG()\n\t\t\trpc_sleep_on\n\t\t\tspin_lock(\u0026q-\u003elock)\n\t\t\t__rpc_sleep_on\n\t\t\ttask-\u003etk_waitqueue \u003d q\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@openvz.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ba3c578de274a5438bafbce03f9225936698051c", "tree": "fd7b7f821334806583d76104995c126485bce5c6", "parents": [ "a8de240a9074b72b156d9e6d53f00076e6cd5f03" ], "author": { "name": "j223yang@asset.uwaterloo.ca", "email": "j223yang@asset.uwaterloo.ca", "time": "Wed Mar 16 11:16:22 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 17 12:39:00 2011 -0400" }, "message": "xprt: remove redundant check\n\nremove redundant check.\n\nSigned-off-by: Jinqiu Yang \u003ccrindy646@gmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a8de240a9074b72b156d9e6d53f00076e6cd5f03", "tree": "9436ca858870ce89af75703b61a2c25889db354e", "parents": [ "e020c6800c9621a77223bf2c1ff68180e41e8ebf" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 15 19:56:30 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 17 12:38:59 2011 -0400" }, "message": "SUNRPC: Convert struct rpc_xprt to use atomic_t counters\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "e020c6800c9621a77223bf2c1ff68180e41e8ebf", "tree": "80e6ede1f189ad1a666fe5ad3c0aa1679b95ac47", "parents": [ "986d4abbddf9e76184f6cabf66654ea8e61bcde5" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 15 19:56:30 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 17 12:38:41 2011 -0400" }, "message": "SUNRPC: Ensure we always run the tk_callback before tk_action\n\nThis fixes a race in which the task-\u003etk_callback() puts the rpc_task\nto sleep, setting a new callback. Under certain circumstances, the current\ncode may end up executing the task-\u003etk_action before it gets round to the\ncallback.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4", "tree": "c095f23260dc30d54e023195a6167313efeb9cc9", "parents": [ "b4a65f4ef59b0ce36ccd518cd2b696afdd932d96", "0ff1731a1ae51e8e48cd559d70db536281c47f8e", "4875ac114d8bce99838a9b0ee7c3f5469cc6352e", "7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9", "61c29f5b1856f90bf0a87d83cfa035a11986d2c5", "0ae43810976bc969ee158510c4acbe70ed136e61", "5623a24a80814fe471e777f12b9dbbb0f77e002e" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Mar 17 14:31:46 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Mar 17 14:31:46 2011 +0100" }, "message": "Merge branches \u0027dragonrise\u0027, \u0027hidraw-feature\u0027, \u0027multitouch\u0027, \u0027ntrig\u0027, \u0027roccat\u0027, \u0027upstream\u0027 and \u0027upstream-fixes\u0027 into for-linus\n" }, { "commit": "f74b9444192c60603020c61d7915b72893137edc", "tree": "8b1d16d373234038c2b045c9ceb3c33b93059e8a", "parents": [ "7a6362800cb7d1d618a697a650c7aaed3eb39320", "4ba8216cd90560bc402f52076f64d8546e8aefcb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:21:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:21:00 2011 -0700" }, "message": "Merge branch \u0027config\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027config\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n BKL: That\u0027s all, folks\n fs/locks.c: Remove stale FIXME left over from BKL conversion\n ipx: remove the BKL\n appletalk: remove the BKL\n x25: remove the BKL\n ufs: remove the BKL\n hpfs: remove the BKL\n drivers: remove extraneous includes of smp_lock.h\n tracing: don\u0027t trace the BKL\n adfs: remove the big kernel lock\n" }, { "commit": "7a6362800cb7d1d618a697a650c7aaed3eb39320", "tree": "087f9bc6c13ef1fad4b392c5cf9325cd28fa8523", "parents": [ "6445ced8670f37cfc2c5e24a9de9b413dbfc788d", "ceda86a108671294052cbf51660097b6534672f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)\n bonding: enable netpoll without checking link status\n xfrm: Refcount destination entry on xfrm_lookup\n net: introduce rx_handler results and logic around that\n bonding: get rid of IFF_SLAVE_INACTIVE netdev-\u003epriv_flag\n bonding: wrap slave state work\n net: get rid of multiple bond-related netdevice-\u003epriv_flags\n bonding: register slave pointer for rx_handler\n be2net: Bump up the version number\n be2net: Copyright notice change. Update to Emulex instead of ServerEngines\n e1000e: fix kconfig for crc32 dependency\n netfilter ebtables: fix xt_AUDIT to work with ebtables\n xen network backend driver\n bonding: Improve syslog message at device creation time\n bonding: Call netif_carrier_off after register_netdevice\n bonding: Incorrect TX queue offset\n net_sched: fix ip_tos2prio\n xfrm: fix __xfrm_route_forward()\n be2net: Fix UDP packet detected status in RX compl\n Phonet: fix aligned-mode pipe socket buffer header reserve\n netxen: support for GbE port settings\n ...\n\nFix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c\nwith the staging updates.\n" }, { "commit": "e6bee325e49f17c65c1fd66e9e8b348c85788341", "tree": "bcc9e5d8e82efa9009edd481a837cc3626360091", "parents": [ "a5e6b135bdff649e4330f98e2e80dbb1984f7e77", "6ae705b23be8da52d3163be9d81e9b767876aaf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:11:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:11:04 2011 -0700" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)\n pch_uart: reference clock on CM-iTC\n pch_phub: add new device ML7213\n n_gsm: fix UIH control byte : P bit should be 0\n n_gsm: add a documentation\n serial: msm_serial_hs: Add MSM high speed UART driver\n tty_audit: fix tty_audit_add_data live lock on audit disabled\n tty: move cd1865.h to drivers/staging/tty/\n Staging: tty: fix build with epca.c driver\n pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()\n Staging: generic_serial: fix double locking bug\n nozomi: don\u0027t use flush_scheduled_work()\n tty/serial: Relax the device_type restriction from of_serial\n MAINTAINERS: Update HVC file patterns\n tty: phase out of ioctl file pointer for tty3270 as well\n tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile\n pch_uart: Fix DMA channel miss-setting issue.\n pch_uart: fix exclusive access issue\n pch_uart: fix auto flow control miss-setting issue\n pch_uart: fix uart clock setting issue\n pch_uart : Use dev_xxx not pr_xxx\n ...\n\nFix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied\ntwice, then changes to the same area in one branch)\n" }, { "commit": "fbd5060875d25f7764fd1c3d35b83a8ed1d88d7b", "tree": "2b92c1c37178af438bd0f2b1573b61cb64117418", "parents": [ "8a4eb5734e8d1dc60a8c28576bbbdfdcc643626d" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Tue Mar 15 21:12:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 16 12:55:36 2011 -0700" }, "message": "xfrm: Refcount destination entry on xfrm_lookup\n\nWe return a destination entry without refcount if a socket\npolicy is found in xfrm_lookup. This triggers a warning on\na negative refcount when freeeing this dst entry. So take\na refcount in this case to fix it.\n\nThis refcount was forgotten when xfrm changed to cache bundles\ninstead of policies for outgoing flows.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a4eb5734e8d1dc60a8c28576bbbdfdcc643626d", "tree": "ed4cd2f9a2a04a30994a8f8964a81834c895c0c9", "parents": [ "2d7011ca79f1a8792e04d131b8ea21db179ab917" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sat Mar 12 03:14:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 16 12:53:54 2011 -0700" }, "message": "net: introduce rx_handler results and logic around that\n\nThis patch allows rx_handlers to better signalize what to do next to\nit\u0027s caller. That makes skb-\u003edeliver_no_wcard no longer needed.\n\nkernel-doc for rx_handler_result is taken from Nicolas\u0027 patch.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nReviewed-by: Nicolas de Pesloüan \u003cnicolas.2p.debian@free.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee0caa79569a9c44febc18480beef4847aa8cecd", "tree": "1ee112772016511b868d118f3703f2de8635d63d", "parents": [ "f942dc2552b8bfdee607be867b12a8971bb9cd85", "400b871ba623b5e8263a3a43de7b45fab0103a57" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 16 11:12:57 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 16 11:12:57 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "400b871ba623b5e8263a3a43de7b45fab0103a57", "tree": "5c77a794cba654ddae9c5c480067d6d6b1a679aa", "parents": [ "2f5dc63123905a89d4260ab8ee08d19ec104db04" ], "author": { "name": "Thomas Graf", "email": "tgraf@redhat.com", "time": "Wed Mar 16 18:32:13 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Mar 16 18:32:13 2011 +0100" }, "message": "netfilter ebtables: fix xt_AUDIT to work with ebtables\n\nEven though ebtables uses xtables it still requires targets to\nreturn EBT_CONTINUE instead of XT_CONTINUE. This prevented\nxt_AUDIT to work as ebt module.\n\nUpon Jan\u0027s suggestion, use a separate struct xt_target for\nNFPROTO_BRIDGE having its own target callback returning\nEBT_CONTINUE instead of cloning the module.\n\nSigned-off-by: Thomas Graf \u003ctgraf@redhat.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0f6e0e8448a16d8d22119ce91d8dd24b44865b51", "tree": "7c295c02db035fc6a0b867465911a2bc9dc6b1ef", "parents": [ "0d2ecee2bdb2a19d04bc5cefac0f86e790f1aad4", "a002951c97ff8da49938c982a4c236bf2fafdc9f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 09:15:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 09:15:43 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (33 commits)\n AppArmor: kill unused macros in lsm.c\n AppArmor: cleanup generated files correctly\n KEYS: Add an iovec version of KEYCTL_INSTANTIATE\n KEYS: Add a new keyctl op to reject a key with a specified error code\n KEYS: Add a key type op to permit the key description to be vetted\n KEYS: Add an RCU payload dereference macro\n AppArmor: Cleanup make file to remove cruft and make it easier to read\n SELinux: implement the new sb_remount LSM hook\n LSM: Pass -o remount options to the LSM\n SELinux: Compute SID for the newly created socket\n SELinux: Socket retains creator role and MLS attribute\n SELinux: Auto-generate security_is_socket_class\n TOMOYO: Fix memory leak upon file open.\n Revert \"selinux: simplify ioctl checking\"\n selinux: drop unused packet flow permissions\n selinux: Fix packet forwarding checks on postrouting\n selinux: Fix wrong checks for selinux_policycap_netpeer\n selinux: Fix check for xfrm selinux context algorithm\n ima: remove unnecessary call to ima_must_measure\n IMA: remove IMA imbalance checking\n ...\n" }, { "commit": "26a992dbc24e34cbdd03621d1c97ce571ad74e65", "tree": "cbb3171eb715b7c1ed28ed3ca29f1f03165e2faa", "parents": [ "abab012a52237693ae48a655ece30cacb2ce4cf7", "7c9e592e1f6a994d2903c9b055e488ec90f58159" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:58:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:58:09 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (46 commits)\n fs/9p: Make the writeback_fid owned by root\n fs/9p: Writeback dirty data before setattr\n fs/9p: call vmtruncate before setattr 9p opeation\n fs/9p: Properly update inode attributes on link\n fs/9p: Prevent multiple inclusion of same header\n fs/9p: Workaround vfs rename rehash bug\n fs/9p: Mark directory inode invalid for many directory inode operations\n fs/9p: Add . and .. dentry revalidation flag\n fs/9p: mark inode attribute invalid on rename, unlink and setattr\n fs/9p: Add support for marking inode attribute invalid\n fs/9p: Initialize root inode number for dotl\n fs/9p: Update link count correctly on different file system operations\n fs/9p: Add drop_inode 9p callback\n fs/9p: Add direct IO support in cached mode\n fs/9p: Fix inode i_size update in file_write\n fs/9p: set default readahead pages in cached mode\n fs/9p: Move writeback fid to v9fs_inode\n fs/9p: Add v9fs_inode\n fs/9p: Don\u0027t set stat.st_blocks based on nrpages\n fs/9p: Add inode hashing\n ...\n" }, { "commit": "bd2895eeade5f11f3e5906283c630bbdb4b57454", "tree": "4d98f4fcd80c7d062afce28823d08aee53e66f82", "parents": [ "016aa2ed1cc9cf704cf76d8df07751b6daa9750f", "24d51add7438f9696a7205927bf9de3c5c787a58" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:20:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:20:19 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: fix build failure introduced by s/freezeable/freezable/\n workqueue: add system_freezeable_wq\n rds/ib: use system_wq instead of rds_ib_fmr_wq\n net/9p: replace p9_poll_task with a work\n net/9p: use system_wq instead of p9_mux_wq\n xfs: convert to alloc_workqueue()\n reiserfs: make commit_wq use the default concurrency level\n ocfs2: use system_wq instead of ocfs2_quota_wq\n ext4: convert to alloc_workqueue()\n scsi/scsi_tgt_lib: scsi_tgtd isn\u0027t used in memory reclaim path\n scsi/be2iscsi,qla2xxx: convert to alloc_workqueue()\n misc/iwmc3200top: use system_wq instead of dedicated workqueues\n i2o: use alloc_workqueue() instead of create_workqueue()\n acpi: kacpi*_wq don\u0027t need WQ_MEM_RECLAIM\n fs/aio: aio_wq isn\u0027t used in memory reclaim path\n input/tps6507x-ts: use system_wq instead of dedicated workqueue\n cpufreq: use system_wq instead of dedicated workqueues\n wireless/ipw2x00: use system_wq instead of dedicated workqueues\n arm/omap: use system_wq in mailbox\n workqueue: use WQ_MEM_RECLAIM instead of WQ_RESCUER\n" }, { "commit": "4a2b9c3756077c05dd8666e458a751d2248b61b6", "tree": "9d074adc7c94a7fdb3be69e1e0572184f76056a3", "parents": [ "7313714775a6411402f63261c05fbb4ee3d5b64a" ], "author": { "name": "Dan Siemon", "email": "dan@coverfire.com", "time": "Tue Mar 15 13:56:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 18:53:54 2011 -0700" }, "message": "net_sched: fix ip_tos2prio\n\nECN support incorrectly maps ECN BESTEFFORT packets to TC_PRIO_FILLER\n(1) instead of TC_PRIO_BESTEFFORT (0)\n\nThis means ECN enabled flows are placed in pfifo_fast/prio low priority\nband, giving ECN enabled flows [ECT(0) and CE codepoints] higher drop\nprobabilities.\n\nThis is rather unfortunate, given we would like ECN being more widely\nused.\n\nRef : http://www.coverfire.com/archives/2011/03/13/pfifo_fast-and-ecn/\n\nSigned-off-by: Dan Siemon \u003cdan@coverfire.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Dave Täht \u003cd@taht.net\u003e\nCc: Jonathan Morton \u003cchromatix99@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "986d4abbddf9e76184f6cabf66654ea8e61bcde5", "tree": "911372f76d30665c08957ee5422cc408137c43b7", "parents": [ "4d4a76f3309edc671918a767b336492fbc80a16d" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Mar 15 17:11:59 2011 -0700" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 15 20:17:32 2011 -0400" }, "message": "sunrpc: fix printk format warning\n\nFix printk format build warning:\n\nnet/sunrpc/xprtrdma/verbs.c:1463: warning: format \u0027%llx\u0027 expects type \u0027long long unsigned int\u0027, but argument 3 has type \u0027dma_addr_t\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "4d4a76f3309edc671918a767b336492fbc80a16d", "tree": "d35e5df0599c095c69bbcae6b5a3207623da07a0", "parents": [ "8f68cd42d85f31fb58dd2cabf3ff4aad0a2bafd9" ], "author": { "name": "j223yang@asset.uwaterloo.ca", "email": "j223yang@asset.uwaterloo.ca", "time": "Thu Mar 10 12:40:28 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 15 20:16:14 2011 -0400" }, "message": "xprt: remove redundant null check\n\n\u0027req\u0027 is dereferenced before checked for NULL.\nThe patch simply removes the check.\n\nSigned-off-by: Jinqiu Yang\u003ccrindy646@gmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "422e6c4bc4b48c15b3cb57a1ca71431abfc57e54", "tree": "81ceb21f84a79e796ee33b5d17e17406f096abcb", "parents": [ "c83ce989cb5ff86575821992ea82c4df5c388ebc", "574197e0de46a8a4db5c54ef7b65e43ffa8873a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 15:48:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 15:48:13 2011 -0700" }, "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: (57 commits)\n tidy the trailing symlinks traversal up\n Turn resolution of trailing symlinks iterative everywhere\n simplify link_path_walk() tail\n Make trailing symlink resolution in path_lookupat() iterative\n update nd-\u003einode in __do_follow_link() instead of after do_follow_link()\n pull handling of one pathname component into a helper\n fs: allow AT_EMPTY_PATH in linkat(), limit that to CAP_DAC_READ_SEARCH\n Allow passing O_PATH descriptors via SCM_RIGHTS datagrams\n readlinkat(), fchownat() and fstatat() with empty relative pathnames\n Allow O_PATH for symlinks\n New kind of open files - \"location only\".\n ext4: Copy fs UUID to superblock\n ext3: Copy fs UUID to superblock.\n vfs: Export file system uuid via /proc/\u003cpid\u003e/mountinfo\n unistd.h: Add new syscalls numbers to asm-generic\n x86: Add new syscalls for x86_64\n x86: Add new syscalls for x86_32\n fs: Remove i_nlink check from file system link callback\n fs: Don\u0027t allow to create hardlink for deleted file\n vfs: Add open by file handle support\n ...\n" }, { "commit": "a002951c97ff8da49938c982a4c236bf2fafdc9f", "tree": "d43e7885ea7376df0a47a0fc8ceca66dc5bfa357", "parents": [ "521cb40b0c44418a4fd36dc633f575813d59a43d", "c151694b2c48d956ac8c8c59c6927f89cc29ef70" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Mar 16 09:41:17 2011 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Mar 16 09:41:17 2011 +1100" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "7313714775a6411402f63261c05fbb4ee3d5b64a", "tree": "ef2983b19f31ba0743911d69f82d0aa252f10913", "parents": [ "c337ffb68e1e71bad069b14d2246fa1e0c31699c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Mar 15 15:26:43 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 15:26:43 2011 -0700" }, "message": "xfrm: fix __xfrm_route_forward()\n\nThis function should return 0 in case of error, 1 if OK\ncommit 452edd598f60522 (xfrm: Return dst directly from xfrm_lookup())\ngot it wrong.\n\nReported-and-bisected-by: Michael Smith \u003cmsmith@cbnco.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c337ffb68e1e71bad069b14d2246fa1e0c31699c", "tree": "7861a59b196adfd63758cc0921e4fb56030fbaf3", "parents": [ "30df754dedebf27ef90452944a723ba058d23396", "84c0c6933cb0303fa006992a6659c2b46de4eb17" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 15:15:17 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 15:15:17 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "638be344593b66ccca6802c6076a5b3d9200829d", "tree": "41a285f44792037362bc4efaf938b73999b76bd1", "parents": [ "bfd823bd74333615783d8108889814c6d82f2ab0" ], "author": { "name": "Rémi Denis-Courmont", "email": "remi.denis-courmont@nokia.com", "time": "Tue Mar 15 14:55:49 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 14:55:49 2011 -0700" }, "message": "Phonet: fix aligned-mode pipe socket buffer header reserve\n\nWhen the pipe uses aligned-mode data packets, we must reserve 4 bytes\ninstead of 3 for the pipe protocol header. Otherwise the Phonet header\nwould not be aligned, resulting in potentially corrupted headers with\nlater unaligned memory writes.\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "918690f9811029667eaf132dbfeb180c6e4e2029", "tree": "7bcefc7484e88090eba789b3b6a52e17a83a2f55", "parents": [ "31111c26d976ca0f298312f08e44cdb078005b03", "106af2c99a5249b809aaed45b8353ac087821f4a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 13:57:18 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 13:57:18 2011 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "31111c26d976ca0f298312f08e44cdb078005b03", "tree": "ca08ef55b2ea91f9e69f8a78bb8b4363a1759b54", "parents": [ "0c0217b016ba8a970a6f6ab62ad0d858f39881ca", "2f5dc63123905a89d4260ab8ee08d19ec104db04" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 13:03:27 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 13:03:27 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n" }, { "commit": "2f5dc63123905a89d4260ab8ee08d19ec104db04", "tree": "1640ff192d42c3433daf99e6760d51f19ef3a3ac", "parents": [ "de81bbea17650769882bc625d6b5df11ee7c4b24" ], "author": { "name": "Florian Westphal", "email": "fwestphal@astaro.com", "time": "Tue Mar 15 20:17:44 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Mar 15 20:17:44 2011 +0100" }, "message": "netfilter: xt_addrtype: ipv6 support\n\nThe kernel will refuse certain types that do not work in ipv6 mode.\nWe can then add these features incrementally without risk of userspace\nbreakage.\n\nSigned-off-by: Florian Westphal \u003cfwestphal@astaro.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "de81bbea17650769882bc625d6b5df11ee7c4b24", "tree": "2e1250b7309977fc48b4f5b88f83959795f04591", "parents": [ "6a8ab060779779de8aea92ce3337ca348f973f54" ], "author": { "name": "Florian Westphal", "email": "fwestphal@astaro.com", "time": "Tue Mar 15 20:16:20 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Mar 15 20:16:20 2011 +0100" }, "message": "netfilter: ipt_addrtype: rename to xt_addrtype\n\nFollowup patch will add ipv6 support.\n\nipt_addrtype.h is retained for compatibility reasons, but no longer used\nby the kernel.\n\nSigned-off-by: Florian Westphal \u003cfwestphal@astaro.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "106af2c99a5249b809aaed45b8353ac087821f4a", "tree": "b9d13cc35cfdc3b763408287b4e50daf32fda53b", "parents": [ "0c0217b016ba8a970a6f6ab62ad0d858f39881ca", "7d2c16befae67b901e6750b845661c1fdffd19f1" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 15 14:16:48 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 15 14:16:48 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n" }, { "commit": "b09734b1f4abd86e046777f0f268215b4ef1b523", "tree": "991e7a2d61dc8c950dbbe6082cbb10dfc3786e75", "parents": [ "521cb40b0c44418a4fd36dc633f575813d59a43d" ], "author": { "name": "Tommi Virtanen", "email": "tommi.virtanen@dreamhost.com", "time": "Wed Feb 02 11:39:32 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Mar 15 09:14:02 2011 -0700" }, "message": "libceph: Fix base64-decoding when input ends in newline.\n\nIt used to return -EINVAL because it thought the end was not aligned\nto 4 bytes.\n\nClean up superfluous src \u003c end test in if, the while itself guarantees\nthat.\n\nSigned-off-by: Tommi Virtanen \u003ctommi.virtanen@dreamhost.com\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "c0aa4caf4c8b87fa85c67538974a14b07e81a23f", "tree": "2b7f98d7cbdcc0b2ab4498ba327d9c05094195d3", "parents": [ "db5841d4a505d1ecb087dc37462926a80511ae8b" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Mon Feb 28 17:03:59 2011 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:38 2011 -0500" }, "message": "net/9p: Implement syncfs 9P operation\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.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": "f735195d51e10b2550097f7b0ac12219060e962b", "tree": "96e752ebf09cad819b9f5dcb178fc016a4dfdd86", "parents": [ "ca41bb3e21d7b3cb2079e225e3a7e62e6c776518" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Wed Feb 16 12:54:22 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:36 2011 -0500" }, "message": "[net/9p] Small non-IO PDUs for zero-copy supporting transports.\n\nIf a transport prefers payload to be sent separate from the PDU\n(P9_TRANS_PREF_PAYLOAD_SEP), there is no need to allocate msize\nPDU buffers(struct p9_fcall).\n\nThis patch allocates only upto 4k buffers for this kind of transports\nand there won\u0027t be any change to the legacy transports.\n\nHence, this patch on top of zero copy changes allows user to\nspecify higher msizes through the mount option\nwithout hogging the kernel heap.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "ca41bb3e21d7b3cb2079e225e3a7e62e6c776518", "tree": "fa65d03bf9d4e8839631ae4a295ab3f1b7ba3e06", "parents": [ "2c66523fd290edeea26cbe8cedd0af167d0f7e5f" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Tue Feb 01 20:04:59 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:36 2011 -0500" }, "message": "[net/9p] Handle Zero Copy TREAD/RERROR case in !dotl case.\n\nThis takes care of copying out error buffers from user buffer\npayloads when we are using zero copy. This happens because the\nonly payload buffer the server has to respond to the request is\nthe user buffer given for the zero copy read.\n\nBecause we only use zerocopy when the amount of data to transfer\nis greater than a certain size (currently 4K) and error strings are\nlimited to ERRMAX (currently 128) we don\u0027t need to worry about there\nbeing sufficient space for the error to fit in the payload.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "2c66523fd290edeea26cbe8cedd0af167d0f7e5f", "tree": "e2658302dfce599cd42545d0487a5650a187c7bd", "parents": [ "1fc52481c2b886c445bb167dfd16ee6de6922ef7" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Wed Feb 16 18:43:20 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:35 2011 -0500" }, "message": "[net/9p] readdir zerocopy changes for 9P2000.L protocol.\n\nModify p9_client_readdir() to check the transport preference and act according\nIf the preference is P9_TRANS_PREF_PAYLOAD_SEP, send the payload\nseparately instead of putting it directly on PDU.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "1fc52481c2b886c445bb167dfd16ee6de6922ef7", "tree": "5d854af0b495441e02ef895570e3d8fac4b0a6a3", "parents": [ "bb2f8a55153ec58e66a496224504ac9be919c8f1" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Sun Feb 13 16:23:59 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:35 2011 -0500" }, "message": "[net/9p] Write side zerocopy changes for 9P2000.L protocol.\n\nModify p9_client_write() to check the transport preference and act accordingly.\nIf the preference is P9_TRANS_PREF_PAYLOAD_SEP, send the payload\nseparately instead of putting it directly on PDU.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "bb2f8a55153ec58e66a496224504ac9be919c8f1", "tree": "25a0d7b4d74b42ca6389fa8f4c41c9378ccd75de", "parents": [ "6f69c395cefb26ebba2c9bb725296a3a4a9200ec" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Fri Jan 28 17:05:59 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:35 2011 -0500" }, "message": "[net/9p] Read side zerocopy changes for 9P2000.L protocol.\n\nModify p9_client_read() to check the transport preference and act accordingly.\nIf the preference is P9_TRANS_PREF_PAYLOAD_SEP, send the payload\nseparately instead of putting it directly on PDU.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "6f69c395cefb26ebba2c9bb725296a3a4a9200ec", "tree": "7012a54d7bef23aef8a14b938d329d87609d8937", "parents": [ "4038866dab4e461e0ef144458bad9d70ce0c98c1" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Sun Feb 06 12:08:01 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:35 2011 -0500" }, "message": "[net/9p] Add preferences to transport layer.\n\nThis patch adds preferences field to the p9_trans_module.\nThrough this, now transport layer can express its preference about the\npayload. i.e if payload neds to be part of the PDU or it prefers it\nto be sent sepearetly so that the transport layer can handle it in\na better way.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "4038866dab4e461e0ef144458bad9d70ce0c98c1", "tree": "b1e90818632d5334a952d6b2d407523d36f22fcd", "parents": [ "9bb6c10a4ed48aef49a7243a6f798694722cf380" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Fri Jan 28 15:22:36 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:35 2011 -0500" }, "message": "[net/9p] Add gup/zero_copy support to VirtIO transport layer.\n\nModify p9_virtio_request() and req_done() functions to support\nadditional payload sent down to the transport layer through\ntc-\u003epubuf and tc-\u003epkbuf.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "9bb6c10a4ed48aef49a7243a6f798694722cf380", "tree": "8dc777ffee7f38513004a918589367a2f6117652", "parents": [ "022cae36551ba805bf82084047945b2901d75f36" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Wed Feb 02 17:52:46 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:34 2011 -0500" }, "message": "[net/9p] Assign type of transaction to tc-\u003epdu-\u003eid which is otherwise unsed.\n\nThis will be used by the transport layer to determine the out going\nrequest type. Transport layer uses this information to correctly\nplace the mapped pages in the PDU. Patches following this will make\nuse of this to achieve zero copy.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "022cae36551ba805bf82084047945b2901d75f36", "tree": "5d8a8ff0eb2102d0449f58ddfcb8907bd3625682", "parents": [ "6752a1ebd13f69b9d5ff08914fe29ee2813cbeea" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Fri Jan 28 14:11:13 2011 -0800" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Tue Mar 15 09:57:34 2011 -0500" }, "message": "[net/9p] Preparation and helper functions for zero copy\n\nThis patch prepares p9_fcall structure for zero copy. Added\nfields send the payload buffer information to the transport layer.\nIn addition it adds a \u0027private\u0027 field for the transport layer to\nstore mapped/pinned page information so that it can be freed/unpinned\nduring req_done.\n\nThis patch also creates trans_common.[ch] to house helper functions.\nIt adds the following helper functions.\n\np9_release_req_pages - Release pages after the transaction.\np9_nr_pages - Return number of pages needed to accomodate the payload.\npayload_gup - Translates user buffer into kernel pages.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "6a8ab060779779de8aea92ce3337ca348f973f54", "tree": "bdd3ebda1c8b1e75c32f6fa115ada1dcef18f1f4", "parents": [ "78b79876761b86653df89c48a7010b5cbd41a84a" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Tue Mar 15 13:37:13 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Mar 15 13:37:13 2011 +0100" }, "message": "ipv6: netfilter: ip6_tables: fix infoleak to userspace\n\nStructures ip6t_replace, compat_ip6t_replace, and xt_get_revision are\ncopied from userspace. Fields of these structs that are\nzero-terminated strings are not checked. When they are used as argument\nto a format string containing \"%s\" in request_module(), some sensitive\ninformation is leaked to userspace via argument of spawned modprobe\nprocess.\n\nThe first bug was introduced before the git epoch; the second was\nintroduced in 3bc3fe5e (v2.6.25-rc1); the third is introduced by\n6b7d31fc (v2.6.15-rc1). To trigger the bug one should have\nCAP_NET_ADMIN.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "78b79876761b86653df89c48a7010b5cbd41a84a", "tree": "8b2d66a823640ab1a5c7e31d4b27b69bfbb86cde", "parents": [ "42eab94fff18cb1091d3501cd284d6bd6cc9c143" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Tue Mar 15 13:36:05 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Mar 15 13:36:05 2011 +0100" }, "message": "netfilter: ip_tables: fix infoleak to userspace\n\nStructures ipt_replace, compat_ipt_replace, and xt_get_revision are\ncopied from userspace. Fields of these structs that are\nzero-terminated strings are not checked. When they are used as argument\nto a format string containing \"%s\" in request_module(), some sensitive\ninformation is leaked to userspace via argument of spawned modprobe\nprocess.\n\nThe first and the third bugs were introduced before the git epoch; the\nsecond was introduced in 2722971c (v2.6.17-rc1). To trigger the bug\none should have CAP_NET_ADMIN.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "42eab94fff18cb1091d3501cd284d6bd6cc9c143", "tree": "b30e101f5503847706a7aa24455d47f5e45cf7e1", "parents": [ "4656c4d61adb8dc3ee04c08f57a5cc7598814420" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Tue Mar 15 13:35:21 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Mar 15 13:35:21 2011 +0100" }, "message": "netfilter: arp_tables: fix infoleak to userspace\n\nStructures ipt_replace, compat_ipt_replace, and xt_get_revision are\ncopied from userspace. Fields of these structs that are\nzero-terminated strings are not checked. When they are used as argument\nto a format string containing \"%s\" in request_module(), some sensitive\ninformation is leaked to userspace via argument of spawned modprobe\nprocess.\n\nThe first bug was introduced before the git epoch; the second is\nintroduced by 6b7d31fc (v2.6.15-rc1); the third is introduced by\n6b7d31fc (v2.6.15-rc1). To trigger the bug one should have\nCAP_NET_ADMIN.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "4656c4d61adb8dc3ee04c08f57a5cc7598814420", "tree": "03c01d2bf4e56fa33ede99f8128839727d3878af", "parents": [ "3e0d5149e6dcbe7111a63773a07c5b33f7ca7236" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Mar 15 13:26:32 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Mar 15 13:26:32 2011 +0100" }, "message": "netfilter: xt_connlimit: remove connlimit_rnd_inited\n\nA potential race condition when generating connlimit_rnd is also fixed.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" } ], "next": "3e0d5149e6dcbe7111a63773a07c5b33f7ca7236" }