From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Mauro Carvalho Chehab <mchehab@osg•samsung.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jan Kara <jack@suse•cz>,
Vladimir Davydov <vdavydov@parallels•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the v4l-dvb tree
Date: Tue, 18 Aug 2015 18:46:57 +1000 [thread overview]
Message-ID: <20150818184657.4df65698@canb.auug.org.au> (raw)
In-Reply-To: <20150818184448.439d5c2e@canb.auug.org.au>
Hi Andrew,
On Tue, 18 Aug 2015 18:44:48 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/Kconfig
Also
mm/Makefile
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next prev parent reply other threads:[~2015-08-18 8:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 8:44 linux-next: manual merge of the akpm-current tree with the v4l-dvb tree Stephen Rothwell
2015-08-18 8:46 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-04-10 10:17 Stephen Rothwell
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=20150818184657.4df65698@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@osg$(echo .)samsung.com \
--cc=vdavydov@parallels$(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