1. 21 Jun, 2006 24 commits
    • Brice Goglin's avatar
      [PATCH] PCI: AMD 8131 MSI quirk called too late, bus_flags not inherited ? · 1edab4a1
      Brice Goglin authored
      The PCI_BUS_FLAGS_NO_MSI bus flags does not appear do be inherited
      correctly from the amd8131 MSI quirk to its parent busses. It makes
      devices behind a bridge behind amd8131 try to enable MSI while the
      amd8131 does not support it.
      We fix this by looking at flags of all parent busses in
      pci_enable_msi() and pci_enable_msix().
      
      By the way, also add the missing dev->no_msi check in pci_enable_msix()
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1edab4a1
    • Brent Casavant's avatar
      [PATCH] PCI: Move various PCI IDs to header file · 74d0a988
      Brent Casavant authored
      Move various QLogic, Vitesse, and Intel storage controller PCI IDs to the
      main header file.
      Signed-off-by: default avatarBrent Casavant <bcasavan@sgi.com>
      Acked-by: default avatarJes Sorensen <jes@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      74d0a988
    • Doug Thompson's avatar
      [PATCH] PCI Bus Parity Status-broken hardware attribute, EDAC foundation · bd8481e1
      Doug Thompson authored
      Currently, the EDAC (error detection and correction) modules that are in
      the kernel contain some features that need to be moved. After some good
      feedback on the PCI Parity detection code and interface
      (http://www.ussg.iu.edu/hypermail/linux/kernel/0603.1/0897.html) this
      patch ADDs an new attribute to the pci_dev structure: Namely the
      'broken_parity_status' bit.
      
      When set this indicates that the respective hardware generates false
      positives of Parity errors.
      
      The EDAC "blacklist" solution was inferior and will be removed in a
      future patch.
      
      Also in this patch is a PCI quirk.c entry for an Infiniband PCI-X card
      which generates false positive parity errors.
      
      I am requesting comments on this AND on the possibility of a exposing
      this 'broken_parity_status' bit to userland via the PCI device sysfs
      directory for devices. This access would allow for enabling of this
      feature on new devices and for old devices that have their drivers
      updated. (SLES 9 SP3 did this on an ATI motherboard video device). There
      is a need to update such a PCI attribute between kernel releases.
      
      This patch just adds a storage place for the attribute and a quirk entry
      for a known bad PCI device. PCI Parity reaper/harvestor operations are
      in EDAC itself and will be refactored to use this PCI attribute instead
      of its own mechanisms (which are currently disabled) in the future.
      Signed-off-by: default avatarDoug Thompson <norsk5@xmission.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      bd8481e1
    • Rajesh Shah's avatar
      [PATCH] PCI: i386/x86_84: disable PCI resource decode on device disable · 53e4d30d
      Rajesh Shah authored
      When a PCI device is disabled via pci_disable_device(), it's still
      left decoding its BAR resource ranges even though its driver
      will have likely released those regions (and may even have
      unloaded). pci_enable_device() already explicitly enables
      BAR resource decode for the device being enabled. This patch
      disables resource decode for the PCI device being disabled,
      making it symmetric with the enable call.
      
      I saw this while doing something else, not because of a
      problem report. Still, seems to be the correct thing to do.
      Signed-off-by: default avatarRajesh Shah <rajesh.shah@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      53e4d30d
    • Muthu Kumar's avatar
      [PATCH] PCI ACPI: Rename the functions to avoid multiple instances. · 9c273b95
      Muthu Kumar authored
      There were two instances of pci_acpi_init(), one in
      drivers/pci/pci-acpi.c and another in arch/i386/pci/acpi.c.
      Rename the one in pci-acpi.c and make it consistent with
      other names in the same file.
      Signed-off-by: default avatarMuthukumar R <muthur@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      9c273b95
    • Kristen Accardi's avatar
      [PATCH] PCI: don't enable device if already enabled · a1e022b3
      Kristen Accardi authored
      If a device is already enabled, don't bother reenabling it.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Acked-By: default avatarArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a1e022b3
    • Arjan van de Ven's avatar
      [PATCH] PCI: Add a "enable" sysfs attribute to the pci devices to allow... · 9f125d30
      Arjan van de Ven authored
      [PATCH] PCI: Add a "enable" sysfs attribute to the pci devices to allow userspace (Xorg) to enable devices without doing foul direct access
      
      This patch adds an "enable" sysfs attribute to each PCI device. When read it
      shows the "enabled-ness" of the device, but you can write a "0" into it to
      disable a device, and a "1" to enable it.
      
      This later is needed for X and other cases where userspace wants to enable
      the BARs on a device (typical example: to run the video bios on a secundary
      head). Right now X does all this "by hand" via bitbanging, that's just evil.
      This allows X to no longer do that but to just let the kernel do this.
      Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      CC: Peter Jones <pjones@redhat.com>
      Acked-by: default avatarDave Airlie <airlied@linux.ie>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      9f125d30
    • Kumar Gala's avatar
      [PATCH] PCI: Add pci_assign_resource_fixed -- allow fixed address assignments · 75acfeca
      Kumar Gala authored
      PCI: Add pci_assign_resource_fixed -- allow fixed address assignments
      
      On some embedded systems the PCI address for hotplug devices are not only
      known a priori but are required to be at a given PCI address for other
      master in the system to be able to access.
      
      An example of such a system would be an FPGA which is setup from user space
      after the system has booted.  The FPGA may be access by DSPs in the system
      and those DSPs expect the FPGA at a fixed PCI address.
      
      Added pci_assign_resource_fixed() as a way to allow assignment of the PCI
      devices's BARs at fixed PCI addresses.
      Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      75acfeca
    • Bjorn Helgaas's avatar
      [PATCH] PCI: fix to pci ignore pre-set 64-bit bars on 32-bit platforms · ea28502d
      Bjorn Helgaas authored
      When we detect a 64-bit pre-set address in a BAR on a 32-bit platform,
      we disable it and treat it as if it had been unset, thus allowing the
      general address assignment code to assign a new address to it when the
      device is enabled.  This can happen either if the firmware assigns
      64-bit addresses; additionally, some cards have been found "in the
      wild" which do not come out of reset with all the BAR registers set to
      zero.
      
      Unfortunately, the patch that implemented this tested the low part of
      the address instead of the high part of the address.  This patch fixes
      that.
      Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      ea28502d
    • H. Peter Anvin's avatar
      [PATCH] PCI: Ignore pre-set 64-bit BARs on 32-bit platforms · 17d6dc8f
      H. Peter Anvin authored
      [pci] Ignore pre-set 64-bit BARs on 32-bit platforms
      
      Currently, Linux always rejects a device which has a pre-set 64-bit
      address on a 32-bit platform.  On systems which do not do PCI
      initialization in firmware, this causes some devices which don't
      correctly power up with all BARs zero to fail.
      
      This patch makes the kernel automatically zero out such an address
      (thus treating it as if it had not been set at all, meaning it will
      assign an address if necessary).
      
      I have done this only for devices, not bridges.  It seems potentially
      hazardous to do for bridges.
      Signed-off-by: default avatarH. Peter Anvin <hpa@c2micro.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      17d6dc8f
    • Mark Maule's avatar
      [PATCH] PCI: altix: msi support · 83821d3f
      Mark Maule authored
      MSI callouts for altix.  Involves a fair amount of code reorg in sn irq.c
      code as well as adding some extensions to the altix PCI provider abstaction.
      Signed-off-by: default avatarMark Maule <maule@sgi.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      83821d3f
    • Mark Maule's avatar
      [PATCH] PCI: per-platform IA64_{FIRST,LAST}_DEVICE_VECTOR definitions · 10083072
      Mark Maule authored
      Abstract IA64_FIRST_DEVICE_VECTOR/IA64_LAST_DEVICE_VECTOR since SN platforms
      use a subset of the IA64 range.  Implement this by making the above macros
      global variables which the platform can override in it setup code.
      
      Also add a reserve_irq_vector() routine used by SN to mark a vector's as
      in-use when that weren't allocated through assign_irq_vector().
      Signed-off-by: default avatarMark Maule <maule@sgi.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      10083072
    • Mark Maule's avatar
      [PATCH] PCI: msi abstractions and support for altix · fd58e55f
      Mark Maule authored
      Abstract portions of the MSI core for platforms that do not use standard
      APIC interrupt controllers.  This is implemented through a new arch-specific
      msi setup routine, and a set of msi ops which can be set on a per platform
      basis.
      Signed-off-by: default avatarMark Maule <maule@sgi.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      fd58e55f
    • Brice Goglin's avatar
      [PATCH] PCI: Add PCI_CAP_ID_VNDR · c34b4c73
      Brice Goglin authored
      Add the vendor-specific extended capability PCI_CAP_ID_VNDR.  It will be
      used by the Myri-10G Ethernet driver (will be submitted soon).
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      c34b4c73
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 789e7dc8
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (30 commits)
        [PATCH] PCI Hotplug: Fix recovery path from errors during pcie_init()
        [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver
        [PATCH] shpchp: Cleanup improper info messages
        [PATCH] shpchp: Remove Unused hpc_evelnt_lock
        [PATCH] shpchp: Cleanup interrupt polling timer
        [PATCH] shpchp: Cleanup SHPC commands
        [PATCH] shpchp: Cleanup interrupt handler
        [PATCH] shpchp: Remove unnecessary hpc_ctlr_handle check
        [PATCH] pciehp: Implement get_address callback
        [PATCH] pciehp: Add missing pci_dev_put
        [PATCH] pciehp: Replace pci_find_slot() with pci_get_slot()
        [PATCH] SGI Hotplug: Incorrect power status
        [PATCH] shpchp: Create shpchpd at controller probe time
        [PATCH] shpchp: Mask Global SERR and Intr at controller release time
        [PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access
        [PATCH] SHPC: Fix SHPC Logical Slot Register bits access
        [PATCH] SHPC: Cleanup SHPC Logical Slot Register bits access
        [PATCH] SHPC: Cleanup SHPC Logical Slot Register access
        [PATCH] SHPC: Cleanup SHPC register access
        [PATCH] pciehp: Fix programming hotplug parameters
        ...
      789e7dc8
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 28e4b224
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
        [SCSI] 53c700: remove reliance on deprecated cmnd fields
        [SCSI] hptiop: don't use cmnd->bufflen
        [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
        [SCSI] aacraid: small misc. cleanups
        [SCSI] aacraid: Update supported product information
        [SCSI] aacraid: Fix return code interpretation
        [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
        [SCSI] remove RQ_SCSI_* flags
        [SCSI] remove scsi_request infrastructure
        [SCSI] mptfusion: change driver revision to 3.03.10
        [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
        [SCSI] mptfc: fix fibre channel infinite request/response loop
        [SCSI] mptfc: set fibre channel fw target missing timers to one second
        [SCSI] mptfusion: move fc event/reset handling to mptfc
        [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
        [SCSI] aic7xxx: expose the bus setting to sysfs
        [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
        [SCSI] drivers/scsi: Use ARRAY_SIZE macro
        [SCSI] Remove last page_address from dc395x.c
        [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
        ...
      
      Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
      the sparc interrupt cleanups)
      28e4b224
    • Brice Goglin's avatar
      [PATCH] add __iowrite64_copy · 22ae813b
      Brice Goglin authored
      Introduce __iowrite64_copy.  It will be used by the Myri-10G Ethernet
      driver to post requests to the NIC.  This driver will be submitted soon.
      
      __iowrite64_copy copies to I/O memory in units of 64 bits when possible (on
      64 bit architectures).  It reverts to __iowrite32_copy on 32 bit
      architectures.
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      22ae813b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6 · 34641a58
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6: (28 commits)
        eth1394: replace __constant_htons by htons
        ieee1394: adjust code formatting in highlevel.c
        ieee1394: hl_irqs_lock is taken in hardware interrupt context
        ieee1394_core: switch to kthread API
        ieee1394: sbp2: Kconfig fix
        ieee1394: add preprocessor constant for invalid csr address
        sbp2: fix deregistration of status fifo address space
        [PATCH] eth1394: endian fixes
        Fix broken suspend/resume in ohci1394
        sbp2: use __attribute__((packed)) for on-the-wire structures
        sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental
        Update feature removal of obsolete raw1394 ISO requests.
        sbp2: fix S800 transfers if phys_dma is off
        sbp2: remove ohci1394 specific constant
        ohci1394: make phys_dma parameter read-only
        ohci1394: set address range properties
        ieee1394: extend lowlevel API for address range properties
        sbp2: log number of supported concurrent logins
        sbp2: remove manipulation of inquiry response
        ieee1394: save RAM by using a single tlabel for broadcast transactions
        ...
      34641a58
    • Cedric Le Goater's avatar
      [PATCH] s390: add __raw_writeq required by __iowrite64_copy · 2eec0e08
      Cedric Le Goater authored
      It also adds all the related quad routines.
      Signed-off-by: default avatarCedric Le Goater <clg@fr.ibm.com>
      Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      2eec0e08
    • Linus Torvalds's avatar
      Fix up CFQ scheduler for recent rbtree node shrinkage · 6b41fd17
      Linus Torvalds authored
      The color is now in the low bits of the parent pointer, and initializing
      it to 0 happens as part of the whole memset above, so just remove the
      unnecessary RB_CLEAR_COLOR.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      6b41fd17
    • Herbert Xu's avatar
      [FORCEDETH] Fix xmit_lock/netif_tx_lock after merge · 58dfd9c1
      Herbert Xu authored
      There has been an update to the forcedeth driver that added a few new
      uses of xmit_lock which is no longer meant to be used directly.  This
      patch replaces them with netif_tx_lock_bh.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      58dfd9c1
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 050335db
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (42 commits)
        [ARM] Fix tosa build error
        [ARM] 3610/1: Make reboot work on Versatile
        [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig
        [ARM] 3591/1: Anubis: IDE device definitions
        [ARM] Include asm/hardware.h not asm/arch/hardware.h
        [ARM] 3594/1: Poodle: Add touchscreen support + other updates
        [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters
        [ARM] 3561/1: Poodle: Correct the MMC/SD power control
        [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds
        [ARM] 3599/1: AT91RM9200 remove global variables
        [ARM] 3607/1: AT91RM9200 misc fixes
        [ARM] 3605/1: AT91RM9200 Power Management
        [ARM] 3604/1: AT91RM9200 New boards
        [ARM] 3603/1: AT91RM9200 remove old files
        [ARM] 3592/1: AT91RM9200 Serial driver update
        [ARM] 3590/1: AT91RM9200 Platform devices support
        [ARM] 3589/1: AT91RM9200 DK/EK board update
        [ARM] 3588/1: AT91RM9200 CSB337/637 board update
        [ARM] 3587/1: AT91RM9200 hardware headers
        [ARM] 3586/1: AT91RM9200 header update
        ...
      050335db
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a4cfae13
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [ATM]: fix broken uses of NIPQUAD in net/atm
        [SCTP]: sctp_unpack_cookie() fix
        [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
        [NET]: Prevent multiple qdisc runs
        [CONNECTOR]: Initialize subsystem earlier.
        [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length
      a4cfae13
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · be883da7
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Update defconfig.
        [SPARC64]: Don't double-export synchronize_irq.
        [SPARC64]: Move over to GENERIC_HARDIRQS.
        [SPARC64]: Virtualize IRQ numbers.
        [SPARC64]: Kill ino_bucket->pil
        [SPARC]: Kill __irq_itoa().
        [SPARC64]: bp->pil can never be zero
        [SPARC64]: Send all device interrupts via one PIL.
        [SPARC]: Fix iommu_flush_iotlb end address
        [SPARC]: Mark smp init functions as cpuinit
        [SPARC]: Add missing rw can_lock macros
        [SPARC]: Setup cpu_possible_map
        [SPARC]: Add topology_init()
      be883da7
  2. 20 Jun, 2006 16 commits
    • Linus Torvalds's avatar
      Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird · 077e9894
      Linus Torvalds authored
      * 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird:
        [PATCH] missing readb/readw in rio
        [PATCH] copy_to_user() from iomem is a bad thing
        [PATCH] forgotten swap of copyout() arguments
        [PATCH] handling rio MEMDUMP
        [PATCH] fix rio_copy_to_card() for OLDPCI case
        [PATCH] uses of ->Copy() in rioroute are bogus
        [PATCH] bogus order of copy_from_user() arguments
        [PATCH] rio ->Copy() expects the sourse as first argument
        [PATCH] trivial annotations in rio
      077e9894
    • Linus Torvalds's avatar
      Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · d9eaec9e
      Linus Torvalds authored
      * 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: (25 commits)
        [PATCH] make set_loginuid obey audit_enabled
        [PATCH] log more info for directory entry change events
        [PATCH] fix AUDIT_FILTER_PREPEND handling
        [PATCH] validate rule fields' types
        [PATCH] audit: path-based rules
        [PATCH] Audit of POSIX Message Queue Syscalls v.2
        [PATCH] fix se_sen audit filter
        [PATCH] deprecate AUDIT_POSSBILE
        [PATCH] inline more audit helpers
        [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array
        [PATCH] update of IPC audit record cleanup
        [PATCH] minor audit updates
        [PATCH] fix audit_krule_to_{rule,data} return values
        [PATCH] add filtering by ppid
        [PATCH] log ppid
        [PATCH] collect sid of those who send signals to auditd
        [PATCH] execve argument logging
        [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES
        [PATCH] audit_panic() is audit-internal
        [PATCH] inotify (5/5): update kernel documentation
        ...
      
      Manual fixup of conflict in unclude/linux/inotify.h
      d9eaec9e
    • Russell King's avatar
      [ARM] Fix tosa build error · 905f1467
      Russell King authored
      tosa.c references mdelay(), but was missing linux/delay.h
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      905f1467
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/hdrcleanup-2.6 · cee4cca7
      Linus Torvalds authored
      * git://git.infradead.org/hdrcleanup-2.6: (63 commits)
        [S390] __FD_foo definitions.
        Switch to __s32 types in joystick.h instead of C99 types for consistency.
        Add <sys/types.h> to headers included for userspace in <linux/input.h>
        Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
        Remove struct fddi_statistics from user view in <linux/if_fddi.h>
        Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
        Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
        Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
        Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
        Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
        Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
        Use __uXX types in <linux/divert.h> for struct divert_blk et al.
        Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
        Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
        Use __uXX types in user-visible structures in <linux/nbd.h>
        Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
        Use __uXX types for S390 DASD volume label definitions which are user-visible
        S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
        Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
        Fix private integer types used in V4L2 ioctls.
        ...
      
      Manually resolve conflict in include/linux/mtd/physmap.h
      cee4cca7
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/~dwmw2/rbtree-2.6 · 2edc322d
      Linus Torvalds authored
      * git://git.infradead.org/~dwmw2/rbtree-2.6:
        [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
        Update UML kernel/physmem.c to use rb_parent() accessor macro
        [RBTREE] Update hrtimers to use rb_parent() accessor macro.
        [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
        [RBTREE] Merge colour and parent fields of struct rb_node.
        [RBTREE] Remove dead code in rb_erase()
        [RBTREE] Update JFFS2 to use rb_parent() accessor macro.
        [RBTREE] Update eventpoll.c to use rb_parent() accessor macro.
        [RBTREE] Update key.c to use rb_parent() accessor macro.
        [RBTREE] Update ext3 to use rb_parent() accessor macro.
        [RBTREE] Change rbtree off-tree marking in I/O schedulers.
        [RBTREE] Add accessor macros for colour and parent fields of rb_node
      2edc322d
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · be967b7e
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (199 commits)
        [MTD] NAND: Fix breakage all over the place
        [PATCH] NAND: fix remaining OOB length calculation
        [MTD] NAND Fixup NDFC merge brokeness
        [MTD NAND] S3C2410 driver cleanup
        [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation.
        [JFFS2] Check CRC32 on dirent and data nodes each time they're read
        [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space
        [JFFS2] Mark XATTR support as experimental, for now
        [JFFS2] Don't trust node headers before the CRC is checked.
        [MTD] Restore MTD_ROM and MTD_RAM types
        [MTD] assume mtd->writesize is 1 for NOR flashes
        [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles
        [MTD] Prepare physmap for 64-bit-resources
        [JFFS2] Fix more breakage caused by janitorial meddling.
        [JFFS2] Remove stray __exit from jffs2_compressors_exit()
        [MTD] Allow alternate JFFS2 mount variant for root filesystem.
        [MTD] Disconnect struct mtd_info from ABI
        [MTD] replace MTD_RAM with MTD_GENERIC_TYPE
        [MTD] replace MTD_ROM with MTD_GENERIC_TYPE
        [MTD] remove a forgotten MTD_XIP
        ...
      be967b7e
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · eef11427
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI
      eef11427
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · c9ab0971
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Add (MMC) to entry in MAINTAINERS file
        [MMC] sdhci truncated pointer fix
      c9ab0971
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · ff914453
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
        [ARM] 3559/1: S3C2442: core and serial port
        [ARM] 3557/1: S3C24XX: centralise and cleanup uart registration
        [ARM] 3558/1: SMDK24XX: LED platform devices
        [ARM] 3534/1: add spi support to lubbock platform
        [ARM] 3554/1: ARM: Fix dyntick locking
        [ARM] 3553/1: S3C24XX: earlier print of cpu idcode info
        [ARM] 3552/1: S3C24XX: Move VA of GPIO for low-level debug
        [ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_WRITETHROUGH
        [ARM] 3550/1: OSIRIS: fix serial port map for 1:1
        [ARM] 3548/1: Fix the ARMv6 CPU id in compressed/head.S
        [ARM] 3335/1: Old-abi Thumb sys_syscall broken
        [ARM] 3467/1: [3/3] Support for Philips PNX4008 platform: defconfig
        [ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support
        [ARM] 3465/1: [1/3] Support for Philips PNX4008 platform: headers
        [ARM] 3407/1: lpd7x: documetation update
        [ARM] 3406/1: lpd7x: compilation fix for smc91x
        [ARM] 3405/1: lpd7a40x: CPLD ssp driver
        [ARM] 3404/1: lpd7a40x: AMBA CLCD support
        [ARM] 3403/1: lpd7a40x: updated default configurations
        [ARM] 3402/1: lpd7a40x: serial driver bug fix
        ...
      ff914453
    • Deepak Saxena's avatar
      [ARM] 3610/1: Make reboot work on Versatile · 4af6fee1
      Deepak Saxena authored
      Patch from Deepak Saxena
      
      This patch makes soft reboot work on the Versatile board. Thanks to
      Catalin Marinas @ ARM for pointing out the proper way to do this.
      Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      4af6fee1
    • Russell King's avatar
      Merge S3Cxxxx branch · 098a4cb7
      Russell King authored
      098a4cb7
    • Thomas Gleixner's avatar
      [MTD] NAND: Fix breakage all over the place · 7bc3312b
      Thomas Gleixner authored
      Following problems are addressed:
      
      - wrong status caused early break out of nand_wait()
      - removed the bogus status check in nand_wait() which
        is a relict of the abandoned support for interrupted
        erase.
      - status check moved to the correct place in read_oob
      - oob support for syndrom based ecc with strange layouts
      - use given offset in the AUTOOOB based oob operations
      
      Partially based on a patch from Vitaly Vool <vwool@ru.mvista.com>
      Thanks to Savin Zlobec <savin@epico.si> for tracking down the
      status problem.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      7bc3312b
    • Vitaly Wool's avatar
      [PATCH] NAND: fix remaining OOB length calculation · 7e4178f9
      Vitaly Wool authored
      In nand_read_page_syndrome/nand_write_page_syndrome the calculation of
      the remaining oob length which is not used by the prepad/ecc/postpad
      areas is wrong.
      Signed-off-by: default avatarVitaly Wool <vwool@ru.mvista.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      7e4178f9
    • Thomas Gleixner's avatar
      [MTD] NAND Fixup NDFC merge brokeness · b6d5ee00
      Thomas Gleixner authored
      Remove the remains of a broken merge.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      b6d5ee00
    • Russell King's avatar
    • Russell King's avatar
      Merge Zaurus branch · 3a8182bd
      Russell King authored
      3a8182bd