linux-kernel - linux-next: manual merge of the akpm tree with the usb 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: <20151019170356.32dee225@canb.auug.org.au>
Date:	Mon, 19 Oct 2015 17:03:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Senna Tschudin <peter.senna@...il.com>,
	Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the akpm tree with the usb tree

Hi Andrew,

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

  drivers/usb/host/fusbh200-hcd.c

between commit:

  34e51ba6b65b ("usb-host: Remove fusbh200 driver")

from the usb tree and patch:

   "dma: remove external references to dma_supported"

from the akpm tree.

I fixed it up (the former removed the file, so I did that) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/