Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # git log --oneline
- 0f283ab4c9 (HEAD -> device/zyxel-wsq50-wsq60, origin/main, origin/HEAD, main) umdns: update to Git HEAD (2023-11-21)
- 0f283ab4c9 (HEAD -> device/zyxel-wsq50-wsq60, origin/main, origin/HEAD, main) umdns: update to Git HEAD (2023-11-21)
- 33f4013bf2 udebug: update to Git HEAD (2023-11-20)
- cafb961850 netifd: update to Git HEAD (2023-11-20), adds udebug support
- 2634d3f855 uboot-envtools: add settings for Synology DS213j
- 3f7637b050 mvebu: add support for Synology DS213j
- 2723f16dda hostapd: add missing acl entries for udebug
- 4cd31d6c7c ubus: update to Git HEAD (2023-11-14)
- effc305cda hostapd: add udebug support
- bc6ee34c97 udebug: add new package
- c4fe1bfc65 ramips: D-Link Dxx-1xx0 image fixes
- ...
- # git status
- On branch device/zyxel-wsq50-wsq60
- Your branch is behind 'origin/device/zyxel-wsq50-wsq60' by 15 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- You are currently cherry-picking commit dca76e84f6.
- (fix conflicts and run "git cherry-pick --continue")
- (use "git cherry-pick --skip" to skip this patch)
- (use "git cherry-pick --abort" to cancel the cherry-pick operation)
- Unmerged paths:
- (use "git add/rm <file>..." as appropriate to mark resolution)
- both modified: package/boot/uboot-envtools/files/ipq40xx
- both modified: package/firmware/ipq-wifi/Makefile
- both modified: target/linux/ipq40xx/base-files/etc/board.d/02_network
- both modified: target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
- both modified: target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh
- both modified: target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
- deleted by us: target/linux/ipq40xx/base-files/lib/upgrade/zyxel.sh
- added by them: target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wsq50.dts
- both modified: target/linux/ipq40xx/image/generic.mk
- no changes added to commit (use "git add" and/or "git commit -a")
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement