)]}' { "log": [ { "commit": "0e833d8cfcb52b5ee3ead22cabbab81dea32c3f0", "tree": "0c64533ba9181c014a4b2dcda75c273ae0437dd6", "parents": [ "4f1ba49efafccbc73017f824efa2505c81b247cd", "7b29dc21ea084be7ddfb536994a9cfae95337690" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:16:00 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:16:00 2011 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)\n tg3: Fix tg3_skb_error_unmap()\n net: tracepoint of net_dev_xmit sees freed skb and causes panic\n drivers/net/can/flexcan.c: add missing clk_put\n net: dm9000: Get the chip in a known good state before enabling interrupts\n drivers/net/davinci_emac.c: add missing clk_put\n af-packet: Add flag to distinguish VID 0 from no-vlan.\n caif: Fix race when conditionally taking rtnl lock\n usbnet/cdc_ncm: add missing .reset_resume hook\n vlan: fix typo in vlan_dev_hard_start_xmit()\n net/ipv4: Check for mistakenly passed in non-IPv4 address\n iwl4965: correctly validate temperature value\n bluetooth l2cap: fix locking in l2cap_global_chan_by_psm\n ath9k: fix two more bugs in tx power\n cfg80211: don\u0027t drop p2p probe responses\n Revert \"net: fix section mismatches\"\n drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()\n sctp: stop pending timers and purge queues when peer restart asoc\n drivers/net: ks8842 Fix crash on received packet when in PIO mode.\n ip_options_compile: properly handle unaligned pointer\n iwlagn: fix incorrect PCI subsystem id for 6150 devices\n ...\n" }, { "commit": "55db4c64eddf37e31279ec15fe90314713bc9cfa", "tree": "4bd186333049c5fcc1eacdff0efc82ac8b80ff5e", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "message": "Revert \"tty: make receive_buf() return the amout of bytes received\"\n\nThis reverts commit b1c43f82c5aa265442f82dba31ce985ebb7aa71c.\n\nIt was broken in so many ways, and results in random odd pty issues.\n\nIt re-introduced the buggy schedule_work() in flush_to_ldisc() that can\ncause endless work-loops (see commit a5660b41af6a: \"tty: fix endless\nwork loop when the buffer fills up\").\n\nIt also used an \"unsigned int\" return value fo the -\u003ereceive_buf()\nfunction, but then made multiple functions return a negative error code,\nand didn\u0027t actually check for the error in the caller.\n\nAnd it didn\u0027t actually work at all. BenH bisected down odd tty behavior\nto it:\n \"It looks like the patch is causing some major malfunctions of the X\n server for me, possibly related to PTYs. For example, cat\u0027ing a\n large file in a gnome terminal hangs the kernel for -minutes- in a\n loop of what looks like flush_to_ldisc/workqueue code, (some ftrace\n data in the quoted bits further down).\n\n ...\n\n Some more data: It -looks- like what happens is that the\n flush_to_ldisc work queue entry constantly re-queues itself (because\n the PTY is full ?) and the workqueue thread will basically loop\n forver calling it without ever scheduling, thus starving the consumer\n process that could have emptied the PTY.\"\n\nwhich is pretty much exactly the problem we fixed in a5660b41af6a.\n\nMilton Miller pointed out the \u0027unsigned int\u0027 issue.\n\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReported-by: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Stefan Bigler \u003cstefan.bigler@keymile.com\u003e\nCc: Toby Gray \u003ctoby.gray@realvnc.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b29dc21ea084be7ddfb536994a9cfae95337690", "tree": "799f5becd9484e53e09b5f620ebfd5315bdfe033", "parents": [ "9a2e0fb0893ddf595d0a372e681f5b98017c6d90", "dfe21582ac5ebc460dda98c67e8589dd506d02cd" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 03 14:31:50 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 03 14:31:50 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem\n" }, { "commit": "9a2e0fb0893ddf595d0a372e681f5b98017c6d90", "tree": "fc32f2ae2fefe55bfe5b3381629b33550f7adea6", "parents": [ "ec764bf083a6ff396234351b51fd236f53c903bf" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu Jun 02 13:01:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 03 00:01:30 2011 -0700" }, "message": "tg3: Fix tg3_skb_error_unmap()\n\nThis function attempts to free one fragment beyond the number of\nfragments that were actually mapped. This patch brings back the limit\nto the correct spot.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nTested-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2e4ceec4edaef6e903422792de4f7f37de98cec6", "tree": "628626d17ea26b1c77449afc9bdee88581982033", "parents": [ "6979d5dd96a4a4975ce240982436e92a3da23315" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 01 19:48:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 02 00:10:01 2011 -0700" }, "message": "drivers/net/can/flexcan.c: add missing clk_put\n\nThe failed_get label is used after the call to clk_get has succeeded, so it\nshould be moved up above the call to clk_put.\n\nThe failed_req labels doesn\u0027t do anything different than failed_get, so\ndelete it.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6979d5dd96a4a4975ce240982436e92a3da23315", "tree": "b8a5c017e168d87f91668b5cab89c7df56dcda58", "parents": [ "b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Jun 01 10:18:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:22:15 2011 -0700" }, "message": "net: dm9000: Get the chip in a known good state before enabling interrupts\n\nCurrently the DM9000 driver requests the primary interrupt before it\nresets the chip and puts it into a known good state. This means that if\nthe chip is asserting interrupt for some reason we can end up with a\nscreaming IRQ that the interrupt handler is unable to deal with. Avoid\nthis by only requesting the interrupt after we\u0027ve reset the chip so we\nknow what state it\u0027s in.\n\nThis started manifesting itself on one of my boards in the past month or\nso, I suspect as a result of some core infrastructure changes removing\nsome form of mitigation against bad behaviour here, even when things boot\nit seems that the new code brings the interface up more quickly.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d", "tree": "8eb77b610efcabd6185b964b817b2b30bdebad0d", "parents": [ "a3bcc23e890a6d49d6763d9eb073d711de2e0469" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 01 07:10:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:20:14 2011 -0700" }, "message": "drivers/net/davinci_emac.c: add missing clk_put\n\nGo to existing error handling code at the end of the function that calls\nclk_put.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "85e3c65fa3a1d0542c181510a950a2be7733ff29", "tree": "7efb6a9f3ed34ed52358eef6b4a59659a5fdea94", "parents": [ "307f73df2b9829ee5a261d1ed432ff683c426cdf" ], "author": { "name": "Stefan Metzmacher", "email": "metze@samba.org", "time": "Wed Jun 01 02:01:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:10:49 2011 -0700" }, "message": "usbnet/cdc_ncm: add missing .reset_resume hook\n\nThis avoids messages like this after suspend:\n\n cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm?\n cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm?\n cdc_ncm 2-1.4:1.6: usb0: unregister \u0027cdc_ncm\u0027 usb-0000:00:1d.0-1.4, CDC NCM\n\nThis is important for the Ericsson F5521gw GSM/UMTS modem.\nOtherwise modemmanager looses the fact that the cdc_ncm and cdc_acm devices\nbelong together.\n\nThe cdc_ether module does the same.\n\nSigned-off-by: Stefan Metzmacher \u003cmetze@samba.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dfe21582ac5ebc460dda98c67e8589dd506d02cd", "tree": "76fe13dd7d63a378d432ac98b62015fcae38a2e3", "parents": [ "a7567b2059020bf3fa96c389ec25eed8e28ad4ba" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Wed Jun 01 17:17:57 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:41:13 2011 -0400" }, "message": "iwl4965: correctly validate temperature value\n\nIn some cases we can read wrong temperature value. If after that\ntemperature value will not be updated to good one, we badly configure\ntx power parameters and device is unable to send a data.\n\nResolves:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d35932\n\nCc: stable@kernel.org # 2.6.39+\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "21fdc87248d1d28492c775e05fa92b3c8c7bc8db", "tree": "cd0f69b7a496b866d2a67cfcf12305b1e5060abc", "parents": [ "333ba7325213f0a09dfa5ceeddb056d6ad74b3b5" ], "author": { "name": "Daniel Halperin", "email": "dhalperi@cs.washington.edu", "time": "Tue May 31 11:59:30 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:35:54 2011 -0400" }, "message": "ath9k: fix two more bugs in tx power\n\nThis is the same fix as\n\n commit 841051602e3fa18ea468fe5a177aa92b6eb44b56\n Author: Matteo Croce \u003ctechnoboy85@gmail.com\u003e\n Date: Fri Dec 3 02:25:08 2010 +0100\n\n The ath9k driver subtracts 3 dBm to the txpower as with two radios the\n signal power is doubled.\n The resulting value is assigned in an u16 which overflows and makes\n the card work at full power.\n\nin two more places. I grepped the ath tree and didn\u0027t find any others.\n\nCc: stable@kernel.org\nSigned-off-by: Daniel Halperin \u003cdhalperi@cs.washington.edu\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "948252cb9e01d65a89ecadf67be5018351eee15e", "tree": "c26e0de3e2b938139f2673cff12520e100f0cd3b", "parents": [ "930a6eac9f40e692bd9670d89bcd9ac0f4019356" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 31 19:27:48 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 31 19:28:32 2011 -0700" }, "message": "Revert \"net: fix section mismatches\"\n\nThis reverts commit e5cb966c0838e4da43a3b0751bdcac7fe719f7b4.\n\nIt causes new build regressions with gcc-4.2 which is\npretty common on non-x86 platforms.\n\nReported-by: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "930a6eac9f40e692bd9670d89bcd9ac0f4019356", "tree": "9da346841ed70c260580d29e9462ad629d0f076f", "parents": [ "a000c01e60e40e15304ffe48fff051d17a7bea91" ], "author": { "name": "Alexey Khoroshilov", "email": "khoroshilov@ispras.ru", "time": "Mon May 30 07:06:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 31 15:30:17 2011 -0700" }, "message": "drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()\n\ncatc_ctrl_run() calls usb_submit_urb() with GFP_KERNEL, while it is called from\ncatc_ctrl_async() and catc_ctrl_done() with catc-\u003ectrl_lock spinlock held.\n\nThe patch replaces GFP_KERNEL with GFP_ATOMIC.\n\nFound by Linux Driver Verification project (linuxtesting.org).\n\nSigned-off-by: Alexey Khoroshilov \u003ckhoroshilov@ispras.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b10cec8a4e8167075b9e1ff3f05419769e7f381a", "tree": "78f82ee427a29c9b3afcd4f06968495cb757b5bf", "parents": [ "48bdf072c3f1f8f739f76d19c74f4c79605cac46" ], "author": { "name": "Dennis Aberilla", "email": "dennis.aberilla@mimomax.com", "time": "Sun May 29 11:46:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@zippy.davemloft.net", "time": "Tue May 31 15:14:31 2011 -0700" }, "message": "drivers/net: ks8842 Fix crash on received packet when in PIO mode.\n\nThis patch fixes a driver crash during packet reception due to not enough\nbytes allocated in the skb. Since the loop reads out 4 bytes at a time, we\nneed to allow for up to 3 bytes of slack space.\n\nSigned-off-by: Dennis Aberilla \u003cdenzzzhome@yahoo.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@zippy.davemloft.net\u003e\n" }, { "commit": "1144181c1bc054dc5e001a6f10b4820167e6c883", "tree": "bdd36e2b480c594c11451d9bc7c8d03d47c93b20", "parents": [ "59342f6a6bc35df623fb44784daa5e1077063b8f" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Mon May 30 09:32:52 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:51:53 2011 -0400" }, "message": "iwlagn: fix incorrect PCI subsystem id for 6150 devices\n\nFor 6150 devices, modify the supported PCI subsystem ID.\n\nCc: stable@kernel.org\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "59342f6a6bc35df623fb44784daa5e1077063b8f", "tree": "612d3ec8c09d18fb0a97f841a535de8b25e46ada", "parents": [ "66870b1ccd5c1460e437c18b0026e2dcaab1ece9" ], "author": { "name": "Jussi Kivilinna", "email": "jussi.kivilinna@mbnet.fi", "time": "Mon May 30 10:15:47 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:26 2011 -0400" }, "message": "zd1211rw: fix to work on OHCI\n\nzd1211 devices register \u0027EP 4 OUT\u0027 endpoint as Interrupt type on USB 2.0:\n\n Endpoint Descriptor:\n bLength 7\n bDescriptorType 5\n bEndpointAddress 0x04 EP 4 OUT\n bmAttributes 3\n Transfer Type Interrupt\n Synch Type None\n Usage Type Data\n wMaxPacketSize 0x0040 1x 64 bytes\n bInterval 1\n\nHowever on USB 1.1 endpoint becomes Bulk:\n\n Endpoint Descriptor:\n bLength 7\n bDescriptorType 5\n bEndpointAddress 0x04 EP 4 OUT\n bmAttributes 2\n Transfer Type Bulk\n Synch Type None\n Usage Type Data\n wMaxPacketSize 0x0040 1x 64 bytes\n bInterval 0\n\nCommit 37939810b937aba830dd751291fcdc51cae1a6cb assumed that endpoint is\nalways interrupt type and changed usb_bulk_msg() calls to usb_interrupt_msg().\n\nProblem here is that usb_bulk_msg() on interrupt endpoint selfcorrects the\ncall and changes requested pipe to interrupt type (see usb_bulk_msg).\nHowever with usb_interrupt_msg() on bulk endpoint does not correct the\npipe type to bulk, but instead URB is submitted with interrupt type pipe.\n\nSo pre-2.6.39 used usb_bulk_msg() and therefore worked with both endpoint\ntypes, however in 2.6.39 usb_interrupt_msg() with bulk endpoint causes\nohci_hcd to fail submitted URB instantly with -ENOSPC and preventing zd1211rw\nfrom working with OHCI.\n\nFix this by detecting endpoint type and using correct endpoint/pipe types\nfor URB. Also fix asynchronous zd_usb_iowrite16v_async() to use right\nURB type on \u0027EP 4 OUT\u0027.\n\nCc: stable@kernel.org\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "66870b1ccd5c1460e437c18b0026e2dcaab1ece9", "tree": "0067c12e2014b4e4aa58ca6204236618515b3d79", "parents": [ "50a66d7f04adbfab9db55144c58dc693358cb635" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:48 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:26 2011 -0400" }, "message": "wl12xx: fix oops in sched_scan when forcing a passive scan\n\nFix kernel oops when trying to use passive scheduled scans. The\nreason was that in passive scans there are no SSIDs, so there was a\nNULL pointer dereference.\n\nTo solve the problem, we now check the number of SSIDs provided in the\nsched_scan request and only access the list if there\u0027s one or more\n(ie. passive scan is not forced). We also force all the channels to\nbe passive by adding the IEEE80211_CHAN_PASSIVE_SCAN flag locally\nbefore the checks in the wl1271_scan_get_sched_scan_channels()\nfunction.\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "50a66d7f04adbfab9db55144c58dc693358cb635", "tree": "5b332a377b92a58991666a57fbaa274d15a7797b", "parents": [ "2497a246e880d1fb537f754f551177c01fa39242" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:47 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:25 2011 -0400" }, "message": "wl12xx: add separate config value for DFS dwell time on sched scan\n\nUse a different value for DFS dwell time when performing a scheduled\nscan. Previously we were using the same value as for normal passive\nscans. This adds some flexibility between these two different types\nof passive scan.\n\nFor now we use 150 TUs for DFS channel dwell time. This may need to\nbe fine-tuned in the future.\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2497a246e880d1fb537f754f551177c01fa39242", "tree": "530cd6f0533ae65ec3336e3b85e7f94f051d54d7", "parents": [ "dd08682150e1815fe5cdd0673a2f2e9cd2d55a7a" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:46 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:25 2011 -0400" }, "message": "wl12xx: fix DFS channels handling in scheduled scan\n\nDFS channels were never getting included in the scheduled scans,\nbecause they always contain the passive flag as well and the call was\nasking for DFS and active channels.\n\nFix this by ignoring the passive flag when collecting DFS channels.\nAlso, move the DFS channels in the channel list before the 5GHz active\nchannels (this was implemented in the FW differently than specified).\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "dd08682150e1815fe5cdd0673a2f2e9cd2d55a7a", "tree": "3c52564a8c92cb75c0b9fa49a91809412c1bdaeb", "parents": [ "71005be40a7fc95edda3cc462361ce0243e4f5fa" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:45 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:24 2011 -0400" }, "message": "wl12xx: fix passive and radar channel generation for scheduled scan\n\nWe were comparing bitwise AND results with a boolean, so when the\nboolean was set to true, it was not matching as it should.\n\nFix this by booleanizing the bitwise AND results with !!.\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "71005be40a7fc95edda3cc462361ce0243e4f5fa", "tree": "d2787b9d02c8a77cffa1028e079856b7fbae50cd", "parents": [ "11ad2f52826ac6d58d6780d3d8a3e098c88d9142" ], "author": { "name": "Daniel Drake", "email": "dsd@laptop.org", "time": "Thu May 26 21:31:08 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:23 2011 -0400" }, "message": "libertas: Set command sequence number later to ensure consistency\n\nBefore this patch, the command sequence number is being set before\nlbs_queue_cmd() adds the command to the queue. However, lbs_queue_cmd()\nsometimes forces commands to queue-jump (e.g. CMD_802_11_WAKEUP_CONFIRM).\nIt currently does this without considering that sequence numbers might need\nadjusting to keep things running in order.\n\nFix this by setting the sequence number at a later stage, just before\nwe\u0027re actually submitting the command to the hardware. Also fixes a\npossible race where seqnum was being modified outside of the driver\nlock.\n\nSigned-off-by: Daniel Drake \u003cdsd@laptop.org\u003e\nAcked-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7a66f784375c5922315bbe879b789ee50b924d26", "tree": "66585f94de392dedff6bf5f5d057490e68b1cfa7", "parents": [ "7ab358c23cbf15cea08129cd722d1ce77433a94d" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:11:23 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:16 2011 +0930" }, "message": "virtio_net: delay TX callbacks\n\nAsk for delayed callbacks on TX ring full, to give the\nother side more of a chance to make progress.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "29a6ccca3869bbe33879dae0cd7df2a1559eff54", "tree": "2d9d355d8662ede95af7bc812d686dc4d5f37ff3", "parents": [ "426048313dfa7d65dbd2379b1665755511f9544f", "6a8a98b22b10f1560d5f90aded4a54234b9b2724" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 20:06:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 20:06:53 2011 -0700" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (97 commits)\n mtd: kill CONFIG_MTD_PARTITIONS\n mtd: remove add_mtd_partitions, add_mtd_device and friends\n mtd: convert remaining users to mtd_device_register()\n mtd: samsung onenand: convert to mtd_device_register()\n mtd: omap2 onenand: convert to mtd_device_register()\n mtd: txx9ndfmc: convert to mtd_device_register()\n mtd: tmio_nand: convert to mtd_device_register()\n mtd: socrates_nand: convert to mtd_device_register()\n mtd: sharpsl: convert to mtd_device_register()\n mtd: s3c2410 nand: convert to mtd_device_register()\n mtd: ppchameleonevb: convert to mtd_device_register()\n mtd: orion_nand: convert to mtd_device_register()\n mtd: omap2: convert to mtd_device_register()\n mtd: nomadik_nand: convert to mtd_device_register()\n mtd: ndfc: convert to mtd_device_register()\n mtd: mxc_nand: convert to mtd_device_register()\n mtd: mpc5121_nfc: convert to mtd_device_register()\n mtd: jz4740_nand: convert to mtd_device_register()\n mtd: h1910: convert to mtd_device_register()\n mtd: fsmc_nand: convert to mtd_device_register()\n ...\n\nFixed up trivial conflicts in\n - drivers/mtd/maps/integrator-flash.c: removed in ARM tree\n - drivers/mtd/maps/physmap.c: addition of afs partition probe type\n clashing with removal of CONFIG_MTD_PARTITIONS\n" }, { "commit": "11ad2f52826ac6d58d6780d3d8a3e098c88d9142", "tree": "92206a4063520aa749f0086f5addb9889f6d6b6f", "parents": [ "c5c177b4aca83338781e72be2e6dd1601c560cb3", "1df85ecec36ad5da3f0165760704310d6c03f65f" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri May 27 15:18:35 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri May 27 15:18:35 2011 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n" }, { "commit": "10799db60cbc4f990dd69eb49883477095c66af7", "tree": "b87ac6acaa48f4f59f5d6a0b11490105876952e1", "parents": [ "aaab184276a6e20834f63735d433f94ef52a0497", "c5c177b4aca83338781e72be2e6dd1601c560cb3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 11:16:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 11:16:27 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n net: Kill ratelimit.h dependency in linux/net.h\n net: Add linux/sysctl.h includes where needed.\n net: Kill ether_table[] declaration.\n inetpeer: fix race in unused_list manipulations\n atm: expose ATM device index in sysfs\n IPVS: bug in ip_vs_ftp, same list heaad used in all netns.\n bug.h: Move ratelimit warn interfaces to ratelimit.h\n bonding: cleanup module option descriptions\n net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.\n net: davinci_emac: fix dev_err use at probe\n can: convert to %pK for kptr_restrict support\n net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags\n netfilter: Fix several warnings in compat_mtw_from_user().\n netfilter: ipset: fix ip_set_flush return code\n netfilter: ipset: remove unused variable from type_pf_tdel()\n netfilter: ipset: Use proper timeout value to jiffies conversion\n" }, { "commit": "1df85ecec36ad5da3f0165760704310d6c03f65f", "tree": "14a43d663ef9aff20d9ecb2f0f439c96b1be443d", "parents": [ "64c754ed3b0009e4fa248f739000dc234eb0d2c9" ], "author": { "name": "Adrian Chadd", "email": "adrian.chadd@gmail.com", "time": "Fri May 27 01:08:04 2011 +0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri May 27 12:53:48 2011 -0400" }, "message": "ath9k: Fix AR9287 calibration\n\nThe AR9287 calibration code was not being called because of an\nincorrect MAC revision check.\nThis forced the AR9287 to use the AR9285 initial calibration code and\nbypass the AR9287 code entirely.\n\nSigned-off-by: Adrian Chadd \u003cadrian@freebsd.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "64bd0821a3b66c3307d7a4ee5523e3e35ec2df0e", "tree": "934698582652f49027aad65889941cfc48ff9395", "parents": [ "aac11c1b351413aa3412e258e2b2dcba31777209" ], "author": { "name": "Tao Ma", "email": "boyu.mt@taobao.com", "time": "Wed May 25 09:44:05 2011 +0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri May 27 12:53:46 2011 -0400" }, "message": "wireless: Default to \u0027n\u0027 for 2 new added devices in Kconfig.\n\nWe make oldconfig every time when a new kernel arrives, but\nif we don\u0027t have such a device(I guess this is the most common\ncase for a new device), the default value should be \u0027n\u0027 so\nthat the kernel size we build doesn\u0027t grow up too much quickly.\nFor anyone who has the device, it is OK for them to turn it on\nby themselves.\n\nCc: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Tao Ma \u003cboyu.mt@taobao.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "aac11c1b351413aa3412e258e2b2dcba31777209", "tree": "65e29fad6f5ab5211ffa7e3583a25a5d05ce2ad5", "parents": [ "1d38c16ce4156f63b45abbd09dd28ca2ef5172b4" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Tue May 24 16:28:55 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri May 27 12:53:45 2011 -0400" }, "message": "iwl4965: fix 5GHz operation\n\nrx_status.band is used uninitialized, what disallow to work on 5GHz .\n\nCc: stable@kernel.org # 2.6.39+\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b7c2f036284452627d793af981877817b37d4351", "tree": "c96bbf7558512b27f4802994c9271ccd0f1c19f3", "parents": [ "14587a2a25447813996e6fb9e48d48627cb75a5d", "8d2c50e3b65c8d48d51088f541c13fde46cc8133" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 13:19:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 13:19:00 2011 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:\n gfs2: Drop __TIME__ usage\n isdn/diva: Drop __TIME__ usage\n atm: Drop __TIME__ usage\n dlm: Drop __TIME__ usage\n wan/pc300: Drop __TIME__ usage\n parport: Drop __TIME__ usage\n hdlcdrv: Drop __TIME__ usage\n baycom: Drop __TIME__ usage\n pmcraid: Drop __DATE__ usage\n edac: Drop __DATE__ usage\n rio: Drop __DATE__ usage\n scsi/wd33c93: Drop __TIME__ usage\n scsi/in2000: Drop __TIME__ usage\n aacraid: Drop __TIME__ usage\n media/cx231xx: Drop __TIME__ usage\n media/radio-maxiradio: Drop __TIME__ usage\n nozomi: Drop __TIME__ usage\n cyclades: Drop __TIME__ usage\n" }, { "commit": "41e2b05b9598d6bdf91fc20280bfc538d853f769", "tree": "b36b2bdb2e762469ba43e49ebf9f80d4c2b18954", "parents": [ "51ac8cbb2176dc159ee910d7074c6796079c3068" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanoharan@atheros.com", "time": "Fri May 20 17:52:14 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 26 15:43:32 2011 -0400" }, "message": "ath9k: set 40 Mhz rate only if hw is configured in ht40\n\nWhenever there is a channel width change from 40 Mhz to 20 Mhz,\nthe hardware is reconfigured to ht20. Meantime before doing\nthe rate control updation, the packets are being transmitted are\nselected rate with IEEE80211_TX_RC_40_MHZ_WIDTH.\n\nWhile transmitting ht40 rate packets in ht20 mode is causing\nbaseband panic with AR9003 based chips.\n\n\u003d\u003d\u003d\u003d BB update: BB status\u003d0x02001109 \u003d\u003d\u003d\u003d\nath: ** BB state: wd\u003d1 det\u003d1 rdar\u003d0 rOFDM\u003d1 rCCK\u003d1 tOFDM\u003d0 tCCK\u003d0 agc\u003d2\nsrc\u003d0 **\nath: ** BB WD cntl: cntl1\u003d0xffff0085 cntl2\u003d0x00000004 **\nath: ** BB mode: BB_gen_controls\u003d0x000033c0 **\nath: ** BB busy times: rx_clear\u003d99%, rx_frame\u003d0%, tx_frame\u003d0% **\nath: \u003d\u003d\u003d\u003d BB update: done \u003d\u003d\u003d\u003d\n\nCc: stable@kernel.org\nSigned-off-by: Rajkumar Manoharan \u003crmanoharan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "51ac8cbb2176dc159ee910d7074c6796079c3068", "tree": "bddc3904e1f35f9cf4c5e774bb54891f8773f461", "parents": [ "a4d86d953b8593791cb29cf2acffd48f9ee6c4f9" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanoharan@atheros.com", "time": "Fri May 20 17:52:13 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 26 15:43:31 2011 -0400" }, "message": "ath9k_hw: disable phy restart on baseband panic caused by RXSM\n\nWhile receiving unsupported rate frame rx state machine\ngets into a state 0xb and if phy_restart happens in that\nstate, BB would go hang. If RXSM is in 0xb state after\nfirst bb panic, ensure to disable the phy_restart.\n\nSigned-off-by: Rajkumar Manoharan \u003crmanoharan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a4d86d953b8593791cb29cf2acffd48f9ee6c4f9", "tree": "8bc19110584b2b55f7dc22e36a754dd7694c7b6d", "parents": [ "fb23d86382a088d50020fd05024d40af5b00f885" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanoharan@atheros.com", "time": "Fri May 20 17:52:10 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 26 15:43:31 2011 -0400" }, "message": "ath9k: Reset chip on baseband hang\n\nResetting hardware helps to recover from baseband\nhang/panic for AR9003 based chips.\n\nCc: stable@kernel.org\nSigned-off-by: Rajkumar Manoharan \u003crmanoharan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fb23d86382a088d50020fd05024d40af5b00f885", "tree": "2afbfeee653714d38169478cec133d3dbfe6aa6e", "parents": [ "0019a2c9277bf6d083032a5a9857249e75407a8c" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Fri May 20 01:04:46 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 26 15:43:30 2011 -0400" }, "message": "b43: N-PHY: initialize last var in calibration function\n\nReported-by: Larry Finger \u003clarry.finger@lwfinger.net\u003e\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0019a2c9277bf6d083032a5a9857249e75407a8c", "tree": "6388a7f514503194871f18319ed24e795e845126", "parents": [ "a9e12869758430424804dd4332e0d2afdfdf00b0" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Thu May 19 11:48:45 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 26 15:43:30 2011 -0400" }, "message": "rtlwifi: Use order 2 RX buffer allocation only if necessary\n\nAlthough a previous fix handles the kernel panics that result from\nfailure to allocate a new RX buffer, memory fragmentation can be\nreduced if the amsdu_8k capability is disabled as new buffers need only\nbe of O(0), not O(2).\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a9e12869758430424804dd4332e0d2afdfdf00b0", "tree": "d56f68c680cec8c376017c66bbe5851f25218252", "parents": [ "208c72f4fe44fe09577e7975ba0e7fa0278f3d03" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Thu May 19 10:17:04 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 26 15:43:29 2011 -0400" }, "message": "rtlwifi: Fix kernel panic resulting from RX buffer allocation failure\n\nTo handle amsdu_8k capability, the PCI routine of this driver must\nallocate receive buffers of order 2. Under heavy load, this causes\nfragmentation of memory. The present code releases the current buffer\nbefore checking to see if a new one is availble. Recovery from\nallocation failures is not possible, which results in kernel panics.\n\nThe fix is to reorder the code to check that a new buffer can be\nallocated before the old one is released. If not possible, the\nreceived frame is dropped and the old one is reused. Without this\nchange, it is impossible to transfer a 2 GB file without a kernel panic.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e [2.6.{37,38,39}]\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "21bc7af6e5e684b44725b20f679e701e38ceef15", "tree": "16a5b3ee99db65df8ed01affac7614e29b162918", "parents": [ "daf8cf608d57a0b9f22276036e420cc82cf6ab4f" ], "author": { "name": "Yogesh Ashok Powar", "email": "yogeshp@marvell.com", "time": "Wed May 18 12:02:03 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu May 26 15:43:27 2011 -0400" }, "message": "mwifiex: correct event header length\n\nWhile decoding received event packet from firmware, 4 bytes\nof interface header are already removed unconditionally.\nSo for handling event only 4 more bytes needs to be pulled.\nThis is achieved by changing event header length to 4.\n\nAlmost all the events, except BA stream related and AMSDU\naggregation control events, do not have the payload in their\nevent skb. Such events handling depends only on the event ID.\nThis event ID is the first four bytes of the event skb, which\nis copied to a separate variable before pulling the skb header.\nHence event handling worked only for those events that didn\u0027t\nhave payload in event skb.\n\nThis patch fixes the broken event path of the events with\npayload in their event skb without harming existing working\nevent path for the events without payload.\n\nSigned-off-by: Yogesh Ashok Powar \u003cyogeshp@marvell.com\u003e\nSigned-off-by: Kiran Divekar \u003cdkiran@marvell.com\u003e\nSigned-off-by: Bing Zhao \u003cbzhao@marvell.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "90e62474fd08e16ba5309886c801243b0eb782f3", "tree": "6a505ffdf7cd599e85100e03a472038b82583242", "parents": [ "da7c06c4a773b7903d3c09a25edbcb20bdc4af22" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Wed May 25 04:41:59 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 26 14:57:17 2011 -0400" }, "message": "bonding: cleanup module option descriptions\n\nWeiping Pan noticed that the module option description for\nxmit_hash_policy was incorrect and was nice enough to post a patch to\nfix it. The text was correct, but created a line over 80 characters and\nI would rather not add those. I realized I could take a few minutes and\nclean up all the descriptions and things would look much better. This\nis the result.\n\nBased on patch from Weiping Pan \u003cpanweiping3@gmail.com\u003e.\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCC: Weiping Pan \u003cpanweiping3@gmail.com\u003e\nReviewed-by: Weiping Pan \u003cpanweiping3@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "240b26284ac84f06ed0bc89c363f022e21b84b98", "tree": "c2dba9d29f5f9322093edb5b98f5cf881fc62f76", "parents": [ "12e6c419b48c4d1803918e5d952ebee07bae7465" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Thu May 26 04:37:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 26 14:30:51 2011 -0400" }, "message": "net: davinci_emac: fix dev_err use at probe\n\nUse platform device rather than net device in dev_err calls before net\ndevice has been registered to avoid messages such as\n\n\t(null): DaVinci EMAC: Failed to get EMAC clock\n\nAlso replace remaining printks in probe with dev_{err,warn}.\n\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d", "tree": "5440763147e844a5e5f83926fe717bef3b7d6fee", "parents": [ "c8a03c96b61bd03a3603bfe5381848c0b40e99be" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Apr 06 16:02:25 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu May 26 19:45:08 2011 +0200" }, "message": "mfd: Use mfd cell platform_data for janz cells platform bits\n\nWith the addition of a platform device mfd_cell pointer, MFD drivers\ncan go back to passing platform data back to their sub drivers.\nThis allows for an mfd_cell-\u003emfd_data removal and thus keep the\nsub drivers MFD agnostic. This is mostly needed for non MFD aware\nsub drivers.\n\nCc: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "3271d382c3ffe61ef3d059ef47e635dbe031030e", "tree": "2612b0030f0fd85ffe7722cbf195ac061a3eaf76", "parents": [ "7dc00a0d14992d0083fefccad7839ac837ea55bc" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Apr 08 01:23:57 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Thu May 26 19:45:05 2011 +0200" }, "message": "mfd: Use mfd cell platform_data for timberdale cells platform bits\n\nWith the addition of a device platform mfd_cell pointer, MFD drivers\ncan go back to passing platform data back to their sub drivers.\nThis allows for an mfd_cell-\u003emfd_data removal and thus keep the\nsub drivers MFD agnostic. This is mostly needed for non MFD aware\nsub drivers.\n\nAcked-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "772e289862e111ce6b4d387e65cd5b7a8b618705", "tree": "8f503aa00acb0782e50496082f1bfe950c5c53d3", "parents": [ "f1a7ee977df9f5c0f18449a9280d62ba04daed0c" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Fri Apr 01 12:41:20 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Thu May 26 09:44:43 2011 +0200" }, "message": "wan/pc300: Drop __TIME__ usage\n\nThe kernel already prints its build timestamp during boot, no need to\nrepeat it in random drivers and produce different object files each\ntime.\n\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "3f5785ec31adcb7cafa9135087297a38d9698cf8", "tree": "b7d06f14e1aea0292a88c4bc0305ea602f6ebd33", "parents": [ "8c1c77ff9be27137fa7cbbf51efedef1a2ae915b", "94265cf5f731c7df29fdfde262ca3e6d51e6828c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 17:00:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 17:00:17 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)\n bonding: documentation and code cleanup for resend_igmp\n bonding: prevent deadlock on slave store with alb mode (v3)\n net: hold rtnl again in dump callbacks\n Add Fujitsu 1000base-SX PCI ID to tg3\n bnx2x: protect sequence increment with mutex\n sch_sfq: fix peek() implementation\n isdn: netjet - blacklist Digium TDM400P\n via-velocity: don\u0027t annotate MAC registers as packed\n xen: netfront: hold RTNL when updating features.\n sctp: fix memory leak of the ASCONF queue when free asoc\n net: make dev_disable_lro use physical device if passed a vlan dev (v2)\n net: move is_vlan_dev into public header file (v2)\n bug.h: Fix build with CONFIG_PRINTK disabled.\n wireless: fix fatal kernel-doc error + warning in mac80211.h\n wireless: fix cfg80211.h new kernel-doc warnings\n iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled\n dst: catch uninitialized metrics\n be2net: hash key for rss-config cmd not set\n bridge: initialize fake_rtable metrics\n net: fix __dst_destroy_metrics_generic()\n ...\n\nFix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c\n" }, { "commit": "0798b1dbfbd9ff2a370c5968c5f0621ef0075fe0", "tree": "c7f61ab9683786a070da0933b9981fc74a4d865f", "parents": [ "ad363e0916423b2e6cdfcdc30ae707ec709f0a65", "6738d3210aabe3016a1b03cd98a7fc479c229197" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 15:35:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 15:35:32 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (26 commits)\n arch/tile: prefer \"tilepro\" as the name of the 32-bit architecture\n compat: include aio_abi.h for aio_context_t\n arch/tile: cleanups for tilegx compat mode\n arch/tile: allocate PCI IRQs later in boot\n arch/tile: support signal \"exception-trace\" hook\n arch/tile: use better definitions of xchg() and cmpxchg()\n include/linux/compat.h: coding-style fixes\n tile: add an RTC driver for the Tilera hypervisor\n arch/tile: finish enabling support for TILE-Gx 64-bit chip\n compat: fixes to allow working with tile arch\n arch/tile: update defconfig file to something more useful\n tile: do_hardwall_trap: do not play with task-\u003esighand\n tile: replace mm-\u003ecpu_vm_mask with mm_cpumask()\n tile,mn10300: add device parameter to dma_cache_sync()\n audit: support the \"standard\" \u003casm-generic/unistd.h\u003e\n arch/tile: clarify flush_buffer()/finv_buffer() function names\n arch/tile: kernel-related cleanups from removing static page size\n arch/tile: various header improvements for building drivers\n arch/tile: disable GX prefetcher during cache flush\n arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD\n ...\n" }, { "commit": "94265cf5f731c7df29fdfde262ca3e6d51e6828c", "tree": "e19d43a5e8b19a220a4258a5a9f30d63ffc4bf55", "parents": [ "9fe0617d9b6d21f700ee9e658e1c9fe3be2fb402" ], "author": { "name": "Flavio Leitner", "email": "fbl@redhat.com", "time": "Wed May 25 08:38:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 17:55:33 2011 -0400" }, "message": "bonding: documentation and code cleanup for resend_igmp\n\nImproves the documentation about how IGMP resend parameter\nworks, fix two missing checks and coding style issues.\n\nSigned-off-by: Flavio Leitner \u003cfbl@redhat.com\u003e\nAcked-by: Rick Jones \u003crick.jones2@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9fe0617d9b6d21f700ee9e658e1c9fe3be2fb402", "tree": "d1e3c425be5697479514792e8183fc1c9c6a32c4", "parents": [ "2907c35ff64708065e5a7fd54e8ded8263eb3074" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Wed May 25 08:13:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 17:55:33 2011 -0400" }, "message": "bonding: prevent deadlock on slave store with alb mode (v3)\n\nThis soft lockup was recently reported:\n\n[root@dell-per715-01 ~]# echo +bond5 \u003e /sys/class/net/bonding_masters\n[root@dell-per715-01 ~]# echo +eth1 \u003e /sys/class/net/bond5/bonding/slaves\nbonding: bond5: doing slave updates when interface is down.\nbonding bond5: master_dev is not up in bond_enslave\n[root@dell-per715-01 ~]# echo -eth1 \u003e /sys/class/net/bond5/bonding/slaves\nbonding: bond5: doing slave updates when interface is down.\n\nBUG: soft lockup - CPU#12 stuck for 60s! [bash:6444]\nCPU 12:\nModules linked in: bonding autofs4 hidp rfcomm l2cap bluetooth lockd sunrpc\nbe2d\nPid: 6444, comm: bash Not tainted 2.6.18-262.el5 #1\nRIP: 0010:[\u003cffffffff80064bf0\u003e] [\u003cffffffff80064bf0\u003e]\n.text.lock.spinlock+0x26/00\nRSP: 0018:ffff810113167da8 EFLAGS: 00000286\nRAX: ffff810113167fd8 RBX: ffff810123a47800 RCX: 0000000000ff1025\nRDX: 0000000000000000 RSI: ffff810123a47800 RDI: ffff81021b57f6f8\nRBP: ffff81021b57f500 R08: 0000000000000000 R09: 000000000000000c\nR10: 00000000ffffffff R11: ffff81011d41c000 R12: ffff81021b57f000\nR13: 0000000000000000 R14: 0000000000000282 R15: 0000000000000282\nFS: 00002b3b41ef3f50(0000) GS:ffff810123b27940(0000) knlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\nCR2: 00002b3b456dd000 CR3: 000000031fc60000 CR4: 00000000000006e0\n\nCall Trace:\n [\u003cffffffff80064af9\u003e] _spin_lock_bh+0x9/0x14\n [\u003cffffffff886937d7\u003e] :bonding:tlb_clear_slave+0x22/0xa1\n [\u003cffffffff8869423c\u003e] :bonding:bond_alb_deinit_slave+0xba/0xf0\n [\u003cffffffff8868dda6\u003e] :bonding:bond_release+0x1b4/0x450\n [\u003cffffffff8006457b\u003e] __down_write_nested+0x12/0x92\n [\u003cffffffff88696ae4\u003e] :bonding:bonding_store_slaves+0x25c/0x2f7\n [\u003cffffffff801106f7\u003e] sysfs_write_file+0xb9/0xe8\n [\u003cffffffff80016b87\u003e] vfs_write+0xce/0x174\n [\u003cffffffff80017450\u003e] sys_write+0x45/0x6e\n [\u003cffffffff8005d28d\u003e] tracesys+0xd5/0xe0\n\nIt occurs because we are able to change the slave configuarion of a bond while\nthe bond interface is down. The bonding driver initializes some data structures\nonly after its ndo_open routine is called. Among them is the initalization of\nthe alb tx and rx hash locks. So if we add or remove a slave without first\nopening the bond master device, we run the risk of trying to lock/unlock a\nspinlock that has garbage for data in it, which results in our above softlock.\n\nNote that sometimes this works, because in many cases an unlocked spinlock has\nthe raw_lock parameter initialized to zero (meaning that the kzalloc of the\nnet_device private data is equivalent to calling spin_lock_init), but thats not\ntrue in all cases, and we aren\u0027t guaranteed that condition, so we need to pass\nthe relevant spinlocks through the spin_lock_init function.\n\nFix it by moving the spin_lock_init calls for the tx and rx hashtable locks to\nthe ndo_init path, so they are ready for use by the bond_store_slaves path.\n\nChange notes:\nv2) Based on conversation with Jay and Nicolas it seems that the ability to\nenslave devices while the bond master is down should be safe to do. As such\nthis is an outlier bug, and so instead we\u0027ll just initalize the errant spinlocks\nin the init path rather than the open path, solving the problem. We\u0027ll also\nremove the warnings about the bond being down during enslave operations, since\nit should be safe\n\nv3) Fix spelling error\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: jtluka@redhat.com\nCC: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nCC: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCC: nicolas.2p.debian@gmail.com\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1dcb14d9e874d12bab9ceeba776b742f1682b0a6", "tree": "ae18b7092f4d65d2552ebfae8dbeee2a4b519c73", "parents": [ "a5971d43ef76f4b73c58e2d893de9db487388c87" ], "author": { "name": "Meelis Roos", "email": "mroos@ut.ee", "time": "Wed May 25 05:43:47 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 17:55:32 2011 -0400" }, "message": "Add Fujitsu 1000base-SX PCI ID to tg3\n\nThis patch adds the PCI ID of Fujitsu 1000base-SX NIC to tg3 driver.\nTested to detect the card, MAC and serdes, not tested with link at the\nmoment since I have no fiber switch here. I did not add new constants to\nthe pci_ids.h header file since these constants are used only here.\n\nSigned-off-by: Meelis Roos \u003cmroos@linux.ee\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a5971d43ef76f4b73c58e2d893de9db487388c87", "tree": "93d92dbc2faf62d52f841b197124085693c33d34", "parents": [ "07bd8df5df4369487812bf85a237322ff3569b77" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Wed May 25 04:55:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 17:55:32 2011 -0400" }, "message": "bnx2x: protect sequence increment with mutex\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d10358de8d70aaeb965a974d56e9b72f6c6dbb3a", "tree": "aab8f6c7a38cf1228866ea844aea44e4e823fd36", "parents": [ "1ba37c518f8f83094209396c65a72732b2c1df3b" ], "author": { "name": "Ulrich Hecht", "email": "uli@suse.de", "time": "Wed May 25 01:07:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 17:55:32 2011 -0400" }, "message": "via-velocity: don\u0027t annotate MAC registers as packed\n\nOn ARM, memory accesses through packed pointers behave in unexpected\nways in GCC releases 4.3 and higher; see https://lkml.org/lkml/2011/2/2/163\nfor discussion.\n\nIn this particular case, 32-bit I/O registers are accessed bytewise,\ncausing incorrect setting of the DMA address registers which in turn\nleads to an error interrupt storm that brings the system to a halt.\n\nSince the mac_regs structure does not need any packing anyway, this patch\nsimply removes the attribute to fix the issue.\n\nSigned-off-by: Ulrich Hecht \u003culi@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ba37c518f8f83094209396c65a72732b2c1df3b", "tree": "2e558ca6fd7a40d4cf6ca427469ede215cc742ee", "parents": [ "8b4472cc13136d04727e399c6fdadf58d2218b0a" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Tue May 24 21:56:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 17:55:32 2011 -0400" }, "message": "xen: netfront: hold RTNL when updating features.\n\nKonrad reports:\n[ 0.930811] RTNL: assertion failed at /home/konrad/ssd/linux/net/core/dev.c (5258)\n[ 0.930821] Pid: 22, comm: xenwatch Not tainted 2.6.39-05193-gd762f43 #1\n[ 0.930825] Call Trace:\n[ 0.930834] [\u003cffffffff8143bd0e\u003e] __netdev_update_features+0xae/0xe0\n[ 0.930840] [\u003cffffffff8143dd41\u003e] netdev_update_features+0x11/0x30\n[ 0.930847] [\u003cffffffffa0037105\u003e] netback_changed+0x4e5/0x800 [xen_netfront]\n[ 0.930854] [\u003cffffffff8132a838\u003e] xenbus_otherend_changed+0xa8/0xb0\n[ 0.930860] [\u003cffffffff8157ca99\u003e] ? _raw_spin_unlock_irqrestore+0x19/0x20\n[ 0.930866] [\u003cffffffff8132adfe\u003e] backend_changed+0xe/0x10\n[ 0.930871] [\u003cffffffff8132875a\u003e] xenwatch_thread+0xba/0x180\n[ 0.930876] [\u003cffffffff810a8ba0\u003e] ? wake_up_bit+0x40/0x40\n[ 0.930881] [\u003cffffffff813286a0\u003e] ? split+0xf0/0xf0\n[ 0.930886] [\u003cffffffff810a8646\u003e] kthread+0x96/0xa0\n[ 0.930891] [\u003cffffffff815855a4\u003e] kernel_thread_helper+0x4/0x10\n[ 0.930896] [\u003cffffffff815846b3\u003e] ? int_ret_from_sys_call+0x7/0x1b\n[ 0.930901] [\u003cffffffff8157cf61\u003e] ? retint_restore_args+0x5/0x6\n[ 0.930906] [\u003cffffffff815855a0\u003e] ? gs_change+0x13/0x13\n\nThis update happens in xenbus watch callback context and hence does not already\nhold the rtnl. Take the lock as necessary.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nTested-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22e95ac87d62bdc65b8a694a23cd4a364689b013", "tree": "5ac900300ad1d4a8d8118545e3e971862de70ea4", "parents": [ "6b3678354647a653e669746c05765f05d2b90239", "31ec97d9cebac804814de298592648f7c18d8281" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 13:28:55 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 25 13:28:55 2011 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "22e12bbc9bc38c6d0bd541d061a0f547596fc19d", "tree": "39b93f43b482c5b4cb9d99933384a8a7fcb85d71", "parents": [ "19426a8f810752b4218e59b1e2187f33e255f7bc", "86ff9baadf16c8a1b452d72f5585be63457d9b15" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:59:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:59:42 2011 -0700" }, "message": "Merge branch \u0027timers-ptp-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-ptp-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n ptp: Fix dp83640 build warning when building statically\n ptp: Added a clock driver for the National Semiconductor PHYTER.\n ptp: Added a clock driver for the IXP46x.\n ptp: Added a clock that uses the eTSEC found on the MPC85xx.\n ptp: Added a brand new class driver for ptp clocks.\n" }, { "commit": "7bf02ea22c6cdd09e2d3f1d3c3fe366b834ae9af", "tree": "c1c8aa415910e0f0deea1181759ddd2b5d6067fb", "parents": [ "851cc856d73d1185243c149ed0c0839df8a1b2fe" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Tue May 24 17:11:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:03 2011 -0700" }, "message": "arch, mm: filter disallowed nodes from arch specific show_mem functions\n\nArchitectures that implement their own show_mem() function did not pass\nthe filter argument to show_free_areas() to appropriately avoid emitting\nthe state of nodes that are disallowed in the current context. This patch\nnow passes the filter argument to show_free_areas() so those nodes are now\navoided.\n\nThis patch also removes the show_free_areas() wrapper around\n__show_free_areas() and converts existing callers to pass an empty filter.\n\nia64 emits additional information for each node, so skip_free_areas_zone()\nmust be made global to filter disallowed nodes and it is converted to use\na nid argument rather than a zone for this use case.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: James Bottomley \u003cjejb@parisc-linux.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b953ff2238661cd95513a8f2837197c6f77a642f", "tree": "6be443648f8f0d7f63c3ebfa89f97156195b0108", "parents": [ "c1afba3c6ce35a0956b008825dd49b07c8ee8362" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Fri Apr 01 12:41:20 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Wed May 25 17:21:33 2011 +0200" }, "message": "hdlcdrv: Drop __TIME__ usage\n\nThe kernel already prints its build timestamp during boot, no need to\nrepeat it in random drivers and produce different object files each\ntime.\n\nAcked-by: Thomas Sailer \u003ct.sailer@alumni.ethz.ch\u003e\nCc: linux-hams@vger.kernel.org\nCc: netdev@vger.kernel.org\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "c1afba3c6ce35a0956b008825dd49b07c8ee8362", "tree": "e33bb51ca0c58378f3dfe54a377157343aa5da10", "parents": [ "a1b666657c3a691c4f8a0025905e88e8b4baa360" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Fri Apr 01 12:41:20 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Wed May 25 17:21:03 2011 +0200" }, "message": "baycom: Drop __TIME__ usage\n\nThe kernel already prints its build timestamp during boot, no need to\nrepeat it in random drivers and produce different object files each\ntime.\n\nAcked-by: Thomas Sailer \u003ct.sailer@alumni.ethz.ch\u003e\nCc: linux-hams@vger.kernel.org\nCc: netdev@vger.kernel.org\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "ee0e87b174bb41f0310cf089262bf5dd8f95a212", "tree": "444b7eb1cc1a807561889a4cffe15fde11761645", "parents": [ "6b57c11601c8fa4bfa046513c4df155b3b58ea89" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Mon May 23 10:23:40 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed May 25 02:25:00 2011 +0100" }, "message": "mtd: convert remaining users to mtd_device_register()\n\nThe older add_mtd_device()/add_mtd_partitions() and their removal\ncounterparts will soon be gone. Replace uses with mtd_device_register()\nand mtd_device_unregister().\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "31ec97d9cebac804814de298592648f7c18d8281", "tree": "f725fcce0d5a9d6d7bd64b777de0a44e71773d0e", "parents": [ "557eed603159b4e007c57d97fad1333ecebd3c2e", "daf8cf608d57a0b9f22276036e420cc82cf6ab4f" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 24 16:47:54 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 24 16:47:54 2011 -0400" }, "message": "Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n" }, { "commit": "f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1", "tree": "105b5bc4bb96b555dba90fa11dd5af66784c132f", "parents": [ "98b98d316349e9a028e632629fe813d07fa5afdd", "4ef7e71444b48cc89152cbc499ed94dde50515ee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 13:28:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 13:28:35 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: Make struct pcmcia_device_id const, sound drivers edition\n staging: pcmcia: Convert pcmcia_device_id declarations to const\n pcmcia: Convert pcmcia_device_id declarations to const\n pcmcia: Make declaration and uses of struct pcmcia_device_id const\n pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data\n" }, { "commit": "54a430c0a4991951805df92efb8c42bdb1277ffd", "tree": "70f2bc3193faf754dcd05fe3df93a71adfddcd96", "parents": [ "c6e38c06cb51bee42ff80a36a0f7c67b485c4541" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Fri May 20 11:56:18 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 24 15:39:30 2011 -0400" }, "message": "iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled\n\nFix compiling error when CONFIG_MAC80211_DEBUGFS is not enabled\ndrivers/net/wireless/iwlwifi/iwl-agn-rs.c:351: error: \u0027struct iwl_lq_sta\u0027 has no member named \u0027dbg_fixed_rate\u0027\ndrivers/net/wireless/iwlwifi/iwl-agn-rs.c:1076: error: \u0027struct iwl_lq_sta\u0027 has no member named \u0027dbg_fixed_rate\u0027\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5d8bee676fc9fc9389302baa9ba47bc2ed885f64", "tree": "f8b5b4dd334d976d916138155d2cb952883fb785", "parents": [ "33eb9873a283a2076f2b5628813d5365ca420ea9" ], "author": { "name": "Sathya Perla", "email": "sathya.perla@emulex.com", "time": "Mon May 23 20:29:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 24 13:33:45 2011 -0400" }, "message": "be2net: hash key for rss-config cmd not set\n\nA non-zero, non-descript value is needed as the hash key. The hash variable was left un-initialized; but sometimes it gets a zero value\nand hashing is not effective. The constant value used now (not of any significance) seems to work fine.\n\nSigned-off-by: Sathya Perla \u003csathya.perla@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "19694ac88d4a73c6f12159d9e53bd636319a69dc", "tree": "c9dcde3f1d990dc88a366320bbbedc71d5b3b467", "parents": [ "eb722d7a2e11b0426a17acaa7336120acbc49406" ], "author": { "name": "Alexey Orishko", "email": "alexey.orishko@gmail.com", "time": "Tue May 24 05:26:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 24 13:26:12 2011 -0400" }, "message": "CDC NCM: release interfaces fix in unbind()\n\nChanges:\n- claim slave/data interface during bind() and release\n interfaces in unbind() unconditionally\n- in case of error during bind(), release claimed data\n interface in the same function\n- remove obsolited \"*_claimed\" entries from driver context\n\nSigned-off-by: Alexey Orishko \u003calexey.orishko@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb722d7a2e11b0426a17acaa7336120acbc49406", "tree": "e10fcae18c7857f9f09f1cb110d788a23c92ffd6", "parents": [ "24cf3af3fed5edcf90bc2a0ed181e6ce1513d2dc" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Tue May 24 02:06:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 24 13:26:12 2011 -0400" }, "message": "bnx2x: fix inverted condition\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "229de618ba6ff36e382b908b7637fe56c25ae9f1", "tree": "b9896ce90de6c2138dc9d8966507454d614c456d", "parents": [ "6ac3f6649223d916bbdf1e823926f8f3b34b5d99" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Mon May 23 12:17:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 24 01:13:11 2011 -0400" }, "message": "net/irda: convert bfin_sir to common Blackfin UART header\n\nNo need to duplicate these defines now that the common Blackfin code has\nunified these for all UART devices.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Samuel Ortiz \u003csamuel@sortiz.org\u003e\nCc: David 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": "5e152b4c9e0fce6149c74406346a7ae7e7a17727", "tree": "12503a50142797c1babfd87099c193b3e4d54f93", "parents": [ "a77febbef105554c5a37241cf903f48ab7bc03c7", "9251bac97d47fdaea406ea0595c2d0aa50022f12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)\n PCI: Don\u0027t use dmi_name_in_vendors in quirk\n PCI: remove unused AER functions\n PCI/sysfs: move bus cpuaffinity to class dev_attrs\n PCI: add rescan to /sys/.../pci_bus/.../\n PCI: update bridge resources to get more big ranges when allocating space (again)\n KVM: Use pci_store/load_saved_state() around VM device usage\n PCI: Add interfaces to store and load the device saved state\n PCI: Track the size of each saved capability data area\n PCI/e1000e: Add and use pci_disable_link_state_locked()\n x86/PCI: derive pcibios_last_bus from ACPI MCFG\n PCI: add latency tolerance reporting enable/disable support\n PCI: add OBFF enable/disable support\n PCI: add ID-based ordering enable/disable support\n PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.\n PCI: Set PCIE maxpayload for card during hotplug insertion\n PCI/ACPI: Report _OSC control mask returned on failure to get control\n x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs\n PCI: handle positive error codes\n PCI: check pci_vpd_pci22_wait() return\n PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio\n ...\n\nFix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be4461\nmoved the intel SMBUS ID definitons to the i2c-i801.c driver.\n" }, { "commit": "a4910b744486254cfa61995954c118fb2283c4fd", "tree": "7bfbb023769fdd777d7ec61a4b59c11560f31b00", "parents": [ "418f275ed5b03c48e0e6c3401466660dfe894f76" ], "author": { "name": "Breno Leitao", "email": "leitao@linux.vnet.ibm.com", "time": "Mon May 23 03:36:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 23 16:33:31 2011 -0400" }, "message": "ehea: Fix multicast registration on semi-promiscuous mode\n\nEhea will not register multicast groups in phyp if the physical\ninterface is in promiscuous mode. But it should register if the\nlogical port is in promiscuous mode, but the physical port is not.\n\nEhea physical promiscuous mode is defined by ehea_port-\u003epromisc,\nwhile logical port is defined by IFF_PROMISC.\n\nSo currently, if the user set the interface in promiscuous mode,\nIGMP will not be registred in PHYP, and PHYP will never pass\nthe multicast packet to the logical port, which is bad\n\nSo, this patch just fixes it, assuring that we register in phyp\nif the physical port is not on promiscuous mode.\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "86ff9baadf16c8a1b452d72f5585be63457d9b15", "tree": "24e79b267dba9b906323614e30af12838e9525a2", "parents": [ "cb646e2b02b27a33a1d1eabd016749606254071c" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:32:11 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:32:11 2011 -0700" }, "message": "ptp: Fix dp83640 build warning when building statically\n\nIf the dp83640 driver is not built as a module, the\nMODULE_DEVICE_TABLE reference to dp83640_tbl nops out.\n\nSince the table isn\u0027t referenced elsewhere, it it causes\nthe following warning:\ndrivers/net/phy/dp83640.c:1095: warning: ‘dp83640_tbl’ defined but not used\n\nThis apparently is common with mdio_device_id table structures,\nand is avoided by using __maybe_unused annotation.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "cb646e2b02b27a33a1d1eabd016749606254071c", "tree": "28961fc0c9c26ef2d7b8c3e3e5ecc471f31b3d48", "parents": [ "32bd93e8f924c23b8cc2e2a12fef0d8cc9cda0c5" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Apr 22 12:04:55 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:10:23 2011 -0700" }, "message": "ptp: Added a clock driver for the National Semiconductor PHYTER.\n\nThis patch adds support for the PTP clock found on the DP83640.\nThe basic clock operations and one external time stamp have\nbeen implemented.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "32bd93e8f924c23b8cc2e2a12fef0d8cc9cda0c5", "tree": "de808d7b959459c741b9999444dfc4a4460b1d2f", "parents": [ "c78275f366c687b5b3ead3d99fc96d1f02d38a8e" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Apr 22 12:04:31 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:10:19 2011 -0700" }, "message": "ptp: Added a clock driver for the IXP46x.\n\nThis patch adds a driver for the hardware time stamping unit found on the\nIXP465. The basic clock operations and an external trigger are implemented.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nAcked-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "c78275f366c687b5b3ead3d99fc96d1f02d38a8e", "tree": "279a8cccfc56fd347b4864c3f400935f18244a5f", "parents": [ "d94ba80ebbea17f036cecb104398fbcd788aa742" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Apr 22 12:03:54 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:10:14 2011 -0700" }, "message": "ptp: Added a clock that uses the eTSEC found on the MPC85xx.\n\nThe eTSEC includes a PTP clock with quite a few features. This patch adds\nsupport for the basic clock adjustment functions, plus two external time\nstamps, one alarm, and the PPS callback.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "99dff5856220a02b8711f2e8746413ea6e53ccf6", "tree": "d8bae7ccdf8f7ad5221b053bb74a6220df996b3a", "parents": [ "bb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c", "d9a0fbfd7bc5d2c42f0fa9bcbdab62c4942d0388" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:23:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:23:20 2011 -0700" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)\n serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.\n tty/serial: Fix break handling for PORT_TEGRA\n tty/serial: Add explicit PORT_TEGRA type\n n_tracerouter and n_tracesink ldisc additions.\n Intel PTI implementaiton of MIPI 1149.7.\n Kernel documentation for the PTI feature.\n export kernel call get_task_comm().\n tty: Remove to support serial for S5P6442\n pch_phub: Support new device ML7223\n 8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter\n ASoC: Update cx20442 for TTY API change\n pch_uart: Support new device ML7223 IOH\n parport: Use request_muxed_region for IT87 probe and lock\n tty/serial: add support for Xilinx PS UART\n n_gsm: Use print_hex_dump_bytes\n drivers/tty/moxa.c: Put correct tty value\n TTY: tty_io, annotate locking functions\n TTY: serial_core, remove superfluous set_task_state\n TTY: serial_core, remove invalid test\n Char: moxa, fix locking in moxa_write\n ...\n\nFix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and\ndrivers/tty/serial/Makefile.\n\nI did the hci_ldisc thing as an evil merge, cleaning things up.\n" }, { "commit": "57d19e80f459dd845fb3cfeba8e6df8471bac142", "tree": "8254766715720228db3d50f1ef3c7fe003c06d65", "parents": [ "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "e64851f5a0ad6ec991f74ebb3108c35aa0323d5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n b43: fix comment typo reqest -\u003e request\n Haavard Skinnemoen has left Atmel\n cris: typo in mach-fs Makefile\n Kconfig: fix copy/paste-ism for dell-wmi-aio driver\n doc: timers-howto: fix a typo (\"unsgined\")\n perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c\n md, raid5: Fix spelling error in comment (\u0027Ofcourse\u0027 --\u003e \u0027Of course\u0027).\n treewide: fix a few typos in comments\n regulator: change debug statement be consistent with the style of the rest\n Revert \"arm: mach-u300/gpio: Fix mem_region resource size miscalculations\"\n audit: acquire creds selectively to reduce atomic op overhead\n rtlwifi: don\u0027t touch with treewide double semicolon removal\n treewide: cleanup continuations and remove logging message whitespace\n ath9k_hw: don\u0027t touch with treewide double semicolon removal\n include/linux/leds-regulator.h: fix syntax in example code\n tty: fix typo in descripton of tty_termios_encode_baud_rate\n xtensa: remove obsolete BKL kernel option from defconfig\n m68k: fix comment typo \u0027occcured\u0027\n arch:Kconfig.locks Remove unused config option.\n treewide: remove extra semicolons\n ...\n" }, { "commit": "53ee7569ce8beb3fd3fc0817116c29298d72353f", "tree": "f3dcce10508c2126347e40b468fd6d3c3cc7006a", "parents": [ "4d9dec4db2efbd7edb549bd02373995b67496983", "1b6e2ceb4745b5838cb94463131d19dbea6cf0e3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 08:39:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 08:39:24 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)\n bnx2x: allow device properly initialize after hotplug\n bnx2x: fix DMAE timeout according to hw specifications\n bnx2x: properly handle CFC DEL in cnic flow\n bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb\n net: filter: move forward declarations to avoid compile warnings\n pktgen: refactor pg_init() code\n pktgen: use vzalloc_node() instead of vmalloc_node() + memset()\n net: skb_trim explicitely check the linearity instead of data_len\n ipv4: Give backtrace in ip_rt_bug().\n net: avoid synchronize_rcu() in dev_deactivate_many\n net: remove synchronize_net() from netdev_set_master()\n rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event\n net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE\n bridge: call NETDEV_JOIN notifiers when add a slave\n netpoll: disable netpoll when enslave a device\n macvlan: Forward unicast frames in bridge mode to lowerdev\n net: Remove linux/prefetch.h include from linux/skbuff.h\n ipv4: Include linux/prefetch.h in fib_trie.c\n netlabel: Remove prefetches from list handlers.\n drivers/net: add prefetch header for prefetch users\n ...\n\nFixed up prefetch parts: removed a few duplicate prefetch.h includes,\nfixed the location of the igb prefetch.h, took my version of the\nskbuff.h code without the extra parentheses etc.\n" }, { "commit": "e64851f5a0ad6ec991f74ebb3108c35aa0323d5f", "tree": "2ce0453843f4c3be1036327ebe770c00fc72851d", "parents": [ "e05503ef1186ad33dfe56794407891eb1dd93ef6" ], "author": { "name": "Jim Cromie", "email": "jim.cromie@gmail.com", "time": "Sat May 21 11:51:50 2011 -0600" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon May 23 11:20:55 2011 +0200" }, "message": "b43: fix comment typo reqest -\u003e request\n\nRecent trivial fix corrected \u0027occured\u0027, but left \u0027reqest\u0027.\ncodespell needs another dictionary entry.\n\ncc: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\nSigned-off-by: Jim Cromie \u003cjim.cromie@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "70c71606190e9115e5f8363bfcd164c582eb314a", "tree": "17c7f6b5df814b9ed319bc0d839969a0de741433", "parents": [ "281dc5c5ec0fb299514567cbc358562649c1af95" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun May 22 16:47:17 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:41:57 2011 -0700" }, "message": "Add appropriate \u003clinux/prefetch.h\u003e include for prefetch users\n\nAfter discovering that wide use of prefetch on modern CPUs\ncould be a net loss instead of a win, net drivers which were\nrelying on the implicit inclusion of prefetch.h via the list\nheaders showed up in the resulting cleanup fallout. Give\nthem an explicit include via the following $0.02 script.\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #!/bin/bash\n MANUAL\u003d\"\"\n for i in `git grep -l \u0027prefetch(.*)\u0027 .` ; do\n \tgrep -q \u0027\u003clinux/prefetch.h\u003e\u0027 $i\n \tif [ $? \u003d 0 ] ; then\n \t\tcontinue\n \tfi\n\n \t(\techo \u0027?^#include \u003clinux/?a\u0027\n \t\techo \u0027#include \u003clinux/prefetch.h\u003e\u0027\n \t\techo .\n \t\techo w\n \t\techo q\n \t) | ed -s $i \u003e /dev/null 2\u003e\u00261\n \tif [ $? !\u003d 0 ]; then\n \t\techo $i needs manual fixup\n \t\tMANUAL\u003d\"$i $MANUAL\"\n \tfi\n done\n echo ------------------- 8\\\u003c----------------------\n echo vi $MANUAL\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Paul \u003cpaul.gortmaker@windriver.com\u003e\n[ Fixed up some incorrect #include placements, and added some\n non-network drivers and the fib_trie.c case - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1b6e2ceb4745b5838cb94463131d19dbea6cf0e3", "tree": "07308487a946e832bcf4cec695e49bdd7aef4f54", "parents": [ "5e374b5aeb9a030c1859b3054e3b36dea3b29cfc" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Sun May 22 10:11:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:24 2011 -0400" }, "message": "bnx2x: allow device properly initialize after hotplug\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e374b5aeb9a030c1859b3054e3b36dea3b29cfc", "tree": "8ba2d86caa9e7683786731259c6b403de9261bd3", "parents": [ "c3a8ce6145cfcfce192513187000cd723313d94f" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Sun May 22 10:09:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:23 2011 -0400" }, "message": "bnx2x: fix DMAE timeout according to hw specifications\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c3a8ce6145cfcfce192513187000cd723313d94f", "tree": "04e32f613162c4accec704b69c919aa9029ed651", "parents": [ "40955532bc9d865999dfc58b7896605d58650655" ], "author": { "name": "Vladislav Zolotarov", "email": "vladz@broadcom.com", "time": "Sun May 22 10:08:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:23 2011 -0400" }, "message": "bnx2x: properly handle CFC DEL in cnic flow\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "40955532bc9d865999dfc58b7896605d58650655", "tree": "fad93cc9a965328419afa9e3e511864893b8f289", "parents": [ "792d4b5cb16b684958c2590f77688667ddec1f61" ], "author": { "name": "Vladislav Zolotarov", "email": "vladz@broadcom.com", "time": "Sun May 22 10:06:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:22 2011 -0400" }, "message": "bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb\n\nreplace function calls when possible call in both irq/non-irq contexts\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "daf9209bb2c8b07ca025eac82e3d175534086c77", "tree": "5101649f4edf2cf316e334c49380b6dd1ecebc77", "parents": [ "bb8ed6302b0613339c1a5f0a2cb0b3807c0af611" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu May 19 21:39:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:19 2011 -0400" }, "message": "net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE\n\ns/NETDEV_BONDING_DESLAVE/NETDEV_RELEASE/ as Andy suggested.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCc: Neil Horman \u003cnhorman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d8fc29d02a33e4bd5f4fa47823c1fd386346093", "tree": "822657741aca7297209c28c906f6b8caa43d163b", "parents": [ "a37dd3332319260cce81ac91ce25fcc3a31de997" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu May 19 21:39:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:19 2011 -0400" }, "message": "netpoll: disable netpoll when enslave a device\n\nV3: rename NETDEV_ENSLAVE to NETDEV_JOIN\n\nCurrently we do nothing when we enslave a net device which is running netconsole.\nNeil pointed out that we may get weird results in such case, so let\u0027s disable\nnetpoll on the device being enslaved. I think it is too harsh to prevent\nthe device being ensalved if it is running netconsole.\n\nBy the way, this patch also removes the NETDEV_GOING_DOWN from netconsole\nnetdev notifier, because netpoll will check if the device is running or not\nand we don\u0027t handle NETDEV_PRE_UP neither.\n\nThis patch is based on net-next-2.6.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Neil Horman \u003cnhorman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a37dd3332319260cce81ac91ce25fcc3a31de997", "tree": "719091eb50b56bb19115383c1bc295133068caa2", "parents": [ "67f11f4deda0818640decb19a28c537dbe5d429e" ], "author": { "name": "David Ward", "email": "david.ward@ll.mit.edu", "time": "Thu May 19 02:53:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:18 2011 -0400" }, "message": "macvlan: Forward unicast frames in bridge mode to lowerdev\n\nUnicast frames between macvlan interfaces in bridge mode are not otherwise\nsent to network taps on the lowerdev (as all other macvlan frames are), so\nforward the frames to the receive queue of the lowerdev first.\n\nSigned-off-by: David Ward \u003cdavid.ward@ll.mit.edu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c0cba59e77b5640912a331566bbfa66ae5029f37", "tree": "372f861413e399592a725f6233736382aa2b6b19", "parents": [ "8df8a47538ac2e26f07efabc8793c06e96a35226" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@gmail.com", "time": "Sun May 22 11:02:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:37:44 2011 -0400" }, "message": "drivers/net: add prefetch header for prefetch users\n\nAfter discovering that wide use of prefetch on modern CPUs\ncould be a net loss instead of a win, net drivers which were\nrelying on the implicit inclusion of prefetch.h via the list\nheaders showed up in the resulting cleanup fallout. Give\nthem an explicit include via the following $0.02 script.\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #!/bin/bash\n MANUAL\u003d\"\"\n for i in `git grep -l \u0027prefetch(.*)\u0027 .` ; do\n \tgrep -q \u0027\u003clinux/prefetch.h\u003e\u0027 $i\n \tif [ $? \u003d 0 ] ; then\n \t\tcontinue\n \tfi\n\n \t(\techo \u0027?^#include \u003clinux/?a\u0027\n \t\techo \u0027#include \u003clinux/prefetch.h\u003e\u0027\n \t\techo .\n \t\techo w\n \t\techo q\n \t) | ed -s $i \u003e /dev/null 2\u003e\u00261\n \tif [ $? !\u003d 0 ]; then\n \t\techo $i needs manual fixup\n \t\tMANUAL\u003d\"$i $MANUAL\"\n \tfi\n done\n echo ------------------- 8\\\u003c----------------------\n echo vi $MANUAL\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Paul \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8df8a47538ac2e26f07efabc8793c06e96a35226", "tree": "efa975b15fa8c2f6e460b876c85159b591320bbf", "parents": [ "0fcbe742eaac14bd5032b369c09e9d94be9058ad" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:35:54 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 20:35:54 2011 -0400" }, "message": "rionet: Remove pointless printk of skb pointer.\n\nCasting to u32 warns anyways.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f728f53dd70396f3183d2f0861022259471824b", "tree": "e5591f2bec0d94c0eb753958c511a21b6bd00d8e", "parents": [ "a3170c1f924ce2565c4e160b9b095e65c03b2dc6" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Thu May 12 17:11:47 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Sat May 21 12:16:44 2011 -0700" }, "message": "PCI/e1000e: Add and use pci_disable_link_state_locked()\n\nNeed to use it in _e1000e_disable_aspm. This routine is used for error\nrecovery, where the pci_bus_sem is already held, and we don\u0027t want\npci_disable_link_state to try to take it again. So add a locked variant\nfor use in cases like this.\n\nFound lock up:\n\n[ 2374.654557] kworker/32:1 D ffff881027f6b0f0 0 6075 2 0x00000000\n[ 2374.654816] ffff88503f099a68 0000000000000046 ffff88503f098000 0000000000004000\n[ 2374.654837] 00000000001d1ec0 ffff88503f099fd8 00000000001d1ec0 ffff88503f099fd8\n[ 2374.654860] 0000000000004000 00000000001d1ec0 ffff88503dcc8000 ffff88503f090000\n[ 2374.654880] Call Trace:\n[ 2374.654898] [\u003cffffffff810b1302\u003e] ? __lock_acquired+0x3a/0x224\n[ 2374.654914] [\u003cffffffff81c2b59c\u003e] ? _raw_spin_unlock_irq+0x30/0x36\n[ 2374.654925] [\u003cffffffff810b069d\u003e] ? trace_hardirqs_on_caller+0x1f/0x178\n[ 2374.654936] [\u003cffffffff81c2ab24\u003e] rwsem_down_failed_common+0xd3/0x103\n[ 2374.654945] [\u003cffffffff810b158f\u003e] ? __lock_contended+0x3a/0x2a2\n[ 2374.654955] [\u003cffffffff81c2ab7b\u003e] rwsem_down_read_failed+0x12/0x14\n[ 2374.654967] [\u003cffffffff813371e4\u003e] call_rwsem_down_read_failed+0x14/0x30\n[ 2374.654981] [\u003cffffffff8135df20\u003e] ? pci_disable_link_state+0x5f/0xf5\n[ 2374.654990] [\u003cffffffff81c2a0e6\u003e] ? down_read+0x7e/0x91\n[ 2374.654999] [\u003cffffffff8135df20\u003e] ? pci_disable_link_state+0x5f/0xf5\n[ 2374.655008] [\u003cffffffff8135df20\u003e] pci_disable_link_state+0x5f/0xf5\n[ 2374.655024] [\u003cffffffff81661796\u003e] e1000e_disable_aspm+0x55/0x5a\n[ 2374.655037] [\u003cffffffff816677eb\u003e] e1000_io_slot_reset+0x59/0xea\n[ 2374.655048] [\u003cffffffff8135fe0d\u003e] ? report_mmio_enabled+0x5d/0x5d\n[ 2374.655057] [\u003cffffffff8135fe3b\u003e] report_slot_reset+0x2e/0x5d\n[ 2374.655072] [\u003cffffffff8135369e\u003e] pci_walk_bus+0x8a/0xb7\n[ 2374.655081] [\u003cffffffff8135fe0d\u003e] ? report_mmio_enabled+0x5d/0x5d\n[ 2374.655091] [\u003cffffffff813603be\u003e] broadcast_error_message+0xa4/0xb2\n[ 2374.655101] [\u003cffffffff81352c71\u003e] ? pci_bus_read_config_dword+0x72/0x80\n[ 2374.655110] [\u003cffffffff813606df\u003e] do_recovery+0x9e/0xf9\n[ 2374.655120] [\u003cffffffff81360786\u003e] handle_error_source+0x4c/0x51\n[ 2374.655129] [\u003cffffffff81360974\u003e] aer_isr_one_error+0x1e9/0x21a\n[ 2374.655138] [\u003cffffffff81360a6c\u003e] aer_isr+0xc7/0xcc\n[ 2374.655147] [\u003cffffffff813609a5\u003e] ? aer_isr_one_error+0x21a/0x21a\n[ 2374.655159] [\u003cffffffff81096d9f\u003e] process_one_work+0x237/0x3ec\n[ 2374.655168] [\u003cffffffff81096d10\u003e] ? process_one_work+0x1a8/0x3ec\n[ 2374.655178] [\u003cffffffff8109728d\u003e] worker_thread+0x17c/0x240\n[ 2374.655186] [\u003cffffffff810b0803\u003e] ? trace_hardirqs_on+0xd/0xf\n[ 2374.655196] [\u003cffffffff81097111\u003e] ? manage_workers+0xab/0xab\n[ 2374.655209] [\u003cffffffff8109c8ed\u003e] kthread+0xa0/0xa8\n[ 2374.655223] [\u003cffffffff81c332d4\u003e] kernel_thread_helper+0x4/0x10\n[ 2374.655232] [\u003cffffffff81c2b880\u003e] ? retint_restore_args+0xe/0xe\n[ 2374.655243] [\u003cffffffff8109c84d\u003e] ? __init_kthread_worker+0x5b/0x5b\n[ 2374.655252] [\u003cffffffff81c332d0\u003e] ? gs_change+0xb/0xb\n\nwhen aer happens,\npci_walk_bus already have down_read(\u0026pci_bus_sem)...\nthen report_slot_reset\n \u003d\u003d\u003e e1000_io_slot_reset\n \u003d\u003d\u003e e1000e_disable_aspm\n \u003d\u003d\u003e pci_disable_link_state...\n\nWe can not use pci_disable_link_state, and it will try to hold pci_bus_sem again.\n\nTry to have __pci_disable_link_state that will not need to hold pci_bus_sem.\n\n-v2: change name to pci_disable_link_state_locked() according to Jesse.\n\n[jbarnes: make sure new function is exported for modules]\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "06f4e926d256d902dd9a53dcb400fd74974ce087", "tree": "0b438b67f5f0eff6fd617bc497a9dace6164a488", "parents": [ "8e7bfcbab3825d1b404d615cb1b54f44ff81f981", "d93515611bbc70c2fe4db232e5feb448ed8e4cc9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 13:43:21 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)\n macvlan: fix panic if lowerdev in a bond\n tg3: Add braces around 5906 workaround.\n tg3: Fix NETIF_F_LOOPBACK error\n macvlan: remove one synchronize_rcu() call\n networking: NET_CLS_ROUTE4 depends on INET\n irda: Fix error propagation in ircomm_lmp_connect_response()\n irda: Kill set but unused variable \u0027bytes\u0027 in irlan_check_command_param()\n irda: Kill set but unused variable \u0027clen\u0027 in ircomm_connect_indication()\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_transport()\n be2net: Kill set but unused variable \u0027req\u0027 in lancer_fw_download()\n irda: Kill set but unused vars \u0027saddr\u0027 and \u0027daddr\u0027 in irlan_provider_connect_indication()\n atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.\n rxrpc: Fix set but unused variable \u0027usage\u0027 in rxrpc_get_peer().\n rxrpc: Kill set but unused variable \u0027local\u0027 in rxrpc_UDP_error_handler()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_process_connection()\n rxrpc: Kill set but unused variable \u0027sp\u0027 in rxrpc_rotate_tx_window()\n pkt_sched: Kill set but unused variable \u0027protocol\u0027 in tc_classify()\n isdn: capi: Use pr_debug() instead of ifdefs.\n tg3: Update version to 3.119\n tg3: Apply rx_discards fix to 5719/5720\n ...\n\nFix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c\nas per Davem.\n" }, { "commit": "268bb0ce3e87872cb9290c322b0d35bce230d88f", "tree": "c8331ade4a3e24fc589c4eb62731bc2312d35333", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 12:50:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 20 12:50:29 2011 -0700" }, "message": "sanitize \u003clinux/prefetch.h\u003e usage\n\nCommit e66eed651fd1 (\"list: remove prefetching from regular list\niterators\") removed the include of prefetch.h from list.h, which\nuncovered several cases that had apparently relied on that rather\nobscure header file dependency.\n\nSo this fixes things up a bit, using\n\n grep -L linux/prefetch.h $(git grep -l \u0027[^a-z_]prefetchw*(\u0027 -- \u0027*.[ch]\u0027)\n grep -L \u0027prefetchw*(\u0027 $(git grep -l \u0027linux/prefetch.h\u0027 -- \u0027*.[ch]\u0027)\n\nto guide us in finding files that either need \u003clinux/prefetch.h\u003e\ninclusion, or have it despite not needing it.\n\nThere are more of them around (mostly network drivers), but this gets\nmany core ones.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d93515611bbc70c2fe4db232e5feb448ed8e4cc9", "tree": "7db1c770bd3a7ac1f27a5e9ccc231719ae3aa6c5", "parents": [ "7196cd6c3d4863000ef88b09f34d6dd75610ec3e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri May 20 14:59:23 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 14:59:23 2011 -0400" }, "message": "macvlan: fix panic if lowerdev in a bond\n\ncommit a35e2c1b6d905 (macvlan: use rx_handler_data pointer to store\nmacvlan_port pointer V2) added a bug in macvlan_port_create()\n\nSteps to reproduce the bug:\n\n# ifenslave bond0 eth0 eth1\n\n# ip link add link eth0 up name eth0#1 type macvlan\n-\u003eerror EBUSY\n\n# ip link add link eth0 up name eth0#1 type macvlan\n-\u003epanic\n\n\nFix: Dont set IFF_MACVLAN_PORT in error case.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7196cd6c3d4863000ef88b09f34d6dd75610ec3e", "tree": "141cc329914450896b57eedda72268bc92a60082", "parents": [ "d542fe27c86ecf932f40c898881208ccdaef9dc5" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 16:02:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 00:33:19 2011 -0400" }, "message": "tg3: Add braces around 5906 workaround.\n\nCommit dabc5c670d3f86d15ee4f42ab38ec5bd2682487d, entitled\n\"tg3: Move TSO_CAPABLE assignment\", moved some TSO flagging code around.\nIn the process it failed to add braces around an exceptional 5906\ncondition. This patch fixes the problem.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d542fe27c86ecf932f40c898881208ccdaef9dc5", "tree": "8ee74f4e1e4c4a9f279939d2fa528a557e7458af", "parents": [ "449f4544267e73d5db372971da63634707c32299" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 16:02:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 00:33:18 2011 -0400" }, "message": "tg3: Fix NETIF_F_LOOPBACK error\n\nMahesh Bandewar noticed that the features cleanup in commit\n0da0606f493c5cdab74bdcc96b12f4305ad94085, entitled\n\"tg3: Consolidate all netdev feature assignments\", mistakenly sets\nNETIF_F_LOOPBACK by default. This patch corrects the error.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Mahesh Bandewar \u003cmaheshb@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "449f4544267e73d5db372971da63634707c32299", "tree": "acee6de13f34c179ec46ef7f8a49e66b229f4460", "parents": [ "034cfe48d0efc248ba4b725e3a94b95e76fbc5d3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 19 12:24:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 20 00:33:18 2011 -0400" }, "message": "macvlan: remove one synchronize_rcu() call\n\nWhen one macvlan device is dismantled, we can avoid one\nsynchronize_rcu() call done after deletion from hash list, since caller\nwill perform a synchronize_net() call after its ndo_stop() call.\n\nAdd a new netdev-\u003edismantle field to signal this dismantle intent.\n\nReduces RTNL hold time.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb04f2f04ed1227c266b3219c0aaeda525639718", "tree": "7f224483a3cd0e439cd64a8666ec9dc5ed178a3d", "parents": [ "5765040ebfc9a28d9dcfaaaaf3d25840d922de96", "80d02085d99039b3b7f3a73c8896226b0cb1ba07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:14:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:14:34 2011 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (78 commits)\n Revert \"rcu: Decrease memory-barrier usage based on semi-formal proof\"\n net,rcu: convert call_rcu(prl_entry_destroy_rcu) to kfree\n batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu\n batman,rcu: convert call_rcu(neigh_node_free_rcu) to kfree()\n batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcu\n net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()\n net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()\n net/mac80211,rcu: convert call_rcu(work_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(phonet_device_rcu_free) to kfree_rcu()\n perf,rcu: convert call_rcu(swevent_hlist_release_rcu) to kfree_rcu()\n perf,rcu: convert call_rcu(free_ctx) to kfree_rcu()\n net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()\n net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()\n net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu()\n net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()\n security,rcu: convert call_rcu(sel_netif_free) to kfree_rcu()\n net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()\n net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()\n net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()\n ...\n" }, { "commit": "fce4a1dda2f1a9a25b3e5b7cd951070e0b42a818", "tree": "03a3f76c5b3d4f3b05dff44c307dbbb64ec5c510", "parents": [ "e1f2084ed200eb31f2c9d1efe70569c76889c980", "6f6c3c33c027f2c83d53e8562cd9daa73fe8108b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 16:40:47 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 16:40:47 2011 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus: (48 commits)\n MIPS: Move arch_get_unmapped_area and gang to new file.\n MIPS: Cleanup arch_get_unmapped_area\n MIPS: Octeon: Don\u0027t request interrupts for unused IPI mailbox bits.\n Octeon: Fix interrupt irq settings for performance counters.\n MIPS: Fix build warnings on defconfigs\n MIPS: Lemote 2F, Malta: Fix build warning\n MIPS: Set ELF AT_PLATFORM string for Loongson2 processors\n MIPS: Set ELF AT_PLATFORM string for BMIPS processors\n MIPS: Introduce set_elf_platform() helper function\n MIPS: JZ4740: setup: Autodetect physical memory.\n MIPS: BCM47xx: Fix MAC address parsing.\n MIPS: BCM47xx: Extend the filling of SPROM from NVRAM\n MIPS: BCM47xx: Register SSB fallback sprom callback\n MIPS: BCM47xx: Extend bcm47xx_fill_sprom with prefix.\n SSB: Change fallback sprom to callback mechanism.\n MIPS: Alchemy: Clean up GPIO registers and accessors\n MIPS: Alchemy: Cleanup DMA addresses\n MIPS: Alchemy: Rewrite ethernet platform setup\n MIPS: Alchemy: Rewrite UART setup and constants.\n MIPS: Alchemy: Convert dbdma.c to syscore_ops\n ...\n" }, { "commit": "63722966d703aeb8071d52172de87e377006cd28", "tree": "01ee020eefdfdca933046783ead5af72c8ed10ec", "parents": [ "fa7479cf48103ee9261398034528495966bd7d2d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:49:54 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:49:54 2011 -0400" }, "message": "be2net: Kill set but unused variable \u0027req\u0027 in lancer_fw_download()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d187c1aab8d30771bb781c745b150f6159467d6f", "tree": "6aac0f68c7bd1f80874ca9453d61ebb5320292ff", "parents": [ "2a64255019e13dd975f1487cec32b873bcb76da6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:44:41 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:44:41 2011 -0400" }, "message": "atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "43a5f002afc6f24891e57d31275f34e19a1a07d0", "tree": "9af57559a2b40cd554ddba39dd29790c374da32e", "parents": [ "310050fad8962a2ebc70011353a549614e118152" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:01 2011 -0400" }, "message": "tg3: Update version to 3.119\n\nThis patch updates the tg3 version to 3.119.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "310050fad8962a2ebc70011353a549614e118152", "tree": "016f1157c7cc34685efddaaf114ba59d60debbc5", "parents": [ "6ff6f81dd4ec08945e10147dbfe611569ef4cc09" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:01 2011 -0400" }, "message": "tg3: Apply rx_discards fix to 5719/5720\n\nCommit 4d95847381228639844c7197deb8b2211274ef22, entitled\n\"tg3: Workaround rx_discards stat bug\", was intended to be applied to\nthe 5717, 5718, 5719_A0, and 5720 A0 chip revisions. The implementation\nmissed the latter two when applying the fix in a critical area. This\npatch fixes the problem.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ff6f81dd4ec08945e10147dbfe611569ef4cc09", "tree": "5469349b17b5ae07b1ce6fbd047092c9ab9c415f", "parents": [ "0da0606f493c5cdab74bdcc96b12f4305ad94085" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:01 2011 -0400" }, "message": "tg3: Remove excessive parenthesis\n\nThis patch removes some excessive parenthesizing.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0da0606f493c5cdab74bdcc96b12f4305ad94085", "tree": "4e5a5ff42ca6a3d36195c08525d579c8f5518a81", "parents": [ "dabc5c670d3f86d15ee4f42ab38ec5bd2682487d" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:01 2011 -0400" }, "message": "tg3: Consolidate all netdev feature assignments\n\nThis patch consolidates all the netdev feature bit assignments to one\nlocation.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dabc5c670d3f86d15ee4f42ab38ec5bd2682487d", "tree": "62dfa1077d9930e02dac2c7e3c88c0c444e478a0", "parents": [ "4452d0999906e3e26b718566362e943fcaa3d694" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:00 2011 -0400" }, "message": "tg3: Move TSO_CAPABLE assignment\n\nThis patch moves the code that asserts the TSO_CAPABLE flag closer to\nwhere the TSO capabilities flags are set. There isn\u0027t a good enough\nreason for the code to be separated.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4452d0999906e3e26b718566362e943fcaa3d694", "tree": "124fa03691574ffb7e290bff82552915a04a5f7b", "parents": [ "54e0a67f446fae290f99781691eba46c5cda66e7" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:00 2011 -0400" }, "message": "tg3: Fix stats for 5704 and later devices\n\nCommit 4d95847381228639844c7197deb8b2211274ef22, entitled\n\"tg3: Workaround rx_discards stat bug\" modified the hardware statistics\ndata structure. The modification shifted the statistics so that the\nlabels no longer corresponded to the counter values. This patch fixes\nthe problem by utilizing reserved space for the new counters.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "54e0a67f446fae290f99781691eba46c5cda66e7", "tree": "e994651f9f4324c106b7bc71154db91c398b3cc9", "parents": [ "42b64a450b81ec9e8cdd5b3fb13613ab9bb25048" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:00 2011 -0400" }, "message": "tg3: Fix TSO loopback test\n\nCommit bb158d696489244f79fd4c3abd47968a06b48c79, entitled\n\"tg3: Add TSO loopback test\", mistakenly inverted the checksum field\ntest from the receive BD. This patch corrects the problem.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "42b64a450b81ec9e8cdd5b3fb13613ab9bb25048", "tree": "f7e12d489f81d6acf0d4b1e0ac693abcb5643fdf", "parents": [ "b0c5943f1ca4df6c1c451ef6be5287a161d29a9d" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu May 19 12:12:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:00:00 2011 -0400" }, "message": "tg3: Consolidate autoneg advertisement setup code\n\nAutonegotiation setup has gotten a little more complicated since the tg3\ndriver was created. This patch consolidates autoneg setup into one\nroutine and modifies the call sites accordingly.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "b0c5943f1ca4df6c1c451ef6be5287a161d29a9d" }