From: Greg KH <gregkh@linuxfoundation.org>
To: Peter Chen <peter.chen@kernel.org>
Cc: linux-usb@vger.kernel.org
Subject: Re: [GIT PULL] usb: changes for v5.13-rc1
Date: Mon, 12 Apr 2021 11:47:57 +0200 [thread overview]
Message-ID: <YHQXTbim32F0etan@kroah.com> (raw)
In-Reply-To: <20210411223542.GA26127@b29397-desktop>
On Mon, Apr 12, 2021 at 06:35:43AM +0800, Peter Chen wrote:
> The following changes since commit 5e17812c22bcd65fa9202595eef4bbf8fa814144:
>
> usb: dwc3: document usb_psy in struct dwc3 (2021-03-03 11:09:29 +0100)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git/ tags/usb-v5.13-rc1
>
> for you to fetch changes up to 6ef82c8acf5ca40d8912947696e9d52956a03cec:
>
> usb: cdnsp: Fixes issue with Configure Endpoint command (2021-04-10 09:10:44 +0800)
>
> ----------------------------------------------------------------
> Several Cadence3 improvements are introduced in v5.13-rc1:
> - Add recovery during resume if the controller was lost power at system suspend
> - Reduce DMA memory footprint
> - Other small improvements
>
> ----------------------------------------------------------------
> Colin Ian King (1):
> usb: cdnsp: remove redundant initialization of variable ret
>
> Dmitry Osipenko (1):
> usb: chipidea: tegra: Silence deferred probe error
>
> Frank Li (3):
> usb: cdns3: add power lost support for system resume
> usb: cdns3: imx: add power lost support for system resume
> usb: cdns3: fix static checker warning.
>
> Pawel Laszczak (1):
> usb: cdnsp: Fixes issue with Configure Endpoint command
>
> Peter Chen (1):
> usb: cdns3: trace: delete the trace parameter for request->trb
>
> Sanket Parmar (2):
> usb: cdns3: Use dma_pool_* api to alloc trb pool
> usb: cdns3: Optimize DMA request buffer allocation
>
> Wang Qing (1):
> usb: cdns3: delete repeated clear operations
>
> Wei Yongjun (1):
> usb: cdns3: imx: mark cdns_imx_system_resume as __maybe_unused
>
> drivers/usb/cdns3/cdns3-gadget.c | 73 ++++++++++++++++++++++--------------
> drivers/usb/cdns3/cdns3-gadget.h | 3 ++
> drivers/usb/cdns3/cdns3-imx.c | 34 +++++++++++++++++
> drivers/usb/cdns3/cdns3-plat.c | 23 +++++++++++-
> drivers/usb/cdns3/cdns3-trace.h | 5 +--
> drivers/usb/cdns3/cdnsp-gadget.c | 17 ++++++---
> drivers/usb/cdns3/cdnsp-gadget.h | 1 +
> drivers/usb/cdns3/cdnsp-mem.c | 3 +-
> drivers/usb/cdns3/core.c | 29 +++++++++++++-
> drivers/usb/cdns3/drd.c | 15 ++++++++
> drivers/usb/cdns3/drd.h | 2 +-
> drivers/usb/chipidea/ci_hdrc_tegra.c | 8 ++--
> 12 files changed, 165 insertions(+), 48 deletions(-)
This merge is odd, why am I getting merge conflicts in:
drivers/usb/dwc3/gadget.c
drivers/usb/typec/tipd/core.c
when I pull this?
According to the above there should not be any changes in those files.
When I resolve those conflicts, I get a _lot_ of additional patches in
this branch than you list here.
How did you create this pull request? What branch of mine is it
against?
confused,
greg k-h
next prev parent reply other threads:[~2021-04-12 9:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 22:35 [GIT PULL] usb: changes for v5.13-rc1 Peter Chen
2021-04-12 9:47 ` Greg KH [this message]
2021-04-12 10:44 ` Peter Chen
2021-04-12 10:56 ` Greg KH
2021-04-12 12:18 ` Peter Chen
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=YHQXTbim32F0etan@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).