git.kernel.dk Git - linux-2.6-block.git/commit

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e48a378 4a248f8)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 04:35:42 +0000 (15:35 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 04:35:42 +0000 (15:35 +1100)
commit	3c54b661d79ab610f3cb84ece913ef68c884f3e6
tree	d4da3a2d0e2aa8aeadfd2a579a218f1d32233f8c	tree
parent	e48a378aa75f297d83a839e56b8b0aa34d021a30	commit \| diff
parent	4a248f85b3dd8e010ff8335755c927130e9b0764	commit \| diff

Merge branch 'driver-core-next' of git://git./linux/kernel/git/gregkh/driver-core.git

# Conflicts:
# drivers/power/supply/ab8500_chargalg.c

13 files changed:

drivers/base/devtmpfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ingenic/ingenic-drm-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mediatek/mtk_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/mtk_iommu.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/mtk_iommu_v1.c	diff1 \|	diff2 \|	blob \| history
drivers/power/supply/ab8500_charger.c	diff1 \|	diff2 \|	blob \| history
drivers/power/supply/ab8500_fg.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wcd938x.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)