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,
Jiri Pirko <jiri@resnulli.us>, David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the driver-core tree with the net-next tree
Date: Fri, 2 Aug 2013 08:28:51 +0800 [thread overview]
Message-ID: <20130802002851.GD11408@kroah.com> (raw)
In-Reply-To: <20130801152148.c98a281ec6e076646edeb7cb@canb.auug.org.au>
On Thu, Aug 01, 2013 at 03:21:48PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> net/core/net-sysfs.c between commit ff80e519ab1b ("net: export physical
> port id via sysfs") from the net-next tree and commit 6be8aeef348a ("net:
> core: convert class code to use dev_groups") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2013-08-02 0:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-01 5:21 linux-next: manual merge of the driver-core tree with the net-next tree Stephen Rothwell
2013-08-02 0:28 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-30 4:32 Stephen Rothwell
2023-01-30 12:31 ` Andy Shevchenko
2023-01-30 16:00 ` Greg KH
2018-07-23 5:12 Stephen Rothwell
2018-07-23 6:20 ` Greg KH
2018-08-15 23:42 ` Stephen Rothwell
2018-08-16 0:05 ` Rajat Jain
2014-12-01 7:19 Stephen Rothwell
2014-12-01 7:34 ` Arend van Spriel
2014-12-03 8:36 ` Jeremiah Mahler
2014-12-03 10:51 ` Jeremiah Mahler
2014-12-03 12:49 ` Arend van Spriel
2014-12-03 16:21 ` Greg KH
2014-12-03 20:07 ` Arend van Spriel
2014-12-03 21:06 ` Jeremiah Mahler
2013-02-04 4:38 Stephen Rothwell
2013-02-04 4:59 ` Greg KH
2013-02-04 4:34 Stephen Rothwell
2011-10-25 8:07 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=20130802002851.GD11408@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).