From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David Airlie" <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch -next] drm/radeon: missing break statement
Date: Tue, 23 Jun 2015 18:19:33 +0000 [thread overview]
Message-ID: <20150624041933.71f83cc7@canb.auug.org.au> (raw)
In-Reply-To: <20150623115148.GA6302@mwanda>
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
Hi Dan,
On Tue, 23 Jun 2015 14:51:48 +0300 Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> There was a merge problem in linux-next 4598d330d29e ('Merge
> remote-tracking branch 'drm/drm-next''). We need to add a break
> statement.
Thanks for noticing. I have fixed my merge resolution for the next
release and hopefully Linus will do it right when he merges the drm
tree (if it is still necessary).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2015-06-23 18:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-23 11:51 [patch -next] drm/radeon: missing break statement Dan Carpenter
2015-06-23 11:56 ` Christian König
2015-06-23 18:19 ` Stephen Rothwell [this message]
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=20150624041933.71f83cc7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dan.carpenter@oracle.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel-janitors@vger.kernel.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