On Mon, Jan 17, 2022 at 04:52:02PM +0500, Mikhail Gavrilov wrote:
> On Mon, 17 Jan 2022 at 16:19, Heikki Krogerus
> <heikki.krogerus@xxxxxxxxxxxxxxx> wrote:
>
> > I don't know which tree you are working on top of, but the patch
> > applies just fine on top of Linus' latest master branch:
> > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> >
>
> Same here.
>
> $ git remote -v
> origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> (fetch)
> origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> (push)
>
> $ git show
> commit 0c947b893d69231a9add855939da7c66237ab44f (HEAD -> master,
> origin/master, origin/HEAD)
> Merge: a6097180d884 9bbf8662a27b
> Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> Date: Mon Jan 17 09:53:21 2022 +0200
>
> Merge tag '5.17-rc-part1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
>
> Pull cifs updates from Steve French:
>
> - multichannel patches mostly related to improving reconnect behavior
>
> - minor cleanup patches
>
> * tag '5.17-rc-part1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
> cifs: fix FILE_BOTH_DIRECTORY_INFO definition
> cifs: move superblock magic defitions to magic.h
> cifs: Fix smb311_update_preauth_hash() kernel-doc comment
> cifs: avoid race during socket reconnect between send and recv
> cifs: maintain a state machine for tcp/smb/tcon sessions
> cifs: fix hang on cifs_get_next_mid()
> cifs: take cifs_tcp_ses_lock for status checks
> cifs: reconnect only the connection and not smb session where possible
> cifs: add WARN_ON for when chan_count goes below minimum
> cifs: adjust DebugData to use chans_need_reconnect for conn status
> cifs: use the chans_need_reconnect bitmap for reconnect status
> cifs: track individual channel status using chans_need_reconnect
> cifs: remove redundant assignment to pointer p
>
> $ cat 0001-usb-typec-Test-fix.patch | git apply
> error: patch failed: drivers/usb/typec/port-mapper.c:56
> error: drivers/usb/typec/port-mapper.c: patch does not apply
Have you modified the file, or something else that you have not
committed yet?
% git status
Checkout the file, and then try to apply the patch:
% git checkout drivers/usb/typec/port-mapper.c
% git apply -v 0001-usb-typec-Test-fix.patch
thanks,
--
heikki
