[OpenWrt-Devel] [PATCH 2/4 v2] gemini: Switch to kernel v4.19

Petr Štetiar ynezz at true.cz
Sat Jan 26 03:14:58 EST 2019


Hi,

FYI I can't merge your branch on top of current master.

 git reset --hard origin/master
 HEAD is now at 0465e41 mt76: update to the latest version

 git merge --no-edit gemini-4.19/gemini-v4.19 
 Auto-merging target/linux/gemini/image/Makefile
 CONFLICT (content): Merge conflict in target/linux/gemini/image/Makefile
 Automatic merge failed; fix conflicts and then commit the result.

> - Run the config through OpenWrt make kernel_oldconfig
>   and inspect the result. Looks good now.

then I had to add missing generic symbol CONFIG_USB_ROLE_SWITCH[1] and
CONFIG_DRM_PANEL_SEIKO_43WVF1G[2] in order to get past kernel config step
while running build in verbose mode `make V=s` (you otherwise don't see the
missing kernel config symbols I guess).

1. https://git.openwrt.org/?p=openwrt/staging/chunkeey.git;a=commit;h=cf0d9418bc54ef4200b83cf33aafc6a759eb8d18
2. https://github.com/openwrt/openwrt/pull/1714/commits/596e83d397d97aa63a0330e0b8a71a599ac37669

-- ynezz

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list