)]}' { "log": [ { "commit": "94956eed14b4b16d401c8ad36d68df0608f968cb", "tree": "60e4e1a3c2c44e8f6616db78cd6b22737b2a1f37", "parents": [ "50e696308c3fb18a4a0dae7b3a4d47469149c919", "e45a618753d5a8bc9086382f73bbc2d6a3399250" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n forcedeth: fix a few sparse warnings (variable shadowing)\n forcedeth: Improve stats counters\n forcedeth: remove unneeded stats updates\n forcedeth: Acknowledge only interrupts that are being processed\n forcedeth: fix race when unloading module\n MAINTAINERS/rds: update maintainer\n wanrouter: Remove kernel_lock annotations\n usbnet: fix oops in usbnet_start_xmit\n ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n etherh: Add MAINTAINERS entry for etherh\n bonding: comparing a u8 with -1 is always false\n sky2: fix regression on Yukon Optima\n netlink: clarify attribute length check documentation\n netlink: validate NLA_MSECS length\n i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n macvlan: receive multicast with local address\n tg3: Update version to 3.121\n tg3: Eliminate timer race with reset_task\n tg3: Schedule at most one tg3_reset_task run\n tg3: Obtain PCI function number from device\n ...\n" }, { "commit": "e45a618753d5a8bc9086382f73bbc2d6a3399250", "tree": "5d703fb6c245a761d9d6b838ecc7d7c594c97f7b", "parents": [ "0bdfea8ba856826f5901fda608013f323c87f661" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:25 2011 -0500" }, "message": "forcedeth: fix a few sparse warnings (variable shadowing)\n\nThis fixes the following sparse warnings:\ndrivers/net/ethernet/nvidia/forcedeth.c:2113:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2155:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2227:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2271:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2986:20: warning: symbol \u0027addr\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2963:6: originally declared here\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0bdfea8ba856826f5901fda608013f323c87f661", "tree": "8527b969d9e27d5f2ded73c643dc79c0c7dd4433", "parents": [ "4687f3f364a1d5b2df815a8c58a763cab57724e8" ], "author": { "name": "Mandeep Baines", "email": "msb@google.com", "time": "Sat Nov 05 14:38:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Improve stats counters\n\nRx byte count was off; instead use the hardware\u0027s count. Tx packet\ncount was counting pre-TSO packets; instead count on-the-wire packets.\nReport hardware dropped frame count as rx_fifo_errors.\n\n- The count of transmitted packets reported by the forcedeth driver\n reports pre-TSO (TCP Segmentation Offload) packet counts and not the\n count of the number of packets sent on the wire. This change fixes\n the forcedeth driver to report the correct count. Fixed the code by\n copying the count stored in the NIC H/W to the value reported by the\n driver.\n\n- Count rx_drop_frame errors as rx_fifo_errors:\n We see a lot of rx_drop_frame errors if we disable the rx bottom-halves\n for too long. Normally, rx_fifo_errors would be counted in this case.\n The rx_drop_frame error count is private to forcedeth and is not\n reported by ifconfig or sysfs. The rx_fifo_errors count is currently\n unused in the forcedeth driver. It is reported by ifconfig as overruns.\n This change reports rx_drop_frame errors as rx_fifo_errors.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4687f3f364a1d5b2df815a8c58a763cab57724e8", "tree": "9083050ec1f348c3f210172e337fcafb3b736678", "parents": [ "2a4e7a085fb44369c450c92cf8bd53b91f874a57" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: remove unneeded stats updates\n\nFunction ndo_get_stats() updates most of the stats from hardware\nregisters, making the manual updates un-needed. This change removes\nthese manual updates. Main exception is rx_missed_errors which needs\nmanual update.\n\nAnother exception is rx_packets, still updated manually in this commit\nto make sure this patch doesn\u0027t change behavior of driver. This will\nbe addressed by a future patch.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a4e7a085fb44369c450c92cf8bd53b91f874a57", "tree": "c96dd683da76b9698281521d249a11ece0ad59ea", "parents": [ "f9c4082df59e43c6667db197a4fb3eb3286f3fc1" ], "author": { "name": "Mike Ditto", "email": "mditto@google.com", "time": "Sat Nov 05 14:38:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Acknowledge only interrupts that are being processed\n\nThis is to avoid a race, accidentally acknowledging an interrupt that\nwe didn\u0027t notice and won\u0027t immediately process. This is based solely\non code inspection; it is not known if there was an actual bug here.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9c4082df59e43c6667db197a4fb3eb3286f3fc1", "tree": "2bd8c50a7a0ea2b12b0f384fb656eb51e32cfbd0", "parents": [ "dd1294c4ed25725d13a6cb3d93ca0eb5fee14963" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: fix race when unloading module\n\nWhen forcedeth module is unloaded, there exists a path that can lead\nto mod_timer() after del_timer_sync(), causing an oops. This patch\nshort-circuits this unneeded path, which originates in\nnv_get_ethtool_stats().\n\nTested:\n x86_64 16-way + 3 ethtool -S infinite loops + 100Mbps incoming traffic\n + rmmod/modprobe/ifconfig in a loop\n\nInitial-Author: Salman Qazi \u003csqazi@google.com\u003e\nDiscussion: http://patchwork.ozlabs.org/patch/123548/\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23ba07991dad5a96a024c1b45cb602eef5f83df8", "tree": "1404d618c42757a234dfb1f0efe946411ecf1b0e", "parents": [ "012641082b34433dac3cbb452e0a6ceccfd4643f" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Nov 07 05:54:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:25:41 2011 -0500" }, "message": "usbnet: fix oops in usbnet_start_xmit\n\nThis patch fixes the bug added in commit v3.1-rc7-1055-gf9b491e\nSKB can be NULL at this point, at least for cdc-ncm.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "012641082b34433dac3cbb452e0a6ceccfd4643f", "tree": "b5fcc89c44d5508f5c669d50e2d879910618ab24", "parents": [ "1a6422f67fbf691cf8721076619aeead9183403d" ], "author": { "name": "Rose, Gregory V", "email": "gregory.v.rose@intel.com", "time": "Mon Nov 07 07:44:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:23:12 2011 -0500" }, "message": "ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n\nFix compiler errors and warnings with CONFIG_PCI_IOV defined and not\ndefined.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561", "tree": "f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a", "parents": [ "addd8c92cf55bba578b8a56e0f717a0a74b31008", "536ec4f8d13433126f948d6e90821f811a4ebdf8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n scsi: drop unused Kconfig symbol\n pci: drop unused Kconfig symbol\n stmmac: drop unused Kconfig symbol\n x86: drop unused Kconfig symbol\n powerpc: drop unused Kconfig symbols\n powerpc: 40x: drop unused Kconfig symbol\n mips: drop unused Kconfig symbols\n openrisc: drop unused Kconfig symbols\n arm: at91: drop unused Kconfig symbol\n samples: drop unused Kconfig symbol\n m32r: drop unused Kconfig symbol\n score: drop unused Kconfig symbols\n sh: drop unused Kconfig symbol\n um: drop unused Kconfig symbol\n sparc: drop unused Kconfig symbol\n alpha: drop unused Kconfig symbol\n\nFix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig\nas per Michal: the STMMAC_DUAL_MAC config variable is still unused and\nshould be deleted.\n" }, { "commit": "06d381484fe8fb1ba2996c22e89595a273e3634c", "tree": "0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0", "parents": [ "5d5a8d2d9d6cca979efe4fe1552d787fdc542603", "c9d6369978411f690513994e6e53e2e6410874a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "message": "Merge branch \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n net: xen-netback: use API provided by xenbus module to map rings\n block: xen-blkback: use API provided by xenbus module to map rings\n xen: use generic functions instead of xen_{alloc, free}_vm_area()\n" }, { "commit": "1197ab2942f920f261952de0c392ac749a35796b", "tree": "4922ccc8a6061e5ece6ac7420001f3bf4524ea92", "parents": [ "ec773e99ab4abce07b1ae23117179c2861831964", "96cc017c5b7ec095ef047d3c1952b6b6bbf98943" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)\n powerpc/p3060qds: Add support for P3060QDS board\n powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX\n powerpc/85xx: Make kexec to interate over online cpus\n powerpc/fsl_booke: Fix comment in head_fsl_booke.S\n powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices\n powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver\n powerpc/85xx: Add \u0027fsl,pq3-gpio\u0027 compatiable for GPIO driver\n powerpc/86xx: Correct Gianfar support for GE boards\n powerpc/cpm: Clear muram before it is in use.\n drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager\n powerpc/fsl_msi: add support for \"msi-address-64\" property\n powerpc/85xx: Setup secondary cores PIR with hard SMP id\n powerpc/fsl-booke: Fix settlbcam for 64-bit\n powerpc/85xx: Adding DCSR node to dtsi device trees\n powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards\n powerpc/85xx: fix PHYS_64BIT selection for P1022DS\n powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map\n powerpc: respect mem\u003d setting for early memory limit setup\n powerpc: Update corenet64_smp_defconfig\n powerpc: Update mpc85xx/corenet 32-bit defconfigs\n ...\n\nFix up trivial conflicts in:\n - arch/powerpc/configs/40x/hcu4_defconfig\n\tremoved stale file, edited elsewhere\n - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:\n\tadded opal and gelic drivers vs added ePAPR driver\n - drivers/tty/serial/8250.c\n\tmoved UPIO_TSI to powerpc vs removed UPIO_DWAPB support\n" }, { "commit": "589665f5a6008dbce1d0af2cb93e94a80bf78151", "tree": "4f4ec1949dd233a8474c2cb477da3637166b6e75", "parents": [ "27d240fdae2808d727ad9ce48ec029731a457524" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Nov 04 08:21:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 18:37:23 2011 -0400" }, "message": "bonding: comparing a u8 with -1 is always false\n\nslave-\u003eduplex is a u8 type so the in bond_info_show_slave() when we\ncheck \"if (slave-\u003eduplex \u003d\u003d -1)\", it\u0027s always false.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27d240fdae2808d727ad9ce48ec029731a457524", "tree": "67d1a401e21a4fdd1c7c3a798611140d65bebbea", "parents": [ "4b6cc7284ddc9a54910f111085ebf0143ef3f5bd" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Nov 04 12:17:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 18:19:43 2011 -0400" }, "message": "sky2: fix regression on Yukon Optima\n\nChanges to support other Optima types, introduced an accidental\nregression that caused 88E8059 to come up in 10Mbit/sec.\n\nThe Yukon Optima supports a reverse auto-negotiation feature that\nwas incorrectly setup, and not needed. The feature could be used to\nallow wake-on-lan at higher speeds. But doing it correctly would require\nother changes to initialization.\n\nReported-by: Pavel Mateja \u003cpavel@netsafe.cz\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "433aee04a447fb2e769c4570f327d9c2a956117b", "tree": "e5cb64fd4ce0de67e2623276f920fb348e322fef", "parents": [ "729e72a10930ef765c11a5a35031ba47f18221c4" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 00:30:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:41:20 2011 -0400" }, "message": "i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n\ni825xx and xscale are \"sub\" Kconfigs to NET_VENDOR_INTEL, so\nNET_VENDOR_INTEL should contain ALL the dependencies of the\n\"sub\" Kconfigs.\n\nSame with 8390 is a \"sub\" Kconfig to NET_VENDOR_NATSEMI, so\nNET_VENDOR_NATSEMI needs to contains ALL the dependencies.\n\nFreescale Kconfig only had fs_enet as a sub Kconfig, and already\ncontained the needed dependencies, just cleaned up the dependencies.\n\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "729e72a10930ef765c11a5a35031ba47f18221c4", "tree": "ae0bcc4d1b15ce6988bd5358c4e2beb9f3b5625e", "parents": [ "5ae7fa06bb90421bc63f1f1e56ab241b49bc7b91" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Nov 02 12:11:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:39:32 2011 -0400" }, "message": "macvlan: receive multicast with local address\n\nWhen implementing VRRP v2 using macvlan several problems were\ndiscovered. VRRP is weird in that all routers participating\nin a redundant group use the same virtual MAC address.\nMacvlan is a natural driver to use for this but it doesn\u0027t\nwork. The problem is that packets with a macvlan device\u0027s\nsource address are not received.\n\nThe problem is actually a regression that date back almost 2 years now.\nThe original problems started with:\n\ncommit 618e1b7482f7a8a4c6c6e8ccbe140e4c331df4e9\nAuthor: Arnd Bergmann \u003carnd@arndb.de\u003e\nDate: Thu Nov 26 06:07:10 2009 +0000\n\n macvlan: implement bridge, VEPA and private mode\n\nThis patches restores the original 2.6.32 behavior. Allowing multicast\npackets received with the VRRP source address to be received.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ae7fa06bb90421bc63f1f1e56ab241b49bc7b91", "tree": "86a8d2a2a3391723fa8d384e181daaf9fc42bb48", "parents": [ "5b1906241905d9bd1abe920854b3d43c2b9c85e1" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:49 2011 -0400" }, "message": "tg3: Update version to 3.121\n\nThis patch updates the tg3 version to 3.121.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b1906241905d9bd1abe920854b3d43c2b9c85e1", "tree": "d259390621daa923977f00fb43415a09da565cd5", "parents": [ "db21997379906fe7657d360674e1106d80b020a4" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:48 2011 -0400" }, "message": "tg3: Eliminate timer race with reset_task\n\nDuring shutdown, it is impossible to reliably disable the timer and\nreset_task threads. Each thread can schedule the other, which leads to\nshutdown code that chases its tail.\n\nTo fix the problem, this patch removes the ability of tg3_reset_task to\nschedule a new timer thread. To support this change, tg3_timer no\nlonger terminates itself, but rather goes into a polling mode.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db21997379906fe7657d360674e1106d80b020a4", "tree": "aefa69f5ad536aec711d102a238d6dc10c50fa48", "parents": [ "9dc5e342703948ea7b086d063c85c0e79dac8149" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:48 2011 -0400" }, "message": "tg3: Schedule at most one tg3_reset_task run\n\nIt is possible for multiple threads in the tg3 driver to each attempt to\nschedule a run of tg3_reset_task(). The multiple tg3_reset_task\nexecutions could all wind up on the same queue (and execute serially) or\nwind up on the queues of another processor (which could execute in\nparallel). Either scenario is not what was truly desired.\n\nThis patch adds a new flag, TG3_FLAG_RESET_TASK_PENDING, and uses it to\ndetermine whether or not to schedule another run of tg3_reset_task().\nWith the new flag comes two new functions to facilitate scheduling and\ndescheduling of tg3_reset_task().\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9dc5e342703948ea7b086d063c85c0e79dac8149", "tree": "664ce50ab14d997f01f44f84a982440257413b78", "parents": [ "5bc09186deba2a016b60aa3923fc0e42838ce877" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:48 2011 -0400" }, "message": "tg3: Obtain PCI function number from device\n\nThis patch adds code to attempt to obtain the PCI function number from\nthe device rather than accept the number handed by the kernel. In\npass-through scenarios, the function number handed by the kernel may not\nreflect the true function of the device.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bc09186deba2a016b60aa3923fc0e42838ce877", "tree": "e16110c073141e90e5f679fd2f385d8e1278e47b", "parents": [ "ba1142e4fb291c7bf124d93596351dca8d226a0f" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:47 2011 -0400" }, "message": "tg3: Fix irq alloc error cleanup path\n\nThis patch fixes a bug where the irq error cleanup path did not free all\nthe resources it allocated.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Ben Li \u003cbenli@broadcom.com\u003e\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba1142e4fb291c7bf124d93596351dca8d226a0f", "tree": "dc20e27d52a515cfad594d2d137e61a3983d7de5", "parents": [ "b9e454826f22e17d1945bd282834c87aef8d0f95" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:15:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:47 2011 -0400" }, "message": "tg3: Fix 4k skb error recovery path\n\nOn the error recovery resource unwind path, it is possible for the\ndriver to attempt to unmap a fragment that hadn\u0027t been mapped. This\npatch fixes the problem by correcting the \"last\" parameter supplied.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b9e454826f22e17d1945bd282834c87aef8d0f95", "tree": "e90abb4a6f8bc8bdb67b1b4bacd030bfad15b9ed", "parents": [ "78f94dc7b10d98cf4cf8498d98581500d910c6b7" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:14:59 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:47 2011 -0400" }, "message": "tg3: Fix 4k tx bd segmentation code\n\nThe new 4k tx bd segmentation code had a bug in the error cleanup path.\nIf the driver did not map all the physical fragments, the abort path\nwould wind up advancing the producer index beyond the point where the\nsetup code stopped. This would ultimately turn into a tx recovery error\nwhere the driver would expect the skb pointer to be set when it isn\u0027t.\nThis patch fixes the problem, and then makes the code a little easier to\nunderstand.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78f94dc7b10d98cf4cf8498d98581500d910c6b7", "tree": "871e63ccac34bef1440e0aa493bd0f08b93e74ec", "parents": [ "39b02648d251dbfa27b576d55eeab4cc62228d86" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Fri Nov 04 09:14:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 04 17:31:46 2011 -0400" }, "message": "tg3: Fix APE mutex init and use\n\nAPE mutex register blocks are shared by all ports of multiport devices.\nFor some mutexing purposes, each function is assigned their own\nregister. For other cases, each function is assigned its own request\nand grant bits of a single register. For the latter cases, the tg3\ndriver is incorrectly allowing each function to use the same set of\ngrant / request bits. This patch fixes the code so that each function\nuses the appropriate bitset.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22097fd297c85ec6c2e700d506f231f7cae442e1", "tree": "4a16a6821c5dc82a512b56ade6fcf64e0935d0aa", "parents": [ "1a67a573b8d9f02211f36fbab50f6265dc49384a", "54d5026e7c173edae8a27c293c286f1783d21ae8" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Nov 04 14:46:34 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Nov 04 14:46:34 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "6dbbd92522a13bcd5003829cbed30bc38a3d0362", "tree": "b486642d7392b81d89f159d65fd556a432e78d16", "parents": [ "d6748066ad0e8b2514545998f8367ebb3906f299", "e1cfb67acd5e890bbad695000d2c997bfb7f1756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 21:05:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 21:05:43 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)\n be2net: Add detect UE feature for Lancer\n be2net: Prevent CQ full condition for Lancer\n be2net: Fix disabling multicast promiscous mode\n be2net: Fix endian issue in RX filter command\n af_packet: de-inline some helper functions\n MAINTAINERS: Add can-gw include to maintained files\n net: Add back alignment for size for __alloc_skb\n net: add missing bh_unlock_sock() calls\n l2tp: fix race in l2tp_recv_dequeue()\n ixgbevf: Update release version\n ixgbe: DCB, return max for IEEE traffic classes\n ixgbe: fix reading of the buffer returned by the firmware\n ixgbe: Fix compiler warnings\n ixgbe: fix smatch splat due to missing NULL check\n ixgbe: fix disabling of Tx laser at probe\n ixgbe: Fix link issues caused by a reset while interface is down\n igb: Fix for I347AT4 PHY cable length unit detection\n e100: make sure vlan support isn\u0027t advertised on old adapters\n e1000e: demote a debugging WARN to a debug log message\n net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c\n ...\n" }, { "commit": "e1cfb67acd5e890bbad695000d2c997bfb7f1756", "tree": "898e6b168e9641f31633157385de5c84375ae802", "parents": [ "9372cacb300df3ee0a8be8a25bea15d16a95c583" ], "author": { "name": "Padmanabh Ratnakar", "email": "padmanabh.ratnakar@emulex.com", "time": "Thu Nov 03 01:50:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 03 21:59:40 2011 -0400" }, "message": "be2net: Add detect UE feature for Lancer\n\nAdd code to detect UE in case of Lancer.\n\nSigned-off-by: Padmanabh Ratnakar \u003cpadmanabh.ratnakar@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9372cacb300df3ee0a8be8a25bea15d16a95c583", "tree": "3e9f4e7dc2ca6df4560b2cf9f51edcda44742e5f", "parents": [ "1610c79f1e9545d0a64dc6bb4f9affdfcf1d5726" ], "author": { "name": "Padmanabh Ratnakar", "email": "padmanabh.ratnakar@emulex.com", "time": "Thu Nov 03 01:49:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 03 21:59:40 2011 -0400" }, "message": "be2net: Prevent CQ full condition for Lancer\n\nIndicate to HW that the CQ is cleaned up before posting new RX buffers.\nThis prevents the HW to go into CQ full error condition.\n\nSigned-off-by: Padmanabh Ratnakar \u003cpadmanabh.ratnakar@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1610c79f1e9545d0a64dc6bb4f9affdfcf1d5726", "tree": "2713f365c1b903ff80768d231a09e2e6187a5675", "parents": [ "016f97b11b3c7fe834260150d0f9cb36d06b2eb8" ], "author": { "name": "Padmanabh Ratnakar", "email": "padmanabh.ratnakar@emulex.com", "time": "Thu Nov 03 01:49:27 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 03 21:59:39 2011 -0400" }, "message": "be2net: Fix disabling multicast promiscous mode\n\nIf user tries to disable multicast promiscous mode, the adapter remains\nin this mode as resetting the multicast promiscous mode was missing\nin RX filter command. Fixed this.\n\nSigned-off-by: Padmanabh Ratnakar \u003cpadmanabh.ratnakar@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "016f97b11b3c7fe834260150d0f9cb36d06b2eb8", "tree": "6d2cac0966c303e79c57f38dfb4c7dd36dccf9ec", "parents": [ "5b67b3c04d73ee998a754d006e53131a7c909a46" ], "author": { "name": "Padmanabh Ratnakar", "email": "padmanabh.ratnakar@emulex.com", "time": "Thu Nov 03 01:49:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 03 21:59:39 2011 -0400" }, "message": "be2net: Fix endian issue in RX filter command\n\nUse cpu_to_le32() for mcast_num field in RX filter command as this\nfield is of type u32.\n\nSigned-off-by: Padmanabh Ratnakar \u003cpadmanabh.ratnakar@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6748066ad0e8b2514545998f8367ebb3906f299", "tree": "f7a9bfd764a8fb781aeda0ef2249afbab42dddf7", "parents": [ "f04c045f8ce69c22bda9d99eb927276b776135fc", "3ba1e543ab4b02640d396098f2f6a199560d5f2d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 13:28:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 13:28:14 2011 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)\n MIPS: O32: Provide definition of registers ta0 .. ta3.\n MIPS: perf: Add Octeon support for hardware perf.\n MIPS: perf: Add support for 64-bit perf counters.\n MIPS: perf: Reorganize contents of perf support files.\n MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c\n MIPS: Add accessor macros for 64-bit performance counter registers.\n MIPS: Add probes for more Octeon II CPUs.\n MIPS: Add more CPU identifiers for Octeon II CPUs.\n MIPS: XLR, XLS: Add comment for smp setup\n MIPS: JZ4740: GPIO: Check correct IRQ in demux handler\n MIPS: JZ4740: GPIO: Simplify IRQ demuxer\n MIPS: JZ4740: Use generic irq chip\n MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines\n MIPS: Alchemy: kill au1xxx.h header\n MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines\n MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep\n MIPS: Alchemy: Redo PCI as platform driver\n MIPS: Alchemy: more base address cleanup\n MIPS: Alchemy: rewrite USB platform setup.\n MIPS: Alchemy: abstract USB block control register access\n ...\n\nFix up trivial conflicts in:\n\tarch/mips/alchemy/devboards/db1x00/platform.c\n\tdrivers/ide/Kconfig\n\tdrivers/mmc/host/au1xmmc.c\n\tdrivers/video/Kconfig\n\tsound/mips/Kconfig\n" }, { "commit": "c1a7e1ebc17a9243d99ba0432d1138d74114dea7", "tree": "5b1871ffa2b279016a796acad25a7258f42852b0", "parents": [ "8599e251b3dd18c7bcb342d5b4acecc420f43606" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Thu Oct 20 04:14:49 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:56:02 2011 -0700" }, "message": "ixgbevf: Update release version\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Sibai Li \u003csibai.li@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "8599e251b3dd18c7bcb342d5b4acecc420f43606", "tree": "54632af24a86dc2506661fa33ddc6a31ceff8b6d", "parents": [ "331bcf45feb76d507a769d9d3b26ff5626804117" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Oct 19 08:48:49 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:55 2011 -0700" }, "message": "ixgbe: DCB, return max for IEEE traffic classes\n\nReturning the max traffic classes on get requests simplifies\nuser space configurations because applications will know\nexplicitly how many traffic classes can be used.\n\nTypical switch implementations use 2 or 3 traffic classes\nso this not seen often today. And user space can learn\nthe number of traffic classes by return codes but this\nallows user space to configure ixgbe correctly at the\nstart.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "331bcf45feb76d507a769d9d3b26ff5626804117", "tree": "6c3d3ba0a7f440d263a776aa55d44caa41b09c59", "parents": [ "9487dc844054e1fc691fb82f4e19da337e2ca35e" ], "author": { "name": "Emil Tantilov", "email": "emil.s.tantilov@intel.com", "time": "Sat Oct 22 05:21:32 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:48 2011 -0700" }, "message": "ixgbe: fix reading of the buffer returned by the firmware\n\nThis patch fixes some issues found in the buffer read portion of\nixgbe_host_interface_command()\n\n- use `bi` as the buffer index counter instead of `i`\n- add conversion to native cpu byte ordering on register read\n- fix conversion from bytes to dword\n- use dword_len instead of buf_len when reading the register\n\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "9487dc844054e1fc691fb82f4e19da337e2ca35e", "tree": "55fc2c909e4dff6de20eb1dcb4d40a0e0bffe66c", "parents": [ "b120818e652965669d3f1abaeaa5c3ccdfb28126" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Fri Oct 21 07:55:15 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:39 2011 -0700" }, "message": "ixgbe: Fix compiler warnings\n\nWrap SR-IOV specific functions in CONFIG_PCI_IOV to avoid compiler\nwarnings.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Sibai Li \u003csibai.li@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "b120818e652965669d3f1abaeaa5c3ccdfb28126", "tree": "f6b2a4b60a94ecbb805a4825834940a62e1e748e", "parents": [ "93d3ce8fafb888702311fc8c5917faa4c25b8266" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sat Oct 15 05:00:10 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:31 2011 -0700" }, "message": "ixgbe: fix smatch splat due to missing NULL check\n\nixgbe_ieee_ets and ixgbe_ieee_pfc are intialized at\nthe same time. Do a check for both before configuring\nIEEE802.1Qaz. Also max_frame was causing a sparse\nwarning resolved here as well.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "93d3ce8fafb888702311fc8c5917faa4c25b8266", "tree": "0cc09c215d5f29928c4e0b75e34a39b050f6a194", "parents": [ "232ef6bc451de2bc17c22fd116838cd89b94e1c1" ], "author": { "name": "Emil Tantilov", "email": "emil.s.tantilov@intel.com", "time": "Wed Oct 19 07:59:55 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:23 2011 -0700" }, "message": "ixgbe: fix disabling of Tx laser at probe\n\nregister_netdev() calls ndo_set_features() which may result in HW reset\nwhich in turn will bring the laser back up.\n\nThis patch moves ixgbe_laser_tx_disable() below register_netdev()\nin ixgbe_probe() to make sure laser is shut off on load.\n\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "232ef6bc451de2bc17c22fd116838cd89b94e1c1", "tree": "88fe56de1620255842b800431544e54c8c15cf6c", "parents": [ "d5a0e3640c05b7d07c548f9f8f986dbb87cfad98" ], "author": { "name": "Emil Tantilov", "email": "emil.s.tantilov@intel.com", "time": "Wed Oct 19 07:41:58 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:15 2011 -0700" }, "message": "ixgbe: Fix link issues caused by a reset while interface is down\n\nInterface fails to obtain link on 82599 SFP in the following scenario:\n\n1. Set advertised speed to GB:\nethtool -s eth0 advertise 0x20\n\n2. Bring interface down\nip link set eth0 down\n\n3. Issue any command that leads to a reset:\nethtool -t eth0\n\n4. Bring link back up:\nip link set eth0 up\n\nFollowing patch makes sure that the driver flaps the Tx laser every time\nixgbe_start_hw() is called, and not only when the speed is set.\n\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "d5a0e3640c05b7d07c548f9f8f986dbb87cfad98", "tree": "d952c48b1a08cb3c9b551ce8abe8d7095419e3a4", "parents": [ "243559f436f26b571ea3a4e70ff082892dc58f16" ], "author": { "name": "Kantecki, Tomasz", "email": "tomasz.kantecki@intel.com", "time": "Mon Oct 17 22:06:59 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:08 2011 -0700" }, "message": "igb: Fix for I347AT4 PHY cable length unit detection\n\nThe PHY cable length unit detection was not using the correct\nthe correct PHY data variable for I347AT4.\n\nSigned-off-by: Tomasz Kantecki \u003ctomasz.kantecki@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "243559f436f26b571ea3a4e70ff082892dc58f16", "tree": "36131ab7f2cb2fe4143f43482cd476a498dd283b", "parents": [ "34c9ef8bc66e21bdecb215b2fb7d93092468d27d" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Sat Oct 22 05:18:10 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:55:00 2011 -0700" }, "message": "e100: make sure vlan support isn\u0027t advertised on old adapters\n\ne100 parts don\u0027t support vlan offload but they generally do\nallow use of vlans in higher software layers via the 8021q module.\nThat said, there are a couple of really old revisions of e100\nhardware that don\u0027t even allow the longer frame sizes\nrequired for vlan use with standard MTU.\n\nUse the VLAN_CHALLENGED flag to prevent vlan binding to these\ndevices.\n\nReported-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nCC: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCC: David Lamparter \u003cequinox@diac24.net\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "34c9ef8bc66e21bdecb215b2fb7d93092468d27d", "tree": "d4a5d366a32ba2a78d6ef02767c76be5dfb02352", "parents": [ "2edcd4ca43df3c1d1d392753531cc73a53e709ba" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Oct 21 04:33:47 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Nov 02 16:54:53 2011 -0700" }, "message": "e1000e: demote a debugging WARN to a debug log message\n\nThis debugging message was recently added but it does not need to be as\nalarming as a WARN.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "092f4c56c1927e4b61a41ee8055005f1cb437009", "tree": "616ceb54b7671ccc13922ae9e002b8b972f6e09e", "parents": [ "80c2861672bbf000f6af838656959ee937e4ee4d", "c1e2ee2dc436574880758b3836fc96935b774c32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:27 2011 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s incoming - part two)\n\nSays Andrew:\n\n \"60 patches. That\u0027s good enough for -rc1 I guess. I have quite a lot\n of detritus to be rechecked, work through maintainers, etc.\n\n - most of the remains of MM\n - rtc\n - various misc\n - cgroups\n - memcg\n - cpusets\n - procfs\n - ipc\n - rapidio\n - sysctl\n - pps\n - w1\n - drivers/misc\n - aio\"\n\n* akpm: (60 commits)\n memcg: replace ss-\u003eid_lock with a rwlock\n aio: allocate kiocbs in batches\n drivers/misc/vmw_balloon.c: fix typo in code comment\n drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop\n w1: disable irqs in critical section\n drivers/w1/w1_int.c: multiple masters used same init_name\n drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal\n drivers/power/ds2780_battery.c: add a nolock function to w1 interface\n drivers/power/ds2780_battery.c: create central point for calling w1 interface\n w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it\n pps gpio client: add missing dependency\n pps: new client driver using GPIO\n pps: default echo function\n include/linux/dma-mapping.h: add dma_zalloc_coherent()\n sysctl: make CONFIG_SYSCTL_SYSCALL default to n\n sysctl: add support for poll()\n RapidIO: documentation update\n drivers/net/rionet.c: fix ethernet address macros for LE platforms\n RapidIO: fix potential null deref in rio_setup_device()\n RapidIO: add mport driver for Tsi721 bridge\n ...\n" }, { "commit": "e0c87bd95e8dad455c23bc56513af8dcb1737e55", "tree": "5719a1829787df33bbaea4aeea35d9ddd70d868d", "parents": [ "166c050bda80bb5dd627a287b6efcdfb68d172b4" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Wed Nov 02 13:39:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:01 2011 -0700" }, "message": "drivers/net/rionet.c: fix ethernet address macros for LE platforms\n\nModify Ethernet addess macros to be compatible with BE/LE platforms\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Chul Kim \u003cchul.kim@idt.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.39+]\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "80c2861672bbf000f6af838656959ee937e4ee4d", "tree": "78b361fd7278d461b1e664272f3b27660b64c642", "parents": [ "d211858837ff8d8e31942ca7d27e6e08b3b46f5e", "5087a50e66bd51b6e72c60bce4757a42b93f6b2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n virtio-blk: use ida to allocate disk index\n virtio: Add platform bus driver for memory mapped virtio device\n virtio: Dont add \"config\" to list for !per_vq_vector\n virtio: console: wait for first console port for early console output\n virtio: console: add port stats for bytes received, sent and discarded\n virtio: console: make discard_port_data() use get_inbuf()\n virtio: console: rename variable\n virtio: console: make get_inbuf() return port-\u003einbuf if present\n virtio: console: Fix return type for get_inbuf()\n virtio: console: Use wait_event_freezable instead of _interruptible\n virtio: console: Ignore port name update request if name already set\n virtio: console: Fix indentation\n virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx\n virtio.h: correct comment for struct virtio_driver\n virtio-net: Use virtio_config_val() for retrieving config\n virtio_config: Add virtio_config_val_len()\n virtio-console: Use virtio_config_val() for retrieving config\n" }, { "commit": "f956c34e2a665a1c457d0af7db7604b22f5acb19", "tree": "338bec36735b5a1a505a37ec2ef6108266505519", "parents": [ "addc98519207fb8ca0609da720469e415f784d0c" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Sat Oct 29 23:15:15 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:13 2011 -0400" }, "message": "iwlwifi: don\u0027t perform \"echo test\" when cmd queue stuck\n\nPerform \"echo test\" when cmd queue stuck detected, somethime it will cause\ncalltrace. I am not sure how to fix it yet, just remove the action now until\nfind a better way to handle it.\n\nReported-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "addc98519207fb8ca0609da720469e415f784d0c", "tree": "20623e1b7ad8f9eb592a5f83babd90d256261f45", "parents": [ "05cb91085760ca378f28fc274fbf77fc4fd9886c" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Fri Oct 28 12:17:49 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:13 2011 -0400" }, "message": "b43: Remove unneeded message\n\nThe driver can spam the logs with \"RX: Packet dropped\" messages. These drops\noriginate from 1. a correpted PLCP, 2. decryption errors, and 3. packet\nsize underruns. Condition #3 logs a separate message, thus no dropped message\nis needed.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8a39ef8ba0fa0410d71db8e981e887fe4fdeca88", "tree": "b1645243a2de84280a54d09c7c2c8272f5583b7a", "parents": [ "3209e061ad04465b3999091f315049c95ac6cbcb" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Thu Oct 27 17:19:39 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:13 2011 -0400" }, "message": "iwlwifi: allow pci_enable_msi fail\n\nContinue the init process even fail to enable msi\n\nout_iounmap is no longer used, remove it\n\nReported-by: werner \u003cw.landgraf@ru.ru\u003e\nTested-by: werner \u003cw.landgraf@ru.ru\u003e\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3209e061ad04465b3999091f315049c95ac6cbcb", "tree": "91e1eb2eb2b0b6e8d1a0514a4de15f0c1fe8e542", "parents": [ "93348928f2c980718434b1bc42f9d7638d665db4" ], "author": { "name": "Andres Salomon", "email": "dilinger@queued.net", "time": "Wed Oct 26 10:19:26 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:12 2011 -0400" }, "message": "libertas: ensure we clean up a scan request properly\n\nCommit 2e30168b (\"libertas: terminate scan when stopping interface\")\nadds cleanup code to lbs_eth_stop to call cfg80211_scan_done if there\u0027s\nan outstanding cfg80211_scan_request. However, it assumes that the\nscan request was allocated via the cfg80211 stack. Libertas has\nits own internal allocation method, kept track of with\npriv-\u003einternal_scan. This doesn\u0027t set scan_req-\u003ewiphy, amongst other\nthings, which results in hitting a BUG() when we call cfg80211_scan_done\non the request.\n\nThis provides a function to take care of the low-level scan_req cleanup\ndetails. We simply call that to deal with finishing up scan requests.\n\nThe bug we were hitting was:\n\n[ 964.321495] kernel BUG at net/wireless/core.h:87!\n[ 964.329970] Unable to handle kernel NULL pointer dereference at virtual address 00000000\n[ 964.341963] pgd \u003d dcf80000\n...\n[ 964.849998] 9fe0: 00000000 beb417b8 4018e280 401e822c 60000010 00000004 00000000 00000000\n[ 964.865007] [\u003cc003104c\u003e] (__bug+0x1c/0x28) from [\u003cc0384ffc\u003e] (cfg80211_scan_done+0x54/0x6c)\n[ 964.895324] [\u003cc0384ffc\u003e] (cfg80211_scan_done+0x54/0x6c) from [\u003cbf028bac\u003e] (lbs_eth_stop+0x10c/0x188 [libertas])\n[ 964.895324] [\u003cbf028bac\u003e] (lbs_eth_stop+0x10c/0x188 [libertas]) from [\u003cc03002a0\u003e] (__dev_close_many+0x94/0xc4)\n[ 964.918995] [\u003cc03002a0\u003e] (__dev_close_many+0x94/0xc4) from [\u003cc030037c\u003e] (dev_close_many+0x78/0xe0)\n\nSigned-off-by: Andres Salomon \u003cdilinger@queued.net\u003e\nAcked-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "93348928f2c980718434b1bc42f9d7638d665db4", "tree": "ecab668b838bf175e2b88347f9501e9acd62e005", "parents": [ "98fb2cc115b4ef1ea0a2d87a170c183bd395dd6c" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanohar@qca.qualcomm.com", "time": "Tue Oct 25 16:47:36 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:12 2011 -0400" }, "message": "ath9k_hw: Fix noise floor calibration timeout on fast channel change\n\nDuring the fast channel change noise floor values are being loaded\ntwice at init_cal and after channel_change. The commit \"ath9k_hw:\nImprove fast channel change for AR9003 chips\" overlooked it that\ncaused failure to load nf while doing bgscan. This patch performs noise\nfloor calibration after the fast and full reset.\n\nSigned-off-by: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "98fb2cc115b4ef1ea0a2d87a170c183bd395dd6c", "tree": "31a8695c8b335360719de7260662b53963cf5c22", "parents": [ "e3a4cc2f073739c9c9c2e97efc774703061f034a" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanohar@qca.qualcomm.com", "time": "Mon Oct 24 18:13:40 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:12 2011 -0400" }, "message": "ath9k_hw: Update AR9485 initvals to fix system hang issue\n\nThis patch fixes system hang when resuming from S3 state\nand lower rate sens failure issue.\n\nCc: stable@kernel.org\nSigned-off-by: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "94d55d62bd757611f07a9122e5e07ce929b8d38d", "tree": "dd6977b6c79f57d8601d633aa2466315d83a572e", "parents": [ "fd26981cf53ee91951a92fae53416e4ce639164c" ], "author": { "name": "Christian Lamparter", "email": "chunkeey@googlemail.com", "time": "Fri Oct 21 18:38:56 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:12 2011 -0400" }, "message": "carl9170: fix AMPDU TX_CTL_REQ_TX_STATUS handling\n\nPreviously the driver did not care if TX_CTL_REQ_TX_STATUS\nwas set on aggregated frames or not and it would silently\ndrop successfully sent frames if possible [much like:\n\"no news is good news!\"].\n\nBut, TX_CTL_REQ_TX_STATUS was invented for a reason and\nno tx status report should ever be dropped if it is set.\n\nReported-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fd26981cf53ee91951a92fae53416e4ce639164c", "tree": "c30d9fbcb6d59cffbfd57c08dbbd6db10fb5aa01", "parents": [ "6911bf0453e0d6ea8eb694a4ce67a68d071c538e" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanohar@qca.qualcomm.com", "time": "Fri Oct 21 12:53:51 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:11 2011 -0400" }, "message": "ath9k_hw: Fix regression of register offset of AR9330/AR9340\n\nThe commit ce407afc10 introduced regression for AR9330/AR9340\nregister offsets. Some of the register offsets are common\nfor AR9330/AR9340/AR9485 except AR9380. Fix that.\n\nCc: stable@kernel.org [3.1.0+]\nCc: Senthil Balasubramanian \u003csenthilb@qca.qualcomm.com\u003e\nSigned-off-by: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "91ae4d02913808fc4056168766185d1a3bd63f65", "tree": "c26ef7f3b71f3f3af44bc00f8fda18988805920b", "parents": [ "52d6d4ef5e6d1517688e27c11c01ab303ec681dd" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanohar@qca.qualcomm.com", "time": "Thu Oct 20 14:29:38 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:11 2011 -0400" }, "message": "ath9k_hw: Fix radio retention for AR9462\n\nIQ calibration during fast channel change sometimes failed\nwith RTT. And also restoring invalid radio retention readings\nduring init cal could cause failure to set the channel properly.\nThis patch counts the valid rtt history readings and clears\nrtt mask.\n\nSigned-off-by: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "52d6d4ef5e6d1517688e27c11c01ab303ec681dd", "tree": "d6cf57db1c25067213cc835bd66ff55d622d4711", "parents": [ "cda4ee3f2e6907e89baf7a12e02e02fa208c0625" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanohar@qca.qualcomm.com", "time": "Thu Oct 20 14:22:43 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:11 2011 -0400" }, "message": "ath9k_hw: Fix regression of register offset for AR9003 chips\n\nMy recent commits (3782c69d, 324c74a) introduced regression\nfor register offset selection that based on the macversion.\nNot using parentheses in proper manner for ternary operator\nleads to select wrong offset for the registers.\n\nThis issue was observed with AR9462 chip that immediate disconnect\nafter the association with the following message\n\nieee80211 phy3: wlan0: Failed to send nullfunc to AP 00:23:69:12:ea:47\nafter 500ms, disconnecting.\n\nCc: stable@kernel.org\nSigned-off-by: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "cda4ee3f2e6907e89baf7a12e02e02fa208c0625", "tree": "aeaedda0e811a1d83cbf00de9cb6673f4ca696f7", "parents": [ "c125d5e846894043361c0c89c1140be8fd6600b7" ], "author": { "name": "Emmanuel Grumbach", "email": "emmanuel.grumbach@intel.com", "time": "Fri Oct 14 12:54:47 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 02 15:23:10 2011 -0400" }, "message": "iwlagn: fix the race in the unmapping of the HCMD\n\nAs Stanislaw pointed out, my patch\n\n\tiwlagn: fix a race in the unmapping of the TFDs\n\nsolved only part of the problem. The race still exists for TFDs of\nthe host commands. Fix that too.\n\nReported-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: Emmanuel Grumbach \u003cemmanuel.grumbach@intel.com\u003e\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "de0a5345a55b8dd5a4695181275df0e691176830", "tree": "17530e824f7f46ce0b1757657179fb5957a6add5", "parents": [ "994c0e992522c123298b4a91b72f5e67ba2d1123", "8535639810e578960233ad39def3ac2157b0c3ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 09:45:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 09:45:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://github.com/richardweinberger/linux\n\n* \u0027for-linus\u0027 of git://github.com/richardweinberger/linux: (90 commits)\n um: fix ubd cow size\n um: Fix kmalloc argument order in um/vdso/vma.c\n um: switch to use of drivers/Kconfig\n UserModeLinux-HOWTO.txt: fix a typo\n UserModeLinux-HOWTO.txt: remove ^H characters\n um: we need sys/user.h only on i386\n um: merge delay_{32,64}.c\n um: distribute exports to where exported stuff is defined\n um: kill system-um.h\n um: generic ftrace.h will do...\n um: segment.h is x86-only and needed only there\n um: asm/pda.h is not needed anymore\n um: hw_irq.h can go generic as well\n um: switch to generic-y\n um: clean Kconfig up a bit\n um: a couple of missing dependencies...\n um: kill useless argument of free_chan() and free_one_chan()\n um: unify ptrace_user.h\n um: unify KSTK_...\n um: fix gcov build breakage\n ...\n" }, { "commit": "bad3118fcdeb4b7b5bf18cb40b2548cf891646b2", "tree": "d5d30f568f4dbda369e0aaf1333ffcc17e85c41d", "parents": [ "772bd0a5a5ebfd37186df086c0f51f676495c4d9" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Thu Aug 18 20:12:50 2011 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Nov 02 14:15:28 2011 +0100" }, "message": "um: a couple of missing dependencies...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "2edcd4ca43df3c1d1d392753531cc73a53e709ba", "tree": "0a82adf6b2b95135568d8defb6931a6b66120fff", "parents": [ "0ad92ad03aa444b312bd318b0341011a8be09d13" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Wed Nov 02 01:49:44 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 02 01:49:44 2011 -0400" }, "message": "net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c\n\nCommit 9e903e085262 (\"net: add skb frag size accessors\") used frag_size\ninstead of skb_frag_size in this file.\n\nFixes this build error:\n\ndrivers/net/ethernet/xilinx/ll_temac_main.c: In function \u0027temac_start_xmit\u0027:\ndrivers/net/ethernet/xilinx/ll_temac_main.c:717:3: error: implicit declaration of function \u0027frag_size\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "77dd7693c52d002d24be6842fb0b766116a6079f", "tree": "5717a04c0cc07d94c744a1162abcbff70a3102c6", "parents": [ "3ead6f4d42e2866a48d7abf9bc98553f1110b6df" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Sun Aug 14 17:52:33 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:40:58 2011 +1030" }, "message": "virtio-net: Use virtio_config_val() for retrieving config\n\nThis patch modifies virtio-net to use virtio_config_val() instead\nof a \u0027if(virtio_has_feature()) vdev-\u003econfig-\u003eget()\u0027 construct to retrieve\noptional values from the config space.\n\nCc: Amit Shah \u003camit.shah@redhat.com\u003e\nCc: \"Michael S. Tsirkin\" \u003cmst@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: virtualization@lists.linux-foundation.org\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "0a3360e1e18fc6bbe10bebe416db42de5fa02dbd", "tree": "19895725ca0ebcd57a976eabe51e318818e69cb6", "parents": [ "1b6b7172d0ee37528762bddb83acb56cb38ffac2" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Oct 29 08:09:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 01 19:30:38 2011 -0400" }, "message": "net/ethernet: Move mac89x0.c from apple to cirrus\n\nMacintosh CS89x0 based ethernet cards use a Crystal Semiconductor (Now\nCirrus Logic) CS89x0 chip, so the mac89x0 driver should be in\ndrivers/net/ethernet/cirrus instead of drivers/net/ethernet/apple.\n\nThis also fixes a build problem, as the driver needs a header file from the\ncirrus directory:\n\ndrivers/net/ethernet/apple/mac89x0.c:107:20: error: cs89x0.h: No such file or directory\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1b6b7172d0ee37528762bddb83acb56cb38ffac2", "tree": "83378bd8c9b88a7074c3ff9ef97790ab54e5ef94", "parents": [ "048ca16935fdfbe17d1593e022eef4713c70c7e2" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Oct 25 12:32:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 01 19:30:38 2011 -0400" }, "message": "net/ethernet: sc92031 is not Realtek\n\nWhile the SC92031 could be found on fake \"Realtek\" NICs, it has no\nrelationship to Realtek, and is actually from Silan.\n\nCreate a new subdirectory for silan and move sc92031 there.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98f41f694f46085fda475cdee8cc0b6d2c5e6f1f", "tree": "aabd6b698ba6319c95eabe1a68f37207e94b51ec", "parents": [ "deede2fabe24e00bd7e246eb81cd5767dc6fcfc7" ], "author": { "name": "Weiping Pan", "email": "wpan@redhat.com", "time": "Mon Oct 31 17:20:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 01 17:52:49 2011 -0400" }, "message": "bonding:update speed/duplex for NETDEV_CHANGE\n\nZheng Liang(lzheng@redhat.com) found a bug that if we config bonding with\narp monitor, sometimes bonding driver cannot get the speed and duplex from\nits slaves, it will assume them to be 100Mb/sec and Full, please see\n/proc/net/bonding/bond0.\nBut there is no such problem when uses miimon.\n\n(Take igb for example)\nI find that the reason is that after dev_open() in bond_enslave(),\nbond_update_speed_duplex() will call igb_get_settings()\n, but in that function,\nit runs ethtool_cmd_speed_set(ecmd, -1); ecmd-\u003eduplex \u003d -1;\nbecause igb get an error value of status.\nSo even dev_open() is called, but the device is not really ready to get its\nsettings.\n\nMaybe it is safe for us to call igb_get_settings() only after\nthis message shows up, that is \"igb: p4p1 NIC Link is Up 1000 Mbps Full Duplex,\nFlow Control: RX\".\n\nSo I prefer to update the speed and duplex for a slave when reseices\nNETDEV_CHANGE/NETDEV_UP event.\n\nChangelog\nV2:\n1 remove the \"fake 100/Full\" logic in bond_update_speed_duplex(),\n set speed and duplex to -1 when it gets error value of speed and duplex.\n2 delete the warning in bond_enslave() if bond_update_speed_duplex() returns\n error.\n3 make bond_info_show_slave() handle bad values of speed and duplex.\n\nSigned-off-by: Weiping Pan \u003cwpan@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f470f8d4e702593ee1d0852871ad80373bce707b", "tree": "85a67e65c5e5b9777639bd8f4c763a4cf8787e0e", "parents": [ "dc47d3810cdcb4f32bfa31d50f26af97aced0638", "504255f8d0480cf293962adf4bc3aecac645ae71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:51:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:51:38 2011 -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: (62 commits)\n mlx4_core: Deprecate log_num_vlan module param\n IB/mlx4: Don\u0027t set VLAN in IBoE WQEs\u0027 control segment\n IB/mlx4: Enable 4K mtu for IBoE\n RDMA/cxgb4: Mark QP in error before disabling the queue in firmware\n RDMA/cxgb4: Serialize calls to CQ\u0027s comp_handler\n RDMA/cxgb3: Serialize calls to CQ\u0027s comp_handler\n IB/qib: Fix issue with link states and QSFP cables\n IB/mlx4: Configure extended active speeds\n mlx4_core: Add extended port capabilities support\n IB/qib: Hold links until tuning data is available\n IB/qib: Clean up checkpatch issue\n IB/qib: Remove s_lock around header validation\n IB/qib: Precompute timeout jiffies to optimize latency\n IB/qib: Use RCU for qpn lookup\n IB/qib: Eliminate divide/mod in converting idx to egr buf pointer\n IB/qib: Decode path MTU optimization\n IB/qib: Optimize RC/UC code by IB operation\n IPoIB: Use the right function to do DMA unmap pages\n RDMA/cxgb4: Use correct QID in insert_recv_cqe()\n RDMA/cxgb4: Make sure flush CQ entries are collected on connection close\n ...\n" }, { "commit": "504255f8d0480cf293962adf4bc3aecac645ae71", "tree": "5ae8663d2bc2eb9e796bfb689f3e462a14742e06", "parents": [ "2be6053318aa4f2787b7bc5cf5160017d7d1586b", "615eb715ae10cbaa8079ab8cacf8f4596be4087a", "f7cc25d018f1e9af6767ee7774bbe83452e9fdf4", "d32ae393dbf0daf778f9e33b0bc6591cd102391e", "a5e12dff757b562bbecd6a2359fdc4c43d4d97de", "3e60a77ea218d1915bdc9127f88ab866fd2ac643", "787adb9d6ad9afb498a1580a7d8ad05f779c488a", "caf6e3f221ddc12ccabd1cd0ba149561db0090d4", "cb29688aaa4caa4d54df2976118fe99a839bb433", "0f0bee8bbc2b3e49baa703118041f99db9ef41a1", "16d99812d58b8af2df29cd337a74cd965b53da04", "42849b2697c36abdafa6aef64186b15055392046" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 01 09:37:08 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 01 09:37:08 2011 -0700" }, "message": "Merge branches \u0027amso1100\u0027, \u0027cma\u0027, \u0027cxgb3\u0027, \u0027cxgb4\u0027, \u0027fdr\u0027, \u0027ipath\u0027, \u0027ipoib\u0027, \u0027misc\u0027, \u0027mlx4\u0027, \u0027misc\u0027, \u0027nes\u0027, \u0027qib\u0027 and \u0027xrc\u0027 into for-next\n" }, { "commit": "23e049442b7b4f87f802470b4fd46a0e50b2fbdd", "tree": "7dfd95eae9373805617c528fb9e38772c72ec77b", "parents": [ "094803e0aab3fe75bbf8202a8f4b5280eaade375" ], "author": { "name": "Andrew Morton", "email": "akpm@google.com", "time": "Tue Nov 01 00:53:33 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 01 00:53:33 2011 -0400" }, "message": "drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug\n\nThe `#define filename\u0027 screws up the expansion of\nDEFINE_DYNAMIC_DEBUG_METADATA:\n\ndrivers/net/ethernet/i825xx/3c505.c: In function \u0027send_pcb\u0027:\ndrivers/net/ethernet/i825xx/3c505.c:390: error: expected identifier before string constant\ndrivers/net/ethernet/i825xx/3c505.c:390: error: expected \u0027}\u0027 before \u0027.\u0027 token\ndrivers/net/ethernet/i825xx/3c505.c:436: error: expected identifier before string constant\ndrivers/net/ethernet/i825xx/3c505.c:435: error: expected \u0027}\u0027 before \u0027.\u0027 token\ndrivers/net/ethernet/i825xx/3c505.c: In function \u0027start_receive\u0027:\ndrivers/net/ethernet/i825xx/3c505.c:557: error: expected identifier before string constant\ndrivers/net/ethernet/i825xx/3c505.c:557: error: expected \u0027}\u0027 before \u0027.\u0027 token\ndrivers/net/ethernet/i825xx/3c505.c: In function \u0027receive_packet\u0027:\ndrivers/net/ethernet/i825xx/3c505.c:629: error: expected identifier before string constant\n\netc\n\nSo remove that #define and \"open-code\" it.\n\nCc: Philip Blundell \u003cphilb@gnu.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67220a9ea3eb9cf61de7e384b6bcaaa78f680c9d", "tree": "9aa6610fe95cb54138b5994d9b36cb2a150082d8", "parents": [ "0a90e0f1012e576500b551455b046013324826b9" ], "author": { "name": "Andy Shevchenko", "email": "andriy.shevchenko@linux.intel.com", "time": "Mon Oct 31 17:13:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:57 2011 -0700" }, "message": "wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack\n\nThere is no functional change.\n\nSigned-off-by: Andy Shevchenko \u003candriy.shevchenko@linux.intel.com\u003e\nAcked-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b9075fa968a0a4347aef35e235e2995c0e57dddd", "tree": "cf9f9716784e790d8a43339653256d9cf9178ff3", "parents": [ "ae29bc92da01a2e9d278a9a58c3b307d41cc0254" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Oct 31 17:11:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:54 2011 -0700" }, "message": "treewide: use __printf not __attribute__((format(printf,...)))\n\nStandardize the style for compiler based printf format verification.\nStandardized the location of __printf too.\n\nDone via script and a little typing.\n\n$ grep -rPl --include\u003d*.[ch] -w \"__attribute__\" * | \\\n grep -vP \"^(tools|scripts|include/linux/compiler-gcc.h)\" | \\\n xargs perl -n -i -e \u0027local $/; while (\u003c\u003e) { s/\\b__attribute__\\s*\\(\\s*\\(\\s*format\\s*\\(\\s*printf\\s*,\\s*(.+)\\s*,\\s*(.+)\\s*\\)\\s*\\)\\s*\\)/__printf($1, $2)/g ; print; }\u0027\n\n[akpm@linux-foundation.org: revert arch bits]\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: \"Kirill A. Shutemov\" \u003ckirill@shutemov.name\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "452962366c11a9126fabac8cb28af49c27464408", "tree": "a98fb3d214943197fbf33eb496a6df4a63f8964c", "parents": [ "3f934e00a4d610b00159873ea9000dc3b08e3c06" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Aug 30 17:50:46 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:32:10 2011 -0400" }, "message": "staging: Add module.h to more drivers implicitly using it.\n\nThis 2nd batch of implicit module.h users only appeared when we\nremoved the unnecessary module.h from include/linux/miscdevice.h\n[The 1st batch is already present in Greg\u0027s staging tree.]\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "310587c320e906c59ef4152c41d81b00adf1b259", "tree": "6dda14eaae4294916983af2ef3558a0a48c43405", "parents": [ "d0e88ec90151c52ca9aa67adece8f2b8bd3c9f3b" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Sep 15 19:42:40 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:10 2011 -0400" }, "message": "drivers/net: fix mislocated headers in cxgb4/l2t.c\n\nFor some reason three #include \u003clinux/...\u003e are buried way\ndown in the file. Since the inclusion of module.h is one\nof them, the inclusion comes after use of EXPORT_SYMBOL\nwhich will cause warnings about implicit declarations.\nRelocate all the headers to the top.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "d0e88ec90151c52ca9aa67adece8f2b8bd3c9f3b", "tree": "1a4e49ef3605e4dbab29797b0c2e5ff8ca787af0", "parents": [ "6eb07caf1ac5723720caea2ee93cd11b7058a0aa" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Sep 29 16:37:30 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:09 2011 -0400" }, "message": "drivers/net: wireless/ath/ath5k/debug.c does not need module.h\n\nIt only has module_param and EXPORT_SYMBOL, so now that export.h\nis in scope at the same time as the recent ath5k update, we can\ndelete this module.h include.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "6eb07caf1ac5723720caea2ee93cd11b7058a0aa", "tree": "f497ae508fdd5147da5bc63b70934f6609e4c506", "parents": [ "ac5c24e9e613df556f054f1fa811fca0c24fe500" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Sep 15 19:46:05 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:09 2011 -0400" }, "message": "drivers/net: Add moduleparam.h to drivers as required.\n\nThese files were using moduleparam infrastructure, but were not\nincluding anything for it -- which is fine when module.h is being\nimplicitly included in all files, but that is going away.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "ac5c24e9e613df556f054f1fa811fca0c24fe500", "tree": "e82e39cf300c0a7f04820fceeb7ec175b395faac", "parents": [ "ee40fa0656a730491765545ff7550f3c1ceb0fbc" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Aug 30 14:18:44 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:08 2011 -0400" }, "message": "drivers/net: change moduleparam.h to module.h as required.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "ee40fa0656a730491765545ff7550f3c1ceb0fbc", "tree": "fd18764b7a60ccc1ca54b15a7611414d8974efbe", "parents": [ "9d9779e723a5d23b94abbe5bb7d1197921f6f3dd" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 27 16:14:23 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:08 2011 -0400" }, "message": "drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE\n\nThese were getting the macros from an implicit module.h\ninclude via device.h, but we are planning to clean that up.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n\ndrivers/net: Add export.h to wireless/brcm80211/brcmfmac/bcmsdh.c\n\nThis relatively recently added file uses EXPORT_SYMBOL and hence\nneeds export.h included so that it is compatible with the module.h\nsplit up work.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "9d9779e723a5d23b94abbe5bb7d1197921f6f3dd", "tree": "19c5f0910a919c3a230867f1aec1f81daedf1f4c", "parents": [ "5270f31222315de96a3ee00ecde5ad97528cacab" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 03 15:21:01 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:07 2011 -0400" }, "message": "drivers/net: Add module.h to drivers who were implicitly using it\n\nThe device.h header was including module.h, making it present for\nmost of these drivers. But we want to clean that up. Call out the\ninclude of module.h in the modular network drivers.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "2d3def0b73e33e5af2e81094710c07423e00b8be", "tree": "65ad662baae4e6f1e50aab4ccdd46300a9587364", "parents": [ "4f4d7a9ba0b7cdbc518cc04930323b15411eee14" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Mon Oct 24 13:43:05 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Oct 31 23:40:16 2011 +0100" }, "message": "stmmac: drop unused Kconfig symbol\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nAcked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "1a4ceab195e66bce9c1638fdded6d92988100ba4", "tree": "3ec17bd66fb3ac1429131e373cc8d99550d5451a", "parents": [ "83f89ca755c9f783b8229d968c4e9d2c660ca427", "6a32e4f9dd9219261f8856f817e6655114cfec2f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 15:22:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 15:22:44 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)\n vlan: allow nested vlan_do_receive()\n ipv6: fix route lookup in addrconf_prefix_rcv()\n bonding: eliminate bond_close race conditions\n qlcnic: fix beacon and LED test.\n qlcnic: Updated License file\n qlcnic: updated reset sequence\n qlcnic: reset loopback mode if promiscous mode setting fails.\n qlcnic: skip IDC ack check in fw reset path.\n i825xx: Fix incorrect dependency for BVME6000_NET\n ipv6: fix route error binding peer in func icmp6_dst_alloc\n ipv6: fix error propagation in ip6_ufo_append_data()\n stmmac: update normal descriptor structure (v2)\n stmmac: fix NULL pointer dereference in capabilities fixup (v2)\n stmmac: fix a bug while checking the HW cap reg (v2)\n be2net: Changing MAC Address of a VF was broken.\n be2net: Refactored be_cmds.c file.\n bnx2x: update driver version to 1.70.30-0\n bnx2x: use FW 7.0.29.0\n bnx2x: Enable changing speed when port type is PORT_DA\n bnx2x: Fix 54618se LED behavior\n ...\n" }, { "commit": "cb29688aaa4caa4d54df2976118fe99a839bb433", "tree": "e6bce5a3970bb1607f025262ba316e6175982862", "parents": [ "80a2dcd8d05c11d42f4e606d7a5f3eaa2794ab34" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Sun Oct 16 10:26:21 2011 +0200" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon Oct 31 12:00:15 2011 -0700" }, "message": "mlx4_core: Deprecate log_num_vlan module param\n\nEnable the maximum size (128) supported by the device for the shadow\nvlans table, ignoring the module parameter that overrides it. This\ntable is only used by the IBoE control plane for setting a vlan index\ninto an RC/UC QP context or UD Address Handle.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "e6d265e8504ab4a3368b8645d318b344ee88b280", "tree": "6fd2bc16819bae491e56be2658fc3298b7efa92c", "parents": [ "10ee0faed92c8af4baebd633372136a6608a41ea" ], "author": { "name": "Jay Vosburgh", "email": "fubar@us.ibm.com", "time": "Fri Oct 28 15:42:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 30 03:13:14 2011 -0400" }, "message": "bonding: eliminate bond_close race conditions\n\nThis patch resolves two sets of race conditions.\n\n\tMitsuo Hayasaka \u003cmitsuo.hayasaka.hu@hitachi.com\u003e reported the\nfirst, as follows:\n\nThe bond_close() calls cancel_delayed_work() to cancel delayed works.\nIt, however, cannot cancel works that were already queued in workqueue.\nThe bond_open() initializes work-\u003edata, and proccess_one_work() refers\nget_work_cwq(work)-\u003ewq-\u003eflags. The get_work_cwq() returns NULL when\nwork-\u003edata has been initialized. Thus, a panic occurs.\n\n\tHe included a patch that converted the cancel_delayed_work calls\nin bond_close to flush_delayed_work_sync, which eliminated the above\nproblem.\n\n\tHis patch is incorporated, at least in principle, into this\npatch. In this patch, we use cancel_delayed_work_sync in place of\nflush_delayed_work_sync, and also convert bond_uninit in addition to\nbond_close.\n\n\tThis conversion to _sync, however, opens new races between\nbond_close and three periodically executing workqueue functions:\nbond_mii_monitor, bond_alb_monitor and bond_activebackup_arp_mon.\n\n\tThe race occurs because bond_close and bond_uninit are always\ncalled with RTNL held, and these workqueue functions may acquire RTNL to\nperform failover-related activities. If bond_close or bond_uninit is\nwaiting in cancel_delayed_work_sync, deadlock occurs.\n\n\tThese deadlocks are resolved by having the workqueue functions\nacquire RTNL conditionally. If the rtnl_trylock() fails, the functions\nreschedule and return immediately. For the cases that are attempting to\nperform link failover, a delay of 1 is used; for the other cases, the\nnormal interval is used (as those activities are not as time critical).\n\n\tAdditionally, the bond_mii_monitor function now stores the delay\nin a variable (mimicing the structure of activebackup_arp_mon).\n\n\tLastly, all of the above renders the kill_timers sentinel moot,\nand therefore it has been removed.\n\nTested-by: Mitsuo Hayasaka \u003cmitsuo.hayasaka.hu@hitachi.com\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10ee0faed92c8af4baebd633372136a6608a41ea", "tree": "bd9390dfecf81ec40c2cdb12f97d4c7e7224132e", "parents": [ "445b62dfd934394807c12aee06d3f20cf70c93b4" ], "author": { "name": "Sucheta Chakraborty", "email": "sucheta.chakraborty@qlogic.com", "time": "Fri Oct 28 12:57:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 30 03:09:41 2011 -0400" }, "message": "qlcnic: fix beacon and LED test.\n\no Updated version number to 5.0.25\n\no Do not hold onto RESETTING_BIT for entire duration of LED/ beacon test.\n Instead, just checking for RESETTING_BIT not set before sending config_led\n command down to card.\n\no Take rtnl_lock instead of RESETTING_BIT for beacon test while sending\n config_led command down to make sure interface cannot be brought up/ down.\n\no Allocate and free resources if interface is down before\n sending the config_led command. This is to make sure config_led\n command sending doesn\u0027t fail.\n\no Clear QLCNIC_LED_ENABLE bit if beacon/ LED test fails to start.\n\nSigned-off-by: Sucheta Chakraborty \u003csucheta.chakraborty@qlogic.com\u003e\nSigned-off-by: Anirban Chakraborty \u003canirban.chakraborty@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68233c583ab4549b739f12135bdab108336d5204", "tree": "e638b99db915d9c039afa3baf2cfb1960fdfc774", "parents": [ "ad567b8f1d1e39bdf622866a910f1d52d2be3a0a" ], "author": { "name": "Sony Chacko", "email": "sony.chacko@qlogic.com", "time": "Fri Oct 28 12:57:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 30 03:09:40 2011 -0400" }, "message": "qlcnic: updated reset sequence\n\nSigned-off-by: Sony Chacko \u003csony.chacko@qlogic.com\u003e\nSigned-off-by: Anirban Chakraborty \u003canirban.chakraborty@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad567b8f1d1e39bdf622866a910f1d52d2be3a0a", "tree": "81da3fda4ec9e9215412697555e5939d0f384ebc", "parents": [ "16e3cf73befecd882399d6ec7b12e8fb2c7abf73" ], "author": { "name": "Sucheta Chakraborty", "email": "sucheta.chakraborty@qlogic.com", "time": "Fri Oct 28 12:57:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 30 03:09:40 2011 -0400" }, "message": "qlcnic: reset loopback mode if promiscous mode setting fails.\n\nIf promiscous mode setting fails, reset loopback mode setting in firmware.\n\nSigned-off-by: Sucheta Chakraborty \u003csucheta.chakraborty@qlogic.com\u003e\nSigned-off-by: Anirban Chakraborty \u003canirban.chakraborty@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "16e3cf73befecd882399d6ec7b12e8fb2c7abf73", "tree": "2e455a015cbdd7c439101e16eb1cdebdc49a9094", "parents": [ "9eeebb5bc8d984298cba9d12690923cdc09ab173" ], "author": { "name": "Sritej Velaga", "email": "sritej.velaga@qlogic.com", "time": "Fri Oct 28 12:57:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 30 03:09:39 2011 -0400" }, "message": "qlcnic: skip IDC ack check in fw reset path.\n\nIn fw reset path, we should consider any change in device state as an\nack from the other driver. When that happens, we don\u0027t have to wait for\nan explicit ack.\n\nSigned-off-by: Sritej Velaga \u003csritej.velaga@qlogic.com\u003e\nSigned-off-by: Anirban Chakraborty \u003canirban.chakraborty@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0e59e7e7feb5a12938fbf9135147eeda3238c6c4", "tree": "dbe994369ca9cad6893f0fd710f75791bc84b816", "parents": [ "46b51ea2099fa2082342e52b8284aa828429b80b", "a513a99a7cebfb452839cc09c9c0586f72d96414" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 14:20:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 14:20:44 2011 -0700" }, "message": "Merge branch \u0027next-rebase\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027next-rebase\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:\n PCI: Clean-up MPS debug output\n pci: Clamp pcie_set_readrq() when using \"performance\" settings\n PCI: enable MPS \"performance\" setting to properly handle bridge MPS\n PCI: Workaround for Intel MPS errata\n PCI: Add support for PASID capability\n PCI: Add implementation for PRI capability\n PCI: Export ATS functions to modules\n PCI: Move ATS implementation into own file\n PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()\n PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove\n PCI / PM: Extend PME polling to all PCI devices\n PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823\n PCI: Make pci_setup_bridge() non-static for use by arch code\n x86: constify PCI raw ops structures\n PCI: Add quirk for known incorrect MPSS\n PCI: Add Solarflare vendor ID and SFC4000 device IDs\n" }, { "commit": "3ddb709af32bacaf78d124420404d1ac19be99b8", "tree": "60f603094ddb3ab6f63c561800b138ae965a5955", "parents": [ "7011687f0f2f12cc348f6a693fafe63d89167eac" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri Oct 28 10:53:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 28 17:06:56 2011 -0400" }, "message": "i825xx: Fix incorrect dependency for BVME6000_NET\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "97285b78174423e5576b2e06aa45f64df009da5b", "tree": "d6f44a503b98f385e22fc9243d1abaf98d68947d", "parents": [ "e36fb88a9a0fb8ac4b87c8ac709214a408de6d97" ], "author": { "name": "Marcel Apfelbaum", "email": "marcela@dev.mellanox.co.il", "time": "Mon Oct 24 11:02:34 2011 +0200" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Fri Oct 28 11:33:38 2011 -0700" }, "message": "mlx4_core: Add extended port capabilities support\n\nAn Extended Port Info packet is sent to each hw port during HCA init.\nIf it returns without error, we assume the port supports extended port\ncapabilities.\n\nSigned-off-by: Marcel Apfelbaum \u003cmarcela@dev.mellanox.co.il\u003e\nReviewed-by: Jack Morgenstein \u003cjackm@dev.mellanox.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "3c20f72f9108b2fcf30ec63d8a4203736c01ccd0", "tree": "8310be8eba2e616fc3b93e5c7e379343c0480710", "parents": [ "e2c57f839c63f452b4704e048c8db9cf669ed410" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Wed Oct 26 19:43:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 23:17:12 2011 -0400" }, "message": "stmmac: update normal descriptor structure (v2)\n\nThis patch updates the normal descriptor structure\nto work fine on new GMAC Synopsys chips.\n\nNormal descriptors were designed on the old MAC10/100\ndatabook 1.91 where some bits were reserved: for example\nthe tx checksum insertion and rx checksum offload.\n\nThe patch maintains the back-compatibility with old\nMAC devices (tested on STx7109 MAC10/100) and adds new\nfields that actually new GMAC devices can use.\n\nFor example, STx7109 (MAC10/100) will pass from the platform\n tx_coe \u003d 0, enh_desc \u003d 0, has_gmac \u003d 0.\nA platform like Loongson1B (GMAC) will pass:\n tx_coe \u003d 1, enh_desc \u003d 0, has_gmac \u003d 1.\n\nThanks to Kelvin, he enhanced the normal descriptors for\nGMAC (on MIPS Loongson1B platform).\n\nSigned-off-by: Kelvin Cheung \u003ckeguang.zhang@gmail.com\u003e\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e2c57f839c63f452b4704e048c8db9cf669ed410", "tree": "8e3553d961db5fc5de5e83ba5469b0e0cbcbdfc3", "parents": [ "5e6efe88c54ad79353666f5371b5b97c0e16111e" ], "author": { "name": "Angus Clark", "email": "angus.clark@st.com", "time": "Wed Oct 26 19:43:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 23:17:11 2011 -0400" }, "message": "stmmac: fix NULL pointer dereference in capabilities fixup (v2)\n\nSigned-off-by: Angus Clark \u003cangus.clark@st.com\u003e\nAcked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e6efe88c54ad79353666f5371b5b97c0e16111e", "tree": "4e6af2da84ec10be1cf8fb033a3627e222b5a9fe", "parents": [ "e3a7ae2c1819aa210a38f80f6bf13322652c8211" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Wed Oct 26 19:43:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 23:17:11 2011 -0400" }, "message": "stmmac: fix a bug while checking the HW cap reg (v2)\n\nThe patch fixes a bug while checking the HW cap reg\non old MAC10/100 where this feature is not available.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e3a7ae2c1819aa210a38f80f6bf13322652c8211", "tree": "75cbeb4866aee1e1d8c75148200795a17c1f657a", "parents": [ "106df1e3594c710c74348883a4942f65651781ff" ], "author": { "name": "Somnath Kotur", "email": "somnath.kotur@emulex.com", "time": "Thu Oct 27 07:14:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 23:16:20 2011 -0400" }, "message": "be2net: Changing MAC Address of a VF was broken.\n\nAllow for MAC Address change of VF(SR-IOV case) on the fly- First add and then\ndelete MAC Address to allow for \u0027out of pool\u0027 errors.\nWhen MAC Addr configured from a VM, the MAC on the NIC will aleady have\nthe supplied MAC,so just copy the supplied MAC to the netdev structure\nbefore returning success to the stack\n\nSigned-off-by: Somnath Kotur \u003csomnath.kotur@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "106df1e3594c710c74348883a4942f65651781ff", "tree": "56f1dd8d113f41cff36cc1942c93887b25a703ff", "parents": [ "6afc25c9a7197db24e1cbfa40140ee360d65141f" ], "author": { "name": "Somnath Kotur", "email": "somnath.kotur@emulex.com", "time": "Thu Oct 27 07:12:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 23:16:19 2011 -0400" }, "message": "be2net: Refactored be_cmds.c file.\n\nMoved the .sge. field\u0027s population inside be_cmd_hdr_prepare.\nPopulating wrb-\u003etag0 and tag1 inside be_cmd_hdr_prepare\n\nSigned-off-by: Somnath Kotur \u003csomnath.kotur@emulex.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6afc25c9a7197db24e1cbfa40140ee360d65141f", "tree": "a7ca56fea98ffb047d89a61f69e6f1a735fdb407", "parents": [ "5e5399d8741ca3667560c43365285f8c280b3181" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Thu Oct 27 05:13:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 16:14:17 2011 -0400" }, "message": "bnx2x: update driver version to 1.70.30-0\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e5399d8741ca3667560c43365285f8c280b3181", "tree": "bc384ca5a534beb18f19f0cd595559111d8b5aa9", "parents": [ "bfdb58232f9227149cac89c17454edaf25f43136" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Thu Oct 27 05:13:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 16:14:16 2011 -0400" }, "message": "bnx2x: use FW 7.0.29.0\n\nThe FW includes the following fixes:\n 1. (iSCSI) Arrival of un-solicited ASYNC message causes\n firmware to abort the connection with RST.\n 2. (FCoE) There is a probability that truncated FCoE packet on\n RX path won\u0027t get detected which might lead to FW assert.\n 3. (iSCSI) Arrival of target-initiated NOP-IN during intense\n ISCSI traffic might lead to FW assert.\n 4. (iSCSI) Chip hangs when in case of retransmission not aligned\n to 4-bytes from the beginning of iSCSI PDU.\n 5. (FCoE) Arrival of packets beyond task IO size can lead to crash.\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfdb58232f9227149cac89c17454edaf25f43136", "tree": "355556ea9a3bdf05e1bbe27b308b0190aaaf6bb9", "parents": [ "001cea77b98f912050b8ea8995253fdbe7333fb6" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Thu Oct 27 05:13:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 16:14:16 2011 -0400" }, "message": "bnx2x: Enable changing speed when port type is PORT_DA\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "001cea77b98f912050b8ea8995253fdbe7333fb6", "tree": "31a426f579dba91b60b7284523bfb9d1f0cd2530", "parents": [ "ce7c048928473220394bb126b08596e92e998a36" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Thu Oct 27 05:09:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 16:14:16 2011 -0400" }, "message": "bnx2x: Fix 54618se LED behavior\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ce7c048928473220394bb126b08596e92e998a36", "tree": "cd84a01e6c6dd20f889cf23b66d71b05a880e045", "parents": [ "a9077bfd0b3fdcd1051cc3d09bf8c28f9d4d506a" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Thu Oct 27 05:09:47 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 16:14:15 2011 -0400" }, "message": "bnx2x: Fix RX/TX problem caused by the MAC layer\n\nThis patch fixes a problem in which the host stops receiving data after\nrestarting the interface. This issue is caused by combination of incorrect\ndata path tap closure, along with missing MAC reset.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a9077bfd0b3fdcd1051cc3d09bf8c28f9d4d506a", "tree": "2a42fe02ff38608a80fdf73006044fe67fcb07a5", "parents": [ "26ffaf36c8e0a0eefb6ff031d6166b5ee82eb3de" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Thu Oct 27 05:09:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 16:14:15 2011 -0400" }, "message": "bnx2x: Add link retry to 578xx-KR\n\nThis fix solves a problem of no link on 578xx-KR by retrying to link up to\nfour timer using the periodic function.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "26ffaf36c8e0a0eefb6ff031d6166b5ee82eb3de", "tree": "17bf603348763fbc10b6e335bcbc7cacc7d9e01c", "parents": [ "b903d324bee2627036d024dceed73b3c96558795" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Thu Oct 27 05:09:45 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 27 16:14:14 2011 -0400" }, "message": "bnx2x: Fix LED blink rate for 578xx\n\nAdjust blink rate on 578xx to fit its clock rate.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ca90666287401b475d9e0becf85bd02f069f1de8", "tree": "ad4dd789f8d5ab639c78997d3655b94fcbf660ef", "parents": [ "60325f0c6ee7c6b68f95aaa643260fb33d4bdd88", "374e759db148d1e874e3afb76707082af67e0984" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "message": "Merge branch \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)\n ARM: 7135/1: ep93xx: bring back missing \u003cmach/gpio.h\u003e\n ARM: 7104/1: plat-pxa: break out GPIO driver specifics\n ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem\n ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics\n ARM: 7101/1: arm/tegra: Replace \u003cmach/gpio.h\u003e with \u003cmach/gpio-tegra.h\u003e\n ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h\n ARM: 7083/1: rewrite U300 GPIO to use gpiolib\n ARM: 7074/1: gpio: davinci: eliminate unused variable warnings\n ARM: 7063/1: Orion: gpio: add missing include of linux/types.h\n ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build\n ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio\n ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq\n ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio\n ARM: 7057/1: mach-pnx4008: rename GPIO header\n ARM: 7056/1: plat-nomadik: kill off \u003cplat/gpio.h\u003e\n ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function\n ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem\n ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics\n ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem\n ARM: 7043/1: mach-ixp2000: rename GPIO header\n ...\n\nFix up trivial conflicts in arch/arm/mach-u300/Kconfig manually\n" }, { "commit": "c9d6369978411f690513994e6e53e2e6410874a4", "tree": "a75b386938b3f8f993c774c06f0e7b2ae830c1de", "parents": [ "2d073846b891c3f49c4ea03c5db3ac92f92742f1" ], "author": { "name": "David Vrabel", "email": "david.vrabel@citrix.com", "time": "Thu Sep 29 16:53:31 2011 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Oct 26 10:02:56 2011 -0400" }, "message": "net: xen-netback: use API provided by xenbus module to map rings\n\nThe xenbus module provides xenbus_map_ring_valloc() and\nxenbus_map_ring_vfree(). Use these to map the Tx and Rx ring pages\ngranted by the frontend.\n\nSigned-off-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "59fdaca9a4497ada47328d7b4b406b98a6f1c1a6", "tree": "f441fce4e551e8715cca1710563648b4c752fc17", "parents": [ "b0691c8ee7c28a72748ff32e91b165ec12ae4de6" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 24 19:04:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 25 19:22:23 2011 -0400" }, "message": "net: make bonding slaves honour master\u0027s skb-\u003epriority\n\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nAcked-by: Flavio Leitner \u003cfbl@redhat.com\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "0110bba5e7731524940f9e02ce3d4aae75087f68" }