Steps on the way to 6.1-rc1 Resolves conflicts in: drivers/ufs/core/ufshcd.c include/ufs/ufshcd.h Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ic4a9c1e9a22a8aae818bf726e5fd8433f3a80dfa |
||
|---|---|---|
| .. | ||
| ufs.h | ||
| ufs_quirks.h | ||
| ufshcd.h | ||
| ufshci.h | ||
| unipro.h | ||