summaryrefslogtreecommitdiff
path: root/linux-lts-6.14-rc5-blob/linux-libre-lts-6.14-1-x86_64-package_linux-libre-lts-headers.log
diff options
context:
space:
mode:
Diffstat (limited to 'linux-lts-6.14-rc5-blob/linux-libre-lts-6.14-1-x86_64-package_linux-libre-lts-headers.log')
-rw-r--r--linux-lts-6.14-rc5-blob/linux-libre-lts-6.14-1-x86_64-package_linux-libre-lts-headers.log30
1 files changed, 30 insertions, 0 deletions
diff --git a/linux-lts-6.14-rc5-blob/linux-libre-lts-6.14-1-x86_64-package_linux-libre-lts-headers.log b/linux-lts-6.14-rc5-blob/linux-libre-lts-6.14-1-x86_64-package_linux-libre-lts-headers.log
new file mode 100644
index 0000000..6806bf6
--- /dev/null
+++ b/linux-lts-6.14-rc5-blob/linux-libre-lts-6.14-1-x86_64-package_linux-libre-lts-headers.log
@@ -0,0 +1,30 @@
+<<<<<<< HEAD
+copy from `/build/linux-libre-lts/pkg/linux-libre-lts-headers/lib/modules/6.14.0-rc4-1-lts-lts/build/vmlinux' [elf64-x86-64] to `/build/linux-libre-lts/pkg/linux-libre-lts-headers/lib/modules/6.14.0-rc4-1-lts-lts/build/stN60k9U' [elf64-x86-64]
+=======
+copy from `/build/linux-libre-lts/pkg/linux-libre-lts-headers/lib/modules/6.14.0-rc5-1-lts-lts/build/vmlinux' [elf64-x86-64] to `/build/linux-libre-lts/pkg/linux-libre-lts-headers/lib/modules/6.14.0-rc5-1-lts-lts/build/stLrCubZ' [elf64-x86-64]
+>>>>>>> 0d2ffcae4c1cd50156bb25562f9c15a8bb2c1620
+Removing scripts/dtc/include-prefixes/sh
+Removing scripts/dtc/include-prefixes/arm
+Removing scripts/dtc/include-prefixes/riscv
+Removing scripts/dtc/include-prefixes/arc
+Removing scripts/dtc/include-prefixes/powerpc
+Removing scripts/dtc/include-prefixes/microblaze
+Removing scripts/dtc/include-prefixes/arm64
+Removing scripts/dtc/include-prefixes/nios2
+Removing scripts/dtc/include-prefixes/mips
+Removing scripts/dtc/include-prefixes/xtensa
+Removing scripts/dtc/include-prefixes/openrisc
+Removing scripts/kconfig/confdata.o
+Removing scripts/kconfig/util.o
+Removing scripts/kconfig/parser.tab.o
+Removing scripts/kconfig/expr.o
+Removing scripts/kconfig/preprocess.o
+Removing scripts/kconfig/lexer.lex.o
+Removing scripts/kconfig/menu.o
+Removing scripts/kconfig/symbol.o
+Removing scripts/kconfig/conf.o
+Removing scripts/mod/sumversion.o
+Removing scripts/mod/modpost.o
+Removing scripts/mod/file2alias.o
+Removing scripts/mod/empty.o
+Removing scripts/mod/symsearch.o