22 Jun, 2006

16 commits


21 Jun, 2006

24 commits

  • 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: Brice Goglin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Brice Goglin
     
  • * 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
    ...

    Linus Torvalds
     
  • It also adds all the related quad routines.

    Signed-off-by: Cedric Le Goater
    Acked-by: Heiko Carstens
    Cc: Martin Schwidefsky
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cedric Le Goater
     
  • 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: Linus Torvalds

    Linus Torvalds
     
  • 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: Herbert Xu
    Signed-off-by: Linus Torvalds

    Herbert Xu
     
  • * '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
    ...

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

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

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

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

    Linus Torvalds
     
  • tosa.c references mdelay(), but was missing linux/delay.h

    Signed-off-by: Russell King

    Russell King
     
  • * 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 to headers included for userspace in
    Move inclusion of out of user scope in asm-x86_64/mtrr.h
    Remove struct fddi_statistics from user view in
    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 and use __uXX types in
    Use __uXX types in , include too
    Remove private struct dx_hash_info from public view in
    Include and use __uXX types in
    Use __uXX types in for struct divert_blk et al.
    Use __u32 for elf_addr_t in , not u32. It's user-visible.
    Remove PPP_FCS from user view in , remove __P mess entirely
    Use __uXX types in user-visible structures in
    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 from
    Fix private integer types used in V4L2 ioctls.
    ...

    Manually resolve conflict in include/linux/mtd/physmap.h

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

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

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-serial:
    [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-mmc:
    [MMC] Add (MMC) to entry in MAINTAINERS file
    [MMC] sdhci truncated pointer fix

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

    Linus Torvalds
     
  • 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: Deepak Saxena
    Signed-off-by: Russell King

    Deepak Saxena
     
  • Russell King
     
  • 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
    Thanks to Savin Zlobec for tracking down the
    status problem.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • 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: Vitaly Wool
    Signed-off-by: Thomas Gleixner

    Vitaly Wool
     
  • Remove the remains of a broken merge.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • Signed-off-by: Russell King

    Russell King
     
  • Russell King