From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751812AbdA3EAs (ORCPT ); Sun, 29 Jan 2017 23:00:48 -0500 Received: from ozlabs.org ([103.22.144.67]:36079 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbdA3EAi (ORCPT ); Sun, 29 Jan 2017 23:00:38 -0500 Date: Mon, 30 Jan 2017 14:59:50 +1100 From: Stephen Rothwell To: Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Rui Miguel Silva Subject: linux-next: manual merge of the staging tree with the staging.current tree Message-ID: <20170130145950.21dd6a22@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 Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/greybus/timesync_platform.c between commit: b17c1bba9cec ("staging: greybus: timesync: validate platform state callback") from the staging.current tree and commit: bdfb95c4baab ("staging: greybus: remove timesync protocol support") from the staging tree. I fixed it up (I just removed the file) 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