8dd06ef34b6e2f41b29fbf5fc1663780f2524285 - Merge branch 'next' into for-linus

Sat, 06 Jun 2020 19:45:37 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.8 merge window. List of files: /linux/fs/ubifs/Kconfig

0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 - Merge tag 'v5.6' into next

Tue, 12 May 2020 21:18:21 +0200

Merge tag 'v5.6' into nextSync up with mainline to get device tree and other changes. List of files: /linux/fs/ubifs/Kconfig

c9f289701540baeef9ac7c9977d67a7259f404db - Merge branch 'for-5.7/appleir' into for-linus

Wed, 01 Apr 2020 12:26:12 +0200

Merge branch 'for-5.7/appleir' into for-linus- small code cleanups in hid-appleir from Lucas Tanure List of files: /linux/fs/ubifs/Kconfig

a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 - Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Sat, 21 Mar 2020 09:23:40 +0100

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflictsConflicts: arch/x86/purgatory/MakefileSigned-off-by: Ingo Molnar List of files: /linux/fs/ubifs/Kconfig

ff36e78fdb251b9fa65028554689806961e011eb - Merge drm/drm-next into drm-intel-next-queued

Tue, 25 Feb 2020 18:29:58 +0100

Merge drm/drm-next into drm-intel-next-queuedSome DSI and VBT pending patches from Hans will applycleanly and with less ugly conflicts if they are rebuilton top of other patches that recently landed on drm-next.Reference: https://patchwork.freedesktop.org/series/70952/Cc: Hans de Goede Signed-off-by: Rodrigo Vivi

546121b65f47384e11ec1fa2e55449fc9f4846b2 - Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patches

Mon, 24 Feb 2020 11:36:09 +0100

Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patchesSigned-off-by: Ingo Molnar List of files: /linux/fs/ubifs/Kconfig

28f2aff1caa4997f58ca31179cad1b4a84a62827 - Merge v5.6-rc2 into drm-misc-next

Mon, 17 Feb 2020 10:34:34 +0100

Merge v5.6-rc2 into drm-misc-nextLyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-nextforward yet, so it looks like a good occasion.Signed-off-by: Maxime Ripard List of files: /linux/fs/ubifs/Kconfig

74c12ee02af109adcde36ec184fa59c0afb0edaa - Merge v5.6-rc1 into drm-misc-fixes

Wed, 12 Feb 2020 14:08:59 +0100

Merge v5.6-rc1 into drm-misc-fixesWe're based on v5.6, need v5.6-rc1 at least. :)Signed-off-by: Maarten Lankhorst List of files: /linux/fs/ubifs/Kconfig

fdff7c21ea00787e3f70a1a00b40b88eb998c6ad - Merge branch 'linus' into perf/urgent, to synchronize with upstream

Wed, 05 Feb 2020 08:44:22 +0100

Merge branch 'linus' into perf/urgent, to synchronize with upstreamSigned-off-by: Ingo Molnar List of files: /linux/fs/ubifs/Kconfig

f0d874414329a86b67198cb0299d0dc9310592f1 - Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

Wed, 29 Jan 2020 00:22:21 +0100

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscryptPull fscrypt updates from Eric Biggers: - Extend the FS_IOC_ADD_ENCRYPTION_KEY ioctl to allow the raw key to be provided via a keyring key. - Prepare for the new dirhash method (SipHash of plaintext name) that will be used by directories that are both encrypted and casefolded. - Switch to a new format for "no-key names" that prepares for the new dirhash method, and also fixes a longstanding bug where multiple filenames could map to the same no-key name. - Allow the crypto algorithms used by fscrypt to be built as loadable modules when the fscrypt-capable filesystems are. - Optimize fscrypt_zeroout_range(). - Various cleanups.* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: (26 commits) fscrypt: improve format of no-key names ubifs: allow both hash and disk name to be provided in no-key names ubifs: don't trigger assertion on invalid no-key filename fscrypt: clarify what is meant by a per-file key fscrypt: derive dirhash key for casefolded directories fscrypt: don't allow v1 policies with casefolding fscrypt: add "fscrypt_" prefix to fname_encrypt() fscrypt: don't print name of busy file when removing key ubifs: use IS_ENCRYPTED() instead of ubifs_crypt_is_encrypted() fscrypt: document gfp_flags for bounce page allocation fscrypt: optimize fscrypt_zeroout_range() fscrypt: remove redundant bi_status check fscrypt: Allow modular crypto algorithms fscrypt: include in UAPI header fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info() fscrypt: remove fscrypt_is_direct_key_policy() fscrypt: move fscrypt_valid_enc_modes() to policy.c fscrypt: check for appropriate use of DIRECT_KEY flag earlier fscrypt: split up fscrypt_supported_policy() by policy version fscrypt: introduce fscrypt_needs_contents_encryption() ... List of files: /linux/fs/ubifs/Kconfig

ede7a09fc8815011d67942e5b4a3cb1882b7bcd9 - fscrypt: Allow modular crypto algorithms

Fri, 27 Dec 2019 03:47:00 +0100

fscrypt: Allow modular crypto algorithmsThe commit 643fa9612bf1 ("fscrypt: remove filesystem specificbuild config option") removed modular support for fs/crypto. Thiscauses the Crypto API to be built-in whenever fscrypt is enabled.This makes it very difficult for me to test modular builds ofthe Crypto API without disabling fscrypt which is a pain.As fscrypt is still evolving and it's developing new ties with thefs layer, it's hard to build it as a module for now.However, the actual algorithms are not required until a filesystemis mounted. Therefore we can allow them to be built as modules.Signed-off-by: Herbert Xu Link: https://lore.kernel.org/r/20191227024700.7vrzuux32uyfdgum@gondor.apana.org.auSigned-off-by: Eric Biggers List of files: /linux/fs/ubifs/Kconfig

0898782247ae533d1f4e47a06bc5d4870931b284 - Merge branch 'next' into for-linus

Mon, 16 Sep 2019 18:56:27 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.4 merge window. List of files: /linux/fs/ubifs/Kconfig

d3f9990f1b48514b33342612b51fad238592d774 - Merge branch 'for-next' into for-linus

Sat, 14 Sep 2019 17:24:57 +0200

Merge branch 'for-next' into for-linusSigned-off-by: Takashi Iwai List of files: /linux/fs/ubifs/Kconfig

6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76 - Merge branch 'master' into for-5.4/logitech

Fri, 23 Aug 2019 11:35:39 +0200

Merge branch 'master' into for-5.4/logitechSigned-off-by: Benjamin Tissoires List of files: /linux/fs/ubifs/Kconfig

75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 - Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

Fri, 23 Aug 2019 06:08:04 +0200

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-nextThis merges in fixes for the XIVE interrupt controller which touch bothgeneric powerpc and PPC KVM code. To avoid merge conflicts, thesecommits will go upstream via the powerpc tree as well as the KVM tree.Signed-off-by: Paul Mackerras List of files: /linux/fs/ubifs/Kconfig

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/fs/ubifs/Kconfig

cbd32a1c56e36fedaa93a727699188bd3e6e6f67 - Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Mon, 12 Aug 2019 14:36:27 +0200

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgentPull a single EFI fix for v5.3 from Ard: - Fix mixed mode breakage in EFI config table handling for TPM. List of files: /linux/fs/ubifs/Kconfig

4aa31b4b61e4985e719352c329c3948d1932cb64 - Merge tag 'v5.3-rc4' into next

Mon, 12 Aug 2019 08:24:46 +0200

Merge tag 'v5.3-rc4' into nextSync up with mainline to bring in device_property_count_u32 andothernewer APIs. List of files: /linux/fs/ubifs/Kconfig

3f61fd41f38328f0a585eaba2d72d339fe9aecda - Merge tag 'v5.3-rc3' into drm-next-5.4

Fri, 09 Aug 2019 20:07:28 +0200

Merge tag 'v5.3-rc3' into drm-next-5.4Linux 5.3-rc3Signed-off-by: Alex Deucher List of files: /linux/fs/ubifs/Kconfig

0e1c438c44dd9cde56effb44c5f1cfeda72e108d - Merge tag 'kvmarm-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Fri, 09 Aug 2019 16:53:39 +0200

Merge tag 'kvmarm-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm fixes for 5.3- A bunch of switch/case fall-through annotation, fixing one actual bug- Fix PMU reset bug- Add missing exception class debug strings List of files: /linux/fs/ubifs/Kconfig

Changes in Kconfig