git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Michael Ellerman <mpe@ellerman.id.au>
	Fri, 3 Sep 2021 12:54:12 +0000 (22:54 +1000)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Fri, 3 Sep 2021 12:54:12 +0000 (22:54 +1000)
commit	8e5bf5969b54f6dfdc6c4f70b7208208ad19f2c2
tree	4ec2b6857f839e9f4c86c9a08c9ccc4528ed0e9f	tree \| snapshot
parent	b84390507fd9bd15328ac228cb68438196e896d9	commit \| diff
parent	dd173c9b1ae5203bc4bfe86bfad8284162eb9b95	commit \| diff

Merge branch 'fixes' into next

Merge our fixes branch into next.

That lets us resolve a conflict in arch/powerpc/sysdev/xive/common.c.

Between bf3239e8b967 ("powerpc/xive: Do not skip CPU-less nodes when
creating the IPIs"), which moved request_irq() out of xive_init_ipis(),
and 6f4af3854928 ("powerpc: use IRQF_NO_DEBUG for IPIs") which added
IRQF_NO_DEBUG to that request_irq() call, which has now moved.

Linux Kernel Source Tree.

RSS Atom

arch/powerpc/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/xive/common.c	diff1 \|	diff2 \|	blob \| history