All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Daniel Baluta <daniel.baluta@intel.com>
Cc: Jonathan Cameron <jic23@kernel.org>,
	Roberta Dobrescu <roberta.dobrescu@gmail.com>,
	opw-kernel <opw-kernel@googlegroups.com>,
	linux-iio@vger.kernel.org
Subject: Re: [OPW kernel] [PATCH v3] staging: iio: iio_event_monitor: Add support for missing IIO modifiers
Date: Tue, 28 Oct 2014 22:23:11 +0800	[thread overview]
Message-ID: <20141028142311.GA18837@kroah.com> (raw)
In-Reply-To: <CAEnQRZABCT=+X1-gqZmyBBNECmA_cwUY0whZvf1Orob_8tnfEg@mail.gmail.com>

On Tue, Oct 28, 2014 at 02:40:21PM +0200, Daniel Baluta wrote:
> On Sat, Oct 25, 2014 at 12:56 PM, Jonathan Cameron <jic23@kernel.org> wrote:
> > On 22/10/14 15:12, Daniel Baluta wrote:
> >> On Wed, Oct 22, 2014 at 4:50 PM, Roberta Dobrescu
> >> <roberta.dobrescu@gmail.com> wrote:
> >>> This patch adds the missing IIO modifiers in event_is_known function
> >>> and iio_modifier_names vector.
> >>>
> >>> Additionally, it removes duplicate name entries of IIO_MOD_LIGHT_BOTH
> >>> and IIO_MOD_LIGHT_IR in iio_modifier_names.
> >>>
> >>> Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
> >>
> >> Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
> >>
> > Applied to the togreg branch of iio.git - initially pushed out as
> > testing for the autobuilders to play.
> 
> Hi,
> 
> FYI:
> 
> Please note that this patch is both in Greg's staging-testing [1]
> and Jonathan's testing [2] tree.
> 
> thanks,
> Daniel.
> 
> [1] https://git.kernel.org/cgit/linux/kernel/git/gregkh/staging.git/commit/?h=staging-testing&id=0a6e2170dfcd2b17ae32ad91993edf2b77014137
> [2] https://git.kernel.org/cgit/linux/kernel/git/jic23/iio.git/commit/?h=testing&id=a9bef750135cc261bfceff6840a30a3f357df8da

That's ok, git handles that just fine when we merge together.

greg k-h

      reply	other threads:[~2014-10-28 14:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-22 13:50 [PATCH v3] staging: iio: iio_event_monitor: Add support for missing IIO modifiers Roberta Dobrescu
2014-10-22 14:12 ` [OPW kernel] " Daniel Baluta
2014-10-25  9:56   ` Jonathan Cameron
2014-10-28 12:40     ` Daniel Baluta
2014-10-28 14:23       ` Greg Kroah-Hartman [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141028142311.GA18837@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=daniel.baluta@intel.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=opw-kernel@googlegroups.com \
    --cc=roberta.dobrescu@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.