)]}' { "log": [ { "commit": "434d42cfd05a7cc452457a81d2029540cba12150", "tree": "3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422", "parents": [ "d762f4383100c2a87b1a3f2d678cd3b5425655b4", "12a5a2621b1ee14d32beca35304d7c6076a58815" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue May 24 22:55:24 2011 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue May 24 22:55:24 2011 +1000" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "57d19e80f459dd845fb3cfeba8e6df8471bac142", "tree": "8254766715720228db3d50f1ef3c7fe003c06d65", "parents": [ "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "e64851f5a0ad6ec991f74ebb3108c35aa0323d5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n b43: fix comment typo reqest -\u003e request\n Haavard Skinnemoen has left Atmel\n cris: typo in mach-fs Makefile\n Kconfig: fix copy/paste-ism for dell-wmi-aio driver\n doc: timers-howto: fix a typo (\"unsgined\")\n perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c\n md, raid5: Fix spelling error in comment (\u0027Ofcourse\u0027 --\u003e \u0027Of course\u0027).\n treewide: fix a few typos in comments\n regulator: change debug statement be consistent with the style of the rest\n Revert \"arm: mach-u300/gpio: Fix mem_region resource size miscalculations\"\n audit: acquire creds selectively to reduce atomic op overhead\n rtlwifi: don\u0027t touch with treewide double semicolon removal\n treewide: cleanup continuations and remove logging message whitespace\n ath9k_hw: don\u0027t touch with treewide double semicolon removal\n include/linux/leds-regulator.h: fix syntax in example code\n tty: fix typo in descripton of tty_termios_encode_baud_rate\n xtensa: remove obsolete BKL kernel option from defconfig\n m68k: fix comment typo \u0027occcured\u0027\n arch:Kconfig.locks Remove unused config option.\n treewide: remove extra semicolons\n ...\n" }, { "commit": "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "tree": "e5ec44a30720f1db1cd4a803b3711a2293322dc5", "parents": [ "e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f", "366a2382c68d01638350efcf23d46a47d661c595" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:10:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:10:03 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)\n HID: hid-multitouch: cosmetic changes, sort classes and devices\n HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE\n HID: hid-multitouch: add support for Unitec panels\n HID: hid-multitouch: add support for Touch International panels\n HID: hid-multitouch: add support for GoodTouch panels\n HID: hid-multitouch: add support for CVTouch panels\n HID: hid-multitouch: add support for ActionStar panels\n HID: hiddev: fix race between hiddev_disconnect and hiddev_release\n HID: magicmouse: ignore \u0027ivalid report id\u0027 while switching modes\n HID: fix a crash in hid_report_raw_event() function.\n HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus\n HID: assorted usage updates from hut 1.12\n HID: roccat: fix actual/startup profile sysfs attribute in koneplus\n HID: hid-multitouch: Add support for Lumio panels\n HID: \u0027name\u0027 and \u0027phys\u0027 in \u0027struct hid_device\u0027 can never be NULL\n HID: hid-multitouch: add support for Ilitek dual-touch panel\n HID: picolcd: Avoid compile warning/error triggered by copy_from_user()\n HID: add support for Logitech G27 wheel\n HID: hiddev: fix error path in hiddev_read when interrupted\n HID: add support for Sony Navigation Controller\n ...\n" }, { "commit": "53ee7569ce8beb3fd3fc0817116c29298d72353f", "tree": "f3dcce10508c2126347e40b468fd6d3c3cc7006a", "parents": [ "4d9dec4db2efbd7edb549bd02373995b67496983", "1b6e2ceb4745b5838cb94463131d19dbea6cf0e3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 08:39:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 08:39:24 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)\n bnx2x: allow device properly initialize after hotplug\n bnx2x: fix DMAE timeout according to hw specifications\n bnx2x: properly handle CFC DEL in cnic flow\n bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb\n net: filter: move forward declarations to avoid compile warnings\n pktgen: refactor pg_init() code\n pktgen: use vzalloc_node() instead of vmalloc_node() + memset()\n net: skb_trim explicitely check the linearity instead of data_len\n ipv4: Give backtrace in ip_rt_bug().\n net: avoid synchronize_rcu() in dev_deactivate_many\n net: remove synchronize_net() from netdev_set_master()\n rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event\n net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE\n bridge: call NETDEV_JOIN notifiers when add a slave\n netpoll: disable netpoll when enslave a device\n macvlan: Forward unicast frames in bridge mode to lowerdev\n net: Remove linux/prefetch.h include from linux/skbuff.h\n ipv4: Include linux/prefetch.h in fib_trie.c\n netlabel: Remove prefetches from list handlers.\n drivers/net: add prefetch header for prefetch users\n ...\n\nFixed up prefetch parts: removed a few duplicate prefetch.h includes,\nfixed the location of the igb prefetch.h, took my version of the\nskbuff.h code without the extra parentheses etc.\n" }, { "commit": "a1e4891fd48d298870b704c6eb48cba0da5ed6b1", "tree": "96fa29fd0c3803f1d1803e1b979c6ac8345fff5a", "parents": [ "70c71606190e9115e5f8363bfcd164c582eb314a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 16:51:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:43:41 2011 -0700" }, "message": "Remove prefetch() from \u003clinux/skbuff.h\u003e and \"netlabel_addrlist.h\"\n\nCommit e66eed651fd1 (\"list: remove prefetching from regular list\niterators\") removed the include of prefetch.h from list.h. The skbuff\nlist traversal still had them.\n\nQuoth David Miller:\n \"Please just remove the prefetches.\n\n Those are modelled after list.h as I intend to eventually convert\n SKB list handling to \"struct list_head\" but we\u0027re not there yet.\n\n Therefore if we kill prefetches from list.h we should kill it from\n these things in skbuff.h too.\"\n\nRequested-by: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "70c71606190e9115e5f8363bfcd164c582eb314a", "tree": "17c7f6b5df814b9ed319bc0d839969a0de741433", "parents": [ "281dc5c5ec0fb299514567cbc358562649c1af95" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun May 22 16:47:17 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:41:57 2011 -0700" }, "message": "Add appropriate \u003clinux/prefetch.h\u003e include for prefetch users\n\nAfter discovering that wide use of prefetch on modern CPUs\ncould be a net loss instead of a win, net drivers which were\nrelying on the implicit inclusion of prefetch.h via the list\nheaders showed up in the resulting cleanup fallout. Give\nthem an explicit include via the following $0.02 script.\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #!/bin/bash\n MANUAL\u003d\"\"\n for i in `git grep -l \u0027prefetch(.*)\u0027 .` ; do\n \tgrep -q \u0027\u003clinux/prefetch.h\u003e\u0027 $i\n \tif [ $? \u003d 0 ] ; then\n \t\tcontinue\n \tfi\n\n \t(\techo \u0027?^#include \u003clinux/?a\u0027\n \t\techo \u0027#include \u003clinux/prefetch.h\u003e\u0027\n \t\techo .\n \t\techo w\n \t\techo q\n \t) | ed -s $i \u003e /dev/null 2\u003e\u00261\n \tif [ $? !\u003d 0 ]; then\n \t\techo $i needs manual fixup\n \t\tMANUAL\u003d\"$i $MANUAL\"\n \tfi\n done\n echo ------------------- 8\\\u003c----------------------\n echo vi $MANUAL\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Paul \u003cpaul.gortmaker@windriver.com\u003e\n[ Fixed up some incorrect #include placements, and added some\n non-network drivers and the fib_trie.c case - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ce14f8946a294ffa741ec29558a1c7e455cecd3b", "tree": "0c96385fe8647f750a6a797bf0c192a732a1f69c", "parents": [ "68d5ac2ed6180567407e4187e206df3ba6466373" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Sun May 22 00:52:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:22 2011 -0400" }, "message": "pktgen: refactor pg_init() code\n\nThis also shrinks the object size a little.\n\n text\t data\t bss\t dec\t hex\tfilename\n 28834\t 186\t 8\t 29028\t 7164\tnet/core/pktgen.o\n 28816\t 186\t 8\t 29010\t 7152\tnet/core/pktgen.o.AFTER\n\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nCc: \"David Miller\" \u003cdavem@davemloft.net\u003e,\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68d5ac2ed6180567407e4187e206df3ba6466373", "tree": "061f3cb53c56333c72ca83c2fc7d9b34d5539a45", "parents": [ "c4264f27e83968ddfe3f0cfe7a33adfb320e1e42" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Sun May 22 00:17:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:21 2011 -0400" }, "message": "pktgen: use vzalloc_node() instead of vmalloc_node() + memset()\n\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c378a9c019cf5e017d1ed24954b54fae7bebd2bc", "tree": "4ac192542d8c5de29fc014f56b659a554f59017c", "parents": [ "3137663dfb43bb3e3174e9da81db0c05f395fc1b" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Sat May 21 07:16:42 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:20 2011 -0400" }, "message": "ipv4: Give backtrace in ip_rt_bug().\n\nAdd a stack backtrace to the ip_rt_bug path for debugging\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3137663dfb43bb3e3174e9da81db0c05f395fc1b", "tree": "d3a09e8eb8655215c9a730da6798e9623f7f0d03", "parents": [ "6df427fe8c481d3be437cbe8bd366bdac82b73c4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 19 23:42:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:20 2011 -0400" }, "message": "net: avoid synchronize_rcu() in dev_deactivate_many\n\ndev_deactivate_many() issues one synchronize_rcu() call after qdiscs set\nto noop_qdisc.\n\nThis call is here to make sure they are no outstanding qdisc-less\ndev_queue_xmit calls before returning to caller.\n\nBut in dismantle phase, we dont have to wait, because we wont activate\nagain the device, and we are going to wait one rcu grace period later in\nrollback_registered_many().\n\nAfter this patch, device dismantle uses one synchronize_net() and one\nrcu_barrier() call only, so we have a ~30% speedup and a smaller RTNL\nlatency.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e,\nCC: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6df427fe8c481d3be437cbe8bd366bdac82b73c4", "tree": "5107145d367b646f815493bfcee75e2c0abfca3b", "parents": [ "ac3d3f81516fcbf80416e84682fd4bdaf3080611" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 19 19:37:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:20 2011 -0400" }, "message": "net: remove synchronize_net() from netdev_set_master()\n\nIn the old days, we used to access dev-\u003emaster in __netif_receive_skb()\nin a rcu_read_lock section.\n\nSo one synchronize_net() call was needed in netdev_set_master() to make\nsure another cpu could not use old master while/after we release it.\n\nWe now use netdev_rx_handler infrastructure and added one\nsynchronize_net() call in bond_release()/bond_release_all()\n\nRemove the obsolete synchronize_net() from netdev_set_master() and add\none in bridge del_nbp() after its netdev_rx_handler_unregister() call.\n\nThis makes enslave -d a bit faster.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jiri Pirko \u003cjpirko@redhat.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ac3d3f81516fcbf80416e84682fd4bdaf3080611", "tree": "08a5f99c6c0763dc7b282f3b0a6a3a6382e6c2c1", "parents": [ "daf9209bb2c8b07ca025eac82e3d175534086c77" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu May 19 23:06:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:19 2011 -0400" }, "message": "rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event\n\nThese two events are not expected to be caught by userspace.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb8ed6302b0613339c1a5f0a2cb0b3807c0af611", "tree": "11fac5a62c192453f01cab4aedc81b0cdc91c900", "parents": [ "8d8fc29d02a33e4bd5f4fa47823c1fd386346093" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu May 19 21:39:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:19 2011 -0400" }, "message": "bridge: call NETDEV_JOIN notifiers when add a slave\n\nIn the previous patch I added NETDEV_JOIN, now\nwe can notify netconsole when adding a device to a bridge too.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Neil Horman \u003cnhorman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "120a3d5c7c1f37752e7956d296a4f031f38cb217", "tree": "e89b30c792d36f6d771d7d97d369c7367f0ce2d7", "parents": [ "474b4c4ff007c992ea7dc88ba2605aa124f8bafb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:53:43 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:53:43 2011 -0400" }, "message": "ipv4: Include linux/prefetch.h in fib_trie.c\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "474b4c4ff007c992ea7dc88ba2605aa124f8bafb", "tree": "609ac1751a31272d42676997e9e08368a5ec0c53", "parents": [ "c0cba59e77b5640912a331566bbfa66ae5029f37" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:42:10 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:42:10 2011 -0400" }, "message": "netlabel: Remove prefetches from list handlers.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "69c867c90c7fe0773d9aa4e8bbf777f574be13d2", "tree": "b67c6269246eb32f6826d590ed6067c5ab87e9a2", "parents": [ "138eded8ba1227261a297b32b7940664c14d193e" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sun May 22 11:18:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:11:49 2011 -0400" }, "message": "caif: Plug memory leak for checksum error\n\nIn case of checksum error, the framing layer returns -EILSEQ, but\ndoes not free the packet. Plug this hole by freeing the packet if\n-EILSEQ is returned.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "96796ea8b6b1221c7cacf68ce056d77eff0a793d", "tree": "f33631705de231bd86c827d69059526da1e00394", "parents": [ "54e90fb5ca8050156d3e748ddc690ed6ea9d71ac" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sun May 22 11:18:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:11:48 2011 -0400" }, "message": "caif: Fix freezes when running CAIF loopback device\n\nFix spinlock bugs when running out of link-ids in loopback tests and\navoid allocating link-id when error is set in link-setup-response.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "54e90fb5ca8050156d3e748ddc690ed6ea9d71ac", "tree": "63a4d1a736a7c44cc88b69e41dec9c4885ef2f74", "parents": [ "0e5a117441ce245b87949cc7713627a293f37227" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sun May 22 11:18:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:11:47 2011 -0400" }, "message": "caif: Fixes freeze on Link layer removal.\n\nCAIF Socket layer - caif_socket.c:\n- Plug mem-leak at reconnect.\n- Always call disconnect to cleanup CAIF stack.\n- Disconnect will always report success.\n\nCAIF configuration layer - cfcnfg.c\n- Disconnect must dismantle the caif stack correctly\n- Protect against faulty removals (check on id zero)\n\nCAIF mux layer - cfmuxl.c\n- When inserting new service layer in the MUX remove\n any old entries with the same ID.\n- When removing CAIF Link layer, remove the associated\n service layers before notifying service layers.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0e5a117441ce245b87949cc7713627a293f37227", "tree": "ab454275481ff94b7830d61160470d73738e3c31", "parents": [ "71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sun May 22 11:18:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:11:47 2011 -0400" }, "message": "caif: Bugfix add check NULL pointer before calling functions.\n\nAdd check on layer-\u003edn !\u003d NULL before calling functions in\nlayer below.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d414521663295ce25c90164f4d41a07ac846468", "tree": "50a3175fe7292ab775cf8031eee510aec2356de4", "parents": [ "0a384b226f61b310586701669b573b49cfcbf436" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:10:23 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:10:23 2011 -0400" }, "message": "sctp: Fix build failure.\n\nCommit c182f90bc1f22ce5039b8722e45621d5f96862c2 (\"SCTP: fix race\nbetween sctp_bind_addr_free() and sctp_bind_addr_conflict()\") and\ncommit 1231f0baa547a541a7481119323b7f964dda4788 (\"net,rcu: convert\ncall_rcu(sctp_local_addr_free) to kfree_rcu()\"), happening in\ndifferent trees, introduced a build failure.\n\nSimply make the SCTP race fix use kfree_rcu() too.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a384b226f61b310586701669b573b49cfcbf436", "tree": "e1fb1a74d916b14f327cb01cbb02f2b45ae6cf35", "parents": [ "0f6c6392dca9c4825c98322a1bf74991e4f0f54d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri May 20 18:31:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:05:22 2011 -0400" }, "message": "garp: use kfree_rcu()\n\nUse kfree_rcu() instead of call_rcu(), remove garp_cleanup_module()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f6c6392dca9c4825c98322a1bf74991e4f0f54d", "tree": "6100a2d32a99b3f735bbb41d9749362ead92fb22", "parents": [ "557eed603159b4e007c57d97fad1333ecebd3c2e" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Fri May 20 11:27:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 21 02:05:22 2011 -0400" }, "message": "ipv6: copy prefsrc setting when copying route entry\n\ncommit c3968a857a6b6c3d2ef4ead35776b055fb664d74\n(\u0027ipv6: RTA_PREFSRC support for ipv6 route source address selection\u0027)\nadded support for ipv6 prefsrc as an alternative to ipv6 addrlabels,\nbut it did not work because the prefsrc entry was not copied.\n\nCc: Daniel Walter \u003csahne@0x90.at\u003e\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "06f4e926d256d902dd9a53dcb400fd74974ce087", "tree": "0b438b67f5f0eff6fd617bc497a9dace6164a488", "parents": [ "8e7bfcbab3825d1b404d615cb1b54f44ff81f981", "d93515611bbc70c2fe4db232e5feb448ed8e4cc9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)\n macvlan: fix panic if lowerdev in a bond\n tg3: Add braces around 5906 workaround.\n tg3: Fix NETIF_F_LOOPBACK error\n macvlan: remove one synchronize_rcu() call\n networking: NET_CLS_ROUTE4 depends on INET\n irda: Fix error propagation in ircomm_lmp_connect_response()\n irda: Kill set but unused variable \u0027bytes\u0027 in irlan_check_command_param()\n irda: Kill set but unused variable \u0027clen\u0027 in ircomm_connect_indication()\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_transport()\n be2net: Kill set but unused variable \u0027req\u0027 in lancer_fw_download()\n irda: Kill set but unused vars \u0027saddr\u0027 and \u0027daddr\u0027 in irlan_provider_connect_indication()\n atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_peer().\n rxrpc: Kill set but unused variable \u0027local\u0027 in rxrpc_UDP_error_handler()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_process_connection()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_rotate_tx_window()\n pkt_sched: Kill set but unused variable \u0027protocol\u0027 in tc_classify()\n isdn: capi: Use pr_debug() instead of ifdefs.\n tg3: Update version to 3.119\n tg3: Apply rx_discards fix to 5719/5720\n ...\n\nFix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c\nas per Davem.\n" }, { "commit": "268bb0ce3e87872cb9290c322b0d35bce230d88f", "tree": "c8331ade4a3e24fc589c4eb62731bc2312d35333", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 12:50:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 12:50:29 2011 -0700" }, "message": "sanitize \u003clinux/prefetch.h\u003e usage\n\nCommit e66eed651fd1 (\"list: remove prefetching from regular list\niterators\") removed the include of prefetch.h from list.h, which\nuncovered several cases that had apparently relied on that rather\nobscure header file dependency.\n\nSo this fixes things up a bit, using\n\n grep -L linux/prefetch.h $(git grep -l \u0027[^a-z_]prefetchw*(\u0027 -- \u0027*.[ch]\u0027)\n grep -L \u0027prefetchw*(\u0027 $(git grep -l \u0027linux/prefetch.h\u0027 -- \u0027*.[ch]\u0027)\n\nto guide us in finding files that either need \u003clinux/prefetch.h\u003e\ninclusion, or have it despite not needing it.\n\nThere are more of them around (mostly network drivers), but this gets\nmany core ones.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "449f4544267e73d5db372971da63634707c32299", "tree": "acee6de13f34c179ec46ef7f8a49e66b229f4460", "parents": [ "034cfe48d0efc248ba4b725e3a94b95e76fbc5d3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 19 12:24:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 00:33:18 2011 -0400" }, "message": "macvlan: remove one synchronize_rcu() call\n\nWhen one macvlan device is dismantled, we can avoid one\nsynchronize_rcu() call done after deletion from hash list, since caller\nwill perform a synchronize_net() call after its ndo_stop() call.\n\nAdd a new netdev-\u003edismantle field to signal this dismantle intent.\n\nReduces RTNL hold time.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb04f2f04ed1227c266b3219c0aaeda525639718", "tree": "7f224483a3cd0e439cd64a8666ec9dc5ed178a3d", "parents": [ "5765040ebfc9a28d9dcfaaaaf3d25840d922de96", "80d02085d99039b3b7f3a73c8896226b0cb1ba07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:14:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:14:34 2011 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (78 commits)\n Revert \"rcu: Decrease memory-barrier usage based on semi-formal proof\"\n net,rcu: convert call_rcu(prl_entry_destroy_rcu) to kfree\n batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu\n batman,rcu: convert call_rcu(neigh_node_free_rcu) to kfree()\n batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcu\n net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()\n net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()\n net/mac80211,rcu: convert call_rcu(work_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(phonet_device_rcu_free) to kfree_rcu()\n perf,rcu: convert call_rcu(swevent_hlist_release_rcu) to kfree_rcu()\n perf,rcu: convert call_rcu(free_ctx) to kfree_rcu()\n net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()\n net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu()\n net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()\n security,rcu: convert call_rcu(sel_netif_free) to kfree_rcu()\n net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()\n net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()\n net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()\n ...\n" }, { "commit": "034cfe48d0efc248ba4b725e3a94b95e76fbc5d3", "tree": "e5a9079bd3b40f1ef4dd9f88d75a79b862f073a0", "parents": [ "8ce6eb1a4a4bc46820f23e927377d386d3ec5404" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu May 19 19:23:28 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 19:23:28 2011 -0400" }, "message": "networking: NET_CLS_ROUTE4 depends on INET\n\nIP_ROUTE_CLASSID depends on INET and NET_CLS_ROUTE4 selects\nIP_ROUTE_CLASSID, but when INET is not enabled, this kconfig warning\nis produced, so fix it by making NET_CLS_ROUTE4 depend on INET.\n\nwarning: (NET_CLS_ROUTE4) selects IP_ROUTE_CLASSID which has unmet direct dependencies (NET \u0026\u0026 INET)\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ce6eb1a4a4bc46820f23e927377d386d3ec5404", "tree": "03365bd164a28786402539083147041a2864525f", "parents": [ "ad6376434c945495ea8c4082ad8a392cc58c3406" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:58:39 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:58:39 2011 -0400" }, "message": "irda: Fix error propagation in ircomm_lmp_connect_response()\n\nThe variable \u0027ret\u0027 is set but unused, and this pointed out that\nerrors from irlmp_connect_response() are not propagated to the\ncaller.\n\nNote that this is currently academic since irlmp_connect_response()\nalways returns 0. :-)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad6376434c945495ea8c4082ad8a392cc58c3406", "tree": "3b93744f8e03718b574e94b1ce32e4dac6c40d96", "parents": [ "bfad6ef6d29e776472b3ead1f5bc920c5410ed2c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:53:58 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:53:58 2011 -0400" }, "message": "irda: Kill set but unused variable \u0027bytes\u0027 in irlan_check_command_param()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfad6ef6d29e776472b3ead1f5bc920c5410ed2c", "tree": "d4a8b29713a027c00fe2d3031d333b2831b766ab", "parents": [ "ed84cadb21e15a3e59a2154158c58579774f0851" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:52:59 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:52:59 2011 -0400" }, "message": "irda: Kill set but unused variable \u0027clen\u0027 in ircomm_connect_indication()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ed84cadb21e15a3e59a2154158c58579774f0851", "tree": "b633d0a680792adc26c147b07977036ccacb1c1d", "parents": [ "63722966d703aeb8071d52172de87e377006cd28" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:51:50 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:51:50 2011 -0400" }, "message": "rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_transport()\n\nThis is identical to the case I fixed in rxrpc_get_peer()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa7479cf48103ee9261398034528495966bd7d2d", "tree": "d68ba8f1e9e8cd918cb4db16cb97a5c6f26bda08", "parents": [ "d187c1aab8d30771bb781c745b150f6159467d6f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:46:41 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:46:41 2011 -0400" }, "message": "irda: Kill set but unused vars \u0027saddr\u0027 and \u0027daddr\u0027 in irlan_provider_connect_indication()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a64255019e13dd975f1487cec32b873bcb76da6", "tree": "81c6fef1eb709a528bec87e9e26070a06050a434", "parents": [ "c9d10c497c3728a5c798c11486dccdc01b2092a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:41:03 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:41:03 2011 -0400" }, "message": "rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_peer().\n\nI backed off from trying to just eliminate this variable, since\ntransforming atomic_inc_return() into atomic_inc() takes away\nthe memory barriers.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9d10c497c3728a5c798c11486dccdc01b2092a8", "tree": "88d0001740d9bd066d0011c307ec6936b4d22076", "parents": [ "9e5e10a22507b8d372bcf0e88875d4a3f6ede297" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:37:11 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:37:11 2011 -0400" }, "message": "rxrpc: Kill set but unused variable \u0027local\u0027 in rxrpc_UDP_error_handler()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e5e10a22507b8d372bcf0e88875d4a3f6ede297", "tree": "8da8a268c11bc97a867f84c5d3bb374130684fb6", "parents": [ "504f284a713c46c6ecf975fbd20af00f4e205f5b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:35:58 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:35:58 2011 -0400" }, "message": "rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_process_connection()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "504f284a713c46c6ecf975fbd20af00f4e205f5b", "tree": "3ab0ad4055e76b2085d2d27daf601bd3c8293b80", "parents": [ "f06cd54f555a4ceca4de39160c68c7e3da657e89" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:34:37 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:34:37 2011 -0400" }, "message": "rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_rotate_tx_window()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f06cd54f555a4ceca4de39160c68c7e3da657e89", "tree": "f05c7617954ad5c8420d4c422dda50285a6e6e36", "parents": [ "8fb53b959bd9e503b646a3d68c7b1759667b6a19" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:32:55 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:32:55 2011 -0400" }, "message": "pkt_sched: Kill set but unused variable \u0027protocol\u0027 in tc_classify()\n\nI checked the history and this has been like this since the\nbeginning of time.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b5ed8afe48ca6916daabf9822e7a19fc19fdab4", "tree": "70918c203246e73133b276727984c78ed14da709", "parents": [ "99517e3d7930f8cc064f7e9443b1b441e00e83d7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 17:45:29 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 17:45:29 2011 -0400" }, "message": "9p: Kill unused variable \u0027ret\u0027 in trans_rdma.c:parse_opts()\n\nProbably just cut and pasted from the other parse_opts() implementations\nin the 9p sources.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99517e3d7930f8cc064f7e9443b1b441e00e83d7", "tree": "62479bb17b58adc49e0c6d11f125eaff36bfd01f", "parents": [ "3fb72f1e6e6165c5f495e8dc11c5bbd14c73385c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 17:38:57 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 17:38:57 2011 -0400" }, "message": "9p: Kill set but not used variable \u0027ret\u0027 in parse_opts()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3fb72f1e6e6165c5f495e8dc11c5bbd14c73385c", "tree": "e47295482bb91c6f837de040cb4abe5b79be7019", "parents": [ "c182f90bc1f22ce5039b8722e45621d5f96862c2" ], "author": { "name": "Micha Nelissen", "email": "micha@neli.hopto.org", "time": "Thu May 19 10:14:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 17:13:04 2011 -0400" }, "message": "ipconfig wait for carrier\n\nv3 -\u003e v4: fix return boolean false instead of 0 for ic_is_init_dev\n\nCurrently the ip auto configuration has a hardcoded delay of 1 second.\nWhen (ethernet) link takes longer to come up (e.g. more than 3 seconds),\nnfs root may not be found.\n\nRemove the hardcoded delay, and wait for carrier on at least one network\ndevice.\n\nSigned-off-by: Micha Nelissen \u003cmicha@neli.hopto.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c182f90bc1f22ce5039b8722e45621d5f96862c2", "tree": "48c5f4f727a2aa7fcde81fccc4ab26f9a0c1a517", "parents": [ "be281e554e2a4cf2478df7a8b8926c89454bccfa" ], "author": { "name": "Jacek Luczak", "email": "difrost.kernel@gmail.com", "time": "Thu May 19 09:55:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 17:13:04 2011 -0400" }, "message": "SCTP: fix race between sctp_bind_addr_free() and sctp_bind_addr_conflict()\n\nDuring the sctp_close() call, we do not use rcu primitives to\ndestroy the address list attached to the endpoint. At the same\ntime, we do the removal of addresses from this list before\nattempting to remove the socket from the port hash\n\nAs a result, it is possible for another process to find the socket\nin the port hash that is in the process of being closed. It then\nproceeds to traverse the address list to find the conflict, only\nto have that address list suddenly disappear without rcu() critical\nsection.\n\nFix issue by closing address list removal inside RCU critical\nsection.\n\nRace can result in a kernel crash with general protection fault or\nkernel NULL pointer dereference:\n\nkernel: general protection fault: 0000 [#1] SMP\nkernel: RIP: 0010:[\u003cffffffffa02f3dde\u003e] [\u003cffffffffa02f3dde\u003e] sctp_bind_addr_conflict+0x64/0x82 [sctp]\nkernel: Call Trace:\nkernel: [\u003cffffffffa02f415f\u003e] ? sctp_get_port_local+0x17b/0x2a3 [sctp]\nkernel: [\u003cffffffffa02f3d45\u003e] ? sctp_bind_addr_match+0x33/0x68 [sctp]\nkernel: [\u003cffffffffa02f4416\u003e] ? sctp_do_bind+0xd3/0x141 [sctp]\nkernel: [\u003cffffffffa02f5030\u003e] ? sctp_bindx_add+0x4d/0x8e [sctp]\nkernel: [\u003cffffffffa02f5183\u003e] ? sctp_setsockopt_bindx+0x112/0x4a4 [sctp]\nkernel: [\u003cffffffff81089e82\u003e] ? generic_file_aio_write+0x7f/0x9b\nkernel: [\u003cffffffffa02f763e\u003e] ? sctp_setsockopt+0x14f/0xfee [sctp]\nkernel: [\u003cffffffff810c11fb\u003e] ? do_sync_write+0xab/0xeb\nkernel: [\u003cffffffff810e82ab\u003e] ? fsnotify+0x239/0x282\nkernel: [\u003cffffffff810c2462\u003e] ? alloc_file+0x18/0xb1\nkernel: [\u003cffffffff8134a0b1\u003e] ? compat_sys_setsockopt+0x1a5/0x1d9\nkernel: [\u003cffffffff8134aaf1\u003e] ? compat_sys_socketcall+0x143/0x1a4\nkernel: [\u003cffffffff810467dc\u003e] ? sysenter_dispatch+0x7/0x32\n\nSigned-off-by: Jacek Luczak \u003cluczak.jacek@gmail.com\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "be281e554e2a4cf2478df7a8b8926c89454bccfa", "tree": "7e80e5eb0aa76efcdb39a06413ff9e0ae73de35a", "parents": [ "75e308c894c4a5e47c005b8e821ae5f539ad2ef3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 19 01:14:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 16:21:22 2011 -0400" }, "message": "ipv6: reduce per device ICMP mib sizes\n\nipv6 has per device ICMP SNMP counters, taking too much space because\nthey use percpu storage.\n\nneeded size per device is :\n(512+4)*sizeof(long)*number_of_possible_cpus*2\n\nOn a 32bit kernel, 16 possible cpus, this wastes more than 64kbytes of\nmemory per ipv6 enabled network device, taken in vmalloc pool.\n\nSince ICMP messages are rare, just use shared counters (atomic_long_t)\n\nPer network space ICMP counters are still using percpu memory, we might\nalso convert them to shared counters in a future patch.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Denys Fedoryshchenko \u003cdenys@visp.net.lb\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75e308c894c4a5e47c005b8e821ae5f539ad2ef3", "tree": "2bd8e3e35f42854fc49a34282c7c83b280c63840", "parents": [ "bb0cd2fb539c4e454ed32e32194acc03b75753f3" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed May 18 21:16:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 16:17:51 2011 -0400" }, "message": "net: ping: fix the coding style\n\nThe characters in a line should be no more than 80.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb0cd2fb539c4e454ed32e32194acc03b75753f3", "tree": "e47d019230025967f8f25bfabdfe6f51dce595c6", "parents": [ "6b60d7b9df727726dfb7e59ca0a7caf14e81e0a2" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed May 18 21:16:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 16:17:51 2011 -0400" }, "message": "net: ping: make local functions static\n\nAs these functions are only used in this file.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b60d7b9df727726dfb7e59ca0a7caf14e81e0a2", "tree": "8a10fdde837d105b9cd6f5d59dc0fa31081236ee", "parents": [ "a48eff128865aa20520fa6e0e0c5fbd2ac50d712", "abb57ea48fd9431fa320a5c55f73e6b5a44c2efb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 15:55:45 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 15:55:45 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "12a5a2621b1ee14d32beca35304d7c6076a58815", "tree": "213e13f99de690b3c4a510f504393b63ada626bd", "parents": [ "e77dc3460fa59be5759e9327ad882868eee9d61b", "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu May 19 18:51:57 2011 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu May 19 18:51:57 2011 +1000" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tinclude/linux/capability.h\n\nManually resolve merge conflict w/ thanks to Stephen Rothwell.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "a48eff128865aa20520fa6e0e0c5fbd2ac50d712", "tree": "c60e376c3fca23bb215c977e42661187076dccbf", "parents": [ "ed2361e66eec60645f8e4715fe39a42235ef43ae" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:42:43 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:42:43 2011 -0400" }, "message": "ipv4: Pass explicit destination address to rt_bind_peer().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ed2361e66eec60645f8e4715fe39a42235ef43ae", "tree": "96c6f4fa75456647d62c245b87b0d3ce97ce462b", "parents": [ "6bd023f3dddfc7c5f660089598c10e1f4167083b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:38:54 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:38:54 2011 -0400" }, "message": "ipv4: Pass explicit destination address to rt_get_peer().\n\nThis will next trickle down to rt_bind_peer().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6bd023f3dddfc7c5f660089598c10e1f4167083b", "tree": "925a7a31d3db434cfda8679cb46e466697ef8bdd", "parents": [ "6882f933ccee5c3a86443ffc7621ce888b93ab6b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:32:03 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:32:03 2011 -0400" }, "message": "ipv4: Make caller provide flowi4 key to inet_csk_route_req().\n\nThis way the caller can get at the fully resolved fl4-\u003e{daddr,saddr}\netc.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6882f933ccee5c3a86443ffc7621ce888b93ab6b", "tree": "07998f54bd459c5345491fbaeae03bd60540c6e8", "parents": [ "12f4d0a8770ab26639091d0b2509b19681daad69" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:23:21 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 18:23:21 2011 -0400" }, "message": "ipv4: Kill RT_CACHE_DEBUG\n\nIt\u0027s way past it\u0027s usefulness. And this gets rid of a bunch\nof stray -\u003ert_{dst,src} references.\n\nEven the comment documenting the macro was inaccurate (stated\ndefault was 1 when it\u0027s 0).\n\nIf reintroduced, it should be done properly, with dynamic debug\nfacilities.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a", "tree": "f2f77cc31b4548745778fca6a51b09e1d8a49804", "parents": [ "b50f315cbb865079a16a12fd9ae6083f98fd592c", "c1d10d18c542278b7fbc413c289d3cb6219da6b3" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed May 18 17:06:31 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed May 18 17:06:49 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into upstream.\n\nThis is sync with Linus\u0027 tree to receive KEY_IMAGES definition\nthat went in through input tree.\n" }, { "commit": "abb57ea48fd9431fa320a5c55f73e6b5a44c2efb", "tree": "6e0cd8111a936a136f3d5ed744f3aeeea6f7d831", "parents": [ "7cc31a9ae1477abc79d5992b3afe889f25c50c99" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 18 02:21:31 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 18 02:21:31 2011 -0400" }, "message": "net: add skb_dst_force() in sock_queue_err_skb()\n\nCommit 7fee226ad239 (add a noref bit on skb dst) forgot to use\nskb_dst_force() on packets queued in sk_error_queue\n\nThis triggers following warning, for applications using IP_CMSG_PKTINFO\nreceiving one error status\n\n\n------------[ cut here ]------------\nWARNING: at include/linux/skbuff.h:457 ip_cmsg_recv_pktinfo+0xa6/0xb0()\nHardware name: 2669UYD\nModules linked in: isofs vboxnetadp vboxnetflt nfsd ebtable_nat ebtables\nlib80211_crypt_ccmp uinput xcbc hdaps tp_smapi thinkpad_ec radeonfb fb_ddc\nradeon ttm drm_kms_helper drm ipw2200 intel_agp intel_gtt libipw i2c_algo_bit\ni2c_i801 agpgart rng_core cfbfillrect cfbcopyarea cfbimgblt video raid10 raid1\nraid0 linear md_mod vboxdrv\nPid: 4697, comm: miredo Not tainted 2.6.39-rc6-00569-g5895198-dirty #22\nCall Trace:\n [\u003cc17746b6\u003e] ? printk+0x1d/0x1f\n [\u003cc1058302\u003e] warn_slowpath_common+0x72/0xa0\n [\u003cc15bbca6\u003e] ? ip_cmsg_recv_pktinfo+0xa6/0xb0\n [\u003cc15bbca6\u003e] ? ip_cmsg_recv_pktinfo+0xa6/0xb0\n [\u003cc1058350\u003e] warn_slowpath_null+0x20/0x30\n [\u003cc15bbca6\u003e] ip_cmsg_recv_pktinfo+0xa6/0xb0\n [\u003cc15bbdd7\u003e] ip_cmsg_recv+0x127/0x260\n [\u003cc154f82d\u003e] ? skb_dequeue+0x4d/0x70\n [\u003cc1555523\u003e] ? skb_copy_datagram_iovec+0x53/0x300\n [\u003cc178e834\u003e] ? sub_preempt_count+0x24/0x50\n [\u003cc15bdd2d\u003e] ip_recv_error+0x23d/0x270\n [\u003cc15de554\u003e] udp_recvmsg+0x264/0x2b0\n [\u003cc15ea659\u003e] inet_recvmsg+0xd9/0x130\n [\u003cc1547752\u003e] sock_recvmsg+0xf2/0x120\n [\u003cc11179cb\u003e] ? might_fault+0x4b/0xa0\n [\u003cc15546bc\u003e] ? verify_iovec+0x4c/0xc0\n [\u003cc1547660\u003e] ? sock_recvmsg_nosec+0x100/0x100\n [\u003cc1548294\u003e] __sys_recvmsg+0x114/0x1e0\n [\u003cc1093895\u003e] ? __lock_acquire+0x365/0x780\n [\u003cc1148b66\u003e] ? fget_light+0xa6/0x3e0\n [\u003cc1148b7f\u003e] ? fget_light+0xbf/0x3e0\n [\u003cc1148aee\u003e] ? fget_light+0x2e/0x3e0\n [\u003cc1549f29\u003e] sys_recvmsg+0x39/0x60\n\nClose bug https://bugzilla.kernel.org/show_bug.cgi?id\u003d34622\n\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9cbc94eabb0791906051bbfac024ef2c2be8e079", "tree": "41ba194e687c6c60f5c883f98737ac83257d0c00", "parents": [ "1d1652cbdb9885e4d73972263e4cdbe1b0beebfe", "7cc31a9ae1477abc79d5992b3afe889f25c50c99" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 17:33:11 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 17:33:11 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/vmxnet3/vmxnet3_ethtool.c\n\tnet/core/dev.c\n" }, { "commit": "1d1652cbdb9885e4d73972263e4cdbe1b0beebfe", "tree": "6ded7338cfec98f1adf0b5606dc9a09a0f701d9d", "parents": [ "11e73de7ccc1c9c61c65f914a214cb6467966a51" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 17:28:02 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 17:28:02 2011 -0400" }, "message": "ipv4: Don\u0027t use enums as bitmasks in ip_fragment.c\n\nNoticed by Joe Perches.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7cc31a9ae1477abc79d5992b3afe889f25c50c99", "tree": "0ae1d4ef45063f72e01114064390c1830f27a03c", "parents": [ "604ae14ffb6d75d6eef4757859226b758d6bf9e3" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue May 17 16:50:02 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 16:50:02 2011 -0400" }, "message": "net: ethtool: fix IPV6 checksum feature name string\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "604ae14ffb6d75d6eef4757859226b758d6bf9e3", "tree": "654f931cddafee84c5ed248c463da770055c820d", "parents": [ "b9eb8b8752804cecbacdb4d24b52e823cf07f107" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon May 16 10:37:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 15:44:10 2011 -0400" }, "message": "net: Change netdev_fix_features messages loglevel\n\nCool, how about we make \u0027Features changed\u0027 debug as well?\nThis way userspace can\u0027t fill up the log just by tweaking tun features\nwith an ioctl.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b9eb8b8752804cecbacdb4d24b52e823cf07f107", "tree": "a8f57f2fc019c8bd7249762d367e717d5d93fc29", "parents": [ "30b9284db3c77a5e20bb826cd1b66ed7b26cb726" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Tue May 17 15:38:57 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 15:38:57 2011 -0400" }, "message": "net: recvmmsg: Strip MSG_WAITFORONE when calling recvmsg\n\nrecvmmsg fails on a raw socket with EINVAL. The reason for this is\npacket_recvmsg checks the incoming flags:\n\n err \u003d -EINVAL;\n if (flags \u0026 ~(MSG_PEEK|MSG_DONTWAIT|MSG_TRUNC|MSG_CMSG_COMPAT|MSG_ERRQUEUE))\n goto out;\n\nThis patch strips out MSG_WAITFORONE when calling recvmmsg which\nfixes the issue.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nCc: stable@kernel.org [2.6.34+]\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "30b9284db3c77a5e20bb826cd1b66ed7b26cb726", "tree": "95557fc43645512f91670b2e07dc6fabcc0a31fe", "parents": [ "372b2312010bece1e36f577d6c99a6193ec54cbd", "e6e4d9ed11fb1fab8b3256a3dc14d71b5e984ac4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 14:18:25 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 14:18:25 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "f56e03e8dc149bf0ac2888d6843584f48c8700fc", "tree": "071864cd821423ff1caf06d824823b533cbcab77", "parents": [ "6dcae1eaee2b437536b2fe928a609f9589691ebf" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Tue May 17 00:16:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 14:16:58 2011 -0400" }, "message": "net: ping: fix build failure\n\nIf CONFIG_PROC_SYSCTL\u003dn the building process fails:\n\n ping.c:(.text+0x52af3): undefined reference to `inet_get_ping_group_range_net\u0027\n\nMoved inet_get_ping_group_range_net() to ping.c.\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "372b2312010bece1e36f577d6c99a6193ec54cbd", "tree": "b413461c036d301bcd8c558d4f4e1909d4e57a72", "parents": [ "6f404e441d169afc90929ef5e451ec9779c1f11a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue May 17 13:56:59 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 13:56:59 2011 -0400" }, "message": "net: use hlist_del_rcu() in dev_change_name()\n\nUsing plain hlist_del() in dev_change_name() is wrong since a\nconcurrent reader can crash trying to dereference LIST_POISON1.\n\nBug introduced in commit 72c9528bab94 (net: Introduce\ndev_get_by_name_rcu())\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6dcae1eaee2b437536b2fe928a609f9589691ebf", "tree": "9216d7a91897a437b1f251e3d7e23897e983f564", "parents": [ "d46d4d64a85c6ff6118b33afd5d63bcb7e4be54a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 23:09:26 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 23:09:26 2011 -0400" }, "message": "bluetooth: Fix warnings in l2cap_core.c\n\nnet/bluetooth/l2cap_core.c: In function ‘l2cap_recv_frame’:\nnet/bluetooth/l2cap_core.c:3758:15: warning: ‘sk’ may be used uninitialized in this function\nnet/bluetooth/l2cap_core.c:3758:15: note: ‘sk’ was declared here\nnet/bluetooth/l2cap_core.c:3791:15: warning: ‘sk’ may be used uninitialized in this function\nnet/bluetooth/l2cap_core.c:3791:15: note: ‘sk’ was declared here\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d46d4d64a85c6ff6118b33afd5d63bcb7e4be54a", "tree": "007fb7d1cfbccac15d7c7551927372ba46777428", "parents": [ "2142c131a3e290ae350f8a0b0d354c0585a96df1", "e00cf3b9eb7839b952e434a75bff6b99e47337ac" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 22:49:41 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 22:49:41 2011 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "c1d10d18c542278b7fbc413c289d3cb6219da6b3", "tree": "867b60d92db4fd9ac99bda532c7290fe564d0821", "parents": [ "477de0de446210eb5c87e2a54c9ba4c8844fb98b", "6f404e441d169afc90929ef5e451ec9779c1f11a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 16 18:38:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 16 18:38:08 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n net: Change netdev_fix_features messages loglevel\n vmxnet3: Fix inconsistent LRO state after initialization\n sfc: Fix oops in register dump after mapping change\n IPVS: fix netns if reading ip_vs_* procfs entries\n bridge: fix forwarding of IPv6\n" }, { "commit": "e00cf3b9eb7839b952e434a75bff6b99e47337ac", "tree": "ef583ab8ac09bf703026650d4bc7777e6a3864d3", "parents": [ "1a8218e96271790a07dd7065a2ef173e0f67e328", "3b8ab88acaceb505aa06ef3bbf3a73b92470ae78" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 14:55:42 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 19:32:19 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-agn-tx.c\n\tnet/mac80211/sta_info.h\n" }, { "commit": "6f404e441d169afc90929ef5e451ec9779c1f11a", "tree": "d8ad18c3501f8fdbfc01a6470ddd765711ee1760", "parents": [ "ebde6f8acba92abfc203585198a54f47e83e2cd0" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Mon May 16 15:14:21 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 15:14:21 2011 -0400" }, "message": "net: Change netdev_fix_features messages loglevel\n\nThose reduced to DEBUG can possibly be triggered by unprivileged processes\nand are nothing exceptional. Illegal checksum combinations can only be\ncaused by driver bug, so promote those messages to WARN.\n\nSince GSO without SG will now only cause DEBUG message from\nnetdev_fix_features(), remove the workaround from register_netdevice().\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2142c131a3e290ae350f8a0b0d354c0585a96df1", "tree": "bf241d3726737ea9c233138f4b8787edd89f7892", "parents": [ "5173cc057787560c127c6e9737f308c833dc4ff3" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon May 16 11:53:49 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 11:53:49 2011 -0700" }, "message": "net: convert to new cpumask API\n\nWe plan to remove cpu_xx() old api later. Thus this patch\nconvert it.\n\nThis patch has no functional change.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5173cc057787560c127c6e9737f308c833dc4ff3", "tree": "3ac8450239e5e9ee99e1a4bbef1626401dd76be9", "parents": [ "485bf569ba798b4702bc2efbfd3a355fe2c8db04" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 16 08:37:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 14:49:14 2011 -0400" }, "message": "ipv4: more compliant RFC 3168 support\n\nCommit 6623e3b24a5e (ipv4: IP defragmentation must be ECN aware) was an\nattempt to not lose \"Congestion Experienced\" (CE) indications when\nperforming datagram defragmentation.\n\nStefanos Harhalakis raised the point that RFC 3168 requirements were not\ncompletely met by this commit.\n\nIn particular, we MUST detect invalid combinations and eventually drop\nillegal frames.\n\nReported-by: Stefanos Harhalakis \u003cv13@v13.gr\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b3becadc82de3b87a5c196239db3fef6caa9c82", "tree": "d71a3c7e29d30c92c4b677257c289ca63b4e65f3", "parents": [ "57cf8043a64b56a10b9f194572548a3dfb62e596" ], "author": { "name": "Yogesh Ashok Powar", "email": "yogeshp@marvell.com", "time": "Fri May 13 11:22:31 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 14:10:50 2011 -0400" }, "message": "cfg80211: make stripping of 802.11 header optional from AMSDU\n\nCurrently the devices that have already stripped IEEE 802.11\nheader from the AMSDU SKB can not use ieee80211_amsdu_to_8023s\nroutine. This patch enhances ieee80211_amsdu_to_8023s() API by\nchanging mandatory removing of IEEE 802.11 header from AMSDU\nto optional.\n\nSigned-off-by: Yogesh Ashok Powar \u003cyogeshp@marvell.com\u003e\nSigned-off-by: Bing Zhao \u003cbzhao@marvell.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "57cf8043a64b56a10b9f194572548a3dfb62e596", "tree": "a0b9530e824c7e7b1417e20f87e800819abfe285", "parents": [ "108697c44b8e50bea3505c6bf9667da4627cb2d5" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Fri May 13 10:45:43 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 14:10:49 2011 -0400" }, "message": "nl80211: Move peer link state definition to nl80211\n\nThese definitions need to be exposed now that we can set the peer link\nstates via NL80211_ATTR_STA_PLINK_STATE. They were already being\n(opaquely) reported by NL80211_STA_INFO_PLINK_STATE.\n\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "bd2281b85d929af0bd192f05135f70dd05f4fd85", "tree": "ad4022b4c9f7ec4125b9d6716cd9865c3165c874", "parents": [ "40b275b69ee660274b77fb612b0db31fd282fc3f" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri May 13 15:52:10 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 14:10:42 2011 -0400" }, "message": "net/rfkill/core.c: Avoid leaving freed data in a list\n\nThe list_for_each_entry loop can fail, in which case the list element is\nnot removed from the list rfkill_fds. Since this list is not accessed by\nthe loop, the addition of \u0026data-\u003elist into the list is just moved after the\nloop.\n\nThe sematic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression E,E1,E2;\nidentifier l;\n@@\n\n*list_add(\u0026E-\u003el,E1);\n... when !\u003d E1\n when !\u003d list_del(\u0026E-\u003el)\n when !\u003d list_del_init(\u0026E-\u003el)\n when !\u003d E \u003d E2\n*kfree(E);// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "40b275b69ee660274b77fb612b0db31fd282fc3f", "tree": "29a4f82a44a12edcf9db5de6a3c6df9615a5799e", "parents": [ "ec034b208dc8aa5dc73ec46c3f27e34c5efbf113" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri May 13 14:15:49 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 14:10:41 2011 -0400" }, "message": "mac80211: sparse RCU annotations\n\nThis adds sparse RCU annotations to most of\nmac80211, only the mesh code remains to be\ndone.\n\nDue the the previous patches, the annotations\nare pretty simple. The only thing that this\nactually changes is removing the RCU usage of\nkey-\u003esta in debugfs since this pointer isn\u0027t\nactually an RCU-managed pointer (it only has\na single assignment done before the key even\ngoes live). As that is otherwise harmless, I\ndecided to make it part of this patch.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ec034b208dc8aa5dc73ec46c3f27e34c5efbf113", "tree": "56140fc3a4115441822b5cc2aa9de5224bcb8654", "parents": [ "7527a782e187d1214a5b3dc2897ce441033bb4ef" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri May 13 13:35:40 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 14:10:40 2011 -0400" }, "message": "mac80211: fix TX a-MPDU locking\n\nDuring my quest to make mac80211 not have any RCU\nwarnings from sparse, I came across the a-MPDU code\nagain and it wasn\u0027t quite clear why it isn\u0027t racy.\nSo instead of assigning the tid_tx array with just\nthe spinlock held in ieee80211_start_tx_ba_session\nuse a separate temporary array protected only by\nthe spinlock and protect all assignments to the\n\"live\" array by both the spinlock and the mutex so\nthat other code is easily verified to be correct.\n\nDue to pointer assignment atomicity I don\u0027t think\nthis is a real issue, but I\u0027m not sure, especially\non Alpha the current code might be problematic.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7527a782e187d1214a5b3dc2897ce441033bb4ef", "tree": "3310adf988e72cb91736c0638d4c17edcccebfe1", "parents": [ "805d7d23ef9806e47b550ad80270c4cea4ffc984" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri May 13 10:58:57 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 16 14:10:40 2011 -0400" }, "message": "cfg80211: advertise possible interface combinations\n\nAdd the ability to advertise interface combinations in nl80211.\nThis allows the driver to indicate what the combinations are\nthat it supports. \"Combinations\" of just a single interface are\nimplicit, as previously. Note that cfg80211 will enforce that\nthe restrictions are met, but not for all drivers yet (once all\ndrivers are updated, we can remove the flag and enforce for all).\n\nWhen no combinations are actually supported, an empty list will\nbe exported so that userspace can know if the kernel exported\nthis info or not (although it isn\u0027t clear to me what tools using\nthe info should do if the kernel didn\u0027t export it).\n\nSince some interface types are purely virtual/software and don\u0027t\nfit the restrictions, those are exposed in a new list of pure SW\ntypes, not subject to restrictions. This mainly exists to handle\nAP-VLAN and monitor interfaces in mac80211.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c5be24ff62d238a3fdd5d15461b420cd72e78a14", "tree": "fcdeb6a8ee58e96547b41df593fd193894620709", "parents": [ "1a8218e96271790a07dd7065a2ef173e0f67e328" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 18:01:21 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 13:49:05 2011 -0400" }, "message": "ipv4: Trivial rt-\u003ert_src conversions in net/ipv4/route.c\n\nAt these points we have a fully filled in value via the IP\nheader the form of ip_hdr(skb)-\u003esaddr\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1a8218e96271790a07dd7065a2ef173e0f67e328", "tree": "3bf2696f434e21c92809b4812fa34b57061ce783", "parents": [ "534ea99b063de7c30262a8e22f0ab44dd7d11a71" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun May 15 21:26:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 11:49:39 2011 -0400" }, "message": "net: ping: dont call udp_ioctl()\n\nudp_ioctl() really handles UDP and UDPLite protocols.\n\n1) It can increment UDP_MIB_INERRORS in case first_packet_length() finds\na frame with bad checksum.\n\n2) It has a dependency on sizeof(struct udphdr), not applicable to\nICMP/PING\n\nIf ping sockets need to handle SIOCINQ/SIOCOUTQ ioctl, this should be\ndone differently.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nAcked-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e6e4d9ed11fb1fab8b3256a3dc14d71b5e984ac4", "tree": "ce2b0eb33f0be2524529d6b6d6dfe1469559d2d3", "parents": [ "274ea0e2a4cdf18110e5931b8ecbfef6353e5293" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 16 14:45:39 2011 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 16 14:45:39 2011 +0200" }, "message": "netfilter: nf_ct_sip: fix SDP parsing in TCP SIP messages for some Cisco phones\n\nSome Cisco phones do not place the Content-Length field at the end of the\nSIP message. This is valid, due to a misunderstanding of the specification\nthe parser expects the SDP body to start directly after the Content-Length\nfield. Fix the parser to scan for \\r\\n\\r\\n to locate the beginning of the\nSDP body.\n\nReported-by: Teresa Kang \u003cteresa_kang@gemtek.com.tw\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "274ea0e2a4cdf18110e5931b8ecbfef6353e5293", "tree": "d8d78f730253a0bd77a5e17557f4552005ba539b", "parents": [ "74973f6fbfcd1b084c3ccc75b783a6dacac94a10" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 16 14:42:26 2011 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 16 14:42:26 2011 +0200" }, "message": "netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages\n\nVerify that the message length of a single SIP message, which is calculated\nbased on the Content-Length field contained in the SIP message, does not\nexceed the packet boundaries.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "3f874adc4ae80828b79e8aac6891c108c1f6be6d", "tree": "5708865d06ae40ddfb12f4aab92b21267fdb0da4", "parents": [ "33b2f5598b4ee68021364a7b795c09ad66bc0aa8" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:56 2011 -0400" }, "message": "caif: remove unesesarry exports\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33b2f5598b4ee68021364a7b795c09ad66bc0aa8", "tree": "f6516cd969e54d39ecd6ff5caf0fb15906373dce", "parents": [ "c85c2951d4da1236e32f1858db418221e624aba5" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:56 2011 -0400" }, "message": "caif: Bugfix debugfs directory name must be unique.\n\nRace condition caused debugfs_create_dir() to fail due to duplicate\nname. Use atomic counter to create unique directory name.\n\nnet_ratelimit() is introduced to limit debug printouts.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c85c2951d4da1236e32f1858db418221e624aba5", "tree": "8f70d7ab3dbe05ea6f812f9bfb8d341425a29193", "parents": [ "bee925db9a77a5736596dcf6f91d0879f5ee915b" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:56 2011 -0400" }, "message": "caif: Handle dev_queue_xmit errors.\n\nDo proper handling of dev_queue_xmit errors in order to\navoid double free of skb and leaks in error conditions.\nIn cfctrl pending requests are removed when CAIF Link layer goes down.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bee925db9a77a5736596dcf6f91d0879f5ee915b", "tree": "57a3b499d5b8ec3cb9d36be674e165fa1e7eed42", "parents": [ "b3ccfbe4098a5542177d0f34e8979f32e7d606e1" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:55 2011 -0400" }, "message": "caif: prepare support for namespaces\n\nUse struct net to reference CAIF configuration object instead of static variables.\nRefactor functions caif_connect_client, caif_disconnect_client and squach\nfiles cfcnfg.c and caif_config_utils.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3ccfbe4098a5542177d0f34e8979f32e7d606e1", "tree": "3f0046e3b519ea253db222abcb761af34b8a1718", "parents": [ "43e3692101086add8719c3b8b50b05c9ac5b14e1" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:55 2011 -0400" }, "message": "caif: Protected in-flight packets using dev or sock refcont.\n\nCAIF Socket Layer and ip-interface registers reference counters\nin CAIF service layer. The functions sock_hold, sock_put and\ndev_hold, dev_put are used by CAIF Stack to protect from freeing\nmemory while packets are in-flight.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "43e3692101086add8719c3b8b50b05c9ac5b14e1", "tree": "736fc7d0792a492d9ef3a19ac8fff7ca800ced99", "parents": [ "cb3cb423a0f3c627639535e5d87977ae662d779f" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:55 2011 -0400" }, "message": "caif: Move refcount from service layer to sock and dev.\n\nInstead of having reference counts in caif service layers,\nwe hook into existing refcount handling in socket layer and netdevice.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cb3cb423a0f3c627639535e5d87977ae662d779f", "tree": "37fae151f44b5549bf1d4fd437dd070315d78cad", "parents": [ "f36214408470ecf6a052e76b72d05b2328b60fcf" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:55 2011 -0400" }, "message": "caif: Add ref-count to framing layer\n\nIntroduce Per-cpu reference for lower part of CAIF Stack.\nBefore freeing payload is disabled, synchronize_rcu() is called,\nand then ref-count verified to be zero.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f36214408470ecf6a052e76b72d05b2328b60fcf", "tree": "adc3df40fdf0ff782392a881c2d80ba16d237c6b", "parents": [ "bd30ce4bc0b7dc859c1d1cba7ad87e08642418b0" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:54 2011 -0400" }, "message": "caif: Use RCU and lists in cfcnfg.c for managing caif link layers\n\nRCU lists are used for handling the link layers instead of array.\nWhen generating CAIF phy-id, ifindex is used as base. Legal range is 1-6.\nIntroduced set_phy_state() for managing CAIF Link layer state.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd30ce4bc0b7dc859c1d1cba7ad87e08642418b0", "tree": "d5648773052baf985db8290774fea4907e558257", "parents": [ "0b1e9738deb30f4c35c0add43a52dcd0608b227e" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:44:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:54 2011 -0400" }, "message": "caif: Use RCU instead of spin-lock in caif_dev.c\n\nRCU read_lock and refcount is used to protect in-flight packets.\n\nUse RCU and counters to manage freeing lower part of the CAIF stack if\nCAIF-link layer is removed. Old solution based on delaying removal of\ndevice is removed.\n\nWhen CAIF link layer goes down the use of CAIF link layer is disabled\n(by calling caif_set_phy_state()), but removal and freeing of the\nlower part of the CAIF stack is done when Link layer is unregistered.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0b1e9738deb30f4c35c0add43a52dcd0608b227e", "tree": "b629d3d0db7fead50ab4256f4ace6d29e7aa980c", "parents": [ "1b1cb1f78a5e9d54c13e176020c3e8ded5d081ce" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 13 02:43:59 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 17:45:54 2011 -0400" }, "message": "caif: Use rcu_read_lock in CAIF mux layer.\n\nReplace spin_lock with rcu_read_lock when accessing lists to layers\nand cache. While packets are in flight rcu_read_lock should not be held,\ninstead ref-counters are used in combination with RCU.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f08190fe8af3cdb6ba19690eb0fa253ecef4bde", "tree": "e3dceb808591fd9cf49ddeccfedac771569c323a", "parents": [ "d8083deb4f1aa0977980dfb834fcc336ef38318f" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Sun May 15 17:20:29 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun May 15 17:27:18 2011 +0200" }, "message": "IPVS: fix netns if reading ip_vs_* procfs entries\n\nWithout this patch every access to ip_vs in procfs will increase\nthe netns count i.e. an unbalanced get_net()/put_net().\n(ipvsadm commands also use procfs.)\nThe result is you can\u0027t exit a netns if reading ip_vs_* procfs entries.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "d8083deb4f1aa0977980dfb834fcc336ef38318f", "tree": "f7a5f943a151b0bcde920b9aad1938e245c7c5d0", "parents": [ "a10e14667635dde504ed9e7ee851494c2cf2ae8e" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri May 13 16:03:24 2011 -0400" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun May 15 17:16:14 2011 +0200" }, "message": "bridge: fix forwarding of IPv6\n\nThe commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e\n bridge: Reset IPCB when entering IP stack on NF_FORWARD\nbroke forwarding of IPV6 packets in bridge because it would\ncall bp_parse_ip_options with an IPV6 packet.\n\nReported-by: Noah Meyerhans \u003cnoahm@debian.org\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "1b1cb1f78a5e9d54c13e176020c3e8ded5d081ce", "tree": "bc29b3c20433a678af2868aa5a49a56b8b9468dc", "parents": [ "89c64d755fbf04d7541d526931dc4b38301946d1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri May 13 22:59:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 15 01:22:21 2011 -0400" }, "message": "net: ping: small changes\n\nping_table is not __read_mostly, since it contains one rwlock,\nand is static to ping.c\n\nping_port_rover \u0026 ping_v4_lookup are static\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4dc6ec26fe7d9f89349d4c0c654e2f07420f4b27", "tree": "4d2c6665ce07436c803c79491180f6cbb3b70275", "parents": [ "7be799a70ba3dd90a59e8d2c72bbe06020005b3f", "ca06c6eb9a31ae782e74596231fb23df4fc5e46d" ], "author": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Sat May 14 22:47:51 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Sat May 14 22:47:51 2011 -0400" }, "message": "Merge branch \u0027batman-adv/next\u0027 of git://git.open-mesh.org/ecsv/linux-merge\n" }, { "commit": "ca06c6eb9a31ae782e74596231fb23df4fc5e46d", "tree": "e0cbfa74c263b8ba653a762bdf571ef7f43effef", "parents": [ "6d5808d4ae1b0851c3b732d9ec2860d5f7804294" ], "author": { "name": "Marek Lindner", "email": "lindner_marek@yahoo.de", "time": "Sat May 14 20:01:22 2011 +0200" }, "committer": { "name": "Sven Eckelmann", "email": "sven@narfation.org", "time": "Sun May 15 00:02:06 2011 +0200" }, "message": "batman-adv: reset broadcast flood protection on error\n\nThe broadcast flood protection should be reset to its original value\nif the primary interface could not be retrieved.\n\nSigned-off-by: Marek Lindner \u003clindner_marek@yahoo.de\u003e\nSigned-off-by: Sven Eckelmann \u003csven@narfation.org\u003e\n" }, { "commit": "6d5808d4ae1b0851c3b732d9ec2860d5f7804294", "tree": "48e9dd4ba240daf2c252d715b89835f066e85fe7", "parents": [ "27aea2128ec09924dfe08e97739b2bf8b15c8619" ], "author": { "name": "Sven Eckelmann", "email": "sven@narfation.org", "time": "Wed May 11 20:59:06 2011 +0200" }, "committer": { "name": "Sven Eckelmann", "email": "sven@narfation.org", "time": "Sun May 15 00:02:06 2011 +0200" }, "message": "batman-adv: Add missing hardif_free_ref in forw_packet_free\n\nadd_bcast_packet_to_list increases the refcount for if_incoming but the\nreference count is never decreased. The reference count must be\nincreased for all kinds of forwarded packets which have the primary\ninterface stored and forw_packet_free must decrease them. Also\npurge_outstanding_packets has to invoke forw_packet_free when a work\nitem was really cancelled.\n\nThis regression was introduced in\n32ae9b221e788413ce68feaae2ca39e406211a0a.\n\nReported-by: Antonio Quartulli \u003cordex@autistici.org\u003e\nSigned-off-by: Sven Eckelmann \u003csven@narfation.org\u003e\n" }, { "commit": "298eaaad0edc004912513d7b9e18163bc053539b", "tree": "9e0e6dd9c54e4af80b0c671de87a71d018f79c38", "parents": [ "cf70cc5b9d6a07d21ffd521aee690d26315d1bdf", "cb68552858c64db302771469b1202ea09e696329" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:20:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 13 15:20:51 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n bridge: fix forwarding of IPv6\n bonding,llc: Fix structure sizeof incompatibility for some PDUs\n ipv6: restore correct ECN handling on TCP xmit\n ne-h8300: Fix regression caused during net_device_ops conversion\n hydra: Fix regression caused during net_device_ops conversion\n zorro8390: Fix regression caused during net_device_ops conversion\n sfc: Always map MCDI shared memory as uncacheable\n ehea: Fix memory hotplug oops\n libertas: fix cmdpendingq locking\n iwlegacy: fix IBSS mode crashes\n ath9k: Fix a warning due to a queued work during S3 state\n mac80211: don\u0027t start the dynamic ps timer if not associated\n" }, { "commit": "7be799a70ba3dd90a59e8d2c72bbe06020005b3f", "tree": "08062fb33b9b09a935ef42eaaff6f2f67c67749e", "parents": [ "8e36360ae876995e92d3a7538dda70548e64e685" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:31:02 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:31:02 2011 -0400" }, "message": "ipv4: Remove rt-\u003ert_dst reference from ip_forward_options().\n\nAt this point iph-\u003edaddr equals what rt-\u003ert_dst would hold.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e36360ae876995e92d3a7538dda70548e64e685", "tree": "d477e086bb35d2de8a6f54b461abeb24be8a4f5b", "parents": [ "22f728f8f311659b068e73ed92833c205651a47f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:29:41 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:29:41 2011 -0400" }, "message": "ipv4: Remove route key identity dependencies in ip_rt_get_source().\n\nPass in the sk_buff so that we can fetch the necessary keys from\nthe packet header when working with input routes.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22f728f8f311659b068e73ed92833c205651a47f", "tree": "cab06ba8b08c8c88a021d597c031c1ef24fae732", "parents": [ "0374d9ceb02eb12fcd65be9dd5df9c911ef93424" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:21:27 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:21:27 2011 -0400" }, "message": "ipv4: Always call ip_options_build() after rest of IP header is filled in.\n\nThis will allow ip_options_build() to reliably look at the values of\niph-\u003e{daddr,saddr}\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0374d9ceb02eb12fcd65be9dd5df9c911ef93424", "tree": "3731be10072252825feea225a082b2ee4029c293", "parents": [ "48e20467227fe540e6bbf3d98df98c2c0fca10f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:15:50 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 17:15:50 2011 -0400" }, "message": "ipv4: Kill spurious write to iph-\u003edaddr in ip_forward_options().\n\nThis code block executes when opt-\u003esrr_is_hit is set. It will be\nset only by ip_options_rcv_srr().\n\nip_options_rcv_srr() walks until it hits a matching nexthop in the SRR\noption addresses, and when it matches one 1) looks up the route for\nthat nexthop and 2) on route lookup success it writes that nexthop\nvalue into iph-\u003edaddr.\n\nip_forward_options() runs later, and again walks the SRR option\naddresses looking for the option matching the destination of the route\nstored in skb_rtable(). This route will be the same exact one looked\nup for the nexthop by ip_options_rcv_srr().\n\nTherefore \"rt-\u003ert_dst \u003d\u003d iph-\u003edaddr\" must be true.\n\nAll it really needs to do is record the route\u0027s source address in the\nmatching SRR option adddress. It need not write iph-\u003edaddr again,\nsince that has already been done by ip_options_rcv_srr() as detailed\nabove.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0696c3a8acd3b7c3186dd231d65d97e05a75189f", "tree": "3ac73df9cda3212c4c710903a99d733fd236bf44", "parents": [ "64c7f304b81a9a92dc7046c97a10427a5997dc07" ], "author": { "name": "Peter Pan(潘卫平)", "email": "panweiping3@gmail.com", "time": "Thu May 12 15:46:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 16:49:49 2011 -0400" }, "message": "net:set valid name before calling ndo_init()\n\nIn commit 1c5cae815d19 (net: call dev_alloc_name from register_netdevice),\na bug of bonding was involved, see example 1 and 2.\n\nIn register_netdevice(), the name of net_device is not valid until\ndev_get_valid_name() is called. But dev-\u003enetdev_ops-\u003endo_init(that is\nbond_init) is called before dev_get_valid_name(),\nand it uses the invalid name of net_device.\n\nI think register_netdevice() should make sure that the name of net_device is\nvalid before calling ndo_init().\n\nexample 1:\nmodprobe bonding\nls /proc/net/bonding/bond%d\n\nps -eLf\nroot 3398 2 3398 0 1 21:34 ? 00:00:00 [bond%d]\n\nexample 2:\nmodprobe bonding max_bonds\u003d3\n\n[ 170.100292] bonding: Ethernet Channel Bonding Driver: v3.7.1 (April 27, 2011)\n[ 170.101090] bonding: Warning: either miimon or arp_interval and arp_ip_target module parameters must be specified, otherwise bonding will not detect link failures! see bonding.txt for details.\n[ 170.102469] ------------[ cut here ]------------\n[ 170.103150] WARNING: at /home/pwp/net-next-2.6/fs/proc/generic.c:586 proc_register+0x126/0x157()\n[ 170.104075] Hardware name: VirtualBox\n[ 170.105065] proc_dir_entry \u0027bonding/bond%d\u0027 already registered\n[ 170.105613] Modules linked in: bonding(+) sunrpc ipv6 uinput microcode ppdev parport_pc parport joydev e1000 pcspkr i2c_piix4 i2c_core [last unloaded: bonding]\n[ 170.108397] Pid: 3457, comm: modprobe Not tainted 2.6.39-rc2+ #14\n[ 170.108935] Call Trace:\n[ 170.109382] [\u003cc0438f3b\u003e] warn_slowpath_common+0x6a/0x7f\n[ 170.109911] [\u003cc051a42a\u003e] ? proc_register+0x126/0x157\n[ 170.110329] [\u003cc0438fc3\u003e] warn_slowpath_fmt+0x2b/0x2f\n[ 170.110846] [\u003cc051a42a\u003e] proc_register+0x126/0x157\n[ 170.111870] [\u003cc051a4dd\u003e] proc_create_data+0x82/0x98\n[ 170.112335] [\u003cf94e6af6\u003e] bond_create_proc_entry+0x3f/0x73 [bonding]\n[ 170.112905] [\u003cf94dd806\u003e] bond_init+0x77/0xa5 [bonding]\n[ 170.113319] [\u003cc0721ac6\u003e] register_netdevice+0x8c/0x1d3\n[ 170.113848] [\u003cf94e0e30\u003e] bond_create+0x6c/0x90 [bonding]\n[ 170.114322] [\u003cf94f4763\u003e] bonding_init+0x763/0x7b1 [bonding]\n[ 170.114879] [\u003cc0401240\u003e] do_one_initcall+0x76/0x122\n[ 170.115317] [\u003cf94f4000\u003e] ? 0xf94f3fff\n[ 170.115799] [\u003cc0463f1e\u003e] sys_init_module+0x1286/0x140d\n[ 170.116879] [\u003cc07c6d9f\u003e] sysenter_do_call+0x12/0x28\n[ 170.117404] ---[ end trace 64e4fac3ae5fff1a ]---\n[ 170.117924] bond%d: Warning: failed to register to debugfs\n[ 170.128728] ------------[ cut here ]------------\n[ 170.129360] WARNING: at /home/pwp/net-next-2.6/fs/proc/generic.c:586 proc_register+0x126/0x157()\n[ 170.130323] Hardware name: VirtualBox\n[ 170.130797] proc_dir_entry \u0027bonding/bond%d\u0027 already registered\n[ 170.131315] Modules linked in: bonding(+) sunrpc ipv6 uinput microcode ppdev parport_pc parport joydev e1000 pcspkr i2c_piix4 i2c_core [last unloaded: bonding]\n[ 170.133731] Pid: 3457, comm: modprobe Tainted: G W 2.6.39-rc2+ #14\n[ 170.134308] Call Trace:\n[ 170.134743] [\u003cc0438f3b\u003e] warn_slowpath_common+0x6a/0x7f\n[ 170.135305] [\u003cc051a42a\u003e] ? proc_register+0x126/0x157\n[ 170.135820] [\u003cc0438fc3\u003e] warn_slowpath_fmt+0x2b/0x2f\n[ 170.137168] [\u003cc051a42a\u003e] proc_register+0x126/0x157\n[ 170.137700] [\u003cc051a4dd\u003e] proc_create_data+0x82/0x98\n[ 170.138174] [\u003cf94e6af6\u003e] bond_create_proc_entry+0x3f/0x73 [bonding]\n[ 170.138745] [\u003cf94dd806\u003e] bond_init+0x77/0xa5 [bonding]\n[ 170.139278] [\u003cc0721ac6\u003e] register_netdevice+0x8c/0x1d3\n[ 170.139828] [\u003cf94e0e30\u003e] bond_create+0x6c/0x90 [bonding]\n[ 170.140361] [\u003cf94f4763\u003e] bonding_init+0x763/0x7b1 [bonding]\n[ 170.140927] [\u003cc0401240\u003e] do_one_initcall+0x76/0x122\n[ 170.141494] [\u003cf94f4000\u003e] ? 0xf94f3fff\n[ 170.141975] [\u003cc0463f1e\u003e] sys_init_module+0x1286/0x140d\n[ 170.142463] [\u003cc07c6d9f\u003e] sysenter_do_call+0x12/0x28\n[ 170.142974] ---[ end trace 64e4fac3ae5fff1b ]---\n[ 170.144949] bond%d: Warning: failed to register to debugfs\n\nSigned-off-by: Weiping Pan \u003cpanweiping3@gmail.com\u003e\nReviewed-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c319b4d76b9e583a5d88d6bf190e079c4e43213d", "tree": "22fcc6f1c671908d640145c1f82e5290cd40f715", "parents": [ "f20190302e3e697a166cc28ebef43058749dedda" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Fri May 13 10:01:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 16:08:13 2011 -0400" }, "message": "net: ipv4: add IPPROTO_ICMP socket kind\n\nThis patch adds IPPROTO_ICMP socket kind. It makes it possible to send\nICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages\nwithout any special privileges. In other words, the patch makes it\npossible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In\norder not to increase the kernel\u0027s attack surface, the new functionality\nis disabled by default, but is enabled at bootup by supporting Linux\ndistributions, optionally with restriction to a group or a group range\n(see below).\n\nSimilar functionality is implemented in Mac OS X:\nhttp://www.manpagez.com/man/4/icmp/\n\nA new ping socket is created with\n\n socket(PF_INET, SOCK_DGRAM, PROT_ICMP)\n\nMessage identifiers (octets 4-5 of ICMP header) are interpreted as local\nports. Addresses are stored in struct sockaddr_in. No port numbers are\nreserved for privileged processes, port 0 is reserved for API (\"let the\nkernel pick a free number\"). There is no notion of remote ports, remote\nport numbers provided by the user (e.g. in connect()) are ignored.\n\nData sent and received include ICMP headers. This is deliberate to:\n1) Avoid the need to transport headers values like sequence numbers by\nother means.\n2) Make it easier to port existing programs using raw sockets.\n\nICMP headers given to send() are checked and sanitized. The type must be\nICMP_ECHO and the code must be zero (future extensions might relax this,\nsee below). The id is set to the number (local port) of the socket, the\nchecksum is always recomputed.\n\nICMP reply packets received from the network are demultiplexed according\nto their id\u0027s, and are returned by recv() without any modifications.\nIP header information and ICMP errors of those packets may be obtained\nvia ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source\nquenches and redirects are reported as fake errors via the error queue\n(IP_RECVERR); the next hop address for redirects is saved to ee_info (in\nnetwork order).\n\nsocket(2) is restricted to the group range specified in\n\"/proc/sys/net/ipv4/ping_group_range\". It is \"1 0\" by default, meaning\nthat nobody (not even root) may create ping sockets. Setting it to \"100\n100\" would grant permissions to the single group (to either make\n/sbin/ping g+s and owned by this group or to grant permissions to the\n\"netadmins\" group), \"0 4294967295\" would enable it for the world, \"100\n4294967295\" would enable it for the users, but not daemons.\n\nThe existing code might be (in the unlikely case anyone needs it)\nextended rather easily to handle other similar pairs of ICMP messages\n(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply\netc.).\n\nUserspace ping util \u0026 patch for it:\nhttp://openwall.info/wiki/people/segoon/ping\n\nFor Openwall GNU/*/Linux it was the last step on the road to the\nsetuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)\nis in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:\nhttp://mirrors.kernel.org/openwall/Owl/current/iso/\n\nInitially this functionality was written by Pavel Kankovsky for\nLinux 2.4.32, but unfortunately it was never made public.\n\nAll ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with\nthe patch.\n\nPATCH v3:\n - switched to flowi4.\n - minor changes to be consistent with raw sockets code.\n\nPATCH v2:\n - changed ping_debug() to pr_debug().\n - removed CONFIG_IP_PING.\n - removed ping_seq_fops.owner field (unused for procfs).\n - switched to proc_net_fops_create().\n - switched to %pK in seq_printf().\n\nPATCH v1:\n - fixed checksumming bug.\n - CAP_NET_RAW may not create icmp sockets anymore.\n\nRFC v2:\n - minor cleanups.\n - introduced sysctl\u0027able group range to restrict socket(2).\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "cb68552858c64db302771469b1202ea09e696329" }