TO CLAIM YOUR FUNDS IS FREE OF CHARGE
Attention:Sir/Madam THIS OFFICIAL UN GUARANTEE LETTER COVER, You have been selected to receive (950,000.00 EURO) as charity donations / aid from the Qatar Foundation. Please kindly provide the below information details mention. Therefore contact our Agent Mrs.Linda Hall Inspector Admin -(QF) Payment Center. contact E-mail; ( qatarfoundation...@gmail.com ) Meanwhile send her your full delivery details: (1)Your Full Name= (2)Mobile Phone Number== (3)Current Home Address (4)Fax Number (5)Country (6)City== (7)Postal Address == Note this compensation including a Victims and international businesses that failed due to Government problems from Europe country. This donation funds will be send to you Via ATM Master Card Yours sincerely, Engineer Saad Al Muhannadi. President of the Qatar Foundation.
CLAIM!!!...
Dear Winner, Your email address attached to ticket number 7-27-31-37-43 WON One Million British Pound in the BINGO LOTTO INTERNATIONAL. Email to (bingo...@aim.com) for claim. Congratulations once again. Yours Faithfully, Mr. David -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] doc: don't claim that cherry-pick calls patch-id
The id is already different for binary files. Let's document that they are similar, not identical. Cc: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-cherry.txt | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index f6c19c7..66ff52f 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -13,12 +13,13 @@ SYNOPSIS DESCRIPTION --- The changeset (or diff) of each commit between the fork-point and head -is compared against each commit between the fork-point and upstream. -The commits are compared with their 'patch id', obtained from -the 'git patch-id' program. +is compared against diff of each commit between the fork-point and upstream. +The diffs are compared with their diff id (sha1) calculated after removing +any whitespace and line numbers (similar but not necessarily identical +to 'patch id', obtained from the 'git patch-id' program). Every commit that doesn't exist in the upstream branch -has its id (sha1) reported, prefixed by a symbol. The ones that have +has its diff id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the upstream branch are prefixed with a minus (-) sign, and those that only exist in the head branch are prefixed with a plus (+) symbol: -- MST -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
Michael S. Tsirkin wrote: Subject: [PATCH] doc: don't claim that cherry-pick calls patch-id s/cherry-pick/cherry/ The id is already different for binary files. Let's document that they are similar, not identical. Thanks. [...] --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -13,12 +13,13 @@ SYNOPSIS DESCRIPTION --- The changeset (or diff) of each commit between the fork-point and head -is compared against each commit between the fork-point and upstream. +is compared against diff of each commit between the fork-point and upstream. I think the old version of this sentence is clearer. -The commits are compared with their 'patch id', obtained from -the 'git patch-id' program. +The diffs are compared with their diff id (sha1) calculated after removing +any whitespace and line numbers (similar but not necessarily identical +to 'patch id', obtained from the 'git patch-id' program). The hash used internally is just an implementation detail, so maybe this sentence could just be dropped? Every commit that doesn't exist in the upstream branch -has its id (sha1) reported, prefixed by a symbol. The ones that have +has its diff id (sha1) reported, prefixed by a symbol. The ones that have Confusingly, here 'id' means 'commit name'. For example: $ git log --oneline -1 sb/repack-in-c 0b63c6a repack: improve warnings about failure of renaming and removing files $ git cherry sb/repack-in-c^ sb/repack-in-c + 0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257 Hope that helps, Jonathan -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote: Michael S. Tsirkin wrote: Subject: [PATCH] doc: don't claim that cherry-pick calls patch-id s/cherry-pick/cherry/ The id is already different for binary files. Let's document that they are similar, not identical. Thanks. [...] --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -13,12 +13,13 @@ SYNOPSIS DESCRIPTION --- The changeset (or diff) of each commit between the fork-point and head -is compared against each commit between the fork-point and upstream. +is compared against diff of each commit between the fork-point and upstream. I think the old version of this sentence is clearer. -The commits are compared with their 'patch id', obtained from -the 'git patch-id' program. +The diffs are compared with their diff id (sha1) calculated after removing +any whitespace and line numbers (similar but not necessarily identical +to 'patch id', obtained from the 'git patch-id' program). The hash used internally is just an implementation detail, so maybe this sentence could just be dropped? I think the fact whitespace is ignored is relevant to users, no? We probably should drop talking about hash here. Every commit that doesn't exist in the upstream branch -has its id (sha1) reported, prefixed by a symbol. The ones that have +has its diff id (sha1) reported, prefixed by a symbol. The ones that have Confusingly, here 'id' means 'commit name'. For example: $ git log --oneline -1 sb/repack-in-c 0b63c6a repack: improve warnings about failure of renaming and removing files $ git cherry sb/repack-in-c^ sb/repack-in-c + 0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257 Hope that helps, Jonathan -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2] doc: don't claim that cherry calls patch-id
The id is already different for binary files. The hash used is an implementation detail, so let's just document how diffs are compared. Cc: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Changes from v1: address comments by Jonathan Documentation/git-cherry.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index f6c19c7..2d0daae 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -14,8 +14,7 @@ DESCRIPTION --- The changeset (or diff) of each commit between the fork-point and head is compared against each commit between the fork-point and upstream. -The commits are compared with their 'patch id', obtained from -the 'git patch-id' program. +The diffs are compared after removing any whitespace and line numbers. Every commit that doesn't exist in the upstream branch has its id (sha1) reported, prefixed by a symbol. The ones that have -- MST -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
Michael S. Tsirkin wrote: On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote: Michael S. Tsirkin wrote: -The commits are compared with their 'patch id', obtained from -the 'git patch-id' program. +The diffs are compared with their diff id (sha1) calculated after removing +any whitespace and line numbers (similar but not necessarily identical +to 'patch id', obtained from the 'git patch-id' program). The hash used internally is just an implementation detail, so maybe this sentence could just be dropped? I think the fact whitespace is ignored is relevant to users, no? We probably should drop talking about hash here. Ah, good point. So, something like the following, then? Whitespace and line numbers are ignored when comparing the diffs, similarly to linkgit:git-patch-id[1]. Maybe some other wording would make it clearer that we are not using git diff -w output. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
On Tue, Sep 24, 2013 at 03:44:31PM -0700, Jonathan Nieder wrote: Michael S. Tsirkin wrote: On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote: Michael S. Tsirkin wrote: -The commits are compared with their 'patch id', obtained from -the 'git patch-id' program. +The diffs are compared with their diff id (sha1) calculated after removing +any whitespace and line numbers (similar but not necessarily identical +to 'patch id', obtained from the 'git patch-id' program). The hash used internally is just an implementation detail, so maybe this sentence could just be dropped? I think the fact whitespace is ignored is relevant to users, no? We probably should drop talking about hash here. Ah, good point. So, something like the following, then? Whitespace and line numbers are ignored when comparing the diffs, similarly to linkgit:git-patch-id[1]. Maybe some other wording would make it clearer that we are not using git diff -w output. See v2 that I sent, maybe that's clear enough. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
Michael S. Tsirkin wrote: See v2 that I sent, maybe that's clear enough. Yep, looks sensible. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
On Tue, Sep 24, 2013 at 03:53:56PM -0700, Jonathan Nieder wrote: Michael S. Tsirkin wrote: See v2 that I sent, maybe that's clear enough. Yep, looks sensible. Thanks. OK, ack that please :) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
ext4: Don't claim block from group which has corrupt bitmap
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e56eb6590693a5a340e8f596db2768a6e1b9e236
Commit: e56eb6590693a5a340e8f596db2768a6e1b9e236
Parent: 9df5643ad135c7f8c02d3b69020de4ec910f9fc0
Author: Aneesh Kumar K.V [EMAIL PROTECTED]
AuthorDate: Fri Feb 15 13:48:21 2008 -0500
Committer: Theodore Ts'o [EMAIL PROTECTED]
CommitDate: Fri Feb 15 13:48:21 2008 -0500
ext4: Don't claim block from group which has corrupt bitmap
In ext4_mb_complex_scan_group, if the extent length of the newly
found extentet is greater than than the total free blocks counted
in group info, break without claiming the block.
Document different ext4_error usage, explaining the state with which we
continue if we mount with errors=continue
Signed-off-by: Aneesh Kumar K.V [EMAIL PROTECTED]
Signed-off-by: Mingming Cao [EMAIL PROTECTED]
Signed-off-by: Theodore Ts'o [EMAIL PROTECTED]
---
fs/ext4/mballoc.c | 16 +++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 2121184..6968c53 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -967,6 +967,10 @@ static void ext4_mb_generate_buddy(struct super_block *sb,
ext4_error(sb, __FUNCTION__,
EXT4-fs: group %lu: %u blocks in bitmap, %u in gd\n,
group, free, grp-bb_free);
+ /*
+* If we intent to continue, we consider group descritor
+* corrupt and update bb_free using bitmap value
+*/
grp-bb_free = free;
}
@@ -1822,7 +1826,7 @@ static void ext4_mb_complex_scan_group(struct
ext4_allocation_context *ac,
EXT4_BLOCKS_PER_GROUP(sb), i);
if (i = EXT4_BLOCKS_PER_GROUP(sb)) {
/*
-* IF we corrupt the bitmap we won't find any
+* IF we have corrupt bitmap, we won't find any
* free blocks even though group info says we
* we have free blocks
*/
@@ -1838,6 +1842,12 @@ static void ext4_mb_complex_scan_group(struct
ext4_allocation_context *ac,
ext4_error(sb, __FUNCTION__, %d free blocks as per
group info. But got %d blocks\n,
free, ex.fe_len);
+ /*
+* The number of free blocks differs. This mostly
+* indicate that the bitmap is corrupt. So exit
+* without claiming the space.
+*/
+ break;
}
ext4_mb_measure_extent(ac, ex, e4b);
@@ -3771,6 +3781,10 @@ static int ext4_mb_release_inode_pa(struct ext4_buddy
*e4b,
(unsigned long) pa-pa_len);
ext4_error(sb, __FUNCTION__, free %u, pa_free %u\n,
free, pa-pa_free);
+ /*
+* pa is already deleted so we use the value obtained
+* from the bitmap and continue.
+*/
}
atomic_add(free, sbi-s_mb_discarded);
if (ac)
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Claim maintainership for block2mtd and update email addresses
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2b54aaef7a3a77f208bc14f576010da4fb8dfe29 Commit: 2b54aaef7a3a77f208bc14f576010da4fb8dfe29 Parent: dcc85cb61808098d22792db95f1dfa9c8b3bcf6d Author: Joern Engel [EMAIL PROTECTED] AuthorDate: Wed Feb 6 01:38:02 2008 -0800 Committer: Linus Torvalds [EMAIL PROTECTED] CommitDate: Wed Feb 6 10:41:09 2008 -0800 Claim maintainership for block2mtd and update email addresses I have been prime author and maintainer of block2mtd from day one, but neither MAINTAINERS nor the module source makes this fact clear. And while I'm at it, update my email addresses tree-wide, as the old address currently bounces and change my name to joern as unicode will likely continue to cause trouble until the end of this century. Signed-off-by: Joern Engel [EMAIL PROTECTED] Cc: David Woodhouse [EMAIL PROTECTED] Cc: Andy Whitcroft [EMAIL PROTECTED] Signed-off-by: Andrew Morton [EMAIL PROTECTED] Signed-off-by: Linus Torvalds [EMAIL PROTECTED] --- MAINTAINERS | 10 -- drivers/mtd/devices/block2mtd.c |4 ++-- drivers/mtd/devices/phram.c |4 ++-- drivers/mtd/maps/mtx-1_flash.c |2 +- scripts/checkstack.pl |2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index eacd304..c5325d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -840,6 +840,12 @@ L: [EMAIL PROTECTED] T: git kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git S: Maintained +BLOCK2MTD DRIVER +P: Joern Engel +M: [EMAIL PROTECTED] +L: [EMAIL PROTECTED] +S: Maintained + BLUETOOTH SUBSYSTEM P: Marcel Holtmann M: [EMAIL PROTECTED] @@ -3030,8 +3036,8 @@ L:[EMAIL PROTECTED] S: Maintained PHRAM MTD DRIVER -P: Jörn Engel -M: [EMAIL PROTECTED] +P: Joern Engel +M: [EMAIL PROTECTED] L: [EMAIL PROTECTED] S: Maintained diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index be4b994..eeaaa9d 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -4,7 +4,7 @@ * block2mtd.c - create an mtd from a block device * * Copyright (C) 2001,2002 Simon Evans [EMAIL PROTECTED] - * Copyright (C) 2004-2006 Jörn Engel [EMAIL PROTECTED] + * Copyright (C) 2004-2006 Joern Engel [EMAIL PROTECTED] * * Licence: GPL */ @@ -485,5 +485,5 @@ module_init(block2mtd_init); module_exit(block2mtd_exit); MODULE_LICENSE(GPL); -MODULE_AUTHOR(Simon Evans [EMAIL PROTECTED] and others); +MODULE_AUTHOR(Joern Engel [EMAIL PROTECTED]); MODULE_DESCRIPTION(Emulate an MTD using a block device); diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c index 56cc1ca..180298b 100644 --- a/drivers/mtd/devices/phram.c +++ b/drivers/mtd/devices/phram.c @@ -2,7 +2,7 @@ * $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $ * * Copyright (c) Jochen Schäuble [EMAIL PROTECTED] - * Copyright (c) 2003-2004 Jörn Engel [EMAIL PROTECTED] + * Copyright (c) 2003-2004 Joern Engel [EMAIL PROTECTED] * * Usage: * @@ -299,5 +299,5 @@ module_init(init_phram); module_exit(cleanup_phram); MODULE_LICENSE(GPL); -MODULE_AUTHOR(Jörn Engel [EMAIL PROTECTED]); +MODULE_AUTHOR(Joern Engel [EMAIL PROTECTED]); MODULE_DESCRIPTION(MTD driver for physical RAM); diff --git a/drivers/mtd/maps/mtx-1_flash.c b/drivers/mtd/maps/mtx-1_flash.c index d884f2b..2a8fde9 100644 --- a/drivers/mtd/maps/mtx-1_flash.c +++ b/drivers/mtd/maps/mtx-1_flash.c @@ -4,7 +4,7 @@ * $Id: mtx-1_flash.c,v 1.2 2005/11/07 11:14:27 gleixner Exp $ * * (C) 2005 Bruno Randolf [EMAIL PROTECTED] - * (C) 2005 Jörn Engel [EMAIL PROTECTED] + * (C) 2005 Joern Engel [EMAIL PROTECTED] * */ diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl index d716b76..340ad69 100755 --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl @@ -2,7 +2,7 @@ # Check the stack usage of functions # -# Copyright Joern Engel [EMAIL PROTECTED] +# Copyright Joern Engel [EMAIL PROTECTED] # Inspired by Linus Torvalds # Original idea maybe from Keith Owens # s390 port and big speedup by Arnd Bergmann [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe git-commits-head in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
libertas: Don't claim to have checksummed incoming packets.
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9088566176cb7f7361e862557eb20adfdd1bfc1f Commit: 9088566176cb7f7361e862557eb20adfdd1bfc1f Parent: 675787e29fd97d08bf7e6253c89ab6de23bf7089 Author: David Woodhouse [EMAIL PROTECTED] AuthorDate: Thu Dec 6 10:36:08 2007 + Committer: David S. Miller [EMAIL PROTECTED] CommitDate: Mon Jan 28 15:06:04 2008 -0800 libertas: Don't claim to have checksummed incoming packets. This explains why we never noticed the corruption of checksums on outgoing packets... we weren't actually checking them either. Signed-off-by: David Woodhouse [EMAIL PROTECTED] Signed-off-by: John W. Linville [EMAIL PROTECTED] --- drivers/net/wireless/libertas/rx.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c index fa467df..a252a8f 100644 --- a/drivers/net/wireless/libertas/rx.c +++ b/drivers/net/wireless/libertas/rx.c @@ -147,7 +147,7 @@ void lbs_upload_rx_packet(struct lbs_private *priv, struct sk_buff *skb) else skb-protocol = eth_type_trans(skb, priv-dev); } - skb-ip_summed = CHECKSUM_UNNECESSARY; + skb-ip_summed = CHECKSUM_NONE; netif_rx(skb); } - To unsubscribe from this list: send the line unsubscribe git-commits-head in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Don't claim to do IPv6 checksum offload
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0581d3f53053de597ef4956568c15785e59828ef Commit: 0581d3f53053de597ef4956568c15785e59828ef Parent: 4c14fe91d0209897fda4dea0102c8cd2e1ddd860 Author: David Woodhouse [EMAIL PROTECTED] AuthorDate: Mon Dec 3 04:34:32 2007 + Committer: Jeff Garzik [EMAIL PROTECTED] CommitDate: Tue Dec 4 14:53:07 2007 -0500 Don't claim to do IPv6 checksum offload Signed-off-by: David Woodhouse [EMAIL PROTECTED] Signed-off-by: Jeff Garzik [EMAIL PROTECTED] --- drivers/net/pasemi_mac.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 09b4fde..a8db5d7 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c @@ -1362,7 +1362,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netif_napi_add(dev, mac-napi, pasemi_mac_poll, 64); - dev-features = NETIF_F_HW_CSUM | NETIF_F_LLTX | NETIF_F_SG; + dev-features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG; /* These should come out of the device tree eventually */ mac-dma_txch = index; - To unsubscribe from this list: send the line unsubscribe git-commits-head in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[SCSI] sym53c8xx: don't claim cpqarray device
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=147e505e23a2bda35689876af48f201d527dde91
Commit: 147e505e23a2bda35689876af48f201d527dde91
Parent: a4ee0df8b3d007f0d685d38a56dc0b91e01aaaf7
Author: Chip Coldwell [EMAIL PROTECTED]
AuthorDate: Wed May 23 14:41:38 2007 -0700
Committer: James Bottomley [EMAIL PROTECTED]
CommitDate: Tue Jul 24 18:38:46 2007 -0400
[SCSI] sym53c8xx: don't claim cpqarray device
Apropos this thread
http://marc.theaimsgroup.com/?l=linux-scsim=115591706804045w=2
which led to this patch
http://www.kernel.org/git/?p=linux/kernel/git/jejb/scsi-rc-fixes-2.6.git;a=commit;h=b2b3c121076961333977f485f0d54c22121df920
We also need to fix sym53c8xx only to bind to the PCI ID if it is of
device class PCI_CLASS_STORAGE_SCSI (otherwise it will be the cpqarray
RAID device).
Signed-off-by: Chip Coldwell [EMAIL PROTECTED]
Cc: Matthew Wilcox [EMAIL PROTECTED]
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
Signed-off-by: James Bottomley [EMAIL PROTECTED]
---
drivers/scsi/sym53c8xx_2/sym_glue.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c
b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 15a5145..3db2232 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -2033,7 +2033,7 @@ static struct pci_device_id sym2_id_table[] __devinitdata
= {
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C875,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C1510,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, /* new */
+ PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SCSI8, 0x00, 0UL },
/* new */
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C895A,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C875A,
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
mmc: use lock instead of claim in debug check
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1efd48b3ae8f89a1d04f1e36be96764d7bf43ae9
Commit: 1efd48b3ae8f89a1d04f1e36be96764d7bf43ae9
Parent: 790864dcc2b3fe65355dd84ef8481e54b1bc61b6
Author: Pierre Ossman [EMAIL PROTECTED]
AuthorDate: Tue May 8 22:35:17 2007 +0200
Committer: Pierre Ossman [EMAIL PROTECTED]
CommitDate: Tue May 8 22:42:57 2007 +0200
mmc: use lock instead of claim in debug check
As mmc_detect_change() can be called from irq context, using
claim (which can sleep) is inherently unsafe. Use the host
spinlock instead, which also is faster.
Signed-off-by: Pierre Ossman [EMAIL PROTECTED]
---
drivers/mmc/core/core.c | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 72c7cf4..b6c1670 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -500,9 +500,10 @@ void __mmc_release_bus(struct mmc_host *host)
void mmc_detect_change(struct mmc_host *host, unsigned long delay)
{
#ifdef CONFIG_MMC_DEBUG
- mmc_claim_host(host);
+ unsigned long flags;
+ spin_lock_irqsave(host-lock, flags);
BUG_ON(host-removed);
- mmc_release_host(host);
+ spin_unlock_irqrestore(host-lock, flags);
#endif
mmc_schedule_delayed_work(host-detect, delay);
@@ -625,9 +626,10 @@ EXPORT_SYMBOL(mmc_add_host);
void mmc_remove_host(struct mmc_host *host)
{
#ifdef CONFIG_MMC_DEBUG
- mmc_claim_host(host);
+ unsigned long flags;
+ spin_lock_irqsave(host-lock, flags);
host-removed = 1;
- mmc_release_host(host);
+ spin_unlock_irqrestore(host-lock, flags);
#endif
mmc_flush_scheduled_work();
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[ARM] 4344/1: iop13xx: do not claim both uarts by default on iop342
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fa543f005de175080640266ca536d45b4b0b1a61
Commit: fa543f005de175080640266ca536d45b4b0b1a61
Parent: 84c981ffb371828ad6d1d220f076453b54734302
Author: Dan Williams [EMAIL PROTECTED]
AuthorDate: Sun Apr 29 09:33:22 2007 +0100
Committer: Russell King [EMAIL PROTECTED]
CommitDate: Mon Apr 30 15:24:56 2007 +0100
[ARM] 4344/1: iop13xx: do not claim both uarts by default on iop342
Signed-off-by: Dan Williams [EMAIL PROTECTED]
Signed-off-by: Russell King [EMAIL PROTECTED]
---
arch/arm/mach-iop13xx/setup.c |6 +-
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index 9a46bcd..bc48715 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -258,15 +258,11 @@ void __init iop13xx_platform_init(void)
if (init_uart == IOP13XX_INIT_UART_DEFAULT) {
switch (iop13xx_dev_id()) {
- /* enable both uarts on iop341 and iop342 */
+ /* enable both uarts on iop341 */
case 0x3380:
case 0x3384:
case 0x3388:
case 0x338c:
- case 0x3382:
- case 0x3386:
- case 0x338a:
- case 0x338e:
init_uart |= IOP13XX_INIT_UART_0;
init_uart |= IOP13XX_INIT_UART_1;
break;
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
V4L/DVB (5038): Pvrusb2: Implement stream claim checking function
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99cfdf5cc6dbe0bd748d810953874d4e08051a9f
Commit: 99cfdf5cc6dbe0bd748d810953874d4e08051a9f
Parent: 2fdf3d9c94f7f752dacbebb75bbecda3c1b082a0
Author: Pantelis Koukousoulas [EMAIL PROTECTED]
AuthorDate: Wed Dec 27 23:08:55 2006 -0300
Committer: Mauro Carvalho Chehab [EMAIL PROTECTED]
CommitDate: Wed Feb 21 13:34:23 2007 -0200
V4L/DVB (5038): Pvrusb2: Implement stream claim checking function
Add (and expose) a new function, pvr2_channel_check_stream_no_lock(), in
pvrusb2-context.c. This is hopefully the last V4L2 interface related patch
to change anything outside pvrusb2-v4l2.c.
We need this to implement the open() for the radio device. The reason is
that within the *enter_context() section of open() we need to ensure nobody
is streaming and if we cannot, we should cleanup after ourselves and return
-EBUSY. We cannot just use claim_stream() because:
1) That would cause a deadlock trying to re-acquire the context lock
2) We only need to ensure that nobody is streaming. We don't need to
actually acquire the stream.
Again, this is a kinda ugly patch. Feel free to improve.
Signed-off-by: Pantelis Koukousoulas [EMAIL PROTECTED]
Signed-off-by: Mike Isely [EMAIL PROTECTED]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
drivers/media/video/pvrusb2/pvrusb2-context.c | 11 +++
drivers/media/video/pvrusb2/pvrusb2-context.h |2 ++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c
b/drivers/media/video/pvrusb2/pvrusb2-context.c
index cf12974..69786cd 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -188,6 +188,17 @@ void pvr2_channel_done(struct pvr2_channel *cp)
}
+int pvr2_channel_check_stream_no_lock(struct pvr2_channel *cp,
+ struct pvr2_context_stream *sp)
+{
+ if (sp == cp-stream) return 0;
+ if (sp-user) {
+ return -EBUSY;
+ }
+ return 0;
+}
+
+
int pvr2_channel_claim_stream(struct pvr2_channel *cp,
struct pvr2_context_stream *sp)
{
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.h
b/drivers/media/video/pvrusb2/pvrusb2-context.h
index 6327fa1..4d0f4ad 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.h
@@ -76,6 +76,8 @@ void pvr2_channel_init(struct pvr2_channel *,struct
pvr2_context *);
void pvr2_channel_done(struct pvr2_channel *);
int pvr2_channel_claim_stream(struct pvr2_channel *,
struct pvr2_context_stream *);
+int pvr2_channel_check_stream_no_lock(struct pvr2_channel *,
+ struct pvr2_context_stream *);
struct pvr2_ioread *pvr2_channel_create_mpeg_stream(
struct pvr2_context_stream *);
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[MIPS] Don't claim we support dma_declare_coherent_memory - we don't.
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=84b47a959b55930e86d6178d49769bc9ba34bce1 Commit: 84b47a959b55930e86d6178d49769bc9ba34bce1 Parent: 9a88cbb5227970757881b1a65be01dea61fe2584 Author: Ralf Baechle [EMAIL PROTECTED] AuthorDate: Mon Feb 12 22:22:53 2007 + Committer: Ralf Baechle [EMAIL PROTECTED] CommitDate: Tue Feb 13 22:40:50 2007 + [MIPS] Don't claim we support dma_declare_coherent_memory - we don't. Signed-off-by: Ralf Baechle [EMAIL PROTECTED] --- include/asm-mips/dma-mapping.h |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/asm-mips/dma-mapping.h b/include/asm-mips/dma-mapping.h index 236d1a4..230b3f1 100644 --- a/include/asm-mips/dma-mapping.h +++ b/include/asm-mips/dma-mapping.h @@ -68,6 +68,7 @@ extern int dma_is_consistent(struct device *dev, dma_addr_t dma_addr); extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction); +#if 0 #define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY extern int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, @@ -75,5 +76,6 @@ extern int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, extern void dma_release_declared_memory(struct device *dev); extern void * dma_mark_declared_memory_occupied(struct device *dev, dma_addr_t device_addr, size_t size); +#endif #endif /* _ASM_DMA_MAPPING_H */ - To unsubscribe from this list: send the line unsubscribe git-commits-head in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
