Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'staging-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fix from Greg KH:
"Here is a single staging driver fix for 6.2-rc5. It resolves a build
issue reported and Fixed by Arnd in the vc04_services driver. It's
been in linux-next this week with no reported problems"

* tag 'staging-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: vchiq_arm: fix enum vchiq_status return types

+3 -3
+1 -1
drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
··· 86 86 87 87 struct vchiq_instance; 88 88 89 - extern enum vchiq_status vchiq_initialise(struct vchiq_instance **pinstance); 89 + extern int vchiq_initialise(struct vchiq_instance **pinstance); 90 90 extern enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance); 91 91 extern enum vchiq_status vchiq_connect(struct vchiq_instance *instance); 92 92 extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance,
+2 -2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
··· 100 100 extern void 101 101 vchiq_dump_service_use_state(struct vchiq_state *state); 102 102 103 - extern enum vchiq_status 103 + extern int 104 104 vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service, 105 105 enum USE_TYPE_E use_type); 106 - extern enum vchiq_status 106 + extern int 107 107 vchiq_release_internal(struct vchiq_state *state, 108 108 struct vchiq_service *service); 109 109