Hi Andrey,
Am 30.01.2017 um 22:54 schrieb Andrey Utkin andrey_utkin@fastmail.com:
On Mon, Jan 30, 2017 at 05:35:02PM +0100, H. Nikolaus Schaller wrote:
Hi, since we now have new Main & CPU boards and displayboards without SSD2858, I'd like to update our letux-kernel to rotate by tiler by default.
Panel driver and DSS work well.
It works fine without tiler (unrotated), but I get merge conflicts when trying to merge
http://git.goldelico.com/?p=gta04-kernel.git;a=shortlog;h=refs/heads/work/te...
on top of
http://git.goldelico.com/?p=gta04-kernel.git;a=shortlog;h=refs/heads/letux-4...
Can someone please point to instructions or explain what is going wrong?
Hi,
No idea what's happening for you, for me it merges cleanly. Or do I miss something?
$ git co letux/letux-4.10-rc6 Note: checking out 'letux/letux-4.10-rc6'.
You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example:
git checkout -b <new-branch-name>
HEAD is now at 4e7fd9336832... Merge branches 'work/hns/letux/rootfs', 'work/hacks', 'work/josua/debian-build', 'work/hns/input/tsc2007-v9', 'work/hns/power/twl4030_charger-v3', 'work/hns/usb/misc/usb3503', 'work/hns/dt/gta04', 'work/hns/dt/gta04a5', 'work/hns/dt/omap5-common-v3', 'work/hns/dt/omap5-uevm-v3', 'work/hns/dt/pyra', 'work/hns/dt/lc8', 'work/hns/misc/wwan', 'work/hns/misc/w2sg-tty-slave2-v4', 'work/hns/omapdss/tvfix-v3', 'work/hns/video/dss/displayprobing', 'work/hns/power/bq27xxx', 'work/marek/generic-adc-battery', 'work/kemnade/charging_fixes', 'work/kemnade/musb-fixes', 'work/hns/iio-input-bridge', 'work/hns/extcon', 'work/hns/mtd/onenand', 'work/kemnade/wifi-sdio-fixes-v3', 'work/hns/input/as5013', 'work/andrey/input/as5013', 'work/hns/power/bq2429x', 'work/hns/sound/ts3a225e', 'work/hns/mmc/txs02612', 'work/hns/video/ov9655', 'work/hns/input/crtouch-v2', 'work/hns/mips/mini-pm', 'work/hns/mips/minibook', 'work/test/bno055', 'work/marek/am335x-hwmon', 'work/hns/video/dss/panels+ssd2858', 'work/test/sgx544-v2' and 'work/hns/hw-test' into letux-4.10-rc6 [OK] 21:51:12 Mon 30 Jan j@dell-m4800 /src/linux $ git merge letux/work/test/tiler
Ah.
I had tried to merge some work/tiler-v2 branch I have in my local branches list. I do not remember what it is... Seems to be some 4.8-rc4 based stuff.
So this I had done the wrong merge. With letux/work/test/tiler I get the same merge success.
Merge made by the 'recursive' strategy. arch/arm/include/asm/pgtable.h | 3 +++ arch/arm/mach-omap2/omap-smp.c | 51 +++++++++++++++++++++++++++++++++++----------------
^^^ this file leads to a compile error:
CC arch/arm/mach-omap2/omap-smp.o - due to: arch/arm/mach-omap2/omap-smp.c arch/arm/include/asm/pgtable.h include/linux/clk/ti.h arch/arm/mach-omap2/omap-smp.c: In function 'omap4_smp_prepare_cpus': arch/arm/mach-omap2/omap-smp.c:301:3: error: too few arguments to function 'omap5_erratum_workaround_801819' omap5_erratum_workaround_801819(); ^ arch/arm/mach-omap2/omap-smp.c:76:13: note: declared here static void omap5_erratum_workaround_801819(unsigned int cpu, u32 *acr) ^ arch/arm/mach-omap2/omap-smp.c:325:3: error: 'startup_addr' undeclared (first use in this function) startup_addr = omap4460_secondary_startup; ^ arch/arm/mach-omap2/omap-smp.c:325:3: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [arch/arm/mach-omap2/omap-smp.o] Error 1 make[1]: *** [arch/arm/mach-omap2] Error 2 make: *** [__build_one_by_one] Error 2
drivers/gpu/drm/omapdrm/omap_gem.c | 30 +++++++++++++++++++----------- include/uapi/drm/omap_drm.h | 12 ++++++++---- 4 files changed, 65 insertions(+), 31 deletions(-) [OK] 21:51:32 Mon 30 Jan j@dell-m4800 /src/linux $ git rev-parse letux/work/test/tiler f72f7f29330518ffa86f8fde7829b17109459bb9
BR, Nikolaus