[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  luci-app-qbittorrent: tidy up code (coolsnowwolf#8194)
  kernel: bump 5.10 to 5.10.78 (coolsnowwolf#8193)

include/kernel-version.mk

@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
 endif
 
 LINUX_VERSION-5.4 = .156
-LINUX_VERSION-5.10 = .77
+LINUX_VERSION-5.10 = .78
 
 LINUX_KERNEL_HASH-5.4.156 = 06fe73e4623fcf1b3c0d0e1983d8286a2ff5b8fffbcb2163f4c01696a1c377fe
-LINUX_KERNEL_HASH-5.10.77 = d3b64edfc1dd7212e62ed733aeeb73d64ffd6d9658d322d44cddf1b41d5b8fc3
+LINUX_KERNEL_HASH-5.10.78 = be806c98e222ea581530727a8e83b0b96fcd678afd12944eb530e58776a6050f
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

package/lean/luci-app-qbittorrent/Makefile

@@ -5,12 +5,15 @@
 
 include $(TOPDIR)/rules.mk
 
-
 PKG_NAME:=luci-app-qbittorrent
 PKG_VERSION=1.0
-PKG_RELEASE:=22
+PKG_RELEASE:=23
 
-include $(INCLUDE_DIR)/package.mk
+LUCI_TITLE:=LuCI support for qBittorrent
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:= \
+	+PACKAGE_luci-app-qbittorrent_static:qBittorrent-static \
+	+PACKAGE_luci-app-qbittorrent_dynamic:qbittorrent
 
 define Package/$(PKG_NAME)/config
 	choice
@@ -28,10 +31,6 @@ define Package/$(PKG_NAME)/config
 	endchoice
 endef
 
-LUCI_TITLE:=LuCI support for qBittorrent
-LUCI_DEPENDS:=+PACKAGE_luci-app-qbittorrent_static:qBittorrent-static +PACKAGE_luci-app-qbittorrent_dynamic:qbittorrent
-LUCI_PKGARCH:=all
-
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature

package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua

@@ -5,13 +5,19 @@ function index()
 		return
 	end
 
-	entry({"admin", "nas", "qBittorrent"}, cbi("qbittorrent"), _("qBittorrent"))
+	entry({"admin", "nas", "qBittorrent"}, alias("admin", "nas", "qBittorrent", "basic"), _("qBittorrent"), 30).dependent = true
+	entry({"admin", "nas", "qBittorrent", "basic"}, cbi("qbittorrent/basic"), _("Basic Settings"), 1).leaf = true
+	entry({"admin", "nas", "qBittorrent", "connection"}, cbi("qbittorrent/connection"), _("Connection Settings"), 2).leaf = true
+	entry({"admin", "nas", "qBittorrent", "downloads"}, cbi("qbittorrent/downloads"), _("Download Settings"), 3).leaf = true
+	entry({"admin", "nas", "qBittorrent", "bittorrent"}, cbi("qbittorrent/bittorrent"), _("Bittorrent Settings"), 4).leaf = true
+	entry({"admin", "nas", "qBittorrent", "webgui"}, cbi("qbittorrent/webgui"), _("WebUI Settings"), 5).leaf = true
+	entry({"admin", "nas", "qBittorrent", "advanced"}, cbi("qbittorrent/advanced"), _("Advance Settings"), 6).leaf = true
 	entry({"admin", "nas", "qBittorrent", "status"}, call("act_status")).leaf = true
 end
 
 function act_status()
-	local e={}
-	e.running=luci.sys.call("pgrep qbittorrent-nox >/dev/null")==0
+	local e = {}
+	e.running = luci.sys.call("pgrep qbittorrent-nox >/dev/null") == 0
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(e)
-end
+end