From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751490AbbJBDgn (ORCPT ); Thu, 1 Oct 2015 23:36:43 -0400 Received: from ozlabs.org ([103.22.144.67]:41691 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751115AbbJBDgm (ORCPT ); Thu, 1 Oct 2015 23:36:42 -0400 Date: Fri, 2 Oct 2015 13:36:38 +1000 From: Stephen Rothwell To: "Nicholas A. Bellinger" , Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Mack , Christoph Hellwig Subject: linux-next: manual merge of the target-updates tree with the kdbus tree Message-ID: <20151002133638.3430e7da@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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 Nicholas, Today's linux-next merge of the target-updates tree got a conflict in: samples/Makefile between commit: 2d41f8138508 ("kdbus: add walk-through user space example") from the kdbus tree and commit: f71933438300 ("configfs: remove old API") from the target-updates tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc samples/Makefile index f0ad51e5b342,48001d7e23f0..000000000000 --- a/samples/Makefile +++ b/samples/Makefile @@@ -1,5 -1,5 +1,5 @@@ # Makefile for Linux samples code obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \ - hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \ - configfs/ + hw_breakpoint/ kfifo/ kdb/ kdbus/ hidraw/ rpmsg/ \ - seccomp/ ++ seccomp/ configfs/