All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Chris Ball <cjb@laptop.org>,
	linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
	linux-mmc@vger.kernel.org, Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: Re: [PATCH 2/8] mmc: omap: Fix DMA configuration to not rely on device id
Date: Fri, 29 Nov 2013 08:34:24 -0800	[thread overview]
Message-ID: <20131129163424.GK31534@atomide.com> (raw)
In-Reply-To: <52977711.6030806@bitmer.com>

* Jarkko Nikula <jarkko.nikula@bitmer.com> [131128 09:03]:
> Hi
> 
> On 11/27/2013 11:37 PM, Tony Lindgren wrote:
> > * Jarkko Nikula <jarkko.nikula@bitmer.com> [131127 12:55]:
> > Bummer, sounds like some duplicate work could have been avoided :(
> > I suggest resend to Chris and linux-mmc one more time as Chris should
> > pick up the MMC patches in general.
> > 
> Before that should Chris merge your 2 patches in order to avoid couple
> trivial merge conflicts with my set when linux-omap and mmc are merged?

Those are already queued to arm-soc/fixes branch and should hit the
mainline tree within next few days, hopefully before -rc2 so it's probably
to wait for that for that for further fixes.

Regards,

Tony

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/8] mmc: omap: Fix DMA configuration to not rely on device id
Date: Fri, 29 Nov 2013 08:34:24 -0800	[thread overview]
Message-ID: <20131129163424.GK31534@atomide.com> (raw)
In-Reply-To: <52977711.6030806@bitmer.com>

* Jarkko Nikula <jarkko.nikula@bitmer.com> [131128 09:03]:
> Hi
> 
> On 11/27/2013 11:37 PM, Tony Lindgren wrote:
> > * Jarkko Nikula <jarkko.nikula@bitmer.com> [131127 12:55]:
> > Bummer, sounds like some duplicate work could have been avoided :(
> > I suggest resend to Chris and linux-mmc one more time as Chris should
> > pick up the MMC patches in general.
> > 
> Before that should Chris merge your 2 patches in order to avoid couple
> trivial merge conflicts with my set when linux-omap and mmc are merged?

Those are already queued to arm-soc/fixes branch and should hit the
mainline tree within next few days, hopefully before -rc2 so it's probably
to wait for that for that for further fixes.

Regards,

Tony

  reply	other threads:[~2013-11-29 16:34 UTC|newest]

Thread overview: 98+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-14  2:35 [PATCH 0/8] Various omap device tree usability fixes for v3.13 merge window Tony Lindgren
2013-11-14  2:35 ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 1/8] net: smc91x: Fix device tree based configuration so it's usable Tony Lindgren
2013-11-14  2:35   ` Tony Lindgren
2013-11-14 11:03   ` Mark Rutland
2013-11-14 11:03     ` Mark Rutland
2013-11-14 16:08     ` Tony Lindgren
2013-11-14 16:08       ` Tony Lindgren
2013-11-16 15:16       ` Tony Lindgren
2013-11-16 15:16         ` Tony Lindgren
2013-11-27 18:36         ` Tony Lindgren
2013-11-27 18:36           ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 2/8] mmc: omap: Fix DMA configuration to not rely on device id Tony Lindgren
2013-11-14  2:35   ` Tony Lindgren
2013-11-18 18:47   ` Tony Lindgren
2013-11-18 18:47     ` Tony Lindgren
2013-11-26 23:33     ` Chris Ball
2013-11-26 23:33       ` Chris Ball
2013-11-26 23:52       ` Tony Lindgren
2013-11-26 23:52         ` Tony Lindgren
2013-11-27 20:57       ` Jarkko Nikula
2013-11-27 20:57         ` Jarkko Nikula
2013-11-27 21:37         ` Tony Lindgren
2013-11-27 21:37           ` Tony Lindgren
2013-11-28 17:02           ` Jarkko Nikula
2013-11-28 17:02             ` Jarkko Nikula
2013-11-29 16:34             ` Tony Lindgren [this message]
2013-11-29 16:34               ` Tony Lindgren
2013-11-27 21:47         ` Chris Ball
2013-11-27 21:47           ` Chris Ball
2013-11-27 21:59           ` Tony Lindgren
2013-11-27 21:59             ` Tony Lindgren
2013-11-28 16:13             ` Jarkko Nikula
2013-11-28 16:13               ` Jarkko Nikula
2013-11-29 17:13               ` Tony Lindgren
2013-11-29 17:13                 ` Tony Lindgren
2013-11-30  0:38   ` Joel Fernandes
2013-11-30  0:38     ` Joel Fernandes
2013-11-30 17:33     ` Tony Lindgren
2013-11-30 17:33       ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 3/8] mmc: omap: Fix I2C dependency and make driver usable with device tree Tony Lindgren
2013-11-14  2:35   ` Tony Lindgren
2013-11-14 11:05   ` Mark Rutland
2013-11-14 11:05     ` Mark Rutland
2013-11-14 17:25     ` Tony Lindgren
2013-11-14 17:25       ` Tony Lindgren
2013-11-26 23:34       ` Chris Ball
2013-11-26 23:34         ` Chris Ball
     [not found] ` <1384396537-3486-1-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-14  2:35   ` [PATCH 4/8] i2c: omap: Fix missing device tree flags for omap2 Tony Lindgren
2013-11-14  2:35     ` Tony Lindgren
     [not found]     ` <1384396537-3486-5-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-14  6:58       ` Wolfram Sang
2013-11-14  6:58         ` Wolfram Sang
2013-11-14 17:34         ` Tony Lindgren
2013-11-14 17:34           ` Tony Lindgren
     [not found]           ` <20131114173429.GF10317-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-14 17:49             ` Wolfram Sang
2013-11-14 17:49               ` Wolfram Sang
2013-11-14 17:53               ` Tony Lindgren
2013-11-14 17:53                 ` Tony Lindgren
2013-11-14 11:07       ` Mark Rutland
2013-11-14 11:07         ` Mark Rutland
2013-11-14 17:30         ` Tony Lindgren
2013-11-14 17:30           ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 5/8] gpio: twl4030: Fix regression for twl gpio output Tony Lindgren
2013-11-14  2:35   ` Tony Lindgren
2013-11-14  9:45   ` Peter Ujfalusi
2013-11-14  9:45     ` Peter Ujfalusi
2013-11-14 17:37     ` Tony Lindgren
2013-11-14 17:37       ` Tony Lindgren
2013-11-18 22:45   ` Linus Walleij
2013-11-18 22:45     ` Linus Walleij
2013-12-03 13:30   ` Roger Quadros
2013-12-03 13:30     ` Roger Quadros
2013-12-09 13:09     ` Linus Walleij
2013-12-09 13:09       ` Linus Walleij
2013-12-09 17:10       ` Tony Lindgren
2013-12-09 17:10         ` Tony Lindgren
2013-12-10 12:17         ` Linus Walleij
2013-12-10 12:17           ` Linus Walleij
2013-12-10 15:20           ` Tony Lindgren
2013-12-10 15:20             ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 6/8] gpio: twl4030: Fix passing of pdata in the device tree case Tony Lindgren
2013-11-14  2:35   ` Tony Lindgren
2013-11-18 18:27   ` Tony Lindgren
2013-11-18 18:27     ` Tony Lindgren
2013-11-18 22:46     ` Linus Walleij
2013-11-18 22:46       ` Linus Walleij
2013-11-14  2:35 ` [PATCH 7/8] ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x Tony Lindgren
2013-11-14  2:35   ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 8/8] ARM: dts: Fix omap2 specific dtsi files by adding the missing entries Tony Lindgren
2013-11-14  2:35   ` Tony Lindgren
2013-11-14 23:08 ` [PATCH 9/8] i2c: Fix device tree binding for i2c-cbus-gpio Tony Lindgren
2013-11-14 23:08   ` Tony Lindgren
     [not found]   ` <20131114230842.GU10317-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-15 18:49     ` Aaro Koskinen
2013-11-15 18:49       ` Aaro Koskinen
2013-11-15 22:26     ` Wolfram Sang
2013-11-15 22:26       ` Wolfram Sang
2013-11-15 22:30       ` Tony Lindgren
2013-11-15 22:30         ` Tony Lindgren

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=20131129163424.GK31534@atomide.com \
    --to=tony@atomide.com \
    --cc=aaro.koskinen@iki.fi \
    --cc=cjb@laptop.org \
    --cc=jarkko.nikula@bitmer.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@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.