From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756415AbcBVXJz (ORCPT ); Mon, 22 Feb 2016 18:09:55 -0500 Received: from ozlabs.org ([103.22.144.67]:51660 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756279AbcBVXJx (ORCPT ); Mon, 22 Feb 2016 18:09:53 -0500 Date: Tue, 23 Feb 2016 10:09:51 +1100 From: Stephen Rothwell To: Jaegeuk Kim Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Theodore Ts'o" Subject: linux-next: manual merge of the f2fs tree with Linus' tree Message-ID: <20160223100951.4b9a7b73@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jaegeuk, Today's linux-next merge of the f2fs tree got conflicts in: fs/ext4/crypto.c fs/ext4/ext4.h fs/ext4/namei.c between commits: 28b4c263961c ("ext4 crypto: revalidate dentry after adding or removing the key") ff978b09f973 ("ext4 crypto: move context consistency check to ext4_file_open()") from Linus' tree (presumably) bug fixes in v4.5-rc5 and commit: e29c55a8d406 ("ext4 crypto: migrate into vfs's crypto engine") from the f2fs tree. I do not have enough information to fix this up, so I dropped the last commit from the f2fs tree for today. I *assume* that this has been passed by Ted - I can;t easily tell as there are no Acked-by or Reviewed-by tags in the f2fs tree commit. If so, perhaps you could either merge v4.5-rc5 yourself and do the resolutions necessary (with nice comments in the merge commit), or give me some hints on how to do it. -- Cheers, Stephen Rothwell