All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org
Subject: Re: [GIT PULL] Staging/IIO driver patches for 4.21-rc1
Date: Fri, 28 Dec 2018 16:47:07 +0100	[thread overview]
Message-ID: <20181228154707.GA26161@kroah.com> (raw)
In-Reply-To: <20181228153531.GA23672@kroah.com>

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


  reply	other threads:[~2018-12-28 15:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-28 15:35 [GIT PULL] Staging/IIO driver patches for 4.21-rc1 Greg KH
2018-12-28 15:47 ` Greg KH [this message]
2018-12-29  5:35 ` pr-tracker-bot

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=20181228154707.GA26161@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=devel@linuxdriverproject.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.