linux-kernel - linux-next: manual merge of the usb-gadget tree with Linus' 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>] [day] [month] [year] [list]

Message-ID: <20170613161127.7a374324@canb.auug.org.au>
Date:   Tue, 13 Jun 2017 16:11:27 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Felipe Balbi <balbi@...nel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Thinh Nguyen <Thinh.Nguyen@...opsys.com>,
        Alan Stern <stern@...land.harvard.edu>
Subject: linux-next: manual merge of the usb-gadget tree with Linus' tree

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in:

  drivers/usb/gadget/function/f_mass_storage.c

between commit:

  dc9217b69dd6 ("usb: gadget: f_mass_storage: Serialize wake and sleep execution")

from Linus' tree and commit:

  225785aec726 ("USB: f_mass_storage: improve memory barriers and synchronization")

from the usb-gadget tree.

I fixed it up (I used the usb-gadget tree version) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell