public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Francois Romieu <romieu@fr•zoreil.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Jiri Kosina <jkosina@suse•cz>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Phil Carmody <ext-phil.2.carmody@nokia•com>,
	David Miller <davem@davemloft•net>,
	netdev@vger•kernel.org
Subject: Re: linux-next: manual merge of the trivial tree with the net tree
Date: Fri, 22 Jul 2011 08:42:48 +0200	[thread overview]
Message-ID: <20110722064248.GA10763@electric-eye.fr.zoreil.com> (raw)
In-Reply-To: <20110722141842.963b38d45ebf8cb5d0a25fcf@canb.auug.org.au>

Stephen Rothwell <sfr@canb•auug.org.au> :
[...]
> diff --cc drivers/net/r8169.c
> index 40bcb82,6f36306..0000000
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@@ -682,19 -666,8 +682,19 @@@ struct rtl8169_private 
>   	struct rtl8169_counters counters;
>   	u32 saved_wolopts;
>   
>  -	const struct firmware *fw;
>  +	struct rtl_fw {
>  +		const struct firmware *fw;
>  +
>  +#define RTL_VER_SIZE		32
>  +
>  +		char version[RTL_VER_SIZE];
>  +
>  +		struct rtl_fw_phy_action {
>  +			__le32 *code;
>  +			size_t size;
>  +		} phy_action;
>  +	} *rtl_fw;
> - #define RTL_FIRMWARE_UNKNOWN	ERR_PTR(-EAGAIN);
> + #define RTL_FIRMWARE_UNKNOWN	ERR_PTR(-EAGAIN)

There should not be further conflict in this part of the code until
things get merged with Linus's tree. Do what suits best.

Thanks.

-- 
Ueimor

next prev parent reply	other threads:[~2011-07-22  6:42 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-22  4:18 linux-next: manual merge of the trivial tree with the net tree Stephen Rothwell
2011-07-22  6:42 ` Francois Romieu [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-01-04  3:22 Stephen Rothwell
2011-01-05 14:51 ` Jiri Kosina
2011-01-05 15:22   ` Justin P. Mattock
2010-10-12  0:53 Stephen Rothwell
2010-09-24  2:19 Stephen Rothwell
2010-09-24 12:09 ` Jiri Kosina
2010-02-24  5:21 Stephen Rothwell
2010-02-16  3:50 Stephen Rothwell
2010-02-05  2:37 Stephen Rothwell
2010-02-05  4:26 ` David Miller
2010-02-05  8:39   ` Jiri Kosina
2010-02-05 11:23     ` Jiri Kosina
2010-02-05 16:55       ` David Miller
2010-02-03  2:30 Stephen Rothwell
2010-02-03 10:39 ` Jiri Kosina
2010-02-04  4:04   ` David Miller
2010-02-04  9:52     ` Jiri Kosina
2010-02-04 12:50       ` Giuseppe CAVALLARO
2010-02-04 13:52         ` Giuseppe CAVALLARO
2010-02-04 17:33           ` David Miller
2009-11-30  2:53 Stephen Rothwell
2009-11-30 12:36 ` Jiri Kosina
2009-11-30 19:55   ` Stephen Rothwell
2009-11-24  6:14 Stephen Rothwell
2009-11-24  9:13 ` Jiri Kosina
2009-11-30  1:13   ` David Miller

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=20110722064248.GA10763@electric-eye.fr.zoreil.com \
    --to=romieu@fr$(echo .)zoreil.com \
    --cc=davem@davemloft$(echo .)net \
    --cc=ext-phil.2.carmody@nokia$(echo .)com \
    --cc=jkosina@suse$(echo .)cz \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox