Re: [GIT PULL] Staging/IIO driver patches for 4.21-rc1

From: Greg KH
Date: Fri Dec 28 2018 - 10:47:12 EST


On Fri, Dec 28, 2018 at 04:35:31PM +0100, Greg KH wrote:
> The following changes since commit 40e020c129cfc991e8ab4736d2665351ffd1468d:
>
> Linux 4.20-rc6 (2018-12-09 15:31:00 -0800)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git tags/staging-4.21-rc1
>
> for you to fetch changes up to 215852f4b8bbf7a8d6a534dfb367bb0f1a2d5011:
>
> staging: mt7621-mmc: Correct spelling mistakes in comments (2018-12-20 18:11:58 +0100)

There will be conflicts with two files in your tree now with this pull:
drivers/staging/media/tegra-vde/tegra-vde.c
drivers/staging/vboxvideo/vbox_ttm.c

both resolutions should be trivial. If not, let me know.

thanks,

greg k-h