From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Media Mailing List <linux-media@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL for v4.16-rc1] media updates
Date: Wed, 7 Feb 2018 09:16:43 +1100 [thread overview]
Message-ID: <20180207091643.6b71df0a@canb.auug.org.au> (raw)
In-Reply-To: <20180206091130.75c0f1ae@vento.lan>
Hi Linus,
On Tue, 6 Feb 2018 09:11:30 -0200 Mauro Carvalho Chehab <mchehab@s-opensource.com> wrote:
>
> 1) You may expect a merge conflict due to this patch:
> c23e0cb81e40 ("media: annotate ->poll() instances")
>
> See: https://lkml.org/lkml/2018/1/1/547
Looks like you missed this when doing the merge :-(
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2018-02-06 22:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 11:11 Mauro Carvalho Chehab
2018-02-06 22:16 ` Stephen Rothwell [this message]
2018-02-06 22:24 ` Linus Torvalds
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=20180207091643.6b71df0a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@s-opensource.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®