Changes in Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/arch/s390/hypfs/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/arch/s390/hypfs/Makefile

a1c613ae4c322ddd58d5a8539dbfba2a0380a8c0 - Merge drm/drm-next into drm-intel-gt-next

Tue, 24 Oct 2023 10:50:22 +0200

Merge drm/drm-next into drm-intel-gt-nextWork that needs to land in drm-intel-gt-next depends on two patches onlypresent in drm-intel-next, absence of which is causing a merge conflict: 3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")Signed-off-by: Tvrtko Ursulin List of files: /linux/arch/s390/hypfs/Makefile

a940daa52167e9db8ecce82213813b735a9d9f23 - Merge branch 'linus' into smp/core

Tue, 17 Oct 2023 21:40:46 +0200

Merge branch 'linus' into smp/corePull in upstream to get the fixes so depending changes can be applied. List of files: /linux/arch/s390/hypfs/Makefile

57390019b68b83f96eb98f490367b9df1f2d77cb - Merge drm/drm-next into drm-misc-next

Wed, 11 Oct 2023 09:50:59 +0200

Merge drm/drm-next into drm-misc-nextUpdating drm-misc-next to the state of Linux v6.6-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/s390/hypfs/Makefile

7d6904bf26b96ef087514cb7a8c50b62a4911c99 - Merge wireless into wireless-next

Thu, 05 Oct 2023 22:57:34 +0200

Merge wireless into wireless-nextResolve several conflicts, mostly between changes/fixes inwireless and the locking rework in wireless-next. One ofthe conflicts actually shows a bug in wireless that we'llwant to fix separately.Signed-off-by: Johannes Berg Signed-off-by: Kalle Valo List of files: /linux/arch/s390/hypfs/Makefile

de80193308f43d3ae52cd3561e8ba77cd1437311 - Merge tag 'v6.6-rc4' into perf/core, to pick up fixes

Tue, 03 Oct 2023 09:32:25 +0200

Merge tag 'v6.6-rc4' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/s390/hypfs/Makefile

6f23fc47c1b2ac226704fb7294f43ed3b0965e51 - Merge tag 'v6.6-rc2' into locking/core, to pick up fixes

Mon, 18 Sep 2023 22:17:15 +0200

Merge tag 'v6.6-rc2' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/s390/hypfs/Makefile

a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7 - Merge drm/drm-next into drm-intel-next

Fri, 15 Sep 2023 10:23:38 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.6-rc1.Signed-off-by: Jani Nikula List of files: /linux/arch/s390/hypfs/Makefile

c900529f3d9161bfde5cca0754f83b4d3c3e0220 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 12 Sep 2023 08:53:30 +0200

Merge drm/drm-fixes into drm-misc-fixesForwarding to v6.6-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/s390/hypfs/Makefile

e5b7ca09e9aa4d483ab84c5f2ba88f0cc7c66540 - Merge tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Tue, 29 Aug 2023 02:22:39 +0200

Merge tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linuxPull s390 updates from Heiko Carstens: - Add vfio-ap support to pass-through crypto devices to secure execution guests - Add API ordinal 6 support to zcrypt_ep11misc device drive, which is required to handle key generate and key derive (e.g. secure key to protected key) correctly - Add missing secure/has_secure sysfs files for the case where it is not possible to figure where a system has been booted from. Existing user space relies on that these files are always present - Fix DCSS block device driver list corruption, caused by incorrect error handling - Convert virt_to_pfn() and pfn_to_virt() from defines to static inline functions to enforce type checking - Cleanups, improvements, and minor fixes to the kernel mapping setup - Fix various virtual vs physical address confusions - Move pfault code to separate file, since it has nothing to do with regular fault handling - Move s390 documentation to Documentation/arch/ like it has been done for other architectures already - Add HAVE_FUNCTION_GRAPH_RETVAL support - Factor out the s390_hypfs filesystem and add a new config option for it. The filesystem is deprecated and as soon as all users are gone it can be removed some time in the not so near future - Remove support for old CEX2 and CEX3 crypto cards from zcrypt device driver - Add support for user-defined certificates: receive user-defined certificates with a diagnose call and provide them via 'cert_store' keyring to user space - Couple of other small fixes and improvements all over the place* tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (66 commits) s390/pci: use builtin_misc_device macro to simplify the code s390/vfio-ap: make sure nib is shared KVM: s390: export kvm_s390_pv*_is_protected functions s390/uv: export uv_pin_shared for direct usage s390/vfio-ap: check for TAPQ response codes 0x35 and 0x36 s390/vfio-ap: handle queue state change in progress on reset s390/vfio-ap: use work struct to verify queue reset s390/vfio-ap: store entire AP queue status word with the queue object s390/vfio-ap: remove upper limit on wait for queue reset to complete s390/vfio-ap: allow deconfigured queue to be passed through to a guest s390/vfio-ap: wait for response code 05 to clear on queue reset s390/vfio-ap: clean up irq resources if possible s390/vfio-ap: no need to check the 'E' and 'I' bits in APQSW after TAPQ s390/ipl: refactor deprecated strncpy s390/ipl: fix virtual vs physical address confusion s390/zcrypt_ep11misc: support API ordinal 6 with empty pin-blob s390/paes: fix PKEY_TYPE_EP11_AES handling for secure keyblobs s390/pkey: fix PKEY_TYPE_EP11_AES handling for sysfs attributes s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_VERIFYKEY2 IOCTL s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_KBLOB2PROTK[23] ... List of files: /linux/arch/s390/hypfs/Makefile

3325b4d85799957aa53514e69bed5c9df7771caf - s390/hypfs: factor out filesystem code

Tue, 04 Jul 2023 15:47:13 +0200

s390/hypfs: factor out filesystem codeThe s390_hypfs filesystem is deprecated and shouldn't be used due to itsrather odd semantics. It creates a whole directory structure with staticfile contents so a user can read a consistent state while within thatdirectory.Writing to its update attribute will remove and rebuild nearly the wholefilesystem, so that again a user can read a consistent state, even ifmultiple files need to be read.Given that this wastes a lot of CPU cycles, and involves a lot of code,binary interfaces have been added quite a couple of years ago, which simplypass the binary data to user space, and let user space decode the data.This is the preferred and only way how the data should be retrieved.The assumption is that there are no users of the s390_hypfs filesystem.However instead of just removing the code, and having to revert in casethere are actually users, factor the filesystem code out and make it onlyavailable via a new config option.This config option is supposed to be disabled. If it turns out there are nocomplaints the filesystem code can be removed probably in a couple ofyears.Acked-by: Alexander Gordeev Signed-off-by: Heiko Carstens List of files: /linux/arch/s390/hypfs/Makefile

664b0bae0b87f69bc9deb098f5e0158b9cf18e04 - Merge branch 'next' into for-linus

Thu, 05 Apr 2018 01:11:49 +0200

Merge branch 'next' into for-linusPrepare input updates for 4.17 merge window. List of files: /linux/arch/s390/hypfs/Makefile

ce8ee02d519ab20c5b87d3b3929b5e44ad89e26f - Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/dapm', 'asoc/fix/mtk' and 'asoc/fix/stm' into asoc-next

Wed, 07 Feb 2018 12:21:02 +0100

Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/dapm', 'asoc/fix/mtk' and 'asoc/fix/stm' into asoc-next List of files: /linux/arch/s390/hypfs/Makefile

d121f07691415df824e6b60520f782f6d13b3c81 - Merge branch 'for-4.16/dax' into libnvdimm-for-next

Sat, 03 Feb 2018 08:26:10 +0100

Merge branch 'for-4.16/dax' into libnvdimm-for-next List of files: /linux/arch/s390/hypfs/Makefile

10a558374f3751cf4eb55143008975641dfc2cf4 - Merge tag 'v4.15' into next

Thu, 01 Feb 2018 09:41:33 +0100

Merge tag 'v4.15' into nextSync with mainline to get in trackpoint updates and other changes. List of files: /linux/arch/s390/hypfs/Makefile

c86aa0129c07c8c7f54dc47656de99ab0eb809b3 - Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus

Wed, 31 Jan 2018 16:23:58 +0100

Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linusPull assorted small fixes queued for merge window. List of files: /linux/arch/s390/hypfs/Makefile

e7996a9a77fc669387da43ff4823b91cc4872bd0 - Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Mon, 29 Jan 2018 21:26:40 +0100

Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitTo resolve conflicts in: drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/qp.cFrom patches merged into the -rc cycle. The conflict resolution matcheswhat linux-next has been carrying.Signed-off-by: Jason Gunthorpe List of files: /linux/arch/s390/hypfs/Makefile

7e86548e2cc8d308cb75439480f428137151b0de - Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes

Tue, 30 Jan 2018 15:08:27 +0100

Merge tag 'v4.15' into x86/pti, to be able to merge dependent changesTime has come to switch PTI development over to a v4.15 base - we'll stilltry to make sure that all PTI fixes backport cleanly to v4.14 and earlier.Signed-off-by: Ingo Molnar List of files: /linux/arch/s390/hypfs/Makefile

ddb9e13af3bba3f8c36ccee0eb9563a82b425c12 - Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Mon, 29 Jan 2018 15:54:46 +0100

Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux List of files: /linux/arch/s390/hypfs/Makefile