From: Ben Dooks <ben@trinity.fluff.org>
To: Yong Zhang <yong.zhang0@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Ben Dooks <ben-linux@fluff.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree
Date: Wed, 2 Nov 2011 17:46:25 +0000 [thread overview]
Message-ID: <20111102174625.GI18361@trinity.fluff.org> (raw)
In-Reply-To: <20111102022850.GA5875@zhy>
On Wed, Nov 02, 2011 at 10:28:50AM +0800, Yong Zhang wrote:
> On Wed, Nov 02, 2011 at 12:22:21PM +1100, Stephen Rothwell wrote:
> > Hi Ben,
> >
> > Today's linux-next merge of the bjdooks-i2c tree got a conflict in
> > drivers/i2c/busses/i2c-designware-platdrv.c between commit 4311051c358a
> > ("i2c: irq: Remove IRQF_DISABLED") from Linus' tree and commit
> > f8420b7bf6ce ("fixup merge") from the bjdooks-i2c tree.
> >
> > I fixed it up (by removing the IRQF_DISABLED flag) but this change should
> > probably be sent to Linus as it appears to have been fixed up incorrectly
> > there.
>
> Yeah, we should remove that flag. And that is what commit 4311051c358a
> want to achieve.
Unfortunately there was a merge conflict. I thought it got fixed, but
seems not. I will sort out fixing it later.
--
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
next prev parent reply other threads:[~2011-11-02 17:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-02 1:22 linux-next: manual merge of the bjdooks-i2c tree with Linus' tree Stephen Rothwell
2011-11-02 2:28 ` Yong Zhang
2011-11-02 17:46 ` Ben Dooks [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-31 2:48 Stephen Rothwell
2011-04-08 3:20 Stephen Rothwell
2011-01-17 0:17 Stephen Rothwell
2011-01-17 0:49 ` Ben Dooks
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=20111102174625.GI18361@trinity.fluff.org \
--to=ben@trinity.fluff.org \
--cc=ben-linux@fluff.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yong.zhang0@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.