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 ATARI

    Acked-by: Geert Uytterhoeven
    Signed-off-by: Adrian Bunk
    Signed-off-by: Jens Axboe

    Adrian Bunk
     
  • 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

    Neil Brown
     
  • Signed-off-by: Robert P. J. Day
    Acked-by: NeilBrown
    Signed-off-by: Jens Axboe

    Robert P. J. Day
     
  • * 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 drivers

    Fixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually

    Linus Torvalds
     
  • * 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
    ...

    Linus Torvalds
     
  • * '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
    ...

    Linus Torvalds
     
  • 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

    Al Viro
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds
    Acked-by: Russell King

    Al Viro
     
  • Fallout from commit 91a6902958f052358899f58683d44e36228d85c2 ('sysfs:
    add parameter "struct bin_attribute *" ...')

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Signed-off-by: Al Viro
    Acked-by: Jeff Garzik
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Signed-off-by: Al Viro
    Acked-by: Jeff Garzik
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • ... 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

    Al Viro
     
  • 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

    Al Viro
     
  • still looks racy (and definitely leaks)

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • 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

    Andrew Morton
     
  • Per Jeff Garzik request.

    Signed-off-by: Jeff Garzik
    Signed-off-by: Anton Vorontsov

    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

    Jeff Garzik
     

15 Jul, 2007

22 commits