The following changes since commit 47610554ba876acbd2dff621bc05e188753dbd5b:
Leann Ogasawara (1):
UBUNTU: Ubuntu-2.6.34-5.14

are available in the git repository at:

git://kernel.ubuntu.com/rtg/ubuntu-maverick.git bnx2-lp589304

Tim Gardner (1):
UBUNTU: [Config] Update bnx2 udeb firmware files

debian.master/d-i/firmware/nic-modules | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
From 18104400ad8a12c14c3f141e083a7b2ba1b45da5 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 4 Jun 2010 12:22:29 -0600
Subject: [PATCH] UBUNTU: [Config] Update bnx2 udeb firmware files

BugLink: http://bugs.launchpad.net/bugs/589304

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian.master/d-i/firmware/nic-modules | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
index bf601e5..75cc3a0 100644
--- a/debian.master/d-i/firmware/nic-modules
+++ b/debian.master/d-i/firmware/nic-modules
@@ -1,10 +1,10 @@
-bnx2/bnx2-mips-06-5.0.0.j3.fw ?
-bnx2/bnx2-rv2p-06-5.0.0.j3.fw ?
-bnx2/bnx2-mips-09-5.0.0.j3.fw ?
-bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ?
-bnx2/bnx2-rv2p-09-5.0.0.j3.fw ?
-bnx2x-e1-5.0.21.0.fw ?
-bnx2x-e1h-5.0.21.0.fw ?
+bnx2/bnx2-mips-06-5.0.0.j6.fw
+bnx2/bnx2-mips-09-5.0.0.j9.fw
+bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+bnx2/bnx2-rv2p-09-5.0.0.j10.fw
+bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
+bnx2x-e1-5.2.13.0.fw
+bnx2x-e1h-5.2.13.0.fw
e100/d101m_ucode.bin
e100/d101s_ucode.bin
e100/d102e_ucode.bin
--
1.7.0.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

On 06/04/2010 12:40 PM, Tim Gardner wrote:
> The following changes since commit 47610554ba876acbd2dff621bc05e188753dbd5b:
> Leann Ogasawara (1):
> UBUNTU: Ubuntu-2.6.34-5.14
>
> are available in the git repository at:
>
> git://kernel.ubuntu.com/rtg/ubuntu-maverick.git bnx2-lp589304
>
> Tim Gardner (1):
> UBUNTU: [Config] Update bnx2 udeb firmware files
>
> debian.master/d-i/firmware/nic-modules | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
> From 18104400ad8a12c14c3f141e083a7b2ba1b45da5 Mon Sep 17 00:00:00 2001
> From: Tim Gardner<tim.gardner@canonical.com>
> Date: Fri, 4 Jun 2010 12:22:29 -0600
> Subject: [PATCH] UBUNTU: [Config] Update bnx2 udeb firmware files
>
> BugLink: http://bugs.launchpad.net/bugs/589304
>
> Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
> ---
> debian.master/d-i/firmware/nic-modules | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
> index bf601e5..75cc3a0 100644
> --- a/debian.master/d-i/firmware/nic-modules
> +++ b/debian.master/d-i/firmware/nic-modules
> @@ -1,10 +1,10 @@
> -bnx2/bnx2-mips-06-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-06-5.0.0.j3.fw ?
> -bnx2/bnx2-mips-09-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09-5.0.0.j3.fw ?
> -bnx2x-e1-5.0.21.0.fw ?
> -bnx2x-e1h-5.0.21.0.fw ?
> +bnx2/bnx2-mips-06-5.0.0.j6.fw
> +bnx2/bnx2-mips-09-5.0.0.j9.fw
> +bnx2/bnx2-rv2p-06-5.0.0.j3.fw
> +bnx2/bnx2-rv2p-09-5.0.0.j10.fw
> +bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
> +bnx2x-e1-5.2.13.0.fw
> +bnx2x-e1h-5.2.13.0.fw
> e100/d101m_ucode.bin
> e100/d101s_ucode.bin
> e100/d102e_ucode.bin

Its worth noting that firmware files, unlike modules, are not generated
and should never be marked optional. Had they not been marked optional,
then we'd have encountered this issue of the firmware file names
changing much earlier because those changes would have broken the build.

rtg
--
Tim Gardner tim.gardner@canonical.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

On Fri, 2010-06-04 at 12:40 -0600, Tim Gardner wrote:
> From 18104400ad8a12c14c3f141e083a7b2ba1b45da5 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Fri, 4 Jun 2010 12:22:29 -0600
> Subject: [PATCH] UBUNTU: [Config] Update bnx2 udeb firmware files
>
> BugLink: http://bugs.launchpad.net/bugs/589304
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
> debian.master/d-i/firmware/nic-modules | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
> index bf601e5..75cc3a0 100644
> --- a/debian.master/d-i/firmware/nic-modules
> +++ b/debian.master/d-i/firmware/nic-modules
> @@ -1,10 +1,10 @@
> -bnx2/bnx2-mips-06-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-06-5.0.0.j3.fw ?
> -bnx2/bnx2-mips-09-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09-5.0.0.j3.fw ?
> -bnx2x-e1-5.0.21.0.fw ?
> -bnx2x-e1h-5.0.21.0.fw ?
> +bnx2/bnx2-mips-06-5.0.0.j6.fw
> +bnx2/bnx2-mips-09-5.0.0.j9.fw
> +bnx2/bnx2-rv2p-06-5.0.0.j3.fw
> +bnx2/bnx2-rv2p-09-5.0.0.j10.fw
> +bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
> +bnx2x-e1-5.2.13.0.fw
> +bnx2x-e1h-5.2.13.0.fw
> e100/d101m_ucode.bin
> e100/d101s_ucode.bin
> e100/d102e_ucode.bin

Makes sense to me. Just updating the versions and making them mandatory
so the build breaks if they change again. It also seems that these are
the only firmware files marked with '?' in maverick, so we're good all
around now.

Acked-by: Chase Douglas <chase.douglas@canonical.com>


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team