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/drivers/nvme/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/drivers/nvme/Makefile

60a2f25de7b8b785baee2932db932ae9a5b8c86d - Merge drm/drm-next into drm-intel-gt-next

Thu, 16 May 2024 09:33:01 +0200

Merge drm/drm-next into drm-intel-gt-nextSome display refactoring patches are needed in order to allow conflict-less merging.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/nvme/Makefile

0ea5c948cb64bab5bc7a5516774eb8536f05aa0d - Merge drm/drm-next into drm-intel-next

Mon, 15 Jan 2024 08:38:05 +0100

Merge drm/drm-next into drm-intel-nextBackmerge to bring Xe driver to drm-intel-next.Signed-off-by: Jani Nikula List of files: /linux/drivers/nvme/Makefile

03c11eb3b16dc0058589751dfd91f254be2be613 - Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

Wed, 14 Feb 2024 10:45:07 +0100

Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branchConflicts: arch/x86/include/asm/percpu.h arch/x86/include/asm/text-patching.hSigned-off-by: Ingo Molnar List of files: /linux/drivers/nvme/Makefile

ab1c247094e323177a578b38f0325bf79f0317ac - Merge remote-tracking branch 'torvalds/master' into perf-tools-next

Tue, 19 Dec 2023 01:37:07 +0100

Merge remote-tracking branch 'torvalds/master' into perf-tools-nextTo pick up fixes that went thru perf-tools for v6.7 and to get in syncwith upstream to check for drift in the copies of headers, etc.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/nvme/Makefile

6b93f350e55f3f2ee071dd41109d936abfba8ebf - Merge branch 'for-6.8/amd-sfh' into for-linus

Mon, 08 Jan 2024 20:57:04 +0100

Merge branch 'for-6.8/amd-sfh' into for-linus- addition of new interfaces to export User presence information and Ambient light from amd-sfh to other drivers within the kernel (Basavaraj Natikar) List of files: /linux/drivers/nvme/Makefile

3bf3e21c15d4386a5f15118ec39bbc1b67ea5759 - Merge drm/drm-next into drm-misc-next

Wed, 15 Nov 2023 10:45:19 +0100

Merge drm/drm-next into drm-misc-nextLet's kickstart the v6.8 release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/nvme/Makefile

56eddc3cb1affe014d567f8460e5a76ca079f842 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 16 Nov 2023 16:05:44 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.No conflicts.Signed-off-by: Paolo Abeni List of files: /linux/drivers/nvme/Makefile

5d2d4a9f603a47403395408f64b1261ca61f6d50 - Merge branch 'tip/perf/urgent'

Wed, 15 Nov 2023 10:15:40 +0100

Merge branch 'tip/perf/urgent'Avoid conflicts, base on fixes.Signed-off-by: Peter Zijlstra List of files: /linux/drivers/nvme/Makefile

849d3f985e73196a24273f810a134b3ebed1efad - Merge tag 'thunderbolt-for-v6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Tue, 21 Nov 2023 08:13:55 +0100

Merge tag 'thunderbolt-for-v6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linusMika writes:thunderbolt: Fixes for v6.7-rc3This includes following USB4/Thunderbolt fixes for v6.7-rc3: - Fix a lane bonding issue on ASMedia USB4 device - Send uevents when link is switched to asymmetric or symmetric - Only add device router DP IN adapters to the head of resource list to avoid issues during system resume.All these have been in linux-next with no reported issues.* tag 'thunderbolt-for-v6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: (1451 commits) thunderbolt: Only add device router DP IN to the head of the DP resource list thunderbolt: Send uevent after asymmetric/symmetric switch thunderbolt: Set lane bonding bit only for downstream port List of files: /linux/drivers/nvme/Makefile

4b803784178d1721ba26cadd8aef13b2c7456730 - Merge tag 'block-6.7-2023-11-10' of git://git.kernel.dk/linux

Fri, 10 Nov 2023 20:20:33 +0100

Merge tag 'block-6.7-2023-11-10' of git://git.kernel.dk/linuxPull block fixes from Jens Axboe: - NVMe pull request via Keith: - nvme keyring config compile fixes (Hannes and Arnd) - fabrics keep alive fixes (Hannes) - tcp authentication fixes (Mark) - io_uring_cmd error handling fix (Anuj) - stale firmware attribute fix (Daniel) - tcp memory leak (Christophe) - crypto library usage simplification (Eric) - nbd use-after-free fix. May need a followup, but at least it's better than what it was before (Li) - Rate limit write on read-only device warnings (Yu)* tag 'block-6.7-2023-11-10' of git://git.kernel.dk/linux: nvme: keyring: fix conditional compilation nvme: common: make keyring and auth separate modules blk-core: use pr_warn_ratelimited() in bio_check_ro() nbd: fix uaf in nbd_open nvme: start keep-alive after admin queue setup nvme-loop: always quiesce and cancel commands before destroying admin q nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_queue() nvme-auth: always set valid seq_num in dhchap reply nvme-auth: add flag for bi-directional auth nvme-auth: auth success1 msg always includes resp nvme: fix error-handling for io_uring nvme-passthrough nvme: update firmware version after commit nvme-tcp: Fix a memory leak nvme-auth: use crypto_shash_tfm_digest() List of files: /linux/drivers/nvme/Makefile

37d9486874ec925fa298bcd7ba628a9b206e812f - Merge tag 'nvme-6.7-2023-11-8' of git://git.infradead.org/nvme into block-6.7

Wed, 08 Nov 2023 17:19:16 +0100

Merge tag 'nvme-6.7-2023-11-8' of git://git.infradead.org/nvme into block-6.7Pull NVMe fixes from Keith:"nvme fixes for 6.7 - nvme keyring config compile fixes (Hannes and Arnd) - fabrics keep alive fixes (Hannes) - tcp authentication fixes (Mark) - io_uring_cmd error handling fix (Anuj) - stale firmware attribute fix (Daniel) - tcp memory leak (Christophe) - cytpo library usage simplification (Eric)"* tag 'nvme-6.7-2023-11-8' of git://git.infradead.org/nvme: nvme: keyring: fix conditional compilation nvme: common: make keyring and auth separate modules nvme: start keep-alive after admin queue setup nvme-loop: always quiesce and cancel commands before destroying admin q nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_queue() nvme-auth: always set valid seq_num in dhchap reply nvme-auth: add flag for bi-directional auth nvme-auth: auth success1 msg always includes resp nvme: fix error-handling for io_uring nvme-passthrough nvme: update firmware version after commit nvme-tcp: Fix a memory leak nvme-auth: use crypto_shash_tfm_digest() List of files: /linux/drivers/nvme/Makefile

6affe08aea5f3b630565676e227b41d55a6f009c - nvme: common: make keyring and auth separate modules

Thu, 26 Oct 2023 15:08:03 +0200

nvme: common: make keyring and auth separate modulesWhen only the keyring module is included but auth is not, modpostcomplains about the lack of a module license tag:ERROR: modpost: missing MODULE_LICENSE() in drivers/nvme/common/nvme-common.oAddress this by making both modules buildable standalone,removing the now unnecessary CONFIG_NVME_COMMON symbolin the process.Also, now that NVME_KEYRING config symbol can be either a module orbuilt-in, the stubs need to check for '#if IS_ENABLED' rather than asimple '#ifdef'.Fixes: 9d77eb5277849 ("nvme-keyring: register '.nvme' keyring")Signed-off-by: Arnd Bergmann Signed-off-by: Hannes Reinecke Signed-off-by: Christoph Hellwig Signed-off-by: Keith Busch List of files: /linux/drivers/nvme/Makefile

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/drivers/nvme/Makefile

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/drivers/nvme/Makefile

5f8f8574c7f5585b09a9623f0f13462e4eb67b4d - Merge branch 'next' into for-linus

Mon, 10 Oct 2022 07:30:23 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.1 merge window. List of files: /linux/drivers/nvme/Makefile

edd1533d3ccd82dd5d600986d27d524e6be4c5fd - Merge branch 'for-6.1/logitech' into for-linus

Wed, 05 Oct 2022 11:21:55 +0200

Merge branch 'for-6.1/logitech' into for-linus- Add hanlding of all Bluetooth HID++ devices and fixes in hid++ (Bastien Nocera) List of files: /linux/drivers/nvme/Makefile

97acb6a8fcc4e5c2cdc2693a35acdc5a7461aaa3 - Merge drm/drm-next into drm-intel-gt-next

Mon, 03 Oct 2022 18:04:02 +0200

Merge drm/drm-next into drm-intel-gt-nextDaniele needs 84d4333c1e28 ("misc/mei: Add NULL check to component matchcallback functions") in order to merge the DG2 HuC patches.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/nvme/Makefile

305a72efa791c826fe84768ca55e31adc4113ea8 - Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next

Sun, 02 Oct 2022 04:16:16 +0200

Merge branch 'for-6.1/nvdimm' into libnvdimm-for-nextAdd v6.1 content on top of some straggling updates that missed v6.0. List of files: /linux/drivers/nvme/Makefile