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>,
Jean Delvare <khali@linux-fr.org>
Subject: Re: linux-next: manual merge of the driver-core.current tree with Linus' tree
Date: Sun, 23 Dec 2012 15:30:10 -0800 [thread overview]
Message-ID: <20121223233010.GA23879@kroah.com> (raw)
In-Reply-To: <20121224095614.3d1fc65e9ade946cc6a8a2e1@canb.auug.org.au>
On Mon, Dec 24, 2012 at 09:56:14AM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> On Mon, 24 Dec 2012 09:52:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the driver-core.current tree got conflicts
> > in 21 files in drivers/i2c 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 (taking a mixture of both commits) and can carry the fix as
> > necessary (no action is required).
>
> BTW, Greg, the patch in your tree to drivers/i2c/busses/i2c-au1550.c is
> incorrect and would not build.
Ugh, that's a horrible merge error on my part, thanks for pointing it
out. My 'make allmodconfig' doesn't happen to build that module.
And sorry about the merge issues, I wasn't aware that Wolfram was going
to be sending these to Linus after 3.8-rc1 was out, sorry about that.
The merge issues are due to me trying to get the coding style correct,
which Bill's sed script didn't always do.
thanks,
greg k-h
next prev parent reply other threads:[~2012-12-23 23:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-23 22:52 linux-next: manual merge of the driver-core.current tree with Linus' tree Stephen Rothwell
2012-12-23 22:56 ` Stephen Rothwell
2012-12-23 23:30 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2025-06-15 23:38 linux-next: manual merge of the driver-core.current tree with Linus' tree Stephen Rothwell
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=20121223233010.GA23879@kroah.com \
--to=greg@kroah.com \
--cc=khali@linux-fr.org \
--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 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.