Re: [PATCH 1/3] staging:iio: Reorder channel type strings to matchthe iio.h enums.

[Greg KH]

On Thu, Jul 07, 2011 at 10:03:53AM -0700, Bryan Freed wrote:
> These are made from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/
> linux-2.6.git last synced on 6/22.

Ick, wrong tree.

> I synced up just now and had no problem cherry-picking the first two patches
> into a new branch.
> The third one required a manual merge, but I am not sure why.  They were all my
> diffs.
> 
> I will resubmit them all in a moment.

Please work against linux-next or the staging-next branch.  That is
where all of the development happens and your previous patches are
applied against.  We can't work against Linus's tree as it doesn't have
the previously accepted patches in it.

So please use that one instead.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/