From: Lars-Peter Clausen <lars@metafoo.de>
To: Jonathan Cameron <jic23@kernel.org>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PATCH 13/13] staging:iio: drop procesed_val element of chan_spec.
Date: Fri, 13 Apr 2012 12:37:57 +0200 [thread overview]
Message-ID: <4F880205.1030001@metafoo.de> (raw)
In-Reply-To: <1334311471-23054-14-git-send-email-jic23@kernel.org>
On 04/13/2012 12:04 PM, Jonathan Cameron wrote:
> [...]
> +<<<<<<< HEAD
> * correspond to the first name that the channel is referred
> * to by in the datasheet (e.g. IND), or the nearest
> * possible compound name (e.g. IND-INC).
> * @processed_val: Flag to specify the data access attribute should be
> * *_input rather than *_raw.
> +=======
> + * correspond to the first name that the channel is
> + * referred to by in the datasheet (e.g. IND), or the
> + * nearest possible compound name (e.g. IND-INC).
> +>>>>>>> adbde46... staging:iio: drop procesed_val element of chan_spec.
> [...]
Looks like something went wrong here.
next prev parent reply other threads:[~2012-04-13 10:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-13 10:04 [PATCH 00/13 V2] IIO: Make the value attribute optional for channels Jonathan Cameron
2012-04-13 10:04 ` [PATCH 01/13] staging:iio: add a raw and processed elements to info_mask Jonathan Cameron
2012-04-13 10:04 ` [PATCH 02/13] staging:iio:accel Add IIO_CHAN_INFO_RAW entries to all drivers Jonathan Cameron
2012-04-13 14:33 ` Lars-Peter Clausen
2012-04-13 10:04 ` [PATCH 03/13] staging:iio:adc " Jonathan Cameron
2012-04-13 14:35 ` Lars-Peter Clausen
2012-04-13 10:04 ` [PATCH 04/13] staging:iio:dac " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 05/13] staging:iio:gyro " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 06/13] staging:iio:imu " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 07/13] staging:iio:light Add IIO_CHAN_INFO_RAW/PROCESSED " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 08/13] staging:iio:magnetometer Add IIO_CHAN_INFO_RAW " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 09/13] staging:iio:resolver " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 10/13] staging:iio:impedance Add IIO_CHAN_INFO_RAW/PROCESSED " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 11/13] staging:iio:cdc " Jonathan Cameron
2012-04-13 10:04 ` [PATCH 12/13] staging:iio: Make read / write attributes for channel values optional Jonathan Cameron
2012-04-13 10:04 ` [PATCH 13/13] staging:iio: drop procesed_val element of chan_spec Jonathan Cameron
2012-04-13 10:37 ` Lars-Peter Clausen [this message]
2012-04-13 10:39 ` Jonathan Cameron
2012-04-13 14:31 ` [PATCH 00/13 V2] IIO: Make the value attribute optional for channels Lars-Peter Clausen
2012-04-13 15:06 ` Jonathan Cameron
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=4F880205.1030001@metafoo.de \
--to=lars@metafoo.de \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
/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.