On Mon, Dec 8, 2014 at 10:45 AM, Charles Steinkuehler <[email protected]> wrote: > On 12/8/2014 10:40 AM, Robert Nelson wrote: >> On Mon, Dec 8, 2014 at 10:34 AM, Charles Steinkuehler >>> >>> What does this mean exactly? Are you offering to maintain a Xenomai >>> patched kernel for the 'Bone?!? >> >> Pretty much yeah. ;) > > Wow! > > My wife will love you because now I don't need anything else for > Christmas! :) > > <fingers crossed this actually works out!>
There's only a couple conflicts. ;) >From git://git.xenomai.org/ipipe * branch ipipe-3.14 -> FETCH_HEAD Auto-merging mm/mmap.c Auto-merging mm/memory.c Auto-merging kernel/trace/ring_buffer.c Auto-merging kernel/sched/core.c Auto-merging kernel/power/hibernate.c Auto-merging kernel/fork.c Auto-merging kernel/debug/debug_core.c Auto-merging init/Kconfig Auto-merging include/linux/sched.h Auto-merging include/linux/clocksource.h Auto-merging fs/exec.c CONFLICT (content): Merge conflict in fs/exec.c Auto-merging drivers/tty/serial/8250/8250_core.c Auto-merging drivers/irqchip/irq-gic.c Auto-merging drivers/gpio/gpio-omap.c CONFLICT (content): Merge conflict in drivers/gpio/gpio-omap.c Auto-merging arch/x86/kvm/x86.c CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c Auto-merging arch/x86/kvm/vmx.c Auto-merging arch/x86/kvm/svm.c Auto-merging arch/x86/kernel/xsave.c Auto-merging arch/x86/kernel/vsyscall_64.c Auto-merging arch/x86/kernel/tsc.c Auto-merging arch/x86/kernel/traps.c Auto-merging arch/x86/kernel/smpboot.c Auto-merging arch/x86/kernel/ptrace.c Auto-merging arch/x86/kernel/entry_64.S CONFLICT (content): Merge conflict in arch/x86/kernel/entry_64.S Auto-merging arch/x86/kernel/dumpstack_64.c Auto-merging arch/x86/kernel/cpu/common.c Auto-merging arch/x86/kernel/apic/apic.c Auto-merging arch/x86/include/asm/traps.h Auto-merging arch/x86/include/asm/thread_info.h Auto-merging arch/x86/include/asm/page_64_types.h Auto-merging arch/x86/ia32/ia32entry.S Auto-merging arch/x86/Kconfig Auto-merging arch/powerpc/platforms/pseries/lpar.c Auto-merging arch/powerpc/mm/hash_native_64.c Auto-merging arch/powerpc/Kconfig Auto-merging arch/arm/mm/proc-xscale.S Auto-merging arch/arm/mm/alignment.c Auto-merging arch/arm/mm/Kconfig Auto-merging arch/arm/mach-omap2/timer.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c Auto-merging arch/arm/mach-omap2/prm_common.c Auto-merging arch/arm/mach-omap2/pm44xx.c Auto-merging arch/arm/mach-omap2/pm34xx.c Auto-merging arch/arm/mach-omap2/omap4-common.c Auto-merging arch/arm/mach-omap2/omap-wakeupgen.c Auto-merging arch/arm/mach-omap2/io.c Auto-merging arch/arm/mach-omap2/gpmc.c Auto-merging arch/arm/mach-at91/clock.c Auto-merging arch/arm/kernel/traps.c Auto-merging arch/arm/kernel/process.c Auto-merging arch/arm/include/uapi/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm/include/uapi/asm/unistd.h Auto-merging arch/arm/include/asm/thread_info.h CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h Auto-merging arch/arm/boot/dts/omap4.dtsi Auto-merging arch/arm/boot/compressed/head.S Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. I'll cutt a raw diff and use that for a branch "ti-linux-xenomai-3.14.y" on https://github.com/RobertCNelson/ti-linux-kernel-dev Regards, -- Robert Nelson http://www.rcn-ee.com/ -- For more options, visit http://beagleboard.org/discuss --- You received this message because you are subscribed to the Google Groups "BeagleBoard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
