1. 06 Feb, 2019 2 commits
  2. 25 Jan, 2019 16 commits
    • Arnd Bergmann's avatar
      alpha: add generic get{eg,eu,g,p,u,pp}id() syscalls · ecf7e0a4
      Arnd Bergmann authored
      Alpha has traditionally followed the OSF1 calling conventions
      here, with its getxpid, getxuid, getxgid system calls returning
      two different values in separate registers.
      
      Following what glibc has done here, we can define getpid,
      getuid and getgid to be aliases for getxpid, getxuid and getxgid
      respectively, and add new system call numbers for getppid, geteuid
      and getegid.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ecf7e0a4
    • Arnd Bergmann's avatar
      alpha: add standard statfs64/fstatfs64 syscalls · 6691f16a
      Arnd Bergmann authored
      As Joseph Myers points out, alpha has never had a standard statfs64
      interface and instead returns only 32-bit numbers here.
      
      While there is an old osf_statfs64 system call that returns additional
      data, this has some other quirks and does not get used in glibc.
      
      I considered making the stat64 structure layout compatible with
      with the one used by the kernel on most other 64 bit architecture that
      implement it (ia64, parisc, powerpc, and sparc), but in the end
      decided to stay with the one that was traditionally defined in
      the alpha headers but not used, since this is also what glibc
      exposes to user space.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      6691f16a
    • Arnd Bergmann's avatar
      arch: add pkey and rseq syscall numbers everywhere · b41c51c8
      Arnd Bergmann authored
      Most architectures define system call numbers for the rseq and pkey system
      calls, even when they don't support the features, and perhaps never will.
      
      Only a few architectures are missing these, so just define them anyway
      for consistency. If we decide to add them later to one of these, the
      system call numbers won't get out of sync then.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      b41c51c8
    • Arnd Bergmann's avatar
      arch: add split IPC system calls where needed · 0d6040d4
      Arnd Bergmann authored
      The IPC system call handling is highly inconsistent across architectures,
      some use sys_ipc, some use separate calls, and some use both.  We also
      have some architectures that require passing IPC_64 in the flags, and
      others that set it implicitly.
      
      For the addition of a y2038 safe semtimedop() system call, I chose to only
      support the separate entry points, but that requires first supporting
      the regular ones with their own syscall numbers.
      
      The IPC_64 is now implied by the new semctl/shmctl/msgctl system
      calls even on the architectures that require passing it with the ipc()
      multiplexer.
      
      I'm not adding the new semtimedop() or semop() on 32-bit architectures,
      those will get implemented using the new semtimedop_time64() version
      that gets added along with the other time64 calls.
      Three 64-bit architectures (powerpc, s390 and sparc) get semtimedop().
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      0d6040d4
    • Arnd Bergmann's avatar
      ipc: rename old-style shmctl/semctl/msgctl syscalls · 275f2214
      Arnd Bergmann authored
      The behavior of these system calls is slightly different between
      architectures, as determined by the CONFIG_ARCH_WANT_IPC_PARSE_VERSION
      symbol. Most architectures that implement the split IPC syscalls don't set
      that symbol and only get the modern version, but alpha, arm, microblaze,
      mips-n32, mips-n64 and xtensa expect the caller to pass the IPC_64 flag.
      
      For the architectures that so far only implement sys_ipc(), i.e. m68k,
      mips-o32, powerpc, s390, sh, sparc, and x86-32, we want the new behavior
      when adding the split syscalls, so we need to distinguish between the
      two groups of architectures.
      
      The method I picked for this distinction is to have a separate system call
      entry point: sys_old_*ctl() now uses ipc_parse_version, while sys_*ctl()
      does not. The system call tables of the five architectures are changed
      accordingly.
      
      As an additional benefit, we no longer need the configuration specific
      definition for ipc_parse_version(), it always does the same thing now,
      but simply won't get called on architectures with the modern interface.
      
      A small downside is that on architectures that do set
      ARCH_WANT_IPC_PARSE_VERSION, we now have an extra set of entry points
      that are never called. They only add a few bytes of bloat, so it seems
      better to keep them compared to adding yet another Kconfig symbol.
      I considered adding new syscall numbers for the IPC_64 variants for
      consistency, but decided against that for now.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      275f2214
    • Arnd Bergmann's avatar
      sparc64: fix sparc_ipc type conversion · 73a66023
      Arnd Bergmann authored
      __kernel_timespec and timespec are currently the same type, but once
      they are different, the type cast has to be changed here.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      73a66023
    • Arnd Bergmann's avatar
      sh: add statx system call · d25a122a
      Arnd Bergmann authored
      statx is available on almost all other architectures but
      got missed on sh, so add it now.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      d25a122a
    • Arnd Bergmann's avatar
      sh: remove duplicate unistd_32.h file · 83f60913
      Arnd Bergmann authored
      When I merged this patch, the file was accidentally left intact
      instead of being removed, which means any changes to syscall.tbl
      have no effect.
      
      Fixes: 2b3c5a99 ("sh: generate uapi header and syscall table header files")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      83f60913
    • Arnd Bergmann's avatar
      m68k: assign syscall number for seccomp · 09ac1260
      Arnd Bergmann authored
      Most architectures have assigned a numbers for the seccomp syscall
      even when they do not implement it.
      
      m68k is an exception here, so for consistency lets add the number.
      Unless CONFIG_SECCOMP is implemented, the system call just
      returns -ENOSYS.
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      09ac1260
    • Arnd Bergmann's avatar
      ARM: add kexec_file_load system call number · 4ab65ba7
      Arnd Bergmann authored
      A couple of architectures including arm64 already implement the
      kexec_file_load system call, on many others we have assigned a system
      call number for it, but not implemented it yet.
      
      Adding the number in arch/arm/ lets us use the system call on arm64
      systems in compat mode, and also reduces the number of differences
      between architectures. If we want to implement kexec_file_load on ARM
      in the future, the number assignment means that kexec tools can already
      be built with the now current set of kernel headers.
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      4ab65ba7
    • Arnd Bergmann's avatar
      ARM: add migrate_pages() system call · 78594b95
      Arnd Bergmann authored
      The migrate_pages system call has an assigned number on all architectures
      except ARM. When it got added initially in commit d80ade7b ("ARM:
      Fix warning: #warning syscall migrate_pages not implemented"), it was
      intentionally left out based on the observation that there are no 32-bit
      ARM NUMA systems.
      
      However, there are now arm64 NUMA machines that can in theory run 32-bit
      kernels (actually enabling NUMA there would require additional work)
      as well as 32-bit user space on 64-bit kernels, so that argument is no
      longer very strong.
      
      Assigning the number lets us use the system call on 64-bit kernels as well
      as providing a more consistent set of syscalls across architectures.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      78594b95
    • Arnd Bergmann's avatar
      alpha: update syscall macro definitions · 12b57c5c
      Arnd Bergmann authored
      Other architectures commonly use __NR_umount2 for sys_umount,
      only ia64 and alpha use __NR_umount here. In order to synchronize
      the generated tables, use umount2 like everyone else, and add back
      the old name from asm/unistd.h for compatibility.
      
      For shmat, alpha uses the osf_shmat name, we can do the same thing
      here, which means we don't have to add an entry in the __IGNORE
      list now that shmat is mandatory everywhere
      
      alarm, creat, pause, time, and utime are optional everywhere
      these days, no need to list them here any more.
      
      I considered also adding the regular versions of the get*id system
      calls that have different names and calling conventions on alpha,
      which would further help unify the syscall ABI, but for now
      I decided against that.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      12b57c5c
    • Arnd Bergmann's avatar
      alpha: wire up io_pgetevents system call · d012d132
      Arnd Bergmann authored
      The io_pgetevents system call was added in linux-4.18 but has
      no entry for alpha:
      
      warning: #warning syscall io_pgetevents not implemented [-Wcpp]
      
      Assign a the next system call number here.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      d012d132
    • Arnd Bergmann's avatar
      ia64: assign syscall numbers for perf and seccomp · acce2f71
      Arnd Bergmann authored
      Most architectures have assigned numbers for both seccomp and
      perf_event_open, even when they do not implement either.
      
      ia64 is an exception here, so for consistency lets add numbers for both
      of them. Unless CONFIG_PERF_EVENTS and CONFIG_SECCOMP are implemented,
      the system calls just return -ENOSYS.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      acce2f71
    • Arnd Bergmann's avatar
      ia64: add statx and io_pgetevents syscalls · 7349ee3a
      Arnd Bergmann authored
      All architectures should implement these two, so assign numbers
      and hook them up on ia64.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      7349ee3a
    • Arnd Bergmann's avatar
      ia64: add __NR_umount2 definition · 74cd2184
      Arnd Bergmann authored
      Other architectures commonly use __NR_umount2 for sys_umount,
      only ia64 and alpha use __NR_umount here. In order to synchronize
      the generated tables, use umount2 like everyone else, and add back
      the old name from asm/unistd.h for compatibility.
      
      The __IGNORE_* lines are now all obsolete and can be removed as
      a side-effect.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      74cd2184
  3. 18 Jan, 2019 5 commits
  4. 13 Jan, 2019 17 commits
    • Linus Torvalds's avatar
      Linux 5.0-rc2 · 1c7fc5cb
      Linus Torvalds authored
      1c7fc5cb
    • Jonathan Neuschäfer's avatar
      kernel/sys.c: Clarify that UNAME26 does not generate unique versions anymore · b7285b42
      Jonathan Neuschäfer authored
      UNAME26 is a mechanism to report Linux's version as 2.6.x, for
      compatibility with old/broken software.  Due to the way it is
      implemented, it would have to be updated after 5.0, to keep the
      resulting versions unique.  Linus Torvalds argued:
      
       "Do we actually need this?
      
        I'd rather let it bitrot, and just let it return random versions. It
        will just start again at 2.4.60, won't it?
      
        Anybody who uses UNAME26 for a 5.x kernel might as well think it's
        still 4.x. The user space is so old that it can't possibly care about
        differences between 4.x and 5.x, can it?
      
        The only thing that matters is that it shows "2.4.<largeenough>",
        which it will do regardless"
      Signed-off-by: default avatarJonathan Neuschäfer <j.neuschaefer@gmx.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b7285b42
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dbc3c09b
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A bigger batch than I anticipated this week, for two reasons:
      
         - Some fallout on Davinci from board file -> DTB conversion, that
           also includes a few longer-standing fixes (i.e. not recent
           regressions).
      
         - drivers/reset material that has been in linux-next for a while, but
           didn't get sent to us until now for a variety of reasons
           (maintainer out sick, holidays, etc). There's a functional
           dependency in there such that one platform (Altera's SoCFPGA) won't
           boot without one of the patches; instead of reverting the patch
           that got merged, I looked at this set and decided it was small
           enough that I'll pick it up anyway. If you disagree I can revisit
           with a smaller set.
      
        That being said, there's also a handful of the usual stuff:
      
         - Fix for a crash on Armada 7K/8K when the kernel touches
           PSCI-reserved memory
      
         - Fix for PCIe reset on Macchiatobin (Armada 8K development board,
           what this email is sent from in fact :)
      
         - Enable a few new-merged modules for Amlogic in arm64 defconfig
      
         - Error path fixes on Integrator
      
         - Build fix for Renesas and Qualcomm
      
         - Initialization fix for Renesas RZ/G2E
      
        .. plus a few more fixlets"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
        ARM: integrator: impd1: use struct_size() in devm_kzalloc()
        qcom-scm: Include <linux/err.h> header
        gpio: pl061: handle failed allocations
        ARM: dts: kirkwood: Fix polarity of GPIO fan lines
        arm64: dts: marvell: mcbin: fix PCIe reset signal
        arm64: dts: marvell: armada-ap806: reserve PSCI area
        ARM: dts: da850-lcdk: Correct the sound card name
        ARM: dts: da850-lcdk: Correct the audio codec regulators
        ARM: dts: da850-evm: Correct the sound card name
        ARM: dts: da850-evm: Correct the audio codec regulators
        ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries
        ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
        ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
        ARM: davinci: da850-evm: fix label names in GPIO lookup entries
        ARM: davinci: da830-evm: fix label names in GPIO lookup entries
        arm64: defconfig: enable modules for amlogic s400 sound card
        reset: uniphier-glue: Add AHCI reset control support in glue layer
        dt-bindings: reset: uniphier: Add AHCI core reset description
        reset: uniphier-usb3: Rename to reset-uniphier-glue
        dt-bindings: reset: uniphier: Replace the expression of USB3 with generic peripherals
        ...
      dbc3c09b
    • Linus Torvalds's avatar
      Merge tag 'for-5.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 6b529fb0
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
      
       - two regression fixes in clone/dedupe ioctls, the generic check
         callback needs to lock extents properly and wait for io to avoid
         problems with writeback and relocation
      
       - fix deadlock when using free space tree due to block group creation
      
       - a recently added check refuses a valid fileystem with seeding device,
         make that work again with a quickfix, proper solution needs more
         intrusive changes
      
      * tag 'for-5.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: Use real device structure to verify dev extent
        Btrfs: fix deadlock when using free space tree due to block group creation
        Btrfs: fix race between reflink/dedupe and relocation
        Btrfs: fix race between cloning range ending at eof and writeback
      6b529fb0
    • Linus Torvalds's avatar
      Merge tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 72d657dd
      Linus Torvalds authored
      Pull driver core fixes from Greg KH:
       "Here is one small sysfs change, and a documentation update for 5.0-rc2
      
        The sysfs change moves from using BUG_ON to WARN_ON, as discussed in
        an email thread on lkml while trying to track down another driver bug.
        sysfs should not be crashing and preventing people from seeing where
        they went wrong. Now it properly recovers and warns the developer.
      
        The documentation update removes the use of BUS_ATTR() as the kernel
        is moving away from this to use the specific BUS_ATTR_RW() and friends
        instead. There are pending patches in all of the different subsystems
        to remove the last users of this macro, but for now, don't advertise
        it should be used anymore to keep new ones from being introduced.
      
        Both have been in linux-next with no reported issues"
      
      * tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        Documentation: driver core: remove use of BUS_ATTR
        sysfs: convert BUG_ON to WARN_ON
      72d657dd
    • Linus Torvalds's avatar
      Merge tag 'staging-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · f7c1038b
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are some small staging driver fixes for some reported issues.
      
        One reverts a patch that was made to the rtl8723bs driver that turned
        out to not be needed at all as it was a bug in clang. The others fix
        up some reported issues in the rtl8188eu driver and update the
        MAINTAINERS file to point to Larry for this driver so he can get the
        bug reports easier.
      
        All have been in linux-next with no reported issues"
      
      * tag 'staging-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        Revert "staging: rtl8723bs: Mark ACPI table declaration as used"
        staging: rtl8188eu: Fix module loading from tasklet for WEP encryption
        staging: rtl8188eu: Fix module loading from tasklet for CCMP encryption
        MAINTAINERS: Add entry for staging driver r8188eu
      f7c1038b
    • Linus Torvalds's avatar
      Merge tag 'tty-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 437e878a
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are 2 tty and serial fixes for 5.0-rc2 that resolve some reported
        issues.
      
        The first is a simple serial driver fix for a regression that showed
        up in 5.0-rc1. The second one resolves a number of reported issues
        with the recent tty locking fixes that went into 5.0-rc1. Lots of
        people have tested the second one and say it resolves their issues.
      
        Both have been in linux-next with no reported issues"
      
      * tag 'tty-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: Don't hold ldisc lock in tty_reopen() if ldisc present
        serial: lantiq: Do not swap register read/writes
      437e878a
    • Linus Torvalds's avatar
      Merge tag 'usb-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1dd8a3f6
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some small USB driver fixes and quirk updates for 5.0-rc2.
      
        The majority here are some quirks for some storage devices to get them
        to work properly. There's also a fix here to resolve the reported
        issues with some audio devices that say they are UAC3 compliant, but
        really are not.
      
        And a fix up for the MAINTAINERS file to remove a dead url.
      
        All have been in linux-next with no reported issues"
      
      * tag 'usb-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: storage: Remove outdated URL from MAINTAINERS
        USB: Add USB_QUIRK_DELAY_CTRL_MSG quirk for Corsair K70 RGB
        usbcore: Select only first configuration for non-UAC3 compliant devices
        USB: storage: add quirk for SMI SM3350
        USB: storage: don't insert sane sense for SPC3+ when bad sense specified
        usb: cdc-acm: send ZLP for Telit 3G Intel based modems
      1dd8a3f6
    • Linus Torvalds's avatar
      Merge tag '5.0-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · 0f9d140a
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "A set of cifs/smb3 fixes, 4 for stable, most from Pavel. His patches
        fix an important set of crediting (flow control) problems, and also
        two problems in cifs_writepages, ddressing some large i/o and also
        compounding issues"
      
      * tag '5.0-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update internal module version number
        CIFS: Fix error paths in writeback code
        CIFS: Move credit processing to mid callbacks for SMB3
        CIFS: Fix credits calculation for cancelled requests
        cifs: Fix potential OOB access of lock element array
        cifs: Limit memory used by lock request calls to a page
        cifs: move large array from stack to heap
        CIFS: Do not hide EINTR after sending network packets
        CIFS: Fix credit computation for compounded requests
        CIFS: Do not set credits to 1 if the server didn't grant anything
        CIFS: Fix adjustment of credits for MTU requests
        cifs: Fix a tiny potential memory leak
        cifs: Fix a debug message
      0f9d140a
    • Olof Johansson's avatar
      Merge tag 'reset-for-5.0-rc2' of git://git.pengutronix.de/git/pza/linux into fixes · 46561217
      Olof Johansson authored
      Late reset controller changes for v5.0
      
      This adds missing deassert functionality to the ARC HSDK reset driver,
      fixes some indentation and grammar issues in the kernel docs, adds a
      helper to count the number of resets on a device for the non-DT case
      as well, adds an early reset driver for SoCFPGA and simple reset driver
      support for Stratix10, and generalizes the uniphier USB3 glue layer
      reset to also cover AHCI.
      
      * tag 'reset-for-5.0-rc2' of git://git.pengutronix.de/git/pza/linux:
        reset: uniphier-glue: Add AHCI reset control support in glue layer
        dt-bindings: reset: uniphier: Add AHCI core reset description
        reset: uniphier-usb3: Rename to reset-uniphier-glue
        dt-bindings: reset: uniphier: Replace the expression of USB3 with generic peripherals
        ARM: socfpga: dts: document "altr,stratix10-rst-mgr" binding
        reset: socfpga: add an early reset driver for SoCFPGA
        reset: fix null pointer dereference on dev by dev_name
        reset: Add reset_control_get_count()
        reset: Improve reset controller kernel docs
        ARC: HSDK: improve reset driver
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      46561217
    • Olof Johansson's avatar
      Merge tag 'mvebu-fixes-5.0-1' of git://git.infradead.org/linux-mvebu into fixes · 56acb3ef
      Olof Johansson authored
      mvebu fixes for 5.0
      
      They are all device tree fixes which also worth being in stable:
      
       - Reserve PSCI area on Armada 7K/8K preventing the kernel accessing
         this area and crashing while doing it.
      
       - Use correct PCIe reset signal on MACCHIATOBin  (Armada 8040 based)
      
       - Fix polarity of GPIO fan line D-Link DNS NASes(kikwood based)
      
      * tag 'mvebu-fixes-5.0-1' of git://git.infradead.org/linux-mvebu:
        ARM: dts: kirkwood: Fix polarity of GPIO fan lines
        arm64: dts: marvell: mcbin: fix PCIe reset signal
        arm64: dts: marvell: armada-ap806: reserve PSCI area
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      56acb3ef
    • Olof Johansson's avatar
      Merge tag 'integrator-fixes-armsoc' of... · 2ec472ed
      Olof Johansson authored
      Merge tag 'integrator-fixes-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into fixes
      
      Fixes for the Integrator:
      - Handle failed allocations in the IM/PC bus attachment.
      - Use struct_size() for allocation.
      
      * tag 'integrator-fixes-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
        ARM: integrator: impd1: use struct_size() in devm_kzalloc()
        gpio: pl061: handle failed allocations
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      2ec472ed
    • Olof Johansson's avatar
      Merge tag 'amlogic-fixes' of... · 431a8b73
      Olof Johansson authored
      Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes
      
      Amlogic DT fixes for v5.0-rc
      - arm64: defconfig: enable modules for amlogic s400 sound card
      
      * tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        arm64: defconfig: enable modules for amlogic s400 sound card
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      431a8b73
    • Olof Johansson's avatar
      Merge tag 'qcom-fixes-for-5.0-rc1' of... · f4f8aa6d
      Olof Johansson authored
      Merge tag 'qcom-fixes-for-5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
      
      Qualcomm Driver Fixes for 5.0-rc1
      
      * Add required includes into qcom_scm.h
      
      * tag 'qcom-fixes-for-5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
        qcom-scm: Include <linux/err.h> header
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      f4f8aa6d
    • Olof Johansson's avatar
      Merge tag 'davinci-fixes-for-v5.0' of... · 98a5f673
      Olof Johansson authored
      Merge tag 'davinci-fixes-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
      
      This pull request fixes some more regressions on legacy
      DaVinci board support due to GPIO driver clean-up introduced
      in v4.20 kernel. These are marked for stable.
      
      Also has fixes for some long standing Audio issues on DA850
      boards.
      
      * tag 'davinci-fixes-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
        ARM: dts: da850-lcdk: Correct the sound card name
        ARM: dts: da850-lcdk: Correct the audio codec regulators
        ARM: dts: da850-evm: Correct the sound card name
        ARM: dts: da850-evm: Correct the audio codec regulators
        ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries
        ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
        ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
        ARM: davinci: da850-evm: fix label names in GPIO lookup entries
        ARM: davinci: da830-evm: fix label names in GPIO lookup entries
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      98a5f673
    • Olof Johansson's avatar
      Merge tag 'renesas-fixes-for-v5.0' of... · 70bf439a
      Olof Johansson authored
      Merge tag 'renesas-fixes-for-v5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      Renesas ARM Based SoC Fixes for v5.0
      
      Renesas SoCs:
      * Fix build regressions caused by move of Kconfig symbols
      
      RZ/G2E (r8a774c0) SoC:
      * Correct initialization order of 3DG-{A,B} in SYSC driver
      
      * tag 'renesas-fixes-for-v5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}
        ARM: shmobile: fix build regressions
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      70bf439a
    • John Hubbard's avatar
      phy: fix build breakage: add PHY_MODE_SATA · e1706720
      John Hubbard authored
      Commit 49e54187 ("ata: libahci_platform: comply to PHY framework") uses
      the PHY_MODE_SATA, but that enum had not yet been added. This caused a
      build failure for me, with today's linux.git.
      
      Also, there is a potentially conflicting (mis-named) PHY_MODE_SATA, hiding
      in the Marvell Berlin SATA PHY driver.
      
      Fix the build by:
      
          1) Renaming Marvell's defined value to a more scoped name,
             in order to avoid any potential conflicts: PHY_BERLIN_MODE_SATA.
      
          2) Adding the missing enum, which was going to be added anyway as part
             of [1].
      
      [1] https://lkml.kernel.org/r/20190108163124.6409-3-miquel.raynal@bootlin.com
      
      Fixes: 49e54187 ("ata: libahci_platform: comply to PHY framework")
      Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
      Acked-by: default avatarJens Axboe <axboe@kernel.dk>
      Acked-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: Grzegorz Jaszczyk <jaz@semihalf.com>
      Cc: Miquel Raynal <miquel.raynal@bootlin.com>
      Cc: Hans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e1706720