tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

Linus Torvalds 005940ea d3813fcf

+4 -28
+1
drivers/scsi/ahci.c
··· 1105 1105 MODULE_DESCRIPTION("AHCI SATA low-level driver"); 1106 1106 MODULE_LICENSE("GPL"); 1107 1107 MODULE_DEVICE_TABLE(pci, ahci_pci_tbl); 1108 + MODULE_VERSION(DRV_VERSION); 1108 1109 1109 1110 module_init(ahci_init); 1110 1111 module_exit(ahci_exit);
+1 -1
drivers/scsi/ata_piix.c
··· 32 32 #include <linux/libata.h> 33 33 34 34 #define DRV_NAME "ata_piix" 35 - #define DRV_VERSION "1.03" 35 + #define DRV_VERSION "1.04" 36 36 37 37 enum { 38 38 PIIX_IOCFG = 0x54, /* IDE I/O configuration register */
-25
drivers/scsi/libata-core.c
··· 2268 2268 * spin_lock_irqsave(host_set lock) 2269 2269 */ 2270 2270 2271 - 2272 - 2273 - /** 2274 - * ata_sg_init_one - Prepare a one-entry scatter-gather list. 2275 - * @qc: Queued command 2276 - * @buf: transfer buffer 2277 - * @buflen: length of buf 2278 - * 2279 - * Builds a single-entry scatter-gather list to initiate a 2280 - * transfer utilizing the specified buffer. 2281 - * 2282 - * LOCKING: 2283 - */ 2284 2271 void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen) 2285 2272 { 2286 2273 struct scatterlist *sg; ··· 2297 2310 * 2298 2311 * LOCKING: 2299 2312 * spin_lock_irqsave(host_set lock) 2300 - */ 2301 - 2302 - 2303 - /** 2304 - * ata_sg_init - Assign a scatter gather list to a queued command 2305 - * @qc: Queued command 2306 - * @sg: Scatter-gather list 2307 - * @n_elem: length of sg list 2308 - * 2309 - * Attaches a scatter-gather list to a queued command. 2310 - * 2311 - * LOCKING: 2312 2313 */ 2313 2314 2314 2315 void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
+1 -1
drivers/scsi/libata.h
··· 26 26 #define __LIBATA_H__ 27 27 28 28 #define DRV_NAME "libata" 29 - #define DRV_VERSION "1.11" /* must be exactly four chars */ 29 + #define DRV_VERSION "1.12" /* must be exactly four chars */ 30 30 31 31 struct ata_scsi_args { 32 32 u16 *id;
+1 -1
drivers/scsi/sata_promise.c
··· 40 40 #include "sata_promise.h" 41 41 42 42 #define DRV_NAME "sata_promise" 43 - #define DRV_VERSION "1.01" 43 + #define DRV_VERSION "1.02" 44 44 45 45 46 46 enum {