Skip to content
  1. May 08, 2021
    • Masahiro Yamada's avatar
      linux/kconfig.h: replace IF_ENABLED() with PTR_IF() in <linux/kernel.h> · 0ab1438b
      Masahiro Yamada authored
      
      
      <linux/kconfig.h> is included from all the kernel-space source files,
      including C, assembly, linker scripts. It is intended to contain a
      minimal set of macros to evaluate CONFIG options.
      
      IF_ENABLED() is an intruder here because (x ? y : z) is C code, which
      should not be included from assembly files or linker scripts.
      
      Also, <linux/kconfig.h> is no longer self-contained because NULL is
      defined in <linux/stddef.h>.
      
      Move IF_ENABLED() out to <linux/kernel.h> as PTR_IF(). PTF_IF()
      takes the general boolean expression instead of a CONFIG option
      so that it fits better in <linux/kernel.h>.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      Reviewed-by: default avatarKees Cook <keescook@chromium.org>
      0ab1438b
  2. May 06, 2021
  3. May 03, 2021
  4. May 01, 2021
    • Masahiro Yamada's avatar
      .gitignore: prefix local generated files with a slash · 9009b455
      Masahiro Yamada authored
      
      
      The pattern prefixed with '/' matches files in the same directory,
      but not ones in sub-directories.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      Acked-by: default avatarMiguel Ojeda <ojeda@kernel.org>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Acked-by: default avatarAndra Paraschiv <andraprs@amazon.com>
      Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Acked-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
      9009b455
    • Masahiro Yamada's avatar
      kbuild: replace LANG=C with LC_ALL=C · 77a88274
      Masahiro Yamada authored
      LANG gives a weak default to each LC_* in case it is not explicitly
      defined. LC_ALL, if set, overrides all other LC_* variables.
      
        LANG  <  LC_CTYPE, LC_COLLATE, LC_MONETARY, LC_NUMERIC, ...  <  LC_ALL
      
      This is why documentation such as [1] suggests to set LC_ALL in build
      scripts to get the deterministic result.
      
      LANG=C is not strong enough to override LC_* that may be set by end
      users.
      
      [1]: https://reproducible-builds.org/docs/locales/
      
      
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
      Reviewed-by: default avatarMatthias Maennich <maennich@google.com>
      Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> (mptcp)
      Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      77a88274
    • Nathan Chancellor's avatar
      Makefile: Move -Wno-unused-but-set-variable out of GCC only block · 885480b0
      Nathan Chancellor authored
      Currently, -Wunused-but-set-variable is only supported by GCC so it is
      disabled unconditionally in a GCC only block (it is enabled with W=1).
      clang currently has its implementation for this warning in review so
      preemptively move this statement out of the GCC only block and wrap it
      with cc-disable-warning so that both compilers function the same.
      
      Cc: stable@vger.kernel.org
      Link: https://reviews.llvm.org/D100581
      
      
      Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
      Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
      Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      885480b0
    • Masahiro Yamada's avatar
      kbuild: add a script to remove stale generated files · 1476fee5
      Masahiro Yamada authored
      We maintain .gitignore and Makefiles so build artifacts are properly
      ignored by Git, and cleaned up by 'make clean'. However, the code is
      always changing; generated files are often moved to another directory,
      or removed when they become unnecessary. Such garbage files tend to be
      left over in the source tree because people usually git-pull without
      cleaning the tree.
      
      This is not only the noise for 'git status', but also a build issue
      in some cases.
      
      One solution is to remove a stale file like commit 223c24a7
      
       ("kbuild:
      Automatically remove stale <linux/version.h> file") did. Such workaround
      should be removed after a while, but we forget about that if we scatter
      the workaround code in random places.
      
      So, this commit adds a new script to collect cleanings of stale files.
      
      As a start point, move the code in arch/arm/boot/compressed/Makefile
      into this script.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      1476fee5
    • Masahiro Yamada's avatar
      kbuild: update config_data.gz only when the content of .config is changed · 46b41d5d
      Masahiro Yamada authored
      If the timestamp of the .config file is updated, config_data.gz is
      regenerated, then vmlinux is re-linked. This occurs even if the content
      of the .config has not changed at all.
      
      This issue was mitigated by commit 67424f61 ("kconfig: do not write
      .config if the content is the same"); Kconfig does not update the
      .config when it ends up with the identical configuration.
      
      The issue is remaining when the .config is created by *_defconfig with
      some config fragment(s) applied on top.
      
      This is typical for powerpc and mips, where several *_defconfig targets
      are constructed by using merge_config.sh.
      
      One workaround is to have the copy of the .config. The filechk rule
      updates the copy, kernel/config_data, by checking the content instead
      of the timestamp.
      
      With this commit, the second run with the same configuration avoids
      the needless rebuilds.
      
        $ make ARCH=mips defconfig all
         [ snip ]
        $ make ARCH=mips defconfig all
        *** Default co...
      46b41d5d
    • Masahiro Yamada's avatar
      .gitignore: ignore only top-level modules.builtin · 40cb0203
      Masahiro Yamada authored
      modules.builtin used to be created in every directory.
      
      Since commit 8b41fc44
      
       ("kbuild: create modules.builtin without
      Makefile.modbuiltin or tristate.conf"), modules.builtin is created only
      in the top directory.
      
      Add the '/' prefix so that it matches to only the modules.builtin located
      in the top directory.
      
      It has been more than one year since that change. I hope this will not
      flood 'Untracked files' of 'git status'.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      40cb0203
    • Masahiro Yamada's avatar
      .gitignore: move tags and TAGS close to other tag files · 819cb9fc
      Masahiro Yamada authored
      
      
      For consistency, move tags and TAGS close to the cscope and GNU Global
      patterns.
      
      I removed the '/' prefix in case somebody wants to manually create tag
      files in sub-directories.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      819cb9fc
    • Masahiro Yamada's avatar
      kernel/.gitgnore: remove stale timeconst.h and hz.bc · 1fca3766
      Masahiro Yamada authored
      timeconst.h and hz.bc used to exist in kernel/.
      
      Commit 5cee9645 ("time/timers: Move all time(r) related files into
      kernel/time") moved them to kernel/time/.
      
      Commit 0a227985
      
       ("time: Move timeconst.h into include/generated")
      moved timeconst.h to include/generated/ and removed hz.bc .
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      1fca3766
    • Masahiro Yamada's avatar
      usr/include: refactor .gitignore · 5134e94a
      Masahiro Yamada authored
      
      
      The current .gitignore intends to ignore everything under usr/include/
      except .gitignore and Makefile.
      
      A cleaner solution is to use a pattern suffixed with '/', which matches
      only directories. It works well here because all the exported headers
      are located in sub-directories, like <linux/*.h>, <asm/*.h>.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      5134e94a
    • Masahiro Yamada's avatar
      genksyms: fix stale comment · 382243f3
      Masahiro Yamada authored
      (shipped source) is a stale comment.
      
      Since commit 833e6224
      
       ("genksyms: generate lexer and parser during
      build instead of shipping"), there is no source file to be shipped in
      this directory.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      382243f3
    • Masahiro Yamada's avatar
      kbuild: add comment about why cmd_shipped uses 'cat' · 3787b7da
      Masahiro Yamada authored
      cmd_shipped uses 'cat' instead of 'cp' for copying a file. The reason
      is explained in the commit [1], but it was in the pre-git era.
      
        $ touch a
        $ chmod -w a
        $ cp a b
        $ cp a b
        cp: cannot create regular file 'b': Permission denied
      
      Add comments so that you can see the reason without looking into
      the history.
      
      [1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=a70dba8086160449cc94c5bdaff78419b6b8e3c8
      
      
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      3787b7da
    • Masahiro Yamada's avatar
      sparc: syscalls: switch to generic syscallshdr.sh · c5849b7c
      Masahiro Yamada authored
      
      
      Many architectures duplicate similar shell scripts.
      
      This commit converts sparc to use scripts/syscallhdr.sh.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      c5849b7c
    • Masahiro Yamada's avatar
      sparc: syscalls: switch to generic syscalltbl.sh · 5ad4e94b
      Masahiro Yamada authored
      
      
      Many architectures duplicate similar shell scripts.
      
      This commit converts sparc to use scripts/syscalltbl.sh. This also
      unifies syscall_table_64.h and syscall_table_c32.h.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      5ad4e94b
    • Masahiro Yamada's avatar
      sh: syscalls: switch to generic syscallhdr.sh · eb611149
      Masahiro Yamada authored
      
      
      Many architectures duplicate similar shell scripts.
      
      This commit converts sh to use scripts/syscallhdr.sh.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      eb611149
    • Masahiro Yamada's avatar
      sh: syscalls: switch to generic syscalltbl.sh · 9c19722c
      Masahiro Yamada authored
      
      
      Many architectures duplicate similar shell scripts.
      
      This commit converts sh to use scripts/syscalltbl.sh.
      
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      9c19722c
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 9f67672a
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "New features for ext4 this cycle include support for encrypted
        casefold, ensure that deleted file names are cleared in directory
        blocks by zeroing directory entries when they are unlinked or moved as
        part of a hash tree node split. We also improve the block allocator's
        performance on a freshly mounted file system by prefetching block
        bitmaps.
      
        There are also the usual cleanups and bug fixes, including fixing a
        page cache invalidation race when there is mixed buffered and direct
        I/O and the block size is less than page size, and allow the dax flag
        to be set and cleared on inline directories"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (32 commits)
        ext4: wipe ext4_dir_entry2 upon file deletion
        ext4: Fix occasional generic/418 failure
        fs: fix reporting supported extra file attributes for statx()
        ext4: allow the dax flag to be set and cleared on inline directories
        ext4: fix debug format string warning
        ext4: fix trailing whitespace
        ext4: fix various seppling typos
        ext4: fix error return code in ext4_fc_perform_commit()
        ext4: annotate data race in jbd2_journal_dirty_metadata()
        ext4: annotate data race in start_this_handle()
        ext4: fix ext4_error_err save negative errno into superblock
        ext4: fix error code in ext4_commit_super
        ext4: always panic when errors=panic is specified
        ext4: delete redundant uptodate check for buffer
        ext4: do not set SB_ACTIVE in ext4_orphan_cleanup()
        ext4: make prefetch_block_bitmaps default
        ext4: add proc files to monitor new structures
        ext4: improve cr 0 / cr 1 group scanning
        ext4: add MB_NUM_ORDERS macro
        ext4: add mballoc stats proc file
        ...
      9f67672a
    • Linus Torvalds's avatar
      Merge tag 'dlm-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 6bab076a
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "This includes more dlm networking cleanups and improvements for making
        dlm shutdowns more robust"
      
      * tag 'dlm-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        fs: dlm: fix missing unlock on error in accept_from_sock()
        fs: dlm: add shutdown hook
        fs: dlm: flush swork on shutdown
        fs: dlm: remove unaligned memory access handling
        fs: dlm: check on minimum msglen size
        fs: dlm: simplify writequeue handling
        fs: dlm: use GFP_ZERO for page buffer
        fs: dlm: change allocation limits
        fs: dlm: add check if dlm is currently running
        fs: dlm: add errno handling to check callback
        fs: dlm: set subclass for othercon sock_mutex
        fs: dlm: set connected bit after accept
        fs: dlm: fix mark setting deadlock
        fs: dlm: fix debugfs dump
      6bab076a
    • Linus Torvalds's avatar
      Merge tag 'fuse-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 9ec1efbf
      Linus Torvalds authored
      Pull fuse updates from Miklos Szeredi:
      
       - Fix a page locking bug in write (introduced in 2.6.26)
      
       - Allow sgid bit to be killed in setacl()
      
       - Miscellaneous fixes and cleanups
      
      * tag 'fuse-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        cuse: simplify refcount
        cuse: prevent clone
        virtiofs: fix userns
        virtiofs: remove useless function
        virtiofs: split requests that exceed virtqueue size
        virtiofs: fix memory leak in virtio_fs_probe()
        fuse: invalidate attrs when page writeback completes
        fuse: add a flag FUSE_SETXATTR_ACL_KILL_SGID to kill SGID
        fuse: extend FUSE_SETXATTR request
        fuse: fix matching of FUSE_DEV_IOC_CLONE command
        fuse: fix a typo
        fuse: don't zero pages twice
        fuse: fix typo for fuse_conn.max_pages comment
        fuse: fix write deadlock
      9ec1efbf
    • Linus Torvalds's avatar
      Merge tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · d652502e
      Linus Torvalds authored
      Pull overlayfs update from Miklos Szeredi:
      
       - Fix a regression introduced in 5.2 that resulted in valid overlayfs
         mounts being rejected with ELOOP (Too many levels of symbolic links)
      
       - Fix bugs found by various tools
      
       - Miscellaneous improvements and cleanups
      
      * tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: add debug print to ovl_do_getxattr()
        ovl: invalidate readdir cache on changes to dir with origin
        ovl: allow upperdir inside lowerdir
        ovl: show "userxattr" in the mount data
        ovl: trivial typo fixes in the file inode.c
        ovl: fix misspellings using codespell tool
        ovl: do not copy attr several times
        ovl: remove ovl_map_dev_ino() return value
        ovl: fix error for ovl_fill_super()
        ovl: fix missing revert_creds() on error path
        ovl: fix leaked dentry
        ovl: restrict lower null uuid for "xino=auto"
        ovl: check that upperdir path is not on a read-only mount
        ovl: plumb through flush method
      d652502e
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · d42f323a
      Linus Torvalds authored
      Merge misc updates from Andrew Morton:
       "A few misc subsystems and some of MM.
      
        175 patches.
      
        Subsystems affected by this patch series: ia64, kbuild, scripts, sh,
        ocfs2, kfifo, vfs, kernel/watchdog, and mm (slab-generic, slub,
        kmemleak, debug, pagecache, msync, gup, memremap, memcg, pagemap,
        mremap, dma, sparsemem, vmalloc, documentation, kasan, initialization,
        pagealloc, and memory-failure)"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (175 commits)
        mm/memory-failure: unnecessary amount of unmapping
        mm/mmzone.h: fix existing kernel-doc comments and link them to core-api
        mm: page_alloc: ignore init_on_free=1 for debug_pagealloc=1
        net: page_pool: use alloc_pages_bulk in refill code path
        net: page_pool: refactor dma_map into own function page_pool_dma_map
        SUNRPC: refresh rq_pages using a bulk page allocator
        SUNRPC: set rq_page_end differently
        mm/page_alloc: inline __rmqueue_pcplist
        mm/page_alloc: optimize code layout for __alloc_pages_bulk
        mm/page_alloc: add an array-based interface to the bulk page allocator
        mm/page_alloc: add a bulk page allocator
        mm/page_alloc: rename alloced to allocated
        mm/page_alloc: duplicate include linux/vmalloc.h
        mm, page_alloc: avoid page_to_pfn() in move_freepages()
        mm/Kconfig: remove default DISCONTIGMEM_MANUAL
        mm: page_alloc: dump migrate-failed pages
        mm/mempolicy: fix mpol_misplaced kernel-doc
        mm/mempolicy: rewrite alloc_pages_vma documentation
        mm/mempolicy: rewrite alloc_pages documentation
        mm/mempolicy: rename alloc_pages_current to alloc_pages
        ...
      d42f323a
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 65ec0a7d
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "There is a lot going on!
      
        Core changes:
      
         - A semantic change to handle pinmux and pinconf in explicit order
           while up until now we depended on the semantic order in the device
           tree. The device tree is a functional programming language and does
           not imply any order, so the right thing is for the pin control core
           to provide these semantics.
      
         - Add a new pinmux-select debugfs file which makes it possible to go
           in and select functions for a pin manually (iteratively, at the
           prompt) for debugging purposes.
      
         - Fixes to gpio regmap handling for a new pin control driver making
           use of regmap-gpio.
      
         - Use octal permissions on debugfs files.
      
        New drivers:
      
         - A massive rewrite of the former custom pin control driver for MIPS
           Broadcom devices to instead use the pin control subsystem. New pin
           control drivers for BCM6345, BCM6328, BCM6358, BCM6362, BCM6368,
           BCM63268 and BCM6318 SoC variants are implemented.
      
         - Support for PM8350, PM8350B, PM8350C, PMK8350, PMR735A and PMR735B
           in the Qualcomm PMIC GPIO driver. Also the two GPIOs on PM8008 are
           supported.
      
         - Support for the Rockchip RK3568/RK3566 pin controller.
      
         - Support for Ingenic JZ4730, JZ4750, JZ4755, JZ4775 and X2000.
      
         - Support for Mediatek MTK8195.
      
         - Add a new Xilinx ZynqMP pin control driver.
      
        Driver improvements and non-urgent fixes:
      
         - Modularization and improvements of the Rockchip drivers.
      
         - Some new pins added to the description of new Renesas SoCs.
      
         - Clarifications of the GPIO base calculation in the Intel driver.
      
         - Fix the function names for the MPP54 and MPP55 pins in the Armada
           CP110 pin controller.
      
         - GPIO wakeup interrupt map for Qualcomm SC7280 and SM8350.
      
         - Support for ACPI probing of the Qualcomm SC8180x.
      
         - Fix interrupt clear status on rockchip
      
         - Fix some missing pins on the Ingenic JZ4770, some semantic fixes
           for the behaviour of the Ingenic pin controller. Add DMIC pins for
           JZ4780, X1000, X1500 and X1830.
      
         - A slew of janitorial like of_node_put() calls"
      
      * tag 'pinctrl-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (99 commits)
        pinctrl: Add Xilinx ZynqMP pinctrl driver support
        firmware: xilinx: Add pinctrl support
        pinctrl: rockchip: do coding style for mux route struct
        pinctrl: Add PIN_CONFIG_MODE_PWM to enum pin_config_param
        pinctrl: Introduce MODE group in enum pin_config_param
        pinctrl: Keep enum pin_config_param ordered by name
        dt-bindings: pinctrl: Add binding for ZynqMP pinctrl driver
        pinctrl: core: Fix kernel doc string for pin_get_name()
        pinctrl: mediatek: use spin lock in mtk_rmw
        pinctrl: add drive for I2C related pins on MT8195
        pinctrl: add pinctrl driver on mt8195
        dt-bindings: pinctrl: mt8195: add pinctrl file and binding document
        pinctrl: Ingenic: Add pinctrl driver for X2000.
        pinctrl: Ingenic: Add pinctrl driver for JZ4775.
        pinctrl: Ingenic: Add pinctrl driver for JZ4755.
        pinctrl: Ingenic: Add pinctrl driver for JZ4750.
        pinctrl: Ingenic: Add pinctrl driver for JZ4730.
        dt-bindings: pinctrl: Add bindings for new Ingenic SoCs.
        pinctrl: Ingenic: Reformat the code.
        pinctrl: Ingenic: Add DMIC pins support for Ingenic SoCs.
        ...
      65ec0a7d
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 592fa953
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
      
       - new drivers for Silicon Labs CP2615 and the HiSilicon I2C unit
      
       - bigger refactoring for the MPC driver
      
       - support for full software nodes - no need to work around with only
         properties anymore
      
       - we now have 'devm_i2c_add_adapter', too
      
       - sub-system wide fixes for the RPM refcounting problem which often
         caused a leak when an error was encountered during probe
      
       - the rest is usual driver updates and improvements
      
      * 'i2c/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (77 commits)
        i2c: mediatek: Use scl_int_delay_ns to compensate clock-stretching
        i2c: mediatek: Fix wrong dma sync flag
        i2c: mediatek: Fix send master code at more than 1MHz
        i2c: sh7760: fix IRQ error path
        i2c: i801: Add support for Intel Alder Lake PCH-M
        i2c: core: Fix spacing error by checkpatch
        i2c: s3c2410: simplify getting of_device_id match data
        i2c: nomadik: Fix space errors
        i2c: iop3xx: Fix coding style issues
        i2c: amd8111: Fix coding style issues
        i2c: mpc: Drop duplicate message from devm_platform_ioremap_resource()
        i2c: mpc: Use device_get_match_data() helper
        i2c: mpc: Remove CONFIG_PM_SLEEP ifdeffery
        i2c: mpc: Use devm_clk_get_optional()
        i2c: mpc: Update license and copyright
        i2c: mpc: Interrupt driven transfer
        i2c: sh7760: add IRQ check
        i2c: rcar: add IRQ check
        i2c: mlxbf: add IRQ check
        i2c: jz4780: add IRQ check
        ...
      592fa953
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid · efd8929b
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - Surface Aggregator Module support from Maximilian Luz
      
       - Apple Magic Mouse 2 support from John Chen
      
       - Support for newer Quad/BT 2.0 Logitech receivers in HID proxy mode
         from Hans de Goede
      
       - Thinkpad X1 Tablet keyboard support from Hans de Goede
      
       - Support for FTDI FT260 I2C host adapter from Michael Zaidman
      
       - other various small device-specific quirks, fixes and cleanups
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (46 commits)
        HID: wacom: Setup pen input capabilities to the targeted tools
        HID: hid-sensor-hub: Move 'hsdev' description to correct struct definition
        HID: hid-sensor-hub: Remove unused struct member 'quirks'
        HID: wacom_sys: Demote kernel-doc abuse
        HID: hid-sensor-custom: Remove unused variable 'ret'
        HID: hid-uclogic-params: Ensure function names are present and correct in kernel-doc headers
        HID: hid-uclogic-rdesc: Kernel-doc is for functions and structs
        HID: hid-logitech-hidpp: Fix conformant kernel-doc header and demote abuses
        HID: hid-picolcd_core: Remove unused variable 'ret'
        HID: hid-kye: Fix incorrect function name for kye_tablet_enable()
        HID: hid-core: Fix incorrect function name in header
        HID: hid-alps: Correct struct misnaming
        HID: usbhid: hid-pidff: Demote a couple kernel-doc abuses
        HID: usbhid: Repair a formatting issue in a struct description
        HID: hid-thrustmaster: Demote a bunch of kernel-doc abuses
        HID: input: map battery capacity (00850065)
        HID: magicmouse: fix reconnection of Magic Mouse 2
        HID: magicmouse: fix 3 button emulation of Mouse 2
        HID: magicmouse: add Apple Magic Mouse 2 support
        HID: lenovo: Add support for Thinkpad X1 Tablet Thin keyboard
        ...
      efd8929b
    • Linus Torvalds's avatar
      Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b71428d7
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "No surprises in this development cycle, and most of work is about the
        fixes and the improvements of the existing code, while a new LED
        control layer and a few new drivers have been introduced.
      
        Here are some highlights:
      
        Core:
         - A common mute-LED framework was introduced. It is used by HD-audio
           for now, more adaption will follow later. The former "Mic Mute-LED
           Mode" mixer control has been replaced with the corresponding sysfs
           now.
         - User-control management was changed to count consumed bytes instead
           of capping by number of elements; this will allow more controls in
           the normal usage pattern while avoiding the possible memory
           exhaustion DoS
      
        ASoC:
         - Continued refactoring and cleanups in ASoC core and generic card
           drivers
         - Wide range of small cppcheck and warning fixes
         - New drivers for Freescale i.MX DMA over rpmsg, Mediatek MT6358
           accessory detection, and Realtek RT1019, RT1316, RT711 and RT715
      
        USB-audio:
         - Continued improvements and fixes of the implicit feedback mode,
           including better support for Pioneer and Roland/BOSS devices
      
        HD-audio:
         - Default back to non-buffer preallocation on x86
         - Cirrus codec improvements, more quirks for Realtek codecs
      
        Others:
         - New virtio sound driver
         - FireWire Bebob updates"
      
      * tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (587 commits)
        ALSA: hda/conexant: Re-order CX5066 quirk table entries
        ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices
        ALSA: hda/realtek: Re-order ALC662 quirk table entries
        ALSA: hda/realtek: Re-order remaining ALC269 quirk table entries
        ALSA: hda/realtek: Re-order ALC269 Lenovo quirk table entries
        ALSA: hda/realtek: Re-order ALC269 Sony quirk table entries
        ALSA: hda/realtek: Re-order ALC269 ASUS quirk table entries
        ALSA: hda/realtek: Re-order ALC269 Dell quirk table entries
        ALSA: hda/realtek: Re-order ALC269 Acer quirk table entries
        ALSA: hda/realtek: Re-order ALC269 HP quirk table entries
        ALSA: hda/realtek: Re-order ALC882 Clevo quirk table entries
        ALSA: hda/realtek: Re-order ALC882 Sony quirk table entries
        ALSA: hda/realtek: Re-order ALC882 Acer quirk table entries
        ALSA: usb-audio: Remove redundant assignment to len
        ALSA: hda/realtek: Add quirk for Intel Clevo PCx0Dx
        ALSA: virtio: fix kernel-doc
        ALSA: hda/cirrus: Use CS8409 filter to fix abnormal sounds on Bullseye
        ALSA: hda/cirrus: Set Initial DMIC volume for Bullseye to -26 dB
        ALSA: sb: Fix two use after free in snd_sb_qsound_build
        ALSA: emu8000: Fix a use after free in snd_emu8000_create_mixer
        ...
      b71428d7
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2021-04-30' of git://anongit.freedesktop.org/drm/drm · 95275402
      Linus Torvalds authored
      Pull more drm updates from Dave Airlie:
       "Looks like I missed a tegra feature request for next, but should still
        be fine since it's pretty self contained.
      
        Apart from that got a set of i915 and amdgpu fixes as per usual along
        with a few misc fixes.
      
        tegra:
         - Tegra186 hardware cursor support
         - better capability reporting for different SoC
         - better framebuffer modifier support
         - host1x fixes
      
        ttm:
         - fix unswappable BO handling
      
        efifb:
         - check for PCI before using it
      
        amdgpu:
         - Fixes for Aldebaran
         - Display LTTPR fixes
         - eDP fixes
         - Fixes for Vangogh
         - RAS fixes
         - ASPM support
         - Renoir SMU fixes
         - Modifier fixes
         - Misc code cleanups
         - Freesync fixes
      
        i915:
         - Several fixes to GLK handling in recent display refactoring
         - Rare watchdog timer race fix
         - Cppcheck redundant condition fix
         - Overlay error code propagation fix
         - Documentation fix
         - gvt: Remove one unused function warning
         - gvt: Fix intel_gvt_init_device() return type
         - gvt: Remove one duplicated register accessible check"
      
      * tag 'drm-next-2021-04-30' of git://anongit.freedesktop.org/drm/drm: (111 commits)
        efifb: Check efifb_pci_dev before using it
        drm/i915: Fix docbook descriptions for i915_gem_shrinker
        drm/i915: fix an error code in intel_overlay_do_put_image()
        drm/i915/display/psr: Fix cppcheck warnings
        drm/i915: Disable LTTPR detection on GLK once again
        drm/i915: Restore lost glk ccs w/a
        drm/i915: Restore lost glk FBC 16bpp w/a
        drm/i915: Take request reference before arming the watchdog timer
        drm/ttm: fix error handling if no BO can be swapped out v4
        drm/i915/gvt: Remove duplicated register accessible check
        drm/amdgpu/gmc9: remove dummy read workaround for newer chips
        drm/amdgpu: Add mem sync flag for IB allocated by SA
        drm/amdgpu: Fix SDMA RAS error reporting on Aldebaran
        drm/amdgpu: Reset RAS error count and status regs
        Revert "drm/amdgpu: workaround the TMR MC address issue (v2)"
        drm/amd/display: 3.2.132
        drm/amd/display: [FW Promotion] Release 0.0.62
        drm/amd/display: add helper for enabling mst stream features
        drm/amd/display: Report Proper Quantization Range in AVI Infoframe
        drm/amd/display: Fix call to pass bpp in 16ths of a bit
        ...
      95275402
    • Linus Torvalds's avatar
      Merge tag 'modules-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux · 65c61de9
      Linus Torvalds authored
      Pull module updates from Jessica Yu:
       "Fix an age old bug involving jump_calls and static_labels when
        CONFIG_MODULE_UNLOAD=n.
      
        When CONFIG_MODULE_UNLOAD=n, it means you can't unload modules, so
        normally the __exit sections of a module are not loaded at all.
        However, dynamic code patching (jump_label, static_call, alternatives)
        can have sites in __exit sections even if __exit is never executed.
      
        Reported by Peter Zijlstra:
           'Alternatives, jump_labels and static_call all can have relocations
            into __exit code. Not loading it at all would be BAD.'
      
        Therefore, load the __exit sections even when CONFIG_MODULE_UNLOAD=n,
        and discard them after init"
      
      * tag 'modules-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
        module: treat exit sections the same as init sections when !CONFIG_MODULE_UNLOAD
      65c61de9
    • Linus Torvalds's avatar
      Merge tag 'powerpc-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · c70a4be1
      Linus Torvalds authored
      Pull powerpc updates from Michael Ellerman:
      
       - Enable KFENCE for 32-bit.
      
       - Implement EBPF for 32-bit.
      
       - Convert 32-bit to do interrupt entry/exit in C.
      
       - Convert 64-bit BookE to do interrupt entry/exit in C.
      
       - Changes to our signal handling code to use user_access_begin/end()
         more extensively.
      
       - Add support for time namespaces (CONFIG_TIME_NS)
      
       - A series of fixes that allow us to reenable STRICT_KERNEL_RWX.
      
       - Other smaller features, fixes & cleanups.
      
      Thanks to Alexey Kardashevskiy, Andreas Schwab, Andrew Donnellan, Aneesh
      Kumar K.V, Athira Rajeev, Bhaskar Chowdhury, Bixuan Cui, Cédric Le
      Goater, Chen Huang, Chris Packham, Christophe Leroy, Christopher M.
      Riedl, Colin Ian King, Dan Carpenter, Daniel Axtens, Daniel Henrique
      Barboza, David Gibson, Davidlohr Bueso, Denis Efremov, dingsenjie,
      Dmitry Safonov, Dominic DeMarco, Fabiano Rosas, Ganesh Goudar, Geert
      Uytterhoeven, Geetika Moolchandani, Greg Kurz, Guenter Roeck, Haren
      Myneni, He Ying, Jiapeng Chong, Jordan Niethe, Laurent Dufour, Lee
      Jones, Leonardo Bras, Li Huafei, Madhavan Srinivasan, Mahesh Salgaonkar,
      Masahiro Yamada, Nathan Chancellor, Nathan Lynch, Nicholas Piggin,
      Oliver O'Halloran, Paul Menzel, Pu Lehui, Randy Dunlap, Ravi Bangoria,
      Rosen Penev, Russell Currey, Santosh Sivaraj, Sebastian Andrzej Siewior,
      Segher Boessenkool, Shivaprasad G Bhat, Srikar Dronamraju, Stephen
      Rothwell, Thadeu Lima de Souza Cascardo, Thomas Gleixner, Tony Ambardar,
      Tyrel Datwyler, Vaibhav Jain, Vincenzo Frascino, Xiongwei Song, Yang Li,
      Yu Kuai, and Zhang Yunkai.
      
      * tag 'powerpc-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (302 commits)
        powerpc/signal32: Fix erroneous SIGSEGV on RT signal return
        powerpc: Avoid clang uninitialized warning in __get_user_size_allowed
        powerpc/papr_scm: Mark nvdimm as unarmed if needed during probe
        powerpc/kvm: Fix build error when PPC_MEM_KEYS/PPC_PSERIES=n
        powerpc/kasan: Fix shadow start address with modules
        powerpc/kernel/iommu: Use largepool as a last resort when !largealloc
        powerpc/kernel/iommu: Align size for IOMMU_PAGE_SIZE() to save TCEs
        powerpc/44x: fix spelling mistake in Kconfig "varients" -> "variants"
        powerpc/iommu: Annotate nested lock for lockdep
        powerpc/iommu: Do not immediately panic when failed IOMMU table allocation
        powerpc/iommu: Allocate it_map by vmalloc
        selftests/powerpc: remove unneeded semicolon
        powerpc/64s: remove unneeded semicolon
        powerpc/eeh: remove unneeded semicolon
        powerpc/selftests: Add selftest to test concurrent perf/ptrace events
        powerpc/selftests/perf-hwbreak: Add testcases for 2nd DAWR
        powerpc/selftests/perf-hwbreak: Coalesce event creation code
        powerpc/selftests/ptrace-hwbreak: Add testcases for 2nd DAWR
        powerpc/configs: Add IBMVNIC to some 64-bit configs
        selftests/powerpc: Add uaccess flush test
        ...
      c70a4be1
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20210429' of git://github.com/jcmvbkbc/linux-xtensa · 437d1a5b
      Linus Torvalds authored
      Pull Xtensa updates from Max Filippov:
      
       - switch to generic syscall generation scripts
      
       - new GDBIO implementation for xtensa semihosting interface
      
       - various small code fixes and cleanups
      
       - a few typo fixes in comments and Kconfig help text
      
      * tag 'xtensa-20210429' of git://github.com/jcmvbkbc/linux-xtensa:
        xtensa: ISS: add GDBIO implementation to semihosting interface
        xtensa: ISS: split simcall implementation from semihosting interface
        xtensa: simcall.h: Change compitible to compatible
        xtensa: Couple of typo fixes
        xtensa: drop extraneous register load from initialize_mmu
        xtensa: fix pgprot_noncached assumptions
        xtensa: simplify coherent_kvaddr logic
        xtensa: syscalls: switch to generic syscallhdr.sh
        xtensa: syscalls: switch to generic syscalltbl.sh
        xtensa: stop filling syscall array with sys_ni_syscall
        xtensa: remove unneeded export in boot-elf/Makefile
        xtensa: move CONFIG_CPU_*_ENDIAN defines to Kconfig
        xtensa: fix warning comparing pointer to 0
        xtensa: fix spelling mistake in Kconfig "wont" -> "won't"
      437d1a5b
    • Jane Chu's avatar
      mm/memory-failure: unnecessary amount of unmapping · 4d75136b
      Jane Chu authored
      It appears that unmap_mapping_range() actually takes a 'size' as its third
      argument rather than a location, the current calling fashion causes
      unnecessary amount of unmapping to occur.
      
      Link: https://lkml.kernel.org/r/20210420002821.2749748-1-jane.chu@oracle.com
      Fixes: 6100e34b
      
       ("mm, memory_failure: Teach memory_failure() about dev_pagemap pages")
      Signed-off-by: default avatarJane Chu <jane.chu@oracle.com>
      Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
      Reviewed-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
      Cc: Dave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4d75136b
    • Mike Rapoport's avatar
      mm/mmzone.h: fix existing kernel-doc comments and link them to core-api · 198fba41
      Mike Rapoport authored
      There are a couple of kernel-doc comments in include/linux/mmzone.h but
      they have minor formatting issues that would cause kernel-doc warnings.
      
      Fix the formatting of those comments, add missing Return: descriptions and
      link include/linux/mmzone.h to Documentation/core-api/mm-api.rst
      
      Link: https://lkml.kernel.org/r/20210426141927.1314326-2-rppt@kernel.org
      
      
      Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
      Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
      Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      198fba41