1. 08 10月, 2012 15 次提交
  2. 07 10月, 2012 19 次提交
  3. 03 10月, 2012 6 次提交
    • L
      Merge tag 'stable/for-linus-3.7-x86-tag' of... · 56d92aa5
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen update from Konrad Rzeszutek Wilk:
       "Features:
         - When hotplugging PCI devices in a PV guest we can allocate
           Xen-SWIOTLB later.
         - Cleanup Xen SWIOTLB.
         - Support pages out grants from HVM domains in the backends.
         - Support wild cards in xen-pciback.hide=(BDF) arguments.
         - Update grant status updates with upstream hypervisor.
         - Boot PV guests with more than 128GB.
         - Cleanup Xen MMU code/add comments.
         - Obtain XENVERS using a preferred method.
         - Lay out generic changes to support Xen ARM.
         - Allow privcmd ioctl for HVM (used to do only PV).
         - Do v2 of mmap_batch for privcmd ioctls.
         - If hypervisor saves the LED keyboard light - we will now instruct
           the kernel about its state.
        Fixes:
         - More fixes to Xen PCI backend for various calls/FLR/etc.
         - With more than 4GB in a 64-bit PV guest disable native SWIOTLB.
         - Fix up smatch warnings.
         - Fix up various return values in privmcmd and mm."
      
      * tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (48 commits)
        xen/pciback: Restore the PCI config space after an FLR.
        xen-pciback: properly clean up after calling pcistub_device_find()
        xen/vga: add the xen EFI video mode support
        xen/x86: retrieve keyboard shift status flags from hypervisor.
        xen/gndev: Xen backend support for paged out grant targets V4.
        xen-pciback: support wild cards in slot specifications
        xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer.
        xen/swiotlb: Remove functions not needed anymore.
        xen/pcifront: Use Xen-SWIOTLB when initting if required.
        xen/swiotlb: For early initialization, return zero on success.
        xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used.
        xen/swiotlb: Move the error strings to its own function.
        xen/swiotlb: Move the nr_tbl determination in its own function.
        xen/arm: compile and run xenbus
        xen: resynchronise grant table status codes with upstream
        xen/privcmd: return -EFAULT on error
        xen/privcmd: Fix mmap batch ioctl error status copy back.
        xen/privcmd: add PRIVCMD_MMAPBATCH_V2 ioctl
        xen/mm: return more precise error from xen_remap_domain_range()
        xen/mmu: If the revector fails, don't attempt to revector anything else.
        ...
      56d92aa5
    • L
      Merge tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm · 33c2a174
      Linus Torvalds 提交于
      Pull frontswap update from Konrad Rzeszutek Wilk:
       "Features:
         - Support exlusive get if backend is capable.
        Bug-fixes:
         - Fix compile warnings
         - Add comments/cleanup doc
         - Fix wrong if condition"
      
      * tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
        frontswap: support exclusive gets if tmem backend is capable
        mm: frontswap: fix a wrong if condition in frontswap_shrink
        mm/frontswap: fix uninit'ed variable warning
        mm/frontswap: cleanup doc and comment error
        mm: frontswap: remove unneeded headers
      33c2a174
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 88265322
      Linus Torvalds 提交于
      Pull security subsystem updates from James Morris:
       "Highlights:
      
         - Integrity: add local fs integrity verification to detect offline
           attacks
         - Integrity: add digital signature verification
         - Simple stacking of Yama with other LSMs (per LSS discussions)
         - IBM vTPM support on ppc64
         - Add new driver for Infineon I2C TIS TPM
         - Smack: add rule revocation for subject labels"
      
      Fixed conflicts with the user namespace support in kernel/auditsc.c and
      security/integrity/ima/ima_policy.c.
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits)
        Documentation: Update git repository URL for Smack userland tools
        ima: change flags container data type
        Smack: setprocattr memory leak fix
        Smack: implement revoking all rules for a subject label
        Smack: remove task_wait() hook.
        ima: audit log hashes
        ima: generic IMA action flag handling
        ima: rename ima_must_appraise_or_measure
        audit: export audit_log_task_info
        tpm: fix tpm_acpi sparse warning on different address spaces
        samples/seccomp: fix 31 bit build on s390
        ima: digital signature verification support
        ima: add support for different security.ima data types
        ima: add ima_inode_setxattr/removexattr function and calls
        ima: add inode_post_setattr call
        ima: replace iint spinblock with rwlock/read_lock
        ima: allocating iint improvements
        ima: add appraise action keywords and default rules
        ima: integrity appraisal extension
        vfs: move ima_file_free before releasing the file
        ...
      88265322
    • L
      Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubi · 65b99c74
      Linus Torvalds 提交于
      Pull UBI changes from Artem Bityutskiy:
       "The main change is the way we reserve eraseblocks for bad blocks
        handling.  We used to reserve 2% of the partition, but now we are more
        aggressive and we reserve 2% of the entire chip, which is what
        actually manufacturers specify in data sheets.  We introduced an
        option to users to override the default, though.
      
        There are a couple of fixes as well, and a number of cleanups."
      
      * tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubi: (24 commits)
        UBI: fix trivial typo 'it' => 'is'
        UBI: load after mtd device drivers
        UBI: print less
        UBI: use pr_ helper instead of printk
        UBI: comply with coding style
        UBI: erase free PEB with bitflip in EC header
        UBI: fix autoresize handling in R/O mode
        UBI: add max_beb_per1024 to attach ioctl
        UBI: allow specifying bad PEBs limit using module parameter
        UBI: check max_beb_per1024 value in ubi_attach_mtd_dev
        UBI: prepare for max_beb_per1024 module parameter addition
        UBI: introduce MTD_PARAM_MAX_COUNT
        UBI: separate bad_peb_limit in a function
        arm: sam9_l9260_defconfig: correct CONFIG_MTD_UBI_BEB_LIMIT
        UBI: use the whole MTD device size to get bad_peb_limit
        mtd: mtdparts: introduce mtd_get_device_size
        mtd: mark mtd_is_partition argument as constant
        arm: sam9_l9260_defconfig: remove non-existing config option
        UBI: kill CONFIG_MTD_UBI_BEB_RESERVE
        UBI: limit amount of reserved eraseblocks for bad PEB handling
        ...
      65b99c74
    • L
      Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs · 782c3fb2
      Linus Torvalds 提交于
      Pull ubifs changes from Artem Bityutskiy:
       "No big changes for 3.7 in UBIFS:
         - Error reporting and debug printing improvements
         - Power cut emulation fixes
         - Minor cleanups"
      
      Fix trivial conflict in fs/ubifs/debug.c due to the user namespace
      changes.
      
      * tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs:
        UBIFS: print less
        UBIFS: use pr_ helper instead of printk
        UBIFS: comply with coding style
        UBIFS: use __aligned() attribute
        UBIFS: remove __DATE__ and __TIME__
        UBIFS: fix power cut emulation for mtdram
        UBIFS: improve scanning debug output
        UBIFS: always print full error reports
        UBIFS: print PID in debug messages
      782c3fb2
    • L
      Merge tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfs · 60c7b4df
      Linus Torvalds 提交于
      Pull xfs update from Ben Myers:
       "Several enhancements and cleanups:
      
         - make inode32 and inode64 remountable options
         - SEEK_HOLE/SEEK_DATA enhancements
         - cleanup struct declarations in xfs_mount.h"
      
      * tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfs:
        xfs: Make inode32 a remountable option
        xfs: add inode64->inode32 transition into xfs_set_inode32()
        xfs: Fix mp->m_maxagi update during inode64 remount
        xfs: reduce code duplication handling inode32/64 options
        xfs: make inode64 as the default allocation mode
        xfs: Fix m_agirotor reset during AG selection
        Make inode64 a remountable option
        xfs: stop the sync worker before xfs_unmountfs
        xfs: xfs_seek_hole() refinement with hole searching from page cache for unwritten extents
        xfs: xfs_seek_data() refinement with unwritten extents check up from page cache
        xfs: Introduce a helper routine to probe data or hole offset from page cache
        xfs: Remove type argument from xfs_seek_data()/xfs_seek_hole()
        xfs: fix race while discarding buffers [V4]
        xfs: check for possible overflow in xfs_ioc_trim
        xfs: unlock the AGI buffer when looping in xfs_dialloc
        xfs: kill struct declarations in xfs_mount.h
        xfs: fix uninitialised variable in xfs_rtbuf_get()
      60c7b4df