2.6.x libata new PCI ids

Please pull the 'new-ids' branch from

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git

This add new PCI ids to some SATA drivers.

diffstat, changelog, and patch attached.

 drivers/scsi/sata_promise.c |    2 ++
 drivers/scsi/sata_sil.c     |    1 +
 2 files changed, 3 insertions(+)

commit 37c15447c565ab458ee3778e198d08f4041caa99
tree 2eda289903e3bf19eebce7d5f9aaed2240a02479
parent 9422e59ddf6cae68e46d7a2c3afe1ce4e739d3eb
author Martin Povolny <[email protected]> Mon, 16 May 2005 02:41:00 -0400 committer Jeff Garzik <[email protected]> Mon, 16 May 2005 02:41:00 -0400

[PATCH] sata_promise: new PCI ID for TX4200

[note - blank changeset]

--------------------------
commit 9422e59ddf6cae68e46d7a2c3afe1ce4e739d3eb
tree 2eda289903e3bf19eebce7d5f9aaed2240a02479
parent eeff84cc026e73d12fbe4484b5fa0d01efa8dc60
author Francisco Javier <[email protected]> Mon, 16 May 2005 02:39:00 -0400 committer Jeff Garzik <[email protected]> Mon, 16 May 2005 02:39:00 -0400

[PATCH] sata_promise: add PCI ID for FastTrak TX2200 2-ports

--------------------------
commit eeff84cc026e73d12fbe4484b5fa0d01efa8dc60
tree 136a26c73b90d0dd1c4088bb9a65409b5a2d806d
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
author NAKAMURA Kenta <[email protected]> Mon, 16 May 2005 02:35:41 -0400 committer Jeff Garzik <[email protected]> Mon, 16 May 2005 02:35:41 -0400

[PATCH] sata_sil: new ID 1002:437A for ATI IXP400

--------------------------

@@ -151,6 +151,8 @@ static struct ata_port_info pdc_port_inf
 static struct pci_device_id pdc_ata_pci_tbl[] = {
 	{ PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_2037x },
+	{ PCI_VENDOR_ID_PROMISE, 0x3571, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_2037x },
 	{ PCI_VENDOR_ID_PROMISE, 0x3373, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_2037x },
 	{ PCI_VENDOR_ID_PROMISE, 0x3375, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

@@ -82,6 +82,7 @@ static struct pci_device_id sil_pci_tbl[
 	{ 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },
 	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
 	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
+	{ 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
 	{ }	/* terminate list */
 };
 

So here the trees are identical in between the two versions, so the later commit is definitely not doing anything. What's up?

I don't have a "git-undo" script, but it looks something like this:

echo [top-you-want-to-save] > .git/HEAD
git-read-tree -m HEAD
git-update-cache -f -u -a

and you're done - it should take less than half a second.

You can do "git-prune-script" at some point if you want to throw away the objects that are no longer reachable, but the way you work, you'll never even notice - you'll just have another stale head that isn't reachable from anywhere any more.

Linus
----

commit 37c15447c565ab458ee3778e198d08f4041caa99
tree 2eda289903e3bf19eebce7d5f9aaed2240a02479
parent 9422e59ddf6cae68e46d7a2c3afe1ce4e739d3eb
author Martin Povolny <[email protected]> Mon, 16 May 2005 02:41:00 -0400 committer Jeff Garzik <[email protected]> Mon, 16 May 2005 02:41:00 -0400

[PATCH] sata_promise: new PCI ID for TX4200

[note - blank changeset]

--------------------------
commit 9422e59ddf6cae68e46d7a2c3afe1ce4e739d3eb
tree 2eda289903e3bf19eebce7d5f9aaed2240a02479
parent eeff84cc026e73d12fbe4484b5fa0d01efa8dc60
author Francisco Javier <[email protected]> Mon, 16 May 2005 02:39:00 -0400 committer Jeff Garzik <[email protected]> Mon, 16 May 2005 02:39:00 -0400

[PATCH] sata_promise: add PCI ID for FastTrak TX2200 2-ports

pass 'refs/heads/new-ids' as the second arg to git-pull-script.

Jeff