1. 31 Jan, 2008 33 commits
  2. 30 Jan, 2008 7 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