shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 749a916a9c ("usb: dwc3: ep0: Don't clear ep0 DWC3_EP_TRANSFER_STARTED") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.121

Resolves merge conflicts in:
        fs/f2fs/file.c
        fs/f2fs/segment.c

Change-Id: Ib221190cc792a39283e1aac50f5038484f2ef1a2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-12-20 15:05:00 +00:00
parent c80fef4574 749a916a9c
commit daaf475999
308 changed files with 2606 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/mod/file2alias.c
View File

@@ -808,10 +808,7 @@ static int do_eisa_entry(const char *filename, void *symval,
char *alias)
{
DEF_FIELD_ADDR(symval, eisa_device_id, sig);
if (sig[0])
sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", *sig);
else
strcat(alias, "*");
sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", *sig);
return 1;
}