1. 21 8月, 2018 2 次提交
  2. 18 8月, 2018 4 次提交
    • S
      x86/speculation/l1tf: Exempt zeroed PTEs from inversion · f19f5c49
      Sean Christopherson 提交于
      It turns out that we should *not* invert all not-present mappings,
      because the all zeroes case is obviously special.
      
      clear_page() does not undergo the XOR logic to invert the address bits,
      i.e. PTE, PMD and PUD entries that have not been individually written
      will have val=0 and so will trigger __pte_needs_invert(). As a result,
      {pte,pmd,pud}_pfn() will return the wrong PFN value, i.e. all ones
      (adjusted by the max PFN mask) instead of zero. A zeroed entry is ok
      because the page at physical address 0 is reserved early in boot
      specifically to mitigate L1TF, so explicitly exempt them from the
      inversion when reading the PFN.
      
      Manifested as an unexpected mprotect(..., PROT_NONE) failure when called
      on a VMA that has VM_PFNMAP and was mmap'd to as something other than
      PROT_NONE but never used. mprotect() sends the PROT_NONE request down
      prot_none_walk(), which walks the PTEs to check the PFNs.
      prot_none_pte_entry() gets the bogus PFN from pte_pfn() and returns
      -EACCES because it thinks mprotect() is trying to adjust a high MMIO
      address.
      
      [ This is a very modified version of Sean's original patch, but all
        credit goes to Sean for doing this and also pointing out that
        sometimes the __pte_needs_invert() function only gets the protection
        bits, not the full eventual pte.  But zero remains special even in
        just protection bits, so that's ok.   - Linus ]
      
      Fixes: f22cc87f ("x86/speculation/l1tf: Invert all not present mappings")
      Signed-off-by: NSean Christopherson <sean.j.christopherson@intel.com>
      Acked-by: NAndi Kleen <ak@linux.intel.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Michal Hocko <mhocko@suse.com>
      Cc: Vlastimil Babka <vbabka@suse.cz>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f19f5c49
    • L
      Merge tag 'for-4.19/dm-changes' of... · b0e5c294
      Linus Torvalds 提交于
      Merge tag 'for-4.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper updates from Mike Snitzer:
      
       - A couple stable fixes for the DM writecache target.
      
       - A stable fix for the DM cache target that fixes the potential for
         data corruption after an unclean shutdown of a cache device using
         writeback mode.
      
       - Update DM integrity target to allow the metadata to be stored on a
         separate device from data.
      
       - Fix DM kcopyd and the snapshot target to cond_resched() where
         appropriate and be more efficient with processing completed work.
      
       - A few fixes and improvements for DM crypt.
      
       - Add DM delay target feature to configure delay of flushes independent
         of writes.
      
       - Update DM thin-provisioning target to include metadata_low_watermark
         threshold in pool status.
      
       - Fix stale DM thin-provisioning Documentation.
      
      * tag 'for-4.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (26 commits)
        dm writecache: fix a crash due to reading past end of dirty_bitmap
        dm crypt: don't decrease device limits
        dm cache metadata: set dirty on all cache blocks after a crash
        dm snapshot: remove stale FIXME in snapshot_map()
        dm snapshot: improve performance by switching out_of_order_list to rbtree
        dm kcopyd: avoid softlockup in run_complete_job
        dm cache metadata: save in-core policy_hint_size to on-disk superblock
        dm thin: stop no_space_timeout worker when switching to write-mode
        dm kcopyd: return void from dm_kcopyd_copy()
        dm thin: include metadata_low_watermark threshold in pool status
        dm writecache: report start_sector in status line
        dm crypt: convert essiv from ahash to shash
        dm crypt: use wake_up_process() instead of a wait queue
        dm integrity: recalculate checksums on creation
        dm integrity: flush journal on suspend when using separate metadata device
        dm integrity: use version 2 for separate metadata
        dm integrity: allow separate metadata device
        dm integrity: add ic->start in get_data_sector()
        dm integrity: report provided data sectors in the status
        dm integrity: implement fair range locks
        ...
      b0e5c294
    • L
      Merge tag 'fsnotify_for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 2645b9d1
      Linus Torvalds 提交于
      Pull fsnotify updates from Jan Kara:
       "fsnotify cleanups from Amir and a small inotify improvement"
      
      * tag 'fsnotify_for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        inotify: Add flag IN_MASK_CREATE for inotify_add_watch()
        fanotify: factor out helpers to add/remove mark
        fsnotify: add helper to get mask from connector
        fsnotify: let connector point to an abstract object
        fsnotify: pass connp and object type to fsnotify_add_mark()
        fsnotify: use typedef fsnotify_connp_t for brevity
      2645b9d1
    • L
      Merge tag 'for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 46e62a07
      Linus Torvalds 提交于
      Pull UDF and ext2 update from Jan Kara.
      
      * tag 'for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2: use ktime_get_real_seconds for timestamps
        udf: convert inode stamps to timespec64
      46e62a07
  3. 17 8月, 2018 8 次提交
    • L
      Merge tag 'for-linus-4.19-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · 5c60a738
      Linus Torvalds 提交于
      Pull orangefs updates from Mike Marshall:
       "Orangefs: one cleanup and Souptick's vm_fault_t patch:
      
         - add new return type vm_fault_t (Souptick Joarder)
      
         - remove redundant pointer (Colin Ian King)"
      
      * tag 'for-linus-4.19-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
        orangefs: remove redundant pointer orangefs_inode
        orangefs: Adding new return type vm_fault_t
      5c60a738
    • M
      dm writecache: fix a crash due to reading past end of dirty_bitmap · 1e1132ea
      Mikulas Patocka 提交于
      wc->dirty_bitmap_size is in bytes so must multiply it by 8, not by
      BITS_PER_LONG, to get number of bitmap_bits.
      
      Fixes crash in find_next_bit() that was reported:
      https://bugzilla.kernel.org/show_bug.cgi?id=200819
      
      Reported-by: edo.rus@gmail.com
      Fixes: 48debafe ("dm: add writecache target")
      Cc: stable@vger.kernel.org # 4.18
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      1e1132ea
    • L
      Merge tag 'vfio-v4.19-rc1' of git://github.com/awilliam/linux-vfio · b6d6a307
      Linus Torvalds 提交于
      Pull VFIO updates from Alex Williamson:
      
       - mark switch fall-through cases (Gustavo A. R. Silva)
      
       - disable binding SR-IOV enabled PFs (Alex Williamson)
      
      * tag 'vfio-v4.19-rc1' of git://github.com/awilliam/linux-vfio:
        vfio-pci: Disable binding to PFs with SR-IOV enabled
        vfio: Mark expected switch fall-throughs
      b6d6a307
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal · d01e12dd
      Linus Torvalds 提交于
      Pull thermal management updates from Eduardo Valentin:
      
       - rework tsens driver to add support for tsens-v2 (Amit Kucheria)
      
       - rework armada thermal driver to use syscon and multichannel support
         (Miquel Raynal)
      
       - fixes to TI SoC, IMX, Exynos, RCar, and hwmon drivers
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (34 commits)
        thermal: armada: fix copy-paste error in armada_thermal_probe()
        thermal: rcar_thermal: avoid NULL dereference in absence of IRQ resources
        thermal: samsung: Remove Exynos5440 clock handling left-overs
        thermal: tsens: Fix negative temperature reporting
        thermal: tsens: switch from of_iomap() to devm_ioremap_resource()
        thermal: tsens: Rename variable
        thermal: tsens: Add generic support for TSENS v2 IP
        thermal: tsens: Rename tsens-8996 to tsens-v2 for reuse
        thermal: tsens: Add support to split up register address space into two
        dt: thermal: tsens: Document the fallback DT property for v2 of TSENS IP
        thermal: tsens: Get rid of unused fields in structure
        thermal_hwmon: Pass the originating device down to hwmon_device_register_with_info
        thermal_hwmon: Sanitize attribute name passed to hwmon
        dt-bindings: thermal: armada: add reference to new bindings
        dt-bindings: cp110: add the thermal node in the syscon file
        dt-bindings: cp110: update documentation since DT de-duplication
        dt-bindings: ap806: add the thermal node in the syscon file
        dt-bindings: cp110: prepare the syscon file to list other syscons nodes
        dt-bindings: ap806: prepare the syscon file to list other syscons nodes
        dt-bindings: cp110: rename cp110 syscon file
        ...
      d01e12dd
    • L
      Merge tag 'mailbox-v4.19' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 9502f0d1
      Linus Torvalds 提交于
      Pull mailbox updates from Jassi Brar:
      
       - xgene: potential null pointer fix
      
       - omap: switch to spdx license and use of_device_get_match_data() to
         match data
      
       - ti-msgmgr: cleanup and optimisation. New TI specific feature - secure
         proxy thread.
      
       - mediatek: add driver for CMDQ controller.
      
       - nxp: add driver for MU controller
      
      * tag 'mailbox-v4.19' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: Add support for i.MX messaging unit
        dt-bindings: mailbox: imx-mu: add generic MU channel support
        dt-bindings: arm: fsl: add mu binding doc
        mailbox: add MODULE_LICENSE() for mtk-cmdq-mailbox.c
        mailbox: mediatek: Add Mediatek CMDQ driver
        dt-bindings: soc: Add documentation for the MediaTek GCE unit
        mailbox: ti-msgmgr: Add support for Secure Proxy
        dt-bindings: mailbox: Add support for secure proxy threads
        mailbox: ti-msgmgr: Move the memory region name to descriptor
        mailbox: ti-msgmgr: Change message count mask to be descriptor based
        mailbox: ti-msgmgr: Allocate Rx channel resources only on request
        mailbox: ti-msgmgr: Get rid of unused structure members
        mailbox/omap: use of_device_get_match_data() to get match data
        mailbox/omap: switch to SPDX license identifier
        mailbox: xgene-slimpro: Fix potential NULL pointer dereference
      9502f0d1
    • Y
      Fix kexec forbidding kernels signed with keys in the secondary keyring to boot · ea93102f
      Yannik Sembritzki 提交于
      The split of .system_keyring into .builtin_trusted_keys and
      .secondary_trusted_keys broke kexec, thereby preventing kernels signed by
      keys which are now in the secondary keyring from being kexec'd.
      
      Fix this by passing VERIFY_USE_SECONDARY_KEYRING to
      verify_pefile_signature().
      
      Fixes: d3bfe841 ("certs: Add a secondary system keyring that can be added to dynamically")
      Signed-off-by: NYannik Sembritzki <yannik@sembritzki.me>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Cc: kexec@lists.infradead.org
      Cc: keyrings@vger.kernel.org
      Cc: linux-security-module@vger.kernel.org
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ea93102f
    • Y
      Replace magic for trusting the secondary keyring with #define · 817aef26
      Yannik Sembritzki 提交于
      Replace the use of a magic number that indicates that verify_*_signature()
      should use the secondary keyring with a symbol.
      Signed-off-by: NYannik Sembritzki <yannik@sembritzki.me>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Cc: keyrings@vger.kernel.org
      Cc: linux-security-module@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      817aef26
    • L
      Merge tag 'pci-v4.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 4e31843f
      Linus Torvalds 提交于
      Pull pci updates from Bjorn Helgaas:
      
       - Decode AER errors with names similar to "lspci" (Tyler Baicar)
      
       - Expose AER statistics in sysfs (Rajat Jain)
      
       - Clear AER status bits selectively based on the type of recovery (Oza
         Pawandeep)
      
       - Honor "pcie_ports=native" even if HEST sets FIRMWARE_FIRST (Alexandru
         Gagniuc)
      
       - Don't clear AER status bits if we're using the "Firmware-First"
         strategy where firmware owns the registers (Alexandru Gagniuc)
      
       - Use sysfs_match_string() to simplify ASPM sysfs parsing (Andy
         Shevchenko)
      
       - Remove unnecessary includes of <linux/pci-aspm.h> (Bjorn Helgaas)
      
       - Defer DPC event handling to work queue (Keith Busch)
      
       - Use threaded IRQ for DPC bottom half (Keith Busch)
      
       - Print AER status while handling DPC events (Keith Busch)
      
       - Work around IDT switch ACS Source Validation erratum (James
         Puthukattukaran)
      
       - Emit diagnostics for all cases of PCIe Link downtraining (Links
         operating slower than they're capable of) (Alexandru Gagniuc)
      
       - Skip VFs when configuring Max Payload Size (Myron Stowe)
      
       - Reduce Root Port Max Payload Size if necessary when hot-adding a
         device below it (Myron Stowe)
      
       - Simplify SHPC existence/permission checks (Bjorn Helgaas)
      
       - Remove hotplug sample skeleton driver (Lukas Wunner)
      
       - Convert pciehp to threaded IRQ handling (Lukas Wunner)
      
       - Improve pciehp tolerance of missed events and initially unstable
         links (Lukas Wunner)
      
       - Clear spurious pciehp events on resume (Lukas Wunner)
      
       - Add pciehp runtime PM support, including for Thunderbolt controllers
         (Lukas Wunner)
      
       - Support interrupts from pciehp bridges in D3hot (Lukas Wunner)
      
       - Mark fall-through switch cases before enabling -Wimplicit-fallthrough
         (Gustavo A. R. Silva)
      
       - Move DMA-debug PCI init from arch code to PCI core (Christoph
         Hellwig)
      
       - Fix pci_request_irq() usage of IRQF_ONESHOT when no handler is
         supplied (Heiner Kallweit)
      
       - Unify PCI and DMA direction #defines (Shunyong Yang)
      
       - Add PCI_DEVICE_DATA() macro (Andy Shevchenko)
      
       - Check for VPD completion before checking for timeout (Bert Kenward)
      
       - Limit Netronome NFP5000 config space size to work around erratum
         (Jakub Kicinski)
      
       - Set IRQCHIP_ONESHOT_SAFE for PCI MSI irqchips (Heiner Kallweit)
      
       - Document ACPI description of PCI host bridges (Bjorn Helgaas)
      
       - Add "pci=disable_acs_redir=" parameter to disable ACS redirection for
         peer-to-peer DMA support (we don't have the peer-to-peer support yet;
         this is just one piece) (Logan Gunthorpe)
      
       - Clean up devm_of_pci_get_host_bridge_resources() resource allocation
         (Jan Kiszka)
      
       - Fixup resizable BARs after suspend/resume (Christian König)
      
       - Make "pci=earlydump" generic (Sinan Kaya)
      
       - Fix ROM BAR access routines to stay in bounds and check for signature
         correctly (Rex Zhu)
      
       - Add DMA alias quirk for Microsemi Switchtec NTB (Doug Meyer)
      
       - Expand documentation for pci_add_dma_alias() (Logan Gunthorpe)
      
       - To avoid bus errors, enable PASID only if entire path supports
         End-End TLP prefixes (Sinan Kaya)
      
       - Unify slot and bus reset functions and remove hotplug knowledge from
         callers (Sinan Kaya)
      
       - Add Function-Level Reset quirks for Intel and Samsung NVMe devices to
         fix guest reboot issues (Alex Williamson)
      
       - Add function 1 DMA alias quirk for Marvell 88SS9183 PCIe SSD
         Controller (Bjorn Helgaas)
      
       - Remove Xilinx AXI-PCIe host bridge arch dependency (Palmer Dabbelt)
      
       - Remove Aardvark outbound window configuration (Evan Wang)
      
       - Fix Aardvark bridge window sizing issue (Zachary Zhang)
      
       - Convert Aardvark to use pci_host_probe() to reduce code duplication
         (Thomas Petazzoni)
      
       - Correct the Cadence cdns_pcie_writel() signature (Alan Douglas)
      
       - Add Cadence support for optional generic PHYs (Alan Douglas)
      
       - Add Cadence power management ops (Alan Douglas)
      
       - Remove redundant variable from Cadence driver (Colin Ian King)
      
       - Add Kirin MSI support (Xiaowei Song)
      
       - Drop unnecessary root_bus_nr setting from exynos, imx6, keystone,
         armada8k, artpec6, designware-plat, histb, qcom, spear13xx (Shawn
         Guo)
      
       - Move link notification settings from DesignWare core to individual
         drivers (Gustavo Pimentel)
      
       - Add endpoint library MSI-X interfaces (Gustavo Pimentel)
      
       - Correct signature of endpoint library IRQ interfaces (Gustavo
         Pimentel)
      
       - Add DesignWare endpoint library MSI-X callbacks (Gustavo Pimentel)
      
       - Add endpoint library MSI-X test support (Gustavo Pimentel)
      
       - Remove unnecessary GFP_ATOMIC from Hyper-V "new child" allocation
         (Jia-Ju Bai)
      
       - Add more devices to Broadcom PAXC quirk (Ray Jui)
      
       - Work around corrupted Broadcom PAXC config space to enable SMMU and
         GICv3 ITS (Ray Jui)
      
       - Disable MSI parsing to work around broken Broadcom PAXC logic in some
         devices (Ray Jui)
      
       - Hide unconfigured functions to work around a Broadcom PAXC defect
         (Ray Jui)
      
       - Lower iproc log level to reduce console output during boot (Ray Jui)
      
       - Fix mobiveil iomem/phys_addr_t type usage (Lorenzo Pieralisi)
      
       - Fix mobiveil missing include file (Lorenzo Pieralisi)
      
       - Add mobiveil Kconfig/Makefile support (Lorenzo Pieralisi)
      
       - Fix mvebu I/O space remapping issues (Thomas Petazzoni)
      
       - Use generic pci_host_bridge in mvebu instead of ARM-specific API
         (Thomas Petazzoni)
      
       - Whitelist VMD devices with fast interrupt handlers to avoid sharing
         vectors with slow handlers (Keith Busch)
      
      * tag 'pci-v4.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (153 commits)
        PCI/AER: Don't clear AER bits if error handling is Firmware-First
        PCI: Limit config space size for Netronome NFP5000
        PCI/MSI: Set IRQCHIP_ONESHOT_SAFE for PCI-MSI irqchips
        PCI/VPD: Check for VPD access completion before checking for timeout
        PCI: Add PCI_DEVICE_DATA() macro to fully describe device ID entry
        PCI: Match Root Port's MPS to endpoint's MPSS as necessary
        PCI: Skip MPS logic for Virtual Functions (VFs)
        PCI: Add function 1 DMA alias quirk for Marvell 88SS9183
        PCI: Check for PCIe Link downtraining
        PCI: Add ACS Redirect disable quirk for Intel Sunrise Point
        PCI: Add device-specific ACS Redirect disable infrastructure
        PCI: Convert device-specific ACS quirks from NULL termination to ARRAY_SIZE
        PCI: Add "pci=disable_acs_redir=" parameter for peer-to-peer support
        PCI: Allow specifying devices using a base bus and path of devfns
        PCI: Make specifying PCI devices in kernel parameters reusable
        PCI: Hide ACS quirk declarations inside PCI core
        PCI: Delay after FLR of Intel DC P3700 NVMe
        PCI: Disable Samsung SM961/PM961 NVMe before FLR
        PCI: Export pcie_has_flr()
        PCI: mvebu: Drop bogus comment above mvebu_pcie_map_registers()
        ...
      4e31843f
  4. 16 8月, 2018 26 次提交
    • L
      Merge branch 'next-integrity' of... · f91e6544
      Linus Torvalds 提交于
      Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
      
      Pull integrity updates from James Morris:
       "This adds support for EVM signatures based on larger digests, contains
        a new audit record AUDIT_INTEGRITY_POLICY_RULE to differentiate the
        IMA policy rules from the IMA-audit messages, addresses two deadlocks
        due to either loading or searching for crypto algorithms, and cleans
        up the audit messages"
      
      * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        EVM: fix return value check in evm_write_xattrs()
        integrity: prevent deadlock during digsig verification.
        evm: Allow non-SHA1 digital signatures
        evm: Don't deadlock if a crypto algorithm is unavailable
        integrity: silence warning when CONFIG_SECURITYFS is not enabled
        ima: Differentiate auditing policy rules from "audit" actions
        ima: Do not audit if CONFIG_INTEGRITY_AUDIT is not set
        ima: Use audit_log_format() rather than audit_log_string()
        ima: Call audit_log_string() rather than logging it untrusted
      f91e6544
    • L
      Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · c715ebeb
      Linus Torvalds 提交于
      Pull TPM updates from James Morris:
      
       - Migrate away from PM runtime as explicit cmdReady/goIdle transactions
         for every command is a spec requirement. PM runtime adds only a layer
         of complexity on our case.
      
       - tpm_tis drivers can now specify the hwrng quality.
      
       - TPM 2.0 code uses now tpm_buf for constructing messages. Jarkko
         thinks Tomas Winkler has done the same for TPM 1.2, and will start
         digging those changes from the patchwork in the near future.
      
       - Bug fixes and clean ups
      
      * 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead
        ima: Use tpm_default_chip() and call TPM functions with a tpm_chip
        tpm: replace TPM_TRANSMIT_RAW with TPM_TRANSMIT_NESTED
        tpm: Convert tpm_find_get_ops() to use tpm_default_chip()
        tpm: Implement tpm_default_chip() to find a TPM chip
        tpm: rename tpm_chip_find_get() to tpm_find_get_ops()
        tpm: Allow tpm_tis drivers to set hwrng quality.
        tpm: Return the actual size when receiving an unsupported command
        tpm: separate cmd_ready/go_idle from runtime_pm
        tpm/tpm_i2c_infineon: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT)
        tpm_tis_spi: Pass the SPI IRQ down to the driver
        tpm: migrate tpm2_get_random() to use struct tpm_buf
        tpm: migrate tpm2_get_tpm_pt() to use struct tpm_buf
        tpm: migrate tpm2_probe() to use struct tpm_buf
        tpm: migrate tpm2_shutdown() to use struct tpm_buf
      c715ebeb
    • L
      Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 04743f89
      Linus Torvalds 提交于
      Pull smack updates from James Morris:
       "Minor fixes from Piotr Sawicki"
      
      * 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        Smack: Inform peer that IPv6 traffic has been blocked
        Smack: Check UDP-Lite and DCCP protocols during IPv6 handling
        Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets
      04743f89
    • L
      Merge tag 'jfs-4.19' of git://github.com/kleikamp/linux-shaggy · 5bae2be4
      Linus Torvalds 提交于
      Pull jfs update from David Kleikamp:
       "Just one jfs patch for 4.19"
      
      * tag 'jfs-4.19' of git://github.com/kleikamp/linux-shaggy:
        jfs: use time64_t for otime
      5bae2be4
    • L
      Merge tag 'gfs2-4.19.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 2b2f2aed
      Linus Torvalds 提交于
      Pull gfs2 updates from Andreas Gruenbacher:
      
       - iomap support for buffered writes and for direct I/O
      
       - two patches that reduce the size of struct gfs2_inode
      
       - lots of fixes and cleanups
      
      * tag 'gfs2-4.19.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (25 commits)
        gfs2: eliminate update_rgrp_lvb_unlinked
        gfs2: Fix gfs2_testbit to use clone bitmaps
        gfs2: Get rid of gfs2_ea_strlen
        gfs2: cleanup: call gfs2_rgrp_ondisk2lvb from gfs2_rgrp_out
        gfs2: Special-case rindex for gfs2_grow
        GFS2: rgrp free blocks used incorrectly
        gfs2: remove redundant variable 'moved'
        gfs2: use iomap_readpage for blocksize == PAGE_SIZE
        gfs2: Use iomap for stuffed direct I/O reads
        gfs2: fallocate_chunk: Always initialize struct iomap
        GFS2: Fix recovery issues for spectators
        fs: gfs2: Adding new return type vm_fault_t
        gfs2: using posix_acl_xattr_size instead of posix_acl_to_xattr
        gfs2: Don't reject a supposedly full bitmap if we have blocks reserved
        gfs2: Eliminate redundant ip->i_rgd
        gfs2: Stop messing with ip->i_rgd in the rlist code
        gfs2: Remove gfs2_write_{begin,end}
        gfs2: iomap direct I/O support
        gfs2: gfs2_extent_length cleanup
        gfs2: iomap buffered write support
        ...
      2b2f2aed
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 72f02ba6
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This is mostly updates to the usual drivers: mpt3sas, lpfc, qla2xxx,
        hisi_sas, smartpqi, megaraid_sas, arcmsr.
      
        In addition, with the continuing absence of Nic we have target updates
        for tcmu and target core (all with reviews and acks).
      
        The biggest observable change is going to be that we're (again) trying
        to switch to mulitqueue as the default (a user can still override the
        setting on the kernel command line).
      
        Other major core stuff is the removal of the remaining Microchannel
        drivers, an update of the internal timers and some reworks of
        completion and result handling"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits)
        scsi: core: use blk_mq_run_hw_queues in scsi_kick_queue
        scsi: ufs: remove unnecessary query(DM) UPIU trace
        scsi: qla2xxx: Fix issue reported by static checker for qla2x00_els_dcmd2_sp_done()
        scsi: aacraid: Spelling fix in comment
        scsi: mpt3sas: Fix calltrace observed while running IO & reset
        scsi: aic94xx: fix an error code in aic94xx_init()
        scsi: st: remove redundant pointer STbuffer
        scsi: qla2xxx: Update driver version to 10.00.00.08-k
        scsi: qla2xxx: Migrate NVME N2N handling into state machine
        scsi: qla2xxx: Save frame payload size from ICB
        scsi: qla2xxx: Fix stalled relogin
        scsi: qla2xxx: Fix race between switch cmd completion and timeout
        scsi: qla2xxx: Fix Management Server NPort handle reservation logic
        scsi: qla2xxx: Flush mailbox commands on chip reset
        scsi: qla2xxx: Fix unintended Logout
        scsi: qla2xxx: Fix session state stuck in Get Port DB
        scsi: qla2xxx: Fix redundant fc_rport registration
        scsi: qla2xxx: Silent erroneous message
        scsi: qla2xxx: Prevent sysfs access when chip is down
        scsi: qla2xxx: Add longer window for chip reset
        ...
      72f02ba6
    • L
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · db06f826
      Linus Torvalds 提交于
      Pull clk updates from Stephen Boyd:
       "The new and exciting feature this time around is in the clk core.
        We've added duty cycle support to the clk API so that clk signal duty
        cycle ratios can be adjusted while taking into account things like clk
        dividers and clk tree hierarchy. So far only one SoC has implemented
        support for this, but I expect there will be more to come in the
        future.
      
        Outside of the core, we have the usual pile of clk driver updates and
        additions. The Amlogic meson driver got the most lines in the diffstat
        this time around because it added support for a whole bunch of
        hardware and duty cycle configuration. After that the Rockchip PX30,
        Qualcomm SDM845, and Renesas SoC drivers fill in a majority of the
        diff. We're left with the collection of non-critical fixes after that.
        Overall it looks pretty quiet this time.
      
        Core:
         - Clk duty cycle support
         - Proper CLK_SET_RATE_GATE support throughout the tree
      
        New Drivers:
         - Actions Semi Owl series S700 SoC clk driver
         - Qualcomm SDM845 display clock controller
         - i.MX6SX ocram_s clk support
         - Uniphier NAND, USB3 PHY, and SPI clk support
         - Qualcomm RPMh clk driver
         - i.MX7D mailbox clk support
         - Maxim 9485 Programmable Clock Generator
         - expose 32 kHz PLL on PXA SoCs
         - imx6sll GPIO clk gate support
         - Atmel at91 I2S audio clk support
         - SI544/SI514 clk on/off support
         - i.MX6UL GPIO clock gates in CCM CCGR
         - Renesas Crypto Engine clocks on R-Car H3
         - Renesas clk support for the new RZ/N1D SoC
         - Allwinner A64 display engine clock support
         - support for Rockchip's PX30 SoC
         - Amlogic Meson axg PCIe and audio clocks
         - Amlogic Meson GEN CLK on gxbb, gxl and axg
      
        Updates:
         - remove an unused variable from Exynos4412 ISP driver
         - fix a thinko bug in SCMI clk division logic
         - add missing of_node_put()s in some i.MX clk drivers
         - Tegra SDMMC clk jitter improvements with high speed signaling modes
         - SPDX tagging for qcom and cs2000-cp drivers
         - stop leaking con ids in __clk_put()
         - fix a corner case in fixed factor clk probing where node is in DT
           but parent clk is registered much later
         - Marvell Armada 3700 clk_pm_cpu_get_parent() had an invalid return
           value
         - i.MX clk init arrays removed in place of CLK_IS_CRITICAL
         - convert to CLK_IS_CRITICAL for i.MX51/53 driver
         - fix Tegra BPMP driver oops when xlating a NULL clk
         - proper default configuration for vic03 and vde clks on Tegra124
         - mark Tegra memory controller clks as critical
         - fix array bounds clamp in Tegra's emc determine_rate() op
         - Ingenic i2s bit update and allow UDC clk to gate
         - fix name of aspeed SDC clk define to have only one 'CLK'
         - fix i.MX6QDL video clk parent
         - critical clk markings for qcom SDM845
         - fix Stratix10 mpu_free_clk and sdmmc_free_clk parents
         - mark Rockchip's pclk_rkpwm_pmu as critical clock, due to it
           supplying the pwm used to drive the logic supply of the rk3399
           core"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (85 commits)
        clk: rockchip: Add pclk_rkpwm_pmu to PMU critical clocks in rk3399
        clk: cs2000-cp: convert to SPDX identifiers
        clk: scmi: Fix the rounding of clock rate
        clk: qcom: Add display clock controller driver for SDM845
        clk: mvebu: armada-37xx-periph: Remove unused var num_parents
        clk: samsung: Remove unused mout_user_aclk400_mcuisp_p4x12 variable
        clk: actions: Add S700 SoC clock support
        dt-bindings: clock: Add S700 support for Actions Semi Soc's
        clk: actions: Add missing REGMAP_MMIO dependency
        clk: uniphier: add clock frequency support for SPI
        clk: uniphier: add more USB3 PHY clocks
        clk: uniphier: add NAND 200MHz clock
        clk: tegra: make sdmmc2 and sdmmc4 as sdmmc clocks
        clk: tegra: Add sdmmc mux divider clock
        clk: tegra: Refactor fractional divider calculation
        clk: tegra: Fix includes required by fence_udelay()
        clk: imx6sll: fix missing of_node_put()
        clk: imx6ul: fix missing of_node_put()
        clk: imx: add ocram_s clock for i.mx6sx
        clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent
        ...
      db06f826
    • L
      Merge tag 'gpio-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 6de4c691
      Linus Torvalds 提交于
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.19 kernel cycle.
      
        I don't know if anything in particular stands out. Maybe the Aspeed
        coprocessor thing from Benji: Aspeed is doing baseboard management
        chips (BMC's) for servers etc.
      
        These Aspeed's are ARM processors that exist inside (I guess) Intel
        servers, and they are moving forward to using mainline Linux in those.
        This is one of the pieces of the puzzle to achive that. They are doing
        OpenBMC, it's pretty cool: https://lwn.net/Articles/683320/
      
        Summary:
      
        Core changes:
      
         - Add a new API for explicitly naming GPIO consumers, when needed.
      
         - Don't let userspace set values on input lines. While we do not
           think anyone would do this crazy thing we better plug the hole
           before someone uses it and think it's a nifty feature.
      
         - Avoid calling chip->request() for unused GPIOs.
      
        New drivers/subdrivers:
      
         - The Mediatek MT7621 is supported which is a big win for OpenWRT and
           similar router distributions using this chip, as it seems every
           major router manufacturer on the planet has made products using
           this chip: https://wikidevi.com/wiki/MediaTek_MT7621
      
         - The Tegra 194 is now supported.
      
         - The IT87 driver now supports IT8786E and IT8718F super-IO chips.
      
         - Add support for Rockchip RK3328 in the syscon GPIO driver.
      
        Driver changes:
      
         - Handle the get/set_multiple() properly on MMIO chips with inverted
           direction registers. We didn't have this problem until a new chip
           appear that has get/set registers AND inverted direction bits, OK
           now we handle it.
      
         - A patch series making more error codes percolate upward properly
           for different errors on gpiochip_lock_as_irq().
      
         - Get/set multiple for the OMAP driver, accelerating these multiple
           line operations if possible.
      
         - A coprocessor interface for the Aspeed driver. Sometimes a few GPIO
           lines need to be grabbed by a co-processor for doing automated
           tasks, sometimes they are available as GPIO lines. By adding an
           explicit API in this driver we make it possible for the two line
           consumers to coexist. (This work was made available on the
           ib-aspeed branch, which may be appearing in other pull requests.)
      
         - Implemented .get_direction() and open drain in the SCH311x driver.
      
         - Continuing cleanup of included headers in GPIO drivers"
      
      * tag 'gpio-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (80 commits)
        gpio: it87: Add support for IT8613
        gpio: it87: add support for IT8718F Super I/O.
        gpiolib: Avoid calling chip->request() for unused gpios
        gpio: tegra: Include the right header
        gpio: mmio: Fix up inverted direction registers
        gpio: xilinx: Use the right include
        gpio: timberdale: Include the right header
        gpio: tb10x: Use the right include
        gpiolib: Fix of_node inconsistency
        gpio: vr41xx: Bail out on gpiochip_lock_as_irq() error
        gpio: uniphier: Bail out on gpiochip_lock_as_irq() error
        gpio: xgene-sb: Don't shadow error code of gpiochip_lock_as_irq()
        gpio: em: Don't shadow error code of gpiochip_lock_as_irq()
        gpio: dwapb: Don't shadow error code of gpiochip_lock_as_irq()
        gpio: bcm-kona: Don't shadow error code of gpiochip_lock_as_irq()
        gpiolib: Don't shadow error code of gpiochip_lock_as_irq()
        gpio: syscon: rockchip: add GRF GPIO support for rk3328
        gpio: omap: Add get/set_multiple() callbacks
        gpio: pxa: remove set but not used variable 'gpio_offset'
        gpio-it87: add support for IT8786E Super I/O
        ...
      6de4c691
    • L
      Merge tag 'edac_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · c1c2ad82
      Linus Torvalds 提交于
      Pull EDAC updates from Borislav Petkov:
      
       - Add support for systems with PCI segmented buses to sb_edac, by
         Masayoshi Mizuma
      
       - The usual pile of fixes and cleanups
      
      * tag 'edac_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, sb_edac: Add support for systems with segmented PCI buses
        EDAC, thunderx: Remove VLA usage
        EDAC, i7core: Fix memleaks and use-after-free on probe and remove
        EDAC: Fix memleak in module init error path
        EDAC, altera: Fix an error handling path in altr_s10_sdram_probe()
      c1c2ad82
    • L
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 99a2c789
      Linus Torvalds 提交于
      Pull random updates from Ted Ts'o:
       "Some changes to trust cpu-based hwrng (such as RDRAND) for
        initializing hashed pointers and (optionally, controlled by a config
        option) to initialize the CRNG to avoid boot hangs"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: Make crng state queryable
        random: remove preempt disabled region
        random: add a config option to trust the CPU's hwrng
        vsprintf: Add command line option debug_boot_weak_hash
        vsprintf: Use hw RNG for ptr_key
        random: Return nbytes filled from hw RNG
        random: Fix whitespace pre random-bytes work
      99a2c789
    • L
      Merge tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux · fa3b39cd
      Linus Torvalds 提交于
      Pull clang-format updates from Miguel Ojeda:
       "Two improvements for .clang-format:
      
         - Set IndentWrappedFunctionNames false (Jason Gunthorpe)
      
         - Add MAINTAINERS entry (Miguel Ojeda)"
      
      * tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux:
        MAINTAINERS: Add .clang-format entry
        clang-format: Set IndentWrappedFunctionNames false
      fa3b39cd
    • L
      Merge tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux · 25ca1d74
      Linus Torvalds 提交于
      Pull auxdisplay updates from Miguel Ojeda:
       "Two cleanups for char_lcd:
      
         - simplify getting .drvdata (Wolfram Sang)
      
         - delete mdelay in long_sleep (Jia-Ju Bai)"
      
      * tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux:
        auxdisplay: simplify getting .drvdata
        auxdisplay: charlcd: delete mdelay in long_sleep
      25ca1d74
    • L
      ALSA: update dell-wmi mic-mute registration to new world order · 70b20dd7
      Linus Torvalds 提交于
      Commit c647f806 ("ALSA: hda - Allow multiple ADCs for mic mute LED
      controls") changed the return value of the snd_hda_gen_add_micmute_led()
      without actually updating the callers.
      
      Admittedly, almost no callers actually cared about the return value.
      But one call site very much did: the Dell wmi code.  It would see the
      registration return zero, which _used_ to mean "failed" but now means
      "success", and clear the dell_micmute_led_set_func pointer.
      
      End result: the successful registration would end up calling the Dell
      code that thought it had all failed, and call through a NULL pointer.
      
      To make matters worse, it ends up being a tail-call, and with the
      retpoline sequence you don't even see the caller (dell_micmute_update())
      in the stack trace, so the error ended up way less obvious than it
      should have been.
      
      Fixes: c647f806 "ALSA: hda - Allow multiple ADCs for mic mute LED controls"
      Cc: Takashi Iwai <tiwai@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      70b20dd7
    • L
      Merge tag 'media/v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 71f3a82f
      Linus Torvalds 提交于
      Pull media updates from Mauro Carvalho Chehab:
      
       - new Socionext MN88443x ISDB-S/T demodulator driver: mn88443x
      
       - new sensor drivers: ak7375, ov2680 and rj54n1cb0c
      
       - an old soc-camera sensor driver converted to the V4L2 framework:
         mt9v111
      
       - a new Voice-Coil Motor (VCM) driver: dw9807-vcm
      
       - some cleanups at cx25821, removing legacy unused code
      
       - some improvements at ddbridge driver
      
       - new platform driver: vicodec
      
       - some DVB API cleanups, removing ioctls and compat code for old
         out-of-tree drivers that were never merged upstream
      
       - improvements at DVB core to support frontents that support both
         Satellite and non-satellite delivery systems
      
       - got rid of the unused VIDIOC_RESERVED V4L2 ioctl
      
       - some cleanups/improvements at gl861 ISDB driver
      
       - several improvements on ov772x, ov7670 and ov5640, imx274, ov5645,
         and smiapp sensor drivers
      
       - fixes at em28xx to support dual TS devices
      
       - some cleanups at V4L2/VB2 locking logic
      
       - some API improvements at media controller
      
       - some cec core and drivers improvements
      
       - some uvcvideo improvements
      
       - some improvements at platform drivers: stm32-dcmi, rcar-vin, coda,
         reneseas-ceu, imx, vsp1, venus, camss
      
       - lots of other cleanups and fixes
      
      * tag 'media/v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (406 commits)
        Revert "media: vivid: shut up warnings due to a non-trivial logic"
        siano: get rid of an unused return code for debugfs register
        media: isp: fix a warning about a wrong struct initializer
        media: radio-wl1273: fix return code for the polling routine
        media: s3c-camif: fix return code for the polling routine
        media: saa7164: fix return codes for the polling routine
        media: exynos-gsc: fix return code if mutex was interrupted
        media: mt9v111: Fix build error with no VIDEO_V4L2_SUBDEV_API
        media: xc4000: get rid of uneeded casts
        media: drxj: get rid of uneeded casts
        media: tuner-xc2028: don't use casts for printing sizes
        media: cleanup fall-through comments
        media: vivid: shut up warnings due to a non-trivial logic
        media: rtl28xxu: be sure that it won't go past the array size
        media: mt9v111: avoid going past the buffer
        media: vsp1_dl: add a description for cmdpool field
        media: sta2x11: add a missing parameter description
        media: v4l2-mem2mem: add descriptions to MC fields
        media: i2c: fix warning in Aptina MT9V111
        media: imx: shut up a false positive warning
        ...
      71f3a82f
    • L
      Merge tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm · 54dbe75b
      Linus Torvalds 提交于
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for 4.19.
      
        Rob has some new hardware support for new qualcomm hw that I'll send
        along separately. This has the display part of it, the remaining pull
        is for the acceleration engine.
      
        This also contains a wound-wait/wait-die mutex rework, Peter has acked
        it for merging via my tree.
      
        Otherwise mostly the usual level of activity. Summary:
      
        core:
         - Wound-wait/wait-die mutex rework
         - Add writeback connector type
         - Add "content type" property for HDMI
         - Move GEM bo to drm_framebuffer
         - Initial gpu scheduler documentation
         - GPU scheduler fixes for dying processes
         - Console deferred fbcon takeover support
         - Displayport support for CEC tunneling over AUX
      
        panel:
         - otm8009a panel driver fixes
         - Innolux TV123WAM and G070Y2-L01 panel driver
         - Ilitek ILI9881c panel driver
         - Rocktech RK070ER9427 LCD
         - EDT ETM0700G0EDH6 and EDT ETM0700G0BDH6
         - DLC DLC0700YZG-1
         - BOE HV070WSA-100
         - newhaven, nhd-4.3-480272ef-atxl LCD
         - DataImage SCF0700C48GGU18
         - Sharp LQ035Q7DB03
         - p079zca: Refactor to support multiple panels
      
        tinydrm:
         - ILI9341 display panel
      
        New driver:
         - vkms - virtual kms driver to testing.
      
        i915:
         - Icelake:
              Display enablement
              DSI support
              IRQ support
              Powerwell support
         - GPU reset fixes and improvements
         - Full ppgtt support refactoring
         - PSR fixes and improvements
         - Execlist improvments
         - GuC related fixes
      
        amdgpu:
         - Initial amdgpu documentation
         - JPEG engine support on VCN
         - CIK uses powerplay by default
         - Move to using core PCIE functionality for gens/lanes
         - DC/Powerplay interface rework
         - Stutter mode support for RV
         - Vega12 Powerplay updates
         - GFXOFF fixes
         - GPUVM fault debugging
         - Vega12 GFXOFF
         - DC improvements
         - DC i2c/aux changes
         - UVD 7.2 fixes
         - Powerplay fixes for Polaris12, CZ/ST
         - command submission bo_list fixes
      
        amdkfd:
         - Raven support
         - Power management fixes
      
        udl:
         - Cleanups and fixes
      
        nouveau:
         - misc fixes and cleanups.
      
        msm:
         - DPU1 support display controller in sdm845
         - GPU coredump support.
      
        vmwgfx:
         - Atomic modesetting validation fixes
         - Support for multisample surfaces
      
        armada:
         - Atomic modesetting support completed.
      
        exynos:
         - IPPv2 fixes
         - Move g2d to component framework
         - Suspend/resume support cleanups
         - Driver cleanups
      
        imx:
         - CSI configuration improvements
         - Driver cleanups
         - Use atomic suspend/resume helpers
         - ipu-v3 V4L2 XRGB32/XBGR32 support
      
        pl111:
         - Add Nomadik LCDC variant
      
        v3d:
         - GPU scheduler jobs management
      
        sun4i:
         - R40 display engine support
         - TCON TOP driver
      
        mediatek:
         - MT2712 SoC support
      
        rockchip:
         - vop fixes
      
        omapdrm:
         - Workaround for DRA7 errata i932
         - Fix mm_list locking
      
        mali-dp:
         - Writeback implementation
              PM improvements
         - Internal error reporting debugfs
      
        tilcdc:
         - Single fix for deferred probing
      
        hdlcd:
         - Teardown fixes
      
        tda998x:
         - Converted to a bridge driver.
      
        etnaviv:
         - Misc fixes"
      
      * tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm: (1506 commits)
        drm/amdgpu/sriov: give 8s for recover vram under RUNTIME
        drm/scheduler: fix param documentation
        drm/i2c: tda998x: correct PLL divider calculation
        drm/i2c: tda998x: get rid of private fill_modes function
        drm/i2c: tda998x: move mode_valid() to bridge
        drm/i2c: tda998x: register bridge outside of component helper
        drm/i2c: tda998x: cleanup from previous changes
        drm/i2c: tda998x: allocate tda998x_priv inside tda998x_create()
        drm/i2c: tda998x: convert to bridge driver
        drm/scheduler: fix timeout worker setup for out of order job completions
        drm/amd/display: display connected to dp-1 does not light up
        drm/amd/display: update clk for various HDMI color depths
        drm/amd/display: program display clock on cache match
        drm/amd/display: Add NULL check for enabling dp ss
        drm/amd/display: add vbios table check for enabling dp ss
        drm/amd/display: Don't share clk source between DP and HDMI
        drm/amd/display: Fix DP HBR2 Eye Diagram Pattern on Carrizo
        drm/amd/display: Use calculated disp_clk_khz value for dce110
        drm/amd/display: Implement custom degamma lut on dcn
        drm/amd/display: Destroy aux_engines only once
        ...
      54dbe75b
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · dafa5f65
      Linus Torvalds 提交于
      Pull crypto updates from Herbert Xu:
       "API:
         - Fix dcache flushing crash in skcipher.
         - Add hash finup self-tests.
         - Reschedule during speed tests.
      
        Algorithms:
         - Remove insecure vmac and replace it with vmac64.
         - Add public key verification for DH/ECDH.
      
        Drivers:
         - Decrease priority of sha-mb on x86.
         - Improve NEON latency/throughput on ARM64.
         - Add md5/sha384/sha512/des/3des to inside-secure.
         - Support eip197d in inside-secure.
         - Only register algorithms supported by the host in virtio.
         - Add cts and remove incompatible cts1 from ccree.
         - Add hisilicon SEC security accelerator driver.
         - Replace msm hwrng driver with qcom pseudo rng driver.
      
        Misc:
         - Centralize CRC polynomials"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (121 commits)
        crypto: arm64/ghash-ce - implement 4-way aggregation
        crypto: arm64/ghash-ce - replace NEON yield check with block limit
        crypto: hisilicon - sec_send_request() can be static
        lib/mpi: remove redundant variable esign
        crypto: arm64/aes-ce-gcm - don't reload key schedule if avoidable
        crypto: arm64/aes-ce-gcm - implement 2-way aggregation
        crypto: arm64/aes-ce-gcm - operate on two input blocks at a time
        crypto: dh - make crypto_dh_encode_key() make robust
        crypto: dh - fix calculating encoded key size
        crypto: ccp - Check for NULL PSP pointer at module unload
        crypto: arm/chacha20 - always use vrev for 16-bit rotates
        crypto: ccree - allow bigger than sector XTS op
        crypto: ccree - zero all of request ctx before use
        crypto: ccree - remove cipher ivgen left overs
        crypto: ccree - drop useless type flag during reg
        crypto: ablkcipher - fix crash flushing dcache in error path
        crypto: blkcipher - fix crash flushing dcache in error path
        crypto: skcipher - fix crash flushing dcache in error path
        crypto: skcipher - remove unnecessary setting of walk->nbytes
        crypto: scatterwalk - remove scatterwalk_samebuf()
        ...
      dafa5f65
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 9a76aba0
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
       "Highlights:
      
         - Gustavo A. R. Silva keeps working on the implicit switch fallthru
           changes.
      
         - Support 802.11ax High-Efficiency wireless in cfg80211 et al, From
           Luca Coelho.
      
         - Re-enable ASPM in r8169, from Kai-Heng Feng.
      
         - Add virtual XFRM interfaces, which avoids all of the limitations of
           existing IPSEC tunnels. From Steffen Klassert.
      
         - Convert GRO over to use a hash table, so that when we have many
           flows active we don't traverse a long list during accumluation.
      
         - Many new self tests for routing, TC, tunnels, etc. Too many
           contributors to mention them all, but I'm really happy to keep
           seeing this stuff.
      
         - Hardware timestamping support for dpaa_eth/fsl-fman from Yangbo Lu.
      
         - Lots of cleanups and fixes in L2TP code from Guillaume Nault.
      
         - Add IPSEC offload support to netdevsim, from Shannon Nelson.
      
         - Add support for slotting with non-uniform distribution to netem
           packet scheduler, from Yousuk Seung.
      
         - Add UDP GSO support to mlx5e, from Boris Pismenny.
      
         - Support offloading of Team LAG in NFP, from John Hurley.
      
         - Allow to configure TX queue selection based upon RX queue, from
           Amritha Nambiar.
      
         - Support ethtool ring size configuration in aquantia, from Anton
           Mikaev.
      
         - Support DSCP and flowlabel per-transport in SCTP, from Xin Long.
      
         - Support list based batching and stack traversal of SKBs, this is
           very exciting work. From Edward Cree.
      
         - Busyloop optimizations in vhost_net, from Toshiaki Makita.
      
         - Introduce the ETF qdisc, which allows time based transmissions. IGB
           can offload this in hardware. From Vinicius Costa Gomes.
      
         - Add parameter support to devlink, from Moshe Shemesh.
      
         - Several multiplication and division optimizations for BPF JIT in
           nfp driver, from Jiong Wang.
      
         - Lots of prepatory work to make more of the packet scheduler layer
           lockless, when possible, from Vlad Buslov.
      
         - Add ACK filter and NAT awareness to sch_cake packet scheduler, from
           Toke Høiland-Jørgensen.
      
         - Support regions and region snapshots in devlink, from Alex Vesker.
      
         - Allow to attach XDP programs to both HW and SW at the same time on
           a given device, with initial support in nfp. From Jakub Kicinski.
      
         - Add TLS RX offload and support in mlx5, from Ilya Lesokhin.
      
         - Use PHYLIB in r8169 driver, from Heiner Kallweit.
      
         - All sorts of changes to support Spectrum 2 in mlxsw driver, from
           Ido Schimmel.
      
         - PTP support in mv88e6xxx DSA driver, from Andrew Lunn.
      
         - Make TCP_USER_TIMEOUT socket option more accurate, from Jon
           Maxwell.
      
         - Support for templates in packet scheduler classifier, from Jiri
           Pirko.
      
         - IPV6 support in RDS, from Ka-Cheong Poon.
      
         - Native tproxy support in nf_tables, from Máté Eckl.
      
         - Maintain IP fragment queue in an rbtree, but optimize properly for
           in-order frags. From Peter Oskolkov.
      
         - Improvde handling of ACKs on hole repairs, from Yuchung Cheng"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1996 commits)
        bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT"
        hv/netvsc: Fix NULL dereference at single queue mode fallback
        net: filter: mark expected switch fall-through
        xen-netfront: fix warn message as irq device name has '/'
        cxgb4: Add new T5 PCI device ids 0x50af and 0x50b0
        net: dsa: mv88e6xxx: missing unlock on error path
        rds: fix building with IPV6=m
        inet/connection_sock: prefer _THIS_IP_ to current_text_addr
        net: dsa: mv88e6xxx: bitwise vs logical bug
        net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()
        ieee802154: hwsim: using right kind of iteration
        net: hns3: Add vlan filter setting by ethtool command -K
        net: hns3: Set tx ring' tc info when netdev is up
        net: hns3: Remove tx ring BD len register in hns3_enet
        net: hns3: Fix desc num set to default when setting channel
        net: hns3: Fix for phy link issue when using marvell phy driver
        net: hns3: Fix for information of phydev lost problem when down/up
        net: hns3: Fix for command format parsing error in hclge_is_all_function_id_zero
        net: hns3: Add support for serdes loopback selftest
        bnxt_en: take coredump_record structure off stack
        ...
      9a76aba0
    • G
      x86: i8259: Add missing include file · 0a957467
      Guenter Roeck 提交于
      i8259.h uses inb/outb and thus needs to include asm/io.h to avoid the
      following build error, as seen with x86_64:defconfig and CONFIG_SMP=n.
      
        In file included from drivers/rtc/rtc-cmos.c:45:0:
        arch/x86/include/asm/i8259.h: In function 'inb_pic':
        arch/x86/include/asm/i8259.h:32:24: error:
      	implicit declaration of function 'inb'
      
        arch/x86/include/asm/i8259.h: In function 'outb_pic':
        arch/x86/include/asm/i8259.h:45:2: error:
      	implicit declaration of function 'outb'
      Reported-by: NSebastian Gottschall <s.gottschall@dd-wrt.com>
      Suggested-by: NSebastian Gottschall <s.gottschall@dd-wrt.com>
      Fixes: 447ae316 ("x86: Don't include linux/irq.h from asm/hardirq.h")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0a957467
    • L
      Merge tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · fa1b5d09
      Linus Torvalds 提交于
      Pull Kconfig consolidation from Masahiro Yamada:
       "Consolidation of Kconfig files by Christoph Hellwig.
      
        Move the source statements of arch-independent Kconfig files instead
        of duplicating the includes in every arch/$(SRCARCH)/Kconfig"
      
      * tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kconfig: add a Memory Management options" menu
        kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt
        kconfig: use a menu in arch/Kconfig to reduce clutter
        kconfig: include kernel/Kconfig.preempt from init/Kconfig
        Kconfig: consolidate the "Kernel hacking" menu
        kconfig: include common Kconfig files from top-level Kconfig
        kconfig: remove duplicate SWAP symbol defintions
        um: create a proper drivers Kconfig
        um: cleanup Kconfig files
        um: stop abusing KBUILD_KCONFIG
      fa1b5d09
    • B
      Merge branch 'remotes/lorenzo/pci/vmd' · fa687fb9
      Bjorn Helgaas 提交于
        - Whitelist VMD devices with fast interrupt handlers to avoid sharing
          vectors with slow handlers (Keith Busch)
      
      * remotes/lorenzo/pci/vmd:
        PCI: vmd: White list for fast interrupt handlers
      fa687fb9
    • B
      Merge branch 'remotes/lorenzo/pci/mvebu' · 323fc750
      Bjorn Helgaas 提交于
        - Fix mvebu I/O space remapping issues (Thomas Petazzoni)
      
        - Use generic pci_host_bridge in mvebu instead of ARM-specific API
          (Thomas Petazzoni)
      
      * remotes/lorenzo/pci/mvebu:
        PCI: mvebu: Drop bogus comment above mvebu_pcie_map_registers()
        PCI: mvebu: Convert to use pci_host_bridge directly
        PCI: mvebu: Use resource_size() to remap I/O space
        PCI: mvebu: Only remap I/O space if configured
        PCI: mvebu: Fix I/O space end address calculation
        PCI: mvebu: Remove redundant platform_set_drvdata() call
      323fc750
    • B
      Merge branch 'remotes/lorenzo/pci/mobiveil' · 732c4701
      Bjorn Helgaas 提交于
        - Fix mobiveil iomem/phys_addr_t type usage (Lorenzo Pieralisi)
      
        - Fix mobiveil missing include file (Lorenzo Pieralisi)
      
        - Add mobiveil Kconfig/Makefile support (Lorenzo Pieralisi)
      
      * remotes/lorenzo/pci/mobiveil:
        PCI: mobiveil: Add Kconfig/Makefile entries
        PCI: mobiveil: Add missing ../pci.h include
        PCI: mobiveil: Fix struct mobiveil_pcie.pcie_reg_base address type
        PCI: mobiveil: Integer overflow in IB_WIN_SIZE
      732c4701
    • B
      Merge branch 'remotes/lorenzo/pci/iproc' · 0ea77d2b
      Bjorn Helgaas 提交于
        - Add more devices to Broadcom PAXC quirk (Ray Jui)
      
        - Work around corrupted Broadcom PAXC config space to enable SMMU and
          GICv3 ITS (Ray Jui)
      
        - Disable MSI parsing to work around broken Broadcom PAXC logic in some
          devices (Ray Jui)
      
        - Hide unconfigured functions to work around a Broadcom PAXC defect (Ray
          Jui)
      
        - Lower iproc log level to reduce console output during boot (Ray Jui)
      
      * remotes/lorenzo/pci/iproc:
        PCI: iproc: Reduce inbound/outbound mapping print level
        PCI: iproc: Reject unconfigured physical functions from PAXC
        PCI: iproc: Disable MSI parsing in certain PAXC blocks
        PCI: iproc: Fix up corrupted PAXC root complex config registers
        PCI: iproc: Activate PAXC bridge quirk for more devices
      0ea77d2b
    • B
      Merge branch 'remotes/lorenzo/pci/hv' · 1974704e
      Bjorn Helgaas 提交于
        - Remove unnecessary GFP_ATOMIC from Hyper-V "new child" allocation
          (Jia-Ju Bai)
      
      * remotes/lorenzo/pci/hv:
        PCI: hv: Replace GFP_ATOMIC with GFP_KERNEL in new_pcichild_device()
      1974704e
    • B
      Merge branch 'remotes/lorenzo/pci/dwc' · 0c38011a
      Bjorn Helgaas 提交于
        - Add Kirin MSI support (Xiaowei Song)
      
        - Drop unnecessary root_bus_nr setting from exynos, imx6, keystone,
          armada8k, artpec6, designware-plat, histb, qcom, spear13xx (Shawn Guo)
      
        - Move link notification settings from DesignWare core to individual
          drivers (Gustavo Pimentel)
      
        - Add endpoint library MSI-X interfaces (Gustavo Pimentel)
      
        - Correct signature of endpoint library IRQ interfaces (Gustavo Pimentel)
      
        - Add DesignWare endpoint library MSI-X callbacks (Gustavo Pimentel)
      
        - Add endpoint library MSI-X test support (Gustavo Pimentel)
      
      * remotes/lorenzo/pci/dwc:
        PCI: endpoint: Add MSI set maximum restriction
        tools: PCI: Add MSI-X support
        pci_endpoint_test: Add 2 ioctl commands
        pci-epf-test/pci_endpoint_test: Add MSI-X support
        pci-epf-test/pci_endpoint_test: Use irq_type module parameter
        pci-epf-test/pci_endpoint_test: Cleanup PCI_ENDPOINT_TEST memspace
        PCI: dwc: Add legacy interrupt callback handler
        PCI: dwc: Rework MSI callbacks handler
        PCI: dwc: Add MSI-X callbacks handler
        PCI: Update xxx_pcie_ep_raise_irq() and pci_epc_raise_irq() signatures
        PCI: endpoint: Add MSI-X interfaces
        PCI: dwc: Fix EP link notification implementation
        PCI: spear13xx: Drop unnecessary root_bus_nr setting
        PCI: qcom: Drop unnecessary root_bus_nr setting
        PCI: histb: Drop unnecessary root_bus_nr setting
        PCI: designware-plat: Drop unnecessary root_bus_nr setting
        PCI: artpec6: Drop unnecessary root_bus_nr setting
        PCI: armada8k: Drop unnecessary root_bus_nr setting
        PCI: keystone: Drop unnecessary root_bus_nr setting
        PCI: imx6: Drop unnecessary root_bus_nr setting
        PCI: exynos: Drop unnecessary root_bus_nr setting
        PCI: kirin: Add MSI support
      0c38011a
    • B
      Merge branch 'remotes/lorenzo/pci/cadence' · 37f0e311
      Bjorn Helgaas 提交于
        - Correct the Cadence cdns_pcie_writel() signature (Alan Douglas)
      
        - Add Cadence support for optional generic PHYs (Alan Douglas)
      
        - Add Cadence power management ops (Alan Douglas)
      
        - Remove redundant variable from Cadence driver (Colin Ian King)
      
      * remotes/lorenzo/pci/cadence:
        PCI: pcie-cadence-ep: Remove redundant variable mmc
        PCI: cadence: Add shutdown callback to host driver
        PCI: cadence: Add Power Management ops for host and EP
        dt-bindings: PCI: cadence: Add DT bindings for optional PHYs
        PCI: cadence: Add generic PHY support to host and EP drivers
        PCI: cadence: Update cdns_pcie_writel() function signature
      37f0e311