1. 05 12月, 2019 2 次提交
    • R
      mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction · a264df74
      Roman Gushchin 提交于
      Christian reported a warning like the following obtained during running
      some KVM-related tests on s390:
      
          WARNING: CPU: 8 PID: 208 at lib/percpu-refcount.c:108 percpu_ref_exit+0x50/0x58
          Modules linked in: kvm(-) xt_CHECKSUM xt_MASQUERADE bonding xt_tcpudp ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 ipt_REJECT nf_reject_ipv4 xt_conntrack ip6table_na>
          CPU: 8 PID: 208 Comm: kworker/8:1 Not tainted 5.2.0+ #66
          Hardware name: IBM 2964 NC9 712 (LPAR)
          Workqueue: events sysfs_slab_remove_workfn
          Krnl PSW : 0704e00180000000 0000001529746850 (percpu_ref_exit+0x50/0x58)
                     R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3
          Krnl GPRS: 00000000ffff8808 0000001529746740 000003f4e30e8e18 0036008100000000
                     0000001f00000000 0035008100000000 0000001fb3573ab8 0000000000000000
                     0000001fbdb6de00 0000000000000000 0000001529f01328 0000001fb3573b00
                     0000001fbb27e000 0000001fbdb69300 000003e009263d00 000003e009263cd0
          Krnl Code: 0000001529746842: f0a0000407fe        srp        4(11,%r0),2046,0
                     0000001529746848: 47000700            bc         0,1792
                    #000000152974684c: a7f40001            brc        15,152974684e
                    >0000001529746850: a7f4fff2            brc        15,1529746834
                     0000001529746854: 0707                bcr        0,%r7
                     0000001529746856: 0707                bcr        0,%r7
                     0000001529746858: eb8ff0580024        stmg       %r8,%r15,88(%r15)
                     000000152974685e: a738ffff            lhi        %r3,-1
          Call Trace:
          ([<000003e009263d00>] 0x3e009263d00)
           [<00000015293252ea>] slab_kmem_cache_release+0x3a/0x70
           [<0000001529b04882>] kobject_put+0xaa/0xe8
           [<000000152918cf28>] process_one_work+0x1e8/0x428
           [<000000152918d1b0>] worker_thread+0x48/0x460
           [<00000015291942c6>] kthread+0x126/0x160
           [<0000001529b22344>] ret_from_fork+0x28/0x30
           [<0000001529b2234c>] kernel_thread_starter+0x0/0x10
          Last Breaking-Event-Address:
           [<000000152974684c>] percpu_ref_exit+0x4c/0x58
          ---[ end trace b035e7da5788eb09 ]---
      
      The problem occurs because kmem_cache_destroy() is called immediately
      after deleting of a memcg, so it races with the memcg kmem_cache
      deactivation.
      
      flush_memcg_workqueue() at the beginning of kmem_cache_destroy() is
      supposed to guarantee that all deactivation processes are finished, but
      failed to do so.  It waits for an rcu grace period, after which all
      children kmem_caches should be deactivated.  During the deactivation
      percpu_ref_kill() is called for non root kmem_cache refcounters, but it
      requires yet another rcu grace period to finish the transition to the
      atomic (dead) state.
      
      So in a rare case when not all children kmem_caches are destroyed at the
      moment when the root kmem_cache is about to be gone, we need to wait
      another rcu grace period before destroying the root kmem_cache.
      
      This issue can be triggered only with dynamically created kmem_caches
      which are used with memcg accounting.  In this case per-memcg child
      kmem_caches are created.  They are deactivated from the cgroup removing
      path.  If the destruction of the root kmem_cache is racing with the
      removal of the cgroup (both are quite complicated multi-stage
      processes), the described issue can occur.  The only known way to
      trigger it in the real life, is to unload some kernel module which
      creates a dedicated kmem_cache, used from different memory cgroups with
      GFP_ACCOUNT flag.  If the unloading happens immediately after calling
      rmdir on the corresponding cgroup, there is some chance to trigger the
      issue.
      
      Link: http://lkml.kernel.org/r/20191129025011.3076017-1-guro@fb.com
      Fixes: f0a3a24b ("mm: memcg/slab: rework non-root kmem_cache lifecycle management")
      Signed-off-by: NRoman Gushchin <guro@fb.com>
      Reported-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Tested-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Reviewed-by: NShakeel Butt <shakeelb@google.com>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a264df74
    • Z
      mm/kasan/common.c: fix compile error · 2e7d3170
      zhong jiang 提交于
      I hit the following compile error in arch/x86/
      
         mm/kasan/common.c: In function kasan_populate_vmalloc:
         mm/kasan/common.c:797:2: error: implicit declaration of function flush_cache_vmap; did you mean flush_rcu_work? [-Werror=implicit-function-declaration]
           flush_cache_vmap(shadow_start, shadow_end);
           ^~~~~~~~~~~~~~~~
           flush_rcu_work
         cc1: some warnings being treated as errors
      
      Link: http://lkml.kernel.org/r/1575363013-43761-1-git-send-email-zhongjiang@huawei.com
      Fixes: 3c5c3cfb ("kasan: support backing vmalloc space with real shadow memory")
      Signed-off-by: Nzhong jiang <zhongjiang@huawei.com>
      Reviewed-by: NAndrew Morton <akpm@linux-foundation.org>
      Reviewed-by: NDaniel Axtens <dja@axtens.net>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Vasily Gorbik <gor@linux.ibm.com>
      Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2e7d3170
  2. 04 12月, 2019 13 次提交
    • L
      Merge tag 'tag-chrome-platform-for-v5.5' of... · 63de3747
      Linus Torvalds 提交于
      Merge tag 'tag-chrome-platform-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
      
      Pull chrome platform changes from Benson Leung:
       "CrOS EC / MFD / IIO:
      
         - Contains tag-ib-chrome-mfd-iio-input-5.5, which is the first part
           of a series from Gwendal to refactor sensor code between MFD, CrOS
           EC, iio and input in order to add a new sensorhub driver and FIFO
           processing
      
        Wilco EC:
      
         - Add support for Dell's USB PowerShare policy control, keyboard
           backlight LED driver, and a new test_event file.
      
         - Fixes use after free in wilco_ec's telemetry driver.
      
        Misc:
      
         - bugfix in cros_usbpd_logger (missing destroy workqueue)"
      
      * tag 'tag-chrome-platform-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
        platform/chrome: wilco_ec: fix use after free issue
        platform/chrome: cros_ec: Add Kconfig default for cros-ec-sensorhub
        Revert "Input: cros_ec_keyb: mask out extra flags in event_type"
        Revert "Input: cros_ec_keyb - add back missing mask for event_type"
        platform/chrome: cros_ec: handle MKBP more events flag
        platform/chrome: cros_ec: Do not attempt to register a non-positive IRQ number
        platform/chrome: cros-ec: Record event timestamp in the hard irq
        mfd / platform / iio: cros_ec: Register sensor through sensorhub
        iio / platform: cros_ec: Add cros-ec-sensorhub driver
        mfd / platform: cros_ec: Add sensor_count and make check_features public
        platform/chrome: cros_ec: Put docs with the code
        platform/chrome: cros_usbpd_logger: add missed destroy_workqueue in remove
        platform/chrome: cros_ec: Fix Kconfig indentation
        platform/chrome: wilco_ec: Add keyboard backlight LED support
        platform/chrome: wilco_ec: Add charging config driver
        platform/chrome: wilco_ec: Add Dell's USB PowerShare Policy control
        platform/chrome: wilco_ec: Add debugfs test_event file
      63de3747
    • L
      Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx · 388c645a
      Linus Torvalds 提交于
      Pull SPDX fix from Greg KH:
       "Here is a single SPDX fixup for 5.5-rc1
      
        It resolves an issue where we had missed a few .h files with the
        auto-tagging scripts because they had "GPL" text in strings within the
        file themselves. This single patch fixes up the issue and provides the
        proper SPDX tags at the top of them as needed.
      
        This patch has been in linux-next for many many weeks now with no
        reported issues"
      
      * tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
        export,module: add SPDX GPL-2.0 license identifier to headers with no license
      388c645a
    • L
      Merge tag 'tty-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 537bd0a1
      Linus Torvalds 提交于
      Pull tty/serial updates from Greg KH:
       "Here is the "big" tty and serial driver patches for 5.5-rc1.
      
        It's a bit later in the merge window than normal as I wanted to make
        sure some last-minute patches applied to it were all sane. They seem
        to be :)
      
        There's a lot of little stuff in here, for the tty core, and for lots
        of serial drivers:
      
         - reverts of uartlite serial driver patches that were wrong
      
         - msm-serial driver fixes
      
         - serial core updates and fixes
      
         - tty core fixes
      
         - serial driver dma mapping api changes
      
         - lots of other tiny fixes and updates for serial drivers
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'tty-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (58 commits)
        Revert "serial/8250: Add support for NI-Serial PXI/PXIe+485 devices"
        vcs: prevent write access to vcsu devices
        tty: vt: keyboard: reject invalid keycodes
        tty: don't crash in tty_init_dev when missing tty_port
        serial: stm32: fix clearing interrupt error flags
        tty: Fix Kconfig indentation, continued
        serial: serial_core: Perform NULL checks for break_ctl ops
        tty: remove unused argument from tty_open_by_driver()
        tty: Fix Kconfig indentation
        {tty: serial, nand: onenand}: samsung: rename to fix build warning
        serial: ifx6x60: add missed pm_runtime_disable
        serial: pl011: Fix DMA ->flush_buffer()
        Revert "serial-uartlite: Move the uart register"
        Revert "serial-uartlite: Add get serial id if not provided"
        Revert "serial-uartlite: Do not use static struct uart_driver out of probe()"
        Revert "serial-uartlite: Add runtime support"
        Revert "serial-uartlite: Change logic how console_port is setup"
        Revert "serial-uartlite: Use allocated structure instead of static ones"
        tty: serial: msm_serial: Use dma_request_chan() directly for channel request
        tty: serial: tegra: Use dma_request_chan() directly for channel request
        ...
      537bd0a1
    • L
      Merge tag 'pci-v5.5-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · c3bed3b2
      Linus Torvalds 提交于
      Pull PCI updates from Bjorn Helgaas:
       "Enumeration:
      
         - Warn if a host bridge has no NUMA info (Yunsheng Lin)
      
         - Add PCI_STD_NUM_BARS for the number of standard BARs (Denis
           Efremov)
      
        Resource management:
      
         - Fix boot-time Embedded Controller GPE storm caused by incorrect
           resource assignment after ACPI Bus Check Notification (Mika
           Westerberg)
      
         - Protect pci_reassign_bridge_resources() against concurrent
           addition/removal (Benjamin Herrenschmidt)
      
         - Fix bridge dma_ranges resource list cleanup (Rob Herring)
      
         - Add "pci=hpmmiosize" and "pci=hpmmioprefsize" parameters to control
           the MMIO and prefetchable MMIO window sizes of hotplug bridges
           independently (Nicholas Johnson)
      
         - Fix MMIO/MMIO_PREF window assignment that assigned more space than
           desired (Nicholas Johnson)
      
         - Only enforce bus numbers from bridge EA if the bridge has EA
           devices downstream (Subbaraya Sundeep)
      
         - Consolidate DT "dma-ranges" parsing and convert all host drivers to
           use shared parsing (Rob Herring)
      
        Error reporting:
      
         - Restore AER capability after resume (Mayurkumar Patel)
      
         - Add PoisonTLPBlocked AER counter (Rajat Jain)
      
         - Use for_each_set_bit() to simplify AER code (Andy Shevchenko)
      
         - Fix AER kernel-doc (Andy Shevchenko)
      
         - Add "pcie_ports=dpc-native" parameter to allow native use of DPC
           even if platform didn't grant control over AER (Olof Johansson)
      
        Hotplug:
      
         - Avoid returning prematurely from sysfs requests to enable or
           disable a PCIe hotplug slot (Lukas Wunner)
      
         - Don't disable interrupts twice when suspending hotplug ports (Mika
           Westerberg)
      
         - Fix deadlocks when PCIe ports are hot-removed while suspended (Mika
           Westerberg)
      
        Power management:
      
         - Remove unnecessary ASPM locking (Bjorn Helgaas)
      
         - Add support for disabling L1 PM Substates (Heiner Kallweit)
      
         - Allow re-enabling Clock PM after it has been disabled (Heiner
           Kallweit)
      
         - Add sysfs attributes for controlling ASPM link states (Heiner
           Kallweit)
      
         - Remove CONFIG_PCIEASPM_DEBUG, including "link_state" and "clk_ctl"
           sysfs files (Heiner Kallweit)
      
         - Avoid AMD FCH XHCI USB PME# from D0 defect that prevents wakeup on
           USB 2.0 or 1.1 connect events (Kai-Heng Feng)
      
         - Move power state check out of pci_msi_supported() (Bjorn Helgaas)
      
         - Fix incorrect MSI-X masking on resume and revert related nvme quirk
           for Kingston NVME SSD running FW E8FK11.T (Jian-Hong Pan)
      
         - Always return devices to D0 when thawing to fix hibernation with
           drivers like mlx4 that used legacy power management (previously we
           only did it for drivers with new power management ops) (Dexuan Cui)
      
         - Clear PCIe PME Status even for legacy power management (Bjorn
           Helgaas)
      
         - Fix PCI PM documentation errors (Bjorn Helgaas)
      
         - Use dev_printk() for more power management messages (Bjorn Helgaas)
      
         - Apply D2 delay as milliseconds, not microseconds (Bjorn Helgaas)
      
         - Convert xen-platform from legacy to generic power management (Bjorn
           Helgaas)
      
         - Removed unused .resume_early() and .suspend_late() legacy power
           management hooks (Bjorn Helgaas)
      
         - Rearrange power management code for clarity (Rafael J. Wysocki)
      
         - Decode power states more clearly ("4" or "D4" really refers to
           "D3cold") (Bjorn Helgaas)
      
         - Notice when reading PM Control register returns an error (~0)
           instead of interpreting it as being in D3hot (Bjorn Helgaas)
      
         - Add missing link delays required by the PCIe spec (Mika Westerberg)
      
        Virtualization:
      
         - Move pci_prg_resp_pasid_required() to CONFIG_PCI_PRI (Bjorn
           Helgaas)
      
         - Allow VFs to use PRI (the PF PRI is shared by the VFs, but the code
           previously didn't recognize that) (Kuppuswamy Sathyanarayanan)
      
         - Allow VFs to use PASID (the PF PASID capability is shared by the
           VFs, but the code previously didn't recognize that) (Kuppuswamy
           Sathyanarayanan)
      
         - Disconnect PF and VF ATS enablement, since ATS in PFs and
           associated VFs can be enabled independently (Kuppuswamy
           Sathyanarayanan)
      
         - Cache PRI and PASID capability offsets (Kuppuswamy Sathyanarayanan)
      
         - Cache the PRI PRG Response PASID Required bit (Bjorn Helgaas)
      
         - Consolidate ATS declarations in linux/pci-ats.h (Krzysztof
           Wilczynski)
      
         - Remove unused PRI and PASID stubs (Bjorn Helgaas)
      
         - Removed unnecessary EXPORT_SYMBOL_GPL() from ATS, PRI, and PASID
           interfaces that are only used by built-in IOMMU drivers (Bjorn
           Helgaas)
      
         - Hide PRI and PASID state restoration functions used only inside the
           PCI core (Bjorn Helgaas)
      
         - Add a DMA alias quirk for the Intel VCA NTB (Slawomir Pawlowski)
      
         - Serialize sysfs sriov_numvfs reads vs writes (Pierre Crégut)
      
         - Update Cavium ACS quirk for ThunderX2 and ThunderX3 (George
           Cherian)
      
         - Fix the UPDCR register address in the Intel ACS quirk (Steffen
           Liebergeld)
      
         - Unify ACS quirk implementations (Bjorn Helgaas)
      
        Amlogic Meson host bridge driver:
      
         - Fix meson PERST# GPIO polarity problem (Remi Pommarel)
      
         - Add DT bindings for Amlogic Meson G12A (Neil Armstrong)
      
         - Fix meson clock names to match DT bindings (Neil Armstrong)
      
         - Add meson support for Amlogic G12A SoC with separate shared PHY
           (Neil Armstrong)
      
         - Add meson extended PCIe PHY functions for Amlogic G12A USB3+PCIe
           combo PHY (Neil Armstrong)
      
         - Add arm64 DT for Amlogic G12A PCIe controller node (Neil Armstrong)
      
         - Add commented-out description of VIM3 USB3/PCIe mux in arm64 DT
           (Neil Armstrong)
      
        Broadcom iProc host bridge driver:
      
         - Invalidate iProc PAXB address mapping before programming it
           (Abhishek Shah)
      
         - Fix iproc-msi and mvebu __iomem annotations (Ben Dooks)
      
        Cadence host bridge driver:
      
         - Refactor Cadence PCIe host controller to use as a library for both
           host and endpoint (Tom Joseph)
      
        Freescale Layerscape host bridge driver:
      
         - Add layerscape LS1028a support (Xiaowei Bao)
      
        Intel VMD host bridge driver:
      
         - Add VMD bus 224-255 restriction decode (Jon Derrick)
      
         - Add VMD 8086:9A0B device ID (Jon Derrick)
      
         - Remove Keith from VMD maintainer list (Keith Busch)
      
        Marvell ARMADA 3700 / Aardvark host bridge driver:
      
         - Use LTSSM state to build link training flag since Aardvark doesn't
           implement the Link Training bit (Remi Pommarel)
      
         - Delay before training Aardvark link in case PERST# was asserted
           before the driver probe (Remi Pommarel)
      
         - Fix Aardvark issues with Root Control reads and writes (Remi
           Pommarel)
      
         - Don't rely on jiffies in Aardvark config access path since
           interrupts may be disabled (Remi Pommarel)
      
         - Fix Aardvark big-endian support (Grzegorz Jaszczyk)
      
        Marvell ARMADA 370 / XP host bridge driver:
      
         - Make mvebu_pci_bridge_emul_ops static (Ben Dooks)
      
        Microsoft Hyper-V host bridge driver:
      
         - Add hibernation support for Hyper-V virtual PCI devices (Dexuan
           Cui)
      
         - Track Hyper-V pci_protocol_version per-hbus, not globally (Dexuan
           Cui)
      
         - Avoid kmemleak false positive on hv hbus buffer (Dexuan Cui)
      
        Mobiveil host bridge driver:
      
         - Change mobiveil csr_read()/write() function names that conflict
           with riscv arch functions (Kefeng Wang)
      
        NVIDIA Tegra host bridge driver:
      
         - Fix Tegra CLKREQ dependency programming (Vidya Sagar)
      
        Renesas R-Car host bridge driver:
      
         - Remove unnecessary header include from rcar (Andrew Murray)
      
         - Tighten register index checking for rcar inbound range programming
           (Marek Vasut)
      
         - Fix rcar inbound range alignment calculation to improve packing of
           multiple entries (Marek Vasut)
      
         - Update rcar MACCTLR setting to match documentation (Yoshihiro
           Shimoda)
      
         - Clear bit 0 of MACCTLR before PCIETCTLR.CFINIT per manual
           (Yoshihiro Shimoda)
      
         - Add Marek Vasut and Yoshihiro Shimoda as R-Car maintainers (Simon
           Horman)
      
        Rockchip host bridge driver:
      
         - Make rockchip 0V9 and 1V8 power regulators non-optional (Robin
           Murphy)
      
        Socionext UniPhier host bridge driver:
      
         - Set uniphier to host (RC) mode always (Kunihiko Hayashi)
      
        Endpoint drivers:
      
         - Fix endpoint driver sign extension problem when shifting page
           number to phys_addr_t (Alan Mikhak)
      
        Misc:
      
         - Add NumaChip SPDX header (Krzysztof Wilczynski)
      
         - Replace EXTRA_CFLAGS with ccflags-y (Krzysztof Wilczynski)
      
         - Remove unused includes (Krzysztof Wilczynski)
      
         - Removed unused sysfs attribute groups (Ben Dooks)
      
         - Remove PTM and ASPM dependencies on PCIEPORTBUS (Bjorn Helgaas)
      
         - Add PCIe Link Control 2 register field definitions to replace magic
           numbers in AMDGPU and Radeon CIK/SI (Bjorn Helgaas)
      
         - Fix incorrect Link Control 2 Transmit Margin usage in AMDGPU and
           Radeon CIK/SI PCIe Gen3 link training (Bjorn Helgaas)
      
         - Use pcie_capability_read_word() instead of pci_read_config_word()
           in AMDGPU and Radeon CIK/SI (Frederick Lawler)
      
         - Remove unused pci_irq_get_node() Greg Kroah-Hartman)
      
         - Make asm/msi.h mandatory and simplify PCI_MSI_IRQ_DOMAIN Kconfig
           (Palmer Dabbelt, Michal Simek)
      
         - Read all 64 bits of Switchtec part_event_bitmap (Logan Gunthorpe)
      
         - Fix erroneous intel-iommu dependency on CONFIG_AMD_IOMMU (Bjorn
           Helgaas)
      
         - Fix bridge emulation big-endian support (Grzegorz Jaszczyk)
      
         - Fix dwc find_next_bit() usage (Niklas Cassel)
      
         - Fix pcitest.c fd leak (Hewenliang)
      
         - Fix typos and comments (Bjorn Helgaas)
      
         - Fix Kconfig whitespace errors (Krzysztof Kozlowski)"
      
      * tag 'pci-v5.5-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (160 commits)
        PCI: Remove PCI_MSI_IRQ_DOMAIN architecture whitelist
        asm-generic: Make msi.h a mandatory include/asm header
        Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
        PCI/MSI: Fix incorrect MSI-X masking on resume
        PCI/MSI: Move power state check out of pci_msi_supported()
        PCI/MSI: Remove unused pci_irq_get_node()
        PCI: hv: Avoid a kmemleak false positive caused by the hbus buffer
        PCI: hv: Change pci_protocol_version to per-hbus
        PCI: hv: Add hibernation support
        PCI: hv: Reorganize the code in preparation of hibernation
        MAINTAINERS: Remove Keith from VMD maintainer
        PCI/ASPM: Remove PCIEASPM_DEBUG Kconfig option and related code
        PCI/ASPM: Add sysfs attributes for controlling ASPM link states
        PCI: Fix indentation
        drm/radeon: Prefer pcie_capability_read_word()
        drm/radeon: Replace numbers with PCI_EXP_LNKCTL2 definitions
        drm/radeon: Correct Transmit Margin masks
        drm/amdgpu: Prefer pcie_capability_read_word()
        PCI: uniphier: Set mode register to host mode
        drm/amdgpu: Replace numbers with PCI_EXP_LNKCTL2 definitions
        ...
      c3bed3b2
    • L
      Merge tag 'rtc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 4672c2f2
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "A lot of unnecessary code removal in here that ends up decreasing the
        number of lines in the subsystem. The ds1343 and ds1347 drivers got
        cleaned up. The rest are the usual fixes and new features.
      
        Subsystem:
         - fix warnings and errors with make W=1
         - UIE are now disabled while setting the RTC time
         - UIE are now disallowed when the RTC time is not set.
      
        Drivers:
         - remove unecessary .remove callbacks
         - Set RTC range for cros-ec, ds1343, ds1347, m41t80, s35390a, vt8500
         - Use devm_platform_ioremap_resource where applicable
         - rv3028: add clock out support"
      
      * tag 'rtc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (81 commits)
        rtc: Fix Kconfig indentation
        rtc: xgene: Remove unused struct device in struct xgene_rtc_dev
        rtc: sun6i: Remove struct device from sun6i_rtc_dev
        rtc: st-lpc: Remove struct resource from struct st_rtc
        rtc: pcf8523: Remove struct pcf8523
        rtc: meson: remove redundant assignment to variable retries
        rtc: v3020: remove set but unused variable
        rtc: tegra: remove set but unused variable
        rtc: pm8xxx: update kerneldoc for struct pm8xxx_rtc
        rtc: m41t80: remove excess kerneldoc
        rtc: ds1685: fix build error with make W=1
        rtc: ds1685: remove set but unused variables
        rtc: ds1374: remove unused variable
        rtc: sysfs: fix hctosys_show kerneldoc
        rtc: interface: fix kerneldoc comments
        rtc: msm6242: Remove unneeded msm6242_set()/msm6242_clear() functions
        rtc: msm6242: Fix reading of 10-hour digit
        rtc: tps65910: allow using RTC without alarm interrupt
        rtc: fsl-ftm-alarm: remove select FSL_RCPM and default y from Kconfig
        rtc: pcf8563: Constify clkout_rates
        ...
      4672c2f2
    • L
      Merge tag 'iomap-5.5-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 2a31aca5
      Linus Torvalds 提交于
      Pull iomap cleanups from Darrick Wong:
       "Aome more new iomap code for 5.5.
      
        There's not much this time -- just removing some local variables that
        don't need to exist in the iomap directio code"
      
      * tag 'iomap-5.5-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        iomap: remove unneeded variable in iomap_dio_rw()
        iomap: Do not create fake iter in iomap_dio_bio_actor()
      2a31aca5
    • L
      Merge tag 'apparmor-pr-2019-12-03' of... · 79e178a5
      Linus Torvalds 提交于
      Merge tag 'apparmor-pr-2019-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
      
      Pull apparmor updates from John Johansen:
       "Features:
      
         - increase left match history buffer size to provide improved
           conflict resolution in overlapping execution rules.
      
         - switch buffer allocation to use a memory pool and GFP_KERNEL where
           possible.
      
         - add compression of policy blobs to reduce memory usage.
      
        Cleanups:
      
         - fix spelling mistake "immutible" -> "immutable"
      
        Bug fixes:
      
         - fix unsigned len comparison in update_for_len macro
      
         - fix sparse warning for type-casting of current->real_cred"
      
      * tag 'apparmor-pr-2019-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
        apparmor: make it so work buffers can be allocated from atomic context
        apparmor: reduce rcu_read_lock scope for aa_file_perm mediation
        apparmor: fix wrong buffer allocation in aa_new_mount
        apparmor: fix unsigned len comparison with less than zero
        apparmor: increase left match history buffer size
        apparmor: Switch to GFP_KERNEL where possible
        apparmor: Use a memory pool instead per-CPU caches
        apparmor: Force type-casting of current->real_cred
        apparmor: fix spelling mistake "immutible" -> "immutable"
        apparmor: fix blob compression when ns is forced on a policy load
        apparmor: fix missing ZLIB defines
        apparmor: fix blob compression build failure on ppc
        apparmor: Initial implementation of raw policy blob compression
      79e178a5
    • L
      Merge tag 's390-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 01d1dff6
      Linus Torvalds 提交于
      Pull more s390 updates from Vasily Gorbik:
      
       - Make stack unwinder reliable and suitable for livepatching. Add
         unwinder testing module.
      
       - Fixes for CALL_ON_STACK helper used for stack switching.
      
       - Fix unwinding from bpf code.
      
       - Fix getcpu and remove compat support in vdso code.
      
       - Fix address space control registers initialization.
      
       - Save KASLR offset for early dumps.
      
       - Handle new FILTERED_BY_HYPERVISOR reply code in crypto code.
      
       - Minor perf code cleanup and potential memory leak fix.
      
       - Add couple of error messages for corner cases during PCI device
         creation.
      
      * tag 's390-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (33 commits)
        s390: remove compat vdso code
        s390/livepatch: Implement reliable stack tracing for the consistency model
        s390/unwind: add stack pointer alignment sanity checks
        s390/unwind: filter out unreliable bogus %r14
        s390/unwind: start unwinding from reliable state
        s390/test_unwind: add program check context tests
        s390/test_unwind: add irq context tests
        s390/test_unwind: print verbose unwinding results
        s390/test_unwind: add CALL_ON_STACK tests
        s390: fix register clobbering in CALL_ON_STACK
        s390/test_unwind: require that unwinding ended successfully
        s390/unwind: add a test for the internal API
        s390/unwind: always inline get_stack_pointer
        s390/pci: add error message on device number limit
        s390/pci: add error message for UID collision
        s390/cpum_sf: Check for SDBT and SDB consistency
        s390/cpum_sf: Use TEAR_REG macro consistantly
        s390/cpum_sf: Remove unnecessary check for pending SDBs
        s390/cpum_sf: Replace function name in debug statements
        s390/kaslr: store KASLR offset for early dumps
        ...
      01d1dff6
    • L
      Merge tag 'xtensa-20191201' of git://github.com/jcmvbkbc/linux-xtensa · 4d7048f5
      Linus Torvalds 提交于
      Pull Xtensa updates from Max Filippov:
      
       - add support for execute in place (XIP) kernels
      
       - improvements in inline assembly: use named arguments and "m"
         constraints where possible
      
       - improve stack dumping
      
       - clean up system_call code and syscall tracing
      
       - various small fixes and cleanups
      
      * tag 'xtensa-20191201' of git://github.com/jcmvbkbc/linux-xtensa: (30 commits)
        xtensa: clean up system_call/xtensa_rt_sigreturn interaction
        xtensa: fix system_call interaction with ptrace
        xtensa: rearrange syscall tracing
        xtensa: fix syscall_set_return_value
        xtensa: drop unneeded headers from coprocessor.S
        xtensa: entry: Remove unneeded need_resched() loop
        xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map
        xtensa: fix TLB sanity checker
        xtensa: get rid of __ARCH_USE_5LEVEL_HACK
        xtensa: mm: fix PMD folding implementation
        xtensa: make stack dump size configurable
        xtensa: improve stack dumping
        xtensa: use "m" constraint instead of "r" in futex.h assembly
        xtensa: use "m" constraint instead of "a" in cmpxchg.h assembly
        xtensa: use named assembly arguments in cmpxchg.h
        xtensa: use "m" constraint instead of "a" in atomic.h assembly
        xtensa: use named assembly arguments in atomic.h
        xtensa: use "m" constraint instead of "a" in bitops.h assembly
        xtensa: use named assembly arguments in bitops.h
        xtensa: use macros to generate *_bit and test_and_*_bit functions
        ...
      4d7048f5
    • L
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 043cf468
      Linus Torvalds 提交于
      Pull timer updates from Ingo Molnar:
       "The main changes in the timer code in this cycle were:
      
         - Clockevent updates:
      
            - timer-of framework cleanups. (Geert Uytterhoeven)
      
            - Use timer-of for the renesas-ostm and the device name to prevent
              name collision in case of multiple timers. (Geert Uytterhoeven)
      
            - Check if there is an error after calling of_clk_get in asm9260
              (Chuhong Yuan)
      
         - ABI fix: Zero out high order bits of nanoseconds on compat
           syscalls. This got broken a year ago, with apparently no side
           effects so far.
      
           Since the kernel would use random data otherwise I don't think we'd
           have other options but to fix the bug, even if there was a side
           effect to applications (Dmitry Safonov)
      
         - Optimize ns_to_timespec64() on 32-bit systems: move away from
           div_s64_rem() which can be slow, to div_u64_rem() which is faster
           (Arnd Bergmann)
      
         - Annotate KCSAN-reported false positive data races in
           hrtimer_is_queued() users by moving timer->state handling over to
           the READ_ONCE()/WRITE_ONCE() APIs. This documents these accesses
           (Eric Dumazet)
      
         - Misc cleanups and small fixes"
      
      [ I undid the "ABI fix" and updated the comments instead. The reason
        there were apparently no side effects is that the fix was a no-op.
      
        The updated comment is to say _why_ it was a no-op.    - Linus ]
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        time: Zero the upper 32-bits in __kernel_timespec on 32-bit
        time: Rename tsk->real_start_time to ->start_boottime
        hrtimer: Remove the comment about not used HRTIMER_SOFTIRQ
        time: Fix spelling mistake in comment
        time: Optimize ns_to_timespec64()
        hrtimer: Annotate lockless access to timer->state
        clocksource/drivers/asm9260: Add a check for of_clk_get
        clocksource/drivers/renesas-ostm: Use unique device name instead of ostm
        clocksource/drivers/renesas-ostm: Convert to timer_of
        clocksource/drivers/timer-of: Use unique device name instead of timer
        clocksource/drivers/timer-of: Convert last full_name to %pOF
      043cf468
    • L
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b22bfea7
      Linus Torvalds 提交于
      Pull irq updates from Ingo Molnar:
       "Most of the IRQ subsystem changes in this cycle were irq-chip driver
        updates:
      
         - Qualcomm PDC wakeup interrupt support
      
         - Layerscape external IRQ support
      
         - Broadcom bcm7038 PM and wakeup support
      
         - Ingenic driver cleanup and modernization
      
         - GICv3 ITS preparation for GICv4.1 updates
      
         - GICv4 fixes
      
        There's also the series from Frederic Weisbecker that fixes memory
        ordering bugs for the irq-work logic, whose primary fix is to turn
        work->irq_work.flags into an atomic variable and then convert the
        complex (and buggy) atomic_cmpxchg() loop in irq_work_claim() into a
        much simpler atomic_fetch_or() call.
      
        There are also various smaller cleanups"
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
        pinctrl/sdm845: Add PDC wakeup interrupt map for GPIOs
        pinctrl/msm: Setup GPIO chip in hierarchy
        irqchip/qcom-pdc: Add irqchip set/get state calls
        irqchip/qcom-pdc: Add irqdomain for wakeup capable GPIOs
        irqchip/qcom-pdc: Do not toggle IRQ_ENABLE during mask/unmask
        irqchip/qcom-pdc: Update max PDC interrupts
        of/irq: Document properties for wakeup interrupt parent
        genirq: Introduce irq_chip_get/set_parent_state calls
        irqdomain: Add bus token DOMAIN_BUS_WAKEUP
        genirq: Fix function documentation of __irq_alloc_descs()
        irq_work: Fix IRQ_WORK_BUSY bit clearing
        irqchip/ti-sci-inta: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))
        irq_work: Slightly simplify IRQ_WORK_PENDING clearing
        irq_work: Fix irq_work_claim() memory ordering
        irq_work: Convert flags to atomic_t
        irqchip: Ingenic: Add process for more than one irq at the same time.
        irqchip: ingenic: Alloc generic chips from IRQ domain
        irqchip: ingenic: Get virq number from IRQ domain
        irqchip: ingenic: Error out if IRQ domain creation failed
        irqchip: ingenic: Drop redundant irq_suspend / irq_resume functions
        ...
      b22bfea7
    • L
      Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 2dff2a1c
      Linus Torvalds 提交于
      Pull dmi updates from Jean Delvare.
      
      * 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        firmware: dmi: Add dmi_memdev_handle
        firmware: dmi: Remember the memory type
      2dff2a1c
    • L
      Merge branch 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu · 2352923c
      Linus Torvalds 提交于
      Pull percpu updates from Dennis Zhou:
       "This has a change to fix percpu-refcount for RT kernels because
        rcu-sched disables preemption and the refcount release callback might
        acquire a spinlock"
      
      * 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
        Revert "percpu: add __percpu to SHIFT_PERCPU_PTR"
        percpu-refcount: Use normal instead of RCU-sched"
        percpu: add __percpu to SHIFT_PERCPU_PTR
      2352923c
  3. 03 12月, 2019 16 次提交
    • J
      firmware: dmi: Add dmi_memdev_handle · 7c237880
      Jean Delvare 提交于
      Add a utility function dmi_memdev_handle() which returns the DMI
      handle associated with a given memory slot. This will allow kernel
      drivers to iterate over the memory slots.
      Signed-off-by: NJean Delvare <jdelvare@suse.de>
      7c237880
    • J
      firmware: dmi: Remember the memory type · 9e0afe39
      Jean Delvare 提交于
      Store the memory type while walking the memory slots, and provide a
      way to retrieve it later.
      Signed-off-by: NJean Delvare <jdelvare@suse.de>
      9e0afe39
    • L
      Merge tag 'kbuild-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 76bb8b05
      Linus Torvalds 提交于
      Pull Kbuild updates from Masahiro Yamada:
      
       - remove unneeded asm headers from hexagon, ia64
      
       - add 'dir-pkg' target, which works like 'tar-pkg' but skips archiving
      
       - add 'helpnewconfig' target, which shows help for new CONFIG options
      
       - support 'make nsdeps' for external modules
      
       - make rebuilds faster by deleting $(wildcard $^) checks
      
       - remove compile tests for kernel-space headers
      
       - refactor modpost to simplify modversion handling
      
       - make single target builds faster
      
       - optimize and clean up scripts/kallsyms.c
      
       - refactor various Makefiles and scripts
      
      * tag 'kbuild-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (59 commits)
        MAINTAINERS: update Kbuild/Kconfig maintainer's email address
        scripts/kallsyms: remove redundant initializers
        scripts/kallsyms: put check_symbol_range() calls close together
        scripts/kallsyms: make check_symbol_range() void function
        scripts/kallsyms: move ignored symbol types to is_ignored_symbol()
        scripts/kallsyms: move more patterns to the ignored_prefixes array
        scripts/kallsyms: skip ignored symbols very early
        scripts/kallsyms: add const qualifiers where possible
        scripts/kallsyms: make find_token() return (unsigned char *)
        scripts/kallsyms: replace prefix_underscores_count() with strspn()
        scripts/kallsyms: add sym_name() to mitigate cast ugliness
        scripts/kallsyms: remove unneeded length check for prefix matching
        scripts/kallsyms: remove redundant is_arm_mapping_symbol()
        scripts/kallsyms: set relative_base more effectively
        scripts/kallsyms: shrink table before sorting it
        scripts/kallsyms: fix definitely-lost memory leak
        scripts/kallsyms: remove unneeded #ifndef ARRAY_SIZE
        kbuild: make single target builds even faster
        modpost: respect the previous export when 'exported twice' is warned
        modpost: do not set ->preloaded for symbols from Module.symvers
        ...
      76bb8b05
    • L
      Merge tag 'linux-kselftest-5.5-rc1-fixes2' of... · e30dbe50
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-5.5-rc1-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull more kselftest fixes from Shuah Khan:
       "This second Kselftest fixes update for Linux 5.5-rc1 consists of an
        urgent revert to fix regression in CI coverage"
      
      * tag 'linux-kselftest-5.5-rc1-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        Revert "selftests: Fix O= and KBUILD_OUTPUT handling for relative paths"
      e30dbe50
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 483847a7
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
      
       - Fix build error in crypto lib code when crypto API is off
      
       - Fix NULL/error check in hisilicon
      
       - Fix Kconfig-related build error in talitos
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()
        crypto: talitos - Fix build error by selecting LIB_DES
        crypto: arch - conditionalize crypto api in arch glue for lib code
      483847a7
    • L
      Merge tag 'for-linus' of git://github.com/openrisc/linux · 120e4768
      Linus Torvalds 提交于
      Pull OpenRISC update from Stafford Horne:
       "White space fixups in Kconfig files from Krzysztof Kozlowski"
      
      * tag 'for-linus' of git://github.com/openrisc/linux:
        openrisc: Fix Kconfig indentation
      120e4768
    • L
      Merge tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · fcaa0ad7
      Linus Torvalds 提交于
      Pull UML updates from Richard Weinberger:
      
       - Fixes for our new virtio code
      
       - Fix for the irqflags tracer
      
       - Kconfig coding style fixes
      
       - Allow BPF firmware loading in our vector driver
      
      * tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: Loadable BPF "Firmware" for vector drivers
        um: Fix Kconfig indentation
        um: virtio_uml: Disallow modular build
        um: virtio: Keep reading on -EAGAIN
        um: virtio: Remove device on disconnect
        um: Don't trace irqflags during shutdown
      fcaa0ad7
    • L
      Merge tag 'upstream-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs · e3a251e3
      Linus Torvalds 提交于
      Pull UBI/UBIFS/JFFS2 updates from Richard Weinberger:
       "This pull request contains mostly fixes for UBI, UBIFS and JFFS2:
      
        UBI:
      
         - Fix a regression around producing a anchor PEB for fastmap.
      
           Due to a change in our locking fastmap was unable to produce fresh
           anchors an re-used the existing one a way to often.
      
        UBIFS:
      
         - Fixes for endianness. A few places blindly assumed little endian.
      
         - Fix for a memory leak in the orphan code.
      
         - Fix for a possible crash during a commit.
      
         - Revert a wrong bugfix.
      
        JFFS2:
      
         - Revert a bad bugfix (false positive from a code checking tool)"
      
      * tag 'upstream-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
        Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"
        ubi: Fix producing anchor PEBs
        ubifs: ubifs_tnc_start_commit: Fix OOB in layout_in_gaps
        ubifs: do_kill_orphans: Fix a memory leak bug
        Revert "ubifs: Fix memory leak bug in alloc_ubifs_info() error path"
        ubifs: Fix type of sup->hash_algo
        ubifs: Fixed missed le64_to_cpu() in journal
        ubifs: Force prandom result to __le32
        ubifs: Remove obsolete TODO from dfs_file_write()
        ubi: Fix warning static is not at beginning of declaration
        ubi: Print skip_check in ubi_dump_vol_info()
      e3a251e3
    • L
      Merge tag 'xfs-5.5-merge-16' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 97eeb4d9
      Linus Torvalds 提交于
      Pull XFS updates from Darrick Wong:
       "For this release, we changed quite a few things.
      
        Highlights:
      
         - Fixed some long tail latency problems in the block allocator
      
         - Removed some long deprecated (and for the past several years no-op)
           mount options and ioctls
      
         - Strengthened the extended attribute and directory verifiers
      
         - Audited and fixed all the places where we could return EFSCORRUPTED
           without logging anything
      
         - Refactored the old SGI space allocation ioctls to make the
           equivalent fallocate calls
      
         - Fixed a race between fallocate and directio
      
         - Fixed an integer overflow when files have more than a few
           billion(!) extents
      
         - Fixed a longstanding bug where quota accounting could be incorrect
           when performing unwritten extent conversion on a freshly mounted fs
      
         - Fixed various complaints in scrub about soft lockups and
           unresponsiveness to signals
      
         - De-vtable'd the directory handling code, which should make it
           faster
      
         - Converted to the new mount api, for better or for worse
      
         - Cleaned up some memory leaks
      
        and quite a lot of other smaller fixes and cleanups.
      
        A more detailed summary:
      
         - Fill out the build string
      
         - Prevent inode fork extent count overflows
      
         - Refactor the allocator to reduce long tail latency
      
         - Rework incore log locking a little to reduce spinning
      
         - Break up the xfs_iomap_begin functions into smaller more cohesive
           parts
      
         - Fix allocation alignment being dropped too early when the
           allocation request is for more blocks than an AG is large
      
         - Other small cleanups
      
         - Clean up file buftarg retrieval helpers
      
         - Hoist the resvsp and unresvsp ioctls to the vfs
      
         - Remove the undocumented biosize mount option, since it has never
           been mentioned as existing or supported on linux
      
         - Clean up some of the mount option printing and parsing
      
         - Enhance attr leaf verifier to check block structure
      
         - Check dirent and attr names for invalid characters before passing
           them to the vfs
      
         - Refactor open-coded bmbt walking
      
         - Fix a few places where we return EIO instead of EFSCORRUPTED after
           failing metadata sanity checks
      
         - Fix a synchronization problem between fallocate and aio dio
           corrupting the file length
      
         - Clean up various loose ends in the iomap and bmap code
      
         - Convert to the new mount api
      
         - Make sure we always log something when returning EFSCORRUPTED
      
         - Fix some problems where long running scrub loops could trigger soft
           lockup warnings and/or fail to exit due to fatal signals pending
      
         - Fix various Coverity complaints
      
         - Remove most of the function pointers from the directory code to
           reduce indirection penalties
      
         - Ensure that dquots are attached to the inode when performing
           unwritten extent conversion after io
      
         - Deuglify incore projid and crtime types
      
         - Fix another AGI/AGF locking order deadlock when renaming
      
         - Clean up some quota typedefs
      
         - Remove the FSSETDM ioctls which haven't done anything in 20 years
      
         - Fix some memory leaks when mounting the log fails
      
         - Fix an underflow when updating an xattr leaf freemap
      
         - Remove some trivial wrappers
      
         - Report metadata corruption as an error, not a (potentially) fatal
           assertion
      
         - Clean up the dir/attr buffer mapping code
      
         - Allow fatal signals to kill scrub during parent pointer checks"
      
      * tag 'xfs-5.5-merge-16' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (198 commits)
        xfs: allow parent directory scans to be interrupted with fatal signals
        xfs: remove the mappedbno argument to xfs_da_get_buf
        xfs: remove the mappedbno argument to xfs_da_read_buf
        xfs: split xfs_da3_node_read
        xfs: remove the mappedbno argument to xfs_dir3_leafn_read
        xfs: remove the mappedbno argument to xfs_dir3_leaf_read
        xfs: remove the mappedbno argument to xfs_attr3_leaf_read
        xfs: remove the mappedbno argument to xfs_da_reada_buf
        xfs: improve the xfs_dabuf_map calling conventions
        xfs: refactor xfs_dabuf_map
        xfs: simplify mappedbno handling in xfs_da_{get,read}_buf
        xfs: report corruption only as a regular error
        xfs: Remove kmem_zone_free() wrapper
        xfs: Remove kmem_zone_destroy() wrapper
        xfs: Remove slab init wrappers
        xfs: fix attr leaf header freemap.size underflow
        xfs: fix some memory leaks in log recovery
        xfs: fix another missing include
        xfs: remove XFS_IOC_FSSETDM and XFS_IOC_FSSETDM_BY_HANDLE
        xfs: remove duplicated include from xfs_dir2_data.c
        ...
      97eeb4d9
    • L
      Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · 9b326948
      Linus Torvalds 提交于
      Pull FireWire updates from Stefan Richter:
      
       - another y2038 fix
      
       - janitorial code movement
      
      * tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: core: code cleanup after vm_map_pages_zero introduction
        firewire: ohci: stop using get_seconds() for BUS_TIME
      9b326948
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · ef2cc88e
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This is mostly update of the usual drivers: aacraid, ufs, zfcp,
        NCR5380, lpfc, qla2xxx, smartpqi, hisi_sas, target, mpt3sas, pm80xx
        plus a whole load of minor updates and fixes.
      
        The major core changes are Al Viro's reworking of sg's handling of
        copy to/from user, Ming Lei's removal of the host busy counter to
        avoid contention in the multiqueue case and Damien Le Moal's fixing of
        residual tracking across error handling"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (251 commits)
        scsi: bnx2fc: timeout calculation invalid for bnx2fc_eh_abort()
        scsi: target: core: Fix a pr_debug() argument
        scsi: iscsi: Don't send data to unbound connection
        scsi: target: iscsi: Wait for all commands to finish before freeing a session
        scsi: target: core: Release SPC-2 reservations when closing a session
        scsi: target: core: Document target_cmd_size_check()
        scsi: bnx2i: fix potential use after free
        Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
        scsi: NCR5380: Add disconnect_mask module parameter
        scsi: NCR5380: Unconditionally clear ICR after do_abort()
        scsi: NCR5380: Call scsi_set_resid() on command completion
        scsi: scsi_debug: num_tgts must be >= 0
        scsi: lpfc: use hdwq assigned cpu for allocation
        scsi: arcmsr: fix indentation issues
        scsi: qla4xxx: fix double free bug
        scsi: pm80xx: Modified the logic to collect fatal dump
        scsi: pm80xx: Tie the interrupt name to the module instance
        scsi: pm80xx: Controller fatal error through sysfs
        scsi: pm80xx: Do not request 12G sas speeds
        scsi: pm80xx: Cleanup command when a reset times out
        ...
      ef2cc88e
    • L
      Merge tag 'docs-5.5a' of git://git.lwn.net/linux · 937d6eef
      Linus Torvalds 提交于
      Pull Documentation updates from Jonathan Corbet:
       "Here are the main documentation changes for 5.5:
      
         - Various kerneldoc script enhancements.
      
         - More RST conversions; those are slowing down as we run out of
           things to convert, but we're a ways from done still.
      
         - Dan's "maintainer profile entry" work landed at last. Now we just
           need to get maintainers to fill in the profiles...
      
         - A reworking of the parallel build setup to work better with a
           variety of systems (and to not take over huge systems entirely in
           particular).
      
         - The MAINTAINERS file is now converted to RST during the build.
           Hopefully nobody ever tries to print this thing, or they will need
           to load a lot of paper.
      
         - A script and documentation making it easy for maintainers to add
           Link: tags at commit time.
      
        Also included is the removal of a bunch of spurious CR characters"
      
      * tag 'docs-5.5a' of git://git.lwn.net/linux: (91 commits)
        docs: remove a bunch of stray CRs
        docs: fix up the maintainer profile document
        libnvdimm, MAINTAINERS: Maintainer Entry Profile
        Maintainer Handbook: Maintainer Entry Profile
        MAINTAINERS: Reclaim the P: tag for Maintainer Entry Profile
        docs, parallelism: Rearrange how jobserver reservations are made
        docs, parallelism: Do not leak blocking mode to other readers
        docs, parallelism: Fix failure path and add comment
        Documentation: Remove bootmem_debug from kernel-parameters.txt
        Documentation: security: core.rst: fix warnings
        Documentation/process/howto/kokr: Update for 4.x -> 5.x versioning
        Documentation/translation: Use Korean for Korean translation title
        docs/memory-barriers.txt: Remove remaining references to mmiowb()
        docs/memory-barriers.txt/kokr: Update I/O section to be clearer about CPU vs thread
        docs/memory-barriers.txt/kokr: Fix style, spacing and grammar in I/O section
        Documentation/kokr: Kill all references to mmiowb()
        docs/memory-barriers.txt/kokr: Rewrite "KERNEL I/O BARRIER EFFECTS" section
        docs: Add initial documentation for devfreq
        Documentation: Document how to get links with git am
        docs: Add request_irq() documentation
        ...
      937d6eef
    • L
      Merge tag 'devicetree-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 2c97b5ae
      Linus Torvalds 提交于
      Pull Devicetree updates from Rob Herring:
      
       - DT schemas for PWM, syscon, power domains, SRAM, syscon-reboot,
         syscon-poweroff, renesas-irqc, simple-pm-bus, renesas-bsc, pwm-rcar,
         Renesas tpu, at24 eeprom, rtc-sh, Allwinner PS/2, sharp,ld-d5116z01b
         panel, Arm SMMU, max77650, Meson CEC, Amlogic canvas and DWC3 glue,
         Allwinner A10 mUSB and CAN, TI Davinci MDIO, QCom QCS404
         interconnect, Unisoc/Spreadtrum SoCs and UART
      
       - Convert a bunch of Samsung bindings to DT schema
      
       - Convert a bunch of ST stm32 bindings to DT schema
      
       - Realtek and Exynos additions to Arm Mali bindings
      
       - Fix schema errors in RiscV CPU schema
      
       - Various schema fixes from improved meta-schema checks
      
       - Improve the handling of 'dma-ranges' and in particular fix DMA mask
         setup on PCI bridges
      
       - Fix a memory leak in add_changeset_property() and DT unit tests.
      
       - Several documentation improvements for schema validation
      
       - Rework build rules to improve schema validation errors
      
       - Color output for dtx_diff
      
      * tag 'devicetree-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (138 commits)
        libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h
        dt-bindings: arm: Remove leftover axentia.txt
        of: unittest: fix memory leak in attach_node_and_children
        of: overlay: add_changeset_property() memory leak
        dt-bindings: interrupt-controller: arm,gic-v3: Add missing type to interrupt-partition-* nodes
        dt-bindings: firmware: ixp4xx: Drop redundant minItems/maxItems
        dt-bindings: power: Rename back power_domain.txt bindings to fix references
        dt-bindings: i2c: stm32: Migrate i2c-stm32 documentation to yaml
        dt-bindings: mtd: Convert stm32 fmc2-nand bindings to json-schema
        dt-bindings: remoteproc: convert stm32-rproc to json-schema
        dt-bindings: mailbox: convert stm32-ipcc to json-schema
        dt-bindings: mfd: Convert stm32 low power timers bindings to json-schema
        dt-bindings: interrupt-controller: Convert stm32-exti to json-schema
        dt-bindings: crypto: Convert stm32 HASH bindings to json-schema
        dt-bindings: rng: Convert stm32 RNG bindings to json-schema
        dt-bindings: pwm: Convert Samsung PWM bindings to json-schema
        dt-bindings: pwm: Convert PWM bindings to json-schema
        dt-bindings: serial: Add a new compatible string for SC9863A
        dt-bindings: serial: Convert sprd-uart to json-schema
        dt-bindings: arm: Add bindings for Unisoc SC9863A
        ...
      2c97b5ae
    • L
      Merge tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 8328dd2f
      Linus Torvalds 提交于
      Pull pstore bug fix from Kees Cook:
      
       - add missing "static" (Ben Dooks)
      
      * tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        pstore: Make pstore_choose_compression() static
      8328dd2f
    • L
      Merge tag 'iommu-updates-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 1daa56bc
      Linus Torvalds 提交于
      Pull iommu updates from Joerg Roedel:
      
       - Conversion of the AMD IOMMU driver to use the dma-iommu code for
         imlementing the DMA-API. This gets rid of quite some code in the
         driver itself, but also has some potential for regressions (non are
         known at the moment).
      
       - Support for the Qualcomm SMMUv2 implementation in the SDM845 SoC.
         This also includes some firmware interface changes, but those are
         acked by the respective maintainers.
      
       - Preparatory work to support two distinct page-tables per domain in
         the ARM-SMMU driver
      
       - Power management improvements for the ARM SMMUv2
      
       - Custom PASID allocator support
      
       - Multiple PCI DMA alias support for the AMD IOMMU driver
      
       - Adaption of the Mediatek driver to the changed IO/TLB flush interface
         of the IOMMU core code.
      
       - Preparatory patches for the Renesas IOMMU driver to support future
         hardware.
      
      * tag 'iommu-updates-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (62 commits)
        iommu/rockchip: Don't provoke WARN for harmless IRQs
        iommu/vt-d: Turn off translations at shutdown
        iommu/vt-d: Check VT-d RMRR region in BIOS is reported as reserved
        iommu/arm-smmu: Remove duplicate error message
        iommu/arm-smmu-v3: Don't display an error when IRQ lines are missing
        iommu/ipmmu-vmsa: Add utlb_offset_base
        iommu/ipmmu-vmsa: Add helper functions for "uTLB" registers
        iommu/ipmmu-vmsa: Calculate context registers' offset instead of a macro
        iommu/ipmmu-vmsa: Add helper functions for MMU "context" registers
        iommu/ipmmu-vmsa: tidyup register definitions
        iommu/ipmmu-vmsa: Remove all unused register definitions
        iommu/mediatek: Reduce the tlb flush timeout value
        iommu/mediatek: Get rid of the pgtlock
        iommu/mediatek: Move the tlb_sync into tlb_flush
        iommu/mediatek: Delete the leaf in the tlb_flush
        iommu/mediatek: Use gather to achieve the tlb range flush
        iommu/mediatek: Add a new tlb_lock for tlb_flush
        iommu/mediatek: Correct the flush_iotlb_all callback
        iommu/io-pgtable-arm: Rename IOMMU_QCOM_SYS_CACHE and improve doc
        iommu/io-pgtable-arm: Rationalise MAIR handling
        ...
      1daa56bc
    • L
      Merge tag 'dmaengine-5.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma · a5255bc3
      Linus Torvalds 提交于
      Pull dmaengine updates from Vinod Koul:
       "Here are the changes this time around, couple of new drivers and
        updates to few more:
      
         - New drivers for SiFive PDMA, Socionext Milbeaut HDMAC and XDMAC,
           Freescale dpaa2 qDMA
      
         - Support for X1000 in JZ4780
      
         - Xilinx dma updates and support for Xilinx AXI MCDM controller
      
         - New bindings for rcar R8A774B1
      
         - Minor updates to dw, dma-jz4780, ti-edma, sprd drivers"
      
      * tag 'dmaengine-5.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (61 commits)
        dmaengine: Fix Kconfig indentation
        dmaengine: sf-pdma: move macro to header file
        dmaengine: sf-pdma: replace /** with /* for non-function comment
        dmaengine: ti: edma: fix missed failure handling
        dmaengine: mmp_pdma: add missed of_dma_controller_free
        dmaengine: mmp_tdma: add missed of_dma_controller_free
        dmaengine: sprd: Add wrap address support for link-list mode
        MAINTAINERS: Add Green as SiFive PDMA driver maintainer
        dmaengine: sf-pdma: add platform DMA support for HiFive Unleashed A00
        dt-bindings: dmaengine: sf-pdma: add bindins for SiFive PDMA
        dmaengine: zx: remove: removed dmam_pool_destroy
        dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails
        dmaengine: iop-adma: clean up an indentation issue
        dmaengine: milbeaut-xdmac: remove redundant error log
        dmaengine: milbeaut-hdmac: remove redundant error log
        dmaengine: dma-jz4780: add missed clk_disable_unprepare in remove
        dmaengine: JZ4780: Add support for the X1000.
        dt-bindings: dmaengine: Add X1000 bindings.
        dmaengine: xilinx_dma: Add Xilinx AXI MCDMA Engine driver support
        dmaengine: xilinx_dma: Extend dma_config struct to store irq routine handle
        ...
      a5255bc3
  4. 02 12月, 2019 9 次提交
    • W
      platform/chrome: wilco_ec: fix use after free issue · 856a0a6e
      Wen Yang 提交于
      This is caused by dereferencing 'dev_data' after put_device() in
      the telem_device_remove() function.
      This patch just moves the put_device() down a bit to avoid this
      issue.
      
      Fixes: 1210d1e6 ("platform/chrome: wilco_ec: Add telemetry char device interface")
      Signed-off-by: NWen Yang <wenyang@linux.alibaba.com>
      Cc: Benson Leung <bleung@chromium.org>
      Cc: Enric Balletbo i Serra <enric.balletbo@collabora.com>
      Cc: Nick Crews <ncrews@chromium.org>
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: NEnric Balletbo i Serra <enric.balletbo@collabora.com>
      856a0a6e
    • L
      Merge branch 'akpm' (patches from Andrew) · 596cf45c
      Linus Torvalds 提交于
      Merge updates from Andrew Morton:
       "Incoming:
      
         - a small number of updates to scripts/, ocfs2 and fs/buffer.c
      
         - most of MM
      
        I still have quite a lot of material (mostly not MM) staged after
        linux-next due to -next dependencies. I'll send those across next week
        as the preprequisites get merged up"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (135 commits)
        mm/page_io.c: annotate refault stalls from swap_readpage
        mm/Kconfig: fix trivial help text punctuation
        mm/Kconfig: fix indentation
        mm/memory_hotplug.c: remove __online_page_set_limits()
        mm: fix typos in comments when calling __SetPageUptodate()
        mm: fix struct member name in function comments
        mm/shmem.c: cast the type of unmap_start to u64
        mm: shmem: use proper gfp flags for shmem_writepage()
        mm/shmem.c: make array 'values' static const, makes object smaller
        userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK
        fs/userfaultfd.c: wp: clear VM_UFFD_MISSING or VM_UFFD_WP during userfaultfd_register()
        userfaultfd: wrap the common dst_vma check into an inlined function
        userfaultfd: remove unnecessary WARN_ON() in __mcopy_atomic_hugetlb()
        userfaultfd: use vma_pagesize for all huge page size calculation
        mm/madvise.c: use PAGE_ALIGN[ED] for range checking
        mm/madvise.c: replace with page_size() in madvise_inject_error()
        mm/mmap.c: make vma_merge() comment more easy to understand
        mm/hwpoison-inject: use DEFINE_DEBUGFS_ATTRIBUTE to define debugfs fops
        autonuma: reduce cache footprint when scanning page tables
        autonuma: fix watermark checking in migrate_balanced_pgdat()
        ...
      596cf45c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · c3bfc5dd
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix several scatter gather list issues in kTLS code, from Jakub
          Kicinski.
      
       2) macb driver device remove has to kill the hresp_err_tasklet. From
          Chuhong Yuan.
      
       3) Several memory leak and reference count bug fixes in tipc, from Tung
          Nguyen.
      
       4) Fix mlx5 build error w/o ipv6, from Yue Haibing.
      
       5) Fix jumbo frame and other regressions in r8169, from Heiner
          Kallweit.
      
       6) Undo some BUG_ON()'s and replace them with WARN_ON_ONCE and proper
          error propagation/handling. From Paolo Abeni.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (24 commits)
        openvswitch: remove another BUG_ON()
        openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()
        net: phy: realtek: fix using paged operations with RTL8105e / RTL8208
        r8169: fix resume on cable plug-in
        r8169: fix jumbo configuration for RTL8168evl
        net: emulex: benet: indent a Kconfig depends continuation line
        selftests: forwarding: fix race between packet receive and tc check
        net: sched: fix `tc -s class show` no bstats on class with nolock subqueues
        net: ethernet: ti: ale: ensure vlan/mdb deleted when no members
        net/mlx5e: Fix build error without IPV6
        selftests: pmtu: use -oneline for ip route list cache
        tipc: fix duplicate SYN messages under link congestion
        tipc: fix wrong timeout input for tipc_wait_for_cond()
        tipc: fix wrong socket reference counter after tipc_sk_timeout() returns
        tipc: fix potential memory leak in __tipc_sendmsg()
        net: macb: add missed tasklet_kill
        selftests: bpf: correct perror strings
        selftests: bpf: test_sockmap: handle file creation failures gracefully
        net/tls: use sg_next() to walk sg entries
        net/tls: remove the dead inplace_crypto code
        ...
      c3bfc5dd
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e5b3fc12
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "Various fixes:
      
         - Fix the PAT performance regression that downgraded write-combining
           device memory regions to uncached.
      
         - There's been a number of bugs in 32-bit double fault handling -
           hopefully all fixed now.
      
         - Fix an LDT crash
      
         - Fix an FPU over-optimization that broke with GCC9 code
           optimizations.
      
         - Misc cleanups"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm/pat: Fix off-by-one bugs in interval tree search
        x86/ioperm: Save an indentation level in tss_update_io_bitmap()
        x86/fpu: Don't cache access to fpu_fpregs_owner_ctx
        x86/entry/32: Remove unused 'restore_all_notrace' local label
        x86/ptrace: Document FSBASE and GSBASE ABI oddities
        x86/ptrace: Remove set_segment_reg() implementations for current
        x86/traps: die() instead of panicking on a double fault
        x86/doublefault/32: Rewrite the x86_32 #DF handler and unify with 64-bit
        x86/doublefault/32: Move #DF stack and TSS to cpu_entry_area
        x86/doublefault/32: Rename doublefault.c to doublefault_32.c
        x86/traps: Disentangle the 32-bit and 64-bit doublefault code
        lkdtm: Add a DOUBLE_FAULT crash type on x86
        selftests/x86/single_step_syscall: Check SYSENTER directly
        x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all()
      e5b3fc12
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b7fcf31f
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar:
      
       - Make /sys/devices/cpu/rdpmc based RDPMC enforcement more
         instantaneous
      
       - decoder: Update the Intel opcode map
      
       - Various tooling fixes, including a few late optimizations and
         cleanups.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        perf script: Fix invalid LBR/binary mismatch error
        perf script: Fix brstackinsn for AUXTRACE
        perf affinity: Add infrastructure to save/restore affinity
        perf pmu: Use file system cache to optimize sysfs access
        perf regs: Make perf_reg_name() return "unknown" instead of NULL
        perf diff: Use llabs() with 64-bit values
        perf diff: Use llabs() with 64-bit values
        perf/x86: Implement immediate enforcement of /sys/devices/cpu/rdpmc value of 0
        perf tools: Allow to link with libbpf dynamicaly
        perf tests: Rename tests/map_groups.c to tests/maps.c
        perf tests: Rename thread-mg-share to thread-maps-share
        perf maps: Rename map_groups.h to maps.h
        perf maps: Rename 'mg' variables to 'maps'
        perf map_symbol: Rename ms->mg to ms->maps
        perf addr_location: Rename al->mg to al->maps
        perf thread: Rename thread->mg to thread->maps
        perf maps: Merge 'struct maps' with 'struct map_groups'
        x86/insn: perf tools: Add some more instructions to the new instructions test
        x86/insn: Add some more Intel instructions to the opcode map
        perf map: Remove unused functions
        ...
      b7fcf31f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 72c0870e
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
      
       - updates to Ilitech driver to support ILI2117
      
       - face lift of st1232 driver to support MT-B protocol
      
       - a new driver for i.MX system controller keys
      
       - mpr121 driver now supports polling mode
      
       - various input drivers have been switched away from input_polled_dev
         to use polled mode of regular input devices
      
       - other assorted cleanups and fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (70 commits)
        Input: synaptics-rmi4 - fix various V4L2 compliance problems in F54
        Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus
        Input: fix Kconfig indentation
        Input: imx_sc_key - correct SCU message structure to avoid stack corruption
        Input: ili210x - optionally show calibrate sysfs attribute
        Input: ili210x - add resolution to chip operations structure
        Input: ili210x - do not retrieve/print chip firmware version
        Input: mms114 - use device_get_match_data
        Input: ili210x - remove unneeded suspend and resume handlers
        Input: ili210x - do not unconditionally mark touchscreen as wakeup source
        Input: ili210x - define and use chip operations structure
        Input: ili210x - do not set parent device explicitly
        Input: ili210x - handle errors from input_mt_init_slots()
        Input: ili210x - switch to using threaded IRQ
        Input: ili210x - add ILI2117 support
        dt-bindings: input: touchscreen: ad7879: generic node names in example
        Input: ar1021 - fix typo in preprocessor macro name
        Input: synaptics-rmi4 - simplify data read in rmi_f54_work
        Input: kxtj9 - switch to using polled mode of input devices
        Input: kxtj9 - switch to using managed resources
        ...
      72c0870e
    • L
      Merge tag 'libnvdimm-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · d10032dd
      Linus Torvalds 提交于
      Pull libnvdimm updates from Dan Williams:
       "The highlight this cycle is continuing integration fixes for PowerPC
        and some resulting optimizations.
      
        Summary:
      
         - Updates to better support vmalloc space restrictions on PowerPC
           platforms.
      
         - Cleanups to move common sysfs attributes to core 'struct
           device_type' objects.
      
         - Export the 'target_node' attribute (the effective numa node if pmem
           is marked online) for regions and namespaces.
      
         - Miscellaneous fixups and optimizations"
      
      * tag 'libnvdimm-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (21 commits)
        MAINTAINERS: Remove Keith from NVDIMM maintainers
        libnvdimm: Export the target_node attribute for regions and namespaces
        dax: Add numa_node to the default device-dax attributes
        libnvdimm: Simplify root read-only definition for the 'resource' attribute
        dax: Simplify root read-only definition for the 'resource' attribute
        dax: Create a dax device_type
        libnvdimm: Move nvdimm_bus_attribute_group to device_type
        libnvdimm: Move nvdimm_attribute_group to device_type
        libnvdimm: Move nd_mapping_attribute_group to device_type
        libnvdimm: Move nd_region_attribute_group to device_type
        libnvdimm: Move nd_numa_attribute_group to device_type
        libnvdimm: Move nd_device_attribute_group to device_type
        libnvdimm: Move region attribute group definition
        libnvdimm: Move attribute groups to device type
        libnvdimm: Remove prototypes for nonexistent functions
        libnvdimm/btt: fix variable 'rc' set but not used
        libnvdimm/pmem: Delete include of nd-core.h
        libnvdimm/namespace: Differentiate between probe mapping and runtime mapping
        libnvdimm/pfn_dev: Don't clear device memmap area during generic namespace probe
        libnvdimm: Trivial comment fix
        ...
      d10032dd
    • L
      Merge tag 'mailbox-v5.5' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 43fd4bd7
      Linus Torvalds 提交于
      Pull mailbox updates from Jassi Brar:
      
       - omap : misc - catch error returned from pm_runtime_put_sync
      
       - hisi : misc - drop .owner from platform_driver
      
       - stm : change how wakeup is handled
      
       - imx : fix - bailout on error and nuke correct irq
      
       - imx : add support for imx7ulp platform
      
      * tag 'mailbox-v5.5' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: imx: add support for imx v1 mu
        dt-bindings: mailbox: imx-mu: add imx7ulp MU support
        mailbox: imx: Clear the right interrupts at shutdown
        mailbox: imx: Fix Tx doorbell shutdown path
        mailbox: stm32-ipcc: Update wakeup management
        mailbox: no need to set .owner platform_driver_register
        mailbox/omap: Handle if CONFIG_PM is disabled
      43fd4bd7
    • L
      Merge tag 'hwlock-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc · 454d9c4a
      Linus Torvalds 提交于
      Pull hwspinlock updates from Bjorn Andersson:
       "This contains a number of cleanups to the core and several drivers, in
        particular removing the requirement for drivers to implement
        pm_runtime.
      
        It also udpates the location of the git tree in MAINTAINERS"
      
      * tag 'hwlock-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
        hwspinlock: u8500_hsem: Remove redundant PM runtime implementation
        hwspinlock: sprd: Remove redundant PM runtime implementation
        hwspinlock: Let the PM runtime can be optional
        hwspinlock: Remove BUG_ON() from the hwspinlock core
        hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller
        hwspinlock: sprd: Use devm_add_action_or_reset() for calls to clk_disable_unprepare()
        hwspinlock: sprd: Check the return value of clk_prepare_enable()
        hwspinlock: sprd: Change to use devm_platform_ioremap_resource()
        hwspinlock: u8500_hsem: Use devm_hwspin_lock_register() to register hwlock controller
        hwspinlock: u8500_hsem: Use devm_kzalloc() to allocate memory
        hwspinlock: u8500_hsem: Change to use devm_platform_ioremap_resource()
        MAINTAINERS: hwspinlock: update git tree location
      454d9c4a