From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755065AbcIEIIw (ORCPT ); Mon, 5 Sep 2016 04:08:52 -0400 Received: from ozlabs.org ([103.22.144.67]:35782 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754961AbcIEIIs (ORCPT ); Mon, 5 Sep 2016 04:08:48 -0400 Date: Mon, 5 Sep 2016 18:08:45 +1000 From: Stephen Rothwell To: Arnd Bergmann , David Miller , Networking Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , Tina Ruchandani Subject: linux-next: manual merge of the y2038 tree with the net-next tree Message-ID: <20160905180845.7f6f63b8@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 Arnd, Today's linux-next merge of the y2038 tree got a conflict in: fs/afs/main.c between commit: e0661dfc5961 ("afs: Need linux/random.h") from the net-next tree and commit: 549eb7b22e24 ("AFS: Correctly use 64-bit time for UUID") from the y2038 tree. I fixed it up (see below) 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 diff --cc fs/afs/main.c index 0b187ef3b5b7,129ff432391c..000000000000 --- a/fs/afs/main.c +++ b/fs/afs/main.c @@@ -14,7 -14,7 +14,8 @@@ #include #include #include +#include + #include #include "internal.h" MODULE_DESCRIPTION("AFS Client File System");