1. 24 1月, 2022 2 次提交
  2. 23 1月, 2022 21 次提交
  3. 22 1月, 2022 17 次提交
    • M
      certs: Fix build error when CONFIG_MODULE_SIG_KEY is empty · e6340b65
      Masahiro Yamada 提交于
      Since b8c96a6b ("certs: simplify $(srctree)/ handling and remove
      config_filename macro"), when CONFIG_MODULE_SIG_KEY is empty,
      signing_key.x509 fails to build:
      
          CERT    certs/signing_key.x509
        Usage: extract-cert <source> <dest>
        make[1]: *** [certs/Makefile:78: certs/signing_key.x509] Error 2
        make: *** [Makefile:1831: certs] Error 2
      
      Pass "" to the first argument of extract-cert to fix the build error.
      
      Link: https://lore.kernel.org/linux-kbuild/20220120094606.2skuyb26yjlnu66q@lion.mk-sys.cz/T/#u
      Fixes: b8c96a6b ("certs: simplify $(srctree)/ handling and remove config_filename macro")
      Reported-by: NMichal Kubecek <mkubecek@suse.cz>
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      Tested-by: NMichal Kubecek <mkubecek@suse.cz>
      e6340b65
    • M
      certs: Fix build error when CONFIG_MODULE_SIG_KEY is PKCS#11 URI · ad29a2fb
      Masahiro Yamada 提交于
      When CONFIG_MODULE_SIG_KEY is PKCS#11 URL (pkcs11:*), signing_key.x509
      fails to build:
      
        certs/Makefile:77: *** target pattern contains no '%'.  Stop.
      
      Due to the typo, $(X509_DEP) contains a colon.
      
      Fix it.
      
      Fixes: b8c96a6b ("certs: simplify $(srctree)/ handling and remove config_filename macro")
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      ad29a2fb
    • M
      Revert "Makefile: Do not quote value for CONFIG_CC_IMPLICIT_FALLTHROUGH" · e92e2634
      Masahiro Yamada 提交于
      This reverts commit cd8c917a.
      
      Commit 129ab0d2 ("kbuild: do not quote string values in
      include/config/auto.conf") provided the final solution.
      
      Now reverting the temporary workaround.
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      e92e2634
    • D
      usr/include/Makefile: add linux/nfc.h to the compile-test coverage · 10756dc5
      Dmitry V. Levin 提交于
      As linux/nfc.h userspace compilation was finally fixed by commits
      79b69a83 ("nfc: uapi: use kernel size_t to fix user-space builds")
      and 7175f02c ("uapi: fix linux/nfc.h userspace compilation errors"),
      there is no need to keep the compile-test exception for it in
      usr/include/Makefile.
      Signed-off-by: NDmitry V. Levin <ldv@altlinux.org>
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      10756dc5
    • L
      Merge branch 'akpm' (patches from Andrew) · 1c522832
      Linus Torvalds 提交于
      Merge yet more updates from Andrew Morton:
       "This is the post-linux-next queue. Material which was based on or
        dependent upon material which was in -next.
      
        69 patches.
      
        Subsystems affected by this patch series: mm (migration and zsmalloc),
        sysctl, proc, and lib"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (69 commits)
        mm: hide the FRONTSWAP Kconfig symbol
        frontswap: remove support for multiple ops
        mm: mark swap_lock and swap_active_head static
        frontswap: simplify frontswap_register_ops
        frontswap: remove frontswap_test
        mm: simplify try_to_unuse
        frontswap: remove the frontswap exports
        frontswap: simplify frontswap_init
        frontswap: remove frontswap_curr_pages
        frontswap: remove frontswap_shrink
        frontswap: remove frontswap_tmem_exclusive_gets
        frontswap: remove frontswap_writethrough
        mm: remove cleancache
        lib/stackdepot: always do filter_irq_stacks() in stack_depot_save()
        lib/stackdepot: allow optional init and stack_table allocation by kvmalloc()
        proc: remove PDE_DATA() completely
        fs: proc: store PDE()->data into inode->i_private
        zsmalloc: replace get_cpu_var with local_lock
        zsmalloc: replace per zpage lock with pool->migrate_lock
        locking/rwlocks: introduce write_lock_nested
        ...
      1c522832
    • L
      Merge tag '5.17-rc-part2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · 8205ae32
      Linus Torvalds 提交于
      Pull cifs fixes from Steve French:
      
       - multichannel fixes, addressing additional reconnect and DFS scenarios
      
       - reenabling fscache support (indexing rewrite, metadata caching e.g.)
      
       - send additional version information during NTLMSSP negotiate to
         improve debugging
      
       - fix for a mount race
      
       - DFS fixes
      
       - fix for a memory leak for stable
      
      * tag '5.17-rc-part2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update internal module number
        smb3: send NTLMSSP version information
        cifs: Support fscache indexing rewrite
        cifs: cifs_ses_mark_for_reconnect should also update reconnect bits
        cifs: update tcpStatus during negotiate and sess setup
        cifs: make status checks in version independent callers
        cifs: remove repeated state change in dfs tree connect
        cifs: fix the cifs_reconnect path for DFS
        cifs: remove unused variable ses_selected
        cifs: protect all accesses to chan_* with chan_lock
        cifs: fix the connection state transitions with multichannel
        cifs: check reconnects for channels of active tcons too
        smb3: add new defines from protocol specification
        cifs: serialize all mount attempts
        cifs: quirk for STATUS_OBJECT_NAME_INVALID returned for non-ASCII dfs refs
        cifs: alloc_path_with_tree_prefix: do not append sep. if the path is empty
        cifs: clean up an inconsistent indenting
        cifs: free ntlmsspblob allocated in negotiate
      8205ae32
    • L
      Merge tag 'xfs-5.17-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 1cb69c80
      Linus Torvalds 提交于
      Pull xfs fixes from Darrick Wong:
       "One of the patches removes some dead code from xfs_ioctl32.h and the
        other fixes broken workqueue flushing in the inode garbage collector.
      
         - Minor cleanup of ioctl32 cruft
      
         - Clean up open coded inodegc workqueue function calls"
      
      * tag 'xfs-5.17-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: flush inodegc workqueue tasks before cancel
        xfs: remove unused xfs_ioctl32.h declarations
      1cb69c80
    • L
      Merge tag 'fscache-fixes-20220121' of... · 7fd350f6
      Linus Torvalds 提交于
      Merge tag 'fscache-fixes-20220121' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
      
      Pull more fscache updates from David Howells:
       "A set of fixes and minor updates for the fscache rewrite:
      
         - Fix mishandling of volume collisions (the wait condition is
           inverted and so it was only waiting if the volume collision was
           already resolved).
      
         - Fix miscalculation of whether there's space available in
           cachefiles.
      
         - Make sure a default cache name is set on a cache if the user hasn't
           set one by the time they bind the cache.
      
         - Adjust the way the backing inode is presented in tracepoints, add a
           tracepoint for mkdir and trace directory lookup.
      
         - Add a tracepoint for failure to set the active file mark.
      
         - Add an explanation of the checks made on the backing filesystem.
      
         - Check that the backing filesystem supports tmpfile.
      
         - Document how the page-release cancellation of the read-skip
           optimisation works.
      
        And I've included a change for netfslib:
      
         - Make ops->init_rreq() optional"
      
      * tag 'fscache-fixes-20220121' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        netfs: Make ops->init_rreq() optional
        fscache: Add a comment explaining how page-release optimisation works
        cachefiles: Check that the backing filesystem supports tmpfiles
        cachefiles: Explain checks in a comment
        cachefiles: Trace active-mark failure
        cachefiles: Make some tracepoint adjustments
        cachefiles: set default tag name if it's unspecified
        cachefiles: Calculate the blockshift in terms of bytes, not pages
        fscache: Fix the volume collision wait condition
      7fd350f6
    • L
      Merge tag 'folio-5.17a' of git://git.infradead.org/users/willy/pagecache · b68b10b6
      Linus Torvalds 提交于
      Pull more folio updates from Matthew Wilcox:
       "Three small folio patches.
      
        One bug fix, one patch pulled forward from the patches destined for
        5.18 and then a patch to make use of that functionality"
      
      * tag 'folio-5.17a' of git://git.infradead.org/users/willy/pagecache:
        filemap: Use folio_put_refs() in filemap_free_folio()
        mm: Add folio_put_refs()
        pagevec: Initialise folio_batch->percpu_pvec_drained
      b68b10b6
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 369af20a
      Linus Torvalds 提交于
      Pull more SCSI updates from James Bottomley:
       "This series is all the stragglers that didn't quite make the first
        merge window pull. It's mostly minor updates and bug fixes of merge
        window code"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: nsp_cs: Check of ioremap return value
        scsi: ufs: ufs-mediatek: Fix error checking in ufs_mtk_init_va09_pwr_ctrl()
        scsi: ufs: Modify Tactive time setting conditions
        scsi: efct: Remove useless DMA-32 fallback configuration
        scsi: message: fusion: mptctl: Use dma_alloc_coherent()
        scsi: message: fusion: mptsas: Use dma_alloc_coherent()
        scsi: message: fusion: Use dma_alloc_coherent() in mptsas_exp_repmanufacture_info()
        scsi: message: fusion: mptbase: Use dma_alloc_coherent()
        scsi: message: fusion: Use dma_alloc_coherent() in mpt_alloc_fw_memory()
        scsi: message: fusion: Remove usage of the deprecated "pci-dma-compat.h" API
        scsi: megaraid: Avoid mismatched storage type sizes
        scsi: hisi_sas: Remove unused variable and check in hisi_sas_send_ata_reset_each_phy()
        scsi: aic79xx: Remove redundant error variable
        scsi: pm80xx: Port reset timeout error handling correction
        scsi: mpi3mr: Fix formatting problems in some kernel-doc comments
        scsi: mpi3mr: Fix some spelling mistakes
        scsi: mpt3sas: Update persistent trigger pages from sysfs interface
        scsi: core: Fix scsi_mode_select() interface
        scsi: aacraid: Fix spelling of "its"
        scsi: qedf: Fix potential dereference of NULL pointer
      369af20a
    • L
      Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata · b087788c
      Linus Torvalds 提交于
      Pull ATA fix from Damien Le Moal:
       "A single patch to fix a compilation error in the pata_octeon_cf driver
        (mips architecture), from me"
      
      * tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
        ata: pata_octeon_cf: fix call to trace_ata_bmdma_stop()
      b087788c
    • L
      Merge tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 6bdfb259
      Linus Torvalds 提交于
      Pull more thermal control updates from Rafael Wysocki:
       "Add device IDs for Raptor Lake to the int340x thermal control driver
        (Srinivas Pandruvada)"
      
      * tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        thermal: int340x: Add Raptor Lake PCI device id
        thermal: int340x: Support Raptor Lake
      6bdfb259
    • L
      Merge tag 'acpi-5.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 71f1b916
      Linus Torvalds 提交于
      Pull extra ACPI updates from Rafael Wysocki:
       "These fix and clean up the ACPI CPPC driver on top of the recent
        changes in it merged previously and add some new device IDs to the
        ACPI DPTF driver.
      
        Specifics:
      
         - Fix a recently introduced endianness-related issue in the ACPI CPPC
           library and clean it up on top of that (Rafael Wysocki)
      
         - Add new device IDs for the Raptor Lake SoC to the ACPI DPTF driver
           (Srinivas Pandruvada)"
      
      * tag 'acpi-5.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: DPTF: Support Raptor Lake
        ACPI: CPPC: Drop redundant local variable from cpc_read()
        ACPI: CPPC: Fix up I/O port access in cpc_read()
      71f1b916
    • L
      Merge tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 0809edba
      Linus Torvalds 提交于
      Pull devicetree fixes and cleanups from Rob Herring:
      
       - Fix a regression when probing a child device reusing the parent
         device's DT node pointer
      
       - Refactor of_parse_phandle*() variants to static inlines
      
       - Drop Enric Balletbo i Serra as a maintainer
      
       - Fix DT schemas with arrays incorrectly encoded as a matrix
      
       - Drop unneeded pinctrl properties from schemas
      
       - Add SPI peripheral schema to SPI based displays
      
       - Clean-up several schema examples
      
       - Clean-up trivial-devices.yaml comments
      
       - Add missing, in use vendor prefixes: Wingtech, Thundercomm, Huawei,
         F(x)tec, 8devices
      
      * tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        dt-bindings: google,cros-ec: drop Enric Balletbo i Serra from maintainers
        dt-bindings: display: bridge: drop Enric Balletbo i Serra from maintainers
        of: Check 'of_node_reused' flag on of_match_device()
        of: property: define of_property_read_u{8,16,32,64}_array() unconditionally
        of: base: make small of_parse_phandle() variants static inline
        dt-bindings: mfd: cirrus,madera: Fix 'interrupts' in example
        dt-bindings: Fix array schemas encoded as matrices
        dt-bindings: Drop unnecessary pinctrl properties
        dt-bindings: rtc: st,stm32-rtc: Make each example a separate entry
        dt-bindings: mmc: arm,pl18x: Make each example a separate entry
        dt-bindings: display: Add SPI peripheral schema to SPI based displays
        scripts/dtc: dtx_diff: remove broken example from help text
        dt-bindings: trivial-devices: fix double spaces in comments
        dt-bindings: trivial-devices: fix swapped comments
        dt-bindings: vendor-prefixes: add Wingtech
        dt-bindings: vendor-prefixes: add Thundercomm
        dt-bindings: vendor-prefixes: add Huawei
        dt-bindings: vendor-prefixes: add F(x)tec
        dt-bindings: vendor-prefixes: add 8devices
        dt-bindings: power: reset: gpio-restart: Correct default priority
      0809edba
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 636b5284
      Linus Torvalds 提交于
      Pull more kvm updates from Paolo Bonzini:
       "Generic:
      
         - selftest compilation fix for non-x86
      
         - KVM: avoid warning on s390 in mark_page_dirty
      
       x86:
      
         - fix page write-protection bug and improve comments
      
         - use binary search to lookup the PMU event filter, add test
      
         - enable_pmu module parameter support for Intel CPUs
      
         - switch blocked_vcpu_on_cpu_lock to raw spinlock
      
         - cleanups of blocked vCPU logic
      
         - partially allow KVM_SET_CPUID{,2} after KVM_RUN (5.16 regression)
      
         - various small fixes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (46 commits)
        docs: kvm: fix WARNINGs from api.rst
        selftests: kvm/x86: Fix the warning in lib/x86_64/processor.c
        selftests: kvm/x86: Fix the warning in pmu_event_filter_test.c
        kvm: selftests: Do not indent with spaces
        kvm: selftests: sync uapi/linux/kvm.h with Linux header
        selftests: kvm: add amx_test to .gitignore
        KVM: SVM: Nullify vcpu_(un)blocking() hooks if AVIC is disabled
        KVM: SVM: Move svm_hardware_setup() and its helpers below svm_x86_ops
        KVM: SVM: Drop AVIC's intermediate avic_set_running() helper
        KVM: VMX: Don't do full kick when handling posted interrupt wakeup
        KVM: VMX: Fold fallback path into triggering posted IRQ helper
        KVM: VMX: Pass desired vector instead of bool for triggering posted IRQ
        KVM: VMX: Don't do full kick when triggering posted interrupt "fails"
        KVM: SVM: Skip AVIC and IRTE updates when loading blocking vCPU
        KVM: SVM: Use kvm_vcpu_is_blocking() in AVIC load to handle preemption
        KVM: SVM: Remove unnecessary APICv/AVIC update in vCPU unblocking path
        KVM: SVM: Don't bother checking for "running" AVIC when kicking for IPIs
        KVM: SVM: Signal AVIC doorbell iff vCPU is in guest mode
        KVM: x86: Remove defunct pre_block/post_block kvm_x86_ops hooks
        KVM: x86: Unexport LAPIC's switch_to_{hv,sw}_timer() helpers
        ...
      636b5284
    • L
      Merge tag 'for-5.17/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · dc5341f4
      Linus Torvalds 提交于
      Pull more parisc architecture updates from Helge Deller:
       "Fixes and enhancements:
      
         - a memory leak fix in an error path in pdc_stable (Miaoqian Lin)
      
         - two compiler warning fixes in the TOC code
      
         - added autodetection for currently used console type (serial or
           graphics) which inserts console=<type> if it's missing"
      
      * tag 'for-5.17/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries
        parisc: Fix missing prototype for 'toc_intr' warning in toc.c
        parisc: Autodetect default output device and set console= kernel parameter
        parisc: Use safer strscpy() in setup_cmdline()
        parisc: Add visible flag to toc_stack variable
      dc5341f4
    • L
      Merge tag 'riscv-for-linus-5.17-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · 7867e402
      Linus Torvalds 提交于
      Pull more RISC-V updates from Palmer Dabbelt:
      
       - Support for sv48 paging
      
       - Hart ID mappings are now sparse, which enables more CPUs to come up
         on systems with sparse hart IDs
      
       - A handful of cleanups and fixes
      
      * tag 'riscv-for-linus-5.17-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (27 commits)
        RISC-V: nommu_virt: Drop unused SLAB_MERGE_DEFAULT
        RISC-V: Remove redundant err variable
        riscv: dts: sifive unmatched: Add gpio poweroff
        riscv: canaan: remove useless select of non-existing config SYSCON
        RISC-V: Do not use cpumask data structure for hartid bitmap
        RISC-V: Move spinwait booting method to its own config
        RISC-V: Move the entire hart selection via lottery to SMP
        RISC-V: Use __cpu_up_stack/task_pointer only for spinwait method
        RISC-V: Do not print the SBI version during HSM extension boot print
        RISC-V: Avoid using per cpu array for ordered booting
        riscv: default to CONFIG_RISCV_SBI_V01=n
        riscv: fix boolconv.cocci warnings
        riscv: Explicit comment about user virtual address space size
        riscv: Use pgtable_l4_enabled to output mmu_type in cpuinfo
        riscv: Implement sv48 support
        asm-generic: Prepare for riscv use of pud_alloc_one and pud_free
        riscv: Allow to dynamically define VA_BITS
        riscv: Introduce functions to switch pt_ops
        riscv: Split early kasan mapping to prepare sv48 introduction
        riscv: Move KASAN mapping next to the kernel mapping
        ...
      7867e402