linux-kernel - Re: linux-next: manual merge of the usb tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190906134335.GA5834@kroah.com>
Date:   Fri, 6 Sep 2019 15:43:35 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
        Saranya Gopal <saranya.gopal@...el.com>,
        Balaji Manoharan <m.balaji@...el.com>
Subject: Re: linux-next: manual merge of the usb tree with the pm tree

On Wed, Sep 04, 2019 at 08:09:29PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/roles/intel-xhci-usb-role-switch.c
> 
> between commit:
> 
>   d2a90ebb6553 ("usb: roles: intel_xhci: Supplying software node for the role mux")
> 
> from the pm tree and commit:
> 
>   2be1fb64dfeb ("usb: roles: intel: Enable static DRD mode for role switch")
> 
> from the usb tree.

Ick, sorry about that, merge looks good to me, thanks!

greg k-h