)]}' { "log": [ { "commit": "dc6ed1df5a5f84e45e77e2acb6fd99b995414956", "tree": "3decaad599f29cb097fc370f1ed92a18fa3596ea", "parents": [ "eed84713bc47ce2f7d675914f297ad9b6227a587" ], "author": { "name": "Shmulik Ravid", "email": "shmulikr@broadcom.com", "time": "Sun Feb 27 05:04:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 21:58:55 2011 -0800" }, "message": "dcbnl: add support for retrieving peer configuration - cee\n\nThis patch adds the support for retrieving the remote or peer DCBX\nconfiguration via dcbnl for embedded DCBX stacks supporting the CEE DCBX\nstandard.\n\nSigned-off-by: Shmulik Ravid \u003cshmulikr@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eed84713bc47ce2f7d675914f297ad9b6227a587", "tree": "27da816e2d37163409639639c37171bb4c53945c", "parents": [ "23b41168fc942a4a041325a04ecc1bd17d031a3e" ], "author": { "name": "Shmulik Ravid", "email": "shmulikr@broadcom.com", "time": "Sun Feb 27 05:04:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 21:58:54 2011 -0800" }, "message": "dcbnl: add support for retrieving peer configuration - ieee\n\nThese 2 patches add the support for retrieving the remote or peer DCBX\nconfiguration via dcbnl for embedded DCBX stacks. The peer configuration\nis part of the DCBX MIB and is useful for debugging and diagnostics of\nthe overall DCB configuration. The first patch add this support for IEEE\n802.1Qaz standard the second patch add the same support for the older\nCEE standard. Diff for v2 - the peer-app-info is CEE specific.\n\nSigned-off-by: Shmulik Ravid \u003cshmulikr@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23b41168fc942a4a041325a04ecc1bd17d031a3e", "tree": "69be018c5d2eae4538f622541d016346e331657e", "parents": [ "5bfa787fb2c29cce0722500f90df29e049ff07fc" ], "author": { "name": "Vlad Dogaru", "email": "ddvlad@rosedu.org", "time": "Sat Feb 26 22:39:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 21:55:52 2011 -0800" }, "message": "netdevice: make initial group visible to userspace\n\nINIT_NETDEV_GROUP is needed by userspace, move it outside __KERNEL__\nguards.\n\nSigned-off-by: Vlad Dogaru \u003cddvlad@rosedu.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "080e4130b1fb6a02e75149a1cccc8192e734713d", "tree": "09627d9d6e7811fc4ae119df03b892327efbd0dc", "parents": [ "8a8efa22f51b3c3f879d272914e3dbbc2041bf91" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu Feb 17 23:43:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 27 16:11:51 2011 -0800" }, "message": "netpoll: remove IFF_IN_NETPOLL flag\n\nV4: rebase to net-next-2.6\n\nThis patch removes the flag IFF_IN_NETPOLL, we don\u0027t need it any more since\nwe have netpoll_tx_running() now.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1b0db64fb7693c1a131b7bcc38f7bc63fb396850", "tree": "f393ebcc4496de2424d3f624c3623194e19c8b22", "parents": [ "26f70e1202b3c66c4f63b8b25e0419dd0b3a91e3", "5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:35:12 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:35:12 2011 -0800" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "661b79725fea030803a89a16cda506bac8eeca78", "tree": "b13a294ecb7696c2c96db88f5b98627f5c4d4ad5", "parents": [ "10f6dfcfde884441db89dc66b945d6c948e1d356" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:56 2011 -0800" }, "message": "netem: revised correlated loss generator\n\nThis is a patch originated with Stefano Salsano and Fabio Ludovici.\nIt provides several alternative loss models for use with netem.\nThis patch adds two state machine based loss models.\n\nSee: http://netgroup.uniroma2.it/twiki/bin/view.cgi/Main/NetemCLG\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "df173bda2639ac744ccf596ec1f8f7e66fe4c343", "tree": "bd74a3a10b0503c578eb1ba5dcd6a4bad59c47d1", "parents": [ "6373a9a286bdd955a76924cee88a2f8f784988b1" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:54 2011 -0800" }, "message": "netem: define NETEM_DIST_MAX\n\nRather than magic constant in code, expose the maximum size of\npacket distribution table in API. In iproute2, q_netem defines\nMAX_DIST as 16K already.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55ae22d08fc9b531bc8a88b7306004e7053bb425", "tree": "d60dd4970f9bc2fb5ce21571c862d421f4a00402", "parents": [ "d12b0d9adc46888e3bb0224886105bf3b188553b", "bf781ecfc6d6ecc4f66762a870f9c1fc76b9c8d5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 20:47:56 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 20:47:56 2011 -0800" }, "message": "Merge branch \u0027tipc-Feb23-2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6\n" }, { "commit": "77c81e0bb8af3f1a0e5d84dd0346fe57dfe3da27", "tree": "da542761e8d720347ab5174d2464aef8f46d1e15", "parents": [ "c8a61b52ebac3645b4e3c5b03c2073e6c8c119a8" ], "author": { "name": "Allan Stephens", "email": "Allan.Stephens@windriver.com", "time": "Tue Jan 18 13:37:09 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Feb 23 18:05:11 2011 -0500" }, "message": "tipc: Clean out all remaining instances of #if 0\u0027d unused code\n\nRemove all instances of legacy or proposed-but-not-implemented code\nthat lives within an #if 0 ... #endif block. If some of it is needed\nin the future it can recovered out of history, but there is no need\nfor it to clutter up the active code base.\n\nSigned-off-by: Allan Stephens \u003cAllan.Stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "5413b4c6c07b659e52c84a4e40d897b32b89834f", "tree": "a0f108cc7396f0a715ed36cd1d6b2636c52798b1", "parents": [ "3f8dd9446e66f2a982ddcff38e4705cfe93eeec6" ], "author": { "name": "Allan Stephens", "email": "Allan.Stephens@windriver.com", "time": "Tue Jan 18 13:24:55 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Feb 23 18:05:09 2011 -0500" }, "message": "tipc: Improve handling of invalid link tolerance values\n\nEnhances TIPC link code to ignore an invalid link tolerance value\ncontained in an incoming LINK_PROTOCOL message, rather than\nprocessing the value and potentially causing a divide-by-zero error.\n\nAlso add a compile-time check that catches attempts to redefine\nTIPC\u0027s minimum link tolerance value in a manner that might result\nin the same divide-by-zero error at run-time.\n\nSigned-off-by: Allan Stephens \u003cAllan.Stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "39fc0ce5710c53bad14aaba1a789eec810c556f9", "tree": "dc5ee565d2fe030dab7cdc1757c822ecc793cc4f", "parents": [ "4e4db200541d49404ff39ac482efee072dd72144" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Feb 22 16:52:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 14:23:32 2011 -0800" }, "message": "net: Implement SFEATURES compatibility for not updated drivers\n\nUse discrete setting ops for not updated drivers. This will not make\nthem conform to full G/SFEATURES semantics, though.\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": "e13e02a3c68d899169c78d9a18689bd73491d59a", "tree": "6e6b40ef37261df391cd445ec0f1b3d538b23a47", "parents": [ "dee9f4bceb5fd9dbfcc1567148fccdbf16d6a38a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Feb 23 10:56:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 14:05:11 2011 -0800" }, "message": "net_sched: SFB flow scheduler\n\nThis is the Stochastic Fair Blue scheduler, based on work from :\n\nW. Feng, D. Kandlur, D. Saha, K. Shin. Blue: A New Class of Active Queue\nManagement Algorithms. U. Michigan CSE-TR-387-99, April 1999.\n\nhttp://www.thefengs.com/wuchang/blue/CSE-TR-387-99.pdf\n\nThis implementation is based on work done by Juliusz Chroboczek\n\nGeneral SFB algorithm can be found in figure 14, page 15:\n\nB[l][n] : L x N array of bins (L levels, N bins per level)\nenqueue()\nCalculate hash function values h{0}, h{1}, .. h{L-1}\nUpdate bins at each level\nfor i \u003d 0 to L - 1\n if (B[i][h{i}].qlen \u003e bin_size)\n B[i][h{i}].p_mark +\u003d p_increment;\n else if (B[i][h{i}].qlen \u003d\u003d 0)\n B[i][h{i}].p_mark -\u003d p_decrement;\np_min \u003d min(B[0][h{0}].p_mark ... B[L-1][h{L-1}].p_mark);\nif (p_min \u003d\u003d 1.0)\n ratelimit();\nelse\n mark/drop with probabilty p_min;\n\nI did the adaptation of Juliusz code to meet current kernel standards,\nand various changes to address previous comments :\n\nhttp://thread.gmane.org/gmane.linux.network/90225\nhttp://thread.gmane.org/gmane.linux.network/90375\n\nDefault flow classifier is the rxhash introduced by RPS in 2.6.35, but\nwe can use an external flow classifier if wanted.\n\ntc qdisc add dev $DEV parent 1:11 handle 11: \\\n est 0.5sec 2sec sfb limit 128\n\ntc filter add dev $DEV protocol ip parent 11: handle 3 \\\n flow hash keys dst divisor 1024\n\nNotes:\n\n1) SFB default child qdisc is pfifo_fast. It can be changed by another\nqdisc but a child qdisc MUST not drop a packet previously queued. This\nis because SFB needs to handle a dequeued packet in order to maintain\nits virtual queue states. pfifo_head_drop or CHOKe should not be used.\n\n2) ECN is enabled by default, unlike RED/CHOKe/GRED\n\nWith help from Patrick McHardy \u0026 Andi Kleen\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Juliusz Chroboczek \u003cJuliusz.Chroboczek@pps.jussieu.fr\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Andi Kleen \u003candi@firstfloor.org\u003e\nCC: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e33f770426674a565a188042caf3f974f8b3722d", "tree": "6ee309a1cbccec1cef9972fc6c8f8d9b280978f5", "parents": [ "e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 18:13:15 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 18:13:15 2011 -0800" }, "message": "xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce", "tree": "b5e5787a6d5c15e589d275c7434ebbf341257234", "parents": [ "db62983a1e4b2af9e79c97af768f0c8b80bd93f0", "320d6c1b56de5f461c6062625b9664095f90ee95" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Feb 22 15:10:22 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Feb 22 15:10:22 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n" }, { "commit": "eaefd1105bc431ef329599e307a07f2a36ae7872", "tree": "658eeed417654c8f6015d4d5f957f5a1b5e9521f", "parents": [ "04cfa852ff8dab923640500ee850d19e75bacabc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Feb 18 03:26:36 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 10:19:31 2011 -0800" }, "message": "net: add __rcu annotations to sk_wq and wq\n\nAdd proper RCU annotations/verbs to sk_wq and wq members\n\nFix __sctp_write_space() sk_sleep() abuse (and sock-\u003ewq access)\n\nFix sunrpc sk_sleep() abuse too\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da935c66bacb3ed9ada984b053297f87c2dff63a", "tree": "46278da2b312c73f1375b830d7e5912bf23abd78", "parents": [ "9435eb1cf0b76b323019cebf8d16762a50a12a19", "2205a6ea93fea76f88b43727fea53f3ce3790d6f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/net/e1000e/netdev.c\n\tnet/xfrm/xfrm_policy.c\n" }, { "commit": "226111d1fbe611bc7a5ffaa5275ccb41e73fd011", "tree": "2127a47120c71f4eb2cfdcc889c0c2971c9d9c33", "parents": [ "91035f0b7d89291af728b6f3e370c3be58fcbe1b" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Fri Feb 18 13:30:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:00:50 2011 -0800" }, "message": "net: dcb: match dcb_app protocol field with 802.1Qaz spec\n\nThe dcb_app protocol field is a __u32 however the 802.1Qaz\nspecification defines it as a 16 bit field. This patch brings\nthe structure inline with the spec making it a __u16.\n\nCC: Shmulik Ravid \u003cshmulikr@broadcom.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0cc9d5257857608ba85885b75fcada13d359b5d1", "tree": "c36289844c623f2a3026f629d47cee793fb535ff", "parents": [ "4c3021da451fe0ea1deaba8fa3805d8d065ec84e", "456d66ecd09e3bc326b93174745faafb6ac378d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 14:20:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 14:20:46 2011 -0800" }, "message": "Merge branch \u0027rtc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027rtc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n RTC: Re-enable UIE timer/polling emulation\n RTC: Revert UIE emulation removal\n RTC: Release mutex in error path of rtc_alarm_irq_enable\n" }, { "commit": "b1a1bcf714c4d79f7872a34138d100941ebb0a0b", "tree": "3e93caf667a9f342c5ff6d9af48e38c1b2ffa035", "parents": [ "0d4171e2153b70957fe67867420a1a24d5e4cd82" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Thu Feb 17 01:50:50 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Feb 18 16:54:54 2011 -0500" }, "message": "ssb: when needed, reject IM input while disabling device\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8b2988c13da00ac9d03f1764fdb26180c188f9e0", "tree": "b7f58047506d3519a11fec20e2dfacf232f7db8f", "parents": [ "98605c2ed4963c44aa72799e697ae4bc7085ffcd" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Wed Feb 16 13:58:26 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Feb 18 16:54:53 2011 -0500" }, "message": "ssb: remove invalid define SSB_TMSLOW_PHYCLK\n\nIt was incorrectly introduced in d2730b2a6a019d14455556019d744ab051e6554b. We\nhave already fixed function to use correct define, but forgot remove old one.\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nCc: Gábor Stefanik \u003cnetrolller.3d@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fd23c3b31107e2fc483301ee923d8a1db14e53f4", "tree": "a9f6628d11b135660418c1ba5edb23c3c75cc0e9", "parents": [ "1cbb1a61d59b7552e1e3fde485d8af5699fe16e0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 18 12:42:28 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 18 12:42:28 2011 -0800" }, "message": "ipv4: Add hash table of interface addresses.\n\nThis will be used to optimize __ip_dev_find() and friends.\n\nWith help from Eric Dumazet.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc3adfc6703edfd2484902b5391092c717076f87", "tree": "9df3b216990f6b321095bcc6c35444f5e0d8165c", "parents": [ "3c18d4de86e4a7f93815c081e50e0543fa27200f", "3233cdbd9fa347a6d6897a94cc6ed0302ae83c4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 12:36:06 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 12:36:06 2011 -0800" }, "message": "Merge branch \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long\n workqueue, freezer: unify spelling of \u0027freeze\u0027 + \u0027able\u0027 to \u0027freezable\u0027\n workqueue: wake up a worker when a rescuer is leaving a gcwq\n" }, { "commit": "3c18d4de86e4a7f93815c081e50e0543fa27200f", "tree": "adea22bccd076266bf94cbda3ed6d9a98eea1206", "parents": [ "2a324ce7b79a3a90cc2d4ade5d5f960a99000caa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 11:32:28 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 11:32:28 2011 -0800" }, "message": "Expand CONFIG_DEBUG_LIST to several other list operations\n\nWhen list debugging is enabled, we aim to readably show list corruption\nerrors, and the basic list_add/list_del operations end up having extra\ndebugging code in them to do some basic validation of the list entries.\n\nHowever, \"list_del_init()\" and \"list_move[_tail]()\" ended up avoiding\nthe debug code due to how they were written. This fixes that.\n\nSo the _next_ time we have list_move() problems with stale list entries,\nwe\u0027ll hopefully have an easier time finding them..\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "456d66ecd09e3bc326b93174745faafb6ac378d6", "tree": "24e0fb6f1c861204e2bf25abc2e27a1e3c3941ae", "parents": [ "6e57b1d6a8d8ed1998229b71c102be1997e397c6" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Feb 11 18:15:23 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Feb 17 14:59:42 2011 -0800" }, "message": "RTC: Re-enable UIE timer/polling emulation\n\nThis patch re-enables UIE timer/polling emulation for rtc devices\nthat do not support alarm irqs.\n\nCC: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nTested-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "6e57b1d6a8d8ed1998229b71c102be1997e397c6", "tree": "941ae7ba1c168af5603bb47d3bbfba33a8f2760c", "parents": [ "516373b8b60fa4152334b6b6f2ece0f178c540ce" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Feb 11 17:45:40 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Feb 17 14:59:41 2011 -0800" }, "message": "RTC: Revert UIE emulation removal\n\nUwe pointed out that my alarm based UIE emulation is not sufficient\nto replace the older timer/polling based UIE emulation on devices\nwhere there is no alarm irq. This causes rtc devices without alarms\nto return -EINVAL to UIE ioctls. The fix is to re-instate the old\ntimer/polling method for devices without alarm irqs.\n\nThis patch reverts the following commits:\n042620a018afcfba1d678062b62e46 - Remove UIE emulation\n1daeddd5962acad1bea55e524fc0fa - Cleanup removed UIE emulation declaration\nb5cc8ca1c9c3a37eaddf709b2fd3e1 - Remove Kconfig symbol for UIE emulation\n\nThe emulation mode will still need to be wired-in with a following\npatch before it will work.\n\nCC: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "e83d360d9a7e5d71d55c13e96b19109a2ea23bf0", "tree": "04e4971ad73ade44eb86671851d568e494abe6e4", "parents": [ "da8ac86c4a56a14bf8deea7d2f92d0a453c67f91" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Feb 15 16:59:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 17 14:16:35 2011 -0800" }, "message": "net: introduce NETIF_F_RXCSUM\n\nIntroduce NETIF_F_RXCSUM to replace device-private flags for RX checksum\noffload. Integrate it with ndo_fix_features.\n\nethtool_op_get_rx_csum() is removed altogether as nothing in-tree uses it.\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": "5455c6998d34dc983a8693500e4dffefc3682dc5", "tree": "b765aecf6d33d8c550cde78368ccc8654951ec07", "parents": [ "0a417704777ed29d0e8c72b7274a328e61248e75" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Feb 15 16:59:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 17 14:16:33 2011 -0800" }, "message": "net: Introduce new feature setting ops\n\nThis introduces a new framework to handle device features setting.\nIt consists of:\n - new fields in struct net_device:\n\t+ hw_features - features that hw/driver supports toggling\n\t+ wanted_features - features that user wants enabled, when possible\n - new netdev_ops:\n\t+ feat \u003d ndo_fix_features(dev, feat) - API checking constraints for\n\t\tenabling features or their combinations\n\t+ ndo_set_features(dev) - API updating hardware state to match\n\t\tchanged dev-\u003efeatures\n - new ethtool commands:\n\t+ ETHTOOL_GFEATURES/ETHTOOL_SFEATURES: get/set dev-\u003ewanted_features\n\t\tand trigger device reconfiguration if resulting dev-\u003efeatures\n\t\tchanged\n\t+ ETHTOOL_GSTRINGS(ETH_SS_FEATURES): get feature bits names (meaning)\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": "0a417704777ed29d0e8c72b7274a328e61248e75", "tree": "2a9cd59d8a58faf0904d503e143547b8aacd63ef", "parents": [ "340ae1654c0667e0cdd2a6d4dc16f7946e018881" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Feb 15 16:59:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 17 14:16:33 2011 -0800" }, "message": "ethtool: factorize get/set_one_feature\n\nThis allows to enable GRO even if RX csum is disabled. GRO will not\nbe used for packets without hardware checksum anyway.\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": "212b573f5552c60265da721ff9ce32e3462a2cdd", "tree": "b930a91d4d9c84414eca6e13d67bd5dba7c3c1e0", "parents": [ "9a279ea3a77ebcc91b68f0546e7cfa5018a12513" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Feb 15 16:59:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 17 14:16:32 2011 -0800" }, "message": "ethtool: enable GSO and GRO by default\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": "58a69cb47ec6991bf006a3e5d202e8571b0327a4", "tree": "56abdf817649c352f70bff3263f9351ed6c42062", "parents": [ "7576958a9d5a4a677ad7dd40901cdbb6c1110c98" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 16 09:25:31 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 16 17:48:59 2011 +0100" }, "message": "workqueue, freezer: unify spelling of \u0027freeze\u0027 + \u0027able\u0027 to \u0027freezable\u0027\n\nThere are two spellings in use for \u0027freeze\u0027 + \u0027able\u0027 - \u0027freezable\u0027 and\n\u0027freezeable\u0027. The former is the more prominent one. The latter is\nmostly used by workqueue and in a few other odd places. Unify the\nspelling to \u0027freezable\u0027.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nAcked-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Alex Dubov \u003coakad@yahoo.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "a7d6e4ecdb7648478ddec76d30d87d03d6e22b31", "tree": "1e0110780ac0a8eeef2629e1d5880602bd6003c0", "parents": [ "09f586b35d8503b57de1e0e9b19bc6b38e0d7319" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Tue Feb 15 19:02:45 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 15:21:11 2011 -0800" }, "message": "thp: prevent hugepages during args/env copying into the user stack\n\nTransparent hugepages can only be created if rmap is fully\nfunctional. So we must prevent hugepages to be created while\nis_vma_temporary_stack() is true.\n\nThis also optmizes away some harmless but unnecessary setting of\nkhugepaged_scan.address and it switches some BUG_ON to VM_BUG_ON.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1cecd791f2708b621e619cf4df4636c97c9497e5", "tree": "7d1cae2e3e0c02a5c187408fac36f0bae20fadf0", "parents": [ "fef86db8feb2618430ac9e3c9b6197a7eacaf27a", "a252852afaea8270fcb91628b298253b112fc92e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 10:18:48 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 10:18:48 2011 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Fix text_poke_smp_batch() deadlock\n perf tools: Fix thread_map event synthesizing in top and record\n watchdog, nmi: Lower the severity of error messages\n ARM: oprofile: Fix backtraces in timer mode\n oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends\n" }, { "commit": "87450bd55d6f7caa472b5db49a97ca373baf2577", "tree": "00cc4e9da0e486c5d540c2f733a75a9230405f40", "parents": [ "055d219441cc23f631240335fd369b6b5852681a", "cfaea56741360311d0dabcb6603fa78c2e3de155" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 09:40:27 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 09:40:27 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: matrix_keypad - increase the limit of rows and columns\n Input: wacom - fix error path in wacom_probe()\n Input: ads7846 - check proper condition when freeing gpio\n Revert \"Input: do not pass injected events back to the originating handler\"\n Input: sysrq - rework re-inject logic\n Input: serio - clear pending rescans after sysfs driver rebind\n Input: rotary_encoder - use proper irqflags\n Input: wacom_w8001 - report resolution to userland\n" }, { "commit": "a252852afaea8270fcb91628b298253b112fc92e", "tree": "71d0931449a6fba2a4c3a306effe2e7ef15f8541", "parents": [ "d91309f69b7bdb64aeb30106fde8d18c5dd354b5", "d14dd7e20d5e526557f5d3cfef4046a642f80924" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 15 04:10:35 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 15 04:10:35 2011 +0100" }, "message": "Merge branch \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent\n" }, { "commit": "d606ef3fe0c57504b8e534c58498f73a6abc049a", "tree": "00aa6e80fedbe8cd866fe19db8b077afd32db068", "parents": [ "68aa3fd551e9d54d98794852714dc1edbb21df77" ], "author": { "name": "Baruch Siach", "email": "baruch@tkos.co.il", "time": "Mon Feb 14 02:05:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 14 17:38:30 2011 -0800" }, "message": "phy/micrel: add ability to support 50MHz RMII clock on KZS8051RNL\n\nPlatform code can now set the MICREL_PHY_50MHZ_CLK bit of dev_flags in a fixup\nroutine (registered with phy_register_fixup_for_uid()), to make the KZS8051RNL\nPHY work with 50MHz RMII reference clock.\n\nCc: David J. Choi \u003cdavid.choi@micrel.com\u003e\nSigned-off-by: Baruch Siach \u003cbaruch@tkos.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fbaec0ea54f7d9131891ff98744e82c073ce03b1", "tree": "d0622d38a51b7e4a1e853338e7cbd954d3977cf2", "parents": [ "f45437efff460aa033978180da88229c5fc68455" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sun Feb 13 10:15:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 16:58:39 2011 -0800" }, "message": "rtnetlink: implement setting of master device\n\nThis patch allows userspace to enslave/release slave devices via netlink\ninterface using IFLA_MASTER. This introduces generic way to add/remove\nunderling devices.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "795abaf1e4e188c4171e3cd3dbb11a9fcacaf505", "tree": "ae7273f0234c3fc3847626266080d8cfdb072c52", "parents": [ "091994cfb8e7d7a372c2d547778a91012d899e16" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 16:37:07 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 13 16:54:24 2011 -0800" }, "message": "klist: Fix object alignment on 64-bit.\n\nCommit c0e69a5bbc6f (\"klist.c: bit 0 in pointer can\u0027t be used as flag\")\nintended to make sure that all klist objects were at least pointer size\naligned, but used the constant \"4\" which only works on 32-bit.\n\nUse \"sizeof(void *)\" which is correct in all cases.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1765a575334f1a232c1478accdee5c7d19f4b3e3", "tree": "6613f53ce9095b799048d891f0b4b6e34a479fe0", "parents": [ "d59cfde2fb960b5970ccb5a38cea25d38b37a8e8" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sat Feb 12 06:48:36 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 10:42:07 2011 -0800" }, "message": "net: make dev-\u003emaster general\n\ndev-\u003emaster is now tightly connected to bonding driver. This patch makes\nthis pointer more general and ready to be used by others.\n\n - netdev_set_master() - bond specifics moved to new function\n netdev_set_bond_master()\n - introduced netif_is_bond_slave() to check if device is a bonding slave\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d59cfde2fb960b5970ccb5a38cea25d38b37a8e8", "tree": "4ccf7fe4c8cc5a128885e60bd417253d3ec9b24a", "parents": [ "d5e219c3a2389f31b18e4ca55c33a12adaadf565" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sat Feb 12 00:46:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 10:42:06 2011 -0800" }, "message": "net: remove the unnecessary dance around skb_bond_should_drop\n\nNo need to check (master) twice and to drive in and out the header file.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nReviewed-by: Nicolas de Pesloüan \u003cnicolas.2p.debian@free.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d033d526a465c4bb8a499a0b5df65b3e7cf4da6f", "tree": "570fba34e3fe39dd158dbf38296ca486298b2548", "parents": [ "55320cb58baebd1795ec92f4550a1e8b38bf9ddf" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Feb 10 14:40:01 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Feb 11 08:47:15 2011 -0800" }, "message": "ixgbe: DCB, implement 802.1Qaz routines\n\nImplements 802.1Qaz support for ixgbe driver. Additionally,\nthis adds IEEE_8021QAZ_TSA_{} defines to dcbnl.h this is to\navoid having to use cryptic numeric codes for the TSA type.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "cfaea56741360311d0dabcb6603fa78c2e3de155", "tree": "2b21a60fc72413a0e7384dc00c81a52a327e0281", "parents": [ "4b6d44344000ff3e62faf595e5f89fd8d9e52a94" ], "author": { "name": "Trilok Soni", "email": "tsoni@codeaurora.org", "time": "Fri Feb 11 00:44:41 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Feb 11 01:01:23 2011 -0800" }, "message": "Input: matrix_keypad - increase the limit of rows and columns\n\nSome keyboard controllers support more than 16 columns and rows.\nIncrease the limit to 32.\n\nSigned-off-by: Trilok Soni \u003ctsoni@codeaurora.org\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "6037b715d6fab139742c3df8851db4c823081561", "tree": "aba9e9427debd4fa5b904daefa8e71a6320f4b93", "parents": [ "deabb19ba4bd8c06ae69bc262e3594b515e3a459" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Wed Feb 09 22:11:51 2011 -0800" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 11 17:41:58 2011 +1100" }, "message": "security: add cred argument to security_capable()\n\nExpand security_capable() to include cred, so that it can be usable in a\nwider range of call sites.\n\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "67d019528e5c2693145217cf18a507689980d2a4", "tree": "77191261468d37b069009887c1ab11afd93e2952", "parents": [ "ce86d35d2fd119d777fc72736732c8c9c3456698", "721d92fc6373dee15846216f9d178ec240ec0fd7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:20:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:20:40 2011 -0800" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (21 commits)\n USB: cdc-acm: Adding second ACM channel support for Nokia N8\n USB, Mass Storage, composite, gadget: Fix build failure and memset of a struct\n USB: Fix trout build failure with ci13xxx_msm gadget\n USB: EHCI: fix scheduling while atomic during suspend\n USB: usb-storage: unusual_devs entry for Coby MP3 player\n USB: ftdi_sio: Add VID\u003d0x0647, PID\u003d0x0100 for Acton Research spectrograph\n USB: fix race between root-hub resume and wakeup requests\n USB: prevent buggy hubs from crashing the USB stack\n usb: r8a66597-udc: Fixed bufnum of Bulk\n USB: ftdi_sio: add ST Micro Connect Lite uart support\n USB: Storage: Add unusual_devs entry for VTech Kidizoom\n USB SL811HS HCD: Fix memory leak in sl811h_urb_enqueue()\n USB: ti_usb: fix module removal\n USB: io_edgeport: fix the reported firmware major and minor\n usb: ehci-omap: Show fatal probing time errors to end user\n usb: musb: introduce api for dma code to check compatibility with usb request\n usb: musb: maintain three states for buffer mappings instead of two\n usb: musb: disable double buffering when it\u0027s broken\n usb: musb: hsdma: change back to use musb_read/writew\n usb: musb: core: fix IRQ check\n ...\n" }, { "commit": "e128c5e26bd474a2a56b96ec7c8967aff347b763", "tree": "1352a221d62f4c452c3962c283aac48491549363", "parents": [ "70a062286b9dfcbd24d2e11601aecfead5cf709a", "3e9d08ec0a68f6faf718d5a7e050fe5ca0ba004f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:05:09 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 10 12:05:09 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)\n virtio_net: Add schedule check to napi_enable call\n x25: Do not reference freed memory.\n pch_can: fix tseg1/tseg2 setting issue\n isdn: hysdn: Kill (partially buggy) CVS regision log reporting.\n can: softing_cs needs slab.h\n pch_gbe: Fix the issue which a driver locks when rx offload is set by ethtool\n netfilter: nf_conntrack: set conntrack templates again if we return NF_REPEAT\n pch_can: fix module reload issue with MSI\n pch_can: fix rmmod issue\n pch_can: fix 800k comms issue\n net: Fix lockdep regression caused by initializing netdev queues too early.\n net/caif: Fix dangling list pointer in freed object on error.\n USB CDC NCM errata updates for cdc_ncm host driver\n CDC NCM errata updates for cdc.h\n ixgbe: update version string\n ixgbe: cleanup variable initialization\n ixgbe: limit VF access to network traffic\n ixgbe: fix for 82599 erratum on Header Splitting\n ixgbe: fix variable set but not used warnings by gcc 4.6\n e1000: add support for Marvell Alaska M88E1118R PHY\n ...\n" }, { "commit": "6d1d4ea4a82f8c17a3ff7c2f677bc3d41ea7484b", "tree": "4c2a87537469cba7dce6f13ff0f757a6cfa37019", "parents": [ "67acad5fe5df591e8f629050667912b0db2c72e7" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Tue Feb 08 23:32:17 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 09 16:09:51 2011 -0500" }, "message": "ssb: extract boardflags2 for SPROMs rev 4 and 5\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d3d373e0e3f51f335d8c722dd1340ab812fdf94b", "tree": "766175dfbbd5688f77e69fe43c835865fd864d2d", "parents": [ "aceb91cd351bc3a19a783c901fe8a8070d5f6fa9", "5084f89303c0a138f66bf74662753f46878989bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 09 11:51:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 09 11:51:40 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n virtio: console: Update Copyright\n virtio: console: Wake up outvq on host notifications\n" }, { "commit": "263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea", "tree": "5ee497d530185d32421122729af86cf77d0dc649", "parents": [ "8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224", "c69b90920a36b88ab0d649963d81355d865eeb05" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 17:19:01 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 17:19:01 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e1000e/netdev.c\n" }, { "commit": "fa9921e46fd52b78070dc67ce0d27ec301a90410", "tree": "8684af3cd03cf8fed1e6be9f722c181278944f7b", "parents": [ "c0c84ef5c130f8871adbdaac2ba824b9195cb6d9" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Feb 02 06:29:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 14:00:40 2011 -0800" }, "message": "ipsec: allow to align IPv4 AH on 32 bits\n\nThe Linux IPv4 AH stack aligns the AH header on a 64 bit boundary\n(like in IPv6). This is not RFC compliant (see RFC4302, Section\n3.3.3.2.1), it should be aligned on 32 bits.\n\nFor most of the authentication algorithms, the ICV size is 96 bits.\nThe AH header alignment on 32 or 64 bits gives the same results.\n\nHowever for SHA-256-128 for instance, the wrong 64 bit alignment results\nin adding useless padding in IPv4 AH, which is forbidden by the RFC.\n\nTo avoid breaking backward compatibility, we use a new flag\n(XFRM_STATE_ALIGN4) do change original behavior.\n\nInitial patch from Dang Hongwu \u003chongwu.dang@6wind.com\u003e and\nChristophe Gouault \u003cchristophe.gouault@6wind.com\u003e.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a9dda7602e566014a859faaf8490e6454683ab1", "tree": "8bd9a7f31308fd13551112ed2a0454b1022f2160", "parents": [ "3fb17dabf663216b90076f7a1649b599e90d46f1" ], "author": { "name": "Alexey Orishko", "email": "alexey.orishko@gmail.com", "time": "Mon Feb 07 09:45:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 13:54:42 2011 -0800" }, "message": "CDC NCM errata updates for cdc.h\n\nChanges are based on the following documents:\n- CDC NCM errata:\nhttp://www.usb.org/developers/devclass_docs/NCM10_012011.zip\n- CDC and WMC errata link:\nhttp://www.usb.org/developers/devclass_docs/CDC1.2_WMC1.1_012011.zip\n\nSigned-off-by: Alexey Orishko \u003calexey.orishko@stericsson.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5084f89303c0a138f66bf74662753f46878989bb", "tree": "7bb0b6cb9d54de0680c53c2efcea23f7baf378e2", "parents": [ "2770c5ea501be69989a7acf54ec4cb3554c47191" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Mon Jan 31 13:06:37 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Feb 09 08:19:55 2011 +1030" }, "message": "virtio: console: Update Copyright\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "43a723286f3cae795418c62bc41c3cce73791a81", "tree": "71b8f7e24df3b2dd49164c31da0c92d5992c43f7", "parents": [ "15ccb7b429d341605296b6a654b414f2b3ae9fd3", "a9fe8d5fd52ecd17c3f3970bbcf6b3573f831898" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:49 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:49 2011 -0800" }, "message": "Merge branch \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n m32r: Fixup last __do_IRQ leftover\n genirq: Add missing status flags to modification mask\n" }, { "commit": "15ccb7b429d341605296b6a654b414f2b3ae9fd3", "tree": "f2af4a8952b10728e13c6f41db4b7a062a574a5c", "parents": [ "07675f484bb9de0c4bd0722e174cb27043dbacef", "862b6f62bf0cd768910b087f6d051f420206c4d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 06 12:04:16 2011 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf stat: Fix aggreate counter reading accounting\n tracing: Replace syscall_meta_data struct array with pointer array\n tracepoints: Fix section alignment using pointer array\n tracing: Replace trace_event struct array with pointer array\n" }, { "commit": "872434d69c644b8aa5088b835598dc3cd9832aff", "tree": "82f55a0ff9ed1fc9eb814fb80dfb5e605f47e07a", "parents": [ "44f2c5c841da1b1e0864d768197ab1497b5c2cc1" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Feb 05 16:25:25 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Feb 05 16:33:56 2011 +0100" }, "message": "genirq: Add missing status flags to modification mask\n\nThe mask which filters out the valid bits which can be set via\nirq_modify_status() is missing IRQ_NO_BALANCING, which breaks UV.\n\nAdd IRQ_PER_CPU as well to avoid another one line patch for 39.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "bd4a6974cc9090ef3851e5b0a2071e5383565c7c", "tree": "e96ef46426d293b730a305b5185ba5412c9172d4", "parents": [ "2b7bcebf958c74124220ee8103024def8597b36c", "1e6d93e45b231b3ae87c01902ede2315aacfe976" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "44f2c5c841da1b1e0864d768197ab1497b5c2cc1", "tree": "a9e62ee30dedd31c5aeb9c1a97cb8efec5dc3398", "parents": [ "78d2978874e4e10e97dfd4fd79db45bdc0748550", "1e6d93e45b231b3ae87c01902ede2315aacfe976" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 04 13:20:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 04 13:20:01 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (68 commits)\n net: can: janz-ican3: world-writable sysfs termination file\n net: can: at91_can: world-writable sysfs files\n MAINTAINERS: update email ids of the be2net driver maintainers.\n bridge: Don\u0027t put partly initialized fdb into hash\n r8169: prevent RxFIFO induced loops in the irq handler.\n r8169: RxFIFO overflow oddities with 8168 chipsets.\n r8169: use RxFIFO overflow workaround for 8168c chipset.\n include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument\n net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.\n net: Support compat SIOCGETVIFCNT ioctl in ipv4.\n net: Fix bug in compat SIOCGETSGCNT handling.\n niu: Fix races between up/down and get_stats.\n tcp_ecn is an integer not a boolean\n atl1c: Add missing PCI device ID\n s390: Fix possibly wrong size in strncmp (smsgiucv)\n s390: Fix wrong size in memcmp (netiucv)\n qeth: allow OSA CHPARM change in suspend state\n qeth: allow HiperSockets framesize change in suspend\n qeth: add more strict MTU checking\n qeth: show new mac-address if its setting fails\n ...\n" }, { "commit": "8cf28f1f4de58c70e6af657bb46ca8f304c073d4", "tree": "0127ff6c9f92106d42e07f5607547e5ebb71fdd3", "parents": [ "148fc55fd0449683a1d15bf219ad8d8b6fa17545" ], "author": { "name": "Pavankumar Kondeti", "email": "pkondeti@codeaurora.org", "time": "Fri Feb 04 10:08:18 2011 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Feb 04 12:38:14 2011 -0800" }, "message": "USB: Fix trout build failure with ci13xxx_msm gadget\n\nThis patch fixes the below compilation errors.\n\n CC drivers/usb/gadget/ci13xxx_msm.o\n CC net/mac80211/led.o\n drivers/usb/gadget/ci13xxx_msm.c: In function \u0027ci13xxx_msm_notify_event\u0027:\n drivers/usb/gadget/ci13xxx_msm.c:42: error: \u0027USB_AHBBURST\u0027 undeclared (first use in this function)\n drivers/usb/gadget/ci13xxx_msm.c:42: error: (Each undeclared identifier is reported only once\n drivers/usb/gadget/ci13xxx_msm.c:42: error: for each function it appears in.)\n drivers/usb/gadget/ci13xxx_msm.c:43: error: \u0027USB_AHBMODE\u0027 undeclared (first use in this function)\nmake[4]: *** [drivers/usb/gadget/ci13xxx_msm.o] Error 1\nmake[3]: *** [drivers/usb/gadget] Error 2\n\nMSM USB driver is not supported on boards like trout (MSM7201) which\nhas an external PHY.\n\nSigned-off-by: Pavankumar Kondeti \u003cpkondeti@codeaurora.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "862b6f62bf0cd768910b087f6d051f420206c4d6", "tree": "f646e5246679ca851baf54e888c0d59b66ecf324", "parents": [ "1ebdfa803dc5ced604ebadd26fcb8cdca8e09b85", "3d56e331b6537671c66f1b510bed0f1e0331dfc8" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 04 19:02:53 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 04 19:02:53 2011 +0100" }, "message": "Merge branch \u0027tip/perf/urgent-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent\n" }, { "commit": "e2d57766e6744f2956975dd2086d82957187b0f6", "tree": "6d7f09ad6eaaac8ad99528cc83894faa6b230b1a", "parents": [ "ca6b8bb097c8e0ab6bce4fa04584074dee17c0d9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 17:59:32 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 18:05:29 2011 -0800" }, "message": "net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d56e331b6537671c66f1b510bed0f1e0331dfc8", "tree": "80145576e1b9e701b7a2270c6a09798ed6b783c3", "parents": [ "654986462939cd7ec18f276c6379a334dac106a7" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Feb 02 17:06:09 2011 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Feb 03 09:29:06 2011 -0500" }, "message": "tracing: Replace syscall_meta_data struct array with pointer array\n\nCurrently the syscall_meta structures for the syscall tracepoints are\nplaced in the __syscall_metadata section, and at link time, the linker\nmakes one large array of all these syscall metadata structures. On boot\nup, this array is read (much like the initcall sections) and the syscall\ndata is processed.\n\nThe problem is that there is no guarantee that gcc will place complex\nstructures nicely together in an array format. Two structures in the\nsame file may be placed awkwardly, because gcc has no clue that they\nare suppose to be in an array.\n\nA hack was used previous to force the alignment to 4, to pack the\nstructures together. But this caused alignment issues with other\narchitectures (sparc).\n\nInstead of packing the structures into an array, the structures\u0027 addresses\nare now put into the __syscall_metadata section. As pointers are always the\nnatural alignment, gcc should always pack them tightly together\n(otherwise initcall, extable, etc would also fail).\n\nBy having the pointers to the structures in the section, we can still\niterate the trace_events without causing unnecessary alignment problems\nwith other architectures, or depending on the current behaviour of\ngcc that will likely change in the future just to tick us kernel developers\noff a little more.\n\nThe __syscall_metadata section is also moved into the .init.data section\nas it is now only needed at boot up.\n\nSuggested-by: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "654986462939cd7ec18f276c6379a334dac106a7", "tree": "b9c70944012c24fa6d7cc973fa9b4b6e875ca842", "parents": [ "e4a9ea5ee7c8812a7bf0c3fb725ceeaa3d4c2fcc" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@efficios.com", "time": "Wed Jan 26 17:26:22 2011 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Feb 03 09:28:46 2011 -0500" }, "message": "tracepoints: Fix section alignment using pointer array\n\nMake the tracepoints more robust, making them solid enough to handle compiler\nchanges by not relying on anything based on compiler-specific behavior with\nrespect to structure alignment. Implement an approach proposed by David Miller:\nuse an array of const pointers to refer to the individual structures, and export\nthis pointer array through the linker script rather than the structures per se.\nIt will consume 32 extra bytes per tracepoint (24 for structure padding and 8\nfor the pointers), but are less likely to break due to compiler changes.\n\nHistory:\n\ncommit 7e066fb8 tracepoints: add DECLARE_TRACE() and DEFINE_TRACE()\nadded the aligned(32) type and variable attribute to the tracepoint structures\nto deal with gcc happily aligning statically defined structures on 32-byte\nmultiples.\n\nOne attempt was to use a 8-byte alignment for tracepoint structures by applying\nboth the variable and type attribute to tracepoint structures definitions and\ndeclarations. It worked fine with gcc 4.5.1, but broke with gcc 4.4.4 and 4.4.5.\n\nThe reason is that the \"aligned\" attribute only specify the _minimum_ alignment\nfor a structure, leaving both the compiler and the linker free to align on\nlarger multiples. Because tracepoint.c expects the structures to be placed as an\narray within each section, up-alignment cause NULL-pointer exceptions due to the\nextra unexpected padding.\n\n(this patch applies on top of -tip)\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nLKML-Reference: \u003c20110126222622.GA10794@Krystal\u003e\nCC: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCC: Ingo Molnar \u003cmingo@elte.hu\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCC: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCC: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "45e144339ac59971eb44be32e1282760aaabe861", "tree": "b9d93acb2c1bb505d3b6facc426d307c59dc63a4", "parents": [ "119b3d386985fcd477b3131190c041516a73f83a" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 02 15:21:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 20:52:42 2011 -0800" }, "message": "sched: CHOKe flow scheduler\n\nCHOKe (\"CHOose and Kill\" or \"CHOose and Keep\") is an alternative\npacket scheduler based on the Random Exponential Drop (RED) algorithm.\n\nThe core idea is:\n For every packet arrival:\n \tCalculate Qave\n\tif (Qave \u003c minth)\n\t Queue the new packet\n\telse\n\t Select randomly a packet from the queue\n\t if (both packets from same flow)\n\t then Drop both the packets\n\t else if (Qave \u003e maxth)\n\t Drop packet\n\t else\n\t \t Admit packet with proability p (same as RED)\n\nSee also:\n Rong Pan, Balaji Prabhakar, Konstantinos Psounis, \"CHOKe: a stateless active\n queue management scheme for approximating fair bandwidth allocation\",\n Proceeding of INFOCOM\u00272000, March 2000.\n\nHelp from:\n Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n Patrick McHardy \u003ckaber@trash.net\u003e\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e4a9ea5ee7c8812a7bf0c3fb725ceeaa3d4c2fcc", "tree": "1b25668508fa302a6ada053c895cd55727f798f1", "parents": [ "9ffdc6c37df131f89d52001e0ef03091b158826f" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Thu Jan 27 09:15:30 2011 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Wed Feb 02 21:37:13 2011 -0500" }, "message": "tracing: Replace trace_event struct array with pointer array\n\nCurrently the trace_event structures are placed in the _ftrace_events\nsection, and at link time, the linker makes one large array of all\nthe trace_event structures. On boot up, this array is read (much like\nthe initcall sections) and the events are processed.\n\nThe problem is that there is no guarantee that gcc will place complex\nstructures nicely together in an array format. Two structures in the\nsame file may be placed awkwardly, because gcc has no clue that they\nare suppose to be in an array.\n\nA hack was used previous to force the alignment to 4, to pack the\nstructures together. But this caused alignment issues with other\narchitectures (sparc).\n\nInstead of packing the structures into an array, the structures\u0027 addresses\nare now put into the _ftrace_event section. As pointers are always the\nnatural alignment, gcc should always pack them tightly together\n(otherwise initcall, extable, etc would also fail).\n\nBy having the pointers to the structures in the section, we can still\niterate the trace_events without causing unnecessary alignment problems\nwith other architectures, or depending on the current behaviour of\ngcc that will likely change in the future just to tick us kernel developers\noff a little more.\n\nThe _ftrace_event section is also moved into the .init.data section\nas it is now only needed at boot up.\n\nSuggested-by: David Miller \u003cdavem@davemloft.net\u003e\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "3cd90ea42f2c15f928b70ed66f6d8ed0a8e7aadd", "tree": "2e27c807baaec2e6528cd5431d57308a4d874dea", "parents": [ "1a44bc8c7cfe69756a116d38aef992d50fc1969d" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Tue Feb 01 15:52:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 16:03:19 2011 -0800" }, "message": "vfs: sparse: add __FMODE_EXEC\n\nFMODE_EXEC is a constant type of fmode_t but was used with normal integer\nconstants. This results in following warnings from sparse. Fix it using\nnew macro __FMODE_EXEC.\n\n fs/exec.c:116:58: warning: restricted fmode_t degrades to integer\n fs/exec.c:689:58: warning: restricted fmode_t degrades to integer\n fs/fcntl.c:777:9: warning: restricted fmode_t degrades to integer\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a44bc8c7cfe69756a116d38aef992d50fc1969d", "tree": "3e830a7fe2f4b57e425421b35c6faebbbb2c7cc2", "parents": [ "3751d60430fe4c26460a5ca8ad8672d32f93bcb1" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Tue Feb 01 15:52:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 16:03:19 2011 -0800" }, "message": "vfs: sparse: remove a warning on OPEN_FMODE()\n\nAND-ing FMODE_* constant with normal integer results in following\nsparse warnings. Fix it.\n\n fs/open.c:662:21: warning: restricted fmode_t degrades to integer\n fs/anon_inodes.c:123:34: warning: restricted fmode_t degrades to integer\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "19942822df65ee4a47c2e6d6d70cace1b7f01710", "tree": "1fe6fdcc92ae7e64014c04676fc91e0105bdf344", "parents": [ "9221edb7120e2dc3ae90f1c58514979f7ba40e46" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Tue Feb 01 15:52:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 16:03:19 2011 -0800" }, "message": "memcg: prevent endless loop when charging huge pages to near-limit group\n\nIf reclaim after a failed charging was unsuccessful, the limits are\nchecked again, just in case they settled by means of other tasks.\n\nThis is all fine as long as every charge is of size PAGE_SIZE, because in\nthat case, being below the limit means having at least PAGE_SIZE bytes\navailable.\n\nBut with transparent huge pages, we may end up in an endless loop where\ncharging and reclaim fail, but we keep going because the limits are not\nyet exceeded, although not allowing for a huge page.\n\nFix this up by explicitely checking for enough room, not just whether we\nare within limits.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8fe73503fae8cb8f00c80dd6444c1ddcd19257bd", "tree": "39cc6d38a628c445da7d52c006df6930a2c58411", "parents": [ "123b9731b14f49cd41c91ed2b6c31e515615347c", "9291747f118d6404e509747b85ff5f6dfec368d2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 15:24:48 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 15:24:48 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "9291747f118d6404e509747b85ff5f6dfec368d2", "tree": "4ccb3988371f3dc75ade8427518986ad6890389c", "parents": [ "5f52bc3cdd1bb2e12e61639df19d9dcd530c4568" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Feb 03 00:05:43 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Feb 03 00:05:43 2011 +0100" }, "message": "netfilter: xtables: add device group match\n\nAdd a new \u0027devgroup\u0027 match to match on the device group of the\nincoming and outgoing network device of a packet.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "724bab476bcac9f7d0b5204cb06e346216d42166", "tree": "ac4aa027d85a801ca2e3eb75678124434e1ba30d", "parents": [ "316ed388802533bcfd3dffb38d2ba29ac5428456" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Feb 02 23:50:01 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Feb 02 23:50:01 2011 +0100" }, "message": "netfilter: ipset: fix linking with CONFIG_IPV6\u003dn\n\nAdd a dummy ip_set_get_ip6_port function that unconditionally\nreturns false for CONFIG_IPV6\u003dn and convert the real function\nto ipv6_skip_exthdr() to avoid pulling in the ip6_tables module\nwhen loading ipset.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e3e241b2769b27669d05f0a05083acd21b4faa2c", "tree": "e0bd02af573dd52c46051f3cd28a378a25cb9d7b", "parents": [ "ed3d1e7b72069a3463b7e227b18cae4a09b0ddad" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 18:52:42 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 18:52:42 2011 +0100" }, "message": "netfilter: ipset: install ipset related header files\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d956798d82d2d331c031301965d69e17a1a48a2b", "tree": "3ceb434334d79d9dd8b205fc502cf2d20ab737ab", "parents": [ "f830837f0eed0f9e371b8fd65169365780814bb1" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Feb 01 15:56:00 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 15:56:00 2011 +0100" }, "message": "netfilter: xtables: \"set\" match and \"SET\" target support\n\nThe patch adds the combined module of the \"SET\" target and \"set\" match\nto netfilter. Both the previous and the current revisions are supported.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f830837f0eed0f9e371b8fd65169365780814bb1", "tree": "f83646838333cf2526270aa23320f88171e6fa35", "parents": [ "21f45020a3084f80fcdd5f056a0c6389f5406399" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Feb 01 15:54:59 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 15:54:59 2011 +0100" }, "message": "netfilter: ipset: list:set set type support\n\nThe module implements the list:set type support in two flavours:\nwithout and with timeout. The sets has two sides: for the userspace,\nthey store the names of other (non list:set type of) sets: one can add,\ndelete and test set names. For the kernel, it forms an ordered union of\nthe member sets: the members sets are tried in order when elements are\nadded, deleted and tested and the process stops at the first success.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "6c027889696a7a694b0e2f6e3cabadefec7553b6", "tree": "bfdb7bbdb8153ac15c45fe86928d4b02ce3fe766", "parents": [ "543261907dc3c4e90845acfcd602ebdbfdfcb4f0" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Feb 01 15:38:36 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 15:38:36 2011 +0100" }, "message": "netfilter: ipset: hash:ip set type support\n\nThe module implements the hash:ip type support in four flavours:\nfor IPv4 or IPv6, both without and with timeout support.\n\nAll the hash types are based on the \"array hash\" or ahash structure\nand functions as a good compromise between minimal memory footprint\nand speed. The hashing uses arrays to resolve clashes. The hash table\nis resized (doubled) when searching becomes too long. Resizing can be\ntriggered by userspace add commands only and those are serialized by\nthe nfnl mutex. During resizing the set is read-locked, so the only\npossible concurrent operations are the kernel side readers. Those are\nprotected by RCU locking.\n\nBecause of the four flavours and the other hash types, the functions\nare implemented in general forms in the ip_set_ahash.h header file\nand the real functions are generated before compiling by macro expansion.\nThus the dereferencing of low-level functions and void pointer arguments\ncould be avoided: the low-level functions are inlined, the function\narguments are pointers of type-specific structures.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "72205fc68bd13109576aa6c4c12c740962d28a6c", "tree": "c034f0c9c216f489cfce377215b7420cb66d4b2f", "parents": [ "a7b4f989a629493bb4ec4a354def784d440b32c4" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Feb 01 15:33:17 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 15:33:17 2011 +0100" }, "message": "netfilter: ipset: bitmap:ip set type support\n\nThe module implements the bitmap:ip set type in two flavours, without\nand with timeout support. In this kind of set one can store IPv4\naddresses (or network addresses) from a given range.\n\nIn order not to waste memory, the timeout version does not rely on\nthe kernel timer for every element to be timed out but on garbage\ncollection. All set types use this mechanism.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "a7b4f989a629493bb4ec4a354def784d440b32c4", "tree": "47f5f6a19cd8fb4cbd44a064edbf03a5b102ea1b", "parents": [ "f703651ef870bd6b94ddc98ae07488b7d3fd9335" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Feb 01 15:28:35 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 15:28:35 2011 +0100" }, "message": "netfilter: ipset: IP set core support\n\nThe patch adds the IP set core support to the kernel.\n\nThe IP set core implements a netlink (nfnetlink) based protocol by which\none can create, destroy, flush, rename, swap, list, save, restore sets,\nand add, delete, test elements from userspace. For simplicity (and backward\ncompatibilty and for not to force ip(6)tables to be linked with a netlink\nlibrary) reasons a small getsockopt-based protocol is also kept in order\nto communicate with the ip(6)tables match and target.\n\nThe netlink protocol passes all u16, etc values in network order with\nNLA_F_NET_BYTEORDER flag. The protocol enforces the proper use of the\nNLA_F_NESTED and NLA_F_NET_BYTEORDER flags.\n\nFor other kernel subsystems (netfilter match and target) the API contains\nthe functions to add, delete and test elements in sets and the required calls\nto get/put refereces to the sets before those operations can be performed.\n\nThe set types (which are implemented in independent modules) are stored\nin a simple RCU protected list. A set type may have variants: for example\nwithout timeout or with timeout support, for IPv4 or for IPv6. The sets\n(i.e. the pointers to the sets) are stored in an array. The sets are\nidentified by their index in the array, which makes possible easy and\nfast swapping of sets. The array is protected indirectly by the nfnl\nmutex from nfnetlink. The content of the sets are protected by the rwlock\nof the set.\n\nThere are functional differences between the add/del/test functions\nfor the kernel and userspace:\n\n- kernel add/del/test: works on the current packet (i.e. one element)\n- kernel test: may trigger an \"add\" operation in order to fill\n out unspecified parts of the element from the packet (like MAC address)\n- userspace add/del: works on the netlink message and thus possibly\n on multiple elements from the IPSET_ATTR_ADT container attribute.\n- userspace add: may trigger resizing of a set\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f703651ef870bd6b94ddc98ae07488b7d3fd9335", "tree": "1840dadb9102fe0cf0216daf63cb97d4e2552629", "parents": [ "6a4ddef2a3805d5b0664a94579b7a651bc202266" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Feb 01 15:20:14 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 15:20:14 2011 +0100" }, "message": "netfilter: NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros\n\nThe patch adds the NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros to the\nvanilla kernel.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0fd08c5545a806c960a6597fae4a2e656eb7ead9", "tree": "027dfcc65f600afe6a4b19ab72c472fe3f0f24fa", "parents": [ "7921127e297ea203b794c4a1c3ef3eb0ee52acbf", "d1205f87bbb8040c1408bbd9e0a720310b2b0b9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 09:41:02 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 09:41:02 2011 +1000" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: NFSv4 readdir loses entries\n NFS: Micro-optimize nfs4_decode_dirent()\n NFS: Fix an NFS client lockdep issue\n NFS construct consistent co_ownerid for v4.1\n NFS: nfs_wcc_update_inode() should set nfsi-\u003eattr_gencount\n NFS improve pnfs_put_deviceid_cache debug print\n NFS fix cb_sequence error processing\n NFS do not find client in NFSv4 pg_authenticate\n NLM: Fix \"kernel BUG at fs/lockd/host.c:417!\" or \".../host.c:283!\"\n NFS: Prevent memory allocation failure in nfsacl_encode()\n NFS: nfsacl_{encode,decode} should return signed integer\n NFS: Fix \"kernel BUG at fs/nfs/nfs3xdr.c:1338!\"\n NFS: Fix \"kernel BUG at fs/aio.c:554!\"\n NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds().\n NFS: fix handling of malloc failure during nfs_flush_multi()\n" }, { "commit": "ffbbf2da9e578dc7b7ae4f945412c4b74f54b20e", "tree": "42286b98b10fce7132ad61750db94765a0946c3c", "parents": [ "fb9f1f17e9c117c0bf7a8f1b7a0efe5db5bc1836" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Jan 31 09:29:14 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 08:23:22 2011 +1000" }, "message": "kernel.h: fix kernel-doc warning\n\nFix kernel-doc warning in kernel.h from commit 7ef88ad56145\n(\"BUILD_BUG_ON: make it handle more cases\"):\n\n Warning(include/linux/kernel.h:605): No description found for parameter \u0027condition\u0027\n Warning(include/linux/kernel.h:605): Excess function parameter \u0027cond\u0027 description in \u0027BUILD_BUG_ON\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cbae48738f23d5409138700c5ccdfd6e4e0d6032", "tree": "67f3773989a9ed3787c18bc22cf80f503431ee9c", "parents": [ "fb1c6348b22dde3ef75b53ec23982bf1bc617c32", "fd96d0d8d8079b1ea7a7e8943a4da9dfc9621124" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 08:07:40 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 01 08:07:40 2011 +1000" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)\n usb: gadget: composite: avoid access beyond array max length\n USB: serial: handle Data Carrier Detect changes\n USB: gadget: Fix endpoint representation in ci13xxx_udc\n USB: gadget: Fix error path in ci13xxx_udc gadget probe function\n usb: pch_udc: Fix the worning log issue at gadget driver remove\n USB: serial: Updated support for ICOM devices\n USB: ehci-mxc: add work-around for efika mx/sb bug\n USB: unbreak ehci-mxc on otg port of i.MX27\n drivers: update to pl2303 usb-serial to support Motorola cables\n USB: adding USB support for Cinterion\u0027s HC2x, EU3 and PH8 products\n USB serial: add missing .usb_driver field in serial drivers\n USB: ehci-fsl: Fix \u0027have_sysif_regs\u0027 detection\n USB: g_printer: fix bug in module parameter definitions\n USB: g_printer: fix bug in unregistration\n USB: uss720: remove duplicate USB device\n MAINTAINERS: add ueagle-atm entry\n USB: EHCI: fix DMA deallocation bug\n USB: pch_udc: support new device ML7213 IOH\n usb: pch_udc: Fixed issue which does not work with g_serial\n usb: set ep_dev async suspend should be later than device_initialize\n ...\n" }, { "commit": "5403c8a29521a6eb02f9283dbbe0184527f8f42b", "tree": "4f1ca17feda4dfa88f53eceeaa39583ec840d27e", "parents": [ "c79b9e4936142d5ed26073d58bdd4a5a0ac62f32", "c4c93106741bbf61ecd05a2a835af8e3bf31c1bd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 13:13:24 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 13:13:24 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "709b46e8d90badda1898caea50483c12af178e96", "tree": "799b57704dda3684777fb57a6e413dabac78858c", "parents": [ "13ad17745c2cbd437d9e24b2d97393e0be11c439" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sat Jan 29 16:15:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 30 01:14:38 2011 -0800" }, "message": "net: Add compat ioctl support for the ipv4 multicast ioctl SIOCGETSGCNT\n\nSIOCGETSGCNT is not a unique ioctl value as it it maps tio SIOCPROTOPRIVATE +1,\nwhich unfortunately means the existing infrastructure for compat networking\nioctls is insufficient. A trivial compact ioctl implementation would conflict\nwith:\n\nSIOCAX25ADDUID\nSIOCAIPXPRISLT\nSIOCGETSGCNT_IN6\nSIOCGETSGCNT\nSIOCRSSCAUSE\nSIOCX25SSUBSCRIP\nSIOCX25SDTEFACILITIES\n\nTo make this work I have updated the compat_ioctl decode path to mirror the\nthe normal ioctl decode path. I have added an ipv4 inet_compat_ioctl function\nso that I can have ipv4 specific compat ioctls. I have added a compat_ioctl\nfunction into struct proto so I can break out ioctls by which kind of ip socket\nI am using. I have added a compat_raw_ioctl function because SIOCGETSGCNT only\nworks on raw sockets. I have added a ipmr_compat_ioctl that mirrors the normal\nipmr_ioctl.\n\nThis was necessary because unfortunately the struct layout for the SIOCGETSGCNT\nhas unsigned longs in it so changes between 32bit and 64bit kernels.\n\nThis change was sufficient to run a 32bit ip multicast routing daemon on a\n64bit kernel.\n\nReported-by: Bill Fenner \u003cfenner@aristanetworks.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52fe7c9cc1637110ba4e0e6fe5d07cc0786d62de", "tree": "b57098f78a3ed893de4e67da1219c80f433b5672", "parents": [ "c128df731862e90ec9292c5d3eb264ac73b522b8" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Sat Jan 29 13:10:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 30 01:14:14 2011 -0800" }, "message": "caif: bugfix - add caif headers for userspace usage.\n\nAdd caif_socket.h and if_caif.h to the kernel header files\nexported for use by userspace.\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e11210d46a4f252f41db6e442b46026aeddbb59", "tree": "b258375de649a5e04e8d567c850b47c41f8ceb11", "parents": [ "3bf63e59e577cbecd41334c866f501c4cc5d54c5", "c7c1806098752c1f46943d8db2c69aff07f5d4bc" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 28 16:23:14 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 28 16:23:14 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n\nConflicts:\n\tdrivers/net/wireless/ath/ath9k/init.c\n" }, { "commit": "ccf434380d1a67df2dcb9113206b77d0cb0a1cef", "tree": "1e1a36691f42ed7448f27f71a9ca9445e88ab5f1", "parents": [ "065825402c058f4a123ddc53dbbe864cc5caaf64" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 26 18:08:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 15:02:56 2011 -0800" }, "message": "net: fix dev_seq_next()\n\nCommit c6d14c84566d (net: Introduce for_each_netdev_rcu() iterator)\nadded a race in dev_seq_next().\n\nThe rcu_dereference() call should be done _before_ testing the end of\nlist, or we might return a wrong net_device if a concurrent thread\nchanges net_device list under us.\n\nNote : discovered thanks to a sparse warning :\n\nnet/core/dev.c:3919:9: error: incompatible types in comparison expression\n(different address spaces)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d14dd7e20d5e526557f5d3cfef4046a642f80924", "tree": "4f4d9c70322e0d2431b5ebdd08cb68dfa451e13b", "parents": [ "1ea1bdf7faa4d0b5293e605f2e1ef1c2c59f6b53" ], "author": { "name": "Ari Kauppi", "email": "kauppi@papupata.org", "time": "Thu Jan 20 13:57:19 2011 -0500" }, "committer": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Wed Jan 26 19:21:28 2011 +0100" }, "message": "ARM: oprofile: Fix backtraces in timer mode\n\nAlways allow backtraces when using oprofile on ARM, even if a PMU\nisn\u0027t present. Restores functionality originally introduced in commit\n1b7b56982fdcd9d85effd76f3928cf5d6eb26155 (\"oprofile: Always allow\nbacktraces on ARM\") by Richard Purdie.\n\nIt is not that obvious, but there is now only one oprofile_arch_init()\nfunction. So the .backtrace callback is available also in timer mode.\n\nImplemented by removing code and using stubs for oprofile_perf_{init,\nexit} provided by \u003clinux/oprofile.h\u003e. This allows cleaning of other\narchitecture specific implementations too.\n\nCc: stable@kernel.org # 37.x\nSigned-off-by: Ari Kauppi \u003ckauppi@papupata.org\u003e\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\n" }, { "commit": "1ea1bdf7faa4d0b5293e605f2e1ef1c2c59f6b53", "tree": "9cb838dcde16a66eb6f0933e10c310d61154843d", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Ari Kauppi", "email": "kauppi@papupata.org", "time": "Thu Jan 20 13:57:18 2011 -0500" }, "committer": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Wed Jan 26 19:14:34 2011 +0100" }, "message": "oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends\n\nThe implementations are flagged in Makefile with CONFIG_HW_PERF_EVENTS\ninstead of CONFIG_PERF_EVENTS.\n\nCc: stable@kernel.org # 37.x\nSigned-off-by: Ari Kauppi \u003ckauppi@papupata.org\u003e\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\n" }, { "commit": "6fb1b304255efc5c4c93874ac8c066272e257e28", "tree": "67b4193e20d3a5470f56b26d912ed791dba20f13", "parents": [ "ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff", "409550f2902470f0387fe40a7db441526e16b2c0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 16:31:44 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 16:31:44 2011 +1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: wacom - pass touch resolution to clients through input_absinfo\n Input: wacom - add 2 Bamboo Pen and touch models\n Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent\n Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup\n Input: tegra-kbc - add tegra keyboard driver\n Input: gpio_keys - switch to using request_any_context_irq\n Input: serio - allow registered drivers to get status flag\n Input: ct82710c - return proper error code for ct82c710_open\n Input: bu21013_ts - added regulator support\n Input: bu21013_ts - remove duplicate resolution parameters\n Input: tnetv107x-ts - don\u0027t treat NULL clk as an error\n Input: tnetv107x-keypad - don\u0027t treat NULL clk as an error\n\nFix up trivial conflicts in drivers/input/keyboard/Makefile due to\nadditions of tc3589x/Tegra drivers\n" }, { "commit": "ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff", "tree": "e2d3f799e20e2cbca80891ea17af7484f21d628f", "parents": [ "3689456b4bd36027022b3215eb2acba51cd0e6b5" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Tue Jan 25 15:07:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 10:50:06 2011 +1000" }, "message": "console: rename acquire/release_console_sem() to console_lock/unlock()\n\nThe -rt patches change the console_semaphore to console_mutex. As a\nresult, a quite large chunk of the patches changes all\nacquire/release_console_sem() to acquire/release_console_mutex()\n\nThis commit makes things use more neutral function names which dont make\nimplications about the underlying lock.\n\nThe only real change is the return value of console_trylock which is\ninverted from try_acquire_console_sem()\n\nThis patch also paves the way to switching console_sem from a semaphore to\na mutex.\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Thomas Gleixner \u003ctglx@tglx.de\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8348ad7c178627a302d579906096108b02052730", "tree": "253a309819de4cd9d913594950e7c1764f7ba5c7", "parents": [ "9948d378b99b06f6f34164dd8ff827e228ae9251", "170c7ab58f41c526c54e9dd04044857d5d73f9e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 09:02:14 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 09:02:14 2011 +1000" }, "message": "Merge branch \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n ARM: mach-shmobile: AG5EVM LCDC / MIPI-DSI platform data\n ARM: mach-shmobile: sh73a0 CPGA fix for PLL CFG bit\n ARM: mach-shmobile: mackerel: clarify shdi/mmcif switch settings\n ARM: mach-shmobile: sh73a0 CPGA fix for IrDA MSTP\n ARM: mach-shmobile: sh73a0 CPGA fix for FRQCRA M3\n ARM: mach-shmobile: remove sh7367 on-chip set_irq_type()\n ARM: mach-shmobile: sh7372 INTCS MFIS2 interrupt update\n ARM: mach-shmobile: ag5evm: Add IrDA support\n ARM: mach-shmobile: clock-sh7372: fixup pllc2 set_rate\n mmc: sh_mmcif: Convert to __raw_xxx() I/O accessors.\n ARM: mach-shmobile: ag5evm requires GPIOLIB\n ARM: mach-shmobile: fix cpu_base of gic_init() on sh73a0\n" }, { "commit": "778be232a207e79088ba70d832ac25dfea6fbf1a", "tree": "307249459e5ef45c4b3651c7fc5c454cdb3e0c92", "parents": [ "80c30e8de4f81851b1f712bcc596e11d53bc76f1" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Jan 25 15:38:01 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jan 25 15:26:51 2011 -0500" }, "message": "NFS do not find client in NFSv4 pg_authenticate\n\nThe information required to find the nfs_client cooresponding to the incoming\nback channel request is contained in the NFS layer. Perform minimal checking\nin the RPC layer pg_authenticate method, and push more detailed checking into\nthe NFS layer where the nfs_client can be found.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "f61f6da0d53842e849bab7f69e1431bd3de1136d", "tree": "8433904f645695338b98d3dc831631ffd6f129e5", "parents": [ "731f3f482ad3b2c58a1af2d0a9a634a82803706a" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Jan 21 03:05:38 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jan 25 15:24:47 2011 -0500" }, "message": "NFS: Prevent memory allocation failure in nfsacl_encode()\n\nnfsacl_encode() allocates memory in certain cases. This of course\nis not guaranteed to work.\n\nSince commit 9f06c719 \"SUNRPC: New xdr_streams XDR encoder API\", the\nkernel\u0027s XDR encoders can\u0027t return a result indicating possibly a\nfailure, so a memory allocation failure in nfsacl_encode() has become\nfatal (ie, the XDR code Oopses) in some cases.\n\nHowever, the allocated memory is a tiny fixed amount, on the order\nof 40-50 bytes. We can easily use a stack-allocated buffer for\nthis, with only a wee bit of nose-holding.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "731f3f482ad3b2c58a1af2d0a9a634a82803706a", "tree": "1425c239481309ffc68dd33a991fc13fc309226c", "parents": [ "ee5dc7732bd557bae6d10873a0aac606d2c551fb" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Jan 21 03:05:28 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jan 25 15:24:47 2011 -0500" }, "message": "NFS: nfsacl_{encode,decode} should return signed integer\n\nClean up.\n\nThe nfsacl_encode() and nfsacl_decode() functions return negative\nerrno values, and each call site verifies that the returned value\nis not negative. Change the synopsis of both of these functions\nto reflect this usage.\n\nDocument the synopsis and return values.\n\nReported-by: Trond Myklebust \u003ctrond.myklebust@netapp.com\u003e\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "acd1130e8793fb150fb522da8ec51675839eb4b1", "tree": "0da6f9f8f7690b426ff069f95bb28bf9e692d534", "parents": [ "04ed3e741d0f133e02bed7fa5c98edba128f90e7" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Mon Jan 24 15:45:15 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 15:45:15 2011 -0800" }, "message": "net: reduce and unify printk level in netdev_fix_features()\n\nReduce printk() levels to KERN_INFO in netdev_fix_features() as this will\nbe used by ethtool and might spam dmesg unnecessarily.\n\nThis converts the function to use netdev_info() instead of plain printk().\n\nAs a side effect, bonding and bridge devices will now log dropped features\non every slave device change.\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": "04ed3e741d0f133e02bed7fa5c98edba128f90e7", "tree": "3dde4ca8306e98536faa69bccf0e47a2549c088f", "parents": [ "57422dc530115e427dff464cc0a32bcd0efb5008" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "message": "net: change netdev-\u003efeatures to u32\n\nQuoting Ben Hutchings: we presumably won\u0027t be defining features that\ncan only be enabled on 64-bit architectures.\n\nOccurences found by `grep -r` on net/, drivers/net, include/\n\n[ Move features and vlan_features next to each other in\n struct netdev, as per Eric Dumazet\u0027s suggestion -DaveM ]\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": "c445477d74ab3779d1386ab797fbb9b628eb9f64", "tree": "3ee70b7748c6c63a688f367e5ffd83fde21b87e3", "parents": [ "c39649c331c70952700f99832b03f87e9d7f5b4b" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Jan 19 11:03:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:53:01 2011 -0800" }, "message": "net: RPS: Enable hardware acceleration of RFS\n\nAllow drivers for multiqueue hardware with flow filter tables to\naccelerate RFS. The driver must:\n\n1. Set net_device::rx_cpu_rmap to a cpu_rmap of the RX completion\nIRQs (in queue order). This will provide a mapping from CPUs to the\nqueues for which completions are handled nearest to them.\n\n2. Implement net_device_ops::ndo_rx_flow_steer. This operation adds\nor replaces a filter steering the given flow to the given RX queue, if\npossible.\n\n3. Periodically remove filters for which rps_may_expire_flow() returns\ntrue.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c39649c331c70952700f99832b03f87e9d7f5b4b", "tree": "19ba9cea5102595e42bcd043aa53eb666ea834fa", "parents": [ "c2df88cbb43c25db27fbbf94e92318bdad018f3e" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Jan 19 11:03:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:51:56 2011 -0800" }, "message": "lib: cpu_rmap: CPU affinity reverse-mapping\n\nWhen initiating I/O on a multiqueue and multi-IRQ device, we may want\nto select a queue for which the response will be handled on the same\nor a nearby CPU. This requires a reverse-map of IRQ affinity. Add\nlibrary functions to support a generic reverse-mapping from CPUs to\nobjects with affinity and the specific case where the objects are\nIRQs.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2df88cbb43c25db27fbbf94e92318bdad018f3e", "tree": "dc41466a193f85e3a7cc8baf1f78f2b55b62aabc", "parents": [ "5bdc22a56549e7983c6b443298672641952ea035", "cd7eab44e9946c28d595abe3e9a43e945bc49141" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:30:13 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:30:13 2011 -0800" }, "message": "Merge branch \u0027irq/numa\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n" }, { "commit": "5bdc22a56549e7983c6b443298672641952ea035", "tree": "fbfd4e7453e4fd23dfef826d4610ed2aae47b36c", "parents": [ "b6f4098897f30b7ea90a1c1edf35e9b20a9d828a", "e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:09:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:09:35 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/sched/sch_hfsc.c\n\tnet/sched/sch_htb.c\n\tnet/sched/sch_tbf.c\n" }, { "commit": "ce84d539ce47484ff3cbc9c67b3eb69ae88954f9", "tree": "cdba43e845e23a6793ca47857a16fae6032becfb", "parents": [ "bc094757f4f3d7b8211a8a1ed7605ffd7c728f75", "b5cc8ca1c9c3a37eaddf709b2fd3e1699aee41ba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 25 05:25:55 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 25 05:25:55 2011 +1000" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n RTC: Remove Kconfig symbol for UIE emulation\n RTC: Properly handle rtc_read_alarm error propagation and fix bug\n RTC: Propagate error handling via rtc_timer_enqueue properly\n acpi_pm: Clear pmtmr_ioport if acpi_pm initialization fails\n rtc: Cleanup removed UIE emulation declaration\n hrtimers: Notify hrtimer users of switches to NOHZ mode\n" }, { "commit": "8c6a98b22b750c9eb52653ba643faa17db8d3881", "tree": "682d083e544bf4b420b6972941c9f3e7493e77ef", "parents": [ "cb1b145929b5b7e1bdc5f76dd2905df9f89c038e" ], "author": { "name": "Andy Whitcroft", "email": "apw@canonical.com", "time": "Mon Jan 24 09:31:38 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Jan 24 09:33:36 2011 -0800" }, "message": "Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent\n\nCurrently sysrq_enabled and __sysrq_enabled are initialised separately\nand inconsistently, leading to sysrq being actually enabled by reported\nas not enabled in sysfs. The first change to the sysfs configurable\nsynchronises these two:\n\n static int __read_mostly sysrq_enabled \u003d 1;\n static int __sysrq_enabled;\n\nAdd a common define to carry the default for these preventing them becoming\nout of sync again. Default this to 1 to mirror previous behaviour.\n\nSigned-off-by: Andy Whitcroft \u003capw@canonical.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "d315777b32a4696feb86f2a0c9e9f39c94683649", "tree": "f21c24d85cde6ad453c4d9485f5de49357336f81", "parents": [ "5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89", "1765e3a4933ea0870fabd755feffc5473c4363ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 24 19:58:39 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 24 19:58:39 2011 +1000" }, "message": "Merge branch \u0027BUG_ON\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027BUG_ON\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n Remove MAYBE_BUILD_BUG_ON\n BUILD_BUG_ON: make it handle more cases\n" } ], "next": "1765e3a4933ea0870fabd755feffc5473c4363ce" }