linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Guenter Roeck <linux@roeck-us.net>,
	Chris Healy <cphealy@gmail.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Date: Thu, 27 Jun 2013 13:49:56 +1000	[thread overview]
Message-ID: <20130627134956.7f7854bef31558c2a4bfb037@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 5090 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/freescale/fec_main.c between commits 32bc9b46d840
("fec: Add support to restart autonegotiate") and d13919301d9a ("net:
fec: Fix build for MCF5272") from the net tree and commit 38ae92dc215e
("ec: Add support for reading RMON registers") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/freescale/fec_main.c
index d48099f,ed6180e..0000000
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@@ -1444,13 -1443,121 +1451,122 @@@ static int fec_enet_set_pauseparam(stru
  	return 0;
  }
  
- #endif /* !defined(CONFIG_M5272) */
 -#ifndef CONFIG_M5272
+ static const struct fec_stat {
+ 	char name[ETH_GSTRING_LEN];
+ 	u16 offset;
+ } fec_stats[] = {
+ 	/* RMON TX */
+ 	{ "tx_dropped", RMON_T_DROP },
+ 	{ "tx_packets", RMON_T_PACKETS },
+ 	{ "tx_broadcast", RMON_T_BC_PKT },
+ 	{ "tx_multicast", RMON_T_MC_PKT },
+ 	{ "tx_crc_errors", RMON_T_CRC_ALIGN },
+ 	{ "tx_undersize", RMON_T_UNDERSIZE },
+ 	{ "tx_oversize", RMON_T_OVERSIZE },
+ 	{ "tx_fragment", RMON_T_FRAG },
+ 	{ "tx_jabber", RMON_T_JAB },
+ 	{ "tx_collision", RMON_T_COL },
+ 	{ "tx_64byte", RMON_T_P64 },
+ 	{ "tx_65to127byte", RMON_T_P65TO127 },
+ 	{ "tx_128to255byte", RMON_T_P128TO255 },
+ 	{ "tx_256to511byte", RMON_T_P256TO511 },
+ 	{ "tx_512to1023byte", RMON_T_P512TO1023 },
+ 	{ "tx_1024to2047byte", RMON_T_P1024TO2047 },
+ 	{ "tx_GTE2048byte", RMON_T_P_GTE2048 },
+ 	{ "tx_octets", RMON_T_OCTETS },
+ 
+ 	/* IEEE TX */
+ 	{ "IEEE_tx_drop", IEEE_T_DROP },
+ 	{ "IEEE_tx_frame_ok", IEEE_T_FRAME_OK },
+ 	{ "IEEE_tx_1col", IEEE_T_1COL },
+ 	{ "IEEE_tx_mcol", IEEE_T_MCOL },
+ 	{ "IEEE_tx_def", IEEE_T_DEF },
+ 	{ "IEEE_tx_lcol", IEEE_T_LCOL },
+ 	{ "IEEE_tx_excol", IEEE_T_EXCOL },
+ 	{ "IEEE_tx_macerr", IEEE_T_MACERR },
+ 	{ "IEEE_tx_cserr", IEEE_T_CSERR },
+ 	{ "IEEE_tx_sqe", IEEE_T_SQE },
+ 	{ "IEEE_tx_fdxfc", IEEE_T_FDXFC },
+ 	{ "IEEE_tx_octets_ok", IEEE_T_OCTETS_OK },
+ 
+ 	/* RMON RX */
+ 	{ "rx_packets", RMON_R_PACKETS },
+ 	{ "rx_broadcast", RMON_R_BC_PKT },
+ 	{ "rx_multicast", RMON_R_MC_PKT },
+ 	{ "rx_crc_errors", RMON_R_CRC_ALIGN },
+ 	{ "rx_undersize", RMON_R_UNDERSIZE },
+ 	{ "rx_oversize", RMON_R_OVERSIZE },
+ 	{ "rx_fragment", RMON_R_FRAG },
+ 	{ "rx_jabber", RMON_R_JAB },
+ 	{ "rx_64byte", RMON_R_P64 },
+ 	{ "rx_65to127byte", RMON_R_P65TO127 },
+ 	{ "rx_128to255byte", RMON_R_P128TO255 },
+ 	{ "rx_256to511byte", RMON_R_P256TO511 },
+ 	{ "rx_512to1023byte", RMON_R_P512TO1023 },
+ 	{ "rx_1024to2047byte", RMON_R_P1024TO2047 },
+ 	{ "rx_GTE2048byte", RMON_R_P_GTE2048 },
+ 	{ "rx_octets", RMON_R_OCTETS },
+ 
+ 	/* IEEE RX */
+ 	{ "IEEE_rx_drop", IEEE_R_DROP },
+ 	{ "IEEE_rx_frame_ok", IEEE_R_FRAME_OK },
+ 	{ "IEEE_rx_crc", IEEE_R_CRC },
+ 	{ "IEEE_rx_align", IEEE_R_ALIGN },
+ 	{ "IEEE_rx_macerr", IEEE_R_MACERR },
+ 	{ "IEEE_rx_fdxfc", IEEE_R_FDXFC },
+ 	{ "IEEE_rx_octets_ok", IEEE_R_OCTETS_OK },
+ };
+ 
+ static void fec_enet_get_ethtool_stats(struct net_device *dev,
+ 	struct ethtool_stats *stats, u64 *data)
+ {
+ 	struct fec_enet_private *fep = netdev_priv(dev);
+ 	int i;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(fec_stats); i++)
+ 		data[i] = readl(fep->hwp + fec_stats[i].offset);
+ }
+ 
+ static void fec_enet_get_strings(struct net_device *netdev,
+ 	u32 stringset, u8 *data)
+ {
+ 	int i;
+ 	switch (stringset) {
+ 	case ETH_SS_STATS:
+ 		for (i = 0; i < ARRAY_SIZE(fec_stats); i++)
+ 			memcpy(data + i * ETH_GSTRING_LEN,
+ 				fec_stats[i].name, ETH_GSTRING_LEN);
+ 		break;
+ 	}
+ }
+ 
+ static int fec_enet_get_sset_count(struct net_device *dev, int sset)
+ {
+ 	switch (sset) {
+ 	case ETH_SS_STATS:
+ 		return ARRAY_SIZE(fec_stats);
+ 	default:
+ 		return -EOPNOTSUPP;
+ 	}
+ }
+ #endif
+ 
+ static int fec_enet_nway_reset(struct net_device *dev)
+ {
+ 	struct fec_enet_private *fep = netdev_priv(dev);
+ 	struct phy_device *phydev = fep->phy_dev;
+ 
+ 	if (!phydev)
+ 		return -ENODEV;
+ 
+ 	return genphy_restart_aneg(phydev);
+ }
  
  static const struct ethtool_ops fec_enet_ethtool_ops = {
 +#if !defined(CONFIG_M5272)
  	.get_pauseparam		= fec_enet_get_pauseparam,
  	.set_pauseparam		= fec_enet_set_pauseparam,
 +#endif
  	.get_settings		= fec_enet_get_settings,
  	.set_settings		= fec_enet_set_settings,
  	.get_drvinfo		= fec_enet_get_drvinfo,
@@@ -1891,9 -2001,13 +2011,14 @@@ fec_probe(struct platform_device *pdev
  	if (pdev->id_entry &&
  	    (pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
  		fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
 +#endif
  
- 	fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
+ 	fep->hwp = devm_ioremap_resource(&pdev->dev, r);
+ 	if (IS_ERR(fep->hwp)) {
+ 		ret = PTR_ERR(fep->hwp);
+ 		goto failed_ioremap;
+ 	}
+ 
  	fep->pdev = pdev;
  	fep->dev_id = dev_id++;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-06-27  3:49 UTC|newest]

Thread overview: 469+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-27  3:49 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-08-30  1:58 Stephen Rothwell
2021-08-17  4:16 Stephen Rothwell
2021-08-17  9:36 ` Andy Shevchenko
2021-08-13  1:24 Stephen Rothwell
2021-08-11  1:39 Stephen Rothwell
2021-08-11  1:35 Stephen Rothwell
2021-08-09  3:14 Stephen Rothwell
2021-08-02 20:25 Mark Brown
2021-08-02 20:31 ` Vladimir Oltean
2021-07-28 11:57 wengjianfeng
2021-07-28 10:54 Mark Brown
2021-07-28 12:03 ` tangbin
2021-07-19  0:51 Stephen Rothwell
2021-06-24  1:58 Stephen Rothwell
2021-06-17  1:04 Stephen Rothwell
2021-06-16  1:47 Stephen Rothwell
2021-06-04  1:28 Stephen Rothwell
2021-06-04 12:56 ` Vladimir Oltean
2021-06-04  1:24 Stephen Rothwell
2021-06-03  1:46 Stephen Rothwell
2021-05-28  1:06 Stephen Rothwell
2021-04-15  2:17 Stephen Rothwell
2021-04-15 14:00 ` Ong, Boon Leong
2021-04-15 22:05   ` Stephen Rothwell
2021-04-08  3:19 Stephen Rothwell
2021-04-08  2:49 Stephen Rothwell
2021-04-06  3:49 Stephen Rothwell
2021-03-24  1:21 Stephen Rothwell
2021-03-24  1:18 Stephen Rothwell
2021-03-19  0:16 Stephen Rothwell
     [not found] ` <CAFzhf4pCdJStzBcveahKYQFHJCKenuT+VZAP+8PWSEQcooKLgQ@mail.gmail.com>
2021-03-19  7:21   ` Daniel Borkmann
2021-03-19 15:17     ` Yonghong Song
2021-03-19 15:33       ` Alexei Starovoitov
2021-03-19 15:38         ` Daniel Borkmann
2021-03-18  0:22 Stephen Rothwell
2021-02-17  1:43 Stephen Rothwell
2021-02-18 18:40 ` Sukadev Bhattiprolu
2021-02-15  0:52 Stephen Rothwell
2021-02-16 21:28 ` Saeed Mahameed
2021-02-15  0:43 Stephen Rothwell
2021-02-15 11:01 ` Guillaume Nault
2021-02-15 11:35   ` Davide Caratti
2021-02-15 11:52     ` Stephen Rothwell
2021-02-12  1:44 Stephen Rothwell
2021-01-08  0:26 Stephen Rothwell
2020-12-02  1:20 Stephen Rothwell
2020-12-02 17:13 ` Thomas Falcon
2020-11-30  2:02 Stephen Rothwell
2020-11-04  0:43 Stephen Rothwell
2020-11-06 20:19 ` ljp
2020-10-12  2:45 Stephen Rothwell
2020-10-07  2:08 Stephen Rothwell
2020-10-02  3:02 Stephen Rothwell
2020-10-02  7:32 ` Geert Uytterhoeven
2020-10-01  3:52 Stephen Rothwell
2020-10-02  0:09 ` Mat Martineau
2020-10-01  3:49 Stephen Rothwell
2020-10-02  0:07 ` Mat Martineau
2020-09-30  3:25 Stephen Rothwell
2020-09-28  2:46 Stephen Rothwell
2020-09-28 12:37 ` Andrew Lunn
2020-09-17  2:47 Stephen Rothwell
2020-09-11  1:17 Stephen Rothwell
2020-09-11 10:18 ` Paul Barker
2020-08-28  0:39 Stephen Rothwell
2020-08-27  0:34 Stephen Rothwell
2020-07-24  2:28 Stephen Rothwell
2020-07-24  2:23 Stephen Rothwell
2020-07-24  9:56 ` Claudiu Manoil
2020-07-23  2:08 Stephen Rothwell
2020-07-21  1:55 Stephen Rothwell
2020-06-23  1:03 Stephen Rothwell
2020-05-12  3:30 Stephen Rothwell
2020-05-12 16:47 ` Jakub Kicinski
2020-05-13  1:51   ` luobin (L)
2020-05-01  2:48 Stephen Rothwell
2020-05-03  5:21 ` Leon Romanovsky
2020-05-01  2:41 Stephen Rothwell
2020-03-26  0:07 Stephen Rothwell
2020-03-25  0:40 Stephen Rothwell
2020-03-19  0:10 Stephen Rothwell
2020-03-19  3:36 ` Kiyanovski, Arthur
2020-03-11  1:33 Stephen Rothwell
2020-03-11  9:50 ` Vladimir Oltean
2020-03-19  4:59   ` Stephen Rothwell
2020-03-10  0:06 Stephen Rothwell
2020-02-27 23:29 Stephen Rothwell
2020-02-27 23:24 Stephen Rothwell
2020-02-28  9:07 ` Paolo Abeni
2020-02-20 23:12 Stephen Rothwell
2019-12-15 23:12 Stephen Rothwell
2019-12-15 23:14 ` Russell King - ARM Linux admin
2019-12-15 23:05 Stephen Rothwell
2019-12-17  6:55 ` Jubran, Samih
2019-11-21  0:48 Stephen Rothwell
2019-11-12 23:55 Stephen Rothwell
2019-10-27 23:59 Stephen Rothwell
2019-10-13 23:02 Stephen Rothwell
2019-09-12 16:25 Stephen Rothwell
2019-09-12 16:29 ` Jeff Kirsher
2019-09-12 16:19 Stephen Rothwell
2019-08-30  4:19 Stephen Rothwell
2019-08-26  2:27 Stephen Rothwell
2019-08-26  5:27 ` Heiner Kallweit
2019-08-12  2:21 Stephen Rothwell
2019-07-25  0:58 Stephen Rothwell
2019-07-04  2:07 Stephen Rothwell
2019-07-02  2:13 Stephen Rothwell
2019-07-09  0:27 ` Stephen Rothwell
2019-07-09  2:57   ` David Miller
2019-06-28  1:45 Stephen Rothwell
2019-06-27  3:26 Stephen Rothwell
2019-06-17  1:55 Stephen Rothwell
2019-06-17  1:50 Stephen Rothwell
2019-06-11  1:37 Stephen Rothwell
2019-06-11  1:28 Stephen Rothwell
2019-05-31  0:25 Stephen Rothwell
2019-05-29 23:56 Stephen Rothwell
2019-05-30  6:51 ` Maxim Uvarov
2019-05-02  2:57 Stephen Rothwell
2019-04-15  0:54 Stephen Rothwell
2019-03-31 22:11 Stephen Rothwell
2019-04-01 18:15 ` Saeed Mahameed
2019-02-19  0:30 Stephen Rothwell
2019-02-13  0:13 Stephen Rothwell
2019-02-13  0:33 ` Stephen Rothwell
2019-02-12  0:23 Stephen Rothwell
2019-02-08  0:24 Stephen Rothwell
2019-02-07  0:54 Stephen Rothwell
2019-02-07 18:36 ` Pablo Neira Ayuso
2019-01-17  1:27 Stephen Rothwell
2018-12-20  2:07 Stephen Rothwell
2018-12-20  6:54 ` Or Gerlitz
2018-12-20  2:00 Stephen Rothwell
2018-12-20  1:56 Stephen Rothwell
2018-12-20 10:38 ` Petr Machata
2018-12-17  0:31 Stephen Rothwell
2018-12-17 10:03 ` Ido Schimmel
2018-12-17 10:12   ` Eric Dumazet
2018-12-17  0:25 Stephen Rothwell
2018-12-17 21:20 ` Saeed Mahameed
2018-12-17 22:01   ` Or Gerlitz
2018-12-17 22:14     ` Stephen Rothwell
2018-12-17  0:13 Stephen Rothwell
2018-12-10  1:36 Stephen Rothwell
2018-12-10 11:38 ` Or Gerlitz
2018-12-10 18:38 ` Nambiar, Amritha
2018-12-10  1:31 Stephen Rothwell
2018-12-07  1:39 Stephen Rothwell
2018-12-05  0:33 Stephen Rothwell
2018-12-03  1:50 Stephen Rothwell
2018-10-18 23:56 Stephen Rothwell
2018-10-16 23:46 Stephen Rothwell
2018-10-11 23:53 Stephen Rothwell
2018-10-12  0:10 ` Stephen Rothwell
2018-10-11 23:45 Stephen Rothwell
2018-10-14  7:58 ` Kiyanovski, Arthur
2018-10-09  1:21 Stephen Rothwell
2018-10-09 10:02 ` Jamal Hadi Salim
2018-10-09 20:58   ` Stephen Rothwell
2018-10-03  2:18 Stephen Rothwell
2018-09-21  0:24 Stephen Rothwell
2018-09-18  0:11 Stephen Rothwell
2018-09-18  8:44 ` Daniel Borkmann
2018-09-18  9:10   ` Vakul Garg
2018-09-18  9:26     ` Daniel Borkmann
2018-09-18  9:32       ` Vakul Garg
2018-09-18  9:53         ` Daniel Borkmann
2018-09-18 10:15           ` Daniel Borkmann
2018-09-18 10:17             ` Vakul Garg
2018-09-18 11:48               ` Stephen Rothwell
2018-09-18 12:08                 ` Daniel Borkmann
2018-09-18 16:32           ` David Miller
2018-07-19  1:25 Stephen Rothwell
2018-07-17  2:33 Stephen Rothwell
2018-07-17  5:47 ` Stefano Brivio
2018-07-13  0:47 Stephen Rothwell
2018-07-09  1:03 Stephen Rothwell
2018-07-09  0:46 Stephen Rothwell
2018-07-09  0:28 Stephen Rothwell
2018-07-02  0:15 Stephen Rothwell
2018-05-24 14:35 Mark Brown
2018-05-10  2:13 Stephen Rothwell
2018-05-09  4:19 Stephen Rothwell
2018-05-09  8:24 ` Anders Roxell
2018-05-09 10:44   ` Stephen Rothwell
2018-05-09  4:12 Stephen Rothwell
2018-05-06 23:52 Stephen Rothwell
2018-05-02  1:52 Stephen Rothwell
2018-04-30  0:10 Stephen Rothwell
2018-03-15  1:55 Stephen Rothwell
2018-03-13  0:29 Stephen Rothwell
2018-03-13 10:41 ` Petr Machata
2018-03-13  0:04 Stephen Rothwell
2018-03-04 23:00 Stephen Rothwell
2018-03-01 23:09 Stephen Rothwell
2018-02-28 22:51 Stephen Rothwell
2018-02-27 22:56 Stephen Rothwell
2018-02-28  9:46 ` Petr Machata
2018-01-19  1:00 Stephen Rothwell
2018-01-18  1:09 Stephen Rothwell
2018-01-17  1:09 Stephen Rothwell
2018-01-15 23:36 Stephen Rothwell
2018-01-15 23:31 Stephen Rothwell
2018-01-14 23:52 Stephen Rothwell
2018-01-15  7:53 ` Eran Ben Elisha
2017-12-22  0:11 Stephen Rothwell
2017-12-20 22:59 Stephen Rothwell
2017-12-19  0:51 Stephen Rothwell
2017-12-12  1:07 Stephen Rothwell
2017-11-01  0:58 Stephen Rothwell
2017-11-01  4:17 ` Cong Wang
2017-10-19 13:05 Mark Brown
2017-10-19 13:08 ` Daniel Borkmann
2017-10-16  9:36 Mark Brown
2017-10-17 11:30 ` Sergei Shtylyov
2017-10-17 13:01   ` Mark Brown
2017-08-29  2:25 Stephen Rothwell
2017-08-23  1:31 Stephen Rothwell
2017-08-23  5:41 ` Ido Schimmel
2017-08-07  2:01 Stephen Rothwell
2017-08-07  2:21 ` Neal Cardwell
2017-08-07  4:59   ` Stephen Rothwell
2017-08-03  2:01 Stephen Rothwell
2017-08-03  2:42 ` Stephen Hemminger
2017-07-03  1:43 Stephen Rothwell
2017-07-03  7:59 ` Saeed Mahameed
2017-06-23  1:12 Stephen Rothwell
2017-06-21  1:47 Stephen Rothwell
2017-06-14  0:25 Stephen Rothwell
2017-06-14  0:20 Stephen Rothwell
2017-06-06  1:49 Stephen Rothwell
2017-06-01  1:30 Stephen Rothwell
2017-05-24 23:34 Stephen Rothwell
2017-04-18  0:18 Stephen Rothwell
2017-04-18  0:39 ` Daniel Borkmann
2017-04-07  0:12 Stephen Rothwell
2017-04-07 15:46 ` Cong Wang
2017-04-04  1:13 Stephen Rothwell
2017-04-04 14:48 ` Simon Horman
2017-04-03  2:07 Stephen Rothwell
2017-04-03 13:14 ` Daniel Borkmann
2017-03-23  0:00 Stephen Rothwell
2017-03-20  0:02 Stephen Rothwell
2017-01-31  1:23 Stephen Rothwell
2017-01-31  1:18 Stephen Rothwell
2017-01-24  0:38 Stephen Rothwell
2016-12-01  1:41 Stephen Rothwell
2016-12-01  7:56 ` Jiri Pirko
2016-12-01  1:36 Stephen Rothwell
2016-11-29  0:31 Stephen Rothwell
2016-11-29  6:32 ` Daniel Borkmann
2016-11-29  0:25 Stephen Rothwell
2016-11-29  0:22 Stephen Rothwell
2016-11-29  9:01 ` Borislav Petkov
2016-11-22  0:58 Stephen Rothwell
2016-11-16 23:51 Stephen Rothwell
2016-11-16 23:48 Stephen Rothwell
2016-11-16 23:46 Stephen Rothwell
2016-11-16 23:36 Stephen Rothwell
2016-11-09 23:50 Stephen Rothwell
2016-11-13 12:27 ` Or Gerlitz
2016-11-08  1:25 Stephen Rothwell
2016-11-08  6:34 ` Cong Wang
2016-10-23 23:34 Stephen Rothwell
2016-10-20 23:40 Stephen Rothwell
2016-10-20  0:01 Stephen Rothwell
2016-10-20  6:37 ` Ido Schimmel
2016-09-12  0:49 Stephen Rothwell
2016-09-07  3:16 Stephen Rothwell
2016-09-05  3:10 Stephen Rothwell
2016-08-22  1:51 Stephen Rothwell
2016-08-17  1:05 Stephen Rothwell
2016-08-15  0:35 Stephen Rothwell
2016-08-15  7:51 ` Daniel Borkmann
2016-07-21  1:41 Stephen Rothwell
2016-07-20  2:10 Stephen Rothwell
2016-07-20  2:05 Stephen Rothwell
2016-07-18  1:59 Stephen Rothwell
2016-07-18  1:52 Stephen Rothwell
2016-07-06  1:32 Stephen Rothwell
2016-07-04  3:07 Stephen Rothwell
2016-07-04 11:34 ` Saeed Mahameed
2016-07-04  3:02 Stephen Rothwell
2016-07-04 11:33 ` Saeed Mahameed
2016-06-27  1:46 Stephen Rothwell
2016-06-27  4:52 ` Eric Dumazet
2016-06-24  1:24 Stephen Rothwell
2016-06-20  1:28 Stephen Rothwell
2016-06-20  1:25 Stephen Rothwell
2016-06-20  1:20 Stephen Rothwell
2016-06-08  1:17 Stephen Rothwell
2016-05-11 23:56 Stephen Rothwell
2016-05-11  0:11 Stephen Rothwell
2016-05-09  0:43 Stephen Rothwell
2016-05-05  0:30 Stephen Rothwell
2016-04-27  2:01 Stephen Rothwell
2016-04-27  2:01 Stephen Rothwell
2016-04-27 13:13 ` Saeed Mahameed
2016-04-26  2:18 Stephen Rothwell
2016-04-18  1:31 Stephen Rothwell
2016-04-18  1:38 ` Eric Dumazet
2016-04-18  1:30 Stephen Rothwell
2016-04-21 23:54 ` Vivien Didelot
2016-03-08  0:37 Stephen Rothwell
2016-03-04  2:09 Stephen Rothwell
2016-03-04  2:17 ` Daniel Borkmann
2016-03-03  0:36 Stephen Rothwell
2016-03-03  0:28 Stephen Rothwell
2016-03-03  0:24 Stephen Rothwell
2016-02-26  0:13 Stephen Rothwell
2016-02-26  0:15 ` Daniel Borkmann
2016-02-18 22:50 Stephen Rothwell
2016-02-17  0:56 Stephen Rothwell
2016-02-11  0:59 Stephen Rothwell
2016-01-12  2:15 Stephen Rothwell
2016-01-12  9:11 ` Ido Schimmel
2016-01-12 11:58   ` Stephen Rothwell
2016-01-12 20:20     ` David Miller
2015-12-15  0:31 Stephen Rothwell
2015-11-26  0:01 Stephen Rothwell
2015-11-26  0:16 ` Daniel Borkmann
2015-11-24  0:18 Stephen Rothwell
2015-11-03  0:17 Stephen Rothwell
2015-10-15  1:06 Stephen Rothwell
2015-10-06  0:16 Stephen Rothwell
2015-10-06  0:11 Stephen Rothwell
2015-09-25  0:50 Stephen Rothwell
2015-08-18  2:35 Stephen Rothwell
2015-08-10  1:24 Stephen Rothwell
2015-07-31  0:35 Stephen Rothwell
2015-07-30  2:10 Stephen Rothwell
2015-07-30  8:06 ` Nikolay Aleksandrov
2015-07-28  1:26 Stephen Rothwell
2015-07-17  0:49 Stephen Rothwell
2015-06-22  2:58 Stephen Rothwell
2015-05-21  2:59 Stephen Rothwell
2015-05-21  3:29 ` Florian Fainelli
2015-05-18  3:39 Stephen Rothwell
2015-05-13  3:05 Stephen Rothwell
2015-05-12  1:49 Stephen Rothwell
2015-05-12  1:49 Stephen Rothwell
2015-05-12  1:49 Stephen Rothwell
2015-04-10  3:12 Stephen Rothwell
2015-04-07  3:21 Stephen Rothwell
2015-04-07 16:54 ` Cong Wang
2015-04-07  3:18 Stephen Rothwell
2015-04-07 11:42 ` Ido Shamay
2015-03-25  2:18 Stephen Rothwell
2015-03-23  3:08 Stephen Rothwell
2015-03-23 12:47 ` Pablo Neira Ayuso
2015-03-23 12:55   ` Joe Perches
2015-03-23 13:06     ` Pablo Neira Ayuso
2015-03-24  2:29   ` David Miller
2015-03-16  2:04 Stephen Rothwell
2015-03-10  1:08 Stephen Rothwell
2015-03-10  3:43 ` David Miller
2015-03-10 21:48   ` Stephen Rothwell
2015-03-10 22:34     ` David Miller
2015-03-02  0:31 Stephen Rothwell
2015-02-02  2:40 Stephen Rothwell
2015-02-02  2:33 Stephen Rothwell
2015-02-02  9:09 ` Nicolas Dichtel
2015-01-28  1:02 Stephen Rothwell
2015-01-28  8:39 ` Daniel Borkmann
2015-01-27  2:00 Stephen Rothwell
2015-01-15  2:47 Stephen Rothwell
2015-01-15  6:06 ` David Miller
2014-12-10  1:20 Stephen Rothwell
2014-12-10 19:49 ` David Miller
2014-12-10 21:38   ` Stephen Rothwell
2014-11-13  0:35 Stephen Rothwell
2014-11-13 21:14 ` David Miller
2014-10-29  0:14 Stephen Rothwell
2014-10-02  4:16 Stephen Rothwell
2014-10-02 18:27 ` David Miller
2014-09-30  2:54 Stephen Rothwell
2014-09-30  2:51 Stephen Rothwell
2014-09-22  1:52 Stephen Rothwell
2014-08-04  3:28 Stephen Rothwell
2014-06-06  3:54 Stephen Rothwell
2014-06-06  3:45 Stephen Rothwell
2014-06-03  2:31 Stephen Rothwell
2014-06-03  2:28 Stephen Rothwell
2014-05-23  3:46 Stephen Rothwell
2014-05-24  4:50 ` David Miller
2014-05-16  2:08 Stephen Rothwell
2014-05-05  2:10 Stephen Rothwell
2014-04-28  2:57 Stephen Rothwell
2014-04-28 18:19 ` Richard Guy Briggs
2014-04-28  2:53 Stephen Rothwell
2014-04-24  1:51 Stephen Rothwell
2014-04-24  1:47 Stephen Rothwell
2014-04-24  2:24 ` Jeff Kirsher
2014-04-24  2:45   ` David Miller
2014-03-31  2:34 Stephen Rothwell
2014-03-25  2:04 Stephen Rothwell
2014-03-25  4:31 ` David Miller
2014-03-25  1:58 Stephen Rothwell
2014-03-12 16:00 Mark Brown
2014-02-21  2:49 Stephen Rothwell
2014-02-18  1:52 Stephen Rothwell
2014-02-18  1:48 Stephen Rothwell
2014-01-17  1:09 Stephen Rothwell
2014-01-06  4:35 Stephen Rothwell
2014-01-06  4:35 Stephen Rothwell
2014-01-06  4:35 Stephen Rothwell
2013-12-12  0:15 Stephen Rothwell
2013-12-12  0:36 ` David Miller
2013-12-12  0:49   ` Stephen Rothwell
2013-12-12  0:58     ` David Miller
2013-12-12  1:01       ` David Miller
2013-10-31  4:19 Stephen Rothwell
2013-10-30  2:14 Stephen Rothwell
2013-10-28  4:23 Stephen Rothwell
2013-06-25  2:54 Stephen Rothwell
2013-06-21  2:33 Stephen Rothwell
2013-06-20  2:58 Stephen Rothwell
2013-06-20  3:37 ` David Miller
2013-04-30  2:24 Stephen Rothwell
2013-04-30  8:04 ` David Miller
2013-05-02  1:25 ` Chen Gang
2013-04-26  3:38 Stephen Rothwell
2013-04-26  3:27 Stephen Rothwell
2013-04-30  8:03 ` David Miller
2013-04-26  3:24 Stephen Rothwell
2013-04-28 13:49 ` Yuval Mintz
2013-04-28 23:57   ` Stephen Rothwell
2013-04-30  8:02 ` David Miller
2013-04-19  2:53 Stephen Rothwell
2013-04-23  0:38 ` David Miller
2013-02-12  0:57 Stephen Rothwell
2013-02-02  3:22 Stephen Rothwell
2013-02-02 10:05 ` Jiri Pirko
2013-02-04 23:21   ` Stephen Rothwell
2013-02-02  3:22 Stephen Rothwell
2013-01-11  2:03 Stephen Rothwell
2012-09-28  1:35 Stephen Rothwell
2012-09-25  2:34 Stephen Rothwell
2012-09-25  5:10 ` Eric Dumazet
2012-09-25  5:13   ` David Miller
2012-09-25  5:23     ` Eric Dumazet
2012-09-21  1:30 Stephen Rothwell
2012-09-21 18:58 ` David Miller
2012-09-14  1:18 Stephen Rothwell
2012-09-14  1:17 Stephen Rothwell
2012-06-26  3:15 Stephen Rothwell
2012-06-29  6:46 ` Sjur BRENDELAND
2012-06-25  3:38 Stephen Rothwell
2012-06-25 23:04 ` David Miller
2012-06-25  3:33 Stephen Rothwell
2012-06-25 23:04 ` David Miller
2012-04-27  2:02 Stephen Rothwell
2012-03-05  2:11 Stephen Rothwell
2012-03-06  2:17 ` David Miller
2012-03-01  2:33 Stephen Rothwell
2012-03-01 22:24 ` David Miller
2012-02-16  1:38 Stephen Rothwell
2012-02-16 11:24 ` Yuval Mintz
2012-02-16 13:47   ` Yuval Mintz
2012-02-16 23:30   ` Stephen Rothwell
2012-02-19 22:41     ` David Miller
2011-12-16  1:07 Stephen Rothwell
2011-12-16  7:34 ` David Miller
2011-12-14  2:25 Stephen Rothwell
2011-12-14 18:36 ` David Miller
2011-11-23  0:17 Stephen Rothwell
2011-11-23  0:23 ` 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=20130627134956.7f7854bef31558c2a4bfb037@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=cphealy@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=netdev@vger.kernel.org \
    --subject='Re: linux-next: manual merge of the net-next tree with the net tree' \
    /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

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