I suggest that you do a git reset --hard HEAD^, git push -f to get rid of the merge commit (this just discards the last commit), and then your branch should be rebasable on the OpenWrt master, and your PR will be accepted.
Hello, I tried to modify the patch inoremap so that will for latest openwrt git but somehow the dts-Makefile wont be patched and a few steps before the build is finished I get an error ....
I found a few errors in the last section of the patch,
-TABS- before the lines have been exchanged with -SPACES- and this leads to rejects while patching:
patch -p1 < ~/Downloads/nanopi-r1/add-nano-pi-r1-new.patch
patching file package/boot/uboot-sunxi/Makefile
Hunk #1 succeeded at 144 with fuzz 1 (offset -22 lines).
Hunk #2 succeeded at 276 with fuzz 1 (offset -33 lines).
patching file package/boot/uboot-sunxi/patches/250-sun8i-h3-Nano-Pi-R1-add-device-tree.patch
patching file package/boot/uboot-sunxi/patches/251-sun8i-h3-Nano-Pi-R1-defconfig.patch
patching file target/linux/sunxi/base-files/etc/board.d/02_network
Hunk #1 FAILED at 8.
1 out of 1 hunk FAILED -- saving rejects to file target/linux/sunxi/base-files/etc/board.d/02_network.rej
can't find file to patch at input line 207
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk
|index 8fa648176fb8..9b06628c18bd 100644
|--- a/target/linux/sunxi/image/cortexa7.mk
|+++ b/target/linux/sunxi/image/cortexa7.mk
--------------------------
File to patch: target/linux/sunxi/image/cortex-a7.mk
patching file target/linux/sunxi/image/cortex-a7.mk
Hunk #1 FAILED at 47.
1 out of 1 hunk FAILED -- saving rejects to file target/linux/sunxi/image/cortex-a7.mk.rej
patching file target/linux/sunxi/patches-5.4/062-ARM-dts-sun8i-add-support-for-Nano-Pi-R1.patch
$ git branch
* (HEAD detached at v19.07.2)
master
git clone https://github.com/openwrt/openwrt.git openwrt_test
cd ./openwrt_test
patch -p1 < ~/Downloads/nanopi-r1/add-nano-pi-r1-new.patch
./scripts/feeds update -a
./scripts/feeds install -a
make menuconfig
-choose the right target:
Target System (Allwinner A1x/A20/A3x/H3/H5/R40)
Subtarget (Allwinner A20/A3x/H3/R40)
Target Profile (FriendlyARM NanoPi R1)
-choose your packages
-Save and exit-
make defconfig
make menuconfig
-check if all is right
make