Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6e5fee1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
* git://git.infradead.org/~dwmw2/hdroneline:
  [HEADERS] One line per header in Kbuild files to reduce conflicts

Manual (trivial) conflict resolution in include/asm-s390/Kbuild
parents 3e59ddff fadcfa33
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/
header-y += asm-generic/
header-y += linux/
header-y += scsi/
header-y += sound/
header-y += mtd/
header-y += rdma/
header-y += video/

header-y += asm-$(ARCH)/
+8 −2
Original line number Diff line number Diff line
include include/asm-generic/Kbuild.asm

unifdef-y += console.h fpu.h sysinfo.h compiler.h
header-y += gentrap.h
header-y += regdef.h
header-y += pal.h
header-y += reg.h

header-y += gentrap.h regdef.h pal.h reg.h
unifdef-y += console.h
unifdef-y += fpu.h
unifdef-y += sysinfo.h
unifdef-y += compiler.h
+12 −3
Original line number Diff line number Diff line
header-y += atomic.h errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h \
	signal.h statfs.h
unifdef-y := resource.h siginfo.h
header-y += atomic.h
header-y += errno-base.h
header-y += errno.h
header-y += fcntl.h
header-y += ioctl.h
header-y += ipc.h
header-y += mman.h
header-y += signal.h
header-y += statfs.h

unifdef-y += resource.h
unifdef-y += siginfo.h
+32 −6
Original line number Diff line number Diff line
unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h	\
	ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h		\
	posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h	\
	sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h	\
	statfs.h termbits.h termios.h types.h unistd.h user.h
unifdef-y += a.out.h
unifdef-y += auxvec.h
unifdef-y += byteorder.h
unifdef-y += errno.h
unifdef-y += fcntl.h
unifdef-y += ioctl.h
unifdef-y += ioctls.h
unifdef-y += ipcbuf.h
unifdef-y += mman.h
unifdef-y += msgbuf.h
unifdef-y += param.h
unifdef-y += poll.h
unifdef-y += posix_types.h
unifdef-y += ptrace.h
unifdef-y += resource.h
unifdef-y += sembuf.h
unifdef-y += shmbuf.h
unifdef-y += sigcontext.h
unifdef-y += siginfo.h
unifdef-y += signal.h
unifdef-y += socket.h
unifdef-y += sockios.h
unifdef-y += stat.h
unifdef-y += statfs.h
unifdef-y += termbits.h
unifdef-y += termios.h
unifdef-y += types.h
unifdef-y += unistd.h
unifdef-y += user.h

# These probably shouldn't be exported
unifdef-y += elf.h page.h
unifdef-y += shmparam.h
unifdef-y += elf.h
unifdef-y += page.h
+7 −2
Original line number Diff line number Diff line
include include/asm-generic/Kbuild.asm

header-y += boot.h debugreg.h ldt.h ucontext.h
header-y += boot.h
header-y += debugreg.h
header-y += ldt.h
header-y += ucontext.h

unifdef-y += mtrr.h setup.h vm86.h
unifdef-y += mtrr.h
unifdef-y += setup.h
unifdef-y += vm86.h
Loading