From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200AbdKAHBW (ORCPT ); Wed, 1 Nov 2017 03:01:22 -0400 Received: from ozlabs.org ([103.22.144.67]:49915 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750904AbdKAHBU (ORCPT ); Wed, 1 Nov 2017 03:01:20 -0400 Date: Wed, 1 Nov 2017 18:01:18 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Doug Ledford Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Mark Rutland , "Michael J. Ruhl" Subject: linux-next: manual merge of the tip tree with the rdma tree Message-ID: <20171101180118.213fd548@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/infiniband/hw/hfi1/file_ops.c between commit: ecf799852bde ("IB/hfi1: Refactor reset_ctxt() IOCTL") from the rdma tree and commit: 6aa7de059173 ("locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()") from the tip tree. I fixed it up (the former included the update from the latter) 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