Changes in Kconfig

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/fs/autofs/Kconfig

cdd5b5a9761fd66d17586e4f4ba6588c70e640ea - Merge branch 'next' into for-linus

Tue, 07 Nov 2023 00:42:08 +0100

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

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/fs/autofs/Kconfig

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/fs/autofs/Kconfig

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/fs/autofs/Kconfig

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/fs/autofs/Kconfig

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/fs/autofs/Kconfig

34069d12e239ae8f36dd96c378e4622fb1c42a76 - Merge tag 'v6.5' into next

Tue, 05 Sep 2023 23:08:14 +0200

Merge tag 'v6.5' into nextSync up with mainline to bring in updates to the shared infrastructure. List of files: /linux/fs/autofs/Kconfig

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

Thu, 24 Aug 2023 09:27:21 +0200

Merge branch 'for-linus' into for-nextBack-merge the 6.5-devel branch for the clean patch application for6.6 and resolving merge conflicts.Signed-off-by: Takashi Iwai List of files: /linux/fs/autofs/Kconfig

fdebffeba8b877368ddcc139c26278c1c97931a4 - BackMerge tag 'v6.5-rc7' into drm-next

Wed, 23 Aug 2023 23:26:06 +0200

BackMerge tag 'v6.5-rc7' into drm-nextLinux 6.5-rc7This is needed for the CI stuff and the msm pull has fixes in it.Signed-off-by: Dave Airlie List of files: /linux/fs/autofs/Kconfig

a3dd14c0d079c214c4de7939dfbb8738887e67e7 - Merge tag 'v6.5-rc6' into icc-next

Mon, 21 Aug 2023 23:59:05 +0200

Merge tag 'v6.5-rc6' into icc-nextThe fixes that got merged into v6.5-rc6 are needed here.Signed-off-by: Georgi Djakov List of files: /linux/fs/autofs/Kconfig

a35762dd14adb952442e487d8dad4bb50b614b2b - Merge tag 'v6.5-rc6' into iommufd for-next

Tue, 15 Aug 2023 15:01:26 +0200

Merge tag 'v6.5-rc6' into iommufd for-nextRequired for following patches.Resolve merge conflict by using the hunk from the for-next branch andshifting the iommufd_object_deref_user() into iommufd_hw_pagetable_put()Signed-off-by: Jason Gunthorpe List of files: /linux/fs/autofs/Kconfig

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

Fri, 04 Aug 2023 15:06:38 +0200

Merge remote-tracking branch 'torvalds/master' into perf-tools-nextTo pick up the fixes that were just merged from perf-tools/perf-toolsfor v6.5.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/fs/autofs/Kconfig

4d84f763f7e137be7eeab30cc7daa9449c9cb053 - Merge tag 'asoc-fix-v6.5-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Fri, 04 Aug 2023 13:53:15 +0200

Merge tag 'asoc-fix-v6.5-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fix for v6.5Not really a fix, but rather a licensing update for the fsl_micfildriver. List of files: /linux/fs/autofs/Kconfig

35b1b1fd96388d5e3cf179bf36bd8a4153baf4a3 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 03 Aug 2023 23:29:50 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.Conflicts:net/dsa/port.c 9945c1fb03a3 ("net: dsa: fix older DSA drivers using phylink") a88dd7538461 ("net: dsa: remove legacy_pre_march2020 detection")https://lore.kernel.org/all/20230731102254.2c9868ca@canb.auug.org.au/net/xdp/xsk.c 3c5b4d69c358 ("net: annotate data-races around sk->sk_mark") b7f72a30e9ac ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path")https://lore.kernel.org/all/20230731102631.39988412@canb.auug.org.au/drivers/net/ethernet/broadcom/bnxt/bnxt.c 37b61cda9c16 ("bnxt: don't handle XDP in netpoll") 2b56b3d99241 ("eth: bnxt: handle invalid Tx completions more gracefully")https://lore.kernel.org/all/20230801101708.1dc7faac@canb.auug.org.au/Adjacent changes:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c 62da08331f1a ("net/mlx5e: Set proper IPsec source port in L4 selector") fbd517549c32 ("net/mlx5e: Add function to get IPsec offload namespace")drivers/net/ethernet/sfc/selftest.c 55c1528f9b97 ("sfc: fix field-spanning memcpy in selftest") ae9d445cd41f ("sfc: Miscellaneous comment removals")Signed-off-by: Jakub Kicinski List of files: /linux/fs/autofs/Kconfig

fe3015748a905e08eb0e1750aa2928f520063d59 - Merge 6.5-rc4 into tty-next

Mon, 31 Jul 2023 09:39:56 +0200

Merge 6.5-rc4 into tty-nextWe need the serial/tty fixes in here as well for testing and futuredevelopment.Signed-off-by: Greg Kroah-Hartman List of files: /linux/fs/autofs/Kconfig

98a9e32bdf2525073fdfbdcc520d5c798a7375e5 - Merge 6.5-rc4 into usb-next

Mon, 31 Jul 2023 09:36:55 +0200

Merge 6.5-rc4 into usb-nextWe need the USB fixes in here for testing and for other patches to beapplied on top of.Signed-off-by: Greg Kroah-Hartman List of files: /linux/fs/autofs/Kconfig

0e21a9d29d8bf9e3fe98c23c827a5be891f74347 - Merge 6.5-rc4 into staging-next

Mon, 31 Jul 2023 09:35:26 +0200

Merge 6.5-rc4 into staging-nextWe need the staging driver fixes in here as well.Signed-off-by: Greg Kroah-Hartman List of files: /linux/fs/autofs/Kconfig

1346e9331abe8d08c05148def1cb2cdf03085c40 - Merge 6.5-rc4 into char-misc-next

Mon, 31 Jul 2023 09:31:38 +0200

Merge 6.5-rc4 into char-misc-nextWe need the char-misc fixes in here as well for testing.Signed-off-by: Greg Kroah-Hartman List of files: /linux/fs/autofs/Kconfig

4ee0feccf2b372134d899a01ee025739f4ddfdca - spi: Merge up fixes from Linus' tree

Mon, 31 Jul 2023 00:38:59 +0200

spi: Merge up fixes from Linus' treeGets us pine64plus back if nothing else. List of files: /linux/fs/autofs/Kconfig