From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752623AbcF2HsZ (ORCPT ); Wed, 29 Jun 2016 03:48:25 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:54411 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570AbcF2HsY (ORCPT ); Wed, 29 Jun 2016 03:48:24 -0400 Message-ID: <1467186499.2278.7.camel@pengutronix.de> Subject: Re: [PATCH 4/7] reset: Supply *_shared variant calls when using *_optional APIs From: Philipp Zabel To: Lee Jones Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com, maxime.coquelin@st.com, srinivas.kandagatla@gmail.com, kishon@ti.com, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org Date: Wed, 29 Jun 2016 09:48:19 +0200 In-Reply-To: <20160628085622.GM6720@dell> References: <20160606155655.10860-1-lee.jones@linaro.org> <20160606155655.10860-5-lee.jones@linaro.org> <20160628085622.GM6720@dell> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:96de:80ff:fec2:9969 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Lee, Am Dienstag, den 28.06.2016, 09:56 +0100 schrieb Lee Jones: > Philipp, > > I need this to go into the -rcs too. > > Can I add it with your Ack please? I have already added your patches to my branch, and I intend to send a pull request for it tomorrow. I am afraid applying this patch in another branch would create a merge conflict with git://git.pengutronix.de/git/pza/linux.git reset/next in arm-soc. If that is not the case, go ahead. Otherwise I could provide a tag at commit 2485394d9e0b ("reset: TRIVIAL: Add line break at same place for similar APIs") for you to merge. regards Philipp