1. 02 Apr, 2006 5 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · f900e582
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
        [PATCH] powerpc: iSeries needs slb_initialize to be called
        powerpc: hook up the splice syscall
        [PATCH] powerpc/cell: compile fixes
        [PATCH] powerpc: trivial spelling fixes in fault.c
        [PATCH] powerpc/pseries: EEH Cleanup
        [PATCH] powerpc/pseries: misc lparcfg fixes
        [PATCH] powerpc/pseries: fix device name printing, again.
        [PATCH] powerpc: Extends HCALL interface for InfiniBand usage
        [PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS
        [PATCH] powerpc/pseries: print message if EEH recovery fails
        [PATCH] powerpc/pseries: mutex lock to serialize EEH event processing
        powerpc: converted embedded platforms to use new define_machine support
        powerpc: merge machine_check_exception between ppc32 & ppc64
      f900e582
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 23344cb3
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC]: Wire up sys_sync_file_range() into syscall tables.
        [SPARC]: Wire up sys_splice() into the syscall tables.
        [SPARC64]: Update defconfig.
        [SPARC64]: Align address in huge_pte_alloc().
        [SPARC64]: Document the instruction checks we do in do_sparc64_fault().
        [SPARC64]: Make tsb_sync() mm comparison more precise.
      23344cb3
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · bacd3add
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Fully fix the memory leaks in sys_accept().
        [NETFILTER]: iptables 32bit compat layer
        [NETFILTER]: {ip,nf}_conntrack_netlink: fix expectation notifier unregistration
        [NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink
        [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
        [NETFILTER]: x_tables: unify IPv4/IPv6 esp match
        [NET]: Fix dentry leak in sys_accept().
        [IPSEC]: Kill unused decap state structure
        [IPSEC]: Kill unused decap state argument
        [NET]: com90xx kmalloc fix
        [TG3]: Update driver version and reldate.
        [TG3]: Revert "Speed up SRAM access"
      bacd3add
    • Linus Torvalds's avatar
      splice: add SPLICE_F_NONBLOCK flag · 29e35094
      Linus Torvalds authored
      It doesn't make the splice itself necessarily nonblocking (because the
      actual file descriptors that are spliced from/to may block unless they
      have the O_NONBLOCK flag set), but it makes the splice pipe operations
      nonblocking.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      29e35094
    • Linus Torvalds's avatar
      ppc64: actually add sys_splice() to the system call table · b45e516f
      Linus Torvalds authored
      (We'd only added the number, which meant that actually trying
      to use splice just went off into la-la-land)
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      b45e516f
  2. 01 Apr, 2006 35 commits