From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbdKHCWA (ORCPT ); Tue, 7 Nov 2017 21:22:00 -0500 Received: from ozlabs.org ([103.22.144.67]:46773 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752251AbdKHCV6 (ORCPT ); Tue, 7 Nov 2017 21:21:58 -0500 Date: Wed, 8 Nov 2017 13:21:56 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Herbert Xu Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Kees Cook , Boris BREZILLON Subject: linux-next: manual merge of the tip tree with the crypto tree Message-ID: <20171108132156.701f77fe@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 all, Today's linux-next merge of the tip tree got a conflict in: drivers/crypto/mv_cesa.c between commit: 27b43fd95b14 ("crypto: marvell - Remove the old mv_cesa driver") from the crypto tree and commit: f34d8d506eef ("crypto: Convert timers to use timer_setup()") from the tip tree. I fixed it up (I removed the file again) 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