1. 07 Jan, 2021 2 commits
  2. 04 Jan, 2021 3 commits
  3. 22 Dec, 2020 1 commit
    • Ping Cheng's avatar
      HID: wacom: Fix memory leakage caused by kfifo_alloc · 37309f47
      Ping Cheng authored
      As reported by syzbot below, kfifo_alloc'd memory would not be freed
      if a non-zero return value is triggered in wacom_probe. This patch
      creates and uses devm_kfifo_alloc to allocate and free itself.
      
      BUG: memory leak
      unreferenced object 0xffff88810dc44a00 (size 512):
        comm "kworker/1:2", pid 3674, jiffies 4294943617 (age 14.100s)
        hex dump (first 32 bytes):
         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
        backtrace:
         [<0000000023e1afac>] kmalloc_array include/linux/slab.h:592 [inline]
         [<0000000023e1afac>] __kfifo_alloc+0xad/0x100 lib/kfifo.c:43
         [<00000000c477f737>] wacom_probe+0x1a1/0x3b0 drivers/hid/wacom_sys.c:2727
         [<00000000b3109aca>] hid_device_probe+0x16b/0x210 drivers/hid/hid-core.c:2281
         [<00000000aff7c640>] really_probe+0x159/0x480 drivers/base/dd.c:554
         [<00000000778d0bc3>] driver_probe_device+0x84/0x100 drivers/base/dd.c:738
         [<000000005108dbb5>] __device_attach_driver+0xee/0x110 drivers/base/dd.c:844
         [<00000000efb7c59e>] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:431
         [<0000000024ab1590>] __device_attach+0x122/0x250 drivers/base/dd.c:912
         [<000000004c7ac048>] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:491
         [<00000000b93050a3>] device_add+0x5ac/0xc30 drivers/base/core.c:2936
         [<00000000e5b46ea5>] hid_add_device+0x151/0x390 drivers/hid/hid-core.c:2437
         [<00000000c6add147>] usbhid_probe+0x412/0x560 drivers/hid/usbhid/hid-core.c:1407
         [<00000000c33acdb4>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396
         [<00000000aff7c640>] really_probe+0x159/0x480 drivers/base/dd.c:554
         [<00000000778d0bc3>] driver_probe_device+0x84/0x100 drivers/base/dd.c:738
         [<000000005108dbb5>] __device_attach_driver+0xee/0x110 drivers/base/dd.c:844
      
      https://syzkaller.appspot.com/bug?extid=5b49c9695968d7250a26
      
      Reported-by: syzbot+5b49c9695968d7250a26@syzkaller.appspotmail.com
      Signed-off-by: default avatarPing Cheng <ping.cheng@wacom.com>
      Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      37309f47
  4. 16 Dec, 2020 34 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid · de925e2f
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - AMD SFH (Sensor Fusion Hub) support (Sandeep Singh)
      
       - increase of maximum HID report size to 16KB in order to support some
         of the modern devices (Dean Camera)
      
       - control interface support for hidraw (Dean Camera)
      
       - Sony DS4 power and firmware reporting fixes (Roderick Colenbrander)
      
       - support for ghlive PS3/WII U dongles (Pascal Giard)
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (27 commits)
        HID: i2c-hid: add Vero K147 to descriptor override
        HID: ite: Add support for Acer S1002 keyboard-dock
        HID: sony: support for ghlive ps3/wii u dongles
        HID: hidraw: Add additional hidraw input/output report ioctls.
        HID: Increase HID maximum report size to 16KB
        HID: elecom: drop stray comment
        HID: mf: add support for 0079:1846 Mayflash/Dragonrise USB Gamecube Adapter
        HID: elecom: add support for EX-G M-XGL20DLBK wireless mouse
        HID: elecom: rewrite report based on model specific parameters
        HID: wacom: Constify attribute_groups
        HID: input: Fix fall-through warnings for Clang
        HID: usbhid: Fix fall-through warnings for Clang
        HID: logitech-hidpp: Add hid_device_id for V470 bluetooth mouse
        HID: intel-ish-hid: Remove unnecessary assignment to variable rv
        HID: sony: Workaround for DS4 dongle hotplug kernel crash.
        HID: sony: Don't use fw_version/hw_version for sysfs cleanup.
        HID: sony: Report more accurate DS4 power status.
        SFH: fix error return check for -ERESTARTSYS
        HID: SFH: Add documentation
        HID: hid-input: occasionally report stylus battery even if not changed
        ...
      de925e2f
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 62746f92
      Linus Torvalds authored
      Pull devicetree updates from Rob Herring:
      
       - Add vendor prefixes for bm, gpio-key, mentor, FII, and Ampere
      
       - Add ADP5585/ADP5589 and delta,q54sj108a2 to trivial-devices.yaml
      
       - Convert fixed-partitions, i2c-gate and fsl,dpaa2-console bindings to
         schemas
      
       - Drop PicoXcell bindings
      
       - Drop unused and undocumented 'pnx,timeout' property from LPC32xx
      
       - Add 'dynamic-power-coefficient' to Mali GPU bindings
      
       - Make 'make dt_binding_check' not error out on warnings
      
       - Various minor binding fixes
      
      * tag 'devicetree-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (22 commits)
        dt-bindings: mali-bifrost: Add dynamic-power-coefficient
        dt-bindings: mali-midgard: Add dynamic-power-coefficient
        dt-bindings: i2c: dw: cancel mandatory requirements for "#address-cells" and "#size-cells"
        dt-bindings: Remove PicoXcell bindings
        ARM: dts: lpc32xx: Remove unused and undocumented 'pnx,timeout'
        dt-bindings: mtd: convert "fixed-partitions" to the json-schema
        dt-bindings: vendor-prefixes: Add undocumented bm, gpio-key, and mentor prefixes
        dt-bindings: pci: rcar-pci-ep: Document missing interrupts property
        dt-bindings: vendor-prefixes: Add an entry for AmpereComputing.com
        dt-bindings: vendor-prefixes: correct the spelling of TQ-Systems GmbH
        dt-bindings: mfd: fix stm32 timers example
        dt-bindings: trivial-devices: Add delta,q54sj108a2
        dt-bindings:i2c:i2c-gate: txt to yaml conversion
        dt-bindings: add ADP5585/ADP5589 entries to trivial-devices
        dt-bindings: Correct GV11B GPU register sizes
        dt-bindings: vendor-prefixes: Add FII
        dt-bindings: Fix typo on the DesignWare IP reset bindings documentation
        dt-bindings: Fix error in 'make dtbs_check' when using DT_SCHEMA_FILES
        dt-bindings: arm: vt8500: remove redundant white-spaces
        dt-bindings: fsl-imx-drm: fix example compatible string
        ...
      62746f92
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · f68e4041
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "This is the bulk of pin control changes for the v5.11 kernel.
      
        Drivers, drivers and drivers. Not a single core change.
      
        Some new stuff, especially a bunch of new Intel, Qualcomm and Ocelot
        SoCs.
      
        As part of the modularization attempt, I applied one patch affecting
        the firmware subsystem as a functional (not syntactic/semantic)
        dependency and then it blew up in our face, so I had to revert it,
        bummer. It will come in later, through that subsystem, I guess.
      
        New drivers:
      
         - New driver for the Microchip Serial GPIO "SGPIO".
      
         - Qualcomm SM8250 LPASS (Low Power Audio Subsystem) GPIO driver.
      
        New subdrivers:
      
         - Intel Lakefield subdriver.
      
         - Intel Elkhart Lake subdriver.
      
         - Intel Alder Lake-S subdriver.
      
         - Qualcomm MSM8953 subdriver.
      
         - Qualcomm SDX55 subdriver.
      
         - Qualcomm SDX55 PMIC subdriver.
      
         - Ocelot Luton SoC subdriver.
      
         - Ocelot Serval SoC subdriver.
      
        Modularization:
      
         - The Meson driver can now be built as modules.
      
         - The Qualcomm driver(s) can now be built as modules.
      
        Incremental improvements:
      
         - The Intel driver now supports pin configuration for GPIO-related
           configurations.
      
         - A bunch of Renesas PFC drivers have been augmented with support for
           QSPI pins, groups and functions.
      
         - Non-critical fixes to the irq handling in the Allwinner Sunxi
           driver"
      
      * tag 'pinctrl-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (80 commits)
        pinctrl/spear: simplify the return expression of spear300_pinctrl_probe()
        pinctrl: mediatek: simplify the return expression of mtk_pinconf_bias_disable_set_rev1()
        dt-bindings: pinctrl: pinctrl-microchip-sgpio: Add irq support
        pinctrl: pinctrl-microchip-sgpio: Add irq support (for sparx5)
        pinctrl: qcom: Add sm8250 lpass lpi pinctrl driver
        dt-bindings: pinctrl: qcom: Add sm8250 lpass lpi pinctrl bindings
        pinctrl: qcom-pmic-gpio: Add support for pmx55
        dt-bindings: pinctrl: qcom-pmic-gpio: Add pmx55 support
        pinctrl: pinctrl-microchip-sgpio: Mark some symbols with static keyword
        pinctrl: at91-pio4: Make PINCTRL_AT91PIO4 depend on HAS_IOMEM to fix build error
        pinctrl: mtk: Fix low level output voltage issue
        pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe()
        pinctrl: actions: pinctrl-s500: Constify s500_padinfo[]
        pinctrl: pinctrl-microchip-sgpio: Add OF config dependency
        pinctrl: pinctrl-microchip-sgpio: Add pinctrl driver for Microsemi Serial GPIO
        dt-bindings: pinctrl: Add bindings for pinctrl-microchip-sgpio driver
        pinctrl: at91-pio4: add support for fewer lines on last PIO bank
        pinctrl: sunxi: Always call chained_irq_{enter, exit} in sunxi_pinctrl_irq_handler
        pinctrl: sunxi: Mark the irq bank not found in sunxi_pinctrl_irq_handler() with WARN_ON
        pinctrl: sunxi: fix irq bank map for the Allwinner A100 pin controller
        ...
      f68e4041
    • Linus Torvalds's avatar
      Merge tag 'mtd/for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux · a701262c
      Linus Torvalds authored
      Pull MTD updates from Miquel Raynal:
       "MTD core:
         - Fix refcounting for unpartitioned MTDs
         - Fix misspelled function parameter 'section'
         - Remove unneeded break
         - cmdline parser: Fix parsing of part-names with colons
         - mtdpart: Fix misdocumented function parameter 'mtd'
      
        MTD devices:
         - phram:
            - Allow the user to set the erase page size
            - File headers are not good candidates for kernel-doc
         - physmap-bt1-rom: Fix __iomem addrspace removal warning
         - plat-ram: correctly free memory on error path in platram_probe()
         - powernv_flash: Add function names to headers and fix 'dev'
         - docg3: Fix kernel-doc 'bad line' and 'excessive doc' issues
      
        UBI cleanup fixes:
         - gluebi: Fix misnamed function parameter documentation
         - wl: Fix a couple of kernel-doc issues
         - eba: Fix a couple of misdocumentation issues
         - kapi: Correct documentation for 'ubi_leb_read_sg's 'sgl' parameter
         - Document 'ubi_num' in struct mtd_dev_param
      
        Generic NAND core ECC management:
         - Add an I/O request tweaking mechanism
         - Entire rework of the software BCH ECC driver, creation of a real
           ECC engine, getting rid of raw NAND structures, migration to more
           generic prototypes, misc fixes and style cleanup. Moved now to the
           Generic NAND layer.
         - Entire rework of the software Hamming ECC driver, creation of a
           real ECC engine, getting rid of raw NAND structures, misc renames,
           comment updates, cleanup, and style fixes. Moved now to the generic
           NAND layer.
         - Necessary plumbing at the NAND level to retrieve generic NAND ECC
           engines (softwares and on-die).
         - Update of the bindings.
      
        Raw NAND core:
         - Geting rid of the chip->ecc.priv entry.
         - Fix miscellaneous typos in kernel-doc
      
        Raw NAND controller drivers:
         - Arasan: Document 'anfc_op's 'buf' member
         - AU1550: Ensure the presence of the right includes
         - Brcmnand: Demote non-conformant kernel-doc headers
         - Cafe: Remove superfluous param doc and add another
         - Davinci: Do not use extra dereferencing
         - Diskonchip: Marking unused variables as __always_unused
         - GPMI:
            - Fix the driver only sense CS0 R/B issue
            - Fix the random DMA timeout issue
            - Use a single line for of_device_id
            - Use of_device_get_match_data()
            - Fix reference count leak in gpmi ops
            - Cleanup makefile
            - Fix binding matching of clocks on different SoCs
         - Ingenic: remove redundant get_device() in ingenic_ecc_get()
         - Intel LGM: New NAND controller driver
         - Marvell: Drop useless line
         - Meson:
            - Fix a resource leak in init
            - Fix meson_nfc_dma_buffer_release() arguments
         - mxc:
            - Use device_get_match_data()
            - Use a single line for of_device_id
            - Remove platform data support
         - Omap:
            - Fix a bunch of kernel-doc misdemeanours
            - Finish ELM half populated function header, demote empty ones
         - s3c2410: Add documentation for 2 missing struct members
         - Sunxi: Document 'sunxi_nfc's 'caps' member
         - Qcom:
            - Add support for SDX55
            - Support for IPQ6018 QPIC NAND controller
            - Fix DMA sync on FLASH_STATUS register read
         - Rockchip: New NAND controller driver for RK3308, RK2928 and others
         - Sunxi: Add MDMA support
      
        ONENAND:
         - bbt: Fix expected kernel-doc formatting
         - Fix some kernel-doc misdemeanours
         - Fix expected kernel-doc formatting
         - Use mtd->oops_panic_write as condition
      
        SPI-NAND core:
         - Creation of a SPI-NAND on-die ECC engine
         - Move ECC related definitions earlier in the driver
         - Fix typo in comment
         - Fill a default ECC provider/algorithm
         - Remove outdated comment
         - Fix OOB read
         - Allow the case where there is no ECC engine
         - Use the external ECC engine logic
      
        SPI-NAND chip drivers:
         - Micron:
            - Add support for MT29F2G01AAAED
            - Use more specific names
         - Macronix:
            - Add support for MX35LFxG24AD
            - Add support for MX35LFxGE4AD
         - Toshiba: Demote non-conformant kernel-doc header
      
        SPI-NOR core:
         - Initial support for stateful Octal DTR mode using volatile settings
         - Preliminary support for JEDEC 251 (xSPI) and JEDEC 216D standards
         - Support for Cypress Semper flash
         - Support to specify ECC block size of SPI NOR flashes
         - Fixes to avoid clearing of non-volatile Block Protection bits at
           probe
         - hisi-sfc: Demote non-conformant kernel-doc"
      
      * tag 'mtd/for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (120 commits)
        mtd: spinand: macronix: Add support for MX35LFxG24AD
        mtd: rawnand: rockchip: NFC driver for RK3308, RK2928 and others
        dt-bindings: mtd: Describe Rockchip RK3xxx NAND flash controller
        mtd: rawnand: gpmi: Use a single line for of_device_id
        mtd: rawnand: gpmi: Fix the random DMA timeout issue
        mtd: rawnand: gpmi: Fix the driver only sense CS0 R/B issue
        mtd: rawnand: qcom: Add NAND controller support for SDX55
        dt-bindings: qcom_nandc: Add SDX55 QPIC NAND documentation
        mtd: rawnand: mxc: Use a single line for of_device_id
        mtd: rawnand: mxc: Use device_get_match_data()
        mtd: rawnand: meson: Fix a resource leak in init
        mtd: rawnand: gpmi: Use of_device_get_match_data()
        mtd: rawnand: Add NAND controller support on Intel LGM SoC
        dt-bindings: mtd: Add Nand Flash Controller support for Intel LGM SoC
        mtd: spinand: micron: Add support for MT29F2G01AAAED
        mtd: spinand: micron: Use more specific names
        mtd: rawnand: gpmi: fix reference count leak in gpmi ops
        dt-bindings: mtd: gpmi-nand: Fix matching of clocks on different SoCs
        mtd: spinand: macronix: Add support for MX35LFxGE4AD
        mtd: plat-ram: correctly free memory on error path in platram_probe()
        ...
      a701262c
    • Linus Torvalds's avatar
      Merge tag 'leds-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds · 945433be
      Linus Torvalds authored
      Pull LED updates from Pavel Machek:
       "Small cleanups/fixes mostly thanks to Marek, nothing major made it in
        this time"
      
      * tag 'leds-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds:
        leds: turris-omnia: check for LED_COLOR_ID_RGB instead LED_COLOR_ID_MULTI
        leds: turris-omnia: fix checkpatch warning
        leds: turris-omnia: wrap to 80 columns
        leds: turris-omnia: use constants instead of macros for color command
        dt-bindings: leds: Convert pwm to yaml
        leds: lp50xx: Fix an error handling path in 'lp50xx_probe_dt()'
        leds: netxbig: add missing put_device() call in netxbig_leds_get_of_pdata()
        Documentation: leds: remove invalidated information
      945433be
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.11-1' of git://github.com/cminyard/linux-ipmi · f67d6620
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "Some very minor changes.
      
        Nothing functional, just little syntax cleanups and a RCU warning
        suppression"
      
      * tag 'for-linus-5.11-1' of git://github.com/cminyard/linux-ipmi:
        char: ipmi: convert comma to semicolon
        ipmi: msghandler: Suppress suspicious RCU usage warning
        ipmi/watchdog: replace atomic_add() and atomic_sub()
        char: ipmi: remove unneeded break
      f67d6620
    • Linus Torvalds's avatar
      Merge tag 'backlight-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 84e010ec
      Linus Torvalds authored
      Pull backlight update from Lee Jones:
       "Careful, it's a big one!
      
         - Fix pwm_bl driver interpolation issues by switching to a linear
           algorithm"
      
      * tag 'backlight-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: pwm_bl: Fix interpolation
      84e010ec
    • Linus Torvalds's avatar
      Merge tag 'mfd-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 278f54c4
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "New Drivers
         - Add support for Intel's Platform Monitoring Technology (PMT)
      
        New Device Support:
         - Add support for PM660/PM660L to QCom SPMI PMIC
         - Add support for lots of new devices to Kontron Core
      
        New Functionality:
         - Provide syscon_regmap_lookup_by_phandle_optional() to SysCon API
      
        Fix-ups:
         - Constify; da9xxx-core; intel_*, tps65xxx, wm8xxx-core, lp8788,
           stmpe, sun4i-gpadc, 88pm800, hi655x-pmic, ioc3, etc
         - Remove superfluous code; madera, tps65910
         - Use raw APIs (rid abstractions); tps65911-comparator, tps65910
         - Whitespace/formatting fix-ups; tps65910
         - Device Tree changes/updates; bd71837-pmic, syscon
         - Use helpers/APIs (no hand rolling); altera-sysmgr
         - Mark of_match tables as __maybe_unused; twl6030-irq
         - Fix spelling; si476x-core
      
        Bug Fixes:
         - Reset on resume to ensure known state; madera-core
         - Correct ordering issues; madera-core, tps65910, kempld-core
         - Remove erroneous passing of of_compatible strings; at91-usart
         - Fix potential I2C adaptor leak; htc-i2cpld
         - Correct errorneous defines; rt5033-private
         - Resolve Kconfig issues; MFD_SL28CPLD, MFD_OMAP_USB_HOST
         - Fix dev_err_probe() handling; stmfx
         - Repair interrupt regression; motorola-cpcap
         - Allow ACPI matching of DT tables; bcm590xx, da9xx, ene-kb3930,
           fsl-imx25-tsadc, max77650, mt6397-core, rt5033, stmfx, max77686,
           sun4i-gpadc, wm8994-core, axp20x-i2c"
      
      [ The PMT updates already came in through the x86 platform tree ]
      
      * tag 'mfd-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (48 commits)
        mfd: kempld-core: Add support for additional devices
        mfd: si476x-core.h: Fix "regulator" spelling in comment
        mfd: twl6030: Mark of_device_id table as maybe unused
        mfd: axp20x: Skip of_device_id table when !CONFIG_OF
        mfd: wm8994: Drop of_match_ptr from of_device_id table
        mfd: sun4i: Drop of_match_ptr from of_device_id table
        mfd: max77686: Drop of_match_ptr from of_device_id table
        mfd: stmfx: Drop of_match_ptr from of_device_id table
        mfd: rt5033: Drop of_match_ptr from of_device_id table
        mfd: mt6397: Drop of_match_ptr from of_device_id table
        mfd: max77650: Drop of_match_ptr from of_device_id table
        mfd: fsl-imx25: Drop of_match_ptr from of_device_id table
        mfd: ene-kb3930: Drop of_match_ptr from of_device_id table
        mfd: da9150: Drop of_match_ptr from of_device_id table
        mfd: da9063: Drop of_match_ptr from of_device_id table
        mfd: da9062: Drop of_match_ptr from of_device_id table
        mfd: da9055: Drop of_match_ptr from of_device_id table
        mfd: bcm590xx: Drop of_match_ptr from of_device_id table
        mfd: omap-usb: Depend on COMMON_CLK to fix compile tests
        mfd: kempld-core: Check for DMI definition before ACPI
        ...
      278f54c4
    • Linus Torvalds's avatar
      Merge tag 'memblock-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock · fff875a1
      Linus Torvalds authored
      Pull memblock updates from Mike Rapoport:
       "memblock debug enhancements.
      
        Improve tracking of early memory allocations when memblock debug is
        enabled:
      
         - Add memblock_dbg() to memblock_phys_alloc_range() to get details
           about its usage
      
         - Make memblock allocator wrappers actually inline to track their
           callers in memblock debug messages"
      
      * tag 'memblock-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
        mm: memblock: drop __init from memblock functions to make it inline
        mm: memblock: add more debug logs
      fff875a1
    • Mark Rutland's avatar
      arm64: make _TIF_WORK_MASK bits contiguous · 870d1675
      Mark Rutland authored
      We need the bits of _TIF_WORK_MASK to be contiguous in order to to use
      this as an immediate argument to an AND instruction in entry.S.
      
      We happened to change these bits in commits:
      
        b5a5a01d ("arm64: uaccess: remove addr_limit_user_check()")
        192caabd ("arm64: add support for TIF_NOTIFY_SIGNAL")
      
      which each worked in isolation, but the merge resolution in commit:
      
        005b2a9d ("Merge tag 'tif-task_work.arch-2020-12-14' of git://git.kernel.dk/linux-block")
      
      happened to make the bits non-contiguous.
      
      Fix this by moving TIF_NOTIFY_SIGNAL to be bit 6, which is contiguous
      with the rest of _TIF_WORK_MASK.
      
      Otherwise, we'll get a build-time failure as below:
      
         arch/arm64/kernel/entry.S: Assembler messages:
         arch/arm64/kernel/entry.S:733: Error: immediate out of range at operand 3 -- `and x2,x19,#((1<<1)|(1<<0)|(1<<2)|(1<<3)|(1<<4)|(1<<5)|(1<<7))'
         scripts/Makefile.build:360: recipe for target 'arch/arm64/kernel/entry.o' failed
      
      Fixes: 005b2a9d ("Merge tag 'tif-task_work.arch-2020-12-14' of git://git.kernel.dk/linux-block")
      Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Will Deacon <will@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      870d1675
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 19778dd5
      Linus Torvalds authored
      Pull IOMMU updates from Will Deacon:
       "There's a good mixture of improvements to the core code and driver
        changes across the board.
      
        One thing worth pointing out is that this includes a quirk to work
        around behaviour in the i915 driver (see 65f746e8 ("iommu: Add
        quirk for Intel graphic devices in map_sg")), which otherwise
        interacts badly with the conversion of the intel IOMMU driver over to
        the DMA-IOMMU APU but has being fixed properly in the DRM tree.
      
        We'll revert the quirk later this cycle once we've confirmed that
        things don't fall apart without it.
      
        Summary:
      
         - IOVA allocation optimisations and removal of unused code
      
         - Introduction of DOMAIN_ATTR_IO_PGTABLE_CFG for parameterising the
           page-table of an IOMMU domain
      
         - Support for changing the default domain type in sysfs
      
         - Optimisation to the way in which identity-mapped regions are
           created
      
         - Driver updates:
             * Arm SMMU updates, including continued work on Shared Virtual
               Memory
             * Tegra SMMU updates, including support for PCI devices
             * Intel VT-D updates, including conversion to the IOMMU-DMA API
      
         - Cleanup, kerneldoc and minor refactoring"
      
      * tag 'iommu-updates-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (50 commits)
        iommu/amd: Add sanity check for interrupt remapping table length macros
        dma-iommu: remove __iommu_dma_mmap
        iommu/io-pgtable: Remove tlb_flush_leaf
        iommu: Stop exporting free_iova_mem()
        iommu: Stop exporting alloc_iova_mem()
        iommu: Delete split_and_remove_iova()
        iommu/io-pgtable-arm: Remove unused 'level' parameter from iopte_type() macro
        iommu: Defer the early return in arm_(v7s/lpae)_map
        iommu: Improve the performance for direct_mapping
        iommu: avoid taking iova_rbtree_lock twice
        iommu/vt-d: Avoid GFP_ATOMIC where it is not needed
        iommu/vt-d: Remove set but not used variable
        iommu: return error code when it can't get group
        iommu: Fix htmldocs warnings in sysfs-kernel-iommu_groups
        iommu: arm-smmu-impl: Add a space before open parenthesis
        iommu: arm-smmu-impl: Use table to list QCOM implementations
        iommu/arm-smmu: Move non-strict mode to use io_pgtable_domain_attr
        iommu/arm-smmu: Add support for pagetable config domain attribute
        iommu: Document usage of "/sys/kernel/iommu_groups/<grp_id>/type" file
        iommu: Take lock before reading iommu group default domain type
        ...
      19778dd5
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-5.11' of... · 007c74e1
      Linus Torvalds authored
      Merge branch 'stable/for-linus-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
      
      Pull swiotlb update from Konrad Rzeszutek Wilk:
       "A generic (but for right now engaged only with AMD SEV) mechanism to
        adjust a larger size SWIOTLB based on the total memory of the SEV
        guests which right now require the bounce buffer for interacting with
        the outside world.
      
        Normal knobs (swiotlb=XYZ) still work"
      
      * 'stable/for-linus-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
        x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests
      007c74e1
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · 009bd55d
      Linus Torvalds authored
      Pull rdma updates from Jason Gunthorpe:
       "A smaller set of patches, nothing stands out as being particularly
        major this cycle. The biggest item would be the new HIP09 HW support
        from HNS, otherwise it was pretty quiet for new work here:
      
         - Driver bug fixes and updates: bnxt_re, cxgb4, rxe, hns, i40iw,
           cxgb4, mlx4 and mlx5
      
         - Bug fixes and polishing for the new rts ULP
      
         - Cleanup of uverbs checking for allowed driver operations
      
         - Use sysfs_emit all over the place
      
         - Lots of bug fixes and clarity improvements for hns
      
         - hip09 support for hns
      
         - NDR and 50/100Gb signaling rates
      
         - Remove dma_virt_ops and go back to using the IB DMA wrappers
      
         - mlx5 optimizations for contiguous DMA regions"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (147 commits)
        RDMA/cma: Don't overwrite sgid_attr after device is released
        RDMA/mlx5: Fix MR cache memory leak
        RDMA/rxe: Use acquire/release for memory ordering
        RDMA/hns: Simplify AEQE process for different types of queue
        RDMA/hns: Fix inaccurate prints
        RDMA/hns: Fix incorrect symbol types
        RDMA/hns: Clear redundant variable initialization
        RDMA/hns: Fix coding style issues
        RDMA/hns: Remove unnecessary access right set during INIT2INIT
        RDMA/hns: WARN_ON if get a reserved sl from users
        RDMA/hns: Avoid filling sl in high 3 bits of vlan_id
        RDMA/hns: Do shift on traffic class when using RoCEv2
        RDMA/hns: Normalization the judgment of some features
        RDMA/hns: Limit the length of data copied between kernel and userspace
        RDMA/mlx4: Remove bogus dev_base_lock usage
        RDMA/uverbs: Fix incorrect variable type
        RDMA/core: Do not indicate device ready when device enablement fails
        RDMA/core: Clean up cq pool mechanism
        RDMA/core: Update kernel documentation for ib_create_named_qp()
        MAINTAINERS: SOFT-ROCE: Change Zhu Yanjun's email address
        ...
      009bd55d
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 60f7c503
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This consists of the usual driver updates (ufs, qla2xxx, smartpqi,
        target, zfcp, fnic, mpt3sas, ibmvfc) plus a load of cleanups, a major
        power management rework and a load of assorted minor updates.
      
        There are a few core updates (formatting fixes being the big one) but
        nothing major this cycle"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (279 commits)
        scsi: mpt3sas: Update driver version to 36.100.00.00
        scsi: mpt3sas: Handle trigger page after firmware update
        scsi: mpt3sas: Add persistent MPI trigger page
        scsi: mpt3sas: Add persistent SCSI sense trigger page
        scsi: mpt3sas: Add persistent Event trigger page
        scsi: mpt3sas: Add persistent Master trigger page
        scsi: mpt3sas: Add persistent trigger pages support
        scsi: mpt3sas: Sync time periodically between driver and firmware
        scsi: qla2xxx: Update version to 10.02.00.104-k
        scsi: qla2xxx: Fix device loss on 4G and older HBAs
        scsi: qla2xxx: If fcport is undergoing deletion complete I/O with retry
        scsi: qla2xxx: Fix the call trace for flush workqueue
        scsi: qla2xxx: Fix flash update in 28XX adapters on big endian machines
        scsi: qla2xxx: Handle aborts correctly for port undergoing deletion
        scsi: qla2xxx: Fix N2N and NVMe connect retry failure
        scsi: qla2xxx: Fix FW initialization error on big endian machines
        scsi: qla2xxx: Fix crash during driver load on big endian machines
        scsi: qla2xxx: Fix compilation issue in PPC systems
        scsi: qla2xxx: Don't check for fw_started while posting NVMe command
        scsi: qla2xxx: Tear down session if FW say it is down
        ...
      60f7c503
    • Linus Torvalds's avatar
      Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block · 69f637c3
      Linus Torvalds authored
      Pull block driver updates from Jens Axboe:
       "Nothing major in here:
      
         - NVMe pull request from Christoph:
              - nvmet passthrough improvements (Chaitanya Kulkarni)
              - fcloop error injection support (James Smart)
              - read-only support for zoned namespaces without Zone Append
                (Javier González)
              - improve some error message (Minwoo Im)
              - reject I/O to offline fabrics namespaces (Victor Gladkov)
              - PCI queue allocation cleanups (Niklas Schnelle)
              - remove an unused allocation in nvmet (Amit Engel)
              - a Kconfig spelling fix (Colin Ian King)
              - nvme_req_qid simplication (Baolin Wang)
      
         - MD pull request from Song:
              - Fix race condition in md_ioctl() (Dae R. Jeong)
              - Initialize read_slot properly for raid10 (Kevin Vigor)
              - Code cleanup (Pankaj Gupta)
              - md-cluster resync/reshape fix (Zhao Heming)
      
         - Move null_blk into its own directory (Damien Le Moal)
      
         - null_blk zone and discard improvements (Damien Le Moal)
      
         - bcache race fix (Dongsheng Yang)
      
         - Set of rnbd fixes/improvements (Gioh Kim, Guoqing Jiang, Jack Wang,
           Lutz Pogrell, Md Haris Iqbal)
      
         - lightnvm NULL pointer deref fix (tangzhenhao)
      
         - sr in_interrupt() removal (Sebastian Andrzej Siewior)
      
         - FC endpoint security support for s390/dasd (Jan Höppner, Sebastian
           Ott, Vineeth Vijayan). From the s390 arch guys, arch bits included
           as it made it easier for them to funnel the feature through the
           block driver tree.
      
         - Follow up fixes (Colin Ian King)"
      
      * tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block: (64 commits)
        block: drop dead assignments in loop_init()
        sr: Remove in_interrupt() usage in sr_init_command().
        sr: Switch the sector size back to 2048 if sr_read_sector() changed it.
        cdrom: Reset sector_size back it is not 2048.
        drivers/lightnvm: fix a null-ptr-deref bug in pblk-core.c
        null_blk: Move driver into its own directory
        null_blk: Allow controlling max_hw_sectors limit
        null_blk: discard zones on reset
        null_blk: cleanup discard handling
        null_blk: Improve implicit zone close
        null_blk: improve zone locking
        block: Align max_hw_sectors to logical blocksize
        null_blk: Fail zone append to conventional zones
        null_blk: Fix zone size initialization
        bcache: fix race between setting bdev state to none and new write request direct to backing
        block/rnbd: fix a null pointer dereference on dev->blk_symlink_name
        block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name
        block/rnbd: call kobject_put in the failure path
        Documentation/ABI/rnbd-srv: add document for force_close
        block/rnbd-srv: close a mapped device from server side.
        ...
      69f637c3
    • Linus Torvalds's avatar
      Merge tag 'for-5.11/block-2020-12-14' of git://git.kernel.dk/linux-block · ac7ac461
      Linus Torvalds authored
      Pull block updates from Jens Axboe:
       "Another series of killing more code than what is being added, again
        thanks to Christoph's relentless cleanups and tech debt tackling.
      
        This contains:
      
         - blk-iocost improvements (Baolin Wang)
      
         - part0 iostat fix (Jeffle Xu)
      
         - Disable iopoll for split bios (Jeffle Xu)
      
         - block tracepoint cleanups (Christoph Hellwig)
      
         - Merging of struct block_device and hd_struct (Christoph Hellwig)
      
         - Rework/cleanup of how block device sizes are updated (Christoph
           Hellwig)
      
         - Simplification of gendisk lookup and removal of block device
           aliasing (Christoph Hellwig)
      
         - Block device ioctl cleanups (Christoph Hellwig)
      
         - Removal of bdget()/blkdev_get() as exported API (Christoph Hellwig)
      
         - Disk change rework, avoid ->revalidate_disk() (Christoph Hellwig)
      
         - sbitmap improvements (Pavel Begunkov)
      
         - Hybrid polling fix (Pavel Begunkov)
      
         - bvec iteration improvements (Pavel Begunkov)
      
         - Zone revalidation fixes (Damien Le Moal)
      
         - blk-throttle limit fix (Yu Kuai)
      
         - Various little fixes"
      
      * tag 'for-5.11/block-2020-12-14' of git://git.kernel.dk/linux-block: (126 commits)
        blk-mq: fix msec comment from micro to milli seconds
        blk-mq: update arg in comment of blk_mq_map_queue
        blk-mq: add helper allocating tagset->tags
        Revert "block: Fix a lockdep complaint triggered by request queue flushing"
        nvme-loop: use blk_mq_hctx_set_fq_lock_class to set loop's lock class
        blk-mq: add new API of blk_mq_hctx_set_fq_lock_class
        block: disable iopoll for split bio
        block: Improve blk_revalidate_disk_zones() checks
        sbitmap: simplify wrap check
        sbitmap: replace CAS with atomic and
        sbitmap: remove swap_lock
        sbitmap: optimise sbitmap_deferred_clear()
        blk-mq: skip hybrid polling if iopoll doesn't spin
        blk-iocost: Factor out the base vrate change into a separate function
        blk-iocost: Factor out the active iocgs' state check into a separate function
        blk-iocost: Move the usage ratio calculation to the correct place
        blk-iocost: Remove unnecessary advance declaration
        blk-iocost: Fix some typos in comments
        blktrace: fix up a kerneldoc comment
        block: remove the request_queue to argument request based tracepoints
        ...
      ac7ac461
    • Linus Torvalds's avatar
      Merge tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block · 48aba79b
      Linus Torvalds authored
      Pull io_uring updates from Jens Axboe:
       "Fairly light set of changes this time around, and mostly some bits
        that were pushed out to 5.11 instead of 5.10, fixes/cleanups, and a
        few features. In particular:
      
         - Cleanups around iovec import (David Laight, Pavel)
      
         - Add timeout support for io_uring_enter(2), which enables us to
           clean up liburing and avoid a timeout sqe submission in the
           completion path.
      
           The big win here is that it allows setups that split SQ and CQ
           handling into separate threads to avoid locking, as the CQ side
           will no longer submit when timeouts are needed when waiting for
           events (Hao Xu)
      
         - Add support for socket shutdown, and renameat/unlinkat.
      
         - SQPOLL cleanups and improvements (Xiaoguang Wang)
      
         - Allow SQPOLL setups for CAP_SYS_NICE, and enable regular
           (non-fixed) files to be used.
      
         - Cancelation improvements (Pavel)
      
         - Fixed file reference improvements (Pavel)
      
         - IOPOLL related race fixes (Pavel)
      
         - Lots of other little fixes and cleanups (mostly Pavel)"
      
      * tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block: (43 commits)
        io_uring: fix io_cqring_events()'s noflush
        io_uring: fix racy IOPOLL flush overflow
        io_uring: fix racy IOPOLL completions
        io_uring: always let io_iopoll_complete() complete polled io
        io_uring: add timeout update
        io_uring: restructure io_timeout_cancel()
        io_uring: fix files cancellation
        io_uring: use bottom half safe lock for fixed file data
        io_uring: fix miscounting ios_left
        io_uring: change submit file state invariant
        io_uring: check kthread stopped flag when sq thread is unparked
        io_uring: share fixed_file_refs b/w multiple rsrcs
        io_uring: replace inflight_wait with tctx->wait
        io_uring: don't take fs for recvmsg/sendmsg
        io_uring: only wake up sq thread while current task is in io worker context
        io_uring: don't acquire uring_lock twice
        io_uring: initialize 'timeout' properly in io_sq_thread()
        io_uring: refactor io_sq_thread() handling
        io_uring: always batch cancel in *cancel_files()
        io_uring: pass files into kill timeouts/poll
        ...
      48aba79b
    • Linus Torvalds's avatar
      Merge tag 'tif-task_work.arch-2020-12-14' of git://git.kernel.dk/linux-block · 005b2a9d
      Linus Torvalds authored
      Pull TIF_NOTIFY_SIGNAL updates from Jens Axboe:
       "This sits on top of of the core entry/exit and x86 entry branch from
        the tip tree, which contains the generic and x86 parts of this work.
      
        Here we convert the rest of the archs to support TIF_NOTIFY_SIGNAL.
      
        With that done, we can get rid of JOBCTL_TASK_WORK from task_work and
        signal.c, and also remove a deadlock work-around in io_uring around
        knowing that signal based task_work waking is invoked with the sighand
        wait queue head lock.
      
        The motivation for this work is to decouple signal notify based
        task_work, of which io_uring is a heavy user of, from sighand. The
        sighand lock becomes a huge contention point, particularly for
        threaded workloads where it's shared between threads. Even outside of
        threaded applications it's slower than it needs to be.
      
        Roman Gershman <romger@amazon.com> reported that his networked
        workload dropped from 1.6M QPS at 80% CPU to 1.0M QPS at 100% CPU
        after io_uring was changed to use TIF_NOTIFY_SIGNAL. The time was all
        spent hammering on the sighand lock, showing 57% of the CPU time there
        [1].
      
        There are further cleanups possible on top of this. One example is
        TIF_PATCH_PENDING, where a patch already exists to use
        TIF_NOTIFY_SIGNAL instead. Hopefully this will also lead to more
        consolidation, but the work stands on its own as well"
      
      [1] https://github.com/axboe/liburing/issues/215
      
      * tag 'tif-task_work.arch-2020-12-14' of git://git.kernel.dk/linux-block: (28 commits)
        io_uring: remove 'twa_signal_ok' deadlock work-around
        kernel: remove checking for TIF_NOTIFY_SIGNAL
        signal: kill JOBCTL_TASK_WORK
        io_uring: JOBCTL_TASK_WORK is no longer used by task_work
        task_work: remove legacy TWA_SIGNAL path
        sparc: add support for TIF_NOTIFY_SIGNAL
        riscv: add support for TIF_NOTIFY_SIGNAL
        nds32: add support for TIF_NOTIFY_SIGNAL
        ia64: add support for TIF_NOTIFY_SIGNAL
        h8300: add support for TIF_NOTIFY_SIGNAL
        c6x: add support for TIF_NOTIFY_SIGNAL
        alpha: add support for TIF_NOTIFY_SIGNAL
        xtensa: add support for TIF_NOTIFY_SIGNAL
        arm: add support for TIF_NOTIFY_SIGNAL
        microblaze: add support for TIF_NOTIFY_SIGNAL
        hexagon: add support for TIF_NOTIFY_SIGNAL
        csky: add support for TIF_NOTIFY_SIGNAL
        openrisc: add support for TIF_NOTIFY_SIGNAL
        sh: add support for TIF_NOTIFY_SIGNAL
        um: add support for TIF_NOTIFY_SIGNAL
        ...
      005b2a9d
    • Linus Torvalds's avatar
      Merge branch 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 5ee863be
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "A change to increase the default maximum stack size on parisc to 100MB
        and the ability to further increase the stack hard limit size at
        runtime with ulimit for newly started processes.
      
        The other patches fix compile warnings, utilize the Kbuild logic and
        cleanups the parisc arch code"
      
      * 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: pci-dma: fix warning unused-function
        parisc/uapi: Use Kbuild logic to provide <asm/types.h>
        parisc: Make user stack size configurable
        parisc: Use _TIF_USER_WORK_MASK in entry.S
        parisc: Drop loops_per_jiffy from per_cpu struct
      5ee863be
    • Linus Torvalds's avatar
      Merge tag 'mips_5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux · 8312f41f
      Linus Torvalds authored
      Pull MIPS updates from Thomas Bogendoerfer:
      
       - enable GCOV
      
       - rework setup of protection map
      
       - add support for more MSCC platforms
      
       - add sysfs boardinfo for Loongson64
      
       - enable KASLR for Loogson64
      
       - add reset controller for BCM63xx
      
       - cleanups and fixes
      
      * tag 'mips_5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (70 commits)
        mips: fix Section mismatch in reference
        MAINTAINERS: Add linux-mips mailing list to JZ47xx entries
        MAINTAINERS: Remove JZ4780 DMA driver entry
        MAINTAINERS: chenhc@lemote.com -> chenhuacai@kernel.org
        MIPS: Octeon: irq: Alloc desc before configuring IRQ
        MIPS: mm: Add back define for PAGE_SHARED
        MIPS: Select ARCH_KEEP_MEMBLOCK if DEBUG_KERNEL to enable sysfs memblock debug
        mips: lib: uncached: fix non-standard usage of variable 'sp'
        MIPS: DTS: img: Fix schema warnings for pwm-leds
        MIPS: KASLR: Avoid endless loop in sync_icache if synci_step is zero
        MIPS: Move memblock_dump_all() to the end of setup_arch()
        MIPS: SMP-CPS: Add support for irq migration when CPU offline
        MIPS: OCTEON: Don't add kernel sections into memblock allocator
        MIPS: Don't round up kernel sections size for memblock_add()
        MIPS: Enable GCOV
        MIPS: configs: drop unused BACKLIGHT_GENERIC option
        MIPS: Loongson64: Fix up reserving kernel memory range
        MIPS: mm: Remove unused is_aligned_hugepage_range
        MIPS: No need to check CPU 0 in {loongson3,bmips,octeon}_cpu_disable()
        mips: cdmm: fix use-after-free in mips_cdmm_bus_discover
        ...
      8312f41f
    • Linus Torvalds's avatar
      Merge tag 'microblaze-v5.11' of git://git.monstr.eu/linux-2.6-microblaze · 66fc6a62
      Linus Torvalds authored
      Pull microblaze updates from Michal Simek:
       "The biggest change is to remove support for noMMU configuration.
      
        FPGAs are bigger so people use Microblaze with MMU for a lot of years
        and there is likely no user of this code anymore. No one is updating
        libraries for this configuration either.
      
         - Remove noMMU support
      
         - Add support for TIF_NOTIFY_SIGNAL
      
         - Small header fix"
      
      * tag 'microblaze-v5.11' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Remove noMMU code
        microblaze: add support for TIF_NOTIFY_SIGNAL
        microblaze: Replace <linux/clk-provider.h> by <linux/of_clk.h>
      66fc6a62
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 7acfd427
      Linus Torvalds authored
      Pull xen updates from Juergen Gross:
       "Fixes for security issues just having been disclosed:
      
         - a five patch series for fixing of XSA-349 (DoS via resource
           depletion in Xen dom0)
      
         - a patch fixing XSA-350 (access of stale pointer in a Xen dom0)"
      
      * tag 'for-linus-5.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen-blkback: set ring->xenblkd to NULL after kthread_stop()
        xenbus/xenbus_backend: Disallow pending watch messages
        xen/xenbus: Count pending messages for each watch
        xen/xenbus/xen_bus_type: Support will_handle watch callback
        xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path()
        xen/xenbus: Allow watches discard events before queueing
      7acfd427
    • Linus Torvalds's avatar
      Merge tag 'hyperv-next-signed-20201214' of... · 571b12dd
      Linus Torvalds authored
      Merge tag 'hyperv-next-signed-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
      
      Pull Hyper-V updates from Wei Liu:
      
       - harden VMBus (Andres Beltran)
      
       - clean up VMBus driver (Matheus Castello)
      
       - fix hv_balloon reporting (Vitaly Kuznetsov)
      
       - fix a potential OOB issue (Andrea Parri)
      
       - remove an obsolete TODO item (Stefan Eschenbacher)
      
      * tag 'hyperv-next-signed-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
        hv_balloon: do adjust_managed_page_count() when ballooning/un-ballooning
        hv_balloon: simplify math in alloc_balloon_pages()
        drivers/hv: remove obsolete TODO and fix misleading typo in comment
        drivers: hv: vmbus: Fix checkpatch SPLIT_STRING
        hv_netvsc: Validate number of allocated sub-channels
        drivers: hv: vmbus: Fix call msleep using < 20ms
        drivers: hv: vmbus: Fix checkpatch LINE_SPACING
        drivers: hv: vmbus: Replace symbolic permissions by octal permissions
        drivers: hv: Fix hyperv_record_panic_msg path on comment
        hv_netvsc: Use vmbus_requestor to generate transaction IDs for VMBus hardening
        scsi: storvsc: Use vmbus_requestor to generate transaction IDs for VMBus hardening
        Drivers: hv: vmbus: Add vmbus_requestor data structure for VMBus hardening
      571b12dd
    • Linus Torvalds's avatar
      Merge tag 'seccomp-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · e994cc24
      Linus Torvalds authored
      Pull seccomp updates from Kees Cook:
       "The major change here is finally gaining seccomp constant-action
        bitmaps, which internally reduces the seccomp overhead for many
        real-world syscall filters to O(1), as discussed at Plumbers this
        year.
      
         - Improve seccomp performance via constant-action bitmaps (YiFei Zhu
           & Kees Cook)
      
         - Fix bogus __user annotations (Jann Horn)
      
         - Add missed CONFIG for improved selftest coverage (Mickaël Salaün)"
      
      * tag 'seccomp-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        selftests/seccomp: Update kernel config
        seccomp: Remove bogus __user annotations
        seccomp/cache: Report cache data through /proc/pid/seccomp_cache
        xtensa: Enable seccomp architecture tracking
        sh: Enable seccomp architecture tracking
        s390: Enable seccomp architecture tracking
        riscv: Enable seccomp architecture tracking
        powerpc: Enable seccomp architecture tracking
        parisc: Enable seccomp architecture tracking
        csky: Enable seccomp architecture tracking
        arm: Enable seccomp architecture tracking
        arm64: Enable seccomp architecture tracking
        selftests/seccomp: Compare bitmap vs filter overhead
        x86: Enable seccomp architecture tracking
        seccomp/cache: Add "emulator" to check if filter is constant allow
        seccomp/cache: Lookup syscall allowlist bitmap for fast path
      e994cc24
    • Linus Torvalds's avatar
      Merge tag 'pstore-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · ba1d41a5
      Linus Torvalds authored
      Pull pstore updates from Kees Cook:
      
       - Clean up unused but exposed API (Christoph Hellwig)
      
       - Provide KCONFIG for default size of kmsg buffer (Vasile-Laurentiu
         Stanimir)
      
      * tag 'pstore-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        pstore: Move kmsg_bytes default into Kconfig
        pstore/blk: remove {un,}register_pstore_blk
        pstore/blk: update the command line example
        pstore/zone: cap the maximum device size
      ba1d41a5
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 6df0f285
      Linus Torvalds authored
      Pull gcc-plugins updates from Kees Cook:
      
       - Clean up gcc plugin builds now that GCC must be 4.9+ (Masahiro
         Yamada)
      
       - Update MAINTAINERS (Kees Cook)
      
      * tag 'gcc-plugins-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        MAINTAINERS: Drop inactive gcc-plugins maintainer
        gcc-plugins: simplify GCC plugin-dev capability test
        gcc-plugins: remove code for GCC versions older than 4.9
      6df0f285
    • Linus Torvalds's avatar
      Merge tag 'Smack-for-5.11' of git://github.com/cschaufler/smack-next · 8bda68d6
      Linus Torvalds authored
      Pull smack updates from Casey Schaufler:
       "There are no functional changes. Just one minor code clean-up and a
        set of corrections in function header comments"
      
      * tag 'Smack-for-5.11' of git://github.com/cschaufler/smack-next:
        security/smack: remove unused varible 'rc'
        Smack: fix kernel-doc interface on functions
      8bda68d6
    • Linus Torvalds's avatar
      Merge tag 'integrity-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity · e20a9b92
      Linus Torvalds authored
      Pull integrity subsystem updates from Mimi Zohar:
       "Just three patches here. Other integrity changes are being upstreamed
        via EFI (defines a common EFI secure and trusted boot IMA policy) and
        BPF LSM (exporting the IMA file cache hash info based on inode).
      
        The three patches included here:
      
         - bug fix: fail calculating the file hash, when a file not opened for
           read and the attempt to re-open it for read fails.
      
         - defer processing the "ima_appraise" boot command line option to
           avoid enabling different modes (e.g. fix, log) to when the secure
           boot flag is available on arm.
      
         - defines "ima-buf" as the default IMA buffer measurement template in
           preparation for the builtin integrity "critical data" policy"
      
      * tag 'integrity-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
        ima: Don't modify file descriptor mode on the fly
        ima: select ima-buf template for buffer measurement
        ima: defer arch_ima_get_secureboot() call to IMA init time
      e20a9b92
    • Linus Torvalds's avatar
      Merge tag 'selinux-pr-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux · ca5b877b
      Linus Torvalds authored
      Pull selinux updates from Paul Moore:
       "While we have a small number of SELinux patches for v5.11, there are a
        few changes worth highlighting:
      
         - Change the LSM network hooks to pass flowi_common structs instead
           of the parent flowi struct as the LSMs do not currently need the
           full flowi struct and they do not have enough information to use it
           safely (missing information on the address family).
      
           This patch was discussed both with Herbert Xu (representing team
           netdev) and James Morris (representing team
           LSMs-other-than-SELinux).
      
         - Fix how we handle errors in inode_doinit_with_dentry() so that we
           attempt to properly label the inode on following lookups instead of
           continuing to treat it as unlabeled.
      
         - Tweak the kernel logic around allowx, auditallowx, and dontauditx
           SELinux policy statements such that the auditx/dontauditx are
           effective even without the allowx statement.
      
        Everything passes our test suite"
      
      * tag 'selinux-pr-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
        lsm,selinux: pass flowi_common instead of flowi to the LSM hooks
        selinux: Fix fall-through warnings for Clang
        selinux: drop super_block backpointer from superblock_security_struct
        selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling
        selinux: allow dontauditx and auditallowx rules to take effect without allowx
        selinux: fix error initialization in inode_doinit_with_dentry()
      ca5b877b
    • Linus Torvalds's avatar
      Merge tag 'audit-pr-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · 3d5de2dd
      Linus Torvalds authored
      Pull audit updates from Paul Moore:
       "A small set of audit patches for v5.11 with four patches in total and
        only one of any real significance.
      
        Richard's patch to trigger accompanying records causes the kernel to
        emit additional related records when an audit event occurs; helping
        provide some much needed context to events in the audit log. It is
        also worth mentioning that this is a revised patch based on an earlier
        attempt that had to be reverted in the v5.8 time frame.
      
        Everything passes our test suite, and with no problems reported please
        merge this for v5.11"
      
      * tag 'audit-pr-20201214' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: replace atomic_add_return()
        audit: fix macros warnings
        audit: trigger accompanying records when no rules present
        audit: fix a kernel-doc markup
      3d5de2dd
    • Linus Torvalds's avatar
      Merge tag 'printk-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux · d3eb5211
      Linus Torvalds authored
      Pull printk updates from Petr Mladek:
      
       - Finally allow parallel writes and reads into/from the lockless
         ringbuffer. But it is not a complete solution. Readers are still
         serialized against each other. And nested writes are still prevented
         by printk_safe per-CPU buffers.
      
       - Use ttynull as the ultimate fallback for /dev/console.
      
       - Officially allow disabling console output by using console="" or
         console=null
      
       - A few code cleanups
      
      * tag 'printk-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
        printk: remove logbuf_lock writer-protection of ringbuffer
        printk: inline log_output(),log_store() in vprintk_store()
        printk: remove obsolete dead assignment
        printk/console: Allow to disable console output by using console="" or console=null
        init/console: Use ttynull as a fallback when there is no console
        printk: ringbuffer: Reference text_data_ring directly in callees.
      d3eb5211
    • Miquel Raynal's avatar
      Merge tags 'spi-nor/for-5.11' and 'nand/for-5.11' into mtd/next · 4c9e94df
      Miquel Raynal authored
      SPI NOR core changes:
      
      - Initial support for stateful Octal DTR mode using volatile settings
      - Preliminary support for JEDEC 251 (xSPI) and JEDEC 216D standards
      - Support for Cypress Semper flash
      - Support to specify ECC block size of SPI NOR flashes
      - Fixes to avoid clearing of non-volatile Block Protection bits at probe
      
      Generic NAND core:
      * ECC management:
        - Add an I/O request tweaking mechanism
        - Entire rework of the software BCH ECC driver, creation of a real
          ECC engine, getting rid of raw NAND structures, migration to more
          generic prototypes, misc fixes and style cleanup. Moved now to the
          Generic NAND layer.
        - Entire rework of the software Hamming ECC driver, creation of a
          real ECC engine, getting rid of raw NAND structures, misc renames,
          comment updates, cleanup, and style fixes. Moved now to the
          generic NAND layer.
        - Necessary plumbing at the NAND level to retrieve generic NAND ECC
          engines (softwares and on-die).
        - Update of the bindings.
      
      Raw NAND core:
      * Geting rid of the chip->ecc.priv entry.
      * Fix miscellaneous typos in kernel-doc
      
      Raw NAND controller drivers:
      * AU1550: Ensure the presence of the right includes
      * Davinci: Do not use extra dereferencing
      * GPMI:
        - Fix the driver only sense CS0 R/B issue
        - Fix the random DMA timeout issue
        - Use a single line for of_device_id
        - Use of_device_get_match_data()
        - Fix reference count leak in gpmi ops
        - Cleanup makefile
        - Fix binding matching of clocks on different SoCs
      * Ingenic: remove redundant get_device() in ingenic_ecc_get()
      * Intel LGM: New NAND controller driver
      * Marvell: Drop useless line
      * Meson:
        - Fix a resource leak in init
        - Fix meson_nfc_dma_buffer_release() arguments
      * mxc:
        - Use device_get_match_data()
        - Use a single line for of_device_id
        - Remove platform data support
      * Qcom:
        - Add support for SDX55
        - Support for IPQ6018 QPIC NAND controller
        - Fix DMA sync on FLASH_STATUS register read
      * Rockchip: New NAND controller driver for RK3308, RK2928 and others
      * Sunxi: Add MDMA support
      
      SPI-NAND core:
      * Creation of a SPI-NAND on-die ECC engine
      * Move ECC related definitions earlier in the driver
      * Fix typo in comment
      * Fill a default ECC provider/algorithm
      * Remove outdated comment
      * Fix OOB read
      * Allow the case where there is no ECC engine
      * Use the external ECC engine logic
      
      SPI-NAND chip drivers:
      * Micron:
        - Add support for MT29F2G01AAAED
        - Use more specific names
      * Macronix:
        - Add support for MX35LFxG24AD
        - Add support for MX35LFxGE4AD
      
      Others:
      * onenand: Use mtd->oops_panic_write as condition
      * plat-ram: correctly free memory on error path in platram_probe()
      4c9e94df
    • Zheng Yongjun's avatar
      char: ipmi: convert comma to semicolon · fad0319c
      Zheng Yongjun authored
      Replace a comma between expression statements by a semicolon.
      Signed-off-by: default avatarZheng Yongjun <zhengyongjun3@huawei.com>
      Message-Id: <20201216132615.15529-1-zhengyongjun3@huawei.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      fad0319c
    • Jiri Kosina's avatar
      Merge branch 'for-5.11/wacom' into for-linus · 85a69473
      Jiri Kosina authored
      85a69473