Changes in Kconfig

f4b369c6fe0ceaba2da2daff8c9eb415f85926dd - Merge branch 'next' into for-linus

Mon, 20 Apr 2026 03:28:57 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.1 merge window. List of files: /linux/drivers/ntb/hw/epf/Kconfig

0421ccdfad0d92713a812a5aeb7d07b0ea7213c8 - Merge tag 'v7.0-rc3' into next

Thu, 12 Mar 2026 18:44:42 +0100

Merge tag 'v7.0-rc3' into nextSync up with the mainline to brig up the latest changes, specificallychanges to ALPS driver. List of files: /linux/drivers/ntb/hw/epf/Kconfig

3e9e952bb3139ad1e08f3e1960239c2988ab90c9 - Merge branch 'for-7.1-printf-kunit-build' into for-linus

Mon, 20 Apr 2026 13:41:28 +0200

Merge branch 'for-7.1-printf-kunit-build' into for-linus List of files: /linux/drivers/ntb/hw/epf/Kconfig

d4eb7b2da66c848709e31585b9c371fa234abc39 - Merge branch 'for-7.1/core-v2' into for-linus

Thu, 16 Apr 2026 21:01:18 +0200

Merge branch 'for-7.1/core-v2' into for-linus- fixed handling of 0-sized reports (Dmitry Torokhov)- convert core code to __free() (Dmitry Torokhov)- support for multiple batteries per HID device (Lucas Zampieri) List of files: /linux/drivers/ntb/hw/epf/Kconfig

42d3b66d4cdbacfc9d120d2301b8de89cc29a914 - Merge drm/drm-next into drm-xe-next

Thu, 12 Mar 2026 15:17:56 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 7.00-rc3. Important ahead GPU SVM merging THPsupport.Signed-off-by: Matthew Brost List of files: /linux/drivers/ntb/hw/epf/Kconfig

0314e382cf02983eb3c33ac537ad9701e7858bc9 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 26 Feb 2026 19:20:47 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR (net-7.0-rc2).Conflicts:tools/testing/selftests/drivers/net/hw/rss_ctx.py 19c3a2a81d2b ("selftests: drv-net: rss: Generate unique ports for RSS context tests") ce5a0f4612db ("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up")include/net/inet_connection_sock.h 858d2a4f67ff6 ("tcp: fix potential race in tcp_v6_syn_recv_sock()") fcd3d039fab69 ("tcp: make tcp_v{4,6}_send_check() static")https://lore.kernel.org/aZ8PSFLzBrEU3I89@sirena.org.ukdrivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.cdrivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c 69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types") bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument") 8a96b9144f18a ("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk()")Adjacent changes:net/netfilter/ipvs/ip_vs_ctl.c c59bd9e62e06 ("ipvs: use more counters to avoid service lookups") bf4afc53b77a ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")Signed-off-by: Jakub Kicinski List of files: /linux/drivers/ntb/hw/epf/Kconfig

f09812b85fa6f41058bcc46e70ac406bf9b0493a - Merge drm/drm-next into drm-intel-next

Wed, 25 Feb 2026 12:23:04 +0100

Merge drm/drm-next into drm-intel-nextSync with v7.0-rc1 which contains a few treewide changes affecting i915.Signed-off-by: Jani Nikula List of files: /linux/drivers/ntb/hw/epf/Kconfig

3ecf0b4a0e0ed4783aa32c5f3e42d23c7021e1c8 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 7.0-rc1

Mon, 23 Feb 2026 17:06:33 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 7.0-rc1Cross-merge trees after 7.0-rc1.No conflicts.Signed-off-by: Alexei Starovoitov List of files: /linux/drivers/ntb/hw/epf/Kconfig

8b85987d3cf50178f67618122d9f3bb202f62f42 - Merge drm/drm-next into drm-misc-next

Mon, 23 Feb 2026 11:48:20 +0100

Merge drm/drm-next into drm-misc-nextLet's merge 7.0-rc1 to start the new drm-misc-next windowSigned-off-by: Maxime Ripard List of files: /linux/drivers/ntb/hw/epf/Kconfig

c17ee635fd3a482b2ad2bf5e269755c2eae5f25e - Merge drm/drm-fixes into drm-misc-fixes

Mon, 23 Feb 2026 10:09:45 +0100

Merge drm/drm-fixes into drm-misc-fixes7.0-rc1 was just released, let's merge it to kick the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/ntb/hw/epf/Kconfig

981361604566a28517a518c317943d9b7c392217 - Merge tag 'ntb-7.0' of https://github.com/jonmason/ntb

Sat, 21 Feb 2026 19:20:32 +0100

Merge tag 'ntb-7.0' of https://github.com/jonmason/ntbPull NTB (PCIe non-transparent bridge) updates from Jon Mason: "NTB updates include debugfs improvements, correctness fixes, cleanups, and new hardware support: ntb_transport QP stats are converted to seq_file, a tx_memcpy_offload module parameter is introduced with associated ordering fixes, and a debugfs queue name truncation bug is corrected. Additional fixes address format specifier mismatches in ntb_tool and boundary conditions in the Switchtec driver, while unused MSI helpers are removed and the codebase migrates to dma_map_phys(). Intel Gen6 (Diamond Rapids) NTB support is also added"* tag 'ntb-7.0' of https://github.com/jonmason/ntb: NTB: ntb_transport: Use seq_file for QP stats debugfs NTB: ntb_transport: Fix too small buffer for debugfs_name ntb/ntb_tool: correct sscanf format for u64 and size_t in tool_peer_mw_trans_write ntb: intel: Add Intel Gen6 NTB support for DiamondRapids NTB/msi: Remove unused functions ntb: ntb_hw_switchtec: Increase MAX_MWS limit to 256 ntb: ntb_hw_switchtec: Fix array-index-out-of-bounds access ntb: ntb_hw_switchtec: Fix shift-out-of-bounds for 0 mw lut NTB: epf: allow built-in build ntb: migrate to dma_map_phys instead of map_page NTB: ntb_transport: Add 'tx_memcpy_offload' module option NTB: ntb_transport: Remove unused 'retries' field from ntb_queue_entry List of files: /linux/drivers/ntb/hw/epf/Kconfig

f39e7d0e7f0dc3f8886d957d268eb5c5b28ddf97 - NTB: epf: allow built-in build

Mon, 03 Nov 2025 08:44:55 +0100

NTB: epf: allow built-in buildntb_hw_epf works just as well when built into the kernel image. Don'tforce module build.Signed-off-by: Baruch Siach Signed-off-by: Jon Mason List of files: /linux/drivers/ntb/hw/epf/Kconfig

d0034a7a4ac7fae708146ac0059b9c47a1543f0d - Merge branch 'next' into for-linus

Tue, 04 May 2021 20:46:00 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.13 merge window. List of files: /linux/drivers/ntb/hw/epf/Kconfig

e50fedec822efc7b7090f95862b782d91ca8aec0 - Merge branch 'for-5.13/surface-system-aggregator-intergration' into for-linus

Thu, 29 Apr 2021 21:45:19 +0200

Merge branch 'for-5.13/surface-system-aggregator-intergration' into for-linus- Surface Aggregator Module support from Maximilian Luz List of files: /linux/drivers/ntb/hw/epf/Kconfig

b7f8f259896f669f131713b0c74ba4d008daa71d - Merge tag 'v5.12-rc7' into ecryptfs/next

Mon, 19 Apr 2021 06:39:17 +0200

Merge tag 'v5.12-rc7' into ecryptfs/nextRequired to pick up idmapped mount changes which changed some functionparameters. List of files: /linux/drivers/ntb/hw/epf/Kconfig

a6ad93e37e76ec43c9cee6a91dd783fb854c2ff1 - Merge tag 'platform-drivers-x86-surface-aggregator-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into for-5.13/surface-system-aggregator-intergration

Tue, 30 Mar 2021 09:17:09 +0200

Merge tag 'platform-drivers-x86-surface-aggregator-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into for-5.13/surface-system-aggregator-intergrationPull immutable integration branch from Hans de Goede to have a stable base forSSAM (Surface System Aggregator Module) HID transport subsystem merge.=====Signed tag for the immutable platform-surface-aggregator-registrybranch for merging into other sub-systems.Note this is based on v5.12-rc2.===== List of files: /linux/drivers/ntb/hw/epf/Kconfig

5acac83bf2e42f51ab9fd315d657798754bf0bb8 - Merge tag 'v5.12-rc4' into next

Thu, 25 Mar 2021 19:46:10 +0100

Merge tag 'v5.12-rc4' into nextSync up with the mainline to bring in newest APIs. List of files: /linux/drivers/ntb/hw/epf/Kconfig

f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 - Merge drm/drm-next into drm-misc-next

Tue, 16 Mar 2021 09:06:23 +0100

Merge drm/drm-next into drm-misc-nextNoralf needs some patches in 5.12-rc3, and we've been delaying the 5.12merge due to the swap issue so it looks like a good time.Signed-off-by: Maxime Ripard List of files: /linux/drivers/ntb/hw/epf/Kconfig

b470ebc9e0e57f53d1db9c49b8a3de4086babd05 - Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Sun, 14 Mar 2021 16:34:35 +0100

Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip fixes from Marc Zyngier: - More compatible strings for the Ingenic irqchip (introducing the JZ4760B SoC) - Select GENERIC_IRQ_MULTI_HANDLER on the ARM ep93xx platform - Drop all GENERIC_IRQ_MULTI_HANDLER selections from the irqchip Kconfig, now relying on the architecture to get it right - Drop the debugfs_file field from struct irq_domain, now that debugfs can track things on its own List of files: /linux/drivers/ntb/hw/epf/Kconfig

35bb28ece90dfb7f72b77ba529f25f79323d9581 - Merge drm/drm-next into drm-intel-next

Thu, 11 Mar 2021 07:19:46 +0100

Merge drm/drm-next into drm-intel-nextSync up with upstream.Signed-off-by: Jani Nikula List of files: /linux/drivers/ntb/hw/epf/Kconfig