1. 07 4月, 2016 1 次提交
  2. 06 4月, 2016 2 次提交
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 541d8f4d
      Linus Torvalds 提交于
      Pull KVM fixes from Paolo Bonzini:
       "Miscellaneous bugfixes.
      
        The ARM and s390 fixes are for new regressions from the merge window,
        others are usual stable material"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        compiler-gcc: disable -ftracer for __noclone functions
        kvm: x86: make lapic hrtimer pinned
        s390/mm/kvm: fix mis-merge in gmap handling
        kvm: set page dirty only if page has been writable
        KVM: x86: reduce default value of halt_poll_ns parameter
        KVM: Hyper-V: do not do hypercall userspace exits if SynIC is disabled
        KVM: x86: Inject pending interrupt even if pending nmi exist
        arm64: KVM: Register CPU notifiers when the kernel runs at HYP
        arm64: kvm: 4.6-rc1: Fix VTCR_EL2 VS setting
      541d8f4d
    • L
      Merge tag 'spi-fix-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 5003bc6c
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "A couple of driver specific fixes here that came in since the merge
        window plus one core fix for locking in cases where a client driver
        grabs a lock on the whole bus for an extended series of operations
        that was introduced by the changes to support accelerated flash
        operations"
      
      * tag 'spi-fix-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: rockchip: fix probe deferral handling
        spi: omap2-mcspi: fix dma transfer for vmalloced buffer
        spi: fix possible deadlock between internal bus locks and bus_lock_flag
        spi: imx: Fix possible NULL pointer deref
        spi: imx: only do necessary changes to ECSPIx_CONFIGREG
        spi: rockchip: Spelling s/divsor/divisor/
      5003bc6c
  3. 05 4月, 2016 18 次提交
    • L
      Merge tag 'pinctrl-v4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 1b5caa3e
      Linus Torvalds 提交于
      Pull pin control fixes from Linus Walleij:
       "Here is a set of pin control fixes for the v4.6 series.
      
        A bit bigger than what I hoped for, but all fixes are confined to
        drivers, a few of them also targeted to stable.
      
        Summary:
      
         - On Super-H PFC (Renesas) controllers: only use dummies on legacy
           systems.  This fixes a serious ethernet regression on a Renesas
           board.
         - Pistachio: Fix errors in the pin table.
         - Allwinner SunXi: fix the external interrupts to work.
         - Intel: fix so the high level interrupts start working, and fix a
           spurious interrupt issue.
         - Qualcomm ipq4019: fix the number of GPIOs provided (bump to 100),
           correct register offsets and handle GPIO mode properly.
         - Revert the revert on the revert so that Xway has a .to_irq()
           callback again.
         - Minor fixes to errorpaths and debug info.
         - A MAINTAINERS update"
      
      * tag 'pinctrl-v4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        Revert "Revert "pinctrl: lantiq: Implement gpio_chip.to_irq""
        pinctrl: qcom: ipq4019: fix register offsets
        pinctrl: qcom: ipq4019: fix the function enum for gpio mode
        pinctrl: qcom: ipq4019: set ngpios to correct value
        pinctrl: nomadik: fix pull debug print inversion
        MAINTAINERS: pinctrl: samsung: Add two new maintainers
        pinctrl: intel: implement gpio_irq_enable
        pinctrl: intel: make the high level interrupt working
        pinctrl: freescale: imx: fix bogus check of of_iomap() return value
        pinctrl: sunxi: Fix A33 external interrupts not working
        pinctrl: pistachio: fix mfio84-89 function description and pinmux.
        pinctrl: sh-pfc: only use dummy states for non-DT platforms
      1b5caa3e
    • L
      Merge tag 'media/v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 62d2def9
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "Some bug fixes on au0828 and snd-usb-audio:
      
         - the au0828+snd-usb-audio MC patch broke several things and produced
           some race conditions.  Better to revert the patches, and re-work on
           them for a next version
      
         - fix a regression at tuner disable links logic
      
         - properly handle dev_state as a bitmask"
      
      * tag 'media/v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] Revert "[media] media: au0828 change to use Managed Media Controller API"
        [media] Revert "[media] sound/usb: Use Media Controller API to share media resources"
        [media] au0828: Fix dev_state handling
        [media] au0828: fix au0828_v4l2_close() dev_state race condition
        [media] media: au0828 fix to clear enable/disable/change source handlers
        [media] v4l2-mc: cleanup a warning
        [media] au0828: disable tuner links and cache tuner/decoder
      62d2def9
    • P
      compiler-gcc: disable -ftracer for __noclone functions · 95272c29
      Paolo Bonzini 提交于
      -ftracer can duplicate asm blocks causing compilation to fail in
      noclone functions.  For example, KVM declares a global variable
      in an asm like
      
          asm("2: ... \n
               .pushsection data \n
               .global vmx_return \n
               vmx_return: .long 2b");
      
      and -ftracer causes a double declaration.
      
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: stable@vger.kernel.org
      Cc: kvm@vger.kernel.org
      Reported-by: NLinda Walsh <lkml@tlinx.org>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      95272c29
    • L
      kvm: x86: make lapic hrtimer pinned · 61abdbe0
      Luiz Capitulino 提交于
      When a vCPU runs on a nohz_full core, the hrtimer used by
      the lapic emulation code can be migrated to another core.
      When this happens, it's possible to observe milisecond
      latency when delivering timer IRQs to KVM guests.
      
      The huge latency is mainly due to the fact that
      apic_timer_fn() expects to run during a kvm exit. It
      sets KVM_REQ_PENDING_TIMER and let it be handled on kvm
      entry. However, if the timer fires on a different core,
      we have to wait until the next kvm exit for the guest
      to see KVM_REQ_PENDING_TIMER set.
      
      This problem became visible after commit 9642d18e. This
      commit changed the timer migration code to always attempt
      to migrate timers away from nohz_full cores. While it's
      discussable if this is correct/desirable (I don't think
      it is), it's clear that the lapic emulation code has
      a requirement on firing the hrtimer in the same core
      where it was started. This is achieved by making the
      hrtimer pinned.
      
      Lastly, note that KVM has code to migrate timers when a
      vCPU is scheduled to run in different core. However, this
      forced migration may fail. When this happens, we can have
      the same problem. If we want 100% correctness, we'll have
      to modify apic_timer_fn() to cause a kvm exit when it runs
      on a different core than the vCPU. Not sure if this is
      possible.
      
      Here's a reproducer for the issue being fixed:
      
       1. Set all cores but core0 to be nohz_full cores
       2. Start a guest with a single vCPU
       3. Trace apic_timer_fn() and kvm_inject_apic_timer_irqs()
      
      You'll see that apic_timer_fn() will run in core0 while
      kvm_inject_apic_timer_irqs() runs in a different core. If
      you get both on core0, try running a program that takes 100%
      of the CPU and pin it to core0 to force the vCPU out.
      Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      61abdbe0
    • C
      s390/mm/kvm: fix mis-merge in gmap handling · 9c650d09
      Christian Borntraeger 提交于
      commit 1e133ab2 ("s390/mm: split arch/s390/mm/pgtable.c") dropped
      some changes from commit a3a92c31 ("KVM: s390: fix mismatch
      between user and in-kernel guest limit") - this breaks KVM for some
      memory sizes (kvm-s390: failed to commit memory region) like
      exactly 2GB.
      
      Cc: Dominik Dingel <dingel@linux.vnet.ibm.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Acked-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      9c650d09
    • L
      Merge tag 'linux-kselftest-4.6-rc3' of... · 1e1e5ce7
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fixes from Shuah Khan:
       "This update for Kselftest contains seccomp fixes"
      
      * tag 'linux-kselftest-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftest/seccomp: Fix the seccomp(2) signature
        selftest/seccomp: Fix the flag name SECCOMP_FILTER_FLAG_TSYNC
      1e1e5ce7
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · c3b1feb0
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "This is the first round of MIPS fixes for 4.6:
      
         - Fix spelling mistakes all over arch/mips
         - Provide __bswapsi2 so XZ kernel compression will build with older GCC
         - ATH79 clock fixes.
         - Fix clock-rated copy-paste erros in ATH79 DTS.
         - Fix gisb-arb compatible string for 7435 BMIPS
         - Enable NAND and UBIFS support in CI20.
         - Fix BUG() assertion caused by inapropriate smp_processor_id() use.
         - Fix exception handling issues for the sake of debuggers
         - Fix the last remaining instance of irq_to_gpio in the db1xxx_ss PCMCIA code
         - Fix MSA unaligned load failures
         - Panic if kernel is configured for a not TLB-supported page size
         - Bail out on unsupported relocs in modules.
         - Partial fix for Qemu breakage after recent IPI rewrite
         - Wire up the preadv2 and pwrite2 syscalls
         - Fix the ar724x clock calculation"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: traps.c: Verify the ISA for microMIPS RDHWR emulation
        MIPS: BMIPS: Fix gisb-arb compatible string for 7435
        MIPS: Bail on unsupported module relocs
        MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: use "ref" for reference clock name
        MIPS: ath79: Fix the ar913x reference clock rate
        MIPS: ath79: Fix the ar724x clock calculation
        dt-bindings: clock: qca,ath79-pll: fix copy-paste typos
        MIPS: traps: Correct the SIGTRAP debug ABI in `do_watch' and `do_trap_or_bp'
        FIRMWARE: Broadcom: Fix grammar of warning messages in bcm47xx_sprom.c.
        MIPS: ci20: Enable NAND and UBIFS support in defconfig.
        MIPS: Fix misspellings in comments.
        MIPS: tlb-r4k: panic if the MMU doesn't support PAGE_SIZE
        MIPS: zboot: Remove copied source files on clean
        MIPS: zboot: Fix the build with XZ compression on older GCC versions
        MIPS: Wire up preadv2 and pwrite2 syscalls.
        MIPS: cpu_name_string: Use raw_smp_processor_id().
        pcmcia: db1xxx_ss: fix last irq_to_gpio user
        MIPS: Fix MSA ld unaligned failure cases
        MIPS: Fix broken malta qemu
      c3b1feb0
    • L
      Merge tag 'for-linus-4.6-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 93e2aeac
      Linus Torvalds 提交于
      Pull xen fixes from David Vrabel:
       "Regression and bug fixes for 4.6-rc2:
      
         - safely migrate event channels between CPUs
         - fix CPU hotplug
         - maintainer changes"
      
      * tag 'for-linus-4.6-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        MAINTAINERS: xen: Konrad to step down and Juergen to pick up
        xen/events: Mask a moving irq
        Xen on ARM and ARM64: update MAINTAINERS info
        xen/x86: Call cpu_startup_entry(CPUHP_AP_ONLINE_IDLE) from xen_play_dead()
        xen/apic: Provide Xen-specific version of cpu_present_to_apicid APIC op
      93e2aeac
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · e865f496
      Linus Torvalds 提交于
      Pull quota fixes from Jan Kara:
       "Fixes for oopses when the new quotactl gets used with quotas disabled"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas
        quota: Handle Q_GETNEXTQUOTA when quota is disabled
      e865f496
    • L
      Merge tag 'f2fs-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · c7e82c64
      Linus Torvalds 提交于
      Pull f2fs fixes from Jaegeuk Kim.
      
      * tag 'f2fs-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
        f2fs: retrieve IO write stat from the right place
        f2fs crypto: fix corrupted symlink in encrypted case
        f2fs: cover large section in sanity check of super
      c7e82c64
    • L
      gma500: remove annoying deprecation warning · 166c5a6e
      Linus Torvalds 提交于
      In commit e4570897 ("drm/dp-helper: Move the legacy helpers to
      gma500") the legacy i2c helpers were moved to the only remaining user of
      them, the gma500 driver.  Together with that move, i2c_dp_aux_add_bus()
      was marked deprecated and started warning about its remaining use.
      
      It's now been a year and a half of annoying warning, and apparently
      nobody cares enough about gma500 to try to move it along to the more
      modern models.
      
      Get rid of the warning - if even the gma500 people don't care enough,
      then they should certainly not spam other innocent developers with a
      warning that might hide other, much more real issues.
      
      Cc: Daniel Vetter <daniel.vetter@intel.com>
      Cc: Alan Cox <alan@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      166c5a6e
    • L
      Merge branch 'PAGE_CACHE_SIZE-removal' · 4a2d057e
      Linus Torvalds 提交于
      Merge PAGE_CACHE_SIZE removal patches from Kirill Shutemov:
       "PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
        ago with promise that one day it will be possible to implement page
        cache with bigger chunks than PAGE_SIZE.
      
        This promise never materialized.  And unlikely will.
      
        Let's stop pretending that pages in page cache are special.  They are
        not.
      
        The first patch with most changes has been done with coccinelle.  The
        second is manual fixups on top.
      
        The third patch removes macros definition"
      
      [ I was planning to apply this just before rc2, but then I spaced out,
        so here it is right _after_ rc2 instead.
      
        As Kirill suggested as a possibility, I could have decided to only
        merge the first two patches, and leave the old interfaces for
        compatibility, but I'd rather get it all done and any out-of-tree
        modules and patches can trivially do the converstion while still also
        working with older kernels, so there is little reason to try to
        maintain the redundant legacy model.    - Linus ]
      
      * PAGE_CACHE_SIZE-removal:
        mm: drop PAGE_CACHE_* and page_cache_{get,release} definition
        mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
        mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
      4a2d057e
    • K
      mm: drop PAGE_CACHE_* and page_cache_{get,release} definition · 1fa64f19
      Kirill A. Shutemov 提交于
      All users gone.  We can remove these macros.
      Signed-off-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1fa64f19
    • K
      mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage · ea1754a0
      Kirill A. Shutemov 提交于
      Mostly direct substitution with occasional adjustment or removing
      outdated comments.
      Signed-off-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ea1754a0
    • K
      mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros · 09cbfeaf
      Kirill A. Shutemov 提交于
      PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
      ago with promise that one day it will be possible to implement page
      cache with bigger chunks than PAGE_SIZE.
      
      This promise never materialized.  And unlikely will.
      
      We have many places where PAGE_CACHE_SIZE assumed to be equal to
      PAGE_SIZE.  And it's constant source of confusion on whether
      PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
      especially on the border between fs and mm.
      
      Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
      breakage to be doable.
      
      Let's stop pretending that pages in page cache are special.  They are
      not.
      
      The changes are pretty straight-forward:
      
       - <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
      
       - <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
      
       - PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
      
       - page_cache_get() -> get_page();
      
       - page_cache_release() -> put_page();
      
      This patch contains automated changes generated with coccinelle using
      script below.  For some reason, coccinelle doesn't patch header files.
      I've called spatch for them manually.
      
      The only adjustment after coccinelle is revert of changes to
      PAGE_CAHCE_ALIGN definition: we are going to drop it later.
      
      There are few places in the code where coccinelle didn't reach.  I'll
      fix them manually in a separate patch.  Comments and documentation also
      will be addressed with the separate patch.
      
      virtual patch
      
      @@
      expression E;
      @@
      - E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
      + E
      
      @@
      expression E;
      @@
      - E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
      + E
      
      @@
      @@
      - PAGE_CACHE_SHIFT
      + PAGE_SHIFT
      
      @@
      @@
      - PAGE_CACHE_SIZE
      + PAGE_SIZE
      
      @@
      @@
      - PAGE_CACHE_MASK
      + PAGE_MASK
      
      @@
      expression E;
      @@
      - PAGE_CACHE_ALIGN(E)
      + PAGE_ALIGN(E)
      
      @@
      expression E;
      @@
      - page_cache_get(E)
      + get_page(E)
      
      @@
      expression E;
      @@
      - page_cache_release(E)
      + put_page(E)
      Signed-off-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      09cbfeaf
    • M
    • M
      2b657a58
    • M
      d7124d69
  4. 04 4月, 2016 4 次提交
  5. 03 4月, 2016 15 次提交