1. 31 Jan, 2008 26 commits
  2. 30 Jan, 2008 14 commits
    • Paul Mackerras's avatar
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · d145c725
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)
        lguest: use __PAGE_KERNEL instead of _PAGE_KERNEL
        lguest: Use explicit includes rateher than indirect
        lguest: get rid of lg variable assignments
        lguest: change gpte_addr header
        lguest: move changed bitmap to lg_cpu
        lguest: move last_pages to lg_cpu
        lguest: change last_guest to last_cpu
        lguest: change spte_addr header
        lguest: per-vcpu lguest pgdir management
        lguest: make pending notifications per-vcpu
        lguest: makes special fields be per-vcpu
        lguest: per-vcpu lguest task management
        lguest: replace lguest_arch with lg_cpu_arch.
        lguest: make registers per-vcpu
        lguest: make emulate_insn receive a vcpu struct.
        lguest: map_switcher_in_guest() per-vcpu
        lguest: per-vcpu interrupt processing.
        lguest: per-vcpu lguest timers
        lguest: make hypercalls use the vcpu struct
        lguest: make write() operation smp aware
        ...
      
      Manual conflict resolved (maybe even correctly, who knows) in
      drivers/lguest/x86/core.c
      d145c725
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 · 44c3b591
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
        security: compile capabilities by default
        selinux: make selinux_set_mnt_opts() static
        SELinux: Add warning messages on network denial due to error
        SELinux: Add network ingress and egress control permission checks
        NetLabel: Add auditing to the static labeling mechanism
        NetLabel: Introduce static network labels for unlabeled connections
        SELinux: Allow NetLabel to directly cache SIDs
        SELinux: Enable dynamic enable/disable of the network access checks
        SELinux: Better integration between peer labeling subsystems
        SELinux: Add a new peer class and permissions to the Flask definitions
        SELinux: Add a capabilities bitmap to SELinux policy version 22
        SELinux: Add a network node caching mechanism similar to the sel_netif_*() functions
        SELinux: Only store the network interface's ifindex
        SELinux: Convert the netif code to use ifindex values
        NetLabel: Add IP address family information to the netlbl_skbuff_getattr() function
        NetLabel: Add secid token support to the NetLabel secattr struct
        NetLabel: Consolidate the LSM domain mapping/hashing locks
        NetLabel: Cleanup the LSM domain hash functions
        NetLabel: Remove unneeded RCU read locks
      44c3b591
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 3b470ac4
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        PPC: Fix powerpc vio_find_name to not use devices_subsys
        Driver core: add bus_find_device_by_name function
        Module: check to see if we have a built in module with the same name
        x86: fix runtime error in arch/x86/kernel/cpu/mcheck/mce_amd_64.c
        Driver core: Fix up build when CONFIG_BLOCK=N
      3b470ac4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm · 2c57ee6f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (249 commits)
        KVM: Move apic timer migration away from critical section
        KVM: Put kvm_para.h include outside __KERNEL__
        KVM: Fix unbounded preemption latency
        KVM: Initialize the mmu caches only after verifying cpu support
        KVM: MMU: Fix dirty page setting for pages removed from rmap
        KVM: Portability: Move kvm_fpu to asm-x86/kvm.h
        KVM: x86 emulator: Only allow VMCALL/VMMCALL trapped by #UD
        KVM: MMU: Merge shadow level check in FNAME(fetch)
        KVM: MMU: Move kvm_free_some_pages() into critical section
        KVM: MMU: Switch to mmu spinlock
        KVM: MMU: Avoid calling gfn_to_page() in mmu_set_spte()
        KVM: Add kvm_read_guest_atomic()
        KVM: MMU: Concurrent guest walkers
        KVM: Disable vapic support on Intel machines with FlexPriority
        KVM: Accelerated apic support
        KVM: local APIC TPR access reporting facility
        KVM: Print data for unimplemented wrmsr
        KVM: MMU: Add cache miss statistic
        KVM: MMU: Coalesce remote tlb flushes
        KVM: Expose ioapic to ia64 save/restore APIs
        ...
      2c57ee6f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · f389e9fc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: (21 commits)
        dlm: static initialization improvements
        dlm: clean ups
        dlm: Sanity check namelen before copying it
        dlm: keep cached master rsbs during recovery
        dlm: change error message to debug
        dlm: fix possible use-after-free
        dlm: limit dir lookup loop
        dlm: reject normal unlock when lock is waiting for lookup
        dlm: validate messages before processing
        dlm: reject messages from non-members
        dlm: another call to confirm_master in receive_request_reply
        dlm: recover locks waiting for overlap replies
        dlm: clear ast_type when removing from astqueue
        dlm: use fixed errno values in messages
        dlm: swap bytes for rcom lock reply
        dlm: align midcomms message buffer
        dlm: close othercons
        dlm: use dlm prefix on alloc and free functions
        dlm: don't print common non-errors
        dlm: proper prototypes
        ...
      f389e9fc
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 2419505a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (21 commits)
        [SCSI] Revert "[SCSI] aacraid: fib context lock for management ioctls"
        [SCSI] bsg: copy the cmd_type field to the subordinate request for bidi
        [SCSI] handle scsi_init_queue failure properly
        [SCSI] destroy scsi_bidi_sdb_cache in scsi_exit_queue
        [SCSI] scsi_debug: add XDWRITEREAD_10 support
        [SCSI] scsi_debug: add bidi data transfer support
        [SCSI] scsi_debug: add get_data_transfer_info helper function
        [SCSI] remove use_sg_chaining
        [SCSI] bidirectional: fix up for the new blk_end_request code
        [SCSI] bidirectional command support
        [SCSI] implement scsi_data_buffer
        [SCSI] tgt: use scsi_init_io instead of scsi_alloc_sgtable
        [SCSI] aic7xxx: fix warnings with CONFIG_PM disabled
        [SCSI] aic79xx: fix warnings with CONFIG_PM disabled
        [SCSI] aic7xxx: fix ahc_done check SCB_ACTIVE for tagged transactions
        [SCSI] sgiwd93: use cached memory access to make driver work on IP28
        [SCSI] zfcp: fix sense_buffer access bug
        [SCSI] ncr53c8xx: fix sense_buffer access bug
        [SCSI] aic79xx: fix sense_buffer access bug
        [SCSI] hptiop: fix sense_buffer access bug
        ...
      2419505a
    • Randy Dunlap's avatar
      docbook: fix block api fatal error · caf03feb
      Randy Dunlap authored
      Fix docbook fatal error:
      docproc: linux-2.6.24-git8/block/ll_rw_blk.c: No such file or directory
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      caf03feb
    • Randy Dunlap's avatar
      docbook: fix drivers/base/class warning · a63ca8f6
      Randy Dunlap authored
      Fix kernel-doc empty line warning:
      Warning(linux-2.6.24-git8//drivers/base/class.c:866): bad line:
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a63ca8f6
    • Thomas Gleixner's avatar
      alpha: fix x86.git merge build error · c18d1250
      Thomas Gleixner authored
      a5a19c63 removed the include of
      asm/pgalloc.h from asm-generic/tlb.h. That works fine on most
      architectures, but broke ALPHA.
      
      Fixup ALPHA by adding the include to asm-alpha/tlbflush.h
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      c18d1250
    • Ingo Molnar's avatar
      ia64: on UP percpu variables are not small memory model · ab6e14b7
      Ingo Molnar authored
      Tony says:
      
      | The CONFIG_SMP=n path in ia64 makes quite radical changes ... rather
      | than putting all the per-cpu stuff into the top 64K of address space
      | and providing a per-cpu TLB mapping for that range to a different
      | physical address ... it just makes all the per-cpu stuff link as ordinary
      | variables in .data.
      
      the new generic percpu code got confused about this as PER_CPU_ATTRIBUTES
      was defined even on UP, so it picked up that small memory model - which
      was not possible to get linked. The right fix is to only define that
      on SMP. This resolved the build failures in my cross-compiling environment.
      
      also link these variables into the .percpu section even on UP - some
      assembly code has offset dependencies. (such as GET_IA64_MCA_DATA() in
      arch/ia64/kernel/mca_asm.S)
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Acked-by: default avatarTony Luck <tony.luck@intel.com>
      ab6e14b7
    • Ingo Molnar's avatar
      x86: fix arch/x86/kernel/test_nx.c modular build bug · 18fbef9e
      Ingo Molnar authored
      fix this modular build bug:
      
      >   CC [M]  arch/x86/kernel/test_nx.o
      > {standard input}: Assembler messages:
      > {standard input}:58: Error: cannot represent relocation type BFD_RELOC_64
      > {standard input}:59: Error: cannot represent relocation type BFD_RELOC_64
      > make[2]: *** [arch/x86/kernel/test_nx.o] Error 1
      > make[1]: *** [arch/x86/kernel] Error 2
      Reported-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      18fbef9e
    • travis@sgi.com's avatar
      s390: use generic percpu linux-2.6.git · f0343474
      travis@sgi.com authored
      Change s390 percpu.h to use asm-generic/percpu.h
      Signed-off-by: default avatarMike Travis <travis@sgi.com>
      Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      f0343474