From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751718AbeBBDRq (ORCPT ); Thu, 1 Feb 2018 22:17:46 -0500 Received: from ozlabs.org ([103.22.144.67]:50747 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751530AbeBBDRi (ORCPT ); Thu, 1 Feb 2018 22:17:38 -0500 Date: Fri, 2 Feb 2018 14:17:36 +1100 From: Stephen Rothwell To: Andrew Morton , "Theodore Ts'o" Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Eric Biggers Subject: linux-next: manual merge of the akpm tree with the fscrypt tree Message-ID: <20180202141736.00f13fff@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 Andrew, Today's linux-next merge of the akpm tree got a conflict in: fs/crypto/hooks.c between commit: 0b1dfa4cc6c6 ("fscrypt: fix build with pre-4.6 gcc versions") from the fscrypt tree and patch: "fs/crypto/hooks.c: fix build with gcc-4.4.4" from the akpm tree. I fixed it up (I just dropped the akpm tree version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell