1. 21 10月, 2008 11 次提交
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 45e4a24f
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (26 commits)
        9p: add more conservative locking
        9p: fix oops in protocol stat parsing error path.
        9p: fix device file handling
        9p: Improve debug support
        9p: eliminate depricated conv functions
        9p: rework client code to use new protocol support functions
        9p: remove unnecessary tag field from p9_req_t structure
        9p: remove 9p fcall debug prints
        9p: add new protocol support code
        9p: encapsulate version function
        9p: move dirread to fs layer
        9p: adjust 9p vfs write operation
        9p: move readn meta-function from client to fs layer
        9p: consolidate read/write functions
        9p: drop broken unused error path from p9_conn_create()
        9p: make rpc code common and rework flush code
        9p: use the rcall structure passed in the request in trans_fd read_work
        9p: apply common request code to trans_fd
        9p: apply common tagpool handling to trans_fd
        9p: move request management to client code
        ...
      45e4a24f
    • L
      Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 52c6738b
      Linus Torvalds 提交于
      * git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: use correct fs type for v4 submounts and referrals
        Make nfs_file_cred more robust.
        NFS: Enable NFSv4 callback server to listen on AF_INET6 sockets
      52c6738b
    • L
      Merge branch 'for-next' of git://git.o-hand.com/linux-mfd · 3b72e441
      Linus Torvalds 提交于
      * 'for-next' of git://git.o-hand.com/linux-mfd:
        mfd: further unbork the ucb1400 ac97_bus dependencies
        mfd: ucb1400 needs GPIO
        mfd: ucb1400 sound driver uses/depends on AC97_BUS:
        mfd: Don't use NO_IRQ in WM8350
        mfd: update TMIO drivers to use the clock API
        mfd: twl4030-core irq simplification
        mfd: add base support for Dialog DA9030/DA9034 PMICs
        mfd: TWL4030 core driver
        mfd: support tmiofb cell on tc6393xb
        mfd: add OHCI cell to tc6393xb
        mfd: Fix htc-egpio compile warning
        mfd: do tcb6393xb state restore on resume only if requested
        mfd: provide and use setup hook for tc6393xb
        mfd: update sm501 debugging/low information messages
        mfd: reduce stack usage in mfd-core.c
      3b72e441
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 396b122f
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits)
        UBIFS: fix ubifs_compress commentary
        UBIFS: amend printk
        UBIFS: do not read unnecessary bytes when unpacking bits
        UBIFS: check buffer length when scanning for LPT nodes
        UBIFS: correct condition to eliminate unecessary assignment
        UBIFS: add more debugging messages for LPT
        UBIFS: fix bulk-read handling uptodate pages
        UBIFS: improve garbage collection
        UBIFS: allow for sync_fs when read-only
        UBIFS: commit on sync_fs
        UBIFS: correct comment for commit_on_unmount
        UBIFS: update dbg_dump_inode
        UBIFS: fix commentary
        UBIFS: fix races in bit-fields
        UBIFS: ensure data read beyond i_size is zeroed out correctly
        UBIFS: correct key comparison
        UBIFS: use bit-fields when possible
        UBIFS: check data CRC when in error state
        UBIFS: improve znode splitting rules
        UBIFS: add no_chk_data_crc mount option
        ...
      396b122f
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · ed402af3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (112 commits)
        sh: Move SH-4 CPU headers down one more level.
        sh: Only build in gpio.o when CONFIG_GENERIC_GPIO is selected.
        sh: Migrate common board headers to mach-common/.
        sh: Move the CPU definition headers from asm/ to cpu/.
        serial: sh-sci: Add support SCIF of SH7723
        video: add sh_mobile_lcdc platform flags
        video: remove unused sh_mobile_lcdc platform data
        sh: remove consistent alloc cruft
        sh: add dynamic crash base address support
        sh: reduce Migo-R smc91x overruns
        sh: Fix up some merge damage.
        Fix debugfs_create_file's error checking method for arch/sh/mm/
        Fix debugfs_create_dir's error checking method for arch/sh/kernel/
        sh: ap325rxa: Add support RTC RX-8564LC in AP325RXA board
        sh: Use sh7720 GPIO on magicpanelr2 board
        sh: Add sh7720 pinmux code
        sh: Use sh7203 GPIO on rsk7203 board
        sh: Add sh7203 pinmux code
        sh: Use sh7723 GPIO on AP325RXA board
        sh: Add sh7723 pinmux code
        ...
      ed402af3
    • B
      pci: Use new %pR to print resource ranges · 096e6f67
      Benjamin Herrenschmidt 提交于
      This converts things in drivers/pci to use %pR to printout the
      content of a struct resource instead of hand-casted %llx or
      other variants.
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      096e6f67
    • L
      Implement %pR to print struct resource content · 332d2e78
      Linus Torvalds 提交于
      Add a %pR option to the kernel vsnprintf that prints the range of
      addresses inside a struct resource passed by pointer.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      332d2e78
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 88e36621
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver
        go7007 - Add missing dependency on sound subsystem
        ALSA: ps3: Add support for SPDIF/HDMI passthru
        ps3: Add passthru support for non-audio streams
        ps3: Add ps3av_audio_mute_analog()
        ALSA: misc typo fixes
        sound: add missing pcm kernel-doc
      88e36621
    • S
      staging: sxg depends on X86 · a1cf6494
      Stephen Rothwell 提交于
      sxghif.h has code that explicitly will not build fo other architecures.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a1cf6494
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 5fdf1128
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        netfilter: replace old NF_ARP calls with NFPROTO_ARP
        netfilter: fix compilation error with NAT=n
        netfilter: xt_recent: use proc_create_data()
        netfilter: snmp nat leaks memory in case of failure
        netfilter: xt_iprange: fix range inversion match
        netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array
        netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig
        pkt_sched: sch_generic: Fix oops in sch_teql
        dccp: Port redirection support for DCCP
        tcp: Fix IPv6 fallout from 'Port redirection support for TCP'
        netdev: change name dropping error codes
        ipvs: Update CONFIG_IP_VS_IPV6 description and help text
      5fdf1128
    • L
      Merge git://git.infradead.org/mtd-2.6 · 2be508d8
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (69 commits)
        Revert "[MTD] m25p80.c code cleanup"
        [MTD] [NAND] GPIO driver depends on ARM... for now.
        [MTD] [NAND] sh_flctl: fix compile error
        [MTD] [NOR] AT49BV6416 has swapped erase regions
        [MTD] [NAND] GPIO NAND flash driver
        [MTD] cmdlineparts documentation change - explain where mtd-id comes from
        [MTD] cfi_cmdset_0002.c: Add Macronix CFI V1.0 TopBottom detection
        [MTD] [NAND] Fix compilation warnings in drivers/mtd/nand/cs553x_nand.c
        [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash
        [MTD] mtdoops: Fix a bug where block may not be erased
        [MTD] mtdoops: Add a magic number to logged kernel oops
        [MTD] mtdoops: Fix an off by one error
        [JFFS2] Correct parameter names of jffs2_compress() in comments
        [MTD] [NAND] sh_flctl: add support for Renesas SuperH FLCTL
        [MTD] [NAND] Bug on atmel_nand HW ECC : OOB info not correctly written
        [MTD] [MAPS] Remove unused variable after ROM API cleanup.
        [MTD] m25p80.c extended jedec support (v2)
        [MTD] remove unused mtd parameter in of_mtd_parse_partitions()
        [MTD] [NAND] remove dead Kconfig associated with !CONFIG_PPC_MERGE
        [MTD] [NAND] driver extension to support NAND on TQM85xx modules
        ...
      2be508d8
  2. 20 10月, 2008 29 次提交