1. 18 Oct, 2016 2 commits
    • Arnd Bergmann's avatar
      ext2: avoid bogus -Wmaybe-uninitialized warning · e952813e
      Arnd Bergmann authored
      On ARM, we get this false-positive warning since the rework of
      the ext2_get_blocks interface:
      
      fs/ext2/inode.c: In function 'ext2_get_block':
      include/linux/buffer_head.h:340:16: error: 'bno' may be used uninitialized in this function [-Werror=maybe-uninitialized]
      
      The calling conventions for this function are rather complex, and it's
      not surprising that the compiler gets this wrong, I spent a long time
      trying to understand how it all fits together myself.
      
      This change to avoid the warning makes sure the compiler sees that we
      always set 'bno' pointer whenever we have a positive return code.
      The transformation is correct because we always arrive at the 'got_it'
      label with a positive count that gets used as the return value, while
      any branch to the 'cleanup' label has a negative or zero 'err'.
      
      Fixes: 6750ad71 ("ext2: stop passing buffer_head to ext2_get_blocks")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Cc: Dave Chinner <david@fromorbit.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      e952813e
    • Jan Kara's avatar
      isofs: Do not return EACCES for unknown filesystems · a2ed0b39
      Jan Kara authored
      When isofs_mount() is called to mount a device read-write, it returns
      EACCES even before it checks that the device actually contains an isofs
      filesystem. This may confuse mount(8) which then tries to mount all
      subsequent filesystem types in read-only mode.
      
      Fix the problem by returning EACCES only once we verify that the device
      indeed contains an iso9660 filesystem.
      
      CC: stable@vger.kernel.org
      Fixes: 17b7f7cfReported-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
      Reported-by: default avatarKarel Zak <kzak@redhat.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      a2ed0b39
  2. 12 Oct, 2016 4 commits
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 1573d2ca
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "Some final updates and fixes for this merge window for the parisc
        architecture. Changes include:
      
         - Fix boot problems with new memblock allocator on rp3410 machine
      
         - Increase initial kernel mapping size for 32- and 64-bit kernels,
           this allows to boot bigger kernels which have many modules built-in
      
         - Fix kernel layout regarding __gp and move exception table into RO
           section
      
         - Show trap names in crashes, use extable.h header instead of
           module.h"
      
      * 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Show trap name in kernel crash
        parisc: Zero-initialize newly alloced memblock
        parisc: Move exception table into read-only section
        parisc: Fix kernel memory layout regarding position of __gp
        parisc: Increase initial kernel mapping size
        parisc: Migrate exception table users off module.h and onto extable.h
      1573d2ca
    • Linus Torvalds's avatar
      Merge branch 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 4cdf8dbe
      Linus Torvalds authored
      Pull uaccess.h prepwork from Al Viro:
       "Preparations to tree-wide switch to use of linux/uaccess.h (which,
        obviously, will allow to start unifying stuff for real). The last step
        there, ie
      
          PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
          sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
                  `git grep -l "$PATT"|grep -v ^include/linux/uaccess.h`
      
        is not taken here - I would prefer to do it once just before or just
        after -rc1.  However, everything should be ready for it"
      
      * 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        remove a stray reference to asm/uaccess.h in docs
        sparc64: separate extable_64.h, switch elf_64.h to it
        score: separate extable.h, switch module.h to it
        mips: separate extable.h, switch module.h to it
        x86: separate extable.h, switch sections.h to it
        remove stray include of asm/uaccess.h from cacheflush.h
        mn10300: remove a bogus processor.h->uaccess.h include
        xtensa: split uaccess.h into C and asm sides
        bonding: quit messing with IOCTL
        kill __kernel_ds_p off
        mn10300: finish verify_area() off
        frv: move HAVE_ARCH_UNMAPPED_AREA to pgtable.h
        exceptions: detritus removal
      4cdf8dbe
    • Linus Torvalds's avatar
      Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux · 6b25e21f
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "Core:
         - Fence destaging work
         - DRIVER_LEGACY to split off legacy drm drivers
         - drm_mm refactoring
         - Splitting drm_crtc.c into chunks and documenting better
         - Display info fixes
         - rbtree support for prime buffer lookup
         - Simple VGA DAC driver
      
        Panel:
         - Add Nexus 7 panel
         - More simple panels
      
        i915:
         - Refactoring GEM naming
         - Refactored vma/active tracking
         - Lockless request lookups
         - Better stolen memory support
         - FBC fixes
         - SKL watermark fixes
         - VGPU improvements
         - dma-buf fencing support
         - Better DP dongle support
      
        amdgpu:
         - Powerplay for Iceland asics
         - Improved GPU reset support
         - UVD/VEC powergating support for CZ/ST
         - Preinitialised VRAM buffer support
         - Virtual display support
         - Initial SI support
         - GTT rework
         - PCI shutdown callback support
         - HPD IRQ storm fixes
      
        amdkfd:
         - bugfixes
      
        tilcdc:
         - Atomic modesetting support
      
        mediatek:
         - AAL + GAMMA engine support
         - Hook up gamma LUT
         - Temporal dithering support
      
        imx:
         - Pixel clock from devicetree
         - drm bridge support for LVDS bridges
         - active plane reconfiguration
         - VDIC deinterlacer support
         - Frame synchronisation unit support
         - Color space conversion support
      
        analogix:
         - PSR support
         - Better panel on/off support
      
        rockchip:
         - rk3399 vop/crtc support
         - PSR support
      
        vc4:
         - Interlaced vblank timing
         - 3D rendering CPU overhead reduction
         - HDMI output fixes
      
        tda998x:
         - HDMI audio ASoC support
      
        sunxi:
         - Allwinner A33 support
         - better TCON support
      
        msm:
         - DT binding cleanups
         - Explicit fence-fd support
      
        sti:
         - remove sti415/416 support
      
        etnaviv:
         - MMUv2 refactoring
         - GC3000 support
      
        exynos:
         - Refactoring HDMI DCC/PHY
         - G2D pm regression fix
         - Page fault issues with wait for vblank
      
        There is no nouveau work in this tree, as Ben didn't get a pull
        request in, and he was fighting moving to atomic and adding mst
        support, so maybe best it waits for a cycle"
      
      * tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux: (1412 commits)
        drm/crtc: constify drm_crtc_index parameter
        drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next
        drm/i915/guc: Unwind GuC workqueue reservation if request construction fails
        drm/i915: Reset the breadcrumbs IRQ more carefully
        drm/i915: Force relocations via cpu if we run out of idle aperture
        drm/i915: Distinguish last emitted request from last submitted request
        drm/i915: Allow DP to work w/o EDID
        drm/i915: Move long hpd handling into the hotplug work
        drm/i915/execlists: Reinitialise context image after GPU hang
        drm/i915: Use correct index for backtracking HUNG semaphores
        drm/i915: Unalias obj->phys_handle and obj->userptr
        drm/i915: Just clear the mmiodebug before a register access
        drm/i915/gen9: only add the planes actually affected by ddb changes
        drm/i915: Allow PCH DPLL sharing regardless of DPLL_SDVO_HIGH_SPEED
        drm/i915/bxt: Fix HDMI DPLL configuration
        drm/i915/gen9: fix the watermark res_blocks value
        drm/i915/gen9: fix plane_blocks_per_line on watermarks calculations
        drm/i915/gen9: minimum scanlines for Y tile is not always 4
        drm/i915/gen9: fix the WaWmMemoryReadLatency implementation
        drm/i915/kbl: KBL also needs to run the SAGV code
        ...
      6b25e21f
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · a379f71a
      Linus Torvalds authored
      Merge more updates from Andrew Morton:
      
       - a few block updates that fell in my lap
      
       - lib/ updates
      
       - checkpatch
      
       - autofs
      
       - ipc
      
       - a ton of misc other things
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
        mm: split gfp_mask and mapping flags into separate fields
        fs: use mapping_set_error instead of opencoded set_bit
        treewide: remove redundant #include <linux/kconfig.h>
        hung_task: allow hung_task_panic when hung_task_warnings is 0
        kthread: add kerneldoc for kthread_create()
        kthread: better support freezable kthread workers
        kthread: allow to modify delayed kthread work
        kthread: allow to cancel kthread work
        kthread: initial support for delayed kthread work
        kthread: detect when a kthread work is used by more workers
        kthread: add kthread_destroy_worker()
        kthread: add kthread_create_worker*()
        kthread: allow to call __kthread_create_on_node() with va_list args
        kthread/smpboot: do not park in kthread_create_on_cpu()
        kthread: kthread worker API cleanup
        kthread: rename probe_kthread_data() to kthread_probe_data()
        scripts/tags.sh: enable code completion in VIM
        mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
        kdump, vmcoreinfo: report memory sections virtual addresses
        ipc/sem.c: add cond_resched in exit_sme
        ...
      a379f71a
  3. 11 Oct, 2016 34 commits