forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'openwrt:main' into main
- Loading branch information
Showing
1,882 changed files
with
463 additions
and
321,559 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 0 additions & 30 deletions
30
...kernel/bpf-headers/patches/101-linux-netlink-drop-NL_SET_ERR_MSG-for-kernel-modules.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,11 +12,9 @@ Signed-off-by: Christian Marangi <[email protected]> | |
| include/net/flow_offload.h | 6 +++--- | ||
| 1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h | ||
| index 7a2b022..f17c485 100644 | ||
| --- a/include/net/flow_offload.h | ||
| +++ b/include/net/flow_offload.h | ||
| @@ -321,7 +321,7 @@ flow_action_mixed_hw_stats_check(const struct flow_action *action, | ||
| @@ -376,7 +376,7 @@ flow_action_mixed_hw_stats_check(const s | ||
|
|
||
| flow_action_for_each(i, action_entry, action) { | ||
| if (i && action_entry->hw_stats != last_hw_stats) { | ||
|
|
@@ -25,7 +23,7 @@ index 7a2b022..f17c485 100644 | |
| return false; | ||
| } | ||
| last_hw_stats = action_entry->hw_stats; | ||
| @@ -356,11 +356,11 @@ __flow_action_hw_stats_check(const struct flow_action *action, | ||
| @@ -411,11 +411,11 @@ __flow_action_hw_stats_check(const struc | ||
|
|
||
| if (!check_allow_bit && | ||
| ~action_entry->hw_stats & FLOW_ACTION_HW_STATS_ANY) { | ||
|
|
@@ -39,6 +37,3 @@ index 7a2b022..f17c485 100644 | |
| return false; | ||
| } | ||
| return true; | ||
| -- | ||
| 2.38.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ FS_MENU:=Filesystems | |
| define KernelPackage/fs-9p | ||
| SUBMENU:=$(FS_MENU) | ||
| TITLE:=Plan 9 Resource Sharing Support | ||
| DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6:kmod-fs-netfs | ||
| DEPENDS:=+kmod-9pnet +kmod-fs-netfs | ||
| KCONFIG:=\ | ||
| CONFIG_9P_FS \ | ||
| CONFIG_9P_FS_POSIX_ACL=n \ | ||
|
|
@@ -89,13 +89,10 @@ define KernelPackage/fs-smbfs-common | |
| HIDDEN:=1 | ||
| DEPENDS:=+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils | ||
| KCONFIG:=\ | ||
| [email protected] \ | ||
| [email protected] | ||
| CONFIG_SMBFS | ||
| FILES:= \ | ||
| $(LINUX_DIR)/fs/smbfs_common/[email protected] \ | ||
| $(LINUX_DIR)/fs/smbfs_common/[email protected] \ | ||
| $(LINUX_DIR)/fs/smb/common/[email protected] \ | ||
| $(LINUX_DIR)/fs/smb/common/[email protected] | ||
| $(LINUX_DIR)/fs/smb/common/cifs_arc4.ko \ | ||
| $(LINUX_DIR)/fs/smb/common/cifs_md4.ko | ||
| endef | ||
|
|
||
| define KernelPackage/fs-smbfs-common/description | ||
|
|
@@ -113,8 +110,7 @@ define KernelPackage/fs-cifs | |
| CONFIG_CIFS_DFS_UPCALL=n \ | ||
| CONFIG_CIFS_UPCALL=n | ||
| FILES:= \ | ||
| $(LINUX_DIR)/fs/cifs/[email protected] \ | ||
| $(LINUX_DIR)/fs/smb/client/[email protected] | ||
| $(LINUX_DIR)/fs/smb/client/cifs.ko | ||
| AUTOLOAD:=$(call AutoLoad,30,cifs) | ||
| $(call AddDepends/nls) | ||
| DEPENDS+= \ | ||
|
|
@@ -380,8 +376,7 @@ define KernelPackage/fs-ksmbd | |
| CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=n \ | ||
| CONFIG_SMB_SERVER_KERBEROS5=n | ||
| FILES:= \ | ||
| $(LINUX_DIR)/fs/ksmbd/[email protected] \ | ||
| $(LINUX_DIR)/fs/smb/server/[email protected] | ||
| $(LINUX_DIR)/fs/smb/server/ksmbd.ko | ||
| AUTOLOAD:=$(call AutoLoad,41,ksmbd) | ||
| endef | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -268,7 +268,7 @@ $(eval $(call KernelPackage,drm)) | |
| define KernelPackage/drm-buddy | ||
| SUBMENU:=$(VIDEO_MENU) | ||
| TITLE:=A page based buddy allocator | ||
| DEPENDS:=@DISPLAY_SUPPORT +kmod-drm @LINUX_6_1||LINUX_6_6 | ||
| DEPENDS:=@DISPLAY_SUPPORT +kmod-drm | ||
| KCONFIG:=CONFIG_DRM_BUDDY | ||
| FILES:= $(LINUX_DIR)/drivers/gpu/drm/drm_buddy.ko | ||
| AUTOLOAD:=$(call AutoProbe,drm_buddy) | ||
|
|
@@ -283,7 +283,7 @@ $(eval $(call KernelPackage,drm-buddy)) | |
| define KernelPackage/drm-display-helper | ||
| SUBMENU:=$(VIDEO_MENU) | ||
| TITLE:=DRM helpers for display adapters drivers | ||
| DEPENDS:=@DISPLAY_SUPPORT +kmod-drm-kms-helper @LINUX_6_1||LINUX_6_6 | ||
| DEPENDS:=@DISPLAY_SUPPORT +kmod-drm-kms-helper | ||
| KCONFIG:=CONFIG_DRM_DISPLAY_HELPER | ||
| FILES:=$(LINUX_DIR)/drivers/gpu/drm/display/drm_display_helper.ko | ||
| AUTOLOAD:=$(call AutoProbe,drm_display_helper) | ||
|
|
@@ -428,7 +428,7 @@ define KernelPackage/drm-imx | |
| FILES:= \ | ||
| $(LINUX_DIR)/drivers/gpu/drm/imx/[email protected] \ | ||
| $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/[email protected] \ | ||
| $(LINUX_DIR)/drivers/gpu/drm/drm_dma_helper.ko@ge6.1 \ | ||
| $(LINUX_DIR)/drivers/gpu/drm/drm_dma_helper.ko \ | ||
| $(LINUX_DIR)/drivers/gpu/ipu-v3/imx-ipu-v3.ko | ||
| AUTOLOAD:=$(call AutoLoad,08,imxdrm imx-ipu-v3 imx-ipuv3-crtc) | ||
| endef | ||
|
|
@@ -476,8 +476,7 @@ define KernelPackage/drm-imx-ldb | |
| CONFIG_DRM_PANEL_SITRONIX_ST7789V=n | ||
| FILES:=$(LINUX_DIR)/drivers/gpu/drm/imx/[email protected] \ | ||
| $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/[email protected] \ | ||
| $(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \ | ||
| $(LINUX_DIR)/drivers/gpu/drm/[email protected] | ||
| $(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko | ||
| AUTOLOAD:=$(call AutoLoad,08,imx-ldb) | ||
| endef | ||
|
|
||
|
|
@@ -517,7 +516,7 @@ define KernelPackage/video-core | |
| CONFIG_MEDIA_CAMERA_SUPPORT=y \ | ||
| CONFIG_VIDEO_DEV \ | ||
| CONFIG_V4L_PLATFORM_DRIVERS=y \ | ||
| CONFIG_MEDIA_PLATFORM_DRIVERS=y@ge6.1 | ||
| CONFIG_MEDIA_PLATFORM_DRIVERS=y | ||
| FILES:= \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko | ||
| AUTOLOAD:=$(call AutoLoad,60,videodev) | ||
|
|
@@ -572,7 +571,7 @@ $(eval $(call KernelPackage,video-videobuf2)) | |
|
|
||
| define KernelPackage/video-cpia2 | ||
| TITLE:=CPIA2 video driver | ||
| DEPENDS:=@USB_SUPPORT +kmod-usb-core @LINUX_5_15 | ||
| DEPENDS:=@USB_SUPPORT | ||
| KCONFIG:=CONFIG_VIDEO_CPIA2 | ||
| FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/cpia2/cpia2.ko | ||
| AUTOLOAD:=$(call AutoProbe,cpia2) | ||
|
|
@@ -1234,10 +1233,8 @@ define KernelPackage/video-coda | |
| CONFIG_VIDEO_CODA \ | ||
| CONFIG_VIDEO_IMX_VDOA | ||
| FILES:= \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/coda/[email protected] \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/[email protected] \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/coda/[email protected] \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/[email protected] \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/coda-vpu.ko \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/imx-vdoa.ko \ | ||
| $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-jpeg.ko | ||
| AUTOLOAD:=$(call AutoProbe,coda-vpu imx-vdoa v4l2-jpeg) | ||
| $(call AddDepends/video) | ||
|
|
@@ -1253,8 +1250,7 @@ define KernelPackage/video-pxp | |
| TITLE:=i.MX PXP support | ||
| DEPENDS:=@TARGET_imx +kmod-video-mem2mem +kmod-video-dma-contig | ||
| KCONFIG:= CONFIG_VIDEO_IMX_PXP | ||
| FILES:= $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/[email protected] \ | ||
| $(LINUX_DIR)/drivers/media/platform/nxp/[email protected] | ||
| FILES:= $(LINUX_DIR)/drivers/media/platform/nxp/imx-pxp.ko | ||
| AUTOLOAD:=$(call AutoProbe,imx-pxp) | ||
| $(call AddDepends/video) | ||
| endef | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 0 additions & 23 deletions
23
target/linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.