On Tue, Nov 3, 2015 at 10:15 PM, Drew Fustini <[email protected]> wrote: > I'm trying to build bb-kernel am33x-v4.0 but a patch conflict occurs: > > CONFLICT (content): Merge conflict in include/linux/compiler-gcc.h > Patch failed at 0052 overflow-arith: begin to add support for > overflow builtin functions > > Full log: https://gist.github.com/pdp7/73eb4857d38054ebcf9f > > I can do a fresh git clone of bb-kernel (which takes quite awhile), so > I'm wondering if this is a problem for "just me".
Just try re-checking out the branch.. git reset HEAD --hard git checkout master -f git branch -D (current one) git checkout origin/am33x-v4.0 -b tmp Regards, -- Robert Nelson https://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.
