1. 15 7月, 2007 30 次提交
  2. 14 7月, 2007 10 次提交
    • L
      Revert "SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel" · 8d9107e8
      Linus Torvalds 提交于
      This reverts commit 9faf65fb.
      
      It bit people like Michal Piotrowski:
      
        "My system is too secure, I can not login :)"
      
      because it changed how CONFIG_NETLABEL worked, and broke older SElinux
      policies.
      
      As a result, quoth James Morris:
      
        "Can you please revert this patch?
      
         We thought it only affected people running MLS, but it will affect others.
      
         Sorry for the hassle."
      
      Cc: James Morris <jmorris@namei.org>
      Cc: Stephen Smalley <sds@tycho.nsa.gov>
      Cc: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
      Cc: Paul Moore <paul.moore@hp.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8d9107e8
    • L
      Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 · 16cefa8c
      Linus Torvalds 提交于
      * git://git.linux-nfs.org/pub/linux/nfs-2.6: (122 commits)
        sunrpc: drop BKL around wrap and unwrap
        NFSv4: Make sure unlock is really an unlock when cancelling a lock
        NLM: fix source address of callback to client
        SUNRPC client: add interface for binding to a local address
        SUNRPC server: record the destination address of a request
        SUNRPC: cleanup transport creation argument passing
        NFSv4: Make the NFS state model work with the nosharedcache mount option
        NFS: Error when mounting the same filesystem with different options
        NFS: Add the mount option "nosharecache"
        NFS: Add support for mounting NFSv4 file systems with string options
        NFS: Add final pieces to support in-kernel mount option parsing
        NFS: Introduce generic mount client API
        NFS: Add enums and match tables for mount option parsing
        NFS: Improve debugging output in NFS in-kernel mount client
        NFS: Clean up in-kernel NFS mount
        NFS: Remake nfsroot_mount as a permanent part of NFS client
        SUNRPC: Add a convenient default for the hostname when calling rpc_create()
        SUNRPC: Rename rpcb_getport to be consistent with new rpcb_getport_sync name
        SUNRPC: Rename rpcb_getport_external routine
        SUNRPC: Allow rpcbind requests to be interrupted by a signal.
        ...
      16cefa8c
    • J
      nfsd: fix nfsd_vfs_read() splice actor setup · 4fbef206
      Jens Axboe 提交于
      When nfsd was transitioned to use splice instead of sendfile() for data
      transfers, a line setting the page index was lost. Restore it, so that
      nfsd is functional when that path is used.
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4fbef206
    • T
      CFS: Fix missing digit off in wmult table · 4fd88517
      Thomas Gleixner 提交于
      Roman Zippel noticed another inconsistency of the wmult table.
      
      wmult[16] has a missing digit.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4fd88517
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq · af09f1e4
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Fix typos in powernow-k8 printk's.
        [CPUFREQ] Restore previously used governor on a hot-replugged CPU
        [CPUFREQ] bugfix cpufreq in combination with performance governor
        [CPUFREQ] powernow-k8 compile fix.
        [CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI
        [CPUFREQ] Longhaul - Option to disable ACPI C3 support
      
      Fixed up arch/i386/kernel/cpu/cpufreq/powernow-k8.c due to revert that
      got fixed differently in the cpufreq branch.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      af09f1e4
    • L
      Merge branch 'ioat-md-accel-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop · e030dbf9
      Linus Torvalds 提交于
      * 'ioat-md-accel-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop: (28 commits)
        ioatdma: add the unisys "i/oat" pci vendor/device id
        ARM: Add drivers/dma to arch/arm/Kconfig
        iop3xx: surface the iop3xx DMA and AAU units to the iop-adma driver
        iop13xx: surface the iop13xx adma units to the iop-adma driver
        dmaengine: driver for the iop32x, iop33x, and iop13xx raid engines
        md: remove raid5 compute_block and compute_parity5
        md: handle_stripe5 - request io processing in raid5_run_ops
        md: handle_stripe5 - add request/completion logic for async expand ops
        md: handle_stripe5 - add request/completion logic for async read ops
        md: handle_stripe5 - add request/completion logic for async check ops
        md: handle_stripe5 - add request/completion logic for async compute ops
        md: handle_stripe5 - add request/completion logic for async write ops
        md: common infrastructure for running operations with raid5_run_ops
        md: raid5_run_ops - run stripe operations outside sh->lock
        raid5: replace custom debug PRINTKs with standard pr_debug
        raid5: refactor handle_stripe5 and handle_stripe6 (v3)
        async_tx: add the async_tx api
        xor: make 'xor_blocks' a library routine for use with async_tx
        dmaengine: make clients responsible for managing channels
        dmaengine: refactor dmaengine around dma_async_tx_descriptor
        ...
      e030dbf9
    • L
      Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block · 12a22960
      Linus Torvalds 提交于
      * 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block:
        splice: fix offset mangling with direct splicing (sendfile)
        security: revalidate rw permissions for sys_splice and sys_vmsplice
        relay: fixup kerneldoc comment
        relay: fix bogus cast in subbuf_splice_actor()
      12a22960
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 31c4ab43
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Workaround for a sparse warning in include/asm-mips/mach-tx4927/ioremap.h
        [MIPS] Make show_code static and add __user tag
        [MIPS] Workaround for a sparse warning in include/asm-mips/compat.h
        [MIPS] Add some __user tags
        [MIPS] math-emu minor cleanup
        [MIPS] Kill CONFIG_TX4927BUG_WORKAROUND
        [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_FB_XPERT98
        [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_SRC_CLK
        [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_USE32K
        [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI
        [CHAR] Delete leftovers of old Alchemy UART driver
      31c4ab43
    • L
      Revert "[CPUFREQ] powernow-k8: clarify number of cores." · 8b69ad0e
      Linus Torvalds 提交于
      This reverts commit 904f7a3f.
      
      As noted by Peter Anvin:
      
        "It causes build failures on i386.
      
         Yet another case of unnecessary divergence between i386 and x86-64
         I'm afraid..."
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8b69ad0e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched · aba2da66
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
        [PATCH] sched: small topology.h cleanup
        [PATCH] sched: fix show_task()/show_tasks() output
        [PATCH] sched: remove stale version info from kernel/sched_debug.c
        [PATCH] sched: allow larger granularity
        [PATCH] sched: fix prio_to_wmult[] for nice 1
      
      [ I re-did the commits to get rid of some bogus merge commit that
        Ingo had. - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      aba2da66