1. 18 Jun, 2018 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · c0d1a7eb
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "common I/O layer
         - Fix bit-fields crossing storage-unit boundaries in css_general_char
      
        dasd driver
         - Avoid a sparse warning in regard to the queue lock
         - Allocate the struct dasd_ccw_req as per request data. Only for
           internal I/O is the structure allocated separately
         - Remove the unused function dasd_kmalloc_set_cda
         - Save a few bytes in struct dasd_ccw_req by reordering fields
         - Convert remaining users of dasd_kmalloc_request to
           dasd_smalloc_request and remove the now unused function
      
        vfio/ccw
         - Refactor and improve pfn_array_alloc_pin/pfn_array_pin
         - Add a new tracepoint for failed vfio/ccw requests
         - Add a CCW translation improvement to accept more requests as valid
         - Bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/dasd: only use preallocated requests
        s390/dasd: reshuffle struct dasd_ccw_req
        s390/dasd: remove dasd_kmalloc_set_cda
        s390/dasd: move dasd_ccw_req to per request data
        s390/dasd: simplify locking in process_final_queue
        s390/cio: sanitize css_general_characteristics definition
        vfio: ccw: add tracepoints for interesting error paths
        vfio: ccw: set ccw->cda to NULL defensively
        vfio: ccw: refactor and improve pfn_array_alloc_pin()
        vfio: ccw: shorten kernel doc description for pfn_array_pin()
        vfio: ccw: push down unsupported IDA check
        vfio: ccw: fix error return in vfio_ccw_sch_event
        s390/archrandom: Rework arch random implementation.
        s390/net: add pnetid support
      c0d1a7eb
    • Andrew Morton's avatar
      revert "mm/memblock: add missing include <linux/bootmem.h>" · 6cc22dc0
      Andrew Morton authored
      The patch fixed a W=1 warning but broke the ia64 build:
      
          CC      mm/memblock.o
        mm/memblock.c:1340: error: redefinition of `memblock_virt_alloc_try_nid_raw'
        ./include/linux/bootmem.h:335: error: previous definition of `memblock_virt_alloc_try_nid_raw' was here
      
      Because inlcude/linux/bootmem.h says
      
      	#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
      
      whereas mm/Makefile says
      
      	obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
      
      So revert 26f09e9b ("mm/memblock: add missing include
      <linux/bootmem.h>") while a full fix can be worked on.
      
      Fixes: 26f09e9b ("mm/memblock: add missing include <linux/bootmem.h>")
      Reported-by: default avatarTony Luck <tony.luck@gmail.com>
      Cc: Mathieu Malaterre <malat@debian.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6cc22dc0
    • Andy Lutomirski's avatar
      MAINTAINERS: Add me as an x86 entry code maintainer · 73c4b15e
      Andy Lutomirski authored
      And update my email address.
      
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      73c4b15e
    • Linus Torvalds's avatar
      Merge tag '4.18-rc1-more-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · 9ffc59d5
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Misc SMB3 fixes, including particularly important ones for signing,
        some minor documentation and debug improvements and another posix
        smb3.11 fix"
      
      * tag '4.18-rc1-more-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: Fix invalid check in __cifs_calc_signature()
        cifs: Use correct packet length in SMB2_TRANSFORM header
        smb3: fix corrupt path in subdirs on smb311 with posix
        smb3: do not display empty interface list
        smb3: Fix mode on mkdir on smb311 mounts
        cifs: Fix kernel oops when traceSMB is enabled
        CIFS: dump every session iface info
        CIFS: parse and store info on iface queries
        CIFS: add iface info to struct cifs_ses
        CIFS: complete PDU definitions for interface queries
        CIFS: move default port definitions to cifsglob.h
        cifs: Fix encryption/signing
        cifs: update __smb_send_rqst() to take an array of requests
        cifs: remove smb2_send_recv()
        cifs: push rfc1002 generation down the stack
        smb3: increase initial number of credits requested to allow write
        cifs: minor documentation updates
        cifs: add lease tracking to the cached root fid
        smb3: note that smb3.11 posix extensions mount option is experimental
      9ffc59d5
    • Linus Torvalds's avatar
      Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · a5696313
      Linus Torvalds authored
      Pull dmi update from Jean Delvare:
       "Expose SKU ID string as a DMI attribute"
      
      * 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        firmware: dmi: Add access to the SKU ID string
      a5696313
    • Randy Dunlap's avatar
      Fix Documentation build due to rename of main.c to mtrr.c · 3ed1d012
      Randy Dunlap authored
      This fixes this documentation build error that is due to a file rename:
      
        Error: Cannot open file ../arch/x86/kernel/cpu/mtrr/main.c
      
      Fixes: 0afe832e ("Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3ed1d012
  2. 17 Jun, 2018 1 commit
  3. 16 Jun, 2018 10 commits
    • Linus Torvalds's avatar
      Linux 4.18-rc1 · ce397d21
      Linus Torvalds authored
      ce397d21
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20180616' of git://git.kernel.dk/linux-block · 265c5596
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A collection of fixes that should go into -rc1. This contains:
      
         - bsg_open vs bsg_unregister race fix (Anatoliy)
      
         - NVMe pull request from Christoph, with fixes for regressions in
           this window, FC connect/reconnect path code unification, and a
           trace point addition.
      
         - timeout fix (Christoph)
      
         - remove a few unused functions (Christoph)
      
         - blk-mq tag_set reinit fix (Roman)"
      
      * tag 'for-linus-20180616' of git://git.kernel.dk/linux-block:
        bsg: fix race of bsg_open and bsg_unregister
        block: remov blk_queue_invalidate_tags
        nvme-fabrics: fix and refine state checks in __nvmf_check_ready
        nvme-fabrics: handle the admin-only case properly in nvmf_check_ready
        nvme-fabrics: refactor queue ready check
        blk-mq: remove blk_mq_tagset_iter
        nvme: remove nvme_reinit_tagset
        nvme-fc: fix nulling of queue data on reconnect
        nvme-fc: remove reinit_request routine
        blk-mq: don't time out requests again that are in the timeout handler
        nvme-fc: change controllers first connect to use reconnect path
        nvme: don't rely on the changed namespace list log
        nvmet: free smart-log buffer after use
        nvme-rdma: fix error flow during mapping request data
        nvme: add bio remapping tracepoint
        nvme: fix NULL pointer dereference in nvme_init_subsystem
        blk-mq: reinit q->tag_set_list entry only after grace period
      265c5596
    • Linus Torvalds's avatar
      Merge tag 'docs-broken-links' of git://linuxtv.org/mchehab/experimental · 5e7b9212
      Linus Torvalds authored
      Pull documentation fixes from Mauro Carvalho Chehab:
       "This solves a series of broken links for files under Documentation,
        and improves a script meant to detect such broken links (see
        scripts/documentation-file-ref-check).
      
        The changes on this series are:
      
         - can.rst: fix a footnote reference;
      
         - crypto_engine.rst: Fix two parsing warnings;
      
         - Fix a lot of broken references to Documentation/*;
      
         - improve the scripts/documentation-file-ref-check script, in order
           to help detecting/fixing broken references, preventing
           false-positives.
      
        After this patch series, only 33 broken references to doc files are
        detected by scripts/documentation-file-ref-check"
      
      * tag 'docs-broken-links' of git://linuxtv.org/mchehab/experimental: (26 commits)
        fix a series of Documentation/ broken file name references
        Documentation: rstFlatTable.py: fix a broken reference
        ABI: sysfs-devices-system-cpu: remove a broken reference
        devicetree: fix a series of wrong file references
        devicetree: fix name of pinctrl-bindings.txt
        devicetree: fix some bindings file names
        MAINTAINERS: fix location of DT npcm files
        MAINTAINERS: fix location of some display DT bindings
        kernel-parameters.txt: fix pointers to sound parameters
        bindings: nvmem/zii: Fix location of nvmem.txt
        docs: Fix more broken references
        scripts/documentation-file-ref-check: check tools/*/Documentation
        scripts/documentation-file-ref-check: get rid of false-positives
        scripts/documentation-file-ref-check: hint: dash or underline
        scripts/documentation-file-ref-check: add a fix logic for DT
        scripts/documentation-file-ref-check: accept more wildcards at filenames
        scripts/documentation-file-ref-check: fix help message
        media: max2175: fix location of driver's companion documentation
        media: v4l: fix broken video4linux docs locations
        media: dvb: point to the location of the old README.dvb-usb file
        ...
      5e7b9212
    • Linus Torvalds's avatar
      Merge tag 'fsnotify_for_v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · dbb2816f
      Linus Torvalds authored
      Pull fsnotify updates from Jan Kara:
       "fsnotify cleanups unifying handling of different watch types.
      
        This is the shortened fsnotify series from Amir with the last five
        patches pulled out. Amir has modified those patches to not change
        struct inode but obviously it's too late for those to go into this
        merge window"
      
      * tag 'fsnotify_for_v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: add fsnotify_add_inode_mark() wrappers
        fanotify: generalize fanotify_should_send_event()
        fsnotify: generalize send_to_group()
        fsnotify: generalize iteration of marks by object type
        fsnotify: introduce marks iteration helpers
        fsnotify: remove redundant arguments to handle_event()
        fsnotify: use type id to identify connector object type
      dbb2816f
    • Linus Torvalds's avatar
      Merge tag 'fbdev-v4.18' of git://github.com/bzolnier/linux · 644f2639
      Linus Torvalds authored
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here, few small fixes, some cleanups and
        dead drivers removal:
      
         - mark omapfb drivers as orphans in MAINTAINERS file (Tomi Valkeinen)
      
         - add missing module license tags to omap/omapfb driver (Arnd
           Bergmann)
      
         - add missing GPIOLIB dependendy to omap2/omapfb driver (Arnd
           Bergmann)
      
         - convert savagefb, aty128fb & radeonfb drivers to use msleep & co.
           (Jia-Ju Bai)
      
         - allow COMPILE_TEST build for viafb driver (media part was reviewed
           by media subsystem Maintainer)
      
         - remove unused MERAM support from sh_mobile_lcdcfb and shmob-drm
           drivers (drm parts were acked by shmob-drm driver Maintainer)
      
         - remove unused auo_k190xfb drivers
      
         - misc cleanups (Souptick Joarder, Wolfram Sang, Markus Elfring, Andy
           Shevchenko, Colin Ian King)"
      
      * tag 'fbdev-v4.18' of git://github.com/bzolnier/linux: (26 commits)
        fb_omap2: add gpiolib dependency
        video/omap: add module license tags
        MAINTAINERS: make omapfb orphan
        video: fbdev: pxafb: match_string() conversion fixup
        video: fbdev: nvidia: fix spelling mistake: "scaleing" -> "scaling"
        video: fbdev: fix spelling mistake: "frambuffer" -> "framebuffer"
        video: fbdev: pxafb: Convert to use match_string() helper
        video: fbdev: via: allow COMPILE_TEST build
        video: fbdev: remove unused sh_mobile_meram driver
        drm: shmobile: remove unused MERAM support
        video: fbdev: sh_mobile_lcdcfb: remove unused MERAM support
        video: fbdev: remove unused auo_k190xfb drivers
        video: omap: Improve a size determination in omapfb_do_probe()
        video: sm501fb: Improve a size determination in sm501fb_probe()
        video: fbdev-MMP: Improve a size determination in path_init()
        video: fbdev-MMP: Delete an error message for a failed memory allocation in two functions
        video: auo_k190x: Delete an error message for a failed memory allocation in auok190x_common_probe()
        video: sh_mobile_lcdcfb: Delete an error message for a failed memory allocation in two functions
        video: sh_mobile_meram: Delete an error message for a failed memory allocation in sh_mobile_meram_probe()
        video: fbdev: sh_mobile_meram: Drop SUPERH platform dependency
        ...
      644f2639
    • Linus Torvalds's avatar
      Merge branch 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 35773c93
      Linus Torvalds authored
      Pull AFS updates from Al Viro:
       "Assorted AFS stuff - ended up in vfs.git since most of that consists
        of David's AFS-related followups to Christoph's procfs series"
      
      * 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        afs: Optimise callback breaking by not repeating volume lookup
        afs: Display manually added cells in dynamic root mount
        afs: Enable IPv6 DNS lookups
        afs: Show all of a server's addresses in /proc/fs/afs/servers
        afs: Handle CONFIG_PROC_FS=n
        proc: Make inline name size calculation automatic
        afs: Implement network namespacing
        afs: Mark afs_net::ws_cell as __rcu and set using rcu functions
        afs: Fix a Sparse warning in xdr_decode_AFSFetchStatus()
        proc: Add a way to make network proc files writable
        afs: Rearrange fs/afs/proc.c to remove remaining predeclarations.
        afs: Rearrange fs/afs/proc.c to move the show routines up
        afs: Rearrange fs/afs/proc.c by moving fops and open functions down
        afs: Move /proc management functions to the end of the file
      35773c93
    • Linus Torvalds's avatar
      Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 29d6849d
      Linus Torvalds authored
      Pull compat updates from Al Viro:
       "Some biarch patches - getting rid of assorted (mis)uses of
        compat_alloc_user_space().
      
        Not much in that area this cycle..."
      
      * 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        orangefs: simplify compat ioctl handling
        signalfd: lift sigmask copyin and size checks to callers of do_signalfd4()
        vmsplice(): lift importing iovec into vmsplice(2) and compat counterpart
      29d6849d
    • Linus Torvalds's avatar
      Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · a5b729ea
      Linus Torvalds authored
      Pull aio fixes from Al Viro:
       "Assorted AIO followups and fixes"
      
      * 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        eventpoll: switch to ->poll_mask
        aio: only return events requested in poll_mask() for IOCB_CMD_POLL
        eventfd: only return events requested in poll_mask()
        aio: mark __aio_sigset::sigmask const
      a5b729ea
    • Paulo Alcantara's avatar
      cifs: Fix invalid check in __cifs_calc_signature() · 83ffdead
      Paulo Alcantara authored
      The following check would never evaluate to true:
        > if (i == 0 && iov[0].iov_len <= 4)
      
      Because 'i' always starts at 1.
      
      This patch fixes it and also move the header checks outside the for loop
      - which makes more sense.
      Signed-off-by: default avatarPaulo Alcantara <palcantara@suse.de>
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
      83ffdead
    • Paulo Alcantara's avatar
      cifs: Use correct packet length in SMB2_TRANSFORM header · 35e2cc1b
      Paulo Alcantara authored
      In smb3_init_transform_rq(), 'orig_len' was only counting the request
      length, but forgot to count any data pages in the request.
      
      Writing or creating files with the 'seal' mount option was broken.
      
      In addition, do some code refactoring by exporting smb2_rqst_len() to
      calculate the appropriate packet size and avoid duplicating the same
      calculation all over the code.
      
      The start of the io vector is either the rfc1002 length (4 bytes) or a
      SMB2 header which is always > 4. Use this fact to check and skip the
      rfc1002 length if requested.
      Signed-off-by: default avatarPaulo Alcantara <palcantara@suse.de>
      Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
      35e2cc1b
  4. 15 Jun, 2018 23 commits