16 Jul, 2007
18 commits
-
This patch removes some code that became dead code after the ATARI_ACSI
removal.It also indirectly fixes the following bug introduced by
commit c2bcf3b8978c291e1b7f6499475c8403a259d4d6:config ATARI_SLM
tristate "Atari SLM laser printer support"
- depends on ATARI && ATARI_ACSI!=n
+ depends on ATARIAcked-by: Geert Uytterhoeven
Signed-off-by: Adrian Bunk
Signed-off-by: Jens Axboe -
the pci device list for umem was not using PCI_DEVICE, so the
subvendor/subdevice fields were not set to ANY, so matching
didn't work properly.Change to use PCI_DEVICE.
Signed-off-by: Neil Brown
Signed-off-by: Jens Axboe -
Signed-off-by: Robert P. J. Day
Acked-by: NeilBrown
Signed-off-by: Jens Axboe -
* git://git.infradead.org/battery-2.6:
git-battery vs git-acpi
Power supply class and drivers: remove non obligatory return statements
pda_power: clean up irq, timer
MAINTAINERS: Add maintainers for power supply subsystem and driversFixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually
-
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (166 commits)
[SCSI] ibmvscsi: convert to use the data buffer accessors
[SCSI] dc395x: convert to use the data buffer accessors
[SCSI] ncr53c8xx: convert to use the data buffer accessors
[SCSI] sym53c8xx: convert to use the data buffer accessors
[SCSI] ppa: coding police and printk levels
[SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
[SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
[SCSI] remove the dead CYBERSTORMIII_SCSI option
[SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
[SCSI] Clean up scsi_add_lun a bit
[SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
[SCSI] sni_53c710: Cleanup
[SCSI] qla4xxx: Fix underrun/overrun conditions
[SCSI] megaraid_mbox: use mutex instead of semaphore
[SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
[SCSI] qla2xxx: update version to 8.02.00-k1.
[SCSI] qla2xxx: add support for NPIV
[SCSI] stex: use resid for xfer len information
[SCSI] Add Brownie 1200U3P to blacklist
[SCSI] scsi.c: convert to use the data buffer accessors
... -
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
[TCP]: Verify the presence of RETRANS bit when leaving FRTO
[IPV6]: Call inet6addr_chain notifiers on link down
[NET_SCHED]: Kill CONFIG_NET_CLS_POLICE
[NET_SCHED]: act_api: qdisc internal reclassify support
[NET_SCHED]: sch_dsmark: act_api support
[NET_SCHED]: sch_atm: act_api support
[NET_SCHED]: sch_atm: Lindent
[IPV6]: MSG_ERRQUEUE messages do not pass to connected raw sockets
[IPV4]: Cleanup call to __neigh_lookup()
[NET_SCHED]: Revert "avoid transmit softirq on watchdog wakeup" optimization
[NETFILTER]: nf_conntrack: UDPLITE support
[NETFILTER]: nf_conntrack: mark protocols __read_mostly
[NETFILTER]: x_tables: add connlimit match
[NETFILTER]: Lower *tables printk severity
[NETFILTER]: nf_conntrack: Don't track locally generated special ICMP error
[NETFILTER]: nf_conntrack: Introduces nf_ct_get_tuplepr and uses it
[NETFILTER]: nf_conntrack: make l3proto->prepare() generic and renames it
[NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header
[NET]: Add ethtool support for NETIF_F_IPV6_CSUM devices.
[AF_IUCV]: Add lock when updating accept_q
... -
It depends on tristate I2C and it's trivial to make modular. The
current Kconfig allows I2C=m, I2C_ACORN=y, which doesn't work at
all; alternatives are dependency on I2C=y and making I2C_ACORN
itself a tristate. The latter is the right thing to do...Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds
Acked-by: Russell King -
Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds
Acked-by: Russell King -
Fallout from commit 91a6902958f052358899f58683d44e36228d85c2 ('sysfs:
add parameter "struct bin_attribute *" ...')Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
Signed-off-by: Al Viro
Acked-by: Jeff Garzik
Signed-off-by: Linus Torvalds -
Signed-off-by: Al Viro
Acked-by: Jeff Garzik
Signed-off-by: Linus Torvalds -
Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
... so all proud owners of s390-based PDAs will have to live without that one
Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
Going through the string and waiting for _pointer_ to become '\0'
is not what the authors meant...Signed-off-by: Al Viro
Acked-by: Ben Collins
Signed-off-by: Linus Torvalds -
still looks racy (and definitely leaks)
Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
drivers/w1/slaves/w1_ds2760.c:85: warning: initialization from incompatible pointer type
The ACPI guys changed the bin_attr APIs
(commit 91a6902958f052358899f58683d44e36228d85c2)Cc: Anton Vorontsov
Cc: Len Brown
Signed-off-by: Andrew Morton -
Per Jeff Garzik request.
Signed-off-by: Jeff Garzik
Signed-off-by: Anton Vorontsov -
Clean up pda_power interrupt handling:
Prior to this patch, the driver would pass information it needed
to the interrupt handler dev_id pointer, and then prompt forget it
ever did so, recreating that same information after a couple passes
through the timer-based state machine.This patch removes the redundant checks by passing the
pda_power_supply[] pointer through the state machine. The current
code passed 'irq' through the state machine, as an index to recreate
the pointer, when we could more simply pass around the pointer itself.This patch makes it easier to remove the 'irq' argument in the future,
in addition to cleaning up the driver today.Signed-off-by: Jeff Garzik
15 Jul, 2007
22 commits
-
- remove the unnecessary map_single path.
- convert to use the new accessors for the sg lists and the
parameters.Signed-off-by: FUJITA Tomonori
Cc: Santiago Leon
Signed-off-by: James Bottomley -
- remove the unnecessary map_single path.
- convert to use the new accessors for the sg lists and the
parameters.Jens Axboe did the for_each_sg cleanup.
Signed-off-by: FUJITA Tomonori
Cc: Jamie Lenehan
Signed-off-by: James Bottomley -
- remove the unnecessary map_single path.
- convert to use the new accessors for the sg lists and the
parameters.Jens Axboe did the for_each_sg cleanup.
Signed-off-by: FUJITA Tomonori
Cc: Matthew Wilcox
Signed-off-by: James Bottomley -
- remove the unnecessary map_single path.
- convert to use the new accessors for the sg lists and the
parameters.Jens Axboe did the for_each_sg cleanup.
Signed-off-by: FUJITA Tomonori
Cc: Matthew Wilcox
Signed-off-by: James Bottomley -
Add printk levels
Clean up some oddities of formatting
Fix goto labelsSigned-off-by: Alan Cox
Signed-off-by: Andrew Morton
Signed-off-by: James Bottomley -
drivers/scsi/aic7xxx_old.c:aic7xxx_slave_alloc() unnecessarily passes
GFP_ATOMIC (along with GFP_KERNEL) to kmalloc() from a context that is not
atomic. Remove the pointless GFP_ATOMIC.Signed-off-by: Satyam Sharma
Signed-off-by: Andrew Morton
Cc: Doug Ledford
Signed-off-by: James Bottomley -
drivers/message/i2o/device.c:i2o_parm_field_get() unnecessarily passes
GFP_ATOMIC (along with GFP_KERNEL) to kmalloc() from a context that is not
atomic. Remove the pointless GFP_ATOMIC.Signed-off-by: Satyam Sharma
Signed-off-by: Andrew Morton
Signed-off-by: James Bottomley -
Not converted to the 2.6 kconfig system and no code in the tree.
Signed-off-by: Adrian Bunk
Signed-off-by: Andrew Morton
Signed-off-by: James Bottomley -
Add ethtool utility function to set or clear IPV6_CSUM feature flag.
Modify tg3.c and bnx2.c to use this function when doing ethtool -K
to change tx checksum.Signed-off-by: Michael Chan
Signed-off-by: David S. Miller -
Add macvlan driver, which allows to create virtual ethernet devices
based on MAC address.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
With
dma-mapping-prevent-dma-dependent-code-from-linking-on.patch
scsi fails to build on !HAS_DMA architectures:
drivers/built-in.o(.text+0x20af6): In function `scsi_dma_map':
: undefined reference to `dma_map_sg'
drivers/built-in.o(.text+0x20b5c): In function `scsi_dma_unmap':
: undefined reference to `dma_unmap_sg'I split those functions out into a new file. Builds on s390 and i386.
Move scsi_dma_{map,unmap} into scsi_lib_dma.c which is only build if
HAS_DMA is set.Signed-off-by: Cornelia Huck
Cc: Martin Schwidefsky
Cc: Heiko Carstens
Cc: James Bottomley
Cc: Jeff Garzik
Cc: Christoph Hellwig
Cc: Dan Williams
Signed-off-by: Andrew Morton
Signed-off-by: James Bottomley -
This patch tidies up scsi_add_lun a bit. I rewrote the kerneldoc to match
the actual parameters, moved the check for RBC and MMC REPORT_LUN devices
away from the switch(), changed the setup of sdev->type to account for
BLIST_ISROM, moved the check for BLIST_NO_ULD_ATTACH further down in
the function, removed a bogus comment and fixed some whitespace issues.Signed-off-by: Matthew Wilcox
Signed-off-by: James Bottomley -
remove printk, which triggers because of low scsi clock on SNI RMs
Signed-off-by: Thomas Bogendoerfer
Signed-off-by: James Bottomley -
- base address is now a physical address; no need to convert it
- remove not needed error printk in module init functionSigned-off-by: Thomas Bogendoerfer
Signed-off-by: James Bottomley -
On Wed, 2007-06-06 at 11:55 -0700, David C Somayajulu wrote:
This patch fixes the code handling underrun and overrun conditions.
Also fixed coding style as per Mike Christie's advice.Signed-off-by: David Somayajulu
Signed-off-by: James Bottomley -
The Megaraid Mailbox driver uses a semaphore as mutex. Use the mutex API
instead of the (binary) semaphore.Signed-off-by: Matthias Kaehlcke
Acked-by: "Patro, Sumant"
Signed-off-by: Andrew Morton
Signed-off-by: James Bottomley -
Following patch bump up the driver version reflecting NPIV addition to
the qla2xxx.- version changed from 8.01.07-k7 to 8.02.00-k1.
Signed-off-by: Seokmann Ju
Signed-off-by: James Bottomley -
Following patch adds support for NPIV (N-Port ID Virtualization) to the
qla2xxx.- supported within switched-fabric topologies only.
- supports up to 63 virtual ports on each physical port.Signed-off-by: Seokmann Ju
Signed-off-by: James Bottomley -
The original implementation in stex_ys_commands() is inappropriate.
For xfer len information, we should use resid instead.Signed-off-by: Ed Lin
Signed-off-by: James Bottomley -
The Brownie 1200U3P has the same problem with REPORT LUNS as the
1600U3P. Add it to the blacklist.Signed-off-by: Matthew Wilcox
Signed-off-by: James Bottomley -
- a couple of prints, they can use the accessors
Signed-off-by: Boaz Harrosh
Signed-off-by: James Bottomley -
- The saved sg_count was a leftover from the time the driver was doing
dma mapping by himself. But now that scsi-ml is called for the mapping
it is not the drivers responsibility.Signed-off-by: Boaz Harrosh
Acked-by: G. Liakhovetski
Signed-off-by: James Bottomley