* Re: [KJ] [patch] use DMA_32BIT_MASK where appropriate in
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
@ 2007-06-06 4:38 ` Randy Dunlap
2007-06-06 6:16 ` [KJ] [patch] Use " Kev Jackson
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Randy Dunlap @ 2007-06-06 4:38 UTC (permalink / raw)
To: kernel-janitors
On Wed, 6 Jun 2007 11:15:12 +0700 Kevin Jackson wrote:
> From: Kev Jackson <foamdino@gmail.com>
>
> -Removes TW_DMA_MASK definition from header/code use DMA_32BIT_MASK
> instead as per kernel janitors TODO list
>
> Signed-off-by: Kev Jackson <foamdino@gmail.com>
>
> ---
Preferably include a diffstat summary here. See SubmittingPatches.
> Hopefully this conforms to the requirements in the SubmittingPatches
> docs :), please point out glaring errors etc (including if this
> meta-comment really is ignored by changelogs as described in the docs)
>
> --- drivers/scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700
> +++ drivers/scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700
The patch should be able to be applied using 'patch -p1' when at the
top of the kernel source tree. IOW, the file names above should have
one directory level preceding them, such as:
> --- old/drivers/scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700
> +++ new/drivers/scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700
Tools such as quilt and git know about this and can do it for you.
> @@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci
>
> pci_set_master(pdev);
>
> - retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
> + retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
> if (retval) {
> printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
> goto out_disable_device;
> --- drivers/scsi/3w-xxxx.h.orig 2007-06-06 10:30:29.000000000 +0700
> +++ drivers/scsi/3w-xxxx.h 2007-06-06 10:32:01.000000000 +0700
> @@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4]
> #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */
> #define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */
> #define TW_IOCTL_CHRDEV_FREE -1
> -#define TW_DMA_MASK DMA_32BIT_MASK
> #define TW_MAX_CDB_LEN 16
>
> /* Bitmask macros to eliminate bitfields */
Otherwise looks good to me. But then I try to apply the patch and get
this:
1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/3w-xxxx.c.rej
1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/3w-xxxx.h.rej
and can see that the tabs have been converted to spaces. Yes,
gmail does that for you if you use the web interface instead of the
SMTP interface. Or using copy-paste from a text editor can also
cause it. You'll need to get that taken care of one way or another.
Please send a patch to yourself and make sure that you can apply it
cleanly...
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* [KJ] [patch] Use DMA_32BIT_MASK where appropriate in
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
2007-06-06 4:38 ` Randy Dunlap
@ 2007-06-06 6:16 ` Kev Jackson
2007-06-06 6:17 ` [KJ] [patch] use DMA_32BIT_MASK where appropriate surya.prabhakar
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Kev Jackson @ 2007-06-06 6:16 UTC (permalink / raw)
To: kernel-janitors
From: Kev Jackson <foamdino@gmail.com>
-Remove TW_DMA_MASK and use DMA_32BIT_MASK instead as recommended by
kernel janitors TODO list
Signed-off-by: Kev Jackson <foamdino@gmail.com>
---
drivers/scsi/3w-xxxx.c | 2 +-
drivers/scsi/3w-xxxx.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 656bdb1..15ca2a0 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev
*pdev, const struct pci_device_id *
pci_set_master(pdev);
- retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+ retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (retval) {
printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
goto out_disable_device;
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 0742e68..4efd6c2 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4] #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */
#define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */
#define TW_IOCTL_CHRDEV_FREE -1
-#define TW_DMA_MASK DMA_32BIT_MASK
#define TW_MAX_CDB_LEN 16
/* Bitmask macros to eliminate bitfields */
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [KJ] [patch] use DMA_32BIT_MASK where appropriate
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
2007-06-06 4:38 ` Randy Dunlap
2007-06-06 6:16 ` [KJ] [patch] Use " Kev Jackson
@ 2007-06-06 6:17 ` surya.prabhakar
2007-06-06 6:49 ` [KJ] [patch] Use " surya.prabhakar
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: surya.prabhakar @ 2007-06-06 6:17 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1.1: Type: text/plain, Size: 2265 bytes --]
On Wed, 2007-06-06 at 11:15 +0700, Kevin Jackson wrote:
> From: Kev Jackson <foamdino@gmail.com>
>
> -Removes TW_DMA_MASK definition from header/code use DMA_32BIT_MASK
> instead as per kernel janitors TODO list
>
> Signed-off-by: Kev Jackson <foamdino@gmail.com>
>
> ---
>
> Hopefully this conforms to the requirements in the SubmittingPatches
> docs :), please point out glaring errors etc (including if this
> meta-comment really is ignored by changelogs as described in the docs)
--
patch failed to apply
patching file drivers/scsi/3w-xxxx.c
Hunk #1 FAILED at 2338.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/scsi/3w-xxxx.c.rej
patching file drivers/scsi/3w-xxxx.h
Hunk #1 FAILED at 234.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/scsi/3w-xxxx.h.rej
---
first setup a git repository on your machine.. it will ease your work
follow the below tutorial..
http://linux.yyz.us/git-howto.html
>
> --- drivers/scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700
> +++ drivers/scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700
> @@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci
>
> pci_set_master(pdev);
>
> - retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
> + retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
> if (retval) {
> printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
> goto out_disable_device;
> --- drivers/scsi/3w-xxxx.h.orig 2007-06-06 10:30:29.000000000 +0700
> +++ drivers/scsi/3w-xxxx.h 2007-06-06 10:32:01.000000000 +0700
> @@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4]
> #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */
> #define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */
> #define TW_IOCTL_CHRDEV_FREE -1
> -#define TW_DMA_MASK DMA_32BIT_MASK
> #define TW_MAX_CDB_LEN 16
>
> /* Bitmask macros to eliminate bitfields */
> _______________________________________________
> Kernel-janitors mailing list
> Kernel-janitors@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
--
surya.
06/06/2007
[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3185 bytes --]
[-- Attachment #2: Type: text/plain, Size: 187 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
` (2 preceding siblings ...)
2007-06-06 6:17 ` [KJ] [patch] use DMA_32BIT_MASK where appropriate surya.prabhakar
@ 2007-06-06 6:49 ` surya.prabhakar
2007-06-06 7:20 ` Kevin Jackson
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: surya.prabhakar @ 2007-06-06 6:49 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1.1: Type: text/plain, Size: 2029 bytes --]
On Wed, 2007-06-06 at 13:16 +0700, Kev Jackson wrote:
> From: Kev Jackson <foamdino@gmail.com>
>
> -Remove TW_DMA_MASK and use DMA_32BIT_MASK instead as recommended by
> kernel janitors TODO list
>
> Signed-off-by: Kev Jackson <foamdino@gmail.com>
>
failed again
patching file drivers/scsi/3w-xxxx.c
patch: **** malformed patch at line 10: *pdev, const struct
pci_device_id *
------
check line number 10, I think it could be a problem with your mail
client. First send the patch to yourself and apply it.
If it goes fine, you can be sure it goes with others.
> ---
>
> drivers/scsi/3w-xxxx.c | 2 +-
> drivers/scsi/3w-xxxx.h | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
> index 656bdb1..15ca2a0 100644
> --- a/drivers/scsi/3w-xxxx.c
> +++ b/drivers/scsi/3w-xxxx.c
> @@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev
> *pdev, const struct pci_device_id *
>
> pci_set_master(pdev);
>
> - retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
> + retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
> if (retval) {
> printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
> goto out_disable_device;
> diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
> index 0742e68..4efd6c2 100644
> --- a/drivers/scsi/3w-xxxx.h
> +++ b/drivers/scsi/3w-xxxx.h
> @@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4] =
> #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */
> #define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */
> #define TW_IOCTL_CHRDEV_FREE -1
> -#define TW_DMA_MASK DMA_32BIT_MASK
> #define TW_MAX_CDB_LEN 16
>
> /* Bitmask macros to eliminate bitfields */
> _______________________________________________
> Kernel-janitors mailing list
> Kernel-janitors@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
--
surya.
06/06/2007
[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3185 bytes --]
[-- Attachment #2: Type: text/plain, Size: 187 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
` (3 preceding siblings ...)
2007-06-06 6:49 ` [KJ] [patch] Use " surya.prabhakar
@ 2007-06-06 7:20 ` Kevin Jackson
2007-06-06 8:27 ` [KJ] [patch] Use DMA_32BIT_MASK where appropriate in Kev Jackson
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Kevin Jackson @ 2007-06-06 7:20 UTC (permalink / raw)
To: kernel-janitors
Hi all,
> check line number 10, I think it could be a problem with your mail
> client. First send the patch to yourself and apply it.
> If it goes fine, you can be sure it goes with others.
Ok, I applied the patch myself before sending this email and it worked
fine. Regarding email clients. I use gmail as my primary/main email,
I've setup both thunderbird and evolution to use this email account,
but when I send an email from my gmail account to my gmail account, it
never appears in my thunderbird/evolution inbox. It does however
appear in my gmail inbox.
Now as pointed out previously, the gmail web interface messes up tabs,
so I cannot use that either.
If anyone knows how I can send to myself without thunderbird/evolution
trying to be clever and 'ignoring' such emails I'd be very happy.
Kev
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* [KJ] [patch] Use DMA_32BIT_MASK where appropriate in
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
` (4 preceding siblings ...)
2007-06-06 7:20 ` Kevin Jackson
@ 2007-06-06 8:27 ` Kev Jackson
2007-06-06 9:28 ` [KJ] [patch] Use DMA_32BIT_MASK where appropriate Kevin Jackson
2007-06-06 9:36 ` surya.prabhakar
7 siblings, 0 replies; 9+ messages in thread
From: Kev Jackson @ 2007-06-06 8:27 UTC (permalink / raw)
To: kernel-janitors
From: Kev Jackson <foamdino@gmail.com>
-Remove TW_DMA_MASK use DMA_32BIT_MASK instead from kernel janitors TODO
Signed-off-by: Kev Jackson <foamdino@gmail.com>
---
Wrapping at 72 chars broke the previous patch, thuderbird setting modified
I've tested sending this from gmail -> yahoo and the received patch was
applied with no problems. Please let me know if this is now ok.
drivers/scsi/3w-xxxx.c | 2 +-
drivers/scsi/3w-xxxx.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 656bdb1..15ca2a0 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *
pci_set_master(pdev);
- retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+ retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (retval) {
printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
goto out_disable_device;
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 0742e68..4efd6c2 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4] #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */
#define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */
#define TW_IOCTL_CHRDEV_FREE -1
-#define TW_DMA_MASK DMA_32BIT_MASK
#define TW_MAX_CDB_LEN 16
/* Bitmask macros to eliminate bitfields */
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
` (5 preceding siblings ...)
2007-06-06 8:27 ` [KJ] [patch] Use DMA_32BIT_MASK where appropriate in Kev Jackson
@ 2007-06-06 9:28 ` Kevin Jackson
2007-06-06 9:36 ` surya.prabhakar
7 siblings, 0 replies; 9+ messages in thread
From: Kevin Jackson @ 2007-06-06 9:28 UTC (permalink / raw)
To: kernel-janitors
Hi all,
> Ok!! no problems. It applies fine.
Is that the saga over then? :)
Do I need to send another email to the lkml or somewhere else, or is
it enough that I sent the patch to kernel janitors?
Kev
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate
2007-06-06 4:15 [KJ] [patch] use DMA_32BIT_MASK where appropriate in Kevin Jackson
` (6 preceding siblings ...)
2007-06-06 9:28 ` [KJ] [patch] Use DMA_32BIT_MASK where appropriate Kevin Jackson
@ 2007-06-06 9:36 ` surya.prabhakar
7 siblings, 0 replies; 9+ messages in thread
From: surya.prabhakar @ 2007-06-06 9:36 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1.1: Type: text/plain, Size: 1941 bytes --]
On Wed, 2007-06-06 at 15:27 +0700, Kev Jackson wrote:
> From: Kev Jackson <foamdino@gmail.com>
>
> -Remove TW_DMA_MASK use DMA_32BIT_MASK instead from kernel janitors TODO
>
> Signed-off-by: Kev Jackson <foamdino@gmail.com>
>
> ---
> Wrapping at 72 chars broke the previous patch, thuderbird setting modified
> I've tested sending this from gmail -> yahoo and the received patch was
> applied with no problems. Please let me know if this is now ok.
Ok!! no problems. It applies fine.
>
> drivers/scsi/3w-xxxx.c | 2 +-
> drivers/scsi/3w-xxxx.h | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
> index 656bdb1..15ca2a0 100644
> --- a/drivers/scsi/3w-xxxx.c
> +++ b/drivers/scsi/3w-xxxx.c
> @@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *
>
> pci_set_master(pdev);
>
> - retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
> + retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
> if (retval) {
> printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
> goto out_disable_device;
> diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
> index 0742e68..4efd6c2 100644
> --- a/drivers/scsi/3w-xxxx.h
> +++ b/drivers/scsi/3w-xxxx.h
> @@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4] =
> #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */
> #define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */
> #define TW_IOCTL_CHRDEV_FREE -1
> -#define TW_DMA_MASK DMA_32BIT_MASK
> #define TW_MAX_CDB_LEN 16
>
> /* Bitmask macros to eliminate bitfields */
> _______________________________________________
> Kernel-janitors mailing list
> Kernel-janitors@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
--
surya.
06/06/2007
[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3185 bytes --]
[-- Attachment #2: Type: text/plain, Size: 187 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 9+ messages in thread