From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Amitoj Kaur Chawla <amitoj1606@gmail•com>,
Shraddha Barke <shraddha.6596@gmail•com>
Subject: linux-next: manual merge of the char-misc tree with the staging tree
Date: Tue, 16 Feb 2016 14:00:19 +1100 [thread overview]
Message-ID: <20160216140019.540886b6@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/staging/goldfish/goldfish_nand.c
between commit:
814625b539d3 ("staging: goldfish: goldfish_nand: Return correct error code")
from the staging tree and commit:
3e2fbc7feec4 ("Staging: goldfish: goldfish_nand: Add DMA Support using dmam_alloc_coherent")
from the char-misc tree.
I fixed it up (the latter incorporated the former) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-02-16 3:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 3:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-02-16 2:55 linux-next: manual merge of the char-misc tree with the staging tree Stephen Rothwell
2016-02-23 1:36 ` Greg KH
2014-11-10 5:53 Stephen Rothwell
2014-11-10 5:58 ` Greg KH
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=20160216140019.540886b6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amitoj1606@gmail$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shraddha.6596@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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