Merged into cifs-2.6.git for-next On Tue, Dec 13, 2022 at 8:44 PM Yang Li <yang.lee@xxxxxxxxxxxxxxxxx> wrote: > > ./fs/cifs/cifsglob.h: linux/scatterlist.h is included more than once. > > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3459 > Fixes: f7f291e14dde ("cifs: fix oops during encryption") > Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx> > Signed-off-by: Yang Li <yang.lee@xxxxxxxxxxxxxxxxx> > --- > fs/cifs/cifsglob.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h > index 703685e2db5e..82f2d3070c26 100644 > --- a/fs/cifs/cifsglob.h > +++ b/fs/cifs/cifsglob.h > @@ -23,7 +23,6 @@ > #include "cifs_fs_sb.h" > #include "cifsacl.h" > #include <crypto/internal/hash.h> > -#include <linux/scatterlist.h> > #include <uapi/linux/cifs/cifs_mount.h> > #include "../smbfs_common/smb2pdu.h" > #include "smb2pdu.h" > -- > 2.20.1.7.g153144c > -- Thanks, Steve
