mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
Cc: Linux List Kernel Mailing <linux-kernel@vger.kernel.org>,
	rafael.j.wysocki@intel.com, linux-usb@vger.kernel.org
Subject: Re: [Bug][5.17-rc0] Between commits daadb3bd0e8d and 455e73a07f6e, the kernel stops loading on my devices.
Date: Mon, 17 Jan 2022 14:21:52 +0200	[thread overview]
Message-ID: <YeVfYOhxGTgg8VpZ@kuha.fi.intel.com> (raw)
In-Reply-To: <CABXGCsMWXFFQY3L8ixK9K-gYX41_gTjqHRBXNp6gDpUgdnvFfg@mail.gmail.com>

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@linux.intel.com> 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@linux-foundation.org>
> 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

  reply	other threads:[~2022-01-17 12:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-17  0:49 Mikhail Gavrilov
2022-01-17  8:58 ` Heikki Krogerus
     [not found]   ` <CABXGCsO5PYBuZ11YR16NLLa0H07Jom1JQhWHFuETfotfBfzkMw@mail.gmail.com>
2022-01-17 11:19     ` Heikki Krogerus
2022-01-17 11:52       ` Mikhail Gavrilov
2022-01-17 12:21         ` Heikki Krogerus [this message]
2022-01-18 11:26           ` Mikhail Gavrilov
2022-01-18 13:12             ` Heikki Krogerus
2022-01-18 13:33               ` Heikki Krogerus
2022-01-18 14:09                 ` Mikhail Gavrilov
2022-01-21 21:33                 ` John Stultz
2022-01-24 23:00                   ` Len Brown
2022-01-25  8:43                     ` Heikki Krogerus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YeVfYOhxGTgg8VpZ@kuha.fi.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mikhail.v.gavrilov@gmail.com \
    --cc=rafael.j.wysocki@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®