linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the v4l-dvb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150818184657.4df65698@canb.auug.org.au>
Date:	Tue, 18 Aug 2015 18:46:57 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Mauro Carvalho Chehab <mchehab@....samsung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jan Kara <jack@...e.cz>,
	Vladimir Davydov <vdavydov@...allels.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 v4l-dvb tree

Hi Andrew,

On Tue, 18 Aug 2015 18:44:48 +1000 Stephen Rothwell <sfr@...b.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@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/