From: Linus Torvalds Date: Tue, 7 Apr 2009 01:05:43 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfe8ff32ae3c2ae47c26883d7703b64172e62487;hp=-c;p=linux-firmware Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: b44: Use kernel DMA addresses for the kernel DMA API forcedeth: Fix resume from hibernation regression. xfrm: fix fragmentation on inter family tunnels ibm_newemac: Fix dangerous struct assumption gigaset: documentation update gigaset: in file ops, check for device disconnect before anything else bas_gigaset: use tasklet_hi_schedule for timing critical tasklets net/802/fddi.c: add MODULE_LICENSE smsc911x: remove unused #include axnet_cs: fix phy_id detection for bogus Asix chip. bnx2: Use request_firmware() b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}() socket: use percpu_add() while updating sockets_in_use virtio_net: Set the mac config only when VIRITO_NET_F_MAC myri_sbus: use request_firmware e1000: fix loss of multicast packets vxge: should include tcp.h Conflict in firmware/WHENCE (SCSI vs net firmware) --- bfe8ff32ae3c2ae47c26883d7703b64172e62487 diff --combined WHENCE index c006af8,f3d0151..e4deb51 --- a/WHENCE +++ b/WHENCE @@@ -45,32 -45,6 +45,32 @@@ Found alsa-firmware package in hex form -------------------------------------------------------------------------- +Driver: SCSI_ADVANSYS - AdvanSys SCSI + +File: advansys/mcode.bin +File: advansys/3550.bin +File: advansys/38C0800.bin +File: advansys/38C1600.bin + +Licence: BSD, no source available. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support + +File: qlogic/1040.bin +File: qlogic/1280.bin +File: qlogic/12160.bin + +Licence: Allegedly GPLv2+, but no source visible. Marked: + + QLOGIC LINUX SOFTWARE + QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x + Copyright (C) 2001 Qlogic Corporation (www.qlogic.com) + +-------------------------------------------------------------------------- Driver: smctr -- SMC ISA/MCA Token Ring adapter File: tr_smctr.bin @@@ -390,59 -364,6 +390,59 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- +Driver: SLICOSS - Alacritech IS-NIC products + +File: slicoss/gbdownload.sys.ihex +File: slicoss/gbrcvucode.sys.ihex +File: slicoss/oasisdbgdownload.sys.ihex +File: slicoss/oasisdownload.sys.ihex +File: slicoss/oasisrcvucode.sys.ihex + +Licence: + Copyright (C) 1999-2009 Alacritech, Inc. + + as an unpublished work. This notice does not imply unrestricted or + public access to the source code from which this firmware image is + derived. Except as noted below this firmware image may not be + reproduced, used, sold or transferred to any third party without + Alacritech's prior written consent. All Rights Reserved. + + Permission is hereby granted for the distribution of this firmware + image as part of a Linux or other Open Source operating system kernel + in text or binary form as required. + + This firmware may not be modified and may only be used with + Alacritech hardware. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: SXG - Alacritech IS-NIC products + +File: sxg/saharadownloadB.sys.ihex +File: sxg/saharadbgdownloadB.sys.ihex + +Licence: + Copyright (C) 1999-2009 Alacritech, Inc. + + as an unpublished work. This notice does not imply unrestricted or + public access to the source code from which this firmware image is + derived. Except as noted below this firmware image may not be + reproduced, used, sold or transferred to any third party without + Alacritech's prior written consent. All Rights Reserved. + + Permission is hereby granted for the distribution of this firmware + image as part of a Linux or other Open Source operating system kernel + in text or binary form as required. + + This firmware may not be modified and may only be used with + Alacritech hardware. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter File: cxgb3/t3b_psram-1.1.0.bin.ihex @@@ -623,12 -544,32 +623,42 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- +Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver + +File: qlogic/isp1000.bin + +Licence: Unknown + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- ++ + Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet + + File: myricom/lanai.bin + + Licence: Unknown + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: BNX2 - Broadcom NetXtremeII + + File: bnx2/bnx2-mips-06-4.6.16.fw + File: bnx2/bnx2-rv2p-06-4.6.16.fw + File: bnx2/bnx2-mips-09-4.6.17.fw + File: bnx2/bnx2-rv2p-09-4.6.15.fw + + Licence: + + This file contains firmware data derived from proprietary unpublished + source code, Copyright (c) 2004 - 2009 Broadcom Corporation. + + Permission is hereby granted for the distribution of this firmware data + in hexadecimal or equivalent format, provided this copyright notice is + accompanying it. + + Found in hex form in kernel source. + + --------------------------------------------------------------------------