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