1. 21 6月, 2006 28 次提交
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 050335db
      Linus Torvalds 提交于
      * '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
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a4cfae13
      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
      a4cfae13
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · be883da7
      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()
      be883da7
    • L
      Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird · 077e9894
      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
      077e9894
    • L
      Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · d9eaec9e
      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
      d9eaec9e
    • R
      [ARM] Fix tosa build error · 905f1467
      Russell King 提交于
      tosa.c references mdelay(), but was missing linux/delay.h
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      905f1467
    • L
      Merge git://git.infradead.org/hdrcleanup-2.6 · cee4cca7
      Linus Torvalds 提交于
      * 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
    • L
      Merge git://git.infradead.org/~dwmw2/rbtree-2.6 · 2edc322d
      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
      2edc322d
    • L
      Merge git://git.infradead.org/mtd-2.6 · be967b7e
      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
        ...
      be967b7e
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · eef11427
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI
      eef11427
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · c9ab0971
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Add (MMC) to entry in MAINTAINERS file
        [MMC] sdhci truncated pointer fix
      c9ab0971
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · ff914453
      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
        ...
      ff914453
    • D
      [ARM] 3610/1: Make reboot work on Versatile · 4af6fee1
      Deepak Saxena 提交于
      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: NDeepak Saxena <dsaxena@plexity.net>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      4af6fee1
    • R
      Merge S3Cxxxx branch · 098a4cb7
      Russell King 提交于
      098a4cb7
    • T
      [MTD] NAND: Fix breakage all over the place · 7bc3312b
      Thomas Gleixner 提交于
      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: NThomas Gleixner <tglx@linutronix.de>
      7bc3312b
    • V
      [PATCH] NAND: fix remaining OOB length calculation · 7e4178f9
      Vitaly Wool 提交于
      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: NVitaly Wool <vwool@ru.mvista.com>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      7e4178f9
    • T
      [MTD] NAND Fixup NDFC merge brokeness · b6d5ee00
      Thomas Gleixner 提交于
      Remove the remains of a broken merge.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      b6d5ee00
    • R
      ea75ee9a
    • R
      Merge Zaurus branch · 3a8182bd
      Russell King 提交于
      3a8182bd
    • R
      Merge AT91 branch · 695a9d23
      Russell King 提交于
      695a9d23
    • A
      [ARM] 3599/1: AT91RM9200 remove global variables · 55c20c0a
      Andrew Victor 提交于
      Patch from Andrew Victor
      
      This patch removes some now unnecessary global variables -
      at91_master_clock, at91_serial_map, at91_console_port.
      Signed-off-by: NAndrew Victor <andrew@sanpeople.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      55c20c0a
    • B
      [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig · ec57b709
      Ben Dooks 提交于
      Patch from Ben Dooks
      
      Update s3c2410_defconfig to latest kernel with the
      latest patches
      Signed-off-by: NBen Dooks <ben-linux@fluff.org>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      ec57b709
    • A
      [ARM] 3607/1: AT91RM9200 misc fixes · 5c3fddce
      Andrew Victor 提交于
      Patch from Andrew Victor
      
      This final patch includes some general fixes.
      
      1. Link in pm.o if CONFIG_PM is enabled.  [Should have been included in
      patch 3605/1].
      2. Use __raw_readl()/__raw_writel() when accessing System Peripheral
      registers.
      3. Removed some unnecessary includes
      Signed-off-by: NAndrew Victor <andrew@sanpeople.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      5c3fddce
    • A
      [ARM] 3605/1: AT91RM9200 Power Management · 907d6deb
      Andrew Victor 提交于
      Patch from Andrew Victor
      
      This patch adds the core Power Management support for the AT91RM9200
      processor.  It will support suspend-to-RAM and standby modes.
      
      The suspend-to-RAM functionality is not 100% complete.  The code that
      needs to be execute from the internal SRAM to restore the system is
      outstanding.  For now we just fall through to Standby mode.
      
      The AT91-specific at91_suspend_entering_slow_clock() function will
      eventually be replaced by clk_must_disable() once that functionality is
      added to mainline clock API.
      
      Patch from David Brownell.
      Signed-off-by: NAndrew Victor <andrew@sanpeople.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      907d6deb
    • A
      [ARM] 3604/1: AT91RM9200 New boards · 6902f523
      Andrew Victor 提交于
      Patch from Andrew Victor
      
      This patch adds support for an additional 4 AT91RM9200-based boards:
      
      1. Conitec ARM&EVA  [MACH_CARMEVA]
         (http://www.conitec.net/english/linuxboard.htm)
      
      2. KwikByte KB920x  [MACH_KB9200]
         (http://kwikbyte.com/KB9202_description_new.htm)
      
      3. Embest ATEB9200  [MACH_ATEB9200]
         (http://www.embedinfo.com/english/product/ATEB9200.asp)
      
      4. Sperry-Sun KAFA board  [MACH_KAFA]
         (unknown)
      Signed-off-by: NAndrew Victor <andrew@sanpeople.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      6902f523
    • A
      [ARM] 3603/1: AT91RM9200 remove old files · d6bdbb8e
      Andrew Victor 提交于
      Patch from Andrew Victor
      
      This patch removes the now unnecessary
      include/asm-arm/arch-at91rm9200/pio.h file.  The pin configuration is
      now handled in the platform-device setup code
      (arch/arm/mach-at91rm9200/devices.c).
      Signed-off-by: NAndrew Victor <andrew@sanpeople.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      d6bdbb8e
    • L
      [ARM] 3606/1: PXA27x SSP Register definitions · c322e24b
      Liam Girdwood 提交于
      Patch from Liam Girdwood
      
      This patch adds some new PXA27x SSP port registers and also fixes the
      SSP slots per frame macro
      
      Changes:-
      
       o SSCR0_SlotPerFrm fixed
       o Added SSP port TSA, RSA, TSS and ACD registers
      Signed-off-by: NLiam Girdwood <liam.girdwood@wolfsonmicro.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      c322e24b
    • L
      [ARM] 3602/1: ixp23xx: fix two typos · e6fea6a5
      Lennert Buytenhek 提交于
      Patch from Lennert Buytenhek
      
      Fix two typos in include/asm-arm/arch-ixp23xx.
      Signed-off-by: NLennert Buytenhek <buytenh@wantstofly.org>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      e6fea6a5
  2. 20 6月, 2006 12 次提交