From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net-next tree with the net tree Date: Wed, 8 Jun 2016 11:17:05 +1000 Message-ID: <20160608111705.2f196767@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, WANG Cong , Jamal Hadi Salim To: David Miller , Return-path: Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/act_police.c between commit: 53eb440f4ada ("net sched actions: introduce timestamp for firsttime use") from the net tree and commit: a03e6fe56971 ("act_police: fix a crash during removal") from the net-next tree. I fixed it up (I think that the firstuse zero initialisation has become redundant, so I just removed it) 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