From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bill Pemberton <wfp5p@virginia.edu>,
Wolfram Sang <w.sang@pengutronix.de>
Subject: Re: linux-next: manual merge of the driver-core.current tree with Linus tree
Date: Fri, 4 Jan 2013 18:33:20 -0800 [thread overview]
Message-ID: <20130105023320.GA9606@kroah.com> (raw)
In-Reply-To: <20130102103726.edc15af3340bb990991ed0c1@canb.auug.org.au>
On Wed, Jan 02, 2013 at 10:37:26AM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core.current tree got a conflict
> in drivers/i2c/busses/i2c-au1550.c between commit 0b255e927d47 ("i2c:
> remove __dev* attributes from subsystem") from Linus' tree and commit
> eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the
> driver-core.current tree.
>
> I fixed it up (I used the driver-core.current version) and can carry the
> fix as necessary (no action is required).
All of these should no longer be an issue due to the driver-core.current
tree getting merged into Linus's tree.
Hopefully it should not be a merge issue for you anymore as well.
thanks,
greg k-h
next prev parent reply other threads:[~2013-01-05 2:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-01 23:37 linux-next: manual merge of the driver-core.current tree with Linus tree Stephen Rothwell
2013-01-05 2:33 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-15 23:38 linux-next: manual merge of the driver-core.current tree with Linus' tree Stephen Rothwell
2012-12-23 22:52 Stephen Rothwell
2012-12-23 22:56 ` Stephen Rothwell
2012-12-23 23:30 ` Greg KH
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=20130105023320.GA9606@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=w.sang@pengutronix.de \
--cc=wfp5p@virginia.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox