)]}' { "log": [ { "commit": "d25282d1c9b9bc4cda7f9d3c0205108e99aa7a9d", "tree": "f414482d768b015a609924293b779b4ad0b8f764", "parents": [ "b6eea87fc6850d3531a64a27d2323a4498cd4e43", "dbadc17683e6c673a69b236c0f041b931cc55c42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 14 13:39:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 14 13:39:34 2012 -0700" }, "message": "Merge branch \u0027modules-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull module signing support from Rusty Russell:\n \"module signing is the highlight, but it\u0027s an all-over David Howells frenzy...\"\n\nHmm \"Magrathea: Glacier signing key\". Somebody has been reading too much HHGTTG.\n\n* \u0027modules-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (37 commits)\n X.509: Fix indefinite length element skip error handling\n X.509: Convert some printk calls to pr_devel\n asymmetric keys: fix printk format warning\n MODSIGN: Fix 32-bit overflow in X.509 certificate validity date checking\n MODSIGN: Make mrproper should remove generated files.\n MODSIGN: Use utf8 strings in signer\u0027s name in autogenerated X.509 certs\n MODSIGN: Use the same digest for the autogen key sig as for the module sig\n MODSIGN: Sign modules during the build process\n MODSIGN: Provide a script for generating a key ID from an X.509 cert\n MODSIGN: Implement module signature checking\n MODSIGN: Provide module signing public keys to the kernel\n MODSIGN: Automatically generate module signing keys if missing\n MODSIGN: Provide Kconfig options\n MODSIGN: Provide gitignore and make clean rules for extra files\n MODSIGN: Add FIPS policy\n module: signature checking hook\n X.509: Add a crypto key parser for binary (DER) X.509 certificates\n MPILIB: Provide a function to read raw data into an MPI\n X.509: Add an ASN.1 decoder\n X.509: Add simple ASN.1 grammar compiler\n ...\n" }, { "commit": "09a9ad6a1ff86836e5280c39300176c4758bb459", "tree": "27967b60cbb53def07f4ceb8365efb8206c2a777", "parents": [ "9db908806b85c1430150fbafe269a7b21b07d15d", "e9069f470803eeb5e243a05bc717452c6218bd71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 13 13:23:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 13 13:23:39 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace compile fixes from Eric W Biederman:\n \"This tree contains three trivial fixes. One compiler warning, one\n thinko fix, and one build fix\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:\n btrfs: Fix compilation with user namespace support enabled\n userns: Fix posix_acl_file_xattr_userns gid conversion\n userns: Properly print bluetooth socket uids\n" }, { "commit": "bd81ccea8558daab570d70d2c23746413f26cecf", "tree": "a3a75dde2dc3cf26c74353b21792da30d65d7c13", "parents": [ "98260daa184c4a171834463cf85ab3a2c509d983", "a9ca4043d074509b9d15003fbcb068d3cdae85a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 13 10:53:54 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 13 10:53:54 2012 +0900" }, "message": "Merge branch \u0027for-3.7\u0027 of git://linux-nfs.org/~bfields/linux\n\nPull nfsd update from J Bruce Fields:\n \"Another relatively quiet cycle. There was some progress on my\n remaining 4.1 todo\u0027s, but a couple of them were just of the form\n \"check that we do X correctly\", so didn\u0027t have much affect on the\n code.\n\n Other than that, a bunch of cleanup and some bugfixes (including an\n annoying NFSv4.0 state leak and a busy-loop in the server that could\n cause it to peg the CPU without making progress).\"\n\n* \u0027for-3.7\u0027 of git://linux-nfs.org/~bfields/linux: (46 commits)\n UAPI: (Scripted) Disintegrate include/linux/sunrpc\n UAPI: (Scripted) Disintegrate include/linux/nfsd\n nfsd4: don\u0027t allow reclaims of expired clients\n nfsd4: remove redundant callback probe\n nfsd4: expire old client earlier\n nfsd4: separate session allocation and initialization\n nfsd4: clean up session allocation\n nfsd4: minor free_session cleanup\n nfsd4: new_conn_from_crses should only allocate\n nfsd4: separate connection allocation and initialization\n nfsd4: reject bad forechannel attrs earlier\n nfsd4: enforce per-client sessions/no-sessions distinction\n nfsd4: set cl_minorversion at create time\n nfsd4: don\u0027t pin clientids to pseudoflavors\n nfsd4: fix bind_conn_to_session xdr comment\n nfsd4: cast readlink() bug argument\n NFSD: pass null terminated buf to kstrtouint()\n nfsd: remove duplicate init in nfsd4_cb_recall\n nfsd4: eliminate redundant nfs4_free_stateid\n fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR\n ...\n" }, { "commit": "98260daa184c4a171834463cf85ab3a2c509d983", "tree": "318c3bfff9edef4da84a69895a3ac2aa39b8256a", "parents": [ "e225ca27057e70e7cbb14ae4c1e5f758973af645", "dabdaf0caa3af520dbc1df87b2fb4e77224037bd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 13 10:51:48 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 13 10:51:48 2012 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking updates from David Miller:\n\n 1) Alexey Kuznetsov noticed we routed TCP resets improperly in the\n assymetric routing case, fix this by reverting a change that made us\n use the incoming interface in the outgoing route key when we didn\u0027t\n have a socket context to work with.\n\n 2) TCP sysctl kernel memory leakage to userspace fix from Alan Cox.\n\n 3) Move UAPI bits from David Howells, WIMAX and CAN this time.\n\n 4) Fix TX stalls in e1000e wrt. Byte Queue Limits, from Hiroaki\n SHIMODA, Denys Fedoryshchenko, and Jesse Brandeburg.\n\n 5) Fix IPV6 crashes in packet generator module, from Amerigo Wang.\n\n 6) Tidies and fixes in the new VXLAN driver from Stephen Hemminger.\n\n 7) Bridge IP options parse doesn\u0027t check first if SKB header has at\n least an IP header\u0027s worth of content present. Fix from Sarveshwar\n Bandi.\n\n 8) The kernel now generates compound pages on transmit and the Xen\n netback drivers needs some adjustments in order to handle this. Fix\n from Ian Campbell.\n\n 9) Turn off ASPM in JME driver, from Kevin Bardon and Matthew Garrett.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)\n mcs7830: Fix link state detection\n net: add doc for in4_pton()\n net: add doc for in6_pton()\n vti: fix sparse bit endian warnings\n tcp: resets are misrouted\n usbnet: Support devices reporting idleness\n Add CDC-ACM support for the CX93010-2x UCMxx USB Modem\n net/ethernet/jme: disable ASPM\n tcp: sysctl interface leaks 16 bytes of kernel memory\n kaweth: print correct debug ptr\n e1000e: Change wthresh to 1 to avoid possible Tx stalls\n ipv4: fix route mark sparse warning\n xen: netback: handle compound page fragments on transmit.\n bridge: Pull ip header into skb-\u003edata before looking into ip header.\n isdn: fix a wrapping bug in isdn_ppp_ioctl()\n vxlan: fix oops when give unknown ifindex\n vxlan: fix receive checksum handling\n vxlan: add additional headroom\n vxlan: allow configuring port range\n vxlan: associate with tunnel socket on transmit\n ...\n" }, { "commit": "1bbb3095a5912be4b9c90397ef2182a5a328865b", "tree": "058cb0bdd84699fa98cd173f381e711400507fde", "parents": [ "ccff9b1db693062b0a9c9070f4304deb47ef215c" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Oct 03 20:32:17 2012 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Oct 12 13:16:47 2012 -0700" }, "message": "userns: Properly print bluetooth socket uids\n\nWith user namespace support enabled building bluetooth generated the warning.\nnet/bluetooth/af_bluetooth.c: In function ‘bt_seq_show’:\nnet/bluetooth/af_bluetooth.c:598:7: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 7 has type ‘kuid_t’ [-Wformat]\n\nConvert sock_i_uid from a kuid_t to a uid_t before printing, to avoid\nthis problem.\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nCc: Masatake YAMATO \u003cyamato@redhat.com\u003e\nCc: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\n" }, { "commit": "93ac0ef016a1b223d23fbb5e0397cab75a8f7d34", "tree": "c5e4199d447064d4da2b4e786b94469332444eaa", "parents": [ "28194fcdc150e4d5b418d01db3c29058f60ef32c" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu Oct 11 21:06:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 12 13:56:52 2012 -0400" }, "message": "net: add doc for in4_pton()\n\nIt is not easy to use in4_pton() correctly without reading\nits definition, so add some doc for it.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28194fcdc150e4d5b418d01db3c29058f60ef32c", "tree": "9988b666e6551dff9f032f390ffe23a20b4c5227", "parents": [ "8437e7610c2d3e06f87f71fb82e10ed4b291812a" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu Oct 11 21:06:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 12 13:56:52 2012 -0400" }, "message": "net: add doc for in6_pton()\n\nIt is not easy to use in6_pton() correctly without reading\nits definition, so add some doc for it.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8437e7610c2d3e06f87f71fb82e10ed4b291812a", "tree": "87fa039c243e134d04eb8ff6d6bb99c6e0ddbd39", "parents": [ "4c67525849e0b7f4bd4fab2487ec9e43ea52ef29" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Oct 11 12:51:28 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 12 13:56:52 2012 -0400" }, "message": "vti: fix sparse bit endian warnings\n\nUse be32_to_cpu instead of htonl to keep sparse happy.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c67525849e0b7f4bd4fab2487ec9e43ea52ef29", "tree": "9c508670c74b189f45f1b59936234e83aced2eb0", "parents": [ "5d9d01a30204c99edf99189018953ee84c5f5017" ], "author": { "name": "Alexey Kuznetsov", "email": "kuznet@ms2.inr.ac.ru", "time": "Fri Oct 12 04:34:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 12 13:52:40 2012 -0400" }, "message": "tcp: resets are misrouted\n\nAfter commit e2446eaa (\"tcp_v4_send_reset: binding oif to iif in no\nsock case\").. tcp resets are always lost, when routing is asymmetric.\nYes, backing out that patch will result in misrouting of resets for\ndead connections which used interface binding when were alive, but we\nactually cannot do anything here. What\u0027s died that\u0027s died and correct\nhandling normal unbound connections is obviously a priority.\n\nComment to comment:\n\u003e This has few benefits:\n\u003e 1. tcp_v6_send_reset already did that.\n\nIt was done to route resets for IPv6 link local addresses. It was a\nmistake to do so for global addresses. The patch fixes this as well.\n\nActually, the problem appears to be even more serious than guaranteed\nloss of resets. As reported by Sergey Soloviev \u003csol@eqv.ru\u003e, those\nmisrouted resets create a lot of arp traffic and huge amount of\nunresolved arp entires putting down to knees NAT firewalls which use\nasymmetric routing.\n\nSigned-off-by: Alexey Kuznetsov \u003ckuznet@ms2.inr.ac.ru\u003e\n" }, { "commit": "940e3a8dd6683a3787faf769b3df7a06f1c2fa31", "tree": "5f722b4a63fcaf288e2689576d75c16e0dfc700d", "parents": [ "12250d843e8489ee00b5b7726da855e51694e792", "759f42987f98915764bad922ee123acb0eadbe33" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 12 09:59:23 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 12 09:59:23 2012 +0900" }, "message": "Merge tag \u0027for-linus-merge-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\nPull v9fs update from Eric Van Hensbergen.\n\n* tag \u0027for-linus-merge-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n 9P: Fix race between p9_write_work() and p9_fd_request()\n 9P: Fix race in p9_write_work()\n 9P: fix test at the end of p9_write_work()\n 9P: Fix race in p9_read_work()\n 9p: don\u0027t use __getname/__putname for uname/aname\n net/9p: Check errno validity\n fs/9p: avoid debug OOPS when reading a long symlink\n" }, { "commit": "0e24c4fc52b16f0a1102a933f636d2f350c41098", "tree": "8d70e83af6991d7d997a9638602618e59e12f718", "parents": [ "0abc1ceec52fcb9f962a2cd52e89baccccbc1d2e" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Oct 11 06:24:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 11 15:12:33 2012 -0400" }, "message": "tcp: sysctl interface leaks 16 bytes of kernel memory\n\nIf the rc_dereference of tcp_fastopen_ctx ever fails then we copy 16 bytes\nof kernel stack into the proc result.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "759f42987f98915764bad922ee123acb0eadbe33", "tree": "57968c56307e7ea636a7558b15edb669dfb14399", "parents": [ "584a8c13d58423462680907d4cc40d9929c9030a" ], "author": { "name": "Simon Derr", "email": "simon.derr@bull.net", "time": "Mon Sep 17 15:16:31 2012 +0200" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Thu Oct 11 12:03:31 2012 -0500" }, "message": "9P: Fix race between p9_write_work() and p9_fd_request()\n\nRace scenario:\n\nthread A\t\t\tthread B\n\np9_write_work() p9_fd_request()\n\nif (list_empty\n (\u0026m-\u003eunsent_req_list))\n ...\n\n spin_lock(\u0026client-\u003elock);\n req-\u003estatus \u003d REQ_STATUS_UNSENT;\n list_add_tail(..., \u0026m-\u003eunsent_req_list);\n spin_unlock(\u0026client-\u003elock);\n ....\n if (n \u0026 POLLOUT \u0026\u0026\n !test_and_set_bit(Wworksched, \u0026m-\u003ewsched)\n schedule_work(\u0026m-\u003ewq);\n --\u003e not done because Wworksched is set\n\n clear_bit(Wworksched, \u0026m-\u003ewsched);\n return;\n\n--\u003e nobody will take care of sending the new request.\n\nThis is not very likely to happen though, because p9_write_work()\nbeing called with an empty unsent_req_list is not frequent.\nBut this also means that taking the lock earlier will not be costly.\n\nSigned-off-by: Simon Derr \u003csimon.derr@bull.net\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "a9ca4043d074509b9d15003fbcb068d3cdae85a4", "tree": "7da7c54ea167f7c6786c2eac7a6aecff97c77322", "parents": [ "f474af7051212b4efc8267583fad9c4ebf33ccff", "62d98c935456ee121b03d6a68aa3091a04085b7e" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Thu Oct 11 12:40:00 2012 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Thu Oct 11 12:41:05 2012 -0400" }, "message": "Merge Trond\u0027s bugfixes\n\nMerge branch \u0027bugfixes\u0027 of git://linux-nfs.org/~trondmy/nfs-2.6 into\nfor-3.7-incoming. Mainly needed for Bryan\u0027s \"SUNRPC: Set alloc_slot for\nbackchannel tcp ops\", without which the 4.1 server oopses.\n" }, { "commit": "68aaed54e7682aef261d5c2cf99e85a9dbf33a84", "tree": "d71ae8f7296be4bc370174829ed2438c14a469c4", "parents": [ "6a8ed462f16b8455eec5ae00eb6014159a6721f0" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Oct 10 08:27:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 22:54:59 2012 -0400" }, "message": "ipv4: fix route mark sparse warning\n\nSparse complains about RTA_MARK which is should be host order according\nto include file and usage in iproute.\n\nnet/ipv4/route.c:2223:46: warning: incorrect type in argument 3 (different base types)\nnet/ipv4/route.c:2223:46: expected restricted __be32 [usertype] value\nnet/ipv4/route.c:2223:46: got unsigned int [unsigned] [usertype] flowic_mark\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6caab7b0544e83e6c160b5e80f5a4a7dd69545c7", "tree": "a46d917a1365ab6e2e2367c48f015bee45b20b5b", "parents": [ "435f08a721919a0027ff4f39f0b51c141c0e2c29" ], "author": { "name": "Sarveshwar Bandi", "email": "sarveshwar.bandi@emulex.com", "time": "Wed Oct 10 01:15:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 22:50:45 2012 -0400" }, "message": "bridge: Pull ip header into skb-\u003edata before looking into ip header.\n\nIf lower layer driver leaves the ip header in the skb fragment, it needs to\nbe first pulled into skb-\u003edata before inspecting ip header length or ip version\nnumber.\n\nSigned-off-by: Sarveshwar Bandi \u003csarveshwar.bandi@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c468fb1375f1b4de851e3e0dbe9d1293d414a160", "tree": "3cba4fd06f4ad6967663fd46dabcc397afc58c4a", "parents": [ "4c139b8ccebaecdfad58eb068d61ef386f1a58ed" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Oct 09 17:48:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 22:33:30 2012 -0400" }, "message": "pktgen: replace scan_ip6() with in6_pton()\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c139b8ccebaecdfad58eb068d61ef386f1a58ed", "tree": "f21b439a3348114f3be4434f40f9236375b4ee75", "parents": [ "0373a94671be1f5c823dbfc03617418d8effd5ce" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Oct 09 17:48:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 22:33:30 2012 -0400" }, "message": "pktgen: enable automatic IPv6 address setting\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0373a94671be1f5c823dbfc03617418d8effd5ce", "tree": "0c60952ed8a87886238b7d1093b45780958c33fc", "parents": [ "68bf9f0b91ed4440951312cf7d4ffa70b9e8cf73" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Oct 09 17:48:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 22:33:30 2012 -0400" }, "message": "pktgen: display IPv4 address in human-readable format\n\nIt is weird to display IPv4 address in %x format, what\u0027s more,\nIPv6 address is disaplayed in human-readable format too. So,\nmake it human-readable.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68bf9f0b91ed4440951312cf7d4ffa70b9e8cf73", "tree": "7cadb1cdf9994926cd8c573bdc63b619b256178d", "parents": [ "5aa8b572007c4bca1e6d3dd4c4820f1ae49d6bb2" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Oct 09 17:48:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 22:33:30 2012 -0400" }, "message": "pktgen: set different default min_pkt_size for different protocols\n\nETH_ZLEN is too small for IPv6, so this default value is not\nsuitable.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5aa8b572007c4bca1e6d3dd4c4820f1ae49d6bb2", "tree": "81f64cc4441a8677763b89aff0df1fba8080b184", "parents": [ "85457685e0e314f6902caaef976b3fd8ef4f51b4" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Oct 09 17:48:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 22:33:30 2012 -0400" }, "message": "pktgen: fix crash when generating IPv6 packets\n\nFor IPv6, sizeof(struct ipv6hdr) \u003d 40, thus the following\nexpression will result negative:\n\n datalen \u003d pkt_dev-\u003ecur_pkt_size - 14 -\n sizeof(struct ipv6hdr) - sizeof(struct udphdr) -\n pkt_dev-\u003epkt_overhead;\n\nAnd, the check \"if (datalen \u003c sizeof(struct pktgen_hdr))\" will be\npassed as \"datalen\" is promoted to unsigned, therefore will cause\na crash later.\n\nThis is a quick fix by checking if \"datalen\" is negative. The following\npatch will increase the default value of \u0027min_pkt_size\u0027 for IPv6.\n\nThis bug should exist for a long time, so Cc -stable too.\n\nCc: \u003cstable@vger.kernel.org\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "85457685e0e314f6902caaef976b3fd8ef4f51b4", "tree": "a5610b82fdf0a9f2b315cab37656ab97abf93a38", "parents": [ "2474542f64432398f503373f53bdf620491bcfa8", "c3e7724b6bc2f25e46c38dbe68f09d71fafeafb8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 11:59:54 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 10 11:59:54 2012 -0400" }, "message": "Merge tag \u0027master-2012-10-08\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nJohn W. Linville says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nHere is a batch of fixes intended for 3.7...\n\nAmitkumar Karwar provides a couple of mwifiex fixes to correctly\nreport some reason codes for certain connection failures. He also\nprovides a fix to cleanup after a scanning failure. Bing Zhao rounds\nthat out with another mwifiex scanning fix.\n\nDaniel Golle gives us a fix for a copy/paste error in rt2x00.\n\nFelix Fietkau brings a couple of ath9k fixes related to suspend/resume,\nand a couple of fixes to prevent memory leaks in ath9k and mac80211.\n\nRonald Wahl sends a carl9170 fix for a sleep in softirq context.\n\nThomas Pedersen reorders some code to prevent drv_get_tsf from being\ncalled while holding a spinlock, now that it can sleep.\n\nFinally, Wei Yongjun prevents a NULL pointer dereference in the\nath5k driver.\n\nPlease let me know if there are problems!\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "df632d3ce7eacf92ad9b642301c7b53a1d95b8d8", "tree": "848c39ed4f7cfdb582bf2e0a0a03147efaa5198d", "parents": [ "2474542f64432398f503373f53bdf620491bcfa8", "af283885b70248268617955a5ea5476647bd556b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 10 23:52:35 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 10 23:52:35 2012 +0900" }, "message": "Merge tag \u0027nfs-for-3.7-1\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client updates from Trond Myklebust:\n \"Features include:\n\n - Remove CONFIG_EXPERIMENTAL dependency from NFSv4.1\n Aside from the issues discussed at the LKS, distros are shipping\n NFSv4.1 with all the trimmings.\n - Fix fdatasync()/fsync() for the corner case of a server reboot.\n - NFSv4 OPEN access fix: finally distinguish correctly between\n open-for-read and open-for-execute permissions in all situations.\n - Ensure that the TCP socket is closed when we\u0027re in CLOSE_WAIT\n - More idmapper bugfixes\n - Lots of pNFS bugfixes and cleanups to remove unnecessary state and\n make the code easier to read.\n - In cases where a pNFS read or write fails, allow the client to\n resume trying layoutgets after two minutes of read/write-\n through-mds.\n - More net namespace fixes to the NFSv4 callback code.\n - More net namespace fixes to the NFSv3 locking code.\n - More NFSv4 migration preparatory patches.\n Including patches to detect network trunking in both NFSv4 and\n NFSv4.1\n - pNFS block updates to optimise LAYOUTGET calls.\"\n\n* tag \u0027nfs-for-3.7-1\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (113 commits)\n pnfsblock: cleanup nfs4_blkdev_get\n NFS41: send real read size in layoutget\n NFS41: send real write size in layoutget\n NFS: track direct IO left bytes\n NFSv4.1: Cleanup ugliness in pnfs_layoutgets_blocked()\n NFSv4.1: Ensure that the layout sequence id stays \u0027close\u0027 to the current\n NFSv4.1: Deal with seqid wraparound in the pNFS return-on-close code\n NFSv4 set open access operation call flag in nfs4_init_opendata_res\n NFSv4.1: Remove the dependency on CONFIG_EXPERIMENTAL\n NFSv4 reduce attribute requests for open reclaim\n NFSv4: nfs4_open_done first must check that GETATTR decoded a file type\n NFSv4.1: Deal with wraparound when updating the layout \"barrier\" seqid\n NFSv4.1: Deal with wraparound issues when updating the layout stateid\n NFSv4.1: Always set the layout stateid if this is the first layoutget\n NFSv4.1: Fix another refcount issue in pnfs_find_alloc_layout\n NFSv4: don\u0027t put ACCESS in OPEN compound if O_EXCL\n NFSv4: don\u0027t check MAY_WRITE access bit in OPEN\n NFS: Set key construction data for the legacy upcall\n NFSv4.1: don\u0027t do two EXCHANGE_IDs on mount\n NFS: nfs41_walk_client_list(): re-lock before iterating\n ...\n" }, { "commit": "f474af7051212b4efc8267583fad9c4ebf33ccff", "tree": "1aa46ebc8065a341f247c2a2d9af2f624ad1d4f8", "parents": [ "0d22f68f02c10d5d10ec5712917e5828b001a822", "e3dd9a52cb5552c46c2a4ca7ccdfb4dab5c72457" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Oct 09 18:35:22 2012 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Oct 09 18:35:22 2012 -0400" }, "message": "nfs: disintegrate UAPI for nfs\n\nThis is to complete part of the Userspace API (UAPI) disintegration for which\nthe preparatory patches were pulled recently. After these patches, userspace\nheaders will be segregated into:\n\n include/uapi/linux/.../foo.h\n\nfor the userspace interface stuff, and:\n\n include/linux/.../foo.h\n\nfor the strictly kernel internal stuff.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "5175a5e76bbdf20a614fb47ce7a38f0f39e70226", "tree": "83a7113b1b7fd3f6d7b2222d66884da291afe328", "parents": [ "4085a7f0a09c73ef3e9de113c9f04d78c79be645" ], "author": { "name": "jeff.liu", "email": "jeff.liu@oracle.com", "time": "Mon Oct 08 18:57:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 09 13:57:23 2012 -0400" }, "message": "RDS: fix rds-ping spinlock recursion\n\nThis is the revised patch for fixing rds-ping spinlock recursion\naccording to Venkat\u0027s suggestions.\n\nRDS ping/pong over TCP feature has been broken for years(2.6.39 to\n3.6.0) since we have to set TCP cork and call kernel_sendmsg() between\nping/pong which both need to lock \"struct sock *sk\". However, this\nlock has already been hold before rds_tcp_data_ready() callback is\ntriggerred. As a result, we always facing spinlock resursion which\nwould resulting in system panic.\n\nGiven that RDS ping is only used to test the connectivity and not for\nserious performance measurements, we can queue the pong transmit to\nrds_wq as a delayed response.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nCC: Venkat Venkatsubra \u003cvenkat.x.venkatsubra@oracle.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: James Morris \u003cjames.l.morris@oracle.com\u003e\nSigned-off-by: Jie Liu \u003cjeff.liu@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8dd9117cc7a021ced1c5cf177e2d44dd92b88617", "tree": "cad990f58f9ec6d400226dda86718fc10781416e", "parents": [ "16e310ae6ed352c4963b1f2413fcd88fa693eeda", "547b1e81afe3119f7daf702cc03b158495535a25" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 09 13:14:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 09 13:14:32 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux\n\nPulled mainline in order to get the UAPI infrastructure already\nmerged before I pull in David Howells\u0027s UAPI trees for networking.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c199a93a2d36b277a9fd209a0f2793f8460a215", "tree": "b7d6af9220ef445eb4a9f5f0966a3bc5306fe513", "parents": [ "1457d2877864d918c546735bd89c29d5e2a542f1" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Mon Oct 08 16:30:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:32 2012 +0900" }, "message": "rbtree: empty nodes have no color\n\nEmpty nodes have no color. We can make use of this property to simplify\nthe code emitted by the RB_EMPTY_NODE and RB_CLEAR_NODE macros. Also,\nwe can get rid of the rb_init_node function which had been introduced by\ncommit 88d19cf37952 (\"timers: Add rb_init_node() to allow for stack\nallocated rb nodes\") to avoid some issue with the empty node\u0027s color not\nbeing initialized.\n\nI\u0027m not sure what the RB_EMPTY_NODE checks in rb_prev() / rb_next() are\ndoing there, though. axboe introduced them in commit 10fd48f2376d\n(\"rbtree: fixed reversed RB_EMPTY_NODE and rb_next/prev\"). The way I\nsee it, the \u0027empty node\u0027 abstraction is only used by rbtree users to\nflag nodes that they haven\u0027t inserted in any rbtree, so asking the\npredecessor or successor of such nodes doesn\u0027t make any sense.\n\nOne final rb_init_node() caller was recently added in sysctl code to\nimplement faster sysctl name lookups. This code doesn\u0027t make use of\nRB_EMPTY_NODE at all, and from what I could see it only called\nrb_init_node() under the mistaken assumption that such initialization was\nrequired before node insertion.\n\n[sfr@canb.auug.org.au: fix net/ceph/osd_client.c build]\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Daniel Santos \u003cdaniel.santos@pobox.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ad4d3ef8b7eb527cca478dc08c02c10936e64115", "tree": "530706cd517a8810cb0ccea44ebccc6c19d875bd", "parents": [ "c92b96553a80c1dbe2ebe128bbe37c8f98f148bf" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:36 2012 -0400" }, "message": "ipvs: fix ARP resolving for direct routing mode\n\nAfter the change \"Make neigh lookups directly in output packet path\"\n(commit a263b30936) IPVS can not reach the real server for DR mode\nbecause we resolve the destination address from IP header, not from\nroute neighbour. Use the new FLOWI_FLAG_KNOWN_NH flag to request\noutput routes with known nexthop, so that it has preference\non resolving.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c92b96553a80c1dbe2ebe128bbe37c8f98f148bf", "tree": "2c08aaddff418e7be5c0674aeb9e4b94ec538179", "parents": [ "155e8336c373d14d87a7f91e356d85ef4b93b8f9" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:36 2012 -0400" }, "message": "ipv4: Add FLOWI_FLAG_KNOWN_NH\n\nAdd flag to request that output route should be\nreturned with known rt_gateway, in case we want to use\nit as nexthop for neighbour resolving.\n\n\tThe returned route can be cached as follows:\n\n- in NH exception: because the cached routes are not shared\n\twith other destinations\n- in FIB NH: when using gateway because all destinations for\n\tNH share same gateway\n\n\tAs last option, to return rt_gateway!\u003d0 we have to\nset DST_NOCACHE.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "155e8336c373d14d87a7f91e356d85ef4b93b8f9", "tree": "5d31e9d9c197129fcf26fd8ae9d54da770503a6c", "parents": [ "f8a17175c63fd3e8b573719f7538816f8c96abf4" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:36 2012 -0400" }, "message": "ipv4: introduce rt_uses_gateway\n\nAdd new flag to remember when route is via gateway.\nWe will use it to allow rt_gateway to contain address of\ndirectly connected host for the cases when DST_NOCACHE is\nused or when the NH exception caches per-destination route\nwithout DST_NOCACHE flag, i.e. when routes are not used for\nother destinations. By this way we force the neighbour\nresolving to work with the routed destination but we\ncan use different address in the packet, feature needed\nfor IPVS-DR where original packet for virtual IP is routed\nvia route to real IP.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8a17175c63fd3e8b573719f7538816f8c96abf4", "tree": "5f592b7613c48716dc1a88bfd688129d24e62324", "parents": [ "e0adef0f7456d5d3a3bfe8ea61c7dddf146b40e1" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:35 2012 -0400" }, "message": "ipv4: make sure nh_pcpu_rth_output is always allocated\n\nAvoid checking nh_pcpu_rth_output in fast path,\nabort fib_info creation on alloc_percpu failure.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0adef0f7456d5d3a3bfe8ea61c7dddf146b40e1", "tree": "b8b38b6fac97938a9d1a470969e422de49ddb382", "parents": [ "e81da0e113a1b7fc7449ae6213f65f89ccac6d06" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:35 2012 -0400" }, "message": "ipv4: fix forwarding for strict source routes\n\nAfter the change \"Adjust semantics of rt-\u003ert_gateway\"\n(commit f8126f1d51) rt_gateway can be 0 but ip_forward() compares\nit directly with nexthop. What we want here is to check if traffic\nis to directly connected nexthop and to fail if using gateway.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e81da0e113a1b7fc7449ae6213f65f89ccac6d06", "tree": "3d5bb2401d12017decf57263936784aa809e524a", "parents": [ "863472454ce50d4ef0929c6aa738cc5d64b84679" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:35 2012 -0400" }, "message": "ipv4: fix sending of redirects\n\nAfter \"Cache input routes in fib_info nexthops\" (commit\nd2d68ba9fe) and \"Elide fib_validate_source() completely when possible\"\n(commit 7a9bc9b81a) we can not send ICMP redirects. It seems we\nshould not cache the RTCF_DOREDIRECT flag in nh_rth_input because\nthe same fib_info can be used for traffic that is not redirected,\neg. from other input devices or from sources that are not in same subnet.\n\n\tAs result, we have to disable the caching of RTCF_DOREDIRECT\nflag and to force source validation for the case when forwarding\ntraffic to the input device. If traffic comes from directly connected\nsource we allow redirection as it was done before both changes.\n\n\tAvoid setting RTCF_DOREDIRECT if IN_DEV_TX_REDIRECTS\nis disabled, this can avoid source address validation and to\nhelp caching the routes.\n\n\tAfter the change \"Adjust semantics of rt-\u003ert_gateway\"\n(commit f8126f1d51) we should make sure our ICMP_REDIR_HOST messages\ncontain daddr instead of 0.0.0.0 when target is directly connected.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "863472454ce50d4ef0929c6aa738cc5d64b84679", "tree": "10a938801074b41e53c8237c92390e745b47a521", "parents": [ "48cc32d38a52d0b68f91a171a8d00531edc6a46e" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Oct 08 21:38:50 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 15:40:43 2012 -0400" }, "message": "ipv6: gro: fix PV6_GRO_CB(skb)-\u003eproto problem\n\nIt seems IPV6_GRO_CB(skb)-\u003eproto can be destroyed in skb_gro_receive()\nif a new skb is allocated (to serve as an anchor for frag_list)\n\nWe copy NAPI_GRO_CB() only (not the IPV6 specific part) in :\n\n*NAPI_GRO_CB(nskb) \u003d *NAPI_GRO_CB(p);\n\nSo we leave IPV6_GRO_CB(nskb)-\u003eproto to 0 (fresh skb allocation) instead\nof IPPROTO_TCP (6)\n\nipv6_gro_complete() isnt able to call ops-\u003egro_complete()\n[ tcp6_gro_complete() ]\n\nFix this by moving proto in NAPI_GRO_CB() and getting rid of\nIPV6_GRO_CB\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "48cc32d38a52d0b68f91a171a8d00531edc6a46e", "tree": "780c4919aeda44d0c6859b840a29847aeb792d1a", "parents": [ "2e71a6f8084e7ac87166dd77d99c44190fb844fc" ], "author": { "name": "Florian Zumbiehl", "email": "florz@florz.de", "time": "Sun Oct 07 15:51:58 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 15:21:55 2012 -0400" }, "message": "vlan: don\u0027t deliver frames for unknown vlans to protocols\n\n6a32e4f9dd9219261f8856f817e6655114cfec2f made the vlan code skip marking\nvlan-tagged frames for not locally configured vlans as PACKET_OTHERHOST if\nthere was an rx_handler, as the rx_handler could cause the frame to be received\non a different (virtual) vlan-capable interface where that vlan might be\nconfigured.\n\nAs rx_handlers do not necessarily return RX_HANDLER_ANOTHER, this could cause\nframes for unknown vlans to be delivered to the protocol stack as if they had\nbeen received untagged.\n\nFor example, if an ipv6 router advertisement that\u0027s tagged for a locally not\nconfigured vlan is received on an interface with macvlan interfaces attached,\nmacvlan\u0027s rx_handler returns RX_HANDLER_PASS after delivering the frame to the\nmacvlan interfaces, which caused it to be passed to the protocol stack, leading\nto ipv6 addresses for the announced prefix being configured even though those\nare completely unusable on the underlying interface.\n\nThe fix moves marking as PACKET_OTHERHOST after the rx_handler so the\nrx_handler, if there is one, sees the frame unchanged, but afterwards,\nbefore the frame is delivered to the protocol stack, it gets marked whether\nthere is an rx_handler or not.\n\nSigned-off-by: Florian Zumbiehl \u003cflorz@florz.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c3e7724b6bc2f25e46c38dbe68f09d71fafeafb8", "tree": "c53c47afd35c31d170f0c9f339178e549883c9c1", "parents": [ "5bcbc3fcbd88842765aa419934602d3930c6ed3c" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Oct 08 14:39:33 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 08 15:06:05 2012 -0400" }, "message": "mac80211: use ieee80211_free_txskb to fix possible skb leaks\n\nA few places free skbs using dev_kfree_skb even though they\u0027re called\nafter ieee80211_subif_start_xmit might have cloned it for tracking tx\nstatus. Use ieee80211_free_txskb here to prevent skb leaks.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "55fabefe3695241e6ccfa0cd4974f3fa497693dc", "tree": "eb6bb131022cac1457e760b1b94bc7ae25e38408", "parents": [ "cf193f6d2ad322cdec1872b28d761db8d22e5c00" ], "author": { "name": "Thomas Pedersen", "email": "thomas@cozybit.com", "time": "Fri Oct 05 17:57:39 2012 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 08 15:06:02 2012 -0400" }, "message": "mac80211: call drv_get_tsf() in sleepable context\n\nThe call to drv_get/set_tsf() was put on the workqueue to perform tsf\nadjustments since that function might sleep. However it ended up inside\na spinlock, whose critical section must be atomic. Do tsf adjustment\noutside the spinlock instead, and get rid of a warning.\n\nSigned-off-by: Thomas Pedersen \u003cthomas@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2e71a6f8084e7ac87166dd77d99c44190fb844fc", "tree": "eb2e2d47361b35b2b5a3f26beac3d1fbd888c372", "parents": [ "a2af139ff1cd85df586690ff626619ab1ee88b0a" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sat Oct 06 08:08:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 14:51:51 2012 -0400" }, "message": "net: gro: selective flush of packets\n\nCurrent GRO can hold packets in gro_list for almost unlimited\ntime, in case napi-\u003epoll() handler consumes its budget over and over.\n\nIn this case, napi_complete()/napi_gro_flush() are not called.\n\nAnother problem is that gro_list is flushed in non friendly way :\nWe scan the list and complete packets in the reverse order.\n(youngest packets first, oldest packets last)\nThis defeats priorities that sender could have cooked.\n\nSince GRO currently only store TCP packets, we dont really notice the\nbug because of retransmits, but this behavior can add unexpected\nlatencies, particularly on mice flows clamped by elephant flows.\n\nThis patch makes sure no packet can stay more than 1 ms in queue, and\nonly in stress situations.\n\nIt also complete packets in the right order to minimize latencies.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Jesse Gross \u003cjesse@nicira.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee9a8f7ab2edf801b8b514c310455c94acc232f6", "tree": "354084bb26d1ce12bb552ced3cdd653fc63989db", "parents": [ "7f92d334ba19a0d8e96f8f8f092219553367d921" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Mon Oct 08 00:56:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 14:46:35 2012 -0400" }, "message": "ipv4: Don\u0027t report stale pmtu values to userspace\n\nWe report cached pmtu values even if they are already expired.\nChange this to not report these values after they are expired\nand fix a race in the expire time calculation, as suggested by\nEric Dumazet.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f92d334ba19a0d8e96f8f8f092219553367d921", "tree": "61974ee8b7c5b0428401e29836ce2cc1bbc9484e", "parents": [ "d851c12b60471188e15e5c8405b289073e8dd025" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Sun Oct 07 22:48:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 14:46:35 2012 -0400" }, "message": "ipv4: Don\u0027t create nh exeption when the device mtu is smaller than the reported pmtu\n\nWhen a local tool like tracepath tries to send packets bigger than\nthe device mtu, we create a nh exeption and set the pmtu to device\nmtu. The device mtu does not expire, so check if the device mtu is\nsmaller than the reported pmtu and don\u0027t crerate a nh exeption in\nthat case.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d851c12b60471188e15e5c8405b289073e8dd025", "tree": "102698a4ae2ec89cb931f360cc9229474a6f1cbb", "parents": [ "594f88e96ebaf290e6509b37fff84b310ec1f155" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Sun Oct 07 22:47:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 14:46:34 2012 -0400" }, "message": "ipv4: Always invalidate or update the route on pmtu events\n\nSome protocols, like IPsec still cache routes. So we need to invalidate\nthe old route on pmtu events to avoid the reuse of stale routes.\nWe also need to update the mtu and expire time of the route if we already\nuse a nh exception route, otherwise we ignore newly learned pmtu values\nafter the first expiration.\n\nWith this patch we always invalidate or update the route on pmtu events.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf7f601c067994f371ba77721d1e45fce61a4569", "tree": "4ff5a12ae84cf47a9815c3e3979341a66360cb31", "parents": [ "9bb9c3be56834653878f766f471fa1c20e562f4c" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Sep 13 13:06:29 2012 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Oct 08 13:49:48 2012 +1030" }, "message": "KEYS: Add payload preparsing opportunity prior to key instantiate or update\n\nGive the key type the opportunity to preparse the payload prior to the\ninstantiation and update routines being called. This is done with the\nprovision of two new key type operations:\n\n\tint (*preparse)(struct key_preparsed_payload *prep);\n\tvoid (*free_preparse)(struct key_preparsed_payload *prep);\n\nIf the first operation is present, then it is called before key creation (in\nthe add/update case) or before the key semaphore is taken (in the update and\ninstantiate cases). The second operation is called to clean up if the first\nwas called.\n\npreparse() is given the opportunity to fill in the following structure:\n\n\tstruct key_preparsed_payload {\n\t\tchar\t\t*description;\n\t\tvoid\t\t*type_data[2];\n\t\tvoid\t\t*payload;\n\t\tconst void\t*data;\n\t\tsize_t\t\tdatalen;\n\t\tsize_t\t\tquotalen;\n\t};\n\nBefore the preparser is called, the first three fields will have been cleared,\nthe payload pointer and size will be stored in data and datalen and the default\nquota size from the key_type struct will be stored into quotalen.\n\nThe preparser may parse the payload in any way it likes and may store data in\nthe type_data[] and payload fields for use by the instantiate() and update()\nops.\n\nThe preparser may also propose a description for the key by attaching it as a\nstring to the description field. This can be used by passing a NULL or \"\"\ndescription to the add_key() system call or the key_create_or_update()\nfunction. This cannot work with request_key() as that required the description\nto tell the upcall about the key to be created.\n\nThis, for example permits keys that store PGP public keys to generate their own\nname from the user ID and public key fingerprint in the key.\n\nThe instantiate() and update() operations are then modified to look like this:\n\n\tint (*instantiate)(struct key *key, struct key_preparsed_payload *prep);\n\tint (*update)(struct key *key, struct key_preparsed_payload *prep);\n\nand the new payload data is passed in *prep, whether or not it was preparsed.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7035cdf36d5c4d913f68ff97e1c2e5603500d946", "tree": "eee5680c16771cb23bc6d3a47bc7b6f350171b22", "parents": [ "6432f2128414edbea5fd4f6c4fa4c28d0e1c6151", "6285bc231277419255f3498d3eb5ddc9f8e7fe79" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 08 06:38:18 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 08 06:38:18 2012 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\nPull ceph updates from Sage Weil:\n \"The bulk of this pull is a series from Alex that refactors and cleans\n up the RBD code to lay the groundwork for supporting the new image\n format and evolving feature set. There are also some cleanups in\n libceph, and for ceph there\u0027s fixed validation of file striping\n layouts and a bugfix in the code handling a shrinking MDS cluster.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (71 commits)\n ceph: avoid 32-bit page index overflow\n ceph: return EIO on invalid layout on GET_DATALOC ioctl\n rbd: BUG on invalid layout\n ceph: propagate layout error on osd request creation\n libceph: check for invalid mapping\n ceph: convert to use le32_add_cpu()\n ceph: Fix oops when handling mdsmap that decreases max_mds\n rbd: update remaining header fields for v2\n rbd: get snapshot name for a v2 image\n rbd: get the snapshot context for a v2 image\n rbd: get image features for a v2 image\n rbd: get the object prefix for a v2 rbd image\n rbd: add code to get the size of a v2 rbd image\n rbd: lay out header probe infrastructure\n rbd: encapsulate code that gets snapshot info\n rbd: add an rbd features field\n rbd: don\u0027t use index in __rbd_add_snap_dev()\n rbd: kill create_snap sysfs entry\n rbd: define rbd_dev_image_id()\n rbd: define some new format constants\n ...\n" }, { "commit": "ca07e43e288956a0ad5e6bd075f7aa1fca3bca00", "tree": "fa3b345f2940b257f7c1b5b268f2ee52926bcbf5", "parents": [ "51ec04038c113a811b177baa85d293feff9ce995" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sat Oct 06 22:28:06 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 07 14:49:17 2012 -0400" }, "message": "net: gro: fix a potential crash in skb_gro_reset_offset\n\nBefore accessing skb first fragment, better make sure there\nis one.\n\nThis is probably not needed for old kernels, since an ethernet frame\ncannot contain only an ethernet header, but the recent GRO addition\nto tunnels makes this patch needed.\n\nAlso skb_gro_reset_offset() can be static, it actually allows\ncompiler to inline it.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "51ec04038c113a811b177baa85d293feff9ce995", "tree": "0b501332fe30a45bbe5d9adb6a93372f27857bd0", "parents": [ "e1f165032c8bade3a6bdf546f8faf61fda4dd01c" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Fri Oct 05 20:43:30 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 07 14:44:36 2012 -0400" }, "message": "ipv6: GRO should be ECN friendly\n\nIPv4 side of the problem was addressed in commit a9e050f4e7f9d\n(net: tcp: GRO should be ECN friendly)\n\nThis patch does the same, but for IPv6 : A Traffic Class mismatch\ndoesnt mean flows are different, but instead should force a flush\nof previous packets.\n\nThis patch removes artificial packet reordering problem.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1f165032c8bade3a6bdf546f8faf61fda4dd01c", "tree": "891c87188420b6a0d42fa25684266ca58ccfe7ef", "parents": [ "0bd8ba18b9384e1c9104eee1d912fd5c8b4234c0" ], "author": { "name": "ramesh.nagappa@gmail.com", "email": "ramesh.nagappa@gmail.com", "time": "Fri Oct 05 19:10:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 07 14:42:39 2012 -0400" }, "message": "net: Fix skb_under_panic oops in neigh_resolve_output\n\nThe retry loop in neigh_resolve_output() and neigh_connected_output()\ncall dev_hard_header() with out reseting the skb to network_header.\nThis causes the retry to fail with skb_under_panic. The fix is to\nreset the network_header within the retry loop.\n\nSigned-off-by: Ramesh Nagappa \u003cramesh.nagappa@ericsson.com\u003e\nReviewed-by: Shawn Lu \u003cshawn.lu@ericsson.com\u003e\nReviewed-by: Robert Coulson \u003crobert.coulson@ericsson.com\u003e\nReviewed-by: Billie Alsup \u003cbillie.alsup@ericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "acb600def2110b1310466c0e485c0d26299898ae", "tree": "21036c7d0518601aba70dde0246ac229cd8dfc0c", "parents": [ "809d5fc9bf6589276a12bd4fd611e4c7ff9940c3" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Fri Oct 05 06:23:55 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 07 00:40:54 2012 -0400" }, "message": "net: remove skb recycling\n\nOver time, skb recycling infrastructure got litle interest and\nmany bugs. Generic rx path skb allocation is now using page\nfragments for efficient GRO / TCP coalescing, and recyling\na tx skb for rx path is not worth the pain.\n\nLast identified bug is that fat skbs can be recycled\nand it can endup using high order pages after few iterations.\n\nWith help from Maxime Bizon, who pointed out that commit\n87151b8689d (net: allow pskb_expand_head() to get maximum tailroom)\nintroduced this regression for recycled skbs.\n\nInstead of fixing this bug, lets remove skb recycling.\n\nDrivers wanting really hot skbs should use build_skb() anyway,\nto allocate/populate sk_buff right before netif_receive_skb()\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6dc878a8ca39e93f70c42f3dd7260bde10c1e0f1", "tree": "2549dc75d29ea1975611775b05921482caf75c04", "parents": [ "ed5062ddaa71e9f8b2b3aacc264428ce6da93d9e" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Thu Oct 04 20:15:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 07 00:30:56 2012 -0400" }, "message": "netlink: add reference of module in netlink_dump_start\n\nI get a panic when I use ss -a and rmmod inet_diag at the\nsame time.\n\nIt\u0027s because netlink_dump uses inet_diag_dump which belongs to module\ninet_diag.\n\nI search the codes and find many modules have the same problem. We\nneed to add a reference to the module which the cb-\u003edump belongs to.\n\nThanks for all help from Stephen,Jan,Eric,Steffen and Pablo.\n\nChange From v3:\nchange netlink_dump_start to inline,suggestion from Pablo and\nEric.\n\nChange From v2:\ndelete netlink_dump_done,and call module_put in netlink_dump\nand netlink_sock_destruct.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "283dbd82055eb70ff3b469f812d9c695f18c9641", "tree": "0a97e7b60b79bc48de9276c4da0f9472a202b130", "parents": [ "11126c611e10abb18b6f1ed0300c0548c3906b54", "6825a26c2dc21eb4f8df9c06d3786ddec97cf53b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:11:59 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:11:59 2012 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking changes from David Miller:\n \"The most important bit in here is the fix for input route caching from\n Eric Dumazet, it\u0027s a shame we couldn\u0027t fully analyze this in time for\n 3.6 as it\u0027s a 3.6 regression introduced by the routing cache removal.\n\n Anyways, will send quickly to -stable after you pull this in.\n\n Other changes of note:\n\n 1) Fix lockdep splats in team and bonding, from Eric Dumazet.\n\n 2) IPV6 adds link local route even when there is no link local\n address, from Nicolas Dichtel.\n\n 3) Fix ixgbe PTP implementation, from Jacob Keller.\n\n 4) Fix excessive stack usage in cxgb4 driver, from Vipul Pandya.\n\n 5) MAC length computed improperly in VLAN demux, from Antonio\n Quartulli.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)\n ipv6: release reference of ip6_null_entry\u0027s dst entry in __ip6_del_rt\n Remove noisy printks from llcp_sock_connect\n tipc: prevent dropped connections due to rcvbuf overflow\n silence some noisy printks in irda\n team: set qdisc_tx_busylock to avoid LOCKDEP splat\n bonding: set qdisc_tx_busylock to avoid LOCKDEP splat\n sctp: check src addr when processing SACK to update transport state\n sctp: fix a typo in prototype of __sctp_rcv_lookup()\n ipv4: add a fib_type to fib_info\n can: mpc5xxx_can: fix section type conflict\n can: peak_pcmcia: fix error return code\n can: peak_pci: fix error return code\n cxgb4: Fix build error due to missing linux/vmalloc.h include.\n bnx2x: fix ring size for 10G functions\n cxgb4: Dynamically allocate memory in t4_memory_rw() and get_vpd_params()\n ixgbe: add support for X540-AT1\n ixgbe: fix poll loop for FDIRCTRL.INIT_DONE bit\n ixgbe: fix PTP ethtool timestamping function\n ixgbe: (PTP) Fix PPS interrupt code\n ixgbe: Fix PTP X540 SDP alignment code for PPS signal\n ...\n" }, { "commit": "04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa", "tree": "d9fb34c24277a6eec6f5da9aeff450aedb8e387c", "parents": [ "6299b669b1340b9f7de2bc2bd565921a1494e7f7" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Thu Oct 04 17:12:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:04:45 2012 +0900" }, "message": "sections: fix section conflicts in net\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: David 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": "6299b669b1340b9f7de2bc2bd565921a1494e7f7", "tree": "d5b2dccaf8bee86fc88594df60aafd6e2cf65014", "parents": [ "17f3609c21706b377ad80b5251558ed700c2af17" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Thu Oct 04 17:12:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:04:45 2012 +0900" }, "message": "sections: fix section conflicts in net/can\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nCc: David 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": "6825a26c2dc21eb4f8df9c06d3786ddec97cf53b", "tree": "8fae2530f09c68511c32d1096cca658585b3655d", "parents": [ "32418cfe495c95013be2e805c087db89dcefac6d" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Wed Sep 19 19:25:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 16:00:07 2012 -0400" }, "message": "ipv6: release reference of ip6_null_entry\u0027s dst entry in __ip6_del_rt\n\nas we hold dst_entry before we call __ip6_del_rt,\nso we should alse call dst_release not only return\n-ENOENT when the rt6_info is ip6_null_entry.\n\nand we already hold the dst entry, so I think it\u0027s\nsafe to call dst_release out of the write-read lock.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32418cfe495c95013be2e805c087db89dcefac6d", "tree": "da22a27485f29d6cd87ac8b063006715104981e0", "parents": [ "19d4e6639fdddce3c27bc91ef91bfe473313be20" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu Oct 04 09:51:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 15:58:47 2012 -0400" }, "message": "Remove noisy printks from llcp_sock_connect\n\nValidation of userspace input shouldn\u0027t trigger dmesg spamming.\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e57edf6b6dba975eceede20b4b13699d4e88cd78", "tree": "c81b8874b5c5de21c01397f1e7d719fe78a34c8c", "parents": [ "096895818cbf3382dc318f369e642fb7460ccb26" ], "author": { "name": "Erik Hugne", "email": "erik.hugne@ericsson.com", "time": "Thu Oct 04 05:00:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 15:53:48 2012 -0400" }, "message": "tipc: prevent dropped connections due to rcvbuf overflow\n\nWhen large buffers are sent over connected TIPC sockets, it\nis likely that the sk_backlog will be filled up on the\nreceiver side, but the TIPC flow control mechanism is happily\nunaware of this since that is based on message count.\n\nThe sender will receive a TIPC_ERR_OVERLOAD message when this occurs\nand drop it\u0027s side of the connection, leaving it stale on\nthe receiver end.\n\nBy increasing the sk_rcvbuf to a \u0027worst case\u0027 value, we avoid the\noverload caused by a full backlog queue and the flow control\nwill work properly.\n\nThis worst case value is the max TIPC message size times\nthe flow control window, multiplied by two because a sender\nwill transmit up to double the window size before a port is marked\ncongested.\nWe multiply this by 2 to account for the sk_buff and other overheads.\n\nSigned-off-by: Erik Hugne \u003cerik.hugne@ericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "096895818cbf3382dc318f369e642fb7460ccb26", "tree": "ccf5c6d8f5bc2bcdaf52ee030117b6c624bd6888", "parents": [ "b3c581d5d7130fc7f2eab9ab14c8de8882b42380" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu Oct 04 03:36:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 15:53:48 2012 -0400" }, "message": "silence some noisy printks in irda\n\nFuzzing causes these printks to spew constantly.\nChanging them to DEBUG statements is consistent with other usage in the file,\nand makes them disappear when CONFIG_IRDA_DEBUG is disabled.\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edfee0339e681a784ebacec7e8c2dc97dc6d2839", "tree": "ec4c3953956d2de79ee326d08e46c6d9736a1068", "parents": [ "575659936f9d392b93b03ce97a58dbd4fce18abd" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Oct 03 05:43:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 15:53:48 2012 -0400" }, "message": "sctp: check src addr when processing SACK to update transport state\n\nSuppose we have an SCTP connection with two paths. After connection is\nestablished, path1 is not available, thus this path is marked as inactive. Then\ntraffic goes through path2, but for some reasons packets are delayed (after\nrto.max). Because packets are delayed, the retransmit mechanism will switch\nagain to path1. At this time, we receive a delayed SACK from path2. When we\nupdate the state of the path in sctp_check_transmitted(), we do not take into\naccount the source address of the SACK, hence we update the wrong path.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Vlad Yasevich \u003cvyasevich@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "575659936f9d392b93b03ce97a58dbd4fce18abd", "tree": "26e7a34b9eefbac391deb5b7d89e2a7a443a7592", "parents": [ "e7b565e73d94e42619bbab7ea1ab5626d1952701" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Oct 03 05:43:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 15:53:48 2012 -0400" }, "message": "sctp: fix a typo in prototype of __sctp_rcv_lookup()\n\nJust to avoid confusion when people only reads this prototype.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Vlad Yasevich \u003cvyasevich@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f4ef85bbda96324785097356336bc79cdd37db0a", "tree": "7a91ea1839d96ccb43d322f88a725f5a76b4be79", "parents": [ "c0b8b99287235626a5850ef7e5bfc842d1ebcecd" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Oct 04 01:25:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 13:58:26 2012 -0400" }, "message": "ipv4: add a fib_type to fib_info\n\ncommit d2d68ba9fe8 (ipv4: Cache input routes in fib_info nexthops.)\nintroduced a regression for forwarding.\n\nThis was hard to reproduce but the symptom was that packets were\ndelivered to local host instead of being forwarded.\n\nDavid suggested to add fib_type to fib_info so that we dont\ninadvertently share same fib_info for different purposes.\n\nWith help from Julian Anastasov who provided very helpful\nhints, reproduced here :\n\n\u003cquote\u003e\n Can it be a problem related to fib_info reuse\nfrom different routes. For example, when local IP address\nis created for subnet we have:\n\nbroadcast 192.168.0.255 dev DEV proto kernel scope link src\n192.168.0.1\n192.168.0.0/24 dev DEV proto kernel scope link src 192.168.0.1\nlocal 192.168.0.1 dev DEV proto kernel scope host src 192.168.0.1\n\n The \"dev DEV proto kernel scope link src 192.168.0.1\" is\na reused fib_info structure where we put cached routes.\nThe result can be same fib_info for 192.168.0.255 and\n192.168.0.0/24. RTN_BROADCAST is cached only for input\nroutes. Incoming broadcast to 192.168.0.255 can be cached\nand can cause problems for traffic forwarded to 192.168.0.0/24.\nSo, this patch should solve the problem because it\nseparates the broadcast from unicast traffic.\n\n And the ip_route_input_slow caching will work for\nlocal and broadcast input routes (above routes 1 and 3) just\nbecause they differ in scope and use different fib_info.\n\n\u003c/quote\u003e\n\nMany thanks to Chris Clayton for his patience and help.\n\nReported-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nBisected-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Julian Anastasov \u003cja@ssi.bg\u003e\nTested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aab174f0df5d72d31caccf281af5f614fa254578", "tree": "2a172c5009c4ac8755e858593154c258ce7709a0", "parents": [ "ca41cc96b2813221b05af57d0355157924de5a07", "2bd2c1941f141ad780135ccc1cd08ca71a24f10a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 20:25:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 20:25:04 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs update from Al Viro:\n\n - big one - consolidation of descriptor-related logics; almost all of\n that is moved to fs/file.c\n\n (BTW, I\u0027m seriously tempted to rename the result to fd.c. As it is,\n we have a situation when file_table.c is about handling of struct\n file and file.c is about handling of descriptor tables; the reasons\n are historical - file_table.c used to be about a static array of\n struct file we used to have way back).\n\n A lot of stray ends got cleaned up and converted to saner primitives,\n disgusting mess in android/binder.c is still disgusting, but at least\n doesn\u0027t poke so much in descriptor table guts anymore. A bunch of\n relatively minor races got fixed in process, plus an ext4 struct file\n leak.\n\n - related thing - fget_light() partially unuglified; see fdget() in\n there (and yes, it generates the code as good as we used to have).\n\n - also related - bits of Cyrill\u0027s procfs stuff that got entangled into\n that work; _not_ all of it, just the initial move to fs/proc/fd.c and\n switch of fdinfo to seq_file.\n\n - Alex\u0027s fs/coredump.c spiltoff - the same story, had been easier to\n take that commit than mess with conflicts. The rest is a separate\n pile, this was just a mechanical code movement.\n\n - a few misc patches all over the place. Not all for this cycle,\n there\u0027ll be more (and quite a few currently sit in akpm\u0027s tree).\"\n\nFix up trivial conflicts in the android binder driver, and some fairly\nsimple conflicts due to two different changes to the sock_alloc_file()\ninterface (\"take descriptor handling from sock_alloc_file() to callers\"\nvs \"net: Providing protocol type via system.sockprotoname xattr of\n/proc/PID/fd entries\" adding a dentry name to the socket)\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (72 commits)\n MAX_LFS_FILESIZE should be a loff_t\n compat: fs: Generic compat_sys_sendfile implementation\n fs: push rcu_barrier() from deactivate_locked_super() to filesystems\n btrfs: reada_extent doesn\u0027t need kref for refcount\n coredump: move core dump functionality into its own file\n coredump: prevent double-free on an error path in core dumper\n usb/gadget: fix misannotations\n fcntl: fix misannotations\n ceph: don\u0027t abuse d_delete() on failure exits\n hypfs: -\u003ed_parent is never NULL or negative\n vfs: delete surplus inode NULL check\n switch simple cases of fget_light to fdget\n new helpers: fdget()/fdput()\n switch o2hb_region_dev_write() to fget_light()\n proc_map_files_readdir(): don\u0027t bother with grabbing files\n make get_file() return its argument\n vhost_set_vring(): turn pollstart/pollstop into bool\n switch prctl_set_mm_exe_file() to fget_light()\n switch xfs_find_handle() to fget_light()\n switch xfs_swapext() to fget_light()\n ...\n" }, { "commit": "5316cf9a5197eb80b2800e1acadde287924ca975", "tree": "1a36086347433ad7205d996cdd2713f28dc51933", "parents": [ "786fdf0bbf1c3a1b402bb2da946b93e0b36a8f32" ], "author": { "name": "Antonio Quartulli", "email": "ordex@autistici.org", "time": "Tue Oct 02 06:14:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 22:45:57 2012 -0400" }, "message": "8021q: fix mac_len recomputation in vlan_untag()\n\nskb_reset_mac_len() relies on the value of the skb-\u003enetwork_header pointer,\ntherefore we must wait for such pointer to be recalculated before computing\nthe new mac_len value.\n\nSigned-off-by: Antonio Quartulli \u003cordex@autistici.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62b54dd91567686a1cb118f76a72d5f4764a86dd", "tree": "26ea17178e66c20f77ffc599e1bc1e803664dc07", "parents": [ "ffb5ba90017505a19e238e986e6d33f09e4df765" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Oct 01 23:19:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 22:36:23 2012 -0400" }, "message": "ipv6: don\u0027t add link local route when there is no link local address\n\nWhen an address is added on loopback (ip -6 a a 2002::1/128 dev lo), a route\nto fe80::/64 is added in the main table:\n unreachable fe80::/64 dev lo proto kernel metric 256 error -101\n\nThis route does not match any prefix (no fe80:: address on lo). In fact,\naddrconf_dev_config() will not add link local address because this function\nfilters interfaces by type. If the link local address is added manually, the\nroute to the link local prefix will be automatically added by\naddrconf_add_linklocal().\nNote also, that this route is not deleted when the address is removed.\n\nAfter looking at the code, it seems that addrconf_add_lroute() is redundant with\naddrconf_add_linklocal(), because this function will add the link local route\nwhen the link local address is configured.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "916082b073ebb7f4e064cebce0768e34cacde508", "tree": "8a8037ebbaaffb2336ac4526a7f87ac9a22aeafd", "parents": [ "aecdc33e111b2c447b622e287c6003726daa1426" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:01:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:01:31 2012 -0700" }, "message": "workqueue: avoid using deprecated functions\n\nThe network merge brought in a few users of functions that got\ndeprecated by the workqueue cleanups: the \u0027system_nrt_wq\u0027 is now the\nsame as the regular system_wq, since all workqueues are now non-\nreentrant.\n\nSimilarly, remove one use of flush_work_sync() - the regular\nflush_work() has become synchronous, and the \"_sync()\" version is thus\ndeprecated as being superfluous.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aecdc33e111b2c447b622e287c6003726daa1426", "tree": "3e7657eae4b785e1a1fb5dfb225dbae0b2f0cfc6", "parents": [ "a20acf99f75e49271381d65db097c9763060a1e8", "a3a6cab5ea10cca64d036851fe0d932448f2fe4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking changes from David Miller:\n\n 1) GRE now works over ipv6, from Dmitry Kozlov.\n\n 2) Make SCTP more network namespace aware, from Eric Biederman.\n\n 3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.\n\n 4) Make openvswitch network namespace aware, from Pravin B Shelar.\n\n 5) IPV6 NAT implementation, from Patrick McHardy.\n\n 6) Server side support for TCP Fast Open, from Jerry Chu and others.\n\n 7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel\n Borkmann.\n\n 8) Increate the loopback default MTU to 64K, from Eric Dumazet.\n\n 9) Use a per-task rather than per-socket page fragment allocator for\n outgoing networking traffic. This benefits processes that have very\n many mostly idle sockets, which is quite common.\n\n From Eric Dumazet.\n\n10) Use up to 32K for page fragment allocations, with fallbacks to\n smaller sizes when higher order page allocations fail. Benefits are\n a) less segments for driver to process b) less calls to page\n allocator c) less waste of space.\n\n From Eric Dumazet.\n\n11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.\n\n12) VXLAN device driver, one way to handle VLAN issues such as the\n limitation of 4096 VLAN IDs yet still have some level of isolation.\n From Stephen Hemminger.\n\n13) As usual there is a large boatload of driver changes, with the scale\n perhaps tilted towards the wireless side this time around.\n\nFix up various fairly trivial conflicts, mostly caused by the user\nnamespace changes.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)\n hyperv: Add buffer for extended info after the RNDIS response message.\n hyperv: Report actual status in receive completion packet\n hyperv: Remove extra allocated space for recv_pkt_list elements\n hyperv: Fix page buffer handling in rndis_filter_send_request()\n hyperv: Fix the missing return value in rndis_filter_set_packet_filter()\n hyperv: Fix the max_xfer_size in RNDIS initialization\n vxlan: put UDP socket in correct namespace\n vxlan: Depend on CONFIG_INET\n sfc: Fix the reported priorities of different filter types\n sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP\n sfc: Fix loopback self-test with separate_tx_channels\u003d1\n sfc: Fix MCDI structure field lookup\n sfc: Add parentheses around use of bitfield macro arguments\n sfc: Fix null function pointer in efx_sriov_channel_type\n vxlan: virtual extensible lan\n igmp: export symbol ip_mc_leave_group\n netlink: add attributes to fdb interface\n tg3: unconditionally select HWMON support when tg3 is enabled.\n Revert \"net: ti cpsw ethernet: allow reading phy interface mode from DT\"\n gre: fix sparse warning\n ...\n" }, { "commit": "437589a74b6a590d175f86cf9f7b2efcee7765e7", "tree": "37bf8635b1356d80ef002b00e84f3faf3d555a63", "parents": [ "68d47a137c3bef754923bccf73fb639c9b0bbd5e", "72235465864d84cedb2d9f26f8e1de824ee20339" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace changes from Eric Biederman:\n \"This is a mostly modest set of changes to enable basic user namespace\n support. This allows the code to code to compile with user namespaces\n enabled and removes the assumption there is only the initial user\n namespace. Everything is converted except for the most complex of the\n filesystems: autofs4, 9p, afs, ceph, cifs, coda, fuse, gfs2, ncpfs,\n nfs, ocfs2 and xfs as those patches need a bit more review.\n\n The strategy is to push kuid_t and kgid_t values are far down into\n subsystems and filesystems as reasonable. Leaving the make_kuid and\n from_kuid operations to happen at the edge of userspace, as the values\n come off the disk, and as the values come in from the network.\n Letting compile type incompatible compile errors (present when user\n namespaces are enabled) guide me to find the issues.\n\n The most tricky areas have been the places where we had an implicit\n union of uid and gid values and were storing them in an unsigned int.\n Those places were converted into explicit unions. I made certain to\n handle those places with simple trivial patches.\n\n Out of that work I discovered we have generic interfaces for storing\n quota by projid. I had never heard of the project identifiers before.\n Adding full user namespace support for project identifiers accounts\n for most of the code size growth in my git tree.\n\n Ultimately there will be work to relax privlige checks from\n \"capable(FOO)\" to \"ns_capable(user_ns, FOO)\" where it is safe allowing\n root in a user names to do those things that today we only forbid to\n non-root users because it will confuse suid root applications.\n\n While I was pushing kuid_t and kgid_t changes deep into the audit code\n I made a few other cleanups. I capitalized on the fact we process\n netlink messages in the context of the message sender. I removed\n usage of NETLINK_CRED, and started directly using current-\u003etty.\n\n Some of these patches have also made it into maintainer trees, with no\n problems from identical code from different trees showing up in\n linux-next.\n\n After reading through all of this code I feel like I might be able to\n win a game of kernel trivial pursuit.\"\n\nFix up some fairly trivial conflicts in netfilter uid/git logging code.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (107 commits)\n userns: Convert the ufs filesystem to use kuid/kgid where appropriate\n userns: Convert the udf filesystem to use kuid/kgid where appropriate\n userns: Convert ubifs to use kuid/kgid\n userns: Convert squashfs to use kuid/kgid where appropriate\n userns: Convert reiserfs to use kuid and kgid where appropriate\n userns: Convert jfs to use kuid/kgid where appropriate\n userns: Convert jffs2 to use kuid and kgid where appropriate\n userns: Convert hpfs to use kuid and kgid where appropriate\n userns: Convert btrfs to use kuid/kgid where appropriate\n userns: Convert bfs to use kuid/kgid where appropriate\n userns: Convert affs to use kuid/kgid wherwe appropriate\n userns: On alpha modify linux_to_osf_stat to use convert from kuids and kgids\n userns: On ia64 deal with current_uid and current_gid being kuid and kgid\n userns: On ppc convert current_uid from a kuid before printing.\n userns: Convert s390 getting uid and gid system calls to use kuid and kgid\n userns: Convert s390 hypfs to use kuid and kgid where appropriate\n userns: Convert binder ipc to use kuids\n userns: Teach security_path_chown to take kuids and kgids\n userns: Add user namespace support to IMA\n userns: Convert EVM to deal with kuids and kgids in it\u0027s hmac computation\n ...\n" }, { "commit": "68d47a137c3bef754923bccf73fb639c9b0bbd5e", "tree": "e82a527bd978ee96283f03d0df36f47d9aee1e41", "parents": [ "c0e8a139a5bb8add02b4111e9e1957d810d7285e", "8c7f6edbda01f1b1a2e60ad61f14fe38023e433b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:52:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:52:28 2012 -0700" }, "message": "Merge branch \u0027for-3.7-hierarchy\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup hierarchy update from Tejun Heo:\n \"Currently, different cgroup subsystems handle nested cgroups\n completely differently. There\u0027s no consistency among subsystems and\n the behaviors often are outright broken.\n\n People at least seem to agree that the broken hierarhcy behaviors need\n to be weeded out if any progress is gonna be made on this front and\n that the fallouts from deprecating the broken behaviors should be\n acceptable especially given that the current behaviors don\u0027t make much\n sense when nested.\n\n This patch makes cgroup emit warning messages if cgroups for\n subsystems with broken hierarchy behavior are nested to prepare for\n fixing them in the future. This was put in a separate branch because\n more related changes were expected (didn\u0027t make it this round) and the\n memory cgroup wanted to pull in this and make changes on top.\"\n\n* \u0027for-3.7-hierarchy\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them\n" }, { "commit": "c0e8a139a5bb8add02b4111e9e1957d810d7285e", "tree": "f5f0695c7553c0f651ea3c714191dedf76e06c78", "parents": [ "033d9959ed2dc1029217d4165f80a71702dc578e", "a6f00298b2ceaf50b4ab00e6ee3eb0206ac72fac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:50:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:50:47 2012 -0700" }, "message": "Merge branch \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup updates from Tejun Heo:\n\n - xattr support added. The implementation is shared with tmpfs. The\n usage is restricted and intended to be used to manage per-cgroup\n metadata by system software. tmpfs changes are routed through this\n branch with Hugh\u0027s permission.\n\n - cgroup subsystem ID handling simplified.\n\n* \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: Define CGROUP_SUBSYS_COUNT according the configuration\n cgroup: Assign subsystem IDs during compile time\n cgroup: Do not depend on a given order when populating the subsys array\n cgroup: Wrap subsystem selection macro\n cgroup: Remove CGROUP_BUILTIN_SUBSYS_COUNT\n cgroup: net_prio: Do not define task_netpioidx() when not selected\n cgroup: net_cls: Do not define task_cls_classid() when not selected\n cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h\n cgroup: trivial fixes for Documentation/cgroups/cgroups.txt\n xattr: mark variable as uninitialized to make both gcc and smatch happy\n fs: add missing documentation to simple_xattr functions\n cgroup: add documentation on extended attributes usage\n cgroup: rename subsys_bits to subsys_mask\n cgroup: add xattr support\n cgroup: revise how we re-populate root directory\n xattr: extract simple_xattr code from tmpfs\n" }, { "commit": "033d9959ed2dc1029217d4165f80a71702dc578e", "tree": "3d306316e44bdabce2e0bf2ef7e466e525f90b4c", "parents": [ "974a847e00cf3ff1695e62b276892137893706ab", "7c6e72e46c9ea4a88f3f8ba96edce9db4bd48726" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 09:54:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 09:54:49 2012 -0700" }, "message": "Merge branch \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\nPull workqueue changes from Tejun Heo:\n \"This is workqueue updates for v3.7-rc1. A lot of activities this\n round including considerable API and behavior cleanups.\n\n * delayed_work combines a timer and a work item. The handling of the\n timer part has always been a bit clunky leading to confusing\n cancelation API with weird corner-case behaviors. delayed_work is\n updated to use new IRQ safe timer and cancelation now works as\n expected.\n\n * Another deficiency of delayed_work was lack of the counterpart of\n mod_timer() which led to cancel+queue combinations or open-coded\n timer+work usages. mod_delayed_work[_on]() are added.\n\n These two delayed_work changes make delayed_work provide interface\n and behave like timer which is executed with process context.\n\n * A work item could be executed concurrently on multiple CPUs, which\n is rather unintuitive and made flush_work() behavior confusing and\n half-broken under certain circumstances. This problem doesn\u0027t\n exist for non-reentrant workqueues. While non-reentrancy check\n isn\u0027t free, the overhead is incurred only when a work item bounces\n across different CPUs and even in simulated pathological scenario\n the overhead isn\u0027t too high.\n\n All workqueues are made non-reentrant. This removes the\n distinction between flush_[delayed_]work() and\n flush_[delayed_]_work_sync(). The former is now as strong as the\n latter and the specified work item is guaranteed to have finished\n execution of any previous queueing on return.\n\n * In addition to the various bug fixes, Lai redid and simplified CPU\n hotplug handling significantly.\n\n * Joonsoo introduced system_highpri_wq and used it during CPU\n hotplug.\n\n There are two merge commits - one to pull in IRQ safe timer from\n tip/timers/core and the other to pull in CPU hotplug fixes from\n wq/for-3.6-fixes as Lai\u0027s hotplug restructuring depended on them.\"\n\nFixed a number of trivial conflicts, but the more interesting conflicts\nwere silent ones where the deprecated interfaces had been used by new\ncode in the merge window, and thus didn\u0027t cause any real data conflicts.\n\nTejun pointed out a few of them, I fixed a couple more.\n\n* \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)\n workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()\n workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()\n workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()\n workqueue: remove @delayed from cwq_dec_nr_in_flight()\n workqueue: fix possible stall on try_to_grab_pending() of a delayed work item\n workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()\n workqueue: use __cpuinit instead of __devinit for cpu callbacks\n workqueue: rename manager_mutex to assoc_mutex\n workqueue: WORKER_REBIND is no longer necessary for idle rebinding\n workqueue: WORKER_REBIND is no longer necessary for busy rebinding\n workqueue: reimplement idle worker rebinding\n workqueue: deprecate __cancel_delayed_work()\n workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()\n workqueue: use mod_delayed_work() instead of __cancel + queue\n workqueue: use irqsafe timer for delayed_work\n workqueue: clean up delayed_work initializers and add missing one\n workqueue: make deferrable delayed_work initializer names consistent\n workqueue: cosmetic whitespace updates for macro definitions\n workqueue: deprecate system_nrt[_freezable]_wq\n workqueue: deprecate flush[_delayed]_work_sync()\n ...\n" }, { "commit": "193ba924524e6afe192217982b2c2d67e4715d33", "tree": "80a904436895b3e519163810eba7a1400c81508b", "parents": [ "edc7d57327bd08bfd04f41531d49b176369db218" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 01 12:32:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 18:39:44 2012 -0400" }, "message": "igmp: export symbol ip_mc_leave_group\n\nNeeded for VXLAN.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edc7d57327bd08bfd04f41531d49b176369db218", "tree": "c1005cd5c5e9006c4eb2de39b3d14598f2206892", "parents": [ "de0a41484c47d783dd4d442914815076aa2caac2" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 01 12:32:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 18:39:44 2012 -0400" }, "message": "netlink: add attributes to fdb interface\n\nLater changes need to be able to refer to neighbour attributes\nwhen doing fdb_add.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba9b584c1dc37851d9c6ca6d0d2ccba55d9aad04", "tree": "d74fa5a04f928d5c508594f285381b41bfe4ac3c", "parents": [ "1b63a75180c6c65c71655c250a4e6b578ba7d1c0" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Sep 14 17:24:02 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Oct 01 15:33:33 2012 -0700" }, "message": "SUNRPC: Introduce rpc_clone_client_set_auth()\n\nAn ULP is supposed to be able to replace a GSS rpc_auth object with\nanother GSS rpc_auth object using rpcauth_create(). However,\nrpcauth_create() in 3.5 reliably fails with -EEXIST in this case.\nThis is because when gss_create() attempts to create the upcall pipes,\nsometimes they are already there. For example if a pipe FS mount\nevent occurs, or a previous GSS flavor was in use for this rpc_clnt.\n\nIt turns out that\u0027s not the only problem here. While working on a\nfix for the above problem, we noticed that replacing an rpc_clnt\u0027s\nrpc_auth is not safe, since dereferencing the cl_auth field is not\nprotected in any way.\n\nSo we\u0027re deprecating the ability of rpcauth_create() to switch an\nrpc_clnt\u0027s security flavor during normal operation. Instead, let\u0027s\nadd a fresh API that clones an rpc_clnt and gives the clone a new\nflavor before it\u0027s used.\n\nThis makes immediate use of the new __rpc_clone_client() helper.\n\nThis can be used in a similar fashion to rpcauth_create() when a\nclient is hunting for the correct security flavor. Instead of\nreplacing an rpc_clnt\u0027s security flavor in a loop, the ULP replaces\nthe whole rpc_clnt.\n\nTo fix the -EEXIST problem, any ULP logic that relies on replacing\nan rpc_clnt\u0027s rpc_auth with rpcauth_create() must be changed to use\nthis API instead.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "1b63a75180c6c65c71655c250a4e6b578ba7d1c0", "tree": "85743d02287e488622cf0504281973b455af8387", "parents": [ "632f0d0503accb8ab749a1165af99d344579c37b" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Sep 14 17:23:52 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Oct 01 15:32:07 2012 -0700" }, "message": "SUNRPC: Refactor rpc_clone_client()\n\nrpc_clone_client() does most of the same tasks as rpc_new_client(),\nso there is an opportunity for code re-use. Create a generic helper\nthat makes it easy to clone an RPC client while replacing any of the\nclnt\u0027s parameters.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "632f0d0503accb8ab749a1165af99d344579c37b", "tree": "1112d5c86a3afafcd5fadfdc48c4aa1a43d74ffd", "parents": [ "d8af9bc16c9e9506c10581111f897be04486218f" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Sep 14 17:23:43 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Oct 01 15:32:02 2012 -0700" }, "message": "SUNRPC: Use __func__ in dprintk() in auth_gss.c\n\nClean up: Some function names have changed, but debugging messages\nwere never updated. Automate the construction of the function name\nin debugging messages.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d8af9bc16c9e9506c10581111f897be04486218f", "tree": "443e477d9766e47688e3f294d239c1ce12ce4a2c", "parents": [ "ffe5a83005b0d23575ab109755b4cb5518a5d91f" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Sep 14 17:23:34 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Oct 01 15:31:57 2012 -0700" }, "message": "SUNRPC: Clean up dprintk messages in rpc_pipe.c\n\nClean up: The blank space in front of the message must be spaces.\nTabs show up on the console as a graphical character.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "6816282dab3a72efe8c0d182c1bc2960d87f4322", "tree": "c36cea753185ad22b073d41a1e5e5dbe56a928a1", "parents": [ "d63b77f4c552cc3a20506871046ab0fcbc332609" ], "author": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Mon Sep 24 21:01:02 2012 -0700" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Oct 01 17:20:00 2012 -0500" }, "message": "ceph: propagate layout error on osd request creation\n\nIf we are creating an osd request and get an invalid layout, return\nan EINVAL to the caller. We switch up the return to have an error\ncode instead of NULL implying -ENOMEM.\n\nSigned-off-by: Sage Weil \u003csage@inktank.com\u003e\nReviewed-by: Alex Elder \u003celder@inktank.com\u003e\n" }, { "commit": "d63b77f4c552cc3a20506871046ab0fcbc332609", "tree": "a428fe42c092c0f6126a99fbc788ae96e8922a97", "parents": [ "b905a7f8b7a61c192927d0324f2ea6c998f451ba" ], "author": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Mon Sep 24 20:59:48 2012 -0700" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Oct 01 17:20:00 2012 -0500" }, "message": "libceph: check for invalid mapping\n\nIf we encounter an invalid (e.g., zeroed) mapping, return an error\nand avoid a divide by zero.\n\nSigned-off-by: Sage Weil \u003csage@inktank.com\u003e\nReviewed-by: Alex Elder \u003celder@inktank.com\u003e\n" }, { "commit": "9fbef059d63cbc3249a3ddfd9a12cb511c8be55e", "tree": "fe01d23f12e8292a1c9684e806e03a6524185774", "parents": [ "66dc81ecd71332783c92fb170950d5ddb43da461" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 01 05:21:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:35:31 2012 -0400" }, "message": "gre: fix sparse warning\n\nUse be16 consistently when looking at flags.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f674e72ff1aad23a99c7c205473cf02c85c2ac33", "tree": "032274dd7d42c5feeb17fe8b944ce9709001e339", "parents": [ "862096a8bbf8f992f6d0a1a8786ffd3fc7437e48" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Sep 27 22:21:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:15:06 2012 -0400" }, "message": "net/key/af_key.c: add range checks on -\u003esadb_x_policy_len\n\nBecause sizeof() is size_t then if \"len\" is negative, it counts as a\nlarge positive value.\n\nThe call tree looks like:\npfkey_sendmsg()\n-\u003e pfkey_process()\n -\u003e pfkey_spdadd()\n -\u003e parse_ipsecrequests()\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60769a5dcd8755715c7143b4571d5c44f01796f1", "tree": "913951cd23fa8aaaac5de4585484becaaead41ff", "parents": [ "c9e6bc644e557338221e75c242ab12c275a67d1b" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Sep 27 02:48:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:01:57 2012 -0400" }, "message": "ipv4: gre: add GRO capability\n\nAdd GRO capability to IPv4 GRE tunnels, using the gro_cells\ninfrastructure.\n\nTested using IPv4 and IPv6 TCP traffic inside this tunnel, and\nchecking GRO is building large packets.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9e6bc644e557338221e75c242ab12c275a67d1b", "tree": "dea44a1edd85dccafc2d0973280d3a608d69eb02", "parents": [ "861b650101eb0c627d171eb18de81dddb93d395e" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Sep 27 19:29:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:01:46 2012 -0400" }, "message": "net: add gro_cells infrastructure\n\nThis adds a new include file (include/net/gro_cells.h), to bring GRO\n(Generic Receive Offload) capability to tunnels, in a modular way.\n\nBecause tunnels receive path is lockless, and GRO adds a serialization\nusing a napi_struct, I chose to add an array of up to\nDEFAULT_MAX_NUM_RSS_QUEUES cells, so that multi queue devices wont be\nslowed down because of GRO layer.\n\nskb_get_rx_queue() is used as selector.\n\nIn the future, we might add optional fanout capabilities, using rxhash\nfor example.\n\nWith help from Ben Hutchings who reminded me\nnetif_get_num_default_rss_queues() function.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "861b650101eb0c627d171eb18de81dddb93d395e", "tree": "07c0b874476d6d82f8618c071402e742b1705b66", "parents": [ "64c6d08e6490fb18cea09bb03686c149946bd818" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Sep 27 02:14:53 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:00:27 2012 -0400" }, "message": "tcp: gro: add checksuming helpers\n\nskb with CHECKSUM_NONE cant currently be handled by GRO, and\nwe notice this deep in GRO stack in tcp[46]_gro_receive()\n\nBut there are cases where GRO can be a benefit, even with a lack\nof checksums.\n\nThis preliminary work is needed to add GRO support\nto tunnels.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "64c6d08e6490fb18cea09bb03686c149946bd818", "tree": "b831092af305441c9639796e9c5e68027bdc345d", "parents": [ "515e12401f43f2fe7511d228dfe3e186be8aab6e" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Sep 26 00:04:55 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 16:49:23 2012 -0400" }, "message": "ipv6: del unreachable route when an addr is deleted on lo\n\nWhen an address is added on loopback (ip -6 a a 2002::1/128 dev lo), two routes\nare added:\n - one in the local table:\n local 2002::1 via :: dev lo proto none metric 0\n - one the in main table (for the prefix):\n unreachable 2002::1 dev lo proto kernel metric 256 error -101\n\nWhen the address is deleted, the route inserted in the main table remains\nbecause we use rt6_lookup(), which returns NULL when dst-\u003eerror is set, which\nis the case here! Thus, it is better to use ip6_route_lookup() to avoid this\nkind of filter.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f4b549a5ac818722fc13d789584f41f4e00d78b5", "tree": "2ff1b310ec9315e3f66e4bd352ee85cdc7001dae", "parents": [ "e4d680c706284ca0413a84bd2a28fda76b360904" ], "author": { "name": "Weiping Pan", "email": "wpan@redhat.com", "time": "Fri Sep 28 20:15:30 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 16:43:17 2012 -0400" }, "message": "use skb_end_offset() in skb_try_coalesce()\n\nCommit ec47ea824774(skb: Add inline helper for getting the skb end offset from\nhead) introduces this helper function, skb_end_offset(),\nwe should make use of it.\n\nSigned-off-by: Weiping Pan \u003cwpan@redhat.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc4829e5967de577794b25dfcd1a65e509d171ed", "tree": "99e14d39ac747a678df303caee99c41ce48ebd9f", "parents": [ "523f32582f30768ab4e56b71b276fc1ea71f48cc" ], "author": { "name": "Wei Yongjun", "email": "yongjun_wei@trendmicro.com.cn", "time": "Wed Sep 05 14:34:32 2012 +0800" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Oct 01 14:30:49 2012 -0500" }, "message": "ceph: use list_move_tail instead of list_del/list_add_tail\n\nUsing list_move_tail() instead of list_del() + list_add_tail().\n\nSigned-off-by: Wei Yongjun \u003cyongjun_wei@trendmicro.com.cn\u003e\nSigned-off-by: Sage Weil \u003csage@inktank.com\u003e\n" }, { "commit": "7698f2f5e0d7b7a062213fa970b7c4e121adf38e", "tree": "9f9cfdff1e250d70162484a875b76cd569e8d6ec", "parents": [ "290e33593d76d1cebf873da50e036559c4820af9" ], "author": { "name": "Iulius Curt", "email": "iulius.curt@gmail.com", "time": "Thu Aug 23 15:14:29 2012 +0300" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Oct 01 14:30:49 2012 -0500" }, "message": "libceph: Fix sparse warning\n\nMake ceph_monc_do_poolop() static to remove the following sparse warning:\n * net/ceph/mon_client.c:616:5: warning: symbol \u0027ceph_monc_do_poolop\u0027 was not\n declared. Should it be static?\nAlso drops the \u0027ceph_monc_\u0027 prefix, now being a private function.\n\nSigned-off-by: Iulius Curt \u003cicurt@ixiacom.com\u003e\nSigned-off-by: Sage Weil \u003csage@inktank.com\u003e\n" }, { "commit": "290e33593d76d1cebf873da50e036559c4820af9", "tree": "e277993f8ce1d8dcc0b368662e71435d71d6654e", "parents": [ "c98f533c9497e285109a047bfb955d683f33f7e4" ], "author": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Fri Aug 17 09:47:49 2012 -0700" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Oct 01 14:30:49 2012 -0500" }, "message": "libceph: remove unused monc-\u003ehave_fsid\n\nThis is unused; use monc-\u003eclient-\u003ehave_fsid.\n\nSigned-off-by: Sage Weil \u003csage@inktank.com\u003e\n" }, { "commit": "3498d13b8090c0b0ef911409fbc503a7c4cca6ef", "tree": "254ca00276e863d9fba25707690c66b2a04c49e9", "parents": [ "def7cb8cd4e3258db88050eaaca5438bcc3dafca", "0c57dfcc6c1d037243c2f8fbf62eab3633326ec0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:26:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:26:52 2012 -0700" }, "message": "Merge tag \u0027tty-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY changes from Greg Kroah-Hartman:\n \"As we skipped the merge window for 3.6-rc1 for the tty tree,\n everything is now settled down and working properly, so we are ready\n for 3.7-rc1. Here\u0027s the patchset, it\u0027s big, but the large changes are\n removing a firmware file and adding a staging tty driver (it depended\n on the tty core changes, so it\u0027s going through this tree instead of\n the staging tree.)\n\n All of these patches have been in the linux-next tree for a while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFix up more-or-less trivial conflicts in\n - drivers/char/pcmcia/synclink_cs.c:\n tty NULL dereference fix vs tty_port_cts_enabled() helper function\n - drivers/staging/{Kconfig,Makefile}:\n add-add conflict (dgrp driver added close to other staging drivers)\n - drivers/staging/ipack/devices/ipoctal.c:\n \"split ipoctal_channel from iopctal\" vs \"TTY: use tty_port_register_device\"\n\n* tag \u0027tty-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)\n tty/serial: Add kgdb_nmi driver\n tty/serial/amba-pl011: Quiesce interrupts in poll_get_char\n tty/serial/amba-pl011: Implement poll_init callback\n tty/serial/core: Introduce poll_init callback\n kdb: Turn KGDB_KDB\u003dn stubs into static inlines\n kdb: Implement disable_nmi command\n kernel/debug: Mask KGDB NMI upon entry\n serial: pl011: handle corruption at high clock speeds\n serial: sccnxp: Make \u0027default\u0027 choice in switch last\n serial: sccnxp: Remove mask termios caps for SW flow control\n serial: sccnxp: Report actual baudrate back to core\n serial: samsung: Add poll_get_char \u0026 poll_put_char\n Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate\n Powerpc 8xx CPM_UART maxidl should not depend on fifo size\n Powerpc 8xx CPM_UART too many interrupts\n Powerpc 8xx CPM_UART desynchronisation\n serial: set correct baud_base for EXSYS EX-41092 Dual 16950\n serial: omap: fix the reciever line error case\n 8250: blacklist Winbond CIR port\n 8250_pnp: do pnp probe before legacy probe\n ...\n" }, { "commit": "06d2fe153b9b35e57221e35831a26918f462db68", "tree": "f77cb72dfba7f2a47ceb93e120abd9399a24a1b9", "parents": [ "3aebd34b1200a902a8662da8845824a02f00772e", "e0f21e6d52cc245e7d4f7e02ca4b7b6571660ec2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:10:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:10:44 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core merge from Greg Kroah-Hartman:\n \"Here is the big driver core update for 3.7-rc1.\n\n A number of firmware_class.c updates (as you saw a month or so ago),\n and some hyper-v updates and some printk fixes as well. All patches\n that are outside of the drivers/base area have been acked by the\n respective maintainers, and have all been in the linux-next tree for a\n while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027driver-core-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (95 commits)\n memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()\n device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit\n memory: emif: Add ifdef CONFIG_DEBUG_FS guard for emif_debugfs_[init|exit]\n Documentation: Fixes some translation error in Documentation/zh_CN/gpio.txt\n Documentation: Remove 3 byte redundant code at the head of the Documentation/zh_CN/arm/booting\n Documentation: Chinese translation of Documentation/video4linux/omap3isp.txt\n device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit\n dev: Add dev_vprintk_emit and dev_printk_emit\n netdev_printk/netif_printk: Remove a superfluous logging colon\n netdev_printk/dynamic_netdev_dbg: Directly call printk_emit\n dev_dbg/dynamic_debug: Update to use printk_emit, optimize stack\n driver-core: Shut up dev_dbg_reatelimited() without DEBUG\n tools/hv: Parse /etc/os-release\n tools/hv: Check for read/write errors\n tools/hv: Fix exit() error code\n tools/hv: Fix file handle leak\n Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO\n Tools: hv: Rename the function kvp_get_ip_address()\n Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO\n Tools: hv: Add an example script to configure an interface\n ...\n" }, { "commit": "99dbb1632f1165c2726056ebfce6edde0e5a0208", "tree": "2b2fc83db20b4c6d13842496899774b0dc2868e2", "parents": [ "aae6f989c6e97ff8197717fa4d032ad4eba091a7", "9c33c512b2d3167a3580659942ee78437b1b1bc6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 09:06:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 09:06:36 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull the trivial tree from Jiri Kosina:\n \"Tiny usual fixes all over the place\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)\n doc: fix old config name of kprobetrace\n fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc\n btrfs: fix the commment for the action flags in delayed-ref.h\n btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID\n vfs: fix kerneldoc for generic_fh_to_parent()\n treewide: fix comment/printk/variable typos\n ipr: fix small coding style issues\n doc: fix broken utf8 encoding\n nfs: comment fix\n platform/x86: fix asus_laptop.wled_type module parameter\n mfd: printk/comment fixes\n doc: getdelays.c: remember to close() socket on error in create_nl_socket()\n doc: aliasing-test: close fd on write error\n mmc: fix comment typos\n dma: fix comments\n spi: fix comment/printk typos in spi\n Coccinelle: fix typo in memdup_user.cocci\n tmiofb: missing NULL pointer checks\n tools: perf: Fix typo in tools/perf\n tools/testing: fix comment / output typos\n ...\n" }, { "commit": "a248afdc1b5916c2bfd007233112333d85aa28f6", "tree": "49d4a0b8fdcf7624ea6b0bdf0af2567d7392210e", "parents": [ "d379142bc4d9b78cdd9fc5aa696ca1ea083fb7d4", "c487606f835a93a725bac1aefd536be98f22474d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 30 02:30:16 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 30 02:30:16 2012 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n\nJohn W. Linville says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nHere is another batch of updates intended for 3.7...\n\nHighlights include an hci_connect re-write in Bluetooth, HCI/LLC\nlayer separation in NFC, removal of the raw pn544 NFC driver, NFC LLCP\nraw sockets support, improved IBSS auth frame handling in mac80211,\nfull-MAC AP mode notification support in mac80211, a lot of attention\npaid to brcmfmac, and the usual level of updates to iwlwifi, ath9k,\nmwifiex, and rt2x00, and various other updates.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b96ce71974127af0304514d310abe596426c112", "tree": "fd43e1006feaa0a4c061e073057c1f276f5ff935", "parents": [ "849b286fd026a6924cc6a4315e446ed88ab983d2" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Sep 28 20:24:16 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Sep 28 20:24:16 2012 -0400" }, "message": "SUNRPC: Limit the rpciod workqueue concurrency\n\nWe shouldn\u0027t need more than 1 worker thread per cpu, since rpciod\nis designed to run without sleeping in most cases.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "188c517a050ec5b123e72cab76ea213721e5bd9d", "tree": "ac2c7777a1e61f45e803ec5d0e038ecfc5b77343", "parents": [ "24cad1b4ce9e9da6ec22cfc9361bbbe0ba4f80cc" ], "author": { "name": "Lin Ming", "email": "mlin@ss.pku.edu.cn", "time": "Tue Sep 25 15:17:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 28 18:48:28 2012 -0400" }, "message": "ipv6: return errno pointers consistently for fib6_add_1()\n\nfib6_add_1() should consistently return errno pointers,\nrather than a mixture of NULL and errno pointers.\n\nSigned-off-by: Lin Ming \u003cmlin@ss.pku.edu.cn\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d19751e7b9bd8a01d00372325439589886674f79", "tree": "71ea849e8dc6021a455f2de1a76601e8db2255c7", "parents": [ "dcfc4f25461813e8a2dd43b052aa1e0be155742f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Sep 11 17:21:25 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Sep 28 16:03:05 2012 -0400" }, "message": "SUNRPC: Get rid of the redundant xprt-\u003eshutdown bit field\n\nIt is only set after everyone has dereferenced the transport,\nand serves no useful purpose: setting it is racy, so all the\nsocket code, etc still needs to be able to cope with the cases\nwhere they miss reading it.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a11a2bf4de5679fa0b63474c7d39bea2dac7d061", "tree": "d59f027797b629d029596f968ccf65dc7916509f", "parents": [ "13fe4ba1b64c099843c75b4f0633ad30a4526637" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Aug 02 13:21:43 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Sep 28 15:58:42 2012 -0400" }, "message": "SUNRPC: Optimise away unnecessary data moves in xdr_align_pages\n\nWe only have to call xdr_shrink_pagelen() if the remaining RPC\nmessage does not fit in the page buffer length that we supplied\nto xdr_align_pages().\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db", "tree": "8faea23112a11f52524eb413f71b7b02712d8b53", "parents": [ "d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1", "6672d90fe779dc0dfffe027c3ede12609df091c2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 28 14:40:49 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 28 14:40:49 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/team/team.c\n\tdrivers/net/usb/qmi_wwan.c\n\tnet/batman-adv/bat_iv_ogm.c\n\tnet/ipv4/fib_frontend.c\n\tnet/ipv4/route.c\n\tnet/l2tp/l2tp_netlink.c\n\nThe team, fib_frontend, route, and l2tp_netlink conflicts were simply\noverlapping changes.\n\nqmi_wwan and bat_iv_ogm were of the \"use HEAD\" variety.\n\nWith help from Antonio Quartulli.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c487606f835a93a725bac1aefd536be98f22474d", "tree": "c77571a519905945e24a9ea6e4e44d9032fd527d", "parents": [ "d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1", "97ea6d0f3eb019891038cd2dfddb749d6bf219be" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 28 11:11:16 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 28 11:11:16 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tnet/nfc/netlink.c\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "69b08f62e17439ee3d436faf0b9a7ca6fffb78db", "tree": "a59ad1118535432b42821b65efe96ac27450c26a", "parents": [ "5dff747b7038d10f9c174a1245263fd1c36a644d" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Sep 26 06:46:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 19:29:35 2012 -0400" }, "message": "net: use bigger pages in __netdev_alloc_frag\n\nWe currently use percpu order-0 pages in __netdev_alloc_frag\nto deliver fragments used by __netdev_alloc_skb()\n\nDepending on NIC driver and arch being 32 or 64 bit, it allows a page to\nbe split in several fragments (between 1 and 8), assuming PAGE_SIZE\u003d4096\n\nSwitching to bigger pages (32768 bytes for PAGE_SIZE\u003d4096 case) allows :\n\n- Better filling of space (the ending hole overhead is less an issue)\n\n- Less calls to page allocator or accesses to page-\u003e_count\n\n- Could allow struct skb_shared_info futures changes without major\n performance impact.\n\nThis patch implements a transparent fallback to smaller\npages in case of memory pressure.\n\nIt also uses a standard \"struct page_frag\" instead of a custom one.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc9259a8bae9e814fc1f775a1b3effa13e6ad330", "tree": "22ec65e032e8080daca4e9ac4dd5227b532a4040", "parents": [ "68b3f28c11bf896be32ad2a2e151aaa5f4a7c98e" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Thu Sep 27 04:11:00 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 19:27:39 2012 -0400" }, "message": "inetpeer: fix token initialization\n\nWhen jiffies wraps around (for example, 5 minutes after the boot, see\nINITIAL_JIFFIES) and peer has just been created, now - peer-\u003erate_last can be\n\u003c XRLIM_BURST_FACTOR * timeout, so token is not set to the maximum value, thus\nsome icmp packets can be unexpectedly dropped.\n\nFix this case by initializing last_rate to 60 seconds in the past.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5dff747b7038d10f9c174a1245263fd1c36a644d", "tree": "7972334b850ec3eeafed5a2e9155de8ba36b7b8f", "parents": [ "bcc452935da124f26885e969ec5a78a8735d1452" ], "author": { "name": "Christoph Paasch", "email": "christoph.paasch@uclouvain.be", "time": "Wed Sep 26 11:59:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 19:20:26 2012 -0400" }, "message": "tcp: Remove unused parameter from tcp_v4_save_options\n\nstruct sock *sk is not used inside tcp_v4_save_options. Thus it can be\nremoved.\n\nSigned-off-by: Christoph Paasch \u003cchristoph.paasch@uclouvain.be\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bcc452935da124f26885e969ec5a78a8735d1452", "tree": "74fca7942a4679f13036c21036f3ac10154932dc", "parents": [ "e2bcabec6ea5ba30dd2097dc1566e9957d14117c" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Sep 26 01:39:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 18:49:22 2012 -0400" }, "message": "ipv6: gre: remove ip6gre_header_parse()\n\ndev_parse_header() callers provide 8 bytes of storage,\nso it\u0027s not possible to store an IPv6 address.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e2bcabec6ea5ba30dd2097dc1566e9957d14117c", "tree": "73c09343cd7302aea199bd1e991b81897f8ca5d7", "parents": [ "f54ba7798848ce1385a71b36a2c997422c82220a" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Tue Sep 25 11:32:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 18:42:00 2012 -0400" }, "message": "net: remove sk_init() helper\n\nIt seems sk_init() has no value today and even does strange things :\n\n# grep . /proc/sys/net/core/?mem_*\n/proc/sys/net/core/rmem_default:212992\n/proc/sys/net/core/rmem_max:131071\n/proc/sys/net/core/wmem_default:212992\n/proc/sys/net/core/wmem_max:131071\n\nWe can remove it completely.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nReviewed-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f54ba7798848ce1385a71b36a2c997422c82220a", "tree": "b93f6a9e0d456602898817b8333a430b0e5929a8", "parents": [ "e905ed57baa82e15ce9c158a8f1e81f171042504" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 18:35:47 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 18:35:47 2012 -0400" }, "message": "pkt_sched: Fix warning false positives.\n\nGCC refuses to recognize that all error control flows do in fact\nset err to something.\n\nAdd an explicit initialization to shut it up.\n\nnet/sched/sch_drr.c: In function ‘drr_enqueue’:\nnet/sched/sch_drr.c:359:11: warning: ‘err’ may be used uninitialized in this function [-Wmaybe-uninitialized]\nnet/sched/sch_qfq.c: In function ‘qfq_enqueue’:\nnet/sched/sch_qfq.c:885:11: warning: ‘err’ may be used uninitialized in this function [-Wmaybe-uninitialized]\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "4b7cc7fc26598914ba202d04d4196efb26b22e69" }