From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752758AbdDLGqK (ORCPT ); Wed, 12 Apr 2017 02:46:10 -0400 Received: from ozlabs.org ([103.22.144.67]:42933 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752547AbdDLGqJ (ORCPT ); Wed, 12 Apr 2017 02:46:09 -0400 Date: Wed, 12 Apr 2017 16:46:06 +1000 From: Stephen Rothwell To: Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Vlastimil Babka , NeilBrown Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20170412164606.08578271@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-current tree got conflicts in: drivers/block/nbd.c drivers/scsi/iscsi_tcp.c net/core/dev.c net/core/sock.c between commit: 717a94b5fc70 ("sched/core: Remove 'task' parameter and rename tsk_restore_flags() to current_restore_flags()") from the tip tree and commit: 61d5ad5b2e8a ("treewide: convert PF_MEMALLOC manipulations to new helpers") from the akpm-current tree. I fixed it up (the latter is just a superset of the former, so I used that) 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. It looks like there may be more instances that the latter patch should update. -- Cheers, Stephen Rothwell