[GIT PULL IBFT] + Introduction

[GIT PULL IBFT] + Introduction

[Konrad Rzeszutek Wilk]

Hey Linus,

The following changes since commit 6ebdc661b608671e9ca572af8bb42d58108cc008:
 Linus Torvalds (1):
	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

are available in the git repository at:

 git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git ibft-fixes

There are two patches: one is a simple fix and the other adds me and Peter
as the maintainers of the iBFT driver. In the past the maintainer for the iBFT
was .. well nobody :-) Mike Christie and Greg KH were taking the patches but
both agreed that it didn't make sense for it to be in their git tree since it
wasn't per say in their baileywick.

Hence I am stepping up and becoming the maintainer for this driver.

Cheers,

Konrad

---
 MAINTAINERS                   |    6 ++++++
 drivers/firmware/iscsi_ibft.c |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

[PATCH 1/2] drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4

[Konrad Rzeszutek Wilk]

From: Joe Perches <joe@perches.com>

Convert netmask to __be32 and format it with %pI4

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Konrad Rzeszutek <ketuzsezr@darnok.org>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Cc: Peter Jones <pjones@redhat.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
---
 drivers/firmware/iscsi_ibft.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 051d1eb..f82bcda 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -381,7 +381,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
 	void *ibft_loc = entry->header;
 	char *str = buf;
 	char *mac;
-	int val;
+	__be32 val;
 
 	if (!nic)
 		return 0;
@@ -397,10 +397,8 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
 		str += sprintf_ipaddr(str, nic->ip_addr);
 		break;
 	case ibft_eth_subnet_mask:
-		val = ~((1 << (32-nic->subnet_mask_prefix))-1);
-		str += sprintf(str, NIPQUAD_FMT,
-			       (u8)(val >> 24), (u8)(val >> 16),
-			       (u8)(val >> 8), (u8)(val));
+		val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
+		str += sprintf(str, "%pI4", &val);
 		break;
 	case ibft_eth_origin:
 		str += sprintf(str, "%d\n", nic->origin);
-- 
1.7.0

[PATCH 2/2] ibft: Update MAINTAINERS file.

[Konrad Rzeszutek Wilk]

Provide the right e-mail and names for me and Peter.

Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
---
 MAINTAINERS |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 317ed38..0d8a948 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2399,6 +2399,12 @@ L:	virtualization@lists.linux-foundation.org
 S:	Maintained
 F:	drivers/char/virtio_console.c
 
+iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
+M:	Peter Jones <pjones@redhat.com>
+M:	Konrad Rzeszutek Wilk <konrad@kernel.org>
+S:	Maintained
+F:	drivers/firmware/iscsi_ibft*
+
 GSPCA FINEPIX SUBDRIVER
 M:	Frank Zago <frank@zago.net>
 L:	linux-media@vger.kernel.org
-- 
1.7.0

Re: [PATCH 2/2] ibft: Update MAINTAINERS file.

[Peter Jones]

On 02/26/2010 04:27 PM, Konrad Rzeszutek Wilk wrote:
> Provide the right e-mail and names for me and Peter.
> 
> Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>

Signed-off-by: Peter Jones <pjones@redhat.com>

> ---
>  MAINTAINERS |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 317ed38..0d8a948 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2399,6 +2399,12 @@ L:	virtualization@lists.linux-foundation.org
>  S:	Maintained
>  F:	drivers/char/virtio_console.c
>  
> +iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
> +M:	Peter Jones <pjones@redhat.com>
> +M:	Konrad Rzeszutek Wilk <konrad@kernel.org>
> +S:	Maintained
> +F:	drivers/firmware/iscsi_ibft*
> +
>  GSPCA FINEPIX SUBDRIVER
>  M:	Frank Zago <frank@zago.net>
>  L:	linux-media@vger.kernel.org


-- 
        Peter

First things first -- but not necessarily in that order.
		-- The Doctor