)]}' { "log": [ { "commit": "857504d06d565ad5b401d505937932775ddf1c47", "tree": "f251c66ca24133498c3d496d78daee0f7ff54fc4", "parents": [ "234bcf8a499ee206145c7007d12d9706a254f790" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Apr 04 12:10:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:14:04 2012 -0400" }, "message": "sky2: copy received packets on inefficient unaligned architecture\n\nModified from original patch from Chris.\n\nThe sky2 driver has to have 8 byte alignment of receive buffer\non some chip versions. On architectures which don\u0027t support efficient\nunaligned access this doesn\u0027t work very well. The solution is to\njust copy all received packets which is what the driver already\ndoes for small packets.\n\nThis allows the driver to be used on the Tilera TILEmpower-Gx, since\nthe tile architecture doesn\u0027t currently handle kernel unaligned accesses,\njust userspace.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "234bcf8a499ee206145c7007d12d9706a254f790", "tree": "2f42f68294a5b1c8093a631d81ed580fee0d0595", "parents": [ "2af73d4b2afe826d23e83f3747f850eefbd867ff" ], "author": { "name": "Shlomo Pongratz", "email": "shlomop@mellanox.com", "time": "Tue Apr 03 22:56:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:11:12 2012 -0400" }, "message": "net/bonding: correctly proxy slave neigh param setup ndo function\n\nThe current implemenation was buggy for slaves who use ndo_neigh_setup,\nsince the networking stack invokes the bonding device ndo entry (from\nneigh_params_alloc) before any devices are enslaved, and the bonding\ndriver can\u0027t further delegate the call at that point in time. As a\nresult when bonding IPoIB devices, the neigh_cleanup hasn\u0027t been called.\n\nFix that by deferring the actual call into the slave ndo_neigh_setup\nfrom the time the bonding neigh_setup is called.\n\nSigned-off-by: Shlomo Pongratz \u003cshlomop@mellanox.com\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2af73d4b2afe826d23e83f3747f850eefbd867ff", "tree": "ab503b426a45d2395f0ff80c6bd74e9f603feb8c", "parents": [ "acdd5985364f8dc511a0762fab2e683f29d9d692" ], "author": { "name": "Shlomo Pongratz", "email": "shlomop@mellanox.com", "time": "Tue Apr 03 22:56:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:11:12 2012 -0400" }, "message": "net/bonding: emit address change event also in bond_release\n\ncommit 7d26bb103c4 \"bonding: emit event when bonding changes MAC\" didn\u0027t\ntake care to emit the NETDEV_CHANGEADDR event in bond_release, where bonding\nactually changes the mac address (to all zeroes). As a result the neighbours\naren\u0027t deleted by the core networking code (which does so upon getting that\nevent).\n\nSigned-off-by: Shlomo Pongratz \u003cshlomop@mellanox.com\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "acdd5985364f8dc511a0762fab2e683f29d9d692", "tree": "e06a7741371bb6905158fc70a3f05121e07f0306", "parents": [ "d96fc659aeb27686cef42d305cfd0c9702f8841c" ], "author": { "name": "Thomas Graf", "email": "tgraf@infradead.org", "time": "Tue Apr 03 22:17:53 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:05:02 2012 -0400" }, "message": "sctp: Allow struct sctp_event_subscribe to grow without breaking binaries\n\ngetsockopt(..., SCTP_EVENTS, ...) performs a length check and returns\nan error if the user provides less bytes than the size of struct\nsctp_event_subscribe.\n\nStruct sctp_event_subscribe needs to be extended by an u8 for every\nnew event or notification type that is added.\n\nThis obviously makes getsockopt fail for binaries that are compiled\nagainst an older versions of \u003cnet/sctp/user.h\u003e which do not contain\nall event types.\n\nThis patch changes getsockopt behaviour to no longer return an error\nif not enough bytes are being provided by the user. Instead, it\nreturns as much of sctp_event_subscribe as fits into the provided buffer.\n\nThis leads to the new behavior that users see what they have been aware\nof at compile time.\n\nThe setsockopt(..., SCTP_EVENTS, ...) API is already behaving like this.\n\nSigned-off-by: Thomas Graf \u003ctgraf@suug.ch\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d96fc659aeb27686cef42d305cfd0c9702f8841c", "tree": "e021455bc7c25a1dfc80360b05caf5bc55dc68ae", "parents": [ "ee14186f8d2338227888f3c00a06caf31f94de38" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 03 16:45:54 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:20:30 2012 -0400" }, "message": "netfilter: nf_conntrack: fix count leak in error path of __nf_conntrack_alloc\n\nWe have to decrement the conntrack counter if we fail to access the\nzone extension.\n\nReported-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee14186f8d2338227888f3c00a06caf31f94de38", "tree": "996690f4f36657854326b0cf2ae0ed27fdabc38c", "parents": [ "ca53e4405347a1e19eaf59c757ceaaaa1a784758" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 03 14:50:07 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:18:21 2012 -0400" }, "message": "netfilter: xt_CT: fix missing put timeout object in error path\n\nThe error path misses putting the timeout object. This patch adds\nnew function xt_ct_tg_timeout_put() to put the timeout object.\n\nReported-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ca53e4405347a1e19eaf59c757ceaaaa1a784758", "tree": "2be033f9ae8057c50ff2ac9e07aba919d692cb82", "parents": [ "9b461783d3d49c74665b55b8ae1b7a1c038177a9" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 03 12:32:15 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:16:39 2012 -0400" }, "message": "netfilter: xt_CT: allocation has to be GFP_ATOMIC under rcu_read_lock section\n\nReported-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b461783d3d49c74665b55b8ae1b7a1c038177a9", "tree": "e4f27485a0669871a6e331b6daf64157bec4447a", "parents": [ "cff4c16296754888b6fd8c886bc860a888e20257", "44b52bccf855b0706de624c29fc3d82ca954bb4e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:15:48 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:15:48 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "cff4c16296754888b6fd8c886bc860a888e20257", "tree": "3f9ebdc32de18afaa79aa247fca40b66b2f4787c", "parents": [ "f2ed5ee1b050495be49e5a0d5df152663558ef08" ], "author": { "name": "Artem Savkov", "email": "artem.savkov@gmail.com", "time": "Tue Apr 03 10:29:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:08:40 2012 -0400" }, "message": "r8169: enable napi on resume.\n\nNAPI is disabled during suspend and needs to be enabled on resume. Without\nthis the driver locks up during resume in rtl_reset_work() trying to disable\nNAPI again.\n\nSigned-off-by: Artem Savkov \u003cartem.savkov@gmail.com\u003e\nAcked-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2ed5ee1b050495be49e5a0d5df152663558ef08", "tree": "3f2f917346f56568116cbf53c2be27212651b251", "parents": [ "b3300146aa8efc5d3937fd33f3cfdc580a3843bc" ], "author": { "name": "Yuval Mintz", "email": "yuvalmin@broadcom.com", "time": "Tue Apr 03 00:07:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:03:36 2012 -0400" }, "message": "bnx2x: correction to firmware interface\n\nCommit 621b4d6 updated the bnx2x driver to a new FW version, but lacked\na commit to a header file with changes to the firmware\u0027s interface.\nThe missing interface change causes iscsi and fcoe to misbehave with the\nupdated firmware.\n\nSigned-off-by: Yuval Mintz \u003cyuvalmin@broadcom.com\u003e\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nCC: Michael Chan \u003cmchan@broadcom.com\u003e\nCC: Bhanu Prakash Gollapudi \u003cbprakash@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3300146aa8efc5d3937fd33f3cfdc580a3843bc", "tree": "89d0f63b53d8412bec93f4da8c5edf2ea4066dda", "parents": [ "6fc8cc3fd1c8c9cbc2597b4929bf21a814bebd83" ], "author": { "name": "Srinivas Kandagatla", "email": "srinivas.kandagatla@st.com", "time": "Mon Apr 02 00:02:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 18:48:58 2012 -0400" }, "message": "phy:icplus:fix Auto Power Saving in ip101a_config_init.\n\nThis patch fixes Auto Power Saving configuration in ip101a_config_init\nwhich was broken as there is no phy register write followed after\nsetting IP101A_APS_ON flag.\n\nThis patch also fixes the return value of ip101a_config_init.\n\nWithout this patch ip101a_config_init returns 2 which is not an error\naccroding to IS_ERR and the mac driver will continue accessing 2 as\nvalid pointer to phy_dev resulting in memory fault.\n\nSigned-off-by: Srinivas Kandagatla \u003csrinivas.kandagatla@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6fc8cc3fd1c8c9cbc2597b4929bf21a814bebd83", "tree": "6635b74c033c30de74dc25fd2fd7ae3b3f859b5e", "parents": [ "a998d4342337c82dacdc0897d30a9364de1576a1", "bf03085f85112eac2d19036ea3003071220285bb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 18:41:12 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 18:41:12 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net\n" }, { "commit": "bf03085f85112eac2d19036ea3003071220285bb", "tree": "204f9390746aa2798589f6a4d037c3c6827593f0", "parents": [ "bb9e44d0d0f45da356c39e485edacff6e14ba961" ], "author": { "name": "Matthew Vick", "email": "matthew.vick@intel.com", "time": "Fri Mar 16 09:03:00 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Apr 03 15:25:16 2012 -0700" }, "message": "e1000e: Guarantee descriptor writeback flush success.\n\nIn rare circumstances, a descriptor writeback flush may not work if it\narrives on a specific clock cycle as a writeback request is going out.\n\nSigned-off-by: Matthew Vick \u003cmatthew.vick@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "bb9e44d0d0f45da356c39e485edacff6e14ba961", "tree": "ad4051375ad12407b3fdec34431a7a4da4009b0f", "parents": [ "aacc1bea190d731755a65cb8ec31dd756f4e263e" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Mar 21 00:39:12 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Apr 03 15:25:08 2012 -0700" }, "message": "e1000e: prevent oops when adapter is being closed and reset simultaneously\n\nWhen the adapter is closed while it is simultaneously going through a\nreset, it can cause a null-pointer dereference when the two different code\npaths simultaneously cleanup up the Tx/Rx resources.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "aacc1bea190d731755a65cb8ec31dd756f4e263e", "tree": "d33b3e8e8d813ed429e63557ecee7b8485c386b1", "parents": [ "01627d968c8b5e2810fe8c417b406b968297c236" ], "author": { "name": "Multanen, Eric W", "email": "eric.w.multanen@intel.com", "time": "Wed Mar 28 07:49:09 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Apr 03 15:24:57 2012 -0700" }, "message": "ixgbe: driver fix for link flap\n\nFix up code so that changes in DCB settings\nare detected only when ixgbe_dcbnl_set_all is called.\nPreviously, a series of \u0027change\u0027 commands followed by\na call to ixgbe_dcbnl_set_all() would always be handled\nas a HW change - even if the net change was zero.\nThis patch checks for this case of no actual change and\nskips going through the HW set process.\n\nWithout this fix, the link could reset and result in\na link flap.\n\nThe core change in this patch is to check for changes\nin the ixgbe_copy_dcb_cfg() routine - and return\na bitmask of detected changes. The other\nplaces where changes were detected previously can be removed.\n\nSigned-off-by: Eric Multanen \u003ceric.w.multanen@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": "a998d4342337c82dacdc0897d30a9364de1576a1", "tree": "301294142ae65e4646281329737fa349190d7565", "parents": [ "f03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b" ], "author": { "name": "Jan Seiffert", "email": "kaffeemonster@googlemail.com", "time": "Fri Mar 30 05:24:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 18:01:41 2012 -0400" }, "message": "bpf jit: Let the x86 jit handle negative offsets\n\nNow the helper function from filter.c for negative offsets is exported,\nit can be used it in the jit to handle negative offsets.\n\nFirst modify the asm load helper functions to handle:\n- know positive offsets\n- know negative offsets\n- any offset\n\nthen the compiler can be modified to explicitly use these helper\nwhen appropriate.\n\nThis fixes the case of a negative X register and allows to lift\nthe restriction that bpf programs with negative offsets can\u0027t\nbe jited.\n\nSigned-of-by: Jan Seiffert \u003ckaffeemonster@googlemail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b", "tree": "5b658f40d38b0ac9c5f4f3e6c6292266df6a1d3c", "parents": [ "5d6bd8619db5a30668093c1b2967674645cf0736" ], "author": { "name": "Jan Seiffert", "email": "kaffeemonster@googlemail.com", "time": "Fri Mar 30 05:08:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 18:01:03 2012 -0400" }, "message": "bpf jit: Make the filter.c::__load_pointer helper non-static for the jits\n\nThe function is renamed to make it a little more clear what it does.\nIt is not added to any .h because it is not for general consumption, only for\nbpf internal use (and so by the jits).\n\nSigned-of-by: Jan Seiffert \u003ckaffeemonster@googlemail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d6bd8619db5a30668093c1b2967674645cf0736", "tree": "ced763e4924f0aa3d153a5edd7a56ae8cd87af47", "parents": [ "2f53384424251c06038ae612e56231b96ab610ee" ], "author": { "name": "Fernando Luis Vazquez Cao", "email": "fernando@oss.ntt.co.jp", "time": "Tue Apr 03 08:41:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 17:38:55 2012 -0400" }, "message": "TCP: update ip_local_port_range documentation\n\nThe explanation of ip_local_port_range in\nDocumentation/networking/ip-sysctl.txt contains several factual\nerrors:\n\n- The default value of ip_local_port_range does not depend on the\n amount of memory available in the system.\n- tcp_tw_recycle is not enabled by default.\n- 1024-4999 is not the default value.\n- Etc.\n\nClean up the mess.\n\nSigned-off-by: Fernando Luis Vazquez Cao \u003cfernando@oss.ntt.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f53384424251c06038ae612e56231b96ab610ee", "tree": "e3524210033983e5727c88e21bb3e6a766b20ae4", "parents": [ "e675f0cc9a872fd152edc0c77acfed19bf28b81e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 03 09:37:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 17:35:43 2012 -0400" }, "message": "tcp: allow splice() to build full TSO packets\n\nvmsplice()/splice(pipe, socket) call do_tcp_sendpages() one page at a\ntime, adding at most 4096 bytes to an skb. (assuming PAGE_SIZE\u003d4096)\n\nThe call to tcp_push() at the end of do_tcp_sendpages() forces an\nimmediate xmit when pipe is not already filled, and tso_fragment() try\nto split these skb to MSS multiples.\n\n4096 bytes are usually split in a skb with 2 MSS, and a remaining\nsub-mss skb (assuming MTU\u003d1500)\n\nThis makes slow start suboptimal because many small frames are sent to\nqdisc/driver layers instead of big ones (constrained by cwnd and packets\nin flight of course)\n\nIn fact, applications using sendmsg() (adding an additional memory copy)\ninstead of vmsplice()/splice()/sendfile() are a bit faster because of\nthis anomaly, especially if serving small files in environments with\nlarge initial [c]wnd.\n\nCall tcp_push() only if MSG_MORE is not set in the flags parameter.\n\nThis bit is automatically provided by splice() internals but for the\nlast page, or on all pages if user specified SPLICE_F_MORE splice()\nflag.\n\nIn some workloads, this can reduce number of sent logical packets by an\norder of magnitude, making zero-copy TCP actually faster than\none-copy :)\n\nReported-by: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Nandita Dukkipati \u003cnanditad@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nCc: H.K. Jerry Chu \u003chkchu@google.com\u003e\nCc: Maciej Żenczykowski \u003cmaze@google.com\u003e\nCc: Mahesh Bandewar \u003cmaheshb@google.com\u003e\nCc: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail\u003ecom\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e675f0cc9a872fd152edc0c77acfed19bf28b81e", "tree": "244c4488575cc19bd882ad00c2d6852db5bcbe98", "parents": [ "2def16ae6b0c77571200f18ba4be049b03d75579" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Mon Mar 26 00:03:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 17:31:38 2012 -0400" }, "message": "ppp: Don\u0027t stop and restart queue on every TX packet\n\nFor every transmitted packet, ppp_start_xmit() will stop the netdev\nqueue and then, if appropriate, restart it. This causes the TX softirq\nto run, entirely gratuitously.\n\nThis is \"only\" a waste of CPU time in the normal case, but it\u0027s actively\nharmful when the PPP device is a TEQL slave — the wakeup will cause the\noffending device to receive the next TX packet from the TEQL queue, when\nit *should* have gone to the next slave in the list. We end up seeing\nlarge bursts of packets on just *one* slave device, rather than using\nthe full available bandwidth over all slaves.\n\nThis patch fixes the problem by *not* unconditionally stopping the queue\nin ppp_start_xmit(). It adds a return value from ppp_xmit_process()\nwhich indicates whether the queue should be stopped or not.\n\nIt *doesn\u0027t* remove the call to netif_wake_queue() from\nppp_xmit_process(), because other code paths (especially from\nppp_output_wakeup()) need it there and it\u0027s messy to push it out to the\nother callers to do it based on the return value. So we leave it in\nplace — it\u0027s a no-op in the case where the queue wasn\u0027t stopped, so it\u0027s\nharmless in the TX path.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2def16ae6b0c77571200f18ba4be049b03d75579", "tree": "8b5bf927cba74c94e2a155b64052df07621917b8", "parents": [ "01627d968c8b5e2810fe8c417b406b968297c236" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Apr 02 22:33:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 17:23:23 2012 -0400" }, "message": "net: fix /proc/net/dev regression\n\nCommit f04565ddf52 (dev: use name hash for dev_seq_ops) added a second\nregression, as some devices are missing from /proc/net/dev if many\ndevices are defined.\n\nWhen seq_file buffer is filled, the last -\u003enext/show() method is\ncanceled (pos value is reverted to value prior -\u003enext() call)\n\nProblem is after above commit, we dont restart the lookup at right\nposition in -\u003estart() method.\n\nFix this by removing the internal \u0027pos\u0027 pointer added in commit, since\nwe need to use the \u0027loff_t *pos\u0027 provided by seq_file layer.\n\nThis also reverts commit 5cac98dd0 (net: Fix corruption\nin /proc/*/net/dev_mcast), since its not needed anymore.\n\nReported-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Mihai Maruseac \u003cmmaruseac@ixiacom.com\u003e\nTested-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "01627d968c8b5e2810fe8c417b406b968297c236", "tree": "e49077d45d6998adee302f142f7d54e472c81bc3", "parents": [ "e1a7eb08ee097e97e928062a242b0de5b2599a11", "e37acc0f5ea18ff1ea4db96a84a51b90044c0dbd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:13:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:13:34 2012 -0700" }, "message": "Merge branch \u0027drm-fixes-intel\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm update from Dave Airlie:\n \"This pull just contains a forward of the Intel fixes from Daniel.\n\n The only annoyance is the RC6 enable, which really should have made\n -next, but since Ubuntu are shipping it I reckon its getting a good\n testing now by the time 3.4 comes out.\n\n The pull from Daniel contains his pull message to me:\n\n \"A few patches for 3.4, major part is 3 regression fixes:\n - ppgtt broke hibernate on snb/ivb. Somehow our QA claims that it\n still works, which is why this has not been caught earlier.\n - ppgtt flails in combination with dmar. I kinda expected this one :(\n - fence handling bugfix for gen2/3. Iirc this one is about a year\n old, fix curtesy Chris Wilson. I\u0027ve created an shockingly simple\n i-g-t test to catch this in the future.\"\n\n Wrt regressions I\u0027ve just got a report that gmbus (newly enabled\n again in 3.4) is a bit noisy. I\u0027m looking into this atm.\n\n Also included are the rc6 enable patches for snb from Eugeni. I\n wanted to include these in the main 3.4 pull but screwed it up.\n Please hit me. Imo these kind of patches really should go in\n before -rc1, but in thise case rc6 has brought us tons of press and\n guinea pigs^W^W testers and ubuntu is already running with it. So\n I estimate a pretty small chance for this to blow up.\n\n And some smaller things:\n - two minor locking snafus\n - server gt2 ivb pciid\n - 2 patches to sanitize the register state left behind by the bios\n some more\n - 2 new quirk entries\n - cs readback trick against missed IRQs from ivb also enabled on snb\n - sprite fix from Jesse\"\n\nLet\u0027s see if the \"enable RC6 on sandybridge\" finally works and sticks.\nI\u0027ve been enabling it by hand (i915.i915_enable_rc6\u003d1) for several\nmonths on my Macbook Air, and it definitely makes a difference (and has\nworked for me). But every time we enabled it before it showed some odd\nhw buglet for *somebody*.\n\nThis time it\u0027s all good, I\u0027m sure.\n\n* \u0027drm-fixes-intel\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n drm/i915: no-lvds quirk on MSI DC500\n drm/i915: Add lock on drm_helper_resume_force_mode\n drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n drm/i915: disable ppgtt on snb when dmar is enabled\n drm/i915: add Ivy Bridge GT2 Server entries\n drm/i915: properly clear SSC1 bit in the pch refclock init code\n drm/i915: apply CS reg readback trick against missed IRQ on snb\n drm/i915: quirk away broken OpRegion VBT\n drm/i915: enable plain RC6 on Sandy Bridge by default\n drm/i915: allow to select rc6 modes via kernel parameter\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n drm/i915: properly restore the ppgtt page directory on resume\n drm/i915: Sanitize BIOS debugging bits from PIPECONF\n" }, { "commit": "e1a7eb08ee097e97e928062a242b0de5b2599a11", "tree": "2e94ca0bd2ac5a53a4a7234b2f1b5f98f669cca8", "parents": [ "464662b91614188b4af9df51baaa0d6b3d89a15f", "62fb376e214d3c1bfdf6fbb77dac162f6da04d7e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:21 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Mainly nouveau fixes, one for a regressions in -rc1, fixes for booting\n on a ppc G5, and a Kconfig fix. Two radeon fixes, one oops, one s/r\n fix. One udl mmap fix. And one core drm fix to stop bad fbdev apps\n overwriting bits of ram.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm: Validate requested virtual size against allocated fb size\n drm/radeon: Don\u0027t dereference possibly-NULL pointer.\n mm, drm/udl: fixup vma flags on mmap\n drm/radeon/kms: fix fans after resume\n nouveau/bios: Fix tracking of BIOS image data\n nouveau: Fix crash when pci_ram_rom() returns a size of 0\n drm/nouveau: select POWER_SUPPLY\n drm/nouveau: inform userspace of relaxed kernel subchannel requirements\n Revert \"drm/nouveau: inform userspace of new kernel subchannel requirements\"\n drm/nouveau: oops, create m2mf for nvd9 too\n" }, { "commit": "464662b91614188b4af9df51baaa0d6b3d89a15f", "tree": "0257f83b14d1bf2fac072d66bfbe60023d7fc372", "parents": [ "1e649afde3708012daf43ff91730595e30e6f3bb", "0dd90aa9d6222e12201f05c0058e8741b7f66474" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:05 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\nPull arch/microblaze fixes from Michal Simek.\n\n* \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n microblaze: Fix ret_from_fork declaration\n microblaze: Do not use tlb_skip in early_printk\n microblaze: Add missing headers caused by disintegration asm/system.h\n microblaze: Fix stack usage in PAGE_SIZE copy_tofrom_user\n microblaze: Fix tlb_skip variable on noMMU system\n microblaze: Fix __futex_atomic_op macro register usage\n" }, { "commit": "1e649afde3708012daf43ff91730595e30e6f3bb", "tree": "3b3a9e873621e7729cc64f36465ffa3cf116c11c", "parents": [ "7d6e1cb7aed231b58acd71bdbe67fc03221373e4", "450aed725c9a53282483c48ebd012feefae94a07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:07:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:07:13 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\nPull m68k fixes from Geert Uytterhoeven:\n \"Here are a few fixes for the m68k architecture. Nothing fancy this\n time, just a build fix for the asm/system.h disintegration, and two\n fixes for missing platform checks (one got in during last merge\n window), which can cause crashes in multi-platform kernels.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k/q40: Add missing platform check before registering platform devices\n m68k/mac: Add missing platform check before registering platform devices\n m68k: include asm/cmpxchg.h in our m68k atomic.h\n" }, { "commit": "e37acc0f5ea18ff1ea4db96a84a51b90044c0dbd", "tree": "c54ef9a06165265e89213eaf9a4c00095cdf2045", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "b4db1e35ac59c144965f517bc575a0d75b60b03f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 03 16:00:23 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 03 16:00:29 2012 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes\n\nFrom Daniel Vetter:\n\n\"A few patches for 3.4, major part is 3 regression fixes:\n- ppgtt broke hibernate on snb/ivb. Somehow our QA claims that it still\n works, which is why this has not been caught earlier.\n- ppgtt flails in combination with dmar. I kinda expected this one :(\n- fence handling bugfix for gen2/3. Iirc this one is about a year old, fix\n curtesy Chris Wilson. I\u0027ve created an shockingly simple i-g-t test to\n catch this in the future.\n\nWrt regressions I\u0027ve just got a report that gmbus (newly enabled again in\n3.4) is a bit noisy. I\u0027m looking into this atm.\n\nAlso included are the rc6 enable patches for snb from Eugeni. I wanted to\ninclude these in the main 3.4 pull but screwed it up. Please hit me. Imo\nthese kind of patches really should go in before -rc1, but in thise case\nrc6 has brought us tons of press and guinea pigs^W^W testers and ubuntu is\nalready running with it. So I estimate a pretty small chance for this to\nblow up.\n\nAnd some smaller things:\n- two minor locking snafus\n- server gt2 ivb pciid\n- 2 patches to sanitize the register state left behind by the bios some\n more\n- 2 new quirk entries\n- cs readback trick against missed IRQs from ivb also enabled on snb\n- sprite fix from Jesse\"\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n drm/i915: no-lvds quirk on MSI DC500\n drm/i915: Add lock on drm_helper_resume_force_mode\n drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n drm/i915: disable ppgtt on snb when dmar is enabled\n drm/i915: add Ivy Bridge GT2 Server entries\n drm/i915: properly clear SSC1 bit in the pch refclock init code\n drm/i915: apply CS reg readback trick against missed IRQ on snb\n drm/i915: quirk away broken OpRegion VBT\n drm/i915: enable plain RC6 on Sandy Bridge by default\n drm/i915: allow to select rc6 modes via kernel parameter\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n drm/i915: properly restore the ppgtt page directory on resume\n drm/i915: Sanitize BIOS debugging bits from PIPECONF\n" }, { "commit": "62fb376e214d3c1bfdf6fbb77dac162f6da04d7e", "tree": "e740485e5c058ad0f8e22f26081c24014e127d5a", "parents": [ "e199fd422420d1620cf64fd9bdd4ff8bc255cc76" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Mar 26 21:15:53 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 03 11:18:46 2012 +0100" }, "message": "drm: Validate requested virtual size against allocated fb size\n\nmplayer -vo fbdev tries to create a screen that is twice as tall as the\nallocated framebuffer for \"doublebuffering\". By default, and all in-tree\nusers, only sufficient memory is allocated and mapped to satisfy the\nsmallest framebuffer and the virtual size is no larger than the actual.\nFor these users, we should therefore reject any userspace request to\ncreate a screen that requires a buffer larger than the framebuffer\noriginally allocated.\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38138\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b4db1e35ac59c144965f517bc575a0d75b60b03f", "tree": "c54ef9a06165265e89213eaf9a4c00095cdf2045", "parents": [ "97effadb65ed08809e1720c8d3ee80b73a93665c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Mar 20 10:59:09 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 11:33:33 2012 +0200" }, "message": "drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n\nThis was missed when we converted the source values to 16.16 fixed point.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "97effadb65ed08809e1720c8d3ee80b73a93665c", "tree": "0a70d3114495a58424ac1ab9eabbec2e3b8f9e74", "parents": [ "927a2f119e8235238a2fc64871051b16c9bdae75" ], "author": { "name": "Anisse Astier", "email": "anisse@astier.eu", "time": "Wed Mar 07 18:36:35 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:44:05 2012 +0200" }, "message": "drm/i915: no-lvds quirk on MSI DC500\n\nThis hardware doesn\u0027t have an LVDS, it\u0027s a desktop box. Fix incorrect\nLVDS detection.\n\nCc: stable@kernel.org\nSigned-off-by: Anisse Astier \u003canisse@astier.eu\u003e\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "927a2f119e8235238a2fc64871051b16c9bdae75", "tree": "982fd48fc0a39dd5ce0e073b3475283219bd11a7", "parents": [ "e02f14cd48a5da0ebaecf88c93dbd54a81e0dead" ], "author": { "name": "Sean Paul", "email": "seanpaul@chromium.org", "time": "Fri Mar 23 08:52:58 2012 -0400" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:37:37 2012 +0200" }, "message": "drm/i915: Add lock on drm_helper_resume_force_mode\n\ni915_drm_thaw was not locking the mode_config lock when calling\ndrm_helper_resume_force_mode. When there were multiple wake sources,\nthis caused FDI training failure on SNB which in turn corrupted the\ndisplay.\n\nSigned-off-by: Sean Paul \u003cseanpaul@chromium.org\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "e02f14cd48a5da0ebaecf88c93dbd54a81e0dead", "tree": "9a5af6d70c2a8e9c499f73f42ca3b6e548715190", "parents": [ "650dc07ec3b0eba8ff21da706d2b1876ada59fc3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 23:33:03 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:25:33 2012 +0200" }, "message": "drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n\nReported-by: Konstantin Belousov \u003ckostikbel@gmail.com\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "44b52bccf855b0706de624c29fc3d82ca954bb4e", "tree": "8159879f1578b4616f1f4d66bb6651ed04266ba4", "parents": [ "5276e16bb6f35412583518d6f04651dd9dc114be" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 03 10:08:48 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 03 10:08:48 2012 +0200" }, "message": "netfilter: xt_CT: remove a compile warning\n\nIf CONFIG_NF_CONNTRACK_TIMEOUT\u003dn we have following warning :\n\n CC [M] net/netfilter/xt_CT.o\nnet/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’:\nnet/netfilter/xt_CT.c:284: warning: label ‘err4’ defined but not used\n\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "7d6e1cb7aed231b58acd71bdbe67fc03221373e4", "tree": "da1a0cdb2f19caa765e8fc2b5917efef10583d9e", "parents": [ "ed359a3b7b6ade0071f378c0cf4392d252f7d334", "3248877ea1796915419fba7c89315fdbf00cb56a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:58:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:58:04 2012 -0700" }, "message": "Merge branch \u0027drm-prime-dmabuf-initial\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull dma-buf prime support from Dave Airlie:\n \"This isn\u0027t a majorly urgent thing to have, but we\u0027d like to set the\n stage for working on dma-buf support in the drm drivers for the next\n merge window, so I\u0027d like to push in the initial submission now so\n people have something that we can build on top of. The code just\n introduces the user interface and internal helper functions for\n drivers to use.\n\n We have driver support under development for i915, nouveau, udl on x86\n and exynos, omapdrm on arm, which we would be aiming for the next\n merge window.\"\n\nIn the -rc1 announcement I asked for people who would use this to\ncomment on it, and got severa \"Yes please\" from people for this and for\nHSI (that I merged earlier).\n\nSo far crickets on pohmelfs and the DMA-mapping infrastructure.\n\n* \u0027drm-prime-dmabuf-initial\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm: base prime/dma-buf support (v5)\n" }, { "commit": "ed359a3b7b6ade0071f378c0cf4392d252f7d334", "tree": "8f81e03fcb44a7d36f53bc5a53d8eced7154bee2", "parents": [ "95694129b43165911dc4e8a972f0d39ad98d86be", "2240eb4ae3dc4acff20d1a8947c441c451513e37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:53:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:53:39 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Provide device string properly for USB i2400m wimax devices, also\n don\u0027t OOPS when providing firmware string. From Phil Sutter.\n\n 2) Add support for sh_eth SH7734 chips, from Nobuhiro Iwamatsu.\n\n 3) Add another device ID to USB zaurus driver, from Guan Xin.\n\n 4) Loop index start in pool vector iterator is wrong causing MAC to not\n get configured in bnx2x driver, fix from Dmitry Kravkov.\n\n 5) EQL driver assumes HZ\u003d100, fix from Eric Dumazet.\n\n 6) Now that skb_add_rx_frag() can specify the truesize increment\n separately, do so in f_phonet and cdc_phonet, also from Eric\n Dumazet.\n\n 7) virtio_net accidently uses net_ratelimit() not only on the kernel\n warning but also the statistic bump, fix from Rick Jones.\n\n 8) ip_route_input_mc() uses fixed init_net namespace, oops, use\n dev_net(dev) instead. Fix from Benjamin LaHaise.\n\n 9) dev_forward_skb() needs to clear the incoming interface index of the\n SKB so that it looks like a new incoming packet, also from Benjamin\n LaHaise.\n\n10) iwlwifi mistakenly initializes a channel entry as 2GHZ instead of\n 5GHZ, fix from Stanislav Yakovlev.\n\n11) Missing kmalloc() return value checks in orinoco, from Santosh\n Nayak.\n\n12) ath9k doesn\u0027t check for HT capabilities in the right way, it is\n checking ht_supported instead of the ATH9K_HW_CAP_HT flag. Fix from\n Sujith Manoharan.\n\n13) Fix x86 BPF JIT emission of 16-bit immediate field of AND\n instructions, from Feiran Zhuang.\n\n14) Avoid infinite loop in GARP code when registering sysfs entries.\n From David Ward.\n\n15) rose protocol uses memcpy instead of memcmp in a device address\n comparison, oops. Fix from Daniel Borkmann.\n\n16) Fix build of lpc_eth due to dev_hw_addr_rancom() interface being\n renamed to eth_hw_addr_random(). From Roland Stigge.\n\n17) Make ipv6 RTM_GETROUTE interpret RTA_IIF attribute the same way\n that ipv4 does. Fix from Shmulik Ladkani.\n\n18) via-rhine has an inverted bit test, causing suspend/resume\n regressions. Fix from Andreas Mohr.\n\n19) RIONET assumes 4K page size, fix from Akinobu Mita.\n\n20) Initialization of imask register in sky2 is buggy, because bits are\n \"or\u0027d\" into an uninitialized local variable. Fix from Lino\n Sanfilippo.\n\n21) Fix FCOE checksum offload handling, from Yi Zou.\n\n22) Fix VLAN processing regression in e1000, from Jiri Pirko.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)\n sky2: dont overwrite settings for PHY Quick link\n tg3: Fix 5717 serdes powerdown problem\n net: usb: cdc_eem: fix mtu\n net: sh_eth: fix endian check for architecture independent\n usb/rtl8150 : Remove duplicated definitions\n rionet: fix page allocation order of rionet_active\n via-rhine: fix wait-bit inversion.\n ipv6: Fix RTM_GETROUTE\u0027s interpretation of RTA_IIF to be consistent with ipv4\n net: lpc_eth: Fix rename of dev_hw_addr_random\n net/netfilter/nfnetlink_acct.c: use linux/atomic.h\n rose_dev: fix memcpy-bug in rose_set_mac_address\n Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.\n net/garp: avoid infinite loop if attribute already exists\n x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND\n bonding: emit event when bonding changes MAC\n mac80211: fix oper channel timestamp updation\n ath9k: Use HW HT capabilites properly\n MAINTAINERS: adding maintainer for ipw2x00\n net: orinoco: add error handling for failed kmalloc().\n net/wireless: ipw2x00: fix a typo in wiphy struct initilization\n ...\n" }, { "commit": "2240eb4ae3dc4acff20d1a8947c441c451513e37", "tree": "18e2923bb441df812bcdae8a928076e22eaf2e9a", "parents": [ "085f1afc56619bda424941412fdeaff1e32c21dc" ], "author": { "name": "Lino Sanfilippo", "email": "LinoSanfilippo@gmx.de", "time": "Fri Mar 30 07:28:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 02 18:41:06 2012 -0400" }, "message": "sky2: dont overwrite settings for PHY Quick link\n\nThis patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver\nin which the settings for PHY quick link are overwritten.\n\nSigned-off-by: Lino Sanfilippo \u003cLinoSanfilippo@gmx.de\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyattta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95694129b43165911dc4e8a972f0d39ad98d86be", "tree": "a7faf4b70c85b457f684cbc1033ac5b79457c2e9", "parents": [ "b1a808ff436343956a6ae63178ea1810c5e5a3a1", "80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:43 2012 -0700" }, "message": "Merge branch \u0027paul\u0027 (Fixups from Paul Gortmaker)\n\nThis merges some of the fixes from Paul Gortmaker for the header file\ncleanup fallout.\n\nSome of the patches are going through arch maintainer trees, and David\nHowells suggested another be done differently, but this at least fixes a\nfew cases.\n\n* emailed from Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e:\n asm-generic: add linux/types.h to cmpxchg.h\n firewire: restore the device.h include in linux/firewire.h\n frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL\n parisc: fix missing cmpxchg file error from system.h split\n blackfin: fix cmpxchg build fails from system.h fallout\n avr32: fix build failures from mis-naming of atmel_nand.h\n ARM: mach-msm: fix compile fail from system.h fallout\n irq_work: fix compile failure on MIPS from system.h split\n" }, { "commit": "085f1afc56619bda424941412fdeaff1e32c21dc", "tree": "aa4a4d06413f4c597d75678a7319c434232fb987", "parents": [ "78fb72f7936c01d5b426c03a691eca082b03f2b9" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Apr 02 09:01:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 02 17:41:42 2012 -0400" }, "message": "tg3: Fix 5717 serdes powerdown problem\n\nIf port 0 of a 5717 serdes device powers down, it hides the phy from\nport 1. This patch works around the problem by keeping port 0\u0027s phy\npowered up.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8", "tree": "4f2826dadc1daa16058d4505f3d24ac98b45a397", "parents": [ "f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:47 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:27 2012 -0700" }, "message": "asm-generic: add linux/types.h to cmpxchg.h\n\nBuilds of the openrisc or1ksim_defconfig show the following:\n\n In file included from arch/openrisc/include/generated/asm/cmpxchg.h:1:0,\n from include/asm-generic/atomic.h:18,\n from arch/openrisc/include/generated/asm/atomic.h:1,\n from include/linux/atomic.h:4,\n from include/linux/dcache.h:4,\n from fs/notify/fsnotify.c:19:\n include/asm-generic/cmpxchg.h: In function \u0027__xchg\u0027:\n include/asm-generic/cmpxchg.h:34:20: error: expected \u0027)\u0027 before \u0027u8\u0027\n include/asm-generic/cmpxchg.h:34:20: warning: type defaults to \u0027int\u0027 in type name\n\nand many more lines of similar errors. It seems specific to the or32\nbecause most other platforms have an arch specific component that would\nhave already included types.h ahead of time, but the o32 does not.\n\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2", "tree": "d8f241632882ee7de71bc1aed211ac9f220d9352", "parents": [ "9a78da114c18c130769c1ba25cabbc34da7ad70c" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:45 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:27 2012 -0700" }, "message": "firewire: restore the device.h include in linux/firewire.h\n\nCommit 313162d0b838 (\"device.h: audit and cleanup users in main include\ndir\") exchanged an include \u003clinux/device.h\u003e for a struct *device but in\nactuality I misread this file when creating 313162d and it should have\nremained an include.\n\nThere were no build regressions since all consumers were already getting\ndevice.h anyway, but make it right regardless.\n\nReported-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9a78da114c18c130769c1ba25cabbc34da7ad70c", "tree": "bf429427c742d597977e501bbc7e6d24a9bed902", "parents": [ "9e5228ce0b9619bde7dcd6c51fb26e2401cfe81a" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:44 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:26 2012 -0700" }, "message": "frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL\n\nTo fix:\n\n arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: data definition has no type or storage class [enabled by default]\n arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: type defaults to \u0027int\u0027 in declaration of \u0027EXPORT_SYMBOL\u0027 [-Wimplicit-int]\n arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: parameter names (without types) in function declaration [enabled by default]\n arch/frv/mb93090-mb00/pci-dma.c:38:1: warning: data definition has no type or storage class [enabled by default]\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9e5228ce0b9619bde7dcd6c51fb26e2401cfe81a", "tree": "4fdfdd44fbbf3e62cb4a9691dd537955ee91a072", "parents": [ "1512cdc3572dac34a1809764f9a646cde7e82407" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:42 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:26 2012 -0700" }, "message": "parisc: fix missing cmpxchg file error from system.h split\n\nCommit b4816afa3986 (\"Move the asm-generic/system.h xchg()\nimplementation to asm-generic/cmpxchg.h\") introduced the concept of\nasm/cmpxchg.h but the parisc arch never got one. Fork the cmpxchg\ncontent out of the asm/atomic.h file to create one.\n\nSome minor whitespace fixups were done on the block of code that created\nthe new file.\n\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1512cdc3572dac34a1809764f9a646cde7e82407", "tree": "abd8318fb7a49bb0a04b338197eeecaa373ac5ed", "parents": [ "3d92e05118262379f76a220772b666dfddb77a9d" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:41 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:25 2012 -0700" }, "message": "blackfin: fix cmpxchg build fails from system.h fallout\n\nCommit 3bed8d67469c (\"Disintegrate asm/system.h for Blackfin [ver #2]\")\nintroduced arch/blackfin/include/asm/cmpxchg.h but has it also including\nthe asm-generic one which causes this:\n\n CC arch/blackfin/kernel/asm-offsets.s\n In file included from arch/blackfin/include/asm/cmpxchg.h:125:0,\n from arch/blackfin/include/asm/atomic.h:10,\n from include/linux/atomic.h:4,\n from include/linux/spinlock.h:384,\n from include/linux/seqlock.h:29,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:57,\n from arch/blackfin/kernel/asm-offsets.c:10:\n include/asm-generic/cmpxchg.h:24:15: error: redefinition of \u0027__xchg\u0027\n arch/blackfin/include/asm/cmpxchg.h:82:29: note: previous definition of \u0027__xchg\u0027 was here\n make[2]: *** [arch/blackfin/kernel/asm-offsets.s] Error 1\n\nIt really only needs two simple defines from asm-generic, so just use\nthose instead.\n\nCc: Bob Liu \u003clliubbo@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3d92e05118262379f76a220772b666dfddb77a9d", "tree": "a63a1e55edd9bfa3e9ff9e1f8e2d09fe12b11615", "parents": [ "b443caf12f9ee14e9843e53d4d929319e637275a" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:40 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:25 2012 -0700" }, "message": "avr32: fix build failures from mis-naming of atmel_nand.h\n\nCommit bf4289cba02b (\"ATMEL: fix nand ecc support\") indicated that it\nwanted to \"Move platform data to a common header\ninclude/linux/platform_data/atmel_nand.h\" and the new header even had\nre-include protectors with:\n\n #ifndef __ATMEL_NAND_H__\n\nHowever, the file that was added was simply called atmel.h\nand this caused avr32 defconfig to fail with:\n\n In file included from arch/avr32/boards/atstk1000/setup.c:22:\n arch/avr32/mach-at32ap/include/mach/board.h:10:44: error: linux/platform_data/atmel_nand.h: No such file or directory\n In file included from arch/avr32/boards/atstk1000/setup.c:22:\n arch/avr32/mach-at32ap/include/mach/board.h:121: warning: \u0027struct atmel_nand_data\u0027 declared inside parameter list\n arch/avr32/mach-at32ap/include/mach/board.h:121: warning: its scope is only this definition or declaration, which is probably not what you want\n make[2]: *** [arch/avr32/boards/atstk1000/setup.o] Error 1\n\nIt seems the scope of the file contents will expand beyond\njust nand, so ignore the original intention, and fix up the\nusers who reference the bad name with the _nand suffix.\n\nCC: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCC: David Woodhouse \u003cdwmw2@infradead.org\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b443caf12f9ee14e9843e53d4d929319e637275a", "tree": "5d1a5b58411d06122fea2f7659e739dff52b7ea3", "parents": [ "83e3fa6f0193299f8b7180db588edd5ca61a3b82" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:38 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:16 2012 -0700" }, "message": "ARM: mach-msm: fix compile fail from system.h fallout\n\nTo fix:\n\n In file included from arm/boot/compressed/misc.c:28:0:\n arm/mach-msm/include/mach/uncompress.h: In function \u0027putc\u0027:\n arch/arm/mach-msm/include/mach/uncompress.h:48:3: error: implicit\n declaration of function \u0027smp_mb\u0027 [-Werror\u003dimplicit-function-declaration]\n\nThe putc does a cpu_relax which for this platform is smp_mb.\n\nBisect indicates the 1st failing commit as: 0195c00244dc (\"Merge tag\n\u0027split-asm_system_h...\")\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b1a808ff436343956a6ae63178ea1810c5e5a3a1", "tree": "bd510d5ea6b407df6ea0b8353e1788e12f95e427", "parents": [ "97754175042e77d02c4232d5fb24c16abd1c77f1", "43139a61fc68f4b0af7327a0e63f340a7c81c69a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:50:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:50:40 2012 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://gitorious.org/kernel-hsi/kernel-hsi\n\nPull HSI (High Speed Synchronous Serial Interface) framework from Carlos Chinea:\n \"The High Speed Synchronous Serial Interface (HSI) is a serial\n interface mainly used for connecting application engines (APE) with\n cellular modem engines (CMT) in cellular handsets.\n\n The framework is currently being used for some people and we would\n like to see it integrated into the kernel for 3.3. There is no HW\n controller drivers in this pull, but some people have already some of\n them pending which they would like to push as soon as this integrated.\n I am also working on the acceptance for an TI OMAP one, based on a\n compatible legacy version of the interface called SSI.\"\n\nOk, so it didn\u0027t get into 3.3, but here it is pulled into 3.4.\n\nSeveral people piped up to say \"yeah, we want this\".\n\n* \u0027for-next\u0027 of git://gitorious.org/kernel-hsi/kernel-hsi:\n HSI: hsi_char: Update ioctl-number.txt\n HSI: Add HSI API documentation\n HSI: hsi_char: Add HSI char device kernel configuration\n HSI: hsi_char: Add HSI char device driver\n HSI: hsi: Introducing HSI framework\n" }, { "commit": "97754175042e77d02c4232d5fb24c16abd1c77f1", "tree": "5f318edf0420807259835b40c3a269f8e1267057", "parents": [ "8f6b7676ceecc1f40df77d5a4d6a8bae87594a2d", "0eb043d0eec44cd083ea6910b1db2f77eb212ebd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:42:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:42:55 2012 -0700" }, "message": "Merge branch \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\nPull \u0027make cscope\u0027 fix from Michal Marek:\n \"The kbuild.git#misc pull request introduced a bug that broke make\n cscope. Apparently, both the original author and me only tested the\n use case that the commit was supposed to improve (make tags/TAGS), and\n not the use case that was not supposed (make cscope).\"\n\n* \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n tags.sh: Add missing quotes\n" }, { "commit": "8f6b7676ceecc1f40df77d5a4d6a8bae87594a2d", "tree": "aaac7c2858dab9817af579f2ad39f2f18ce4dbd8", "parents": [ "143418d0c87fda0c587205c45094d8b05222fd49", "5219a5342ab13650ae0f0c62319407268c48d0ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:40:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:40:24 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto fixes from Herbert Xu:\n - Fix for CPU hotplug hang in padata.\n - Avoid using cpu_active inappropriately in pcrypt and padata.\n - Fix for user-space algorithm lookup hang with IV generators.\n - Fix for netlink dump of algorithms where stuff went missing due to\n incorrect calculation of message size.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: user - Fix size of netlink dump message\n crypto: user - Fix lookup of algorithms with IV generator\n crypto: pcrypt - Use the online cpumask as the default\n padata: Fix cpu hotplug\n padata: Use the online cpumask as the default\n padata: Add a reference to the api documentation\n" }, { "commit": "143418d0c87fda0c587205c45094d8b05222fd49", "tree": "31204467c0632c356cb77e374c270016f72d4ef3", "parents": [ "deb74f5ca1f22f9e1c5da93143a250dbb96535af", "9b218f63e50e590fe0c7724a0838d7eaa6dae5ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:38:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:38:51 2012 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fixes from Benjamin Herrenschmidt:\n \"This contains a couple more fixes for the system.h disintegration, a\n trivial section mismatch fix, a couple of patches from akpm that I\n didn\u0027t quite get he expected me to pickup, and a few more trivialities\n form Kumar that he appear to have forgotten to send me in the previous\n batch.\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart\n powerpc/eeh: Remove eeh_event_handler()-\u003edaemonize()\n powerpc/kvm: Fallout from system.h disintegration\n powerpc: Fix fallout from system.h split up\n powerpc: Mark const init data with __initconst instead of __initdata\n powerpc/qe: Update the SNUM table for MPC8569 Rev2.0\n powerpc/dts: Removed fsl,msi property from dts.\n powerpc/epapr: add \"memory\" as a clobber to all hypercalls\n powerpc/85xx: Enable I2C_CHARDEV and I2C_MPC options in defconfigs\n powerpc/85xx: add the P1020UTM-PC DTS support\n powerpc/85xx: add the P1020MBG-PC DTS support\n powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.h\n" }, { "commit": "deb74f5ca1f22f9e1c5da93143a250dbb96535af", "tree": "ee9eb01e5433ea50f3414a469521a4c1cfaccb7a", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "615399c84d1b8d8d8752629e5e5ab4e5044d6918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nPull cpumask cleanups from Rusty Russell:\n \"(Somehow forgot to send this out; it\u0027s been sitting in linux-next, and\n if you don\u0027t want it, it can sit there another cycle)\"\n\nI\u0027m a sucker for things that actually delete lines of code.\n\nFix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed\na user of \u0026cpu_online_map to be cpu_online_mask, but that code got\ndeleted by commit b21d55e98ac2 (\"ARM: 7332/1: extract out code patch\nfunction from kprobes\").\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n cpumask: remove old cpu_*_map.\n documentation: remove references to cpu_*_map.\n drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map.\n remove references to cpu_*_map in arch/\n" }, { "commit": "83e3fa6f0193299f8b7180db588edd5ca61a3b82", "tree": "bb7298e580619fd3b7923364e3c4cd1e9d341972", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:37 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:48:04 2012 -0700" }, "message": "irq_work: fix compile failure on MIPS from system.h split\n\nBuilds of the MIPS platform ip32_defconfig fails as of commit\n0195c00244dc (\"Merge tag \u0027split-asm_system_h ...\") because MIPS xchg()\nmacro uses BUILD_BUG_ON and it was moved in commit b81947c646bf\n(\"Disintegrate asm/system.h for MIPS\").\n\nThe root cause is that the system.h split wasn\u0027t tested on a baseline\nwith commit 6c03438edeb5 (\"kernel.h: doesn\u0027t explicitly use bug.h, so\ndon\u0027t include it.\")\n\nSince this file uses BUG code in several other places besides the xchg\ncall, simply make the inclusion explicit.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "650dc07ec3b0eba8ff21da706d2b1876ada59fc3", "tree": "337809fc7c960a6c525f473d498c339aa7075ab3", "parents": [ "cc22a938fc1db0c8ef5e693a69b159c4b851dab3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 10:08:35 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:59:07 2012 +0200" }, "message": "drm/i915: disable ppgtt on snb when dmar is enabled\n\nTotally unexpected that this regressed. Luckily it sounds like we just\nneed to have dmar disable on the igfx, not the entire system. At least\nthat\u0027s what a few days of testing between Tony Vroon and me indicates.\n\nReported-by: Tony Vroon \u003ctony@linx.net\u003e\nCc: Tony Vroon \u003ctony@linx.net\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43024\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "cc22a938fc1db0c8ef5e693a69b159c4b851dab3", "tree": "9d2e52caed1d848c267dcb33997b6fc8e6b3f739", "parents": [ "e77166b5a653728f312d07e60a80819d1c54fca4" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Thu Mar 29 20:55:48 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:58:47 2012 +0200" }, "message": "drm/i915: add Ivy Bridge GT2 Server entries\n\nThis adds PCI ID for IVB GT2 server variant which we were missing.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\n[danvet: fix up conflict because the patch has been diffed against next. tsk.]\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "0dd90aa9d6222e12201f05c0058e8741b7f66474", "tree": "8a57798f1d84db887b77abc2a66a2217d3b5ca6e", "parents": [ "0fc7374bb5df938ef3d386e48ac9797d7651e9cc" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 12:55:47 2012 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 13:00:26 2012 +0200" }, "message": "microblaze: Fix ret_from_fork declaration\n\nret_from_fork is used by noMMU system too.\n\nIt should be the part of patch\n\"Disintegrate asm/system.h for Microblaze\"\n(sha1: c40d04df152a1111c5bbcb632278394dabd2b73d)\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "0fc7374bb5df938ef3d386e48ac9797d7651e9cc", "tree": "41c2fe3282ec9e88dad9f81bcbb85fa72f395d0e", "parents": [ "90c0d80daa82fa9cbaa85d1a787375b33877d2d4" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 12:50:54 2012 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 13:00:22 2012 +0200" }, "message": "microblaze: Do not use tlb_skip in early_printk\n\ntlb_skip is valid only for MMU system.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "e199fd422420d1620cf64fd9bdd4ff8bc255cc76", "tree": "305939ba483e3c935a29aea84c624a536e68e353", "parents": [ "fa9e855025b19e96e493ee00de7d933a9794f742" ], "author": { "name": "Michel Dänzer", "email": "michel.daenzer@amd.com", "time": "Thu Mar 29 16:47:43 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:09:50 2012 +0100" }, "message": "drm/radeon: Don\u0027t dereference possibly-NULL pointer.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fa9e855025b19e96e493ee00de7d933a9794f742", "tree": "f58d289ecb25d82483b9158406f510a3783022fb", "parents": [ "402976fe51b2d1a58a29ba06fa1ca5ace3a4cdcd" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Sat Mar 31 13:29:25 2012 +0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:08:17 2012 +0100" }, "message": "mm, drm/udl: fixup vma flags on mmap\n\nThere should be VM_MIXEDMAP, not VM_PFNMAP, because udl_gem_fault() inserts\npages via vm_insert_page(). Other drm/gem drivers already do this.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "402976fe51b2d1a58a29ba06fa1ca5ace3a4cdcd", "tree": "2de887cae4ddcaf291562f796231c4feb829ad42", "parents": [ "d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Mar 29 19:04:08 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:07:42 2012 +0100" }, "message": "drm/radeon/kms: fix fans after resume\n\nOn pre-R600 asics, the SpeedFanControl table is not\nexecuted as part of ASIC_Init as it is on newer asics.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d29412\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1", "tree": "5ec7d22876848e194036c019aaea9f6a14e63c2a", "parents": [ "ea71f98d680c9ac768a7849d26d7ce4744064510" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:38:19 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:06:33 2012 +0100" }, "message": "nouveau/bios: Fix tracking of BIOS image data\n\nThe code tries various methods for retreiving the BIOS data. However\nit doesn\u0027t clear the bios-\u003edata pointer between the iterations.\n\nIn some cases, the shadow() method will fail and not update bios-\u003edata\nat all, which will cause us to \"score\" the old data and incorrectly\nattribute that score to the new method. This can cause double frees\nlater when disposing of the unused data.\n\nAdditionally, we were not freeing the data for methods that fail the\nscore test (we only freed when a \"best\" is superseeded, not when the\nnew method has a lower score than the exising \"best\"). Fix that as well.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ea71f98d680c9ac768a7849d26d7ce4744064510", "tree": "696b8eb9fc6541f71caede709857de3f07d08f06", "parents": [ "40c61046ee3007d73f141e96aa2f3dd56ee321c6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:37:13 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:05:58 2012 +0100" }, "message": "nouveau: Fix crash when pci_ram_rom() returns a size of 0\n\nFrom b15b244d6e6e20964bd4b85306722cb60c3c0809 Mon Sep 17 00:00:00 2001\nFrom: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nDate: Mon, 2 Apr 2012 13:28:18 +1000\nSubject:\n\nUnder some circumstances, pci_map_rom() can return a valid mapping\nbut a size of 0 (if it cannot find an image in the header).\n\nThis causes nouveau to try to kmalloc() a 0 sized pointer and\ndereference it, which crashes.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "40c61046ee3007d73f141e96aa2f3dd56ee321c6", "tree": "8ae9f4dc5aa83a4e7cc8664de97d1001fcddd92b", "parents": [ "e0d2e320210a0e0a75110bad8501b1cd498221de" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:49 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:49 2012 +0100" }, "message": "drm/nouveau: select POWER_SUPPLY\n\nBen H. reported that building nouveau into the kernel and power supply\nas a module was broken.\n\nJust have nouveau select it, like radeon does.\n\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e0d2e320210a0e0a75110bad8501b1cd498221de", "tree": "ba8bf718645591c2638fc7fbb4c55454d94e0801", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "02bfc2881e0d5b23147211bb6420798d946a7b5c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:03 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:03 2012 +0100" }, "message": "Merge branch \u0027drm-nouveau-fixes\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes\n\n* \u0027drm-nouveau-fixes\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6:\n drm/nouveau: inform userspace of relaxed kernel subchannel requirements\n Revert \"drm/nouveau: inform userspace of new kernel subchannel requirements\"\n drm/nouveau: oops, create m2mf for nvd9 too\n" }, { "commit": "0eb043d0eec44cd083ea6910b1db2f77eb212ebd", "tree": "fae70f3b77368b9f6397b0ebaacf05d5f4a0ce75", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Sat Mar 31 23:41:07 2012 -0700" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Apr 02 11:28:17 2012 +0200" }, "message": "Subject: [PATCH] tags.sh: Add missing quotes\n\nWhen $remove_structs is empty a test for empty string will turn\ninto test -n with no arguments meaning true. Add quotes so an\nempty string is tested and so that make cscope works again.\n\nReported-and-tested-by: Jike Song \u003calbcamus@gmail.com\u003e\nReported-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nAcked-by: Yang Bai \u003chamo.by@gmail.com\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "9b218f63e50e590fe0c7724a0838d7eaa6dae5ce", "tree": "2879a705de175bc7e956d90d72dee2bf1c38499c", "parents": [ "37ef9bd48af6ab9a3d1fd28df4f929abc19f2cc3" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Mar 28 12:20:58 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:31:19 2012 +1000" }, "message": "powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart\n\nThat set_current_state() won\u0027t work very well: the subsequent mutex_lock()\nmight flip the task back into TASK_RUNNING.\n\nAttempt to put it somewhere where it might have been meant to be, and\nattempt to describe why it might have been added.\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "37ef9bd48af6ab9a3d1fd28df4f929abc19f2cc3", "tree": "7352315e60fca4aead9bb25ae1985068cb38a88b", "parents": [ "95327d08fd5fc686b35ac21050a1b74f9bce3abe" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Mar 28 12:20:57 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:31:19 2012 +1000" }, "message": "powerpc/eeh: Remove eeh_event_handler()-\u003edaemonize()\n\ndaemonize() is only needed when a user-space task does kernel_thread().\n\neeh_event_handler() thread is created by the worker kthread, and thus it\ndoesn\u0027t need the soon-to-be-deprecated daemonize().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Linas Vepstas \u003clinasvepstas@gmail.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "95327d08fd5fc686b35ac21050a1b74f9bce3abe", "tree": "8fe15aac8ea373bb2b8dd0476ca7a495179f255f", "parents": [ "cad3c8346b94edd68e4b9c2c0056a5f61411af1a" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Sun Apr 01 17:35:53 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:00:04 2012 +1000" }, "message": "powerpc/kvm: Fallout from system.h disintegration\n\nAdd a missing include to fix build\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "cad3c8346b94edd68e4b9c2c0056a5f61411af1a", "tree": "ba8899651f4ab61f9d268bf65c262d879270aaa5", "parents": [ "059378e3ff36094dccdd55600c3ad67a88c302aa" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Fri Mar 30 14:01:07 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:00:03 2012 +1000" }, "message": "powerpc: Fix fallout from system.h split up\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "059378e3ff36094dccdd55600c3ad67a88c302aa", "tree": "cf3de6bdf02df80408fe5db35d25a7e86b642d94", "parents": [ "e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Mar 30 10:05:00 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:00:03 2012 +1000" }, "message": "powerpc: Mark const init data with __initconst instead of __initdata\n\nAs long as there is no other non-const variable marked __initdata in the\nsame compilation unit it doesn\u0027t hurt. If there were one however\ncompilation would fail with\n\n\terror: $variablename causes a section type conflict\n\nbecause a section containing const variables is marked read only and so\ncannot contain non-const variables.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Josh Boyer \u003cjwboyer@gmail.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: linuxppc-dev@lists.ozlabs.org\nCc: cbe-oss-dev@lists.ozlabs.org\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b", "tree": "e897997d1844a712391772444817abc12d2bc3d6", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "fa1b42b45a9c96da77f3ddabf715f49525a87209" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:57:46 2012 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:57:46 2012 +1000" }, "message": "Merge remote-tracking branch \u0027kumar/next\u0027 into merge\n" }, { "commit": "78fb72f7936c01d5b426c03a691eca082b03f2b9", "tree": "e35842c46e105ef286c4e148977494fd81946eee", "parents": [ "10b9194f959608368ed89df1937f17cfe6bd6d84" ], "author": { "name": "Rabin Vincent", "email": "rabin@rab.in", "time": "Thu Mar 29 07:15:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:32:35 2012 -0400" }, "message": "net: usb: cdc_eem: fix mtu\n\nMake CDC EEM recalculate the hard_mtu after adjusting the\nhard_header_len.\n\nWithout this, usbnet adjusts the MTU down to 1494 bytes, and the host is\nunable to receive standard 1500-byte frames from the device.\n\nTested with the Linux USB Ethernet gadget.\n\nCc: Oliver Neukum \u003coliver@neukum.name\u003e\nSigned-off-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10b9194f959608368ed89df1937f17cfe6bd6d84", "tree": "867eec7da75983ee378204b8bdbeefc26301c336", "parents": [ "6bafd6436e99d08e8def37ae9f790e1aff871bae" ], "author": { "name": "Yoshihiro Shimoda", "email": "yoshihiro.shimoda.uh@renesas.com", "time": "Thu Mar 29 19:32:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:22:11 2012 -0400" }, "message": "net: sh_eth: fix endian check for architecture independent\n\nSuperH has the \"CONFIG_CPU_LITTLE_ENDIAN\" and the \"__LITTLE_ENDIAN__\".\nBut, other architecture doesn\u0027t have them. So, this patch fixes it.\n\nSigned-off-by: Yoshihiro Shimoda \u003cyoshihiro.shimoda.uh@renesas.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6bafd6436e99d08e8def37ae9f790e1aff871bae", "tree": "3b3fcac82ed3db0c2f1694d87b69e7969d5ae377", "parents": [ "acc656323ab904803393acefdc8e1b78cde752e5" ], "author": { "name": "huajun li", "email": "huajun.li.lee@gmail.com", "time": "Fri Mar 30 00:11:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:20:37 2012 -0400" }, "message": "usb/rtl8150 : Remove duplicated definitions\n\nThere exist duplicated macro definitions in rtl8150.c, remove them.\n\nSigned-off-by: Huajun Li \u003chuajun.li.lee@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "acc656323ab904803393acefdc8e1b78cde752e5", "tree": "4d11bd3fc1c943d639af8d1bd68c0eb211309d55", "parents": [ "3f8c91a7398b9266fbe7abcbe4bd5dffef907643" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Fri Mar 30 01:01:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:17:16 2012 -0400" }, "message": "rionet: fix page allocation order of rionet_active\n\nrionet_active is allocated from the page allocator and the allocation\norder is calculated on the assumption that the page size is 4KB, so it\nwastes memory on more than 4K page systems.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f8c91a7398b9266fbe7abcbe4bd5dffef907643", "tree": "b49aab8ce6ded6ba2c718ce889bfa80d5e42f246", "parents": [ "72331bc0cd072c3f4b670cd1256e47681fc53b80" ], "author": { "name": "Andreas Mohr", "email": "andi@lisas.de", "time": "Sun Apr 01 12:35:00 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:09:36 2012 -0400" }, "message": "via-rhine: fix wait-bit inversion.\n\nBug appeared in a384a33bb1c9ec2d99db2046b41f57023fa7d77b\n(\"via-rhine: RHINE_WAIT_FOR macro removal). It can be noticed\nduring suspend/resume.\n\nSigned-off-by: Andreas Mohr \u003candi@lisas.de\u003e\nAcked-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nCc: David Lv \u003cDavidLv@viatech.com.cn\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72331bc0cd072c3f4b670cd1256e47681fc53b80", "tree": "46665ad2830342d94b4d784c5aa397e3a6f0045b", "parents": [ "cdaf0b835df04177397b90214f8b457fd23b67e0" ], "author": { "name": "Shmulik Ladkani", "email": "shmulik.ladkani@gmail.com", "time": "Sun Apr 01 04:03:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 17:29:40 2012 -0400" }, "message": "ipv6: Fix RTM_GETROUTE\u0027s interpretation of RTA_IIF to be consistent with ipv4\n\nIn IPv4, if an RTA_IIF attribute is specified within an RTM_GETROUTE\nmessage, then a route is searched as if a packet was received on the\nspecified \u0027iif\u0027 interface.\n\nHowever in IPv6, RTA_IIF is not interpreted in the same way:\n\u0027inet6_rtm_getroute()\u0027 always calls \u0027ip6_route_output()\u0027, regardless the\nRTA_IIF attribute.\n\nAs a result, in IPv6 there\u0027s no way to use RTM_GETROUTE in order to look\nfor a route as if a packet was received on a specific interface.\n\nFix \u0027inet6_rtm_getroute()\u0027 so that RTA_IIF is interpreted as \"lookup a\nroute as if a packet was received on the specified interface\", similar\nto IPv4\u0027s \u0027inet_rtm_getroute()\u0027 interpretation.\n\nReported-by: Ami Koren \u003camikoren@yahoo.com\u003e\nSigned-off-by: Shmulik Ladkani \u003cshmulik.ladkani@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "450aed725c9a53282483c48ebd012feefae94a07", "tree": "2cbd5e664c0f66490294a641033cf361820a3564", "parents": [ "6cfeba53911d6d2f17ebbd1246893557d5ff5aeb" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Mar 18 13:20:27 2012 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 01 22:57:53 2012 +0200" }, "message": "m68k/q40: Add missing platform check before registering platform devices\n\nOn multi-platform kernels, the Q40/Q60 platform devices should be\nregistered when running on Q40/Q60 only. Else it may crash later.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "6cfeba53911d6d2f17ebbd1246893557d5ff5aeb", "tree": "ec74c829f11b9fe5b4fa5c35cffd61f83454ad22", "parents": [ "7224c0d1045327d637dab2c90777b6d5ec6d6804" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Mar 18 13:21:38 2012 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 01 22:57:51 2012 +0200" }, "message": "m68k/mac: Add missing platform check before registering platform devices\n\nOn multi-platform kernels, the Mac platform devices should be registered\nwhen running on Mac only. Else it may crash later.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "7224c0d1045327d637dab2c90777b6d5ec6d6804", "tree": "ef39bbd027772ebec21435f762815d783ba0e3da", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri Mar 30 15:52:09 2012 +1000" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 01 22:57:49 2012 +0200" }, "message": "m68k: include asm/cmpxchg.h in our m68k atomic.h\n\nAfter commit 9ffc93f203c18a70623f21950f1dd473c9ec48cd (\"Remove all\n\n CC init/main.o\nIn file included from include/linux/mm.h:15:0,\n from include/linux/ring_buffer.h:5,\n from include/linux/ftrace_event.h:4,\n from include/trace/syscall.h:6,\n from include/linux/syscalls.h:78,\n from init/main.c:16:\ninclude/linux/debug_locks.h: In function ‘__debug_locks_off’:\ninclude/linux/debug_locks.h:16:2: error: implicit declaration of function ‘xchg’\n\nThere is no indirect inclusions of the new asm/cmpxchg.h for m68k here.\nLooking at most other architectures they include asm/cmpxchg.h in their\nasm/atomic.h. M68k currently does not do this. Including this in atomic.h\nfixes all m68k build problems.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "cdaf0b835df04177397b90214f8b457fd23b67e0", "tree": "a1d291b17a63a4cd9c2c213351a1f12b02d07a34", "parents": [ "6523cf9a460c488c681b7e4ecef2395491de1d4e" ], "author": { "name": "stigge@antcom.de", "email": "stigge@antcom.de", "time": "Wed Mar 28 12:36:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "net: lpc_eth: Fix rename of dev_hw_addr_random\n\nIn parallel to the integration of lpc_eth.c, dev_hw_addr_random() has been\nrenamed to eth_hw_addr_random(). This patch fixes it also in the new driver\nlpc_eth.c.\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6523cf9a460c488c681b7e4ecef2395491de1d4e", "tree": "6783e2d14e9a767058837f343a3748e5ecffc111", "parents": [ "81213b5e8ae68e204aa7a3f83c4f9100405dbff9" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Mar 28 12:10:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "net/netfilter/nfnetlink_acct.c: use linux/atomic.h\n\nThere\u0027s no known problem here, but this is one of only two non-arch files\nin the kernel which use asm/atomic.h instead of linux/atomic.h.\n\nAcked-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81213b5e8ae68e204aa7a3f83c4f9100405dbff9", "tree": "cf12b20ee5162471bf0a319beb3db8657f190c28", "parents": [ "464b57da56910c8737ede75ad820b9a7afc46b3e" ], "author": { "name": "danborkmann@iogearbox.net", "email": "danborkmann@iogearbox.net", "time": "Tue Mar 27 22:47:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "rose_dev: fix memcpy-bug in rose_set_mac_address\n\nIf both addresses equal, nothing needs to be done. If the device is down,\nthen we simply copy the new address to dev-\u003edev_addr. If the device is up,\nthen we add another loopback device with the new address, and if that does\nnot fail, we remove the loopback device with the old address. And only\nthen, we update the dev-\u003edev_addr.\n\nSigned-off-by: Daniel Borkmann \u003cdaniel.borkmann@tik.ee.ethz.ch\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "464b57da56910c8737ede75ad820b9a7afc46b3e", "tree": "0d5ec220c1dbe97b9fdfe4f6bd0e748cddf191a7", "parents": [ "67378563df2e168d32a4054616f244a91aec462d" ], "author": { "name": "Kenth Eriksson", "email": "kenth.eriksson@transmode.com", "time": "Tue Mar 27 22:05:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.\n\nThe merge done in commit b26e478f undid bug fix in commit c3e072f8\n(\"net: fsl_pq_mdio: fix non tbi phy access\"), with the result that non\nTBI (e.g. MDIO) PHYs cannot be accessed.\n\nSigned-off-by: Kenth Eriksson \u003ckenth.eriksson@transmode.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67378563df2e168d32a4054616f244a91aec462d", "tree": "ef7a14168f63eedbdcfdc0f3345d48dc21cbd352", "parents": [ "54f5ffbf308828b588b9d1acd9a512d433be8a09" ], "author": { "name": "David Ward", "email": "david.ward@ll.mit.edu", "time": "Tue Mar 27 09:01:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:11 2012 -0400" }, "message": "net/garp: avoid infinite loop if attribute already exists\n\nAn infinite loop occurred if garp_attr_create was called with the values\nof an existing attribute. This might happen if a previous leave request\nfor the attribute has not yet been followed by a PDU transmission (or,\nif the application previously issued a join request for the attribute\nand is now issuing another one, without having issued a leave request).\n\nIf garp_attr_create finds an existing attribute having the same values,\nreturn the address to it. Its state will then get updated (i.e., if it\nwas in a leaving state, it will move into a non-leaving state and not\nget deleted during the next PDU transmission).\n\nTo accomplish this fix, collapse garp_attr_insert into garp_attr_create\n(which is its only caller).\n\nThanks to Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e for contributing to\nthis fix.\n\nSigned-off-by: David Ward \u003cdavid.ward@ll.mit.edu\u003e\nAcked-by: Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "54f5ffbf308828b588b9d1acd9a512d433be8a09", "tree": "02746522e57bd0c92432a17d53ba40666cd41ced", "parents": [ "1d24fb3684f347226747c6b11ea426b7b992694e", "de312db345f9770b64ff39ef5a7f86f6358e93cc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:08 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:08 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "e77166b5a653728f312d07e60a80819d1c54fca4", "tree": "52c6517f27f31b2b2b216a08f1e8d0978ccf7456", "parents": [ "1c7eaac737e4cca24703531ebcb566afc3ed285f" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Mar 30 22:14:05 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:32:32 2012 +0200" }, "message": "drm/i915: properly clear SSC1 bit in the pch refclock init code\n\nNoticed by staring at intel_reg_dumper diffs. Unfortunately it does\nnot seem to completely fix the bug.\n\nStill, it\u0027s good to get this right, and maybe it helps someplace else.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d47117\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "1c7eaac737e4cca24703531ebcb566afc3ed285f", "tree": "cfdbf8ca115e1de50e83f6f9f049144f901ddecb", "parents": [ "25e341cfc33d94435472983825163e97fe370a6c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Mar 27 09:31:24 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:30:24 2012 +0200" }, "message": "drm/i915: apply CS reg readback trick against missed IRQ on snb\n\nBen Widawsky reported missed IRQ issues and this patch here helps.\n\nWe have one other missed IRQ report still left on snb, reported by QA:\n\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d46145\n\nThis is _not_ a regression due to the forcewake voodoo though, it\nstarted showing up before that was applied and has been on-and-off for\nthe past few weeks. According to QA this patch does not help. But the\nmissed IRQ is always from the blt ring (despite running piglit, so\nalso render activity expected), so I\u0027m hopefully that this is an issue\nwith the blt ring itself.\n\nTested-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "25e341cfc33d94435472983825163e97fe370a6c", "tree": "ff7a27ab018509561894d018e5f2a21eb6a921bd", "parents": [ "aa46419186992e6b8b8010319f0ca7f40a0d13f5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Mar 24 23:51:30 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:29:44 2012 +0200" }, "message": "drm/i915: quirk away broken OpRegion VBT\n\nSomehow the BIOS manages to screw things up when copying the VBT\naround, because the one we scrap from the VBIOS rom actually works.\n\nCc: stable@kernel.org\nTested-by: Markus Heinz \u003cmarkus.heinz@uni-dortmund.de\u003e\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Rodrigo Vivi \u003crodrigo.vivi@gmail.com\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d28812\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "aa46419186992e6b8b8010319f0ca7f40a0d13f5", "tree": "b6cd7d2870de63808e31143607a3e5ec2a740720", "parents": [ "83b7f9ac9126f0532ca34c14e4f0582c565c6b0d" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Fri Mar 23 11:57:19 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:28:22 2012 +0200" }, "message": "drm/i915: enable plain RC6 on Sandy Bridge by default\n\nThis is yet another chapter in the ongoing saga of bringing RC6 to Sandy\nBridge machines by default.\n\nNow that we have discovered that RC6 issues are triggered by RC6+ state,\nlet\u0027s try to disable it by default. Plain RC6 is the one responsible for\nmost energy savings, and so far it haven\u0027t given any problems - at least,\nnone we are aware of.\n\nSo with this, when i915_enable_rc6\u003d-1 (e.g., the default value), we\u0027ll\nattempt to enable plain RC6 only on SNB. For Ivy Bridge, the behavior\nstays the same as always - we enable both RC6 and deep RC6.\n\nNote that while this exact patch does not has explicit tested-by\u0027s, the\nequivalent settings were fixed in 3.3 kernel by a smaller patch. And it\nhas also received considerable testing through Canonical RC6 task-force\ntesting at https://wiki.ubuntu.com/Kernel/PowerManagementRC6. Up to date,\nit looks like all the known issues are gone.\n\nv2: improve description and reference a couple of open bugs related to\nRC6 which seem to be fixed with this change.\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d41682\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38567\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d44867\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "83b7f9ac9126f0532ca34c14e4f0582c565c6b0d", "tree": "4c3b9359270a0009150719eae585acd679cc5324", "parents": [ "7dd4906586274f3945f2aeaaa5a33b451c3b4bba" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Fri Mar 23 11:57:18 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:27:50 2012 +0200" }, "message": "drm/i915: allow to select rc6 modes via kernel parameter\n\nThis allows to select which rc6 modes are to be used via kernel parameter,\nvia a bitmask parameter. E.g.:\n\n- to enable rc6, i915_enable_rc6\u003d1\n- to enable rc6 and deep rc6, i915_enable_rc6\u003d3\n- to enable rc6 and deepest rc6, use i915_enable_rc6\u003d5\n- to enable rc6, deep and deepest rc6, use i915_enable_rc6\u003d7\n\nPlease keep in mind that the deepest RC6 state really should NOT be used\nby default, as it could potentially worsen the issues with deep RC6. So do\nenable it only when you know what you are doing. However, having it around\ncould help solving possible future rc6-related issues and their debugging\non user machines.\n\nNote that this changes behavior - previously, value of 1 would enable both\nRC6 and deep RC6. Now it should only enable RC6 and deep/deepest RC6\nstages must be enabled manually.\n\nv2: address Chris Wilson comments and clean up the code.\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d42579\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Ben Widawsky \u003cbenjamin.widawsky@intel.com\u003e\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "7dd4906586274f3945f2aeaaa5a33b451c3b4bba", "tree": "fa0258dcd2325e7ffef04adedf471a0a5afa8f10", "parents": [ "55a254ac63a3ac1867d1501030e7fba69c7d4aeb" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Mar 21 10:48:18 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:26:05 2012 +0200" }, "message": "drm/i915: Mark untiled BLT commands as fenced on gen2/3\n\nThe BLT commands on gen2/3 utilize the fence registers and so we cannot\nmodify any fences for the object whilst those commands are in flight.\nCurrently we marked tiled commands as occupying a fence, but forgot to\nrestrict the untiled commands from preventing a fence being assigned\nbefore they were completed.\n\nOne side-effect is that we ten have to double check that a fence was\nallocated for a fenced buffer during move-to-active.\n\nReported-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d43427\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d47990\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nTestcase: i-g-t/tests/gem_tiled_after_untiled_blt\nTested-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "55a254ac63a3ac1867d1501030e7fba69c7d4aeb", "tree": "a0438e133793dcce412879537d49214c29a8fefd", "parents": [ "f47166d2b0001fcb752b40c5a2d4db986dfbea68" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Mar 22 00:14:43 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:25:29 2012 +0200" }, "message": "drm/i915: properly restore the ppgtt page directory on resume\n\nThe ppgtt page directory lives in a snatched part of the gtt pte\nrange. Which naturally gets cleared on hibernate when we pull the\npower. Suspend to ram (which is what I\u0027ve tested) works because\ndespite the fact that this is a mmio region, it is actually back by\nsystem ram.\n\nFix this by moving the page directory setup code to the ppgtt init\ncode (which gets called on resume).\n\nThis fixes hibernate on my ivb and snb.\n\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "f47166d2b0001fcb752b40c5a2d4db986dfbea68", "tree": "439aa744068a97f0ab402e8e91b8d524ff0d3b8e", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Mar 22 15:00:50 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:23:53 2012 +0200" }, "message": "drm/i915: Sanitize BIOS debugging bits from PIPECONF\n\nQuoting the BSpec from time immemorial:\n\n PIPEACONF, bits 28:27: Frame Start Delay (Debug)\n\n Used to delay the frame start signal that is sent to the display planes.\n Care must be taken to insure that there are enough lines during VBLANK\n to support this setting.\n\nAn instance of the BIOS leaving these bits set was found in the wild,\nwhere it caused our modesetting to go all squiffy and skewiff.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d47271\nReported-and-tested-by: Eva Wang \u003cevawang@linpus.com\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43012\nReported-and-tested-by: Carl Richell \u003ccarl@system76.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "dd775ae2549217d3ae09363e3edb305d0fa19928", "tree": "a56f5e61a081da06d29676a1677442e654d498eb", "parents": [ "b7ffff4bb3fef527a26144a95d9dfe8c11a6b927" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 16:24:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 16:24:09 2012 -0700" }, "message": "Linux 3.4-rc1\n" }, { "commit": "b7ffff4bb3fef527a26144a95d9dfe8c11a6b927", "tree": "d5788ce86b8f0b2290660e1d7298a564a37f62a9", "parents": [ "8bb1f229527dee95644e0f8496980bb767c6f620", "f878d0be229ab129bc4b224191f217106a4b0bc1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 15:11:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 15:11:39 2012 -0700" }, "message": "Merge branch \u0027s3-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console\n\nPull virtio S3 support patches from Amit Shah:\n \"Turns out S3 is not different from S4 for virtio devices: the device\n is assumed to be reset, so the host and guest state are to be assumed\n to be out of sync upon resume. We handle the S4 case with exactly the\n same scenario, so just point the suspend/resume routines to the\n freeze/restore ones.\n\n Once that is done, we also use the PM API\u0027s macro to initialise the\n sleep functions.\n\n A couple of cleanups are included: there\u0027s no need for special thaw\n processing in the balloon driver, so that\u0027s addressed in patches 1 and\n 2.\n\n Testing: both S3 and S4 support have been tested using these patches\n using a similar method used earlier during S4 patch development: a\n guest is started with virtio-blk as the only disk, a virtio network\n card, a virtio-serial port and a virtio balloon device. Ping from\n guest to host, dd /dev/zero to a file on the disk, and IO from the\n host on the virtio-serial port, all at once, while exercising S4 and\n S3 (separately) were tested. They all continue to work fine after\n resume. virtio balloon values too were tested by inflating and\n deflating the balloon.\"\n\nPulling from Amit, since Rusty is off getting married (and presumably\nshaving people).\n\n* \u0027s3-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console:\n virtio-pci: switch to PM ops macro to initialise PM functions\n virtio-pci: S3 support\n virtio-pci: drop restore_common()\n virtio: drop thaw PM operation\n virtio: balloon: Allow stats update after restore from S4\n" }, { "commit": "8bb1f229527dee95644e0f8496980bb767c6f620", "tree": "511551e9772f11f855bd5b759b6d449da47e8820", "parents": [ "f22e08a79f3765fecf060b225a46931c94fb0a92", "c0d0259481cc6ec2a38cad810055e455de35c733" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:42:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:42:57 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull second try at vfs part d#2 from Al Viro:\n \"Miklos\u0027 first series (with do_lookup() rewrite split into edible\n chunks) + assorted bits and pieces.\n\n The \u0027untangling of do_lookup()\u0027 series is is a splitup of what used to\n be a monolithic patch from Miklos, so this series is basically \"how do\n I convince myself that his patch is correct (or find a hole in it)\".\n No holes found and I like the resulting cleanup, so in it went...\"\n\nChanges from try 1: Fix a boot problem with selinux, and commit messages\nprettied up a bit.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (24 commits)\n vfs: fix out-of-date dentry_unhash() comment\n vfs: split __lookup_hash\n untangling do_lookup() - take __lookup_hash()-calling case out of line.\n untangling do_lookup() - switch to calling __lookup_hash()\n untangling do_lookup() - merge d_alloc_and_lookup() callers\n untangling do_lookup() - merge failure exits in !dentry case\n untangling do_lookup() - massage !dentry case towards __lookup_hash()\n untangling do_lookup() - get rid of need_reval in !dentry case\n untangling do_lookup() - eliminate a loop.\n untangling do_lookup() - expand the area under -\u003ei_mutex\n untangling do_lookup() - isolate !dentry stuff from the rest of it.\n vfs: move MAY_EXEC check from __lookup_hash()\n vfs: don\u0027t revalidate just looked up dentry\n vfs: fix d_need_lookup/d_revalidate order in do_lookup\n ext3: move headers to fs/ext3/\n migrate ext2_fs.h guts to fs/ext2/ext2.h\n new helper: ext2_image_size()\n get rid of pointless includes of ext2_fs.h\n ext2: No longer export ext2_fs.h to user space\n mtdchar: kill persistently held vfsmount\n ...\n" }, { "commit": "f22e08a79f3765fecf060b225a46931c94fb0a92", "tree": "2f02777e8893d03289ec0a7f5f414f3ff01c8c37", "parents": [ "f187e9fd68577cdd5f914659b6f7f11124e40485", "e3831edd59edf57ca11fc289f08961b20baf5146" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:35:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:35:31 2012 -0700" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler fixes from Ingo Molnar.\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched: Fix incorrect usage of for_each_cpu_mask() in select_fallback_rq()\n sched: Fix __schedule_bug() output when called from an interrupt\n sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback\n" }, { "commit": "f187e9fd68577cdd5f914659b6f7f11124e40485", "tree": "ad0e7422359724f7c7ffaaaa80dd3a7281f02a83", "parents": [ "adb3b1f3fc1c6edb501808ebf80a81e81c52eb73", "8ebfdf2babcda5a3b06cc67523bca1f9aed46009" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:34:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:34:04 2012 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf updates and fixes from Ingo Molnar:\n \"It\u0027s mostly fixes, but there\u0027s also two late items:\n\n - preliminary GTK GUI support for perf report\n - PMU raw event format descriptors in sysfs, to be parsed by tooling\n\n The raw event format in sysfs is a new ABI. For example for the \u0027CPU\u0027\n PMU we have:\n\n aldebaran:~\u003e ll /sys/bus/event_source/devices/cpu/format/*\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/any\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/cmask\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/edge\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/event\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/inv\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/offcore_rsp\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/pc\n -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/umask\n\n those lists of fields contain a specific format:\n\n aldebaran:~\u003e cat /sys/bus/event_source/devices/cpu/format/offcore_rsp\n config1:0-63\n\n So, those who wish to specify raw events can now use the following\n event format:\n\n -e cpu/cmask\u003d1,event\u003d2,umask\u003d3\n\n Most people will not want to specify any events (let alone raw\n events), they\u0027ll just use whatever default event the tools use.\n\n But for more obscure PMU events that have no cross-architecture\n generic events the above syntax is more usable and a bit more\n structured than specifying hex numbers.\"\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (41 commits)\n perf tools: Remove auto-generated bison/flex files\n perf annotate: Fix off by one symbol hist size allocation and hit accounting\n perf tools: Add missing ref-cycles event back to event parser\n perf annotate: addr2line wants addresses in same format as objdump\n perf probe: Finder fails to resolve function name to address\n tracing: Fix ent_size in trace output\n perf symbols: Handle NULL dso in dso__name_len\n perf symbols: Do not include libgen.h\n perf tools: Fix bug in raw sample parsing\n perf tools: Fix display of first level of callchains\n perf tools: Switch module.h into export.h\n perf: Move mmap page data_head offset assertion out of header\n perf: Fix mmap_page capabilities and docs\n perf diff: Fix to work with new hists design\n perf tools: Fix modifier to be applied on correct events\n perf tools: Fix various casting issues for 32 bits\n perf tools: Simplify event_read_id exit path\n tracing: Fix ftrace stack trace entries\n tracing: Move the tracing_on/off() declarations into CONFIG_TRACING\n perf report: Add a simple GTK2-based \u0027perf report\u0027 browser\n ...\n" }, { "commit": "adb3b1f3fc1c6edb501808ebf80a81e81c52eb73", "tree": "9490e03ee23abda6a42cc0070aec5494c18ce9bf", "parents": [ "a75ee6ecd411a50bf4da927c2fdb2cb56246a2bd", "7ec6118c46699548b302149bba791166004c8428" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:32:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:32:30 2012 -0700" }, "message": "Merge tag \u0027parisc-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6\n\nPull PARISC misc updates from James Bottomley:\n \"This is a couple of minor updates (fixing lws futex locking and\n removing some obsolete cpu_*_map calls).\"\n\n* tag \u0027parisc-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:\n [PARISC] remove references to cpu_*_map.\n [PARISC] futex: Use same lock set as lws calls\n" }, { "commit": "a75ee6ecd411a50bf4da927c2fdb2cb56246a2bd", "tree": "fcb06e1940152b115901fda68e7eea1cc1196ff3", "parents": [ "c9651e70ad0aa499814817cbf3cc1d0b806ed3a1", "699316948628dab9e813c415640fe5b9f65cd5e3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:31:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 31 13:31:23 2012 -0700" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\nPull SCSI updates from James Bottomley:\n \"This is primarily another round of driver updates (lpfc, bfa, fcoe,\n ipr) plus a new ufshcd driver. There shouldn\u0027t be anything\n controversial in here (The final deletion of scsi proc_ops which\n caused some build breakage has been held over until the next merge\n window to give us more time to stabilise it).\n\n I\u0027m afraid, with me moving continents at exactly the wrong time,\n anything submitted after the merge window opened has been held over to\n the next merge window.\"\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (63 commits)\n [SCSI] ipr: Driver version 2.5.3\n [SCSI] ipr: Increase alignment boundary of command blocks\n [SCSI] ipr: Increase max concurrent oustanding commands\n [SCSI] ipr: Remove unnecessary memory barriers\n [SCSI] ipr: Remove unnecessary interrupt clearing on new adapters\n [SCSI] ipr: Fix target id allocation re-use problem\n [SCSI] atp870u, mpt2sas, qla4xxx use pci_dev-\u003erevision\n [SCSI] fcoe: Drop the rtnl_mutex before calling fcoe_ctlr_link_up\n [SCSI] bfa: Update the driver version to 3.0.23.0\n [SCSI] bfa: BSG and User interface fixes.\n [SCSI] bfa: Fix to avoid vport delete hang on request queue full scenario.\n [SCSI] bfa: Move service parameter programming logic into firmware.\n [SCSI] bfa: Revised Fabric Assigned Address(FAA) feature implementation.\n [SCSI] bfa: Flash controller IOC pll init fixes.\n [SCSI] bfa: Serialize the IOC hw semaphore unlock logic.\n [SCSI] bfa: Modify ISR to process pending completions\n [SCSI] bfa: Add fc host issue lip support\n [SCSI] mpt2sas: remove extraneous sas_log_info messages\n [SCSI] libfc: fcoe_transport_create fails in single-CPU environment\n [SCSI] fcoe: reduce contention for fcoe_rx_list lock [v2]\n ...\n" }, { "commit": "c0d0259481cc6ec2a38cad810055e455de35c733", "tree": "20ca63134e34d408e075790bb2fd4bf375b89313", "parents": [ "bad61189780ec0592cacde01a0775cb98a30efdc" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Wed Feb 15 11:48:40 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 31 16:03:17 2012 -0400" }, "message": "vfs: fix out-of-date dentry_unhash() comment\n\n64252c75a2196a0cf1e0d3777143ecfe0e3ae650 \"vfs: remove dget() from\ndentry_unhash()\" changed the implementation but not the comment.\n\nCc: Sage Weil \u003csage@newdream.net\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "bad61189780ec0592cacde01a0775cb98a30efdc", "tree": "c17f96209e27717bab726d1fae5c4164c49c4860", "parents": [ "81e6f520898edbda56e8680d338ace4f5694874e" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Mon Mar 26 12:54:24 2012 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 31 16:03:17 2012 -0400" }, "message": "vfs: split __lookup_hash\n\nSplit __lookup_hash into two component functions:\n\n lookup_dcache - tries cached lookup, returns whether real lookup is needed\n lookup_real - calls i_op-\u003elookup\n\nThis eliminates code duplication between d_alloc_and_lookup() and\nd_inode_lookup().\n\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" } ], "next": "81e6f520898edbda56e8680d338ace4f5694874e" }