1. 02 Nov, 2018 4 commits
    • Christoph Hellwig's avatar
      arm64: fix warnings without CONFIG_IOMMU_DMA · f6271755
      Christoph Hellwig authored
      __swiotlb_get_sgtable_page and __swiotlb_mmap_pfn are not only misnamed
      but also only used if CONFIG_IOMMU_DMA is set.  Just add a simple ifdef
      for now, given that we plan to remove them entirely for the next merge
      window.
      Reported-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Tested-by: default avatarWill Deacon <will.deacon@arm.com>
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      f6271755
    • Linus Torvalds's avatar
      Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 8adcc599
      Linus Torvalds authored
      Pull misc vfs updates from Al Viro:
       "No common topic, really - a handful of assorted stuff; the least
        trivial bits are Mark's dedupe patches"
      
      * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fs/exofs: only use true/false for asignment of bool type variable
        fs/exofs: fix potential memory leak in mount option parsing
        Delete invalid assignment statements in do_sendfile
        iomap: remove duplicated include from iomap.c
        vfs: dedupe should return EPERM if permission is not granted
        vfs: allow dedupe of user owned read-only files
        ntfs: don't open-code ERR_CAST
        ext4: don't open-code ERR_CAST
      8adcc599
    • Linus Torvalds's avatar
      Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 9931a07d
      Linus Torvalds authored
      Pull AFS updates from Al Viro:
       "AFS series, with some iov_iter bits included"
      
      * 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
        missing bits of "iov_iter: Separate type from direction and use accessor functions"
        afs: Probe multiple fileservers simultaneously
        afs: Fix callback handling
        afs: Eliminate the address pointer from the address list cursor
        afs: Allow dumping of server cursor on operation failure
        afs: Implement YFS support in the fs client
        afs: Expand data structure fields to support YFS
        afs: Get the target vnode in afs_rmdir() and get a callback on it
        afs: Calc callback expiry in op reply delivery
        afs: Fix FS.FetchStatus delivery from updating wrong vnode
        afs: Implement the YFS cache manager service
        afs: Remove callback details from afs_callback_break struct
        afs: Commit the status on a new file/dir/symlink
        afs: Increase to 64-bit volume ID and 96-bit vnode ID for YFS
        afs: Don't invoke the server to read data beyond EOF
        afs: Add a couple of tracepoints to log I/O errors
        afs: Handle EIO from delivery function
        afs: Fix TTL on VL server and address lists
        afs: Implement VL server rotation
        afs: Improve FS server rotation error handling
        ...
      9931a07d
    • Linus Torvalds's avatar
      Merge tag 'compiler-attributes-for-linus-4.20-rc1' of https://github.com/ojeda/linux · e468f5c0
      Linus Torvalds authored
      Pull compiler attribute updates from Miguel Ojeda:
       "This is an effort to disentangle the include/linux/compiler*.h headers
        and bring them up to date.
      
        The main idea behind the series is to use feature checking macros
        (i.e. __has_attribute) instead of compiler version checks (e.g.
        GCC_VERSION), which are compiler-agnostic (so they can be shared,
        reducing the size of compiler-specific headers) and version-agnostic.
      
        Other related improvements have been performed in the headers as well,
        which on top of the use of __has_attribute it has amounted to a
        significant simplification of these headers (e.g. GCC_VERSION is now
        only guarding a few non-attribute macros).
      
        This series should also help the efforts to support compiling the
        kernel with clang and icc. A fair amount of documentation and comments
        have also been added, clarified or removed; and the headers are now
        more readable, which should help kernel developers in general.
      
        The series was triggered due to the move to gcc >= 4.6. In turn, this
        series has also triggered Sparse to gain the ability to recognize
        __has_attribute on its own.
      
        Finally, the __nonstring variable attribute series has been also
        applied on top; plus two related patches from Nick Desaulniers for
        unreachable() that came a bit afterwards"
      
      * tag 'compiler-attributes-for-linus-4.20-rc1' of https://github.com/ojeda/linux:
        compiler-gcc: remove comment about gcc 4.5 from unreachable()
        compiler.h: update definition of unreachable()
        Compiler Attributes: ext4: remove local __nonstring definition
        Compiler Attributes: auxdisplay: panel: use __nonstring
        Compiler Attributes: enable -Wstringop-truncation on W=1 (gcc >= 8)
        Compiler Attributes: add support for __nonstring (gcc >= 8)
        Compiler Attributes: add MAINTAINERS entry
        Compiler Attributes: add Doc/process/programming-language.rst
        Compiler Attributes: remove uses of __attribute__ from compiler.h
        Compiler Attributes: KENTRY used twice the "used" attribute
        Compiler Attributes: use feature checks instead of version checks
        Compiler Attributes: add missing SPDX ID in compiler_types.h
        Compiler Attributes: remove unneeded sparse (__CHECKER__) tests
        Compiler Attributes: homogenize __must_be_array
        Compiler Attributes: remove unneeded tests
        Compiler Attributes: always use the extra-underscores syntax
        Compiler Attributes: remove unused attributes
      e468f5c0
  2. 01 Nov, 2018 23 commits
    • Linus Torvalds's avatar
      Merge branch 'next-keys2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · baa888d2
      Linus Torvalds authored
      Pull keys updates from James Morris:
       "Provide five new operations in the key_type struct that can be used to
        provide access to asymmetric key operations. These will be implemented
        for the asymmetric key type in a later patch and may refer to a key
        retained in RAM by the kernel or a key retained in crypto hardware.
      
           int (*asym_query)(const struct kernel_pkey_params *params,
                             struct kernel_pkey_query *info);
           int (*asym_eds_op)(struct kernel_pkey_params *params,
                              const void *in, void *out);
           int (*asym_verify_signature)(struct kernel_pkey_params *params,
                                        const void *in, const void *in2);
      
        Since encrypt, decrypt and sign are identical in their interfaces,
        they're rolled together in the asym_eds_op() operation and there's an
        operation ID in the params argument to distinguish them.
      
        Verify is different in that we supply the data and the signature
        instead and get an error value (or 0) as the only result on the
        expectation that this may well be how a hardware crypto device may
        work"
      
      * 'next-keys2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (22 commits)
        KEYS: asym_tpm: Add support for the sign operation [ver #2]
        KEYS: asym_tpm: Implement tpm_sign [ver #2]
        KEYS: asym_tpm: Implement signature verification [ver #2]
        KEYS: asym_tpm: Implement the decrypt operation [ver #2]
        KEYS: asym_tpm: Implement tpm_unbind [ver #2]
        KEYS: asym_tpm: Add loadkey2 and flushspecific [ver #2]
        KEYS: Move trusted.h to include/keys [ver #2]
        KEYS: trusted: Expose common functionality [ver #2]
        KEYS: asym_tpm: Implement encryption operation [ver #2]
        KEYS: asym_tpm: Implement pkey_query [ver #2]
        KEYS: Add parser for TPM-based keys [ver #2]
        KEYS: asym_tpm: extract key size & public key [ver #2]
        KEYS: asym_tpm: add skeleton for asym_tpm [ver #2]
        crypto: rsa-pkcs1pad: Allow hash to be optional [ver #2]
        KEYS: Implement PKCS#8 RSA Private Key parser [ver #2]
        KEYS: Implement encrypt, decrypt and sign for software asymmetric key [ver #2]
        KEYS: Allow the public_key struct to hold a private key [ver #2]
        KEYS: Provide software public key query function [ver #2]
        KEYS: Make the X.509 and PKCS7 parsers supply the sig encoding type [ver #2]
        KEYS: Provide missing asymmetric key subops for new key type ops [ver #2]
        ...
      baa888d2
    • Al Viro's avatar
      missing bits of "iov_iter: Separate type from direction and use accessor functions" · 0e9b4a82
      Al Viro authored
      sunrpc patches from nfs tree conflict with calling conventions change done
      in iov_iter work.  Trivial fixup...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      0e9b4a82
    • Al Viro's avatar
      Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 78a63f12
      Al Viro authored
      backmerge to do fixup of iov_iter_kvec() conflict
      78a63f12
    • Linus Torvalds's avatar
      Merge tag 'ovl-update-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 7260935d
      Linus Torvalds authored
      Pull overlayfs updates from Miklos Szeredi:
       "A mix of fixes and cleanups"
      
      * tag 'ovl-update-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: automatically enable redirect_dir on metacopy=on
        ovl: check whiteout in ovl_create_over_whiteout()
        ovl: using posix_acl_xattr_size() to get size instead of posix_acl_to_xattr()
        ovl: abstract ovl_inode lock with a helper
        ovl: remove the 'locked' argument of ovl_nlink_{start,end}
        ovl: relax requirement for non null uuid of lower fs
        ovl: fold copy-up helpers into callers
        ovl: untangle copy up call chain
        ovl: relax permission checking on underlying layers
        ovl: fix recursive oi->lock in ovl_link()
        vfs: fix FIGETBSZ ioctl on an overlayfs file
        ovl: clean up error handling in ovl_get_tmpfile()
        ovl: fix error handling in ovl_verify_set_fh()
      7260935d
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 34c7685a
      Linus Torvalds authored
      Pull Devicetree fixes from Rob Herring:
      
       - fix cpu node iterator for powerpc systems
      
       - clarify ARM CPU binding 'capacities-dmips-mhz' property calculations
      
      * tag 'devicetree-fixes-for-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        of: Fix cpu node iterator to not ignore disabled cpu nodes
        dt-bindings: arm: Explain capacities-dmips-mhz calculations in example
      34c7685a
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · b5b1de35
      Linus Torvalds authored
      Pull virtio/vhost updates from Michael Tsirkin:
       "Fixes and tweaks:
      
         - virtio balloon page hinting support
      
         - vhost scsi control queue
      
         - misc fixes"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        MAINTAINERS: remove reference to bogus vsock file
        vhost/scsi: Use common handling code in request queue handler
        vhost/scsi: Extract common handling code from control queue handler
        vhost/scsi: Respond to control queue operations
        vhost/scsi: truncate T10 PI iov_iter to prot_bytes
        virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON
        mm/page_poison: expose page_poisoning_enabled to kernel modules
        virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT
        kvm_config: add CONFIG_VIRTIO_MENU
      b5b1de35
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa · 90de1fb8
      Linus Torvalds authored
      Pull Xtensa fixes and cleanups from Max Filippov:
      
       - use ZONE_NORMAL instead of ZONE_DMA
      
       - fix Image.elf build error caused by assignment of incorrect address
         to the .note.Linux section
      
       - clean up debug and property sections in the vmlinux.lds.S
      
      * tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa:
        xtensa: clean up xtensa-specific property sections
        xtensa: use DWARF_DEBUG in the vmlinux.lds.S
        xtensa: add NOTES section to the linker script
        xtensa: remove ZONE_DMA
      90de1fb8
    • Rob Herring's avatar
      of: Fix cpu node iterator to not ignore disabled cpu nodes · c961cb3b
      Rob Herring authored
      In most cases, nodes with 'status = "disabled";' are treated as if the
      node is not present though it is a common bug to forget to check that.
      However, cpu nodes are different in that "disabled" simply means offline
      and the OS can bring the CPU core online. Commit f1f207e4 ("of: Add
      cpu node iterator for_each_of_cpu_node()") followed the common behavior
      of ignoring disabled cpu nodes. This breaks some powerpc systems (at
      least NXP P50XX/e5500). Fix this by dropping the status check.
      
      Fixes: 651d44f9 ("of: use for_each_of_cpu_node iterator")
      Fixes: f1f207e4 ("of: Add cpu node iterator for_each_of_cpu_node()")
      Reported-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
      Tested-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      Cc: Frank Rowand <frowand.list@gmail.com>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      c961cb3b
    • Miklos Szeredi's avatar
      ovl: automatically enable redirect_dir on metacopy=on · d47748e5
      Miklos Szeredi authored
      Current behavior is to automatically disable metacopy if redirect_dir is
      not enabled and proceed with the mount.
      
      If "metacopy=on" mount option was given, then this behavior can confuse the
      user: no mount failure, yet metacopy is disabled.
      
      This patch makes metacopy=on imply redirect_dir=on.
      
      The converse is also true: turning off full redirect with redirect_dir=
      {off|follow|nofollow} will disable metacopy.
      
      If both metacopy=on and redirect_dir={off|follow|nofollow} is specified,
      then mount will fail, since there's no way to correctly resolve the
      conflict.
      Reported-by: default avatarDaniel Walsh <dwalsh@redhat.com>
      Fixes: d5791044 ("ovl: Provide a mount option metacopy=on/off...")
      Cc: <stable@vger.kernel.org> # v4.19
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
      d47748e5
    • Linus Torvalds's avatar
      Merge tag 'stackleak-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 2d6bb6ad
      Linus Torvalds authored
      Pull stackleak gcc plugin from Kees Cook:
       "Please pull this new GCC plugin, stackleak, for v4.20-rc1. This plugin
        was ported from grsecurity by Alexander Popov. It provides efficient
        stack content poisoning at syscall exit. This creates a defense
        against at least two classes of flaws:
      
         - Uninitialized stack usage. (We continue to work on improving the
           compiler to do this in other ways: e.g. unconditional zero init was
           proposed to GCC and Clang, and more plugin work has started too).
      
         - Stack content exposure. By greatly reducing the lifetime of valid
           stack contents, exposures via either direct read bugs or unknown
           cache side-channels become much more difficult to exploit. This
           complements the existing buddy and heap poisoning options, but
           provides the coverage for stacks.
      
        The x86 hooks are included in this series (which have been reviewed by
        Ingo, Dave Hansen, and Thomas Gleixner). The arm64 hooks have already
        been merged through the arm64 tree (written by Laura Abbott and
        reviewed by Mark Rutland and Will Deacon).
      
        With VLAs having been removed this release, there is no need for
        alloca() protection, so it has been removed from the plugin"
      
      * tag 'stackleak-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        arm64: Drop unneeded stackleak_check_alloca()
        stackleak: Allow runtime disabling of kernel stack erasing
        doc: self-protection: Add information about STACKLEAK feature
        fs/proc: Show STACKLEAK metrics in the /proc file system
        lkdtm: Add a test for STACKLEAK
        gcc-plugins: Add STACKLEAK plugin for tracking the kernel stack
        x86/entry: Add STACKLEAK erasing the kernel stack at the end of syscalls
      2d6bb6ad
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 7c6c54b5
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "I2C has a core bugfix & cleanup as well as an ID addition and
        MAINTAINERS update for you"
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        MAINTAINERS: add maintainer for IMX LPI2C driver
        dt-bindings: i2c: i2c-imx-lpi2c: add imx8qxp compatible string
        i2c: Clear client->irq in i2c_device_remove
        i2c: Remove unnecessary call to irq_find_mapping
      7c6c54b5
    • Linus Torvalds's avatar
      Merge branch 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu · 6444ccfd
      Linus Torvalds authored
      Pull percpu fixes from Dennis Zhou:
       "Two small things for v4.20.
      
        The first fixes a clang uninitialized variable warning for arm64 in
        the default path calls BUILD_BUG(). The second removes an unnecessary
        unlikely() in a WARN_ON() use"
      
      * 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
        arm64: percpu: Initialize ret in the default case
        mm: percpu: remove unnecessary unlikely()
      6444ccfd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 82aa4671
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) BPF verifier fixes from Daniel Borkmann.
      
       2) HNS driver fixes from Huazhong Tan.
      
       3) FDB only works for ethernet devices, reject attempts to install FDB
          rules for others. From Ido Schimmel.
      
       4) Fix spectre V1 in vhost, from Jason Wang.
      
       5) Don't pass on-stack object to irq_set_affinity_hint() in mvpp2
          driver, from Marc Zyngier.
      
       6) Fix mlx5e checksum handling when RXFCS is enabled, from Eric
          Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (49 commits)
        openvswitch: Fix push/pop ethernet validation
        net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules
        bpf: test make sure to run unpriv test cases in test_verifier
        bpf: add various test cases to test_verifier
        bpf: don't set id on after map lookup with ptr_to_map_val return
        bpf: fix partial copy of map_ptr when dst is scalar
        libbpf: Fix compile error in libbpf_attach_type_by_name
        kselftests/bpf: use ping6 as the default ipv6 ping binary if it exists
        selftests: mlxsw: qos_mc_aware: Add a test for UC awareness
        selftests: mlxsw: qos_mc_aware: Tweak for min shaper
        mlxsw: spectrum: Set minimum shaper on MC TCs
        mlxsw: reg: QEEC: Add minimum shaper fields
        net: hns3: bugfix for rtnl_lock's range in the hclgevf_reset()
        net: hns3: bugfix for rtnl_lock's range in the hclge_reset()
        net: hns3: bugfix for handling mailbox while the command queue reinitialized
        net: hns3: fix incorrect return value/type of some functions
        net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read
        net: hns3: bugfix for is_valid_csq_clean_head()
        net: hns3: remove unnecessary queue reset in the hns3_uninit_all_ring()
        net: hns3: bugfix for the initialization of command queue's spin lock
        ...
      82aa4671
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · ffb845db
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Two small fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Wire up compat getpeername and getsockname.
        sparc64: Remvoe set_fs() from perf_callchain_user().
      ffb845db
    • Linus Torvalds's avatar
      Merge tag 'csky-for-linus-4.20-fixup-dtb' of https://github.com/c-sky/csky-linux · 5c99a8d1
      Linus Torvalds authored
      Pull csky dtb fixups from Guo Ren:
       "These fix the csky dtb Kbuild to follow the new Devicetree dtb build
        rules"
      
      * tag 'csky-for-linus-4.20-fixup-dtb' of https://github.com/c-sky/csky-linux:
        csky: use common dtb build rules
        csky: remove builtin-dtb Kbuild
      5c99a8d1
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86 · eb7046e9
      Linus Torvalds authored
      Pull x86 platform driver updates from Darren Hart:
      
       - Move the Dell dcdbas and dell_rbu drivers into platform/drivers/x86
         as they are closely coupled with other drivers in this location.
      
       - Improve _init* usage for acerhdf and fix some usage issues with
         messages and module parameters.
      
       - Simplify asus-wmi by calling ACPI/WMI methods directly, eliminating
         workqueue overhead, eliminate double reporting of keyboard backlight.
      
       - Fix wake from USB failure on Bay Trail devices (intel_int0002_vgpio).
      
       - Notify intel_telemetry users when IPC1 device is not enabled.
      
       - Update various drivers with new laptop model IDs.
      
       - Update several intel drivers to use SPDX identifers and order headers
         alphabetically.
      
      * tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86: (64 commits)
        HID: asus: only support backlight when it's not driven by WMI
        platform/x86: asus-wmi: export function for evaluating WMI methods
        platform/x86: asus-wmi: Only notify kbd LED hw_change by fn-key pressed
        platform/x86: wmi: declare device_type structure as constant
        platform/x86: ideapad: Add Y530-15ICH to no_hw_rfkill
        platform/x86: Add Intel AtomISP2 dummy / power-management driver
        platform/x86: touchscreen_dmi: Add min-x and min-y settings for various models
        platform/x86: touchscreen_dmi: Add info for the Onda V80 Plus v3 tablet
        platform/x86: touchscreen_dmi: Add info for the Trekstor Primetab T13B tablet
        platform/x86: intel_telemetry: Get rid of custom macro
        platform/x86: intel_telemetry: report debugfs failure
        MAINTAINERS: intel_telemetry: Update maintainers info
        platform/x86: Add LG Gram laptop special features driver
        platform/x86: asus-wmi: Simplify the keyboard brightness updating process
        platform/x86: touchscreen_dmi: Add info for the Trekstor Primebook C11 convertible
        platform/x86: mlx-platform: Properly use mlxplat_mlxcpld_msn201x_items
        MAINTAINERS: intel_pmc_core: Update MAINTAINERS
        firmware: dcdbas: include linux/io.h
        platform/x86: intel-wmi-thunderbolt: Add dynamic debugging
        platform/x86: intel-wmi-thunderbolt: Convert to use SPDX identifier
        ...
      eb7046e9
    • Guo Ren's avatar
      csky: use common dtb build rules · e8d0c9a7
      Guo Ren authored
      Remove the Kbuild rules in arch/csky and use common dtb build rules.
      
      This modification is based on:
      
      commit 37c8a5fa ("kbuild: consolidate Devicetree dtb build rules")
      Signed-off-by: default avatarGuo Ren <ren_guo@c-sky.com>
      Reviewed-by: default avatarRob Herring <robh@kernel.org>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      e8d0c9a7
    • Guo Ren's avatar
      csky: remove builtin-dtb Kbuild · c4c14c3b
      Guo Ren authored
      Remove the builtin-dtb implementation in arch/csky.
      Signed-off-by: default avatarGuo Ren <ren_guo@c-sky.com>
      Reviewed-by: default avatarRob Herring <robh@kernel.org>
      Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
      c4c14c3b
    • Jaime Caamaño Ruiz's avatar
      openvswitch: Fix push/pop ethernet validation · 46ebe283
      Jaime Caamaño Ruiz authored
      When there are both pop and push ethernet header actions among the
      actions to be applied to a packet, an unexpected EINVAL (Invalid
      argument) error is obtained. This is due to mac_proto not being reset
      correctly when those actions are validated.
      
      Reported-at:
      https://mail.openvswitch.org/pipermail/ovs-discuss/2018-October/047554.html
      Fixes: 91820da6 ("openvswitch: add Ethernet push and pop actions")
      Signed-off-by: default avatarJaime Caamaño Ruiz <jcaamano@suse.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Reviewed-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      46ebe283
    • Niklas Cassel's avatar
      net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules · 30549aab
      Niklas Cassel authored
      When building stmmac, it is only possible to select CONFIG_DWMAC_GENERIC,
      or any of the glue drivers, when CONFIG_STMMAC_PLATFORM is set.
      The only exception is CONFIG_STMMAC_PCI.
      
      When calling of_mdiobus_register(), it will call our ->reset()
      callback, which is set to stmmac_mdio_reset().
      
      Most of the code in stmmac_mdio_reset() is protected by a
      "#if defined(CONFIG_STMMAC_PLATFORM)", which will evaluate
      to false when CONFIG_STMMAC_PLATFORM=m.
      
      Because of this, the phy reset gpio will only be pulled when
      stmmac is built as built-in, but not when built as modules.
      
      Fix this by using "#if IS_ENABLED()" instead of "#if defined()".
      Signed-off-by: default avatarNiklas Cassel <niklas.cassel@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      30549aab
    • David S. Miller's avatar
      sparc64: Wire up compat getpeername and getsockname. · 1f2b5b8e
      David S. Miller authored
      Fixes: 8b30ca73 ("sparc: Add all necessary direct socket system calls.")
      Reported-by: default avatarJoseph Myers  <joseph@codesourcery.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1f2b5b8e
    • David S. Miller's avatar
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue · 4d3163cf
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2018-10-31
      
      This series contains a various collection of fixes.
      
      Miroslav Lichvar from Red Hat or should I say IBM now?  Updates the PHC
      timecounter interval for igb so that it gets updated at least once
      every 550 seconds.
      
      Ngai-Mint provides a fix for fm10k to prevent a soft lockup or system
      crash by adding a new condition to determine if the SM mailbox is in the
      correct state before proceeding.
      
      Jake provides several fm10k fixes, first one marks complier aborts as
      non-fatal since on some platforms trigger machine check errors when the
      compile aborts.  Added missing device ids to the in-kernel driver.  Due
      to the recent fixes, bumped the driver version.
      
      I (Jeff Kirsher) fixed a XFRM_ALGO dependency for both ixgbe and
      ixgbevf.  This fix was based on the original work from Arnd Bergmann,
      which only fixed ixgbe.
      
      Mitch provides a fix for i40e/avf to update the status codes, which
      resolves an issue between a mis-match between i40e and the iavf driver,
      which also supports the ice LAN driver.
      
      Radoslaw fixes the ixgbe where the driver is logging a message about
      spoofed packets detected when the VF is re-started with a different MAC
      address.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4d3163cf
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf · df975da4
      David S. Miller authored
      Daniel Borkmann says:
      
      ====================
      pull-request: bpf 2018-11-01
      
      The following pull-request contains BPF updates for your *net* tree.
      
      The main changes are:
      
      1) Fix tcp_bpf_recvmsg() to return -EAGAIN instead of 0 in non-blocking
         case when no data is available yet, from John.
      
      2) Fix a compilation error in libbpf_attach_type_by_name() when compiled
         with clang 3.8, from Andrey.
      
      3) Fix a partial copy of map pointer on scalar alu and remove id
         generation for RET_PTR_TO_MAP_VALUE return types, from Daniel.
      
      4) Add unlimited memlock limit for kernel selftest's flow_dissector_load
         program, from Yonghong.
      
      5) Fix ping for some BPF shell based kselftests where distro does not
         ship "ping -6" anymore, from Li.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      df975da4
  3. 31 Oct, 2018 13 commits