1. 11 Jul, 2013 26 commits
  2. 10 Jul, 2013 14 commits
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · ae924949
      Linus Torvalds authored
      Pull coccinelle updates from Michal Marek:
       "The misc branch is reserved for Coccinelle this time:
      
         - 'report' is the default mode
         - MAINTAINERS update for Coccinelle
         - documentation udate
         - use new option format for spatch(1)
         - J=<n> variable to mimic make -j for coccicheck
         - check for missing pci_free_consistent() calls
      
        There are some patches for rpm-pkg and deb-pkg waiting for the
        3.12-rc1 merge window"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        Coccinelle: Update information about the minimal version required
        Coccinelle: Update the options used to the new option scheme
        scripts: Coccinelle script for pci_free_consistent()
        Coccinelle: Update the documentation
        Coccinelle: Update section of MAINTAINERS
        coccicheck: span checks across CPUs
        scripts/coccinelle: check for field address argument to kfree
        Coccinelle: Update the Coccinelle section of MAINTAINERS
        Coccinelle: Make 'report' the default mode
      ae924949
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · b202c0d5
      Linus Torvalds authored
      Pull kconfig updates from Michal Marek:
       - dependency solver fix for make defconfig
       - randconfig fixes, one of which had to be reverted again
       - more user-friendly sorting of search results
       - hex and range keywords support longs
       - fix for [mn]conf not to rely on particular behavior of the LINES and
         COLS variables
       - cleanup of magic constants in kconfig/lxdialog
       - [mn]conf formatting fixes
       - fix for scripts/config's help text in out-of-tree usage (under a
         different name)
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: allow "hex" and "range" to support longs
        Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
        kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG
        kconfig: loop as long as we changed some symbols in randconfig
        kconfig/[mn]conf: make it explicit in the search box that a regexp is possible
        kconfig: sort found symbols by relevance
        kconfig/conf: print the seed used to initialise the RNG for randconfig
        kconfig/conf: accept a base-16 seed for randconfig
        kconfig/conf: fix randconfig setting multiple symbols in a choice
        scripts/config: replace hard-coded script name by a dynamic value
        mconf/nconf: mark empty menus/menuconfigs different from non-empty ones
        nconf: use function calls instead of ncurses' variables LINES and COLS
        mconf: use function calls instead of ncurses' variables LINES and COLS
        kconfig/lxdialog: handle newline characters in print_autowrap()
        kconfig/lxdialog: Use new mininimum resize definitions in conf_choice()
        kconfig/lxdialog: Add definitions for mininimum (re)size values
        kconfig: Fix defconfig when one choice menu selects options that another choice menu depends on
      b202c0d5
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · cb63fc26
      Linus Torvalds authored
      Pull kbuild updates from Michal Marek:
       - fix for make headers_install argv explosion with too long path
       - scripts/setlocalversion does not call git update-index needlessly
       - fix for the src.rpm produced by make rpm-pkg.  The new make
         image_name can be useful also for other packaging tools.
       - scripts/mod/devicetable-offsets.o is not rebuilt during each make run
       - make modules_install dependency fix
       - scripts/sortextable portability fix
       - fix for kbuild to generate the output directory for all object files
         in subdirs.
       - a couple of minor fixes
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: create directory for dir/file.o
        tools/include: use stdint types for user-space byteshift headers
        Makefile: Fix install error with make -j option
        Fix a build warning in scripts/mod/file2alias.c
        improve modalias building
        scripts/mod: Spelling s/DEVICEVTABLE/DEVICETABLE/
        kbuild: fix error when building from src rpm
        scripts/setlocalversion on write-protected source tree
        Makefile.lib: align DTB quiet_cmd
        kbuild: fix make headers_install when path is too long
      cb63fc26
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a9642fa3
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Two small fixlets"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Fix interrupt handler timing harness
        perf/x86/amd: Do not print an error when the device is not present
      a9642fa3
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 81336333
      Linus Torvalds authored
      Pull module updates from Rusty Russell:
       "Nothing interesting.  Except the most embarrassing bugfix ever.  But
        let's ignore that"
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: cleanup call chain.
        module: do percpu allocation after uniqueness check.  No, really!
        modules: don't fail to load on unknown parameters.
        ABI: Clarify when /sys/module/MODULENAME is created
        There is no /sys/parameters
        module: don't modify argument of module_kallsyms_lookup_name()
      81336333
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 5f129721
      Linus Torvalds authored
      Pull virtio updates from Rusty Russell:
       "No real surprises"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        MAINTAINERS: add tools/virtio/ under virtio
        tools/virtio: move module license stub to module.h
        virtio: include asm/barrier explicitly
        virtio: VIRTIO_F_ANY_LAYOUT feature
        lguest: fix example launcher compilation for broken glibc headers.
        virtio-net: fix the race between channels setting and refill
        tools/lguest: real barriers.
        tools/lguest: fix missing rmb().
        virtio_balloon: leak_balloon(): only tell host if we got pages deflated
        virtio-pci: fix leaks of msix_affinity_masks
        Fix comment typo "CONFIG_PAE"
      5f129721
    • Linus Torvalds's avatar
      Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio · 15a49b9a
      Linus Torvalds authored
      Pull vfio updates from Alex Williamson:
       "Largely hugepage support for vfio/type1 iommu and surrounding cleanups
        and fixes"
      
      * tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio:
        vfio/type1: Fix leak on error path
        vfio: Limit group opens
        vfio/type1: Fix missed frees and zero sized removes
        vfio: fix documentation
        vfio: Provide module option to disable vfio_iommu_type1 hugepage support
        vfio: hugepage support for vfio_iommu_type1
        vfio: Convert type1 iommu to use rbtree
      15a49b9a
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 8d10aae2
      Linus Torvalds authored
      Pull vhost fixes and cleanups from Michael S Tsirkin:
       "This includes some fixes and cleanups for vhost net and scsi drivers"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost/test: update test after vhost cleanups
        vhost: Make local function static
        vhost: Make vhost a separate module
        vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to *cmd
        vhost-scsi: Rename struct tcm_vhost_tpg *tv_tpg to *tpg
        vhost-scsi: Make func indention more consistent
        vhost-scsi: Rename struct vhost_scsi *s to *vs
        vhost-scsi: Remove unnecessary forward struct vhost_scsi declaration
        vhost: Simplify dev->vqs[i] access
        vhost-net: fix use-after-free in vhost_net_flush
      8d10aae2
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 66645656
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "A few updates this time, most important and exiciting (to me) is:
      
         - The new ARM SMMU driver.  This is a common IOMMU driver that will
           hopefully be used in a lot of upcoming ARM chips.  So the mess in
           the past where every SOC had its own IOMMU will be over.
      
        Besides that:
      
         - Some important fixes in the IOMMU unmap path.  There are fixes in
           the common code and also in the AMD IOMMU driver.
         - Other random fixes"
      
      * tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        MAINTAINERS: add entry for ARM system MMU driver
        iommu/arm: Add support for ARM Ltd. System MMU architecture
        documentation/iommu: Add description of ARM System MMU binding
        iommu: Use %pa and %zx instead of casting
        iommu/amd: Only unmap large pages from the first pte
        iommu: Fix compiler warning on pr_debug
        iommu/amd: Fix memory leak in free_pagetable
        iommu: Split iommu_unmaps
        iommu/{vt-d,amd}: Remove multifunction assumption around grouping
        iommu/omap: fix checkpatch warnings in omap iommu code
        iommu/omap: fix printk formats for dma_addr_t
        iommu/vt-d: DMAR reporting table needs at least one DRHD
        iommu/vt-d: Downgrade the warning if enabling irq remapping fails
      66645656
    • Linus Torvalds's avatar
      drm: avoid warning in drm_load_edid_firmware() · 496fd15b
      Linus Torvalds authored
      Use "const char *" instead of "char *" in order to avoid this warning:
      
        drivers/gpu/drm/drm_edid_load.c: In function ‘drm_load_edid_firmware’:
        drivers/gpu/drm/drm_edid_load.c:245:25: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      496fd15b
    • Olivier DANET's avatar
      [PATCH] sparc32: vm_area_struct access for old Sun SPARCs. · 961246b4
      Olivier DANET authored
      Commit e4c6bfd2 ("mm: rearrange
      vm_area_struct for fewer cache misses") changed the layout of the
      vm_area_struct structure, it broke several SPARC32 assembly routines
      which used numerical constants for accessing the vm_mm field.
      
      This patch defines the VMA_VM_MM constant to replace the immediate values.
      Signed-off-by: default avatarOlivier DANET <odanet@caramail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      961246b4
    • Dave Kleikamp's avatar
      sunvnet: vnet_port_remove must call unregister_netdev · aabb9875
      Dave Kleikamp authored
      The missing call to unregister_netdev() leaves the interface active
      after the driver is unloaded by rmmod.
      Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aabb9875
    • Andreas Larsson's avatar
      sparc32, leon: Require separate snoop tags set to regard snooping to be enabled · e8e2bfd1
      Andreas Larsson authored
      Even if data snooping is enabled, without separate snoop tags snooping will not
      work when the MMU is enabled.
      Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e8e2bfd1
    • Chen Gang's avatar
      arch: sparc: kernel: check the memory length before use strcpy(). · f118e9ab
      Chen Gang authored
      For the related next strcpy(), the destination length is less than 512,
      but the source maximize length may be 'OPROMMAXPARAM' (4096) which is
      more than 512.
      
      One work flow may:
        openprom_sunos_ioctl() ->  if (cmd == OPROMSETOPT)
          getstrings() ->  will alloc buffer with size 'OPROMMAXPARAM'.
          opromsetopt() ->  devide the buffer into 'var' and 'value'
            of_set_property() -> pass
              prom_setprop() -> pass
                ldom_set_var()
      
      And do not mind the additional 4 alignment buffer increasing, since
      'sizeof(pkt) - sizeof(pkt.header)' is 4 alignment at least.
      Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f118e9ab