From patchwork Tue May 31 10:04:08 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: gerrit-no-reply@lists.osmocom.org
X-Patchwork-Id: 628112
Return-Path: <openbsc-bounces@lists.osmocom.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from lists.osmocom.org (lists.osmocom.org
	[IPv6:2a01:4f8:191:444b::2:7])
	by ozlabs.org (Postfix) with ESMTP id 3rJpx9689Lz9t3q
	for <incoming@patchwork.ozlabs.org>;
	Tue, 31 May 2016 20:04:13 +1000 (AEST)
Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76])
	by lists.osmocom.org (Postfix) with ESMTP id 014BC22463;
	Tue, 31 May 2016 10:04:10 +0000 (UTC)
X-Original-To: openbsc@lists.osmocom.org
Delivered-To: openbsc@lists.osmocom.org
Received: from 127.0.1.12 (unknown [127.0.1.12])
	by lists.osmocom.org (Postfix) with ESMTPA id A3D222244D;
	Tue, 31 May 2016 10:04:08 +0000 (UTC)
Date: Tue, 31 May 2016 10:04:08 +0000
From: Neels Hofmeyr <gerrit-no-reply@lists.osmocom.org>
Message-ID: 
 <gerrit.1464689048617.Ic47afc6ea2da93721a4d7f852ca37d734051147c@gerrit.osmocom.org>
X-Gerrit-MessageType: newchange
Subject: [PATCH] openbsc[master]: TEST: outdated branch without conflict,
	on 'cherry pick' mode
X-Gerrit-Change-Id: Ic47afc6ea2da93721a4d7f852ca37d734051147c
X-Gerrit-ChangeURL: <https://gerrit.osmocom.org/134>
X-Gerrit-Commit: e28b3771ff92ad854e6da9449992ce2b86a24f80
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Gerrit/2.12.2-31-gb331dbd-dirty
X-BeenThere: openbsc@lists.osmocom.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB,
	OsmoCSCN" <openbsc.lists.osmocom.org>
List-Unsubscribe: <https://lists.osmocom.org/mailman/options/openbsc>,
	<mailto:openbsc-request@lists.osmocom.org?subject=unsubscribe>
List-Archive: <http://lists.osmocom.org/pipermail/openbsc/>
List-Post: <mailto:openbsc@lists.osmocom.org>
List-Help: <mailto:openbsc-request@lists.osmocom.org?subject=help>
List-Subscribe: <https://lists.osmocom.org/mailman/listinfo/openbsc>,
	<mailto:openbsc-request@lists.osmocom.org?subject=subscribe>
Reply-To: nhofmeyr@sysmocom.de
Errors-To: openbsc-bounces@lists.osmocom.org
Sender: "OpenBSC" <openbsc-bounces@lists.osmocom.org>

Review at  https://gerrit.osmocom.org/134

TEST: outdated branch without conflict, on 'cherry pick' mode

Change-Id: Ic47afc6ea2da93721a4d7f852ca37d734051147c
---
M openbsc/src/libbsc/bsc_init.c
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/34/134/1

diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index 5c27862..647de2c 100644
--- a/openbsc/src/libbsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
@@ -19,6 +19,8 @@
  *
  */
 
+/* TEST COMMIT */
+
 #include <openbsc/gsm_data.h>
 #include <osmocom/gsm/gsm_utils.h>
 #include <openbsc/gsm_04_08.h>