)]}' { "log": [ { "commit": "a6540f731d506d9e82444cf0020e716613d4c46c", "tree": "07482a4a9da12f754231598371d0bf5e1f691c66", "parents": [ "a115902f67ef51fbbe83e214fb761aaa9734c1ce" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Jun 22 18:42:29 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 22 11:32:24 2009 -0700" }, "message": "ppp: Fix throttling bugs\n\nThe ppp layer goes around calling the unthrottle method from non sleeping\npaths. This isn\u0027t safe because the unthrottle methods in the tty layer need\nto be able to sleep (consider a USB dongle).\n\nUntil now this didn\u0027t show up because the ppp layer never actually throttled\na port so the unthrottle was always a no-op. Currently it\u0027s a mutex taking\npath so warnings are spewed if the unthrottle occurs via certain paths.\n\nFix this by removing the unneccessary unthrottle calls.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "773d7a09e1a1349a5319ac8665e9c612c6aa27d8", "tree": "3b2272bb3cfcab04ba6459cba116e577278c9392", "parents": [ "17fad5209e6b55148dbd20156cdaf2c7e67faa40", "b71a107c66ad952c9d35ec046a803efc89a80556" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 19 17:40:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 19 17:40:40 2009 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits)\n powerpc/5121: make clock debug output more readable\n powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function\n powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft\n powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback\n fbdev/xilinxfb: Fix improper casting and tighen up probe path\n usb/ps3: Add missing annotations\n powerpc: Add memory clobber to mtspr()\n powerpc: Fix invalid construct in our CPU selection Kconfig\n ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access\n powerpc: Add configurable -Werror for arch/powerpc\n of_serial: Add UPF_FIXED_TYPE flag\n drivers/hvc: Add missing __devexit_p()\n net/ps3: gelic - Add missing annotations\n powerpc: Introduce macro spin_event_timeout()\n powerpc/warp: Fix ISA_DMA_THRESHOLD default\n powerpc/bootwrapper: Custom build options for XPedite52xx targets\n powerpc/85xx: Add defconfig for X-ES MPC85xx boards\n powerpc/85xx: Add dts files for X-ES MPC85xx boards\n powerpc/85xx: Add platform support for X-ES MPC85xx boards\n 83xx: add support for the kmeter1 board.\n ...\n" }, { "commit": "8e20ce94ce378334dea83a83ab26253b851100a2", "tree": "f75e2d51b4b54842833b20a9cc9cfc569cbfe7a6", "parents": [ "a90b037583d5f1ae3e54e9c687c79df82d1d34a4" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Jun 18 16:49:17 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 19 16:46:06 2009 -0700" }, "message": "convert some DMA_nnBIT_MASK() callers\n\nWe\u0027re about to make DMA_nnBIT_MASK() emit `deprecated\u0027 warnings. Convert the\nremaining stragglers which are visible to the x86_64 build.\n\nCc: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: Eric Moore \u003cEric.Moore@lsil.com\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nCc: Yi Zou \u003cyi.zou@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d2aa4550379f92e929af7ed1dd4f55e6a1e331f8", "tree": "5ef0fc69a507f0d701fd157b6652427eabd5efdd", "parents": [ "9e3e4b1d2d13bead8d52703c82a02b55f108b491", "cb2107be43d2fc5eadec58b92b54bf32c00bfff3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 14:07:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 14:07:15 2009 -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: (55 commits)\n netxen: fix tx ring accounting\n netxen: fix detection of cut-thru firmware mode\n forcedeth: fix dma api mismatches\n atm: sk_wmem_alloc initial value is one\n net: correct off-by-one write allocations reports\n via-velocity : fix no link detection on boot\n Net / e100: Fix suspend of devices that cannot be power managed\n TI DaVinci EMAC : Fix rmmod error\n net: group address list and its count\n ipv4: Fix fib_trie rebalancing, part 2\n pkt_sched: Update drops stats in act_police\n sky2: version 1.23\n sky2: add GRO support\n sky2: skb recycling\n sky2: reduce default transmit ring\n sky2: receive counter update\n sky2: fix shutdown synchronization\n sky2: PCI irq issues\n sky2: more receive shutdown\n sky2: turn off pause during shutdown\n ...\n\nManually fix trivial conflict in net/core/skbuff.c due to kmemcheck\n" }, { "commit": "cb2107be43d2fc5eadec58b92b54bf32c00bfff3", "tree": "dd04fda143a4a7d71b32b79b508a0566450c22c6", "parents": [ "d173346040af497af22818dfc48cff369e67cf50" ], "author": { "name": "Dhananjay Phadke", "email": "dhananjay@netxen.com", "time": "Wed Jun 17 17:27:25 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:46:14 2009 -0700" }, "message": "netxen: fix tx ring accounting\n\nThis forces every update of tx ring producer to check for\navailability of space for next full TSO command. Earlier\nfirmware control commands didn\u0027t care to pause tx queue.\n\nStop the tx queue if there\u0027s not enough space to transmit one full\nLSO command left on the tx ring after current transmit. This avoids\nreturning NETDEV_TX_BUSY after checking distance between producer\nand consumer on every cpu.\n\nRestart the tx queue only if we have cleaned up enough tx\ndescriptors.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d173346040af497af22818dfc48cff369e67cf50", "tree": "566b752334fc16e87cd3d99d9ef9a9e8627478b8", "parents": [ "73a370795371e41f72aeca61656d47adeadf28e5" ], "author": { "name": "Dhananjay Phadke", "email": "dhananjay@netxen.com", "time": "Wed Jun 17 17:27:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:46:14 2009 -0700" }, "message": "netxen: fix detection of cut-thru firmware mode\n\nFix the detection of cut-thru mode of the hardware (direct dma\nto host) to mode configured in SRE (ingress block) rather than\nonboard memory control.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "73a370795371e41f72aeca61656d47adeadf28e5", "tree": "cfef861074052a586e7b97a23b71e14ce2ea04e0", "parents": [ "81e2a3d5b75cbf0b42428b9d5a7cc7c85be9e7a7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 17 21:17:59 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:46:13 2009 -0700" }, "message": "forcedeth: fix dma api mismatches\n\nforcedeth doesnt use properly dma api in its tx completion path\nand in nv_loopback_test()\n\npci_map_single() should be paired with pci_unmap_single()\npci_map_page() should be paired with pci_unmap_page()\n\nforcedeth xmit path uses pci_map_single() \u0026 pci_map_page(),\nbut tx completion path only uses pci_unmap_single()\n\nnv_loopback_test() uses pci_map_single() \u0026 pci_unmap_page()\n\nAdd a dma_single field in struct nv_skb_map, and\ndefine a helper function nv_unmap_txskb\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Ayaz Abdulla \u003caabdulla@nvidia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3b238a03efd6d644ff93c8b10a1d38a596f2e34", "tree": "8b676d9b5824507d9d324fb9407de358f6107d28", "parents": [ "6905b1f1a03a48dcf115a2927f7b87dba8d5e566" ], "author": { "name": "Séguier Régis", "email": "rseguier@e-teleport.net", "time": "Tue Jun 16 11:25:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:29:11 2009 -0700" }, "message": "via-velocity : fix no link detection on boot\n\non boot, link is always up.\n\nSigned-off-by: Seguier Regis \u003crseguier@e-teleport.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6905b1f1a03a48dcf115a2927f7b87dba8d5e566", "tree": "ef1a52ca05bf55e5b1e55bd3502b1f7295ac9bf1", "parents": [ "ab0a8e6c663047363e7436621b66c2ae575d2525" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Jun 14 09:46:46 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:29:10 2009 -0700" }, "message": "Net / e100: Fix suspend of devices that cannot be power managed\n\nIf the adapter is not power-manageable using either ACPI, or the\nnative PCI PM interface, __e100_power_off() returns error code, which\ncauses every attempt to suspend to fail, although it should return 0\nin such a case. Fix this problem by ignoring the return value of\npci_set_power_state() in __e100_power_off().\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Andreas Mohr \u003candi@lisas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab0a8e6c663047363e7436621b66c2ae575d2525", "tree": "338871af43c8d98b68af5b4e488d0e4c81e8e5c7", "parents": [ "31278e71471399beaff9280737e52b47db4dc345" ], "author": { "name": "chaithrika@ti.com", "email": "chaithrika@ti.com", "time": "Wed Jun 17 01:28:54 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:29:08 2009 -0700" }, "message": "TI DaVinci EMAC : Fix rmmod error\n\nclk_disable was called twice in the remove function.\nCorrect this so that the driver module unloads without error.\n\nSigned-off-by: Chaithrika U S \u003cchaithrika@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "31278e71471399beaff9280737e52b47db4dc345", "tree": "25fe2ff8e48a75b7f569dccc463f3bd2561c6c66", "parents": [ "7b85576d15bf2574b0a451108f59f9ad4170dd3f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Wed Jun 17 01:12:19 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:29:08 2009 -0700" }, "message": "net: group address list and its count\n\nThis patch is inspired by patch recently posted by Johannes Berg. Basically what\nmy patch does is to group list and a count of addresses into newly introduced\nstructure netdev_hw_addr_list. This brings us two benefits:\n1) struct net_device becames a bit nicer.\n2) in the future there will be a possibility to operate with lists independently\n on netdevices (with exporting right functions).\nI wanted to introduce this patch before I\u0027ll post a multicast lists conversion.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\n\n drivers/net/bnx2.c | 4 +-\n drivers/net/e1000/e1000_main.c | 4 +-\n drivers/net/ixgbe/ixgbe_main.c | 6 +-\n drivers/net/mv643xx_eth.c | 2 +-\n drivers/net/niu.c | 4 +-\n drivers/net/virtio_net.c | 10 ++--\n drivers/s390/net/qeth_l2_main.c | 2 +-\n include/linux/netdevice.h | 17 +++--\n net/core/dev.c | 130 ++++++++++++++++++--------------------\n 9 files changed, 89 insertions(+), 90 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e4f1482e686212e6d1dd6df93888bb26344981c6", "tree": "18271462be0204813dbb7d91dd83be7c44560ca5", "parents": [ "37e5a2439b43bb90655e17f00c9db5759909a712" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:40 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:49:48 2009 -0700" }, "message": "sky2: version 1.23\n\nVersion bump.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "37e5a2439b43bb90655e17f00c9db5759909a712", "tree": "386ec6f2f8ed5475362166cfcd565eb03cc0ef11", "parents": [ "bd1c6869f14f88aa82587ff51303e72dc7eec30e" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:39 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:49:47 2009 -0700" }, "message": "sky2: add GRO support\n\nAdd support for generic receive offload.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd1c6869f14f88aa82587ff51303e72dc7eec30e", "tree": "73b0f1bb457cdf15065b77df847c9af68f49df60", "parents": [ "e9c1be80a7403fb817ec6229ec20a39e377cc4ce" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:38 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:54 2009 -0700" }, "message": "sky2: skb recycling\n\nThis patch implements skb recycling. It reclaims transmitted skb\u0027s\nfor use in the receive ring.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e9c1be80a7403fb817ec6229ec20a39e377cc4ce", "tree": "2abd8532c0c6f62dc9485bd70f603be1bd57bbff", "parents": [ "bf15fe996e050332c018cf63dd51288b081cc556" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:37 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:53 2009 -0700" }, "message": "sky2: reduce default transmit ring\n\nReduce the size of the driver transmit ring to reduce latency\nand allow qdisc to do better rate control. Also make it\nobvious what the minimum transmit ring allowed is and why.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf15fe996e050332c018cf63dd51288b081cc556", "tree": "60aa23279726e73f4649a0039e9f536f1ef72e1b", "parents": [ "6c83504ff24f4a6bf28ad865e7c0619b17349e08" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:36 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:52 2009 -0700" }, "message": "sky2: receive counter update\n\nSince it is likely that there are multiple packets received per\ninterrupt, only update the receive counters once after all\npackets are processed.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c83504ff24f4a6bf28ad865e7c0619b17349e08", "tree": "1c1ff9bd9a2d857b9b5a488b80b839236c9ae07b", "parents": [ "1fd82f3cafa8e7854db08eccbdb8a9218225e1ef" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:35 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:51 2009 -0700" }, "message": "sky2: fix shutdown synchronization\n\nThe logic in sky2_down was incorrect. Receiver could report status\nafter rx_stop was called.\n\nThe steps need to be:\n * stop new frames from being transmitted\n * shut off transmit/receive logic\n * synchronize with NAPI to process status info about transmitter\n and receiver\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1fd82f3cafa8e7854db08eccbdb8a9218225e1ef", "tree": "3bb1e16a67381ceaa56c7bb44a4909b551c6933f", "parents": [ "c0bad0f2e4366d5bbfe0c4a7a80bca8f4b05272b" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:34 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:50 2009 -0700" }, "message": "sky2: PCI irq issues\n\nAdd some read\u0027s to avoid any PCI posting issues when controlling\nirq\u0027s.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c0bad0f2e4366d5bbfe0c4a7a80bca8f4b05272b", "tree": "183e29403c3e89d08524ee911c735fb3c40777e3", "parents": [ "d104acaf0540aee527d22eafd14b0a3d30be7f81" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:49 2009 -0700" }, "message": "sky2: more receive shutdown\n\nReset more parts of the receive path when device is take offline.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d104acaf0540aee527d22eafd14b0a3d30be7f81", "tree": "022233f61b944f888a943e8ed5352db89c1662fd", "parents": [ "4bb3f522077f6b10531451f50c376d6137ebd364" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jun 17 07:30:32 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:48 2009 -0700" }, "message": "sky2: turn off pause during shutdown\n\nThis unblocks the chip if it is stuck in pause cycle during\nshutdown.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4bb3f522077f6b10531451f50c376d6137ebd364", "tree": "2cc9236355863d196ca9833ef3f77abfc5d8f1b0", "parents": [ "c2f3f3a2fe4e35db352cfe1176e384e36bfd91b1" ], "author": { "name": "françois romieu", "email": "romieu@fr.zoreil.com", "time": "Wed Jun 17 11:41:45 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:47 2009 -0700" }, "message": "r8169: do not bring device down when suspending\n\nStopping all activity through ChipCmd and blindly acking the irqs\nis neither nice nor completely needed: the transition to low-power\nmode does enough work and it apparently keeps the device in a sane\nstate.\n\nPatch suggested by a fix for http://bugzilla.kernel.org/show_bug.cgi?id\u003d9512\n\nThe rtl_shutdown path is kept unchanged so far.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nTested-by: Anders Eriksson \u003caeriksson@fastmail.fm\u003e\nCc: Edward Hsu \u003cedward_hsu@realtek.com.tw\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2f3f3a2fe4e35db352cfe1176e384e36bfd91b1", "tree": "28abad21db7632288692371f62d8c47108bfeeaa", "parents": [ "fb1001f3de1a8576b25d929502f1fe7865ff32dc" ], "author": { "name": "françois romieu", "email": "romieu@fr.zoreil.com", "time": "Wed Jun 17 11:43:11 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:46 2009 -0700" }, "message": "sis190: use an adequate phy list entry as a fallback\n\nWhen sis190 driver is trying to get default phy, if it doesn\u0027t find home\nor lan phy, it falls back to the first phy in the phy list but list_entry()\npoints to a bogus entry. list_first_entry() should be used instead.\n\nSigned-off-by: Arnaud Patard \u003capatard@mandriva.com\u003e\nAcked-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fb1001f3de1a8576b25d929502f1fe7865ff32dc", "tree": "afb9115df813d278e7747ccfc6c138464fe92a23", "parents": [ "f3a32500ba8f3ec9ee0c12836fcfd315f1256db4" ], "author": { "name": "Haiying Wang", "email": "Haiying.Wang@freescale.com", "time": "Wed Jun 17 13:16:10 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:45 2009 -0700" }, "message": "net/ucc_geth: Add SGMII support for UCC GETH driver\n\n-- derived from reverted commit 047584ce94108012288554a5f84585d792cc7f8f\n-- reworked by Grant Likely to play nice with commit:\n \"net: Rework ucc_geth driver to use of_mdio infrastructure\"\n (0b9da337dca972e7a4144e298ec3adb8f244d4a4)\n\nSigned-off-by: Haiying Wang \u003cHaiying.Wang@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3a32500ba8f3ec9ee0c12836fcfd315f1256db4", "tree": "fecc1148c135213d6f82130de46e6196e57a59a8", "parents": [ "603a8bbe62e54108055fca46ecdd611c10c6cd0a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jun 17 13:16:04 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:46:43 2009 -0700" }, "message": "Revert \"net/ucc_geth: Add SGMII support for UEC GETH driver\"\n\nThis reverts commit 047584ce94108012288554a5f84585d792cc7f8f.\n\nThis patch meshes badly with \"net: Rework ucc_geth driver to use\nof_mdio infrastructure\" (0b9da337dca972e7a4144e298ec3adb8f244d4a4).\nSince most of the patch needs to be reworked, it is clearer to revert\nthe patch and then apply the corrected version\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b71a107c66ad952c9d35ec046a803efc89a80556", "tree": "eb1f77af4f14974ba40a413d7679b3a451295a3d", "parents": [ "4b337c5f245b6587ba844ac7bb13c313a2912f7b", "e7c5a4f292e0d1f4ba9a3a94b2c8e8b71e35b25a" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Jun 18 11:22:08 2009 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Jun 18 11:22:08 2009 +1000" }, "message": "Merge commit \u0027gcl/merge\u0027 into next\n\nManual merge of:\n\tdrivers/net/fec_mpc52xx.c\n" }, { "commit": "4b337c5f245b6587ba844ac7bb13c313a2912f7b", "tree": "999c6a6580b76a083c8efb9dabff709d1c49fcd0", "parents": [ "492b057c426e4aa747484958e18e9da29003985d", "3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Jun 18 11:16:55 2009 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Jun 18 11:16:55 2009 +1000" }, "message": "Merge commit \u0027origin/master\u0027 into next\n" }, { "commit": "aa2638a210ab0d7c6702cd54315365785fce326c", "tree": "ccc6a99248a1e914fbb90a466b76c98e4f083bc6", "parents": [ "b069e8ed4d5054b1fcd31a98bb2053bde645202f", "ea4431906d86686e541de527915ccbe556761b16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 17 09:50:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 17 09:50:44 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:\n [SCSI] aic79xx: make driver respect nvram for IU and QAS settings\n [SCSI] don\u0027t attach ULD to Dell Universal Xport\n [SCSI] lpfc 8.3.3 : Update driver version to 8.3.3\n [SCSI] lpfc 8.3.3 : Add support for Target Reset handler entrypoint\n [SCSI] lpfc 8.3.3 : Fix a couple of spin_lock and memory issues and a crash\n [SCSI] lpfc 8.3.3 : FC/FCOE discovery fixes\n [SCSI] lpfc 8.3.3 : Fix various SLI-3 vs SLI-4 differences\n [SCSI] qla2xxx: Resolve a performance issue in interrupt\n [SCSI] cnic, bnx2i: Fix build failure when CONFIG_PCI is not set.\n [SCSI] nsp_cs: time_out reaches -1\n [SCSI] qla2xxx: fix printk format warnings\n [SCSI] ncr53c8xx: div reaches -1\n [SCSI] compat: don\u0027t perform unneeded copy in sg_io code\n [SCSI] zfcp: Update FC pass-through support\n [SCSI] zfcp: Add FC pass-through support\n [SCSI] FC Pass Thru support\n" }, { "commit": "1d4ac5d5ef9dd965ae211ebe8acbf83dc4d9571b", "tree": "3e4add1849b94096a1eaf8f4f541d15aea580720", "parents": [ "d77eeb702cba0fa6efaf5689fce8939aa617f410" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 16 16:56:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 04:31:20 2009 -0700" }, "message": "phy_device: fix parameter name in kernel-doc\n\nFix kernel-doc parameter name in phy_device.c.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d77eeb702cba0fa6efaf5689fce8939aa617f410", "tree": "a78a54d0f421364c17260d92ce7b240bfbaf6fd3", "parents": [ "5dbc901172fb952409940cd7ca55d8e6e5a7cc2c" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 15 23:33:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 04:31:16 2009 -0700" }, "message": "net: fix network drivers ndo_start_xmit() return values\n\nFix up remaining drivers returning a magic or an errno value from their\nndo_start_xmit() functions that were missed in the first pass:\n\n- isdn_net: missed conversion\n- bpqether: missed conversion: skb is freed, so return NETDEV_TX_OK\n- hp100: intention appears to be to resubmit skb once resources are\n available, but due to no queue handling it is dropped for now.\n- lapbether: skb is freed, so return NETDEV_TX_OK\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5dbc901172fb952409940cd7ca55d8e6e5a7cc2c", "tree": "db90856015b0373b3b545901db2d98f88fef4039", "parents": [ "a42fc8f6943127787ad2a416436cf211d5531229" ], "author": { "name": "Sivakumar Subramani", "email": "Sivakumar.Subramani@neterion.com", "time": "Tue Jun 16 18:48:55 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 04:31:14 2009 -0700" }, "message": "vxge: Enable SRIOV support in the driver.\n\n- Enabled SRIOV support in the driver.\n- Call __vxge_hw_verify_pci_e_info() for the PF only. This function\n verifies the negotiated link width and current link speed in the\n Link Status Register (offset 12h) which are reserved fields for VFs\n as per the SRIOV specification, section 3.5.8.\n- Implemented David Miller\u0027s comment to remove the #ifdef CONFIG_PCI_IOV as\n these intefaces have NOP versions declared when the defintion is not set.\n\nSigned-off-by: Sivakumar Subramani \u003csivakumar.subramani@neterion.com\u003e\nSigned-off-by: Rastapur Santosh \u003csantosh.rastapur@neterion.com\u003e\nSigned-off-by: Ramkrishna Vepa \u003cram.vepa@neterion.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05e9e61a2e742d33ed24392d989fff912a68d04f", "tree": "dbf690d98e44aae52650a9cfa46626a7b4e5f956", "parents": [ "14ebaf81e13ce66bff275380b246796fd16cbfa1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 01:36:23 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 01:36:23 2009 -0700" }, "message": "sonic: Fix build after ndo_start_xmit() changes.\n\nNoticed by Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87c441e54dfcf9f45593ecaf68e7e18ea53d5e13", "tree": "6a986caab77412a90ffe8c5d8788bc1216b10ed8", "parents": [ "c155ee10c212254e9cdfe7b3eab4e8c13990c231" ], "author": { "name": "Wolfgang Denk", "email": "wd@denx.de", "time": "Wed Jun 17 00:30:22 2009 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jun 17 00:30:22 2009 -0600" }, "message": "powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function\n\nSo far, MPC512x used mpc512x_find_ips_freq() to get the bus frequency,\nwhile MPC52xx used mpc52xx_find_ipb_freq(). Despite the different\nclock names (IPS vs. IPB) the code was identical.\n\nUse common code for both processor families.\n\nSigned-off-by: Wolfgang Denk \u003cwd@denx.de\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "492b057c426e4aa747484958e18e9da29003985d", "tree": "34e08c24618688d8bcc190523028b5f94cce0c0b", "parents": [ "313485175da221c388f6a8ecf4c30062ba9bea17", "300df7dc89cc276377fc020704e34875d5c473b6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 17 10:24:53 2009 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 17 10:24:53 2009 +1000" }, "message": "Merge commit \u0027origin/master\u0027 into next\n" }, { "commit": "6fd03301d76bc439382710e449f58efbb233df1b", "tree": "3c8a3217aed67319683ffc1debccdb5b3245b16c", "parents": [ "cd5232bd6be2d215a800f3d88c287ca791debfbe", "e4792aa30f9d33584d7192685ed149cc5fee737f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 12:57:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 12:57:37 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (64 commits)\n debugfs: use specified mode to possibly mark files read/write only\n debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.\n xen: remove driver_data direct access of struct device from more drivers\n usb: gadget: at91_udc: remove driver_data direct access of struct device\n uml: remove driver_data direct access of struct device\n block/ps3: remove driver_data direct access of struct device\n s390: remove driver_data direct access of struct device\n parport: remove driver_data direct access of struct device\n parisc: remove driver_data direct access of struct device\n of_serial: remove driver_data direct access of struct device\n mips: remove driver_data direct access of struct device\n ipmi: remove driver_data direct access of struct device\n infiniband: ehca: remove driver_data direct access of struct device\n ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device\n hvcs: remove driver_data direct access of struct device\n xen block: remove driver_data direct access of struct device\n thermal: remove driver_data direct access of struct device\n scsi: remove driver_data direct access of struct device\n pcmcia: remove driver_data direct access of struct device\n PCIE: remove driver_data direct access of struct device\n ...\n\nManually fix up trivial conflicts due to different direct driver_data\ndirect access fixups in drivers/block/{ps3disk.c,ps3vram.c}\n" }, { "commit": "609106b9ac968adbc76ce78c979fc3903a56e16c", "tree": "4af8b305ab4095870a927ffdb9a5e14eb2107401", "parents": [ "69257cae20640a396f03aa0bf169b815ba66a58a", "42e27bfc4bfa42bd905e53be93d862b8e3d80a00" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 11:30:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 11:30:37 2009 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (38 commits)\n ps3flash: Always read chunks of 256 KiB, and cache them\n ps3flash: Cache the last accessed FLASH chunk\n ps3: Replace direct file operations by callback\n ps3: Switch ps3_os_area_[gs]et_rtc_diff to EXPORT_SYMBOL_GPL()\n ps3: Correct debug message in dma_ioc0_map_pages()\n drivers/ps3: Add missing annotations\n ps3fb: Use ps3_system_bus_[gs]et_drvdata() instead of direct access\n ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct access\n ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata\n ps3: Use dev_[gs]et_drvdata() instead of direct access for system bus devices\n block/ps3: remove driver_data direct access of struct device\n ps3vram: Make ps3vram_priv.reports a void *\n ps3vram: Remove no longer used ps3vram_priv.ddr_base\n ps3vram: Replace mutex by spinlock + bio_list\n block: Add bio_list_peek()\n powerpc: Use generic atomic64_t implementation on 32-bit processors\n lib: Provide generic atomic64_t implementation\n powerpc: Add compiler memory barrier to mtmsr macro\n powerpc/iseries: Mark signal_vsp_instruction() as maybe unused\n powerpc/iseries: Fix unused function warning in iSeries DT code\n ...\n" }, { "commit": "a1870b9cc280fe16fed13994810f8a1687be3bcf", "tree": "d482018f5cc8ff0412c0c4d02f984960a5ec2385", "parents": [ "6cc90a5a6061428358d0f726a53fb44af5254111", "1fa6f4af9f55bc1b753af04276984429d6b5a613" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 16 02:27:12 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 16 02:27:12 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "6cc90a5a6061428358d0f726a53fb44af5254111", "tree": "963a86a2f6adf2398938813d45ca8ba83831c6bc", "parents": [ "9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jun 11 07:03:47 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 16 02:25:42 2009 -0700" }, "message": "sky2: don\u0027t look for VPD size\n\nThe code to compute VPD size didn\u0027t handle some systems that use\nchip without VPD. Also some of the newer chips use some additional\nregisters to store the actual size, and wasn\u0027t worth putting the\nadditional complexity in, so just remove the code.\n\nNo big loss since the code to set the VPD size was only a\nconvenience so that utilities would not read the extra space past\nthe end of the available VPD.\n\nMove the first PCI config read earlier to detect bad hardware\nwhere it returns all ones and refuse loading driver before furthur\ndamage.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nTested-by: Andy Whitcroft \u003capw@canonical.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "156f5a7801195fa2ce44aeeb62d6cf8468f3332a", "tree": "dd506816ca6f14bb650189aa364eb0a2f51ad5cc", "parents": [ "1b713e00500c6f03317742981674e89a21629399" ], "author": { "name": "GeunSik Lim", "email": "leemgs1@gmail.com", "time": "Tue Jun 02 15:01:37 2009 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 15 21:30:28 2009 -0700" }, "message": "debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.\n\nMany developers use \"/debug/\" or \"/debugfs/\" or \"/sys/kernel/debug/\"\ndirectory name to mount debugfs filesystem for ftrace according to\n./Documentation/tracers/ftrace.txt file.\n\nAnd, three directory names(ex:/debug/, /debugfs/, /sys/kernel/debug/) is\nexisted in kernel source like ftrace, DRM, Wireless, Documentation,\nNetwork[sky2]files to mount debugfs filesystem.\n\ndebugfs means debug filesystem for debugging easy to use by greg kroah\nhartman. \"/sys/kernel/debug/\" name is suitable as directory name\nof debugfs filesystem.\n- debugfs related reference: http://lwn.net/Articles/334546/\n\nFix inconsistency of directory name to mount debugfs filesystem.\n\n* From Steven Rostedt\n - find_debugfs() and tracing_files() in this patch.\n\nSigned-off-by: GeunSik Lim \u003cgeunsik.lim@samsung.com\u003e\nAcked-by : Inaky Perez-Gonzalez \u003cinaky@linux.intel.com\u003e\nReviewed-by : Steven Rostedt \u003crostedt@goodmis.org\u003e\nReviewed-by : James Smart \u003cjames.smart@emulex.com\u003e\nCC: Jiri Kosina \u003ctrivial@kernel.org\u003e\nCC: David Airlie \u003cairlied@linux.ie\u003e\nCC: Peter Osterlund \u003cpetero2@telia.com\u003e\nCC: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCC: Anil S Keshavamurthy \u003canil.s.keshavamurthy@intel.com\u003e\nCC: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "1b713e00500c6f03317742981674e89a21629399", "tree": "28effcbb622d14f72b3d2059c6a7db6b0ec124a6", "parents": [ "839214aeaae1866d55e745c676206825f8ba7e99" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon May 04 12:40:54 2009 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 15 21:30:28 2009 -0700" }, "message": "xen: remove driver_data direct access of struct device from more drivers\n\nIn the near future, the driver core is going to not allow direct access\nto the driver_data pointer in struct device. Instead, the functions\ndev_get_drvdata() and dev_set_drvdata() should be used. These functions\nhave been around since the beginning, so are backwards compatible with\nall older kernel versions.\n\nCc: xen-devel@lists.xensource.com\nCc: virtualization@lists.osdl.org\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nCc: Jeremy Fitzhardinge \u003cjeremy@xensource.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d405640539555b601e52f7d18f1f0b1345d18bf5", "tree": "6a748c0acea0fa72c732d2f188e57153418395e0", "parents": [ "6fcf53acccf85b4b0d0260e66c692a341760f464" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Thu Apr 30 15:23:42 2009 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 15 21:30:25 2009 -0700" }, "message": "Driver Core: misc: add nodename support for misc devices.\n\nThis adds support for misc devices to report their requested nodename to\nuserspace. It also updates a number of misc drivers to provide the\nneeded subdirectory and device name to be used for them.\n\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Jan Blunck \u003cjblunck@suse.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "cadeba315cc91ae1b57632e61b0cec3a4ed7088d", "tree": "e061f57ec4afa217ca97ce22ab122c9ce79fbeb9", "parents": [ "ed62acec209fa7e104b9d7871c1e5307fab83bf0" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed May 27 00:49:36 2009 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 15 21:30:25 2009 -0700" }, "message": "firmware: wireless/libertas: prepare for FIRMWARE_NAME_MAX removal\n\nWe\u0027re going to remove the FIRMWARE_NAME_MAX definition in order to avoid any\nfirmware name length restriction.\nThis patch eplaces the shared FIRMWARE_NAME_MAX definition with a libertas\nlocal one.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nAcked-by: Dan Williams \u003cdcbw@redhat.com\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "48dce82cd6df71c8e7cddc79d787735b109ee0a3", "tree": "411a534e8292eb8f54fc7052d011d624f2fc8f70", "parents": [ "9317726de42a157c377f7fe9110a63260800582f" ], "author": { "name": "Geert Uytterhoeven", "email": "Geert.Uytterhoeven@sonycom.com", "time": "Wed Jun 10 04:38:58 2009 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jun 16 14:15:44 2009 +1000" }, "message": "net/ps3: gelic - Add missing annotations\n\nprobe functions should be __devinit\n\nSigned-off-by: Geert Uytterhoeven \u003cGeert.Uytterhoeven@sonycom.com\u003e\nAcked-by: Geoff Levand \u003cgeoffrey.levand@am.sony.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "f0e9a8606ce60880249fd570fbebf4472c3d37c0", "tree": "e69b613875d4910ff7cf89846d397b914b5e4e22", "parents": [ "7fe96a16486fb617a26b39a4895c7522c50fc555" ], "author": { "name": "Gabor Juhos", "email": "juhosg@openwrt.org", "time": "Mon Jun 15 17:49:11 2009 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:59 2009 -0400" }, "message": "ath9k: process rx packet if we are waiting for CAB\n\nIf we are in PS mode, we have to process the received frame if\nthe SC_OP_WAIT_FOR_CAB bit is set.\n\nChanges-licensed-under: ISC\nSigned-off-by: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7fe96a16486fb617a26b39a4895c7522c50fc555", "tree": "09ddf9096cbd23df7167b0f22883e4a74263e7ac", "parents": [ "3989279ccc838c7357c75af6090f56f5cb555158" ], "author": { "name": "Gabor Juhos", "email": "juhosg@openwrt.org", "time": "Mon Jun 15 17:49:10 2009 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:58 2009 -0400" }, "message": "ath9k: prevent sleeping while we are waiting for CAB\n\nWe have to remain awake if the SC_OP_WAIT_FOR_CAB flag is set.\n\nChanges-licensed-under: ISC\nSigned-off-by: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3989279ccc838c7357c75af6090f56f5cb555158", "tree": "6d87843d328e5025e697ebc412f43ac4ee736096", "parents": [ "624f0de44afa9fbb4ec8396f88d8d54b96a57a7e" ], "author": { "name": "Gabor Juhos", "email": "juhosg@openwrt.org", "time": "Mon Jun 15 17:49:09 2009 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:58 2009 -0400" }, "message": "ath9k: restore power mode on error path\n\nThe ath9k_ps_{wakeup,restore} calls must be in balance.\n\nChanges-licensed-under: ISC\nSigned-off-by: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3b319aae4244f9b4758212605f67cf63207a4fa1", "tree": "52a06f91c8a4d8784904bb46cbc2a0581ece7069", "parents": [ "159cd468bc885f7a2fbc75bbfe782782e52ef9c9" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Sat Jun 13 14:50:26 2009 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:57 2009 -0400" }, "message": "ath9k: port to cfg80211 rfkill\n\nThis ports the ath9k rfkill code to the new API offered by\ncfg80211 and thus removes a lot of useless stuff.\n\n(\"With this series a kernel panic, which is a regression, during module\nunload disappears.\" -- Vasanthakumar Thiagarajan \u003cvasanth@atheros.com\u003e\n\nOther patches in the series:\n\n ath9k: Add helper to get ath9k specific current channel\n ath9k: Make sure we have current channel in ah_curchan before rf\n disable/enable\n\n-- JWL)\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: Luis Rodriguez \u003cmcgrof@gmail.com\u003e\nTested-by: Vasanthakumar Thiagarajan \u003cvasanth@atheros.com\u003e\nSigned-off-by: Vasanthakumar Thiagarajan \u003cvasanth@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "159cd468bc885f7a2fbc75bbfe782782e52ef9c9", "tree": "3985624889b896a5d87f3ba6b0221ebb1a2cab85", "parents": [ "82880a7cf9c059c11cd6ad1868c48969956f966b" ], "author": { "name": "Vasanthakumar Thiagarajan", "email": "vasanth@atheros.com", "time": "Sat Jun 13 14:50:25 2009 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:57 2009 -0400" }, "message": "ath9k: Make sure we have current channel in ah_curchan before rf disable/enable\n\nSigned-off-by: Vasanthakumar Thiagarajan \u003cvasanth@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "82880a7cf9c059c11cd6ad1868c48969956f966b", "tree": "b17f8870a90cbc7d274bffab0961b4feb0235519", "parents": [ "35edf8aae8f903b154d658b9a7eed0d5c1a4a814" ], "author": { "name": "Vasanthakumar Thiagarajan", "email": "vasanth@atheros.com", "time": "Sat Jun 13 14:50:24 2009 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:56 2009 -0400" }, "message": "ath9k: Add helper to get ath9k specific current channel\n\nSigned-off-by: Vasanthakumar Thiagarajan \u003cvasanth@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "35edf8aae8f903b154d658b9a7eed0d5c1a4a814", "tree": "3e833fa8a0b776c233138a8d9c683515b63d9a90", "parents": [ "8a9b99267cb3b51d4e59693c03e1204d86b42445" ], "author": { "name": "Nick Kossifidis", "email": "mickflemm@gmail.com", "time": "Fri Jun 12 16:09:53 2009 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:53 2009 -0400" }, "message": "ath5k: fix mesh beaconing\n\nThis patch is from Nick Kossifidis but he forgot to send it. It ensures\nthat the beacon queue gets started in mesh mode as well, otherwise ath5k\nwill not beacon in mesh point mode.\n\nAt this time, we still need to issue a scan before mesh beaconing will\nwork but that appears to be a separate problem.\n\nSigned-off-by: Andrey Yurovsky \u003candrey@cozybit.com\u003e\nSigned-off-by: Nick Kossifidis \u003cmickflemm@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8a9b99267cb3b51d4e59693c03e1204d86b42445", "tree": "78d92df7a96f786820148b63c53cd40a53117587", "parents": [ "611d3eb72aa7847a1081e6c1ac05fd2012652cde" ], "author": { "name": "Abhijeet Kolekar", "email": "abhijeet.kolekar@intel.com", "time": "Fri Jun 12 13:22:52 2009 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:53 2009 -0400" }, "message": "iwlwifi/iwl3945: fix suspend resume association bug\n\nPatch fixes the following bugs at\nhttp://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id\u003d2005\nhttp://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id\u003d2007\n\nIf we suspend with an association and then resumed,\nwe need to synchronize the active rxon with staging rxon,\nelse we will get an error when iwl_alive_start try to commit\nrxon and staging is set to channel 0. Before going to suspend\nstaging and active rxon are in sync. After resuming from the\nsuspend, iwl_mac_start is called and it clears the staging\nrxon. Patch fixes the bug by not clearing the staging rxon\nin iwl_mac_start.\n\nPatch also adds similar fix to 3945.\n\nSigned-off-by: Abhijeet Kolekar \u003cabhijeet.kolekar@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "611d3eb72aa7847a1081e6c1ac05fd2012652cde", "tree": "3b14c4980d8762f30517ec6946353c733b9377a5", "parents": [ "508b08e7121f2083c9e9cd82f10b9088b6bc13fb" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Fri Jun 12 13:22:51 2009 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:52 2009 -0400" }, "message": "iwlwifi: check for channel location for 40MHz\n\nfor both mixed and pure 40MHz, need to check for valid channel location.\nif the specified channel not allow the channel location requested\n(ABOVE, BELOW), then reject the Fat channel access\n\nThis fixes http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id\u003d1988\n\n(\"iwlwifi: checking for 40MHz mode\" and \"iwlwifi: check control channel\nfor pure 40MHz\" combine with this to address the above bug. -- JWL)\n\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "508b08e7121f2083c9e9cd82f10b9088b6bc13fb", "tree": "22a23d6ab5084a3e882ed7143a4347e5c32bba4c", "parents": [ "8e8df3a08c6f3098b54639ee6892e3753ad5f210" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Fri Jun 12 13:22:50 2009 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:52 2009 -0400" }, "message": "iwlwifi: check control channel for pure 40MHz\n\nfor pure 40MHz mode, set the control channel location if provided, but not\nlike Mixed mode; if information is not provided, still allow 40MHz\noperation.\n\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8e8df3a08c6f3098b54639ee6892e3753ad5f210", "tree": "dc03c73142b2587a48fefc4a2fc2c0727cd4cf49", "parents": [ "d7129e190c3107db8ac11a9e51035641b68d2aa7" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Fri Jun 12 13:22:49 2009 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:52 2009 -0400" }, "message": "iwlwifi: checking for 40MHz mode\n\nwhen checking for 40MHz, compare ht_protection to\nIEEE80211_HT_OP_MODE_PROTECTION_20MHZ. ht_protection is not a bit-mask\nfield\n\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d7129e190c3107db8ac11a9e51035641b68d2aa7", "tree": "5ff7d6bb71d3f37121c415ff049031dcb44e3e44", "parents": [ "87e501b351ed9d837e63f6506b7e66331a69ed58" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Fri Jun 12 13:22:48 2009 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:52 2009 -0400" }, "message": "iwlwifi: revamp bss_info_changed\n\nMy earlier patch,\n\t\"mac80211: unify config_interface and bss_info_changed\"\nintroduced a bug in iwlwifi where it will do some things\nincorrectly now when reassociating.\n\nRevamp iwl_bss_info_changed to fix that issue and make it\neasier to read. Also, while at it, add comments about things\nthat it should do but currently doesn\u0027t.\n\nFinally, also improve the locking in the function.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "87e501b351ed9d837e63f6506b7e66331a69ed58", "tree": "7dad95c4413bff47f6f7de41b1e656d989157a47", "parents": [ "b3781c74373489fa325ce64efdf72f6c8567b783" ], "author": { "name": "Sebastian Andrzej Siewior", "email": "bigeasy@linutronix.de", "time": "Fri Jun 12 21:37:31 2009 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:52 2009 -0400" }, "message": "net/libertas: don\u0027t recursive spin lock in if_spi_e2h()\n\n|BUG: spinlock recursion on CPU#0, lbs_spi_thread/1030\n| lock: dee9a1bc, .magic: dead4ead, .owner: lbs_spi_thread/1030, .owner_cpu: 0\n|Call Trace:\n|[deec3eb0] [c0007220] show_stack+0x4c/0x15c (unreliable)\n|[deec3ef0] [c0187720] spin_bug+0x9c/0xb0\n|[deec3f10] [c0187890] _raw_spin_lock+0x54/0x148\n|[deec3f40] [c02d260c] _spin_lock_irqsave+0x2c/0x44\n|[deec3f60] [e8671800] lbs_queue_event+0x7c/0x130 [libertas]\n|[deec3f80] [e8725f04] lbs_spi_thread+0x538/0x58c [libertas_spi]\n|[deec3fe0] [c004f270] kthread+0x4c/0x88\n|[deec3ff0] [c000f33c] kernel_thread+0x4c/0x68\n\nif_spi_e2h() is grabbing -\u003edriver_lock just while calling\nlbs_queue_event() which is grabbing the same lock.\n\nSigned-off-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b3781c74373489fa325ce64efdf72f6c8567b783", "tree": "d715fc68a73b3ef8cf697d4cce8b5f790f513260", "parents": [ "68f2d02669f7102be80aae47155f45e18950d223" ], "author": { "name": "Andrey Yurovsky", "email": "andrey@cozybit.com", "time": "Fri Jun 12 12:45:36 2009 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 15 15:05:51 2009 -0400" }, "message": "libertas: fix IEEE PS mode in GSPI driver\n\nThe card firmware does not set the Command Download Ready interrupt bit\nwhen IEEE PS mode is enabled, preventing the driver from sending\ncommands (such as the command to exit IEEE PS mode) since there is no\nindication that the card is ready to accept commands.\n\nThis patch works around the problem by using the the TX Download Ready\nbit in place of the Command Download Ready Bit while in IEEE PS mode.\nTX Download Ready is set in IEEE PS mode.\n\nSigned-off-by: Andrey Yurovsky \u003candrey@cozybit.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2ed0e21b30b53d3a94e204196e523e6c8f732b56", "tree": "de2635426477d86338a9469ce09ba0626052288f", "parents": [ "0fa213310cd8fa7a51071cdcf130e26fa56e9549", "9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 15 09:40:05 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 15 09:40:05 2009 -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: (1244 commits)\n pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US\n ipv4: Fix fib_trie rebalancing\n Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver\n Bluetooth: Fix Kconfig issue with RFKILL integration\n PIM-SM: namespace changes\n ipv4: update ARPD help text\n net: use a deferred timer in rt_check_expire\n ieee802154: fix kconfig bool/tristate muckup\n bonding: initialization rework\n bonding: use is_zero_ether_addr\n bonding: network device names are case sensative\n bonding: elminate bad refcount code\n bonding: fix style issues\n bonding: fix destructor\n bonding: remove bonding read/write semaphore\n bonding: initialize before registration\n bonding: bond_create always called with default parameters\n x_tables: Convert printk to pr_err\n netfilter: conntrack: optional reliable conntrack event delivery\n list_nulls: add hlist_nulls_add_head and hlist_nulls_del\n ...\n" }, { "commit": "0fa213310cd8fa7a51071cdcf130e26fa56e9549", "tree": "2a7e5cc33c8938ec82604a99c3797a3132fd91ec", "parents": [ "d3bf80bff13597004b5724ee4549cd68eb0badf0", "bc47ab0241c7c86da4f5e5f82fbca7d45387c18d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 15 09:32:52 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 15 09:32:52 2009 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)\n powerpc: Fix bug in move of altivec code to vector.S\n powerpc: Add support for swiotlb on 32-bit\n powerpc/spufs: Remove unused error path\n powerpc: Fix warning when printing a resource_size_t\n powerpc/xmon: Remove unused variable in xmon.c\n powerpc/pseries: Fix warnings when printing resource_size_t\n powerpc: Shield code specific to 64-bit server processors\n powerpc: Separate PACA fields for server CPUs\n powerpc: Split exception handling out of head_64.S\n powerpc: Introduce CONFIG_PPC_BOOK3S\n powerpc: Move VMX and VSX asm code to vector.S\n powerpc: Set init_bootmem_done on NUMA platforms as well\n powerpc/mm: Fix a AB-\u003eBA deadlock scenario with nohash MMU context lock\n powerpc/mm: Fix some SMP issues with MMU context handling\n powerpc: Add PTRACE_SINGLEBLOCK support\n fbdev: Add PLB support and cleanup DCR in xilinxfb driver.\n powerpc/virtex: Add ml510 reference design device tree\n powerpc/virtex: Add Xilinx ML510 reference design support\n powerpc/virtex: refactor intc driver and add support for i8259 cascading\n powerpc/virtex: Add support for Xilinx PCI host bridge\n ...\n" }, { "commit": "babdb788f7ec1a782a52240a5f6dae568f32565f", "tree": "a1c4cdc0618b9568c6a2dff798beaa1dcd2277e0", "parents": [ "0454c7408ac533a0690cb308554a4ed304270c3d" ], "author": { "name": "Michael Chan", "email": "mchan@broadcom.com", "time": "Wed Jun 10 13:35:28 2009 -0700" }, "committer": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Mon Jun 15 10:09:31 2009 -0500" }, "message": "[SCSI] cnic, bnx2i: Fix build failure when CONFIG_PCI is not set.\n\nCNIC and BNX2I must depend on PCI. Dependencies do not get\npropagated through select.\n\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\n" }, { "commit": "9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb", "tree": "8d104ec2a459346b99413b0b77421ca7b9936c1a", "parents": [ "ca44d6e60f9de26281fda203f58b570e1748c015", "45e3e1935e2857c54783291107d33323b3ef33c8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 15 03:02:23 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 15 03:02:23 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/scsi/fcoe/fcoe.c\n\tnet/core/drop_monitor.c\n\tnet/core/net-traces.c\n" }, { "commit": "03fa68c245cccbcb99035cbabaa13b408ba91ab5", "tree": "b6190d60db6302fd9b84c3aac50bf75b7351f70c", "parents": [ "9f08e9db84c1e9234e07b9b595f5b2508c621823" ], "author": { "name": "Geert Uytterhoeven", "email": "Geert.Uytterhoeven@sonycom.com", "time": "Wed Jun 10 04:38:54 2009 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jun 15 16:47:24 2009 +1000" }, "message": "ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata\n\nSigned-off-by: Geert Uytterhoeven \u003cGeert.Uytterhoeven@sonycom.com\u003e\nCc: Geoff Levand \u003cgeoffrey.levand@am.sony.com\u003e\nCc: Jim Paris \u003cjim@jtan.com\u003e\nAcked-by: Geoff Levand \u003cgeoffrey.levand@am.sony.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "7dafd239ab522d38979ebe44d79aa68ad7b1a383", "tree": "04754a0c6495e57c1fe5f417fbfc99272d353c0e", "parents": [ "bc47ab0241c7c86da4f5e5f82fbca7d45387c18d", "45e3e1935e2857c54783291107d33323b3ef33c8" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jun 15 10:36:54 2009 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jun 15 10:36:54 2009 +1000" }, "message": "Merge commit \u0027origin/master\u0027 into next\n" }, { "commit": "cf5046323ea254be72535648a9d090b18b8510f3", "tree": "d44894722bd965b2f28a54c4dc4157f22b618c34", "parents": [ "ae937debe178b4327fd67d604ee83a20f22aa0de", "8d34ff34016959d464fd5582ea6a8226fe57ab0e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 14 13:53:22 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 14 13:53:22 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n mlx4_core: Don\u0027t double-free IRQs when falling back from MSI-X to INTx\n IB/mthca: Don\u0027t double-free IRQs when falling back from MSI-X to INTx\n IB/mlx4: Add strong ordering to local inval and fast reg work requests\n IB/ehca: Remove superfluous bitmasks from QP control block\n RDMA/cxgb3: Limit fast register size based on T3 limitations\n RDMA/cxgb3: Report correct port state and MTU\n mlx4_core: Add module parameter for number of MTTs per segment\n IB/mthca: Add module parameter for number of MTTs per segment\n RDMA/nes: Fix off-by-one bugs in reset_adapter_ne020() and init_serdes()\n infiniband: Remove void casts\n IB/ehca: Increment version number\n IB/ehca: Remove unnecessary memory operations for userspace queue pairs\n IB/ehca: Fall back to vmalloc() for big allocations\n IB/ehca: Replace vmalloc() with kmalloc() for queue allocation\n" }, { "commit": "489f7ab6c18cdd64a2d444e056d60a0e722f4ad7", "tree": "2c7ed6a0042dc15c91ece08c5a3866f610ddca6d", "parents": [ "b322b7816908487c08b89b72f838174c37d8c836", "82d27b2b2f3a80ffa7759a49b9cba39e47df476e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 14 13:46:25 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 14 13:46:25 2009 -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: (31 commits)\n trivial: remove the trivial patch monkey\u0027s name from SubmittingPatches\n trivial: Fix a typo in comment of addrconf_dad_start()\n trivial: usb: fix missing space typo in doc\n trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug\n trivial: Remove the hyphen from git commands\n trivial: fix ETIMEOUT -\u003e ETIMEDOUT typos\n trivial: Kconfig: .ko is normally not included in module names\n trivial: SubmittingPatches: fix typo\n trivial: Documentation/dell_rbu.txt: fix typos\n trivial: Fix Pavel\u0027s address in MAINTAINERS\n trivial: ftrace:fix description of trace directory\n trivial: unnecessary (void*) cast removal in sound/oss/msnd.c\n trivial: input/misc: Fix typo in Kconfig\n trivial: fix grammo in bus_for_each_dev() kerneldoc\n trivial: rbtree.txt: fix rb_entry() parameters in sample code\n trivial: spelling fix in ppc code comments\n trivial: fix typo in bio_alloc kernel doc\n trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt\n trivial: Miscellaneous documentation typo fixes\n trivial: fix typo milisecond/millisecond for documentation and source comments.\n ...\n" }, { "commit": "2cf4d4514d5b43c1f3b64bd0ec8b9853bde8f1dc", "tree": "e35a625496acc6ac852846d40b8851186b9d1ac4", "parents": [ "44b7532b8b464f606053562400719c9c21276037", "ce53895a5d24e0ee19fb92f56c17323fb4c9ab27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 14 13:42:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 14 13:42:43 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)\n MAINTAINERS: EB110ATX is not ebsa110\n MAINTAINERS: update Eric Miao\u0027s email address and status\n fb: add support of LCD display controller on pxa168/910 (base layer)\n [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN\n [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines\n [ARM] 5544/1: Trust PrimeCell resource sizes\n [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.\n [ARM] pxa/sharpsl_pm: drop set_irq_type calls\n [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one\n [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it\u0027s now pxa specific\n [ARM] sa1100: remove unused collie_pm.c\n [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]\n [ARM] 5550/1: Add default configure file for w90p910 platform\n [ARM] 5549/1: Add clock api for w90p910 platform.\n [ARM] 5548/1: Add gpio api for w90p910 platform\n [ARM] 5551/1: Add multi-function pin api for w90p910 platform.\n [ARM] Make ARM_VIC_NR depend on ARM_VIC\n [ARM] 5546/1: ARM PL022 SSP/SPI driver v3\n ARM: OMAP4: SMP: Update defconfig for OMAP4430\n ARM: OMAP4: SMP: Enable SMP support for OMAP4430\n ...\n" }, { "commit": "8d34ff34016959d464fd5582ea6a8226fe57ab0e", "tree": "63523621aa0b1f5811916297b7ea7e505157e4d0", "parents": [ "3026c19a14ba71ccd4dc4925abab9395ea12839c", "25a52393270ca48c7d0848672ad4423313033c3d", "5b891a9332dc4212bf166a4506092fbcd60f2319", "2ac6bf4ddc87c3b6b609f8fa82f6ebbffeac12f4", "d1fdf24b4074a8d962f9a28519c99dcdd66bdee3", "28e43a519b9edb8277fc6b490ad17aa38c45a02b" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Jun 14 13:31:19 2009 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Jun 14 13:31:19 2009 -0700" }, "message": "Merge branches \u0027cxgb3\u0027, \u0027ehca\u0027, \u0027misc\u0027, \u0027mlx4\u0027, \u0027mthca\u0027 and \u0027nes\u0027 into for-linus\n" }, { "commit": "d1fdf24b4074a8d962f9a28519c99dcdd66bdee3", "tree": "ad9a3b623b5f7a23811f68ae95e100119b037635", "parents": [ "9aa0a489d909af0cc36c41d3061ef956c7442ce2" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Jun 14 13:30:45 2009 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Jun 14 13:30:45 2009 -0700" }, "message": "mlx4_core: Don\u0027t double-free IRQs when falling back from MSI-X to INTx\n\nWhen both MSI-X and legacy INTx fail to generate an interrupt, the\ndriver frees the MSI-X interrupts twice. Fix this by clearing the\nhave_irq flag for the MSI-X interrupts when they are freed the first\ntime. This is the same bug that was reported in ib_mthca by Yinghai\nLu \u003cyhlu.kernel@gmail.com\u003e.\n\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "4c31791c3d9d38ac052dd5e2981df713d8f3dcc4", "tree": "b7f95922b2f1da5b36d95176e6d8f826151f3ee1", "parents": [ "98797a241e28b787b84d308b867ec4c5fe7bbdf8", "7517b3fbe40c231d79d36f31c1e9930cbb8c4be2" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sun Jun 14 11:00:16 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jun 14 11:00:16 2009 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel\n" }, { "commit": "181470fcf3f8ecc16625bc45a5f6f678e57bfb22", "tree": "903835cc78e6ff87f3db38508933676c48510bdd", "parents": [ "5c5129b54f2f346c86cd23fea67e71b45f7f84ff" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:52 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:29:04 2009 -0700" }, "message": "bonding: initialization rework\n\nNeed to rework how bonding devices are initialized to make it more\namenable to creating bonding devices via netlink.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5c5129b54f2f346c86cd23fea67e71b45f7f84ff", "tree": "2917749b65942edababa110625ccbb9f7c3d3d06", "parents": [ "373500db927706d1f60785aff40b9884f789b01a" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:51 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:29:03 2009 -0700" }, "message": "bonding: use is_zero_ether_addr\n\nRemove bogus non-portable possibly unaligned way of testing\nfor zero addres..\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "373500db927706d1f60785aff40b9884f789b01a", "tree": "2a9fd664e6ae30c77a63576045c4eb182aaa7033", "parents": [ "6d7ab43ccce5fddeca945ba6b06ba32cda4e3355" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:50 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:29:01 2009 -0700" }, "message": "bonding: network device names are case sensative\n\nThe bonding device acts unlike all other Linux network device functions\nin that it ignores case of device names. The developer must have come\nfrom windows!\n\nCleanup the management of names and use standard routines where possible.\nFlag places where bonding device still doesn\u0027t work right with network\nnamespaces.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6d7ab43ccce5fddeca945ba6b06ba32cda4e3355", "tree": "7492faab7570a039535936d4822f0c69f2eee0be", "parents": [ "3d632c3f28e69f0d6d44aa09c4df708d63a91a7c" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:29:00 2009 -0700" }, "message": "bonding: elminate bad refcount code\n\nThe \"expected_refcount\" stuff in bonding sysfs module is a mistake.\nSysfs does proper refcounting, and it is okay to remove a bond device\nthat has some user process holding the file open.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d632c3f28e69f0d6d44aa09c4df708d63a91a7c", "tree": "8782d6b6e56a4c7f425331744584b778ca5a5255", "parents": [ "9e71626c1c23ec69372c43c6fe66c1171032bf42" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:48 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:28:57 2009 -0700" }, "message": "bonding: fix style issues\n\nResolve some of the complaints from checkpatch, and remove \"magic emacs format\"\ncomments, and useless MODULE_SUPPORTED_DEVICE(). But should not\nchange actual code.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e71626c1c23ec69372c43c6fe66c1171032bf42", "tree": "664e2c6d342c210a6f041b97ed9a3d9c1bc58f06", "parents": [ "7e0838404541d2758bee089632690aabd82f3d5d" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:47 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:28:56 2009 -0700" }, "message": "bonding: fix destructor\n\nIt is not safe to use a network device destructor that is a function in\nthe module, since it can be called after module is unloaded if sysfs\nhandle is open.\n\nWhen eventually using netlink, the device cleanup code needs to be done\nvia uninit function.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e0838404541d2758bee089632690aabd82f3d5d", "tree": "08625e067250aab61a621cdae5aeb21f579bde3f", "parents": [ "d93216051ae60995736518ca9ebb58a0e6ade212" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:46 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:28:54 2009 -0700" }, "message": "bonding: remove bonding read/write semaphore\n\nThe whole read/write semaphore locking can be removed. It doesn\u0027t add any\nprotection that isn\u0027t already done by using the RTNL mutex properly.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d93216051ae60995736518ca9ebb58a0e6ade212", "tree": "0f2e6c6d4abef68b54fb58a6397376871a277f91", "parents": [ "d2991f75354941a4cdf61ce7443d21804b978f89" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:45 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:28:52 2009 -0700" }, "message": "bonding: initialize before registration\n\nAvoid a unnecessary carrier state transistion that happens when device\nis registered.\nLockdep works better if initialization is done before registration as well.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d2991f75354941a4cdf61ce7443d21804b978f89", "tree": "eb52cc7a67ba92c7f1eaa16dd77b6b46296126aa", "parents": [ "9d794a0c1dbb9551d870683bca0744624db353ed" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jun 12 19:02:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 23:28:51 2009 -0700" }, "message": "bonding: bond_create always called with default parameters\n\nbond_create() is always called with same parameters so move the argument\ndown.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d794a0c1dbb9551d870683bca0744624db353ed", "tree": "6a576c37cc8e0be41f5b4bde7dc0bed8f09132a4", "parents": [ "eaae44d248b151e7257ba551ae589cf343c3fdf6", "e0057975e09a85ac92be81e975d0d0a911b1c4c6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 17:08:11 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 17:08:11 2009 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6\n" }, { "commit": "bc3bf8fd330ce981ce632a1a4a283eee46838f32", "tree": "10a84ae36757d85f35bc61fe75c726ac9fd65e09", "parents": [ "faea56c9bb44f539da1ae0194184873fc2720b20" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jun 13 08:29:33 2009 +0200" }, "committer": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Sat Jun 13 09:07:51 2009 -0500" }, "message": "[SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’\n\n drivers/net/cnic.c: In function ‘init_bnx2_cnic’:\n drivers/net/cnic.c:2520: error: implicit declaration of function ‘__symbol_get’\n drivers/net/cnic.c:2520: warning: assignment makes pointer from integer without a cast\n make[1]: *** [drivers/net/cnic.o] Error 1\n make: *** [drivers/net/cnic.o] Error 2\n\nCaused by not including linux/module.h\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\n" }, { "commit": "faea56c9bb44f539da1ae0194184873fc2720b20", "tree": "ed3e9c02574c3d1d441093a23b117462cb4ed4b9", "parents": [ "f3ad116588151b3371ae4e092290e4f48e62b8bb" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri Jun 12 11:43:48 2009 -0700" }, "committer": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Sat Jun 13 09:06:10 2009 -0500" }, "message": "[SCSI] cnic: fix undefined reference to `ip6_route_output\u0027\n\nFix cnic build for case of CONFIG_INET\u003dn.\nFix cnic build for case of CONFIG_IPV6\u003dm and CONFIG_CNIC\u003dy.\n\nFixes these build errors:\n\ncnic.c:(.text+0x236a1d): undefined reference to `ip_route_output_key\u0027\ncnic.c:(.text+0x15a8e8): undefined reference to `ip6_route_output\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\n" }, { "commit": "5b548140225c6bbbbd560551dd1048b2c0ce58be", "tree": "9306a37dbca0095ca6d88e0b0ab297bcb2dc5ae8", "parents": [ "5b2c4b972c0226406361f83b747eb5cdab51e68e" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 06:22:29 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:50 2009 -0700" }, "message": "net: use symbolic values for ndo_start_xmit() return codes\n\nConvert magic values 1 and -1 to NETDEV_TX_BUSY and NETDEV_TX_LOCKED respectively.\n\n0 (NETDEV_TX_OK) is not changed to keep the noise down, except in very few cases\nwhere its in direct proximity to one of the other values.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b2c4b972c0226406361f83b747eb5cdab51e68e", "tree": "b915055947fc6646af3477b135be4ad76ec4ba32", "parents": [ "81fbbf60408ad6b98ff72120de948cb7fd2498d0" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 06:14:36 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:45 2009 -0700" }, "message": "net: fix network drivers ndo_start_xmit() return values (part 8)\n\nFix up USB drivers that return an errno value (result of usb_submit_urb())\nto qdisc_restart(), causing qdisc_restart() to print a warning and requeue/\nretransmit the skb.\n\n- hso: skb is freed: use after free\n- at76_usb: skb is freed: use after free\n\nCompile tested only.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98ca4a46d27348476c9196ebc0a0c5297431d90f", "tree": "6e3e590e2e10b3e0ec62a37c2a56f0704d202827", "parents": [ "ae71bafdd4ce29856addfede1ab7046f4e45775b" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 05:20:01 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:42 2009 -0700" }, "message": "net: fix network drivers ndo_start_xmit() return values (part 6)\n\nFix up hamradio drivers that return an errno value to dev_queue_xmit(), causing\nit to print a warning an free the skb.\n\n- bpqether: skb is freed: use after free\n\nCompile tested only.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "47f88c99c2ad0c05dd415e1c2a6d59426eb305ed", "tree": "18ae02686efdbbd5c89eb62211bbf82f797b81de", "parents": [ "4153e77596c4caaf52293b0c6b2207d73ed8f1eb" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 04:37:34 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:39 2009 -0700" }, "message": "net: fix network drivers ndo_start_xmit() return values (part 4)\n\nFix up WAN drivers that return an errno value to qdisc_restart(), causing\nqdisc_restart() to print a warning an requeue/retransmit the skb.\n\n- cycx_x25: intention appears to be to requeue the skb\n\nDoes not compile cleanly for me even without this patch, so untested.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4153e77596c4caaf52293b0c6b2207d73ed8f1eb", "tree": "5920561315cfea1b89e287d264fdac6314c670ec", "parents": [ "4bd73ae2682d9069746bb049a416d9ab90c6684b" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 04:08:02 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:37 2009 -0700" }, "message": "net: fix network drivers ndo_start_xmit() return values (part 3)\n\nnet: fix network drivers ndo_start_xmit() return values (part 3)\n\nFix up wireless drivers that return an errno value to qdisc_restart(), causing\nqdisc_restart() to print a warning an requeue/retransmit the skb.\n\n- airo: transmission not implemented for chip, intention is to free and abort\n- ipw2200: transmission not implemented for promiscous mode, intention is to\n drop\n- prism54: intention is to drop\n- wl3501_cs: intention appears to be to drop\n- zd1201: error counter indicates intention is to drop\n\nAll drivers compile tested.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4bd73ae2682d9069746bb049a416d9ab90c6684b", "tree": "06c1fa545e0fe2ee1e610db19fde49114b47f152", "parents": [ "3790c8cdb99f23824b23cb16df608281b335ee91" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 03:17:19 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:34 2009 -0700" }, "message": "net: fix network drivers ndo_start_xmit() return values (part 2)\n\nFix up IRDA drivers that return an errno value to qdisc_restart(), causing\nqdisc_restart() to print a warning an requeue/retransmit the skb.\n\n- donauboe: intention appears to be to have the skb retransmitted without\n error message\n- irda-usb: intention is to drop silently according to comment\n- kingsub-sir: skb is freed: use after free\n- ks959-sir: skb is freed: use after free\n- ksdazzle-sir: skb is freed: use after free\n- mcs7880: skb is freed: use after free\n\nAll but donauboe compile tested.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3790c8cdb99f23824b23cb16df608281b335ee91", "tree": "c437f801a709cefcf1210eb1e9f8306e52f42ca6", "parents": [ "da6782927de809d9d427bd4bd6a4024243e41f13" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 03:00:35 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:32 2009 -0700" }, "message": "net: fix network driver ndo_start_xmit() return values (part 1)\n\nFix up drivers that return an errno value to qdisc_restart(), causing\nqdisc_restart() to print a warning and requeue/retransmit the skb.\n\n- xpnet: memory allocation error, intention is to drop\n- ethoc: oversized packet, packet must be dropped\n- ibmlana: skb freed: use after free\n- rrunner: skb freed: use after free\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "adbf7f01e78287701c0270a5262f319935d94082", "tree": "a320b9e67518c2fb9f37d37ee974ed58c10bb342", "parents": [ "d510fe70db4c62ac899c486506fdfb7f3b518c86" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Fri Jun 05 12:54:44 2009 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "samuel@sortiz.org", "time": "Sat Jun 13 01:56:06 2009 +0200" }, "message": "irda: smsc wait count reaches -1\n\nThe sir retries count reaches -1 rather than 0.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Samuel Ortiz \u003csamuel@sortiz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "d510fe70db4c62ac899c486506fdfb7f3b518c86", "tree": "1906c4baa902e2b636a1049e322be5d7d27fa1aa", "parents": [ "8981f01001c616f58f1623ecadfab8b1ed758da7" ], "author": { "name": "Graff Yang", "email": "graff.yang@gmail.com", "time": "Tue May 12 13:47:54 2009 -0700" }, "committer": { "name": "Samuel Ortiz", "email": "samuel@sortiz.org", "time": "Sat Jun 13 01:56:02 2009 +0200" }, "message": "irda: new Blackfin on-chip SIR IrDA driver\n\nSigned-off-by: Graff Yang \u003cgraff.yang@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Bryan Wu \u003cbryan.wu@analog.com\u003e\nSigned-off-by: Samuel Ortiz \u003csamuel@sortiz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "c9b8af00ff71f86ff3d092cc60ca673e1d0eae5b", "tree": "25cc016481cc693552bebb4040041817280c2ccf", "parents": [ "c59a264c9e932c828d533497e286b89e43c8d1be", "82681a318f9f028ea64e61f24bbd9ac535531921" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 12 09:50:42 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 12 09:50:42 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (154 commits)\n [SCSI] osd: Remove out-of-tree left overs\n [SCSI] libosd: Use REQ_QUIET requests.\n [SCSI] osduld: use filp_open() when looking up an osd-device\n [SCSI] libosd: Define an osd_dev wrapper to retrieve the request_queue\n [SCSI] libosd: osd_req_{read,write} takes a length parameter\n [SCSI] libosd: Let _osd_req_finalize_data_integrity receive number of out_bytes\n [SCSI] libosd: osd_req_{read,write}_kern new API\n [SCSI] libosd: Better printout of OSD target system information\n [SCSI] libosd: OSD2r05: Attribute definitions\n [SCSI] libosd: OSD2r05: Additional command enums\n [SCSI] mpt fusion: fix up doc book comments\n [SCSI] mpt fusion: Added support for Broadcast primitives Event handling\n [SCSI] mpt fusion: Queue full event handling\n [SCSI] mpt fusion: RAID device handling and Dual port Raid support is added\n [SCSI] mpt fusion: Put IOC into ready state if it not already in ready state\n [SCSI] mpt fusion: Code Cleanup patch\n [SCSI] mpt fusion: Rescan SAS topology added\n [SCSI] mpt fusion: SAS topology scan changes, expander events\n [SCSI] mpt fusion: Firmware event implementation using seperate WorkQueue\n [SCSI] mpt fusion: rewrite of ioctl_cmds internal generated function\n ...\n" }, { "commit": "3ac49a1c9928b4a242b3cb1d83bc1d5c9b8fcb50", "tree": "4237e93f0952c07da3e9ed74bc18845f41136c7b", "parents": [ "4737f0978d6e64eae468e01fa181abf6499e6b84" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu Jun 04 16:20:28 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 12 18:01:50 2009 +0200" }, "message": "trivial: fix ETIMEOUT -\u003e ETIMEDOUT typos\n\nfix ETIMEOUT -\u003e ETIMEDOUT typos\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "4737f0978d6e64eae468e01fa181abf6499e6b84", "tree": "44871914422157121d4a68d376e60d1b1e7f1f92", "parents": [ "3226224039c8f8cb840d236b5f27d2a1104789e2" ], "author": { "name": "Pavel Machek", "email": "pavel@ucw.cz", "time": "Fri Jun 05 00:44:53 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 12 18:01:50 2009 +0200" }, "message": "trivial: Kconfig: .ko is normally not included in module names\n\n.ko is normally not included in Kconfig help, make it consistent.\n\nSigned-off-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "19af5cdb7c79ff5ec96a99893ffb7f894f4a3dc1", "tree": "09e855da51df91fc35e98b26e420f26e84305cff", "parents": [ "98a1708de1bfa5fe1c490febba850d6043d3c7fa" ], "author": { "name": "Martin Olsson", "email": "martin@minimum.se", "time": "Thu Apr 23 11:37:37 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 12 18:01:46 2009 +0200" }, "message": "trivial: fix typo milisecond/millisecond for documentation and source comments.\n\nSigned-off-by: Martin Olsson \u003cmartin@minimum.se\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "98a1708de1bfa5fe1c490febba850d6043d3c7fa", "tree": "823104983ff8cd44fc8f3dbfbcc583dc69ee30b2", "parents": [ "ab2274af0569a43c6da390e969759d1138799839" ], "author": { "name": "Martin Olsson", "email": "martin@minimum.se", "time": "Wed Apr 22 18:21:29 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 12 18:01:46 2009 +0200" }, "message": "trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.\n\nSigned-off-by: Martin Olsson \u003cmartin@minimum.se\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6d60f9dfc8d437e914d46fa355c50c695cad24e7", "tree": "b9e1d84faf19965eb8efe802d25b40b36c27fc64", "parents": [ "7ea2ac9b6632038377cb488c7d1cb60b88164d4d" ], "author": { "name": "Martin Olsson", "email": "mnemo@minimum.se", "time": "Tue Apr 07 10:30:24 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 12 18:01:46 2009 +0200" }, "message": "trivial: Fix paramater/parameter typo in dmesg and source comments\n\nSigned-off-by: Martin Olsson \u003cmartin@minimum.se\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "4b512d26f425be1c779c8319249b42ce3c3424d2", "tree": "2f48dd4f2361a0686bd8e1dd803e36080f529e09", "parents": [ "0b1b51f50ed7b4225d0631140de8873fb235a6c0" ], "author": { "name": "Thadeu Lima de Souza Cascardo", "email": "cascardo@holoscopio.com", "time": "Tue Apr 14 23:14:10 2009 -0300" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 12 18:01:45 2009 +0200" }, "message": "trivial: typo (en|dis|avail|remove)bale -\u003e (en|dis|avail|remove)able\n\nSigned-off-by: Thadeu Lima de Souza Cascardo \u003ccascardo@holoscopio.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "82681a318f9f028ea64e61f24bbd9ac535531921", "tree": "529b6a5b4fd040fb54b7672b1a224ebd47445876", "parents": [ "3860c97bd60a4525bb62eb90e3e7d2f02662ac59", "8ebf975608aaebd7feb33d77f07ba21a6380e086" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Fri Jun 12 10:02:03 2009 -0500" }, "committer": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Fri Jun 12 10:02:03 2009 -0500" }, "message": "[SCSI] Merge branch \u0027linus\u0027\n\nConflicts:\n\tdrivers/message/fusion/mptsas.c\n\nfixed up conflict between req-\u003edata_len accessors and mptsas driver updates.\n\nSigned-off-by: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\n" }, { "commit": "d2a7ddda9ffb1c8961abff6714b0f1eb925c120f", "tree": "1090884fd260d042255255467367e4e6b6193e5d", "parents": [ "9499f5e7ed5224c40706f0cec6542a9916bc7606" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri Jun 12 22:16:36 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jun 12 22:16:36 2009 +0930" }, "message": "virtio: find_vqs/del_vqs virtio operations\n\nThis replaces find_vq/del_vq with find_vqs/del_vqs virtio operations,\nand updates all drivers. This is needed for MSI support, because MSI\nneeds to know the total number of vectors upfront.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (+ lguest/9p compile fixes)\n" }, { "commit": "9499f5e7ed5224c40706f0cec6542a9916bc7606", "tree": "3e4e1b36d3d549ea356e88e6e44359a887c6ee01", "parents": [ "ef688e151c00e5d529703be9a04fd506df8bc54e" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jun 12 22:16:35 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jun 12 22:16:36 2009 +0930" }, "message": "virtio: add names to virtqueue struct, mapping from devices to queues.\n\nAdd a linked list of all virtqueues for a virtio device: this helps for\ndebugging and is also needed for upcoming interface change.\n\nAlso, add a \"name\" field for clearer debug messages.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bc47ab0241c7c86da4f5e5f82fbca7d45387c18d", "tree": "b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42", "parents": [ "37f9ef553bed630957e025504cdcbc76f5de49d5", "8ebf975608aaebd7feb33d77f07ba21a6380e086" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jun 12 16:53:38 2009 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jun 12 16:53:38 2009 +1000" }, "message": "Merge commit \u0027origin/master\u0027 into next\n\nManual merge of:\n\tarch/powerpc/kernel/asm-offsets.c\n" } ], "next": "8981f01001c616f58f1623ecadfab8b1ed758da7" }