* Re: [PATCH] pinctrl: fix build when CONFIG_OF && !CONFIG_PINCTRL
From: Dong Aisheng @ 2012-04-05 6:41 UTC (permalink / raw)
To: Stephen Warren
Cc: linus.walleij, sfr, linux-kernel, linux-next, Stephen Warren
In-Reply-To: <1333511636-9987-1-git-send-email-swarren@wwwdotorg.org>
On Tue, Apr 03, 2012 at 09:53:56PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> pinctrl/devicetree.c won't compile when !CONFIG_PINCTRL, since the
> pinctrl headers don't declare some types when !PINCTRL. Make sure
> pinctrl/Makefile only attempts to compile devicetree.c when OF &&
> PINCTRL.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Regards
Dong Aisheng
> drivers/pinctrl/Makefile | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
> index 049c9fb..8e3c95a 100644
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@ -5,7 +5,9 @@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG
> obj-$(CONFIG_PINCTRL) += core.o
> obj-$(CONFIG_PINMUX) += pinmux.o
> obj-$(CONFIG_PINCONF) += pinconf.o
> -obj-$(CONFIG_OF) += devicetree.o
> +ifeq ($(CONFIG_OF),y)
> +obj-$(CONFIG_PINCTRL) += devicetree.o
> +endif
> obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o
> obj-$(CONFIG_PINCTRL_PXA3xx) += pinctrl-pxa3xx.o
> obj-$(CONFIG_PINCTRL_MMP2) += pinctrl-mmp2.o
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply
* Re: linux-next: build warning after merge of the sound-asoc tree
From: MR Swami Reddy @ 2012-04-05 14:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Girdwood, Liam, linux-next@vger.kernel.org,
Reddy, MR Swami
In-Reply-To: <20120405110339.4f83ac849d3bce2893c2ccf8@canb.auug.org.au>
Hi,
I tried to reproduce the below mentioned warning messages using:
- Latest for-next git repo sources on x86_64 build machine
- gcc version 4.3.2
- -Woverflow option used in KBUILD_CFLAGS
But couldn't see the warning messages.
Below is the quick patch to remove the warning messages (and this patch
will be submitted to alsa-devel mailing list soon).
Signed-off-by: M R Swami Reddy <mr.swami.reddy@ti.com>
---
sound/soc/codecs/lm49453.c | 13 +-
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index 744063d..74409ec 100644
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -1178,27 +1178,24 @@ static int lm49453_set_dai_fmt(struct
snd_soc_dai *codec_dai, unsigned int fmt)
{
struct snd_soc_codec *codec = codec_dai->codec;
- int aif_val = 0;
+ u16 aif_val;
int mode = 0;
int clk_phase = 0;
int clk_shift = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS:
- aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ aif_val = 0;
break;
case SND_SOC_DAIFMT_CBS_CFM:
- aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ aif_val = LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
break;
case SND_SOC_DAIFMT_CBM_CFS:
- aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS;
break;
case SND_SOC_DAIFMT_CBM_CFM:
aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
break;
default:
return -EINVAL;
On Thursday 05 April 2012 06:33 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the sound-asoc tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
>
> sound/soc/codecs/lm49453.c: In function 'lm49453_set_dai_fmt':
> sound/soc/codecs/lm49453.c:1189:4: warning: overflow in implicit constant conversion [-Woverflow]
> sound/soc/codecs/lm49453.c:1193:4: warning: overflow in implicit constant conversion [-Woverflow]
> sound/soc/codecs/lm49453.c:1197:4: warning: overflow in implicit constant conversion [-Woverflow]
>
> Introduced by commit dbf7a733f5fb (ASoC: Support TI LM49453 Audio driver"").
^ permalink raw reply related
* Re: [PATCH] ARM: S3C24XX: fix missing common.h in mach-s3c24xx/
From: Kukjin Kim @ 2012-04-05 15:10 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Kukjin Kim, linux-arm-kernel, linux-samsung-soc, linux-next
In-Reply-To: <CAP=VYLp-FwEu2AY9wWY7vygmjtZ30AMD=0h8+VtuNVZF2xtTYw@mail.gmail.com>
On 04/03/12 15:33, Paul Gortmaker wrote:
> Hi,
>
> On Wed, Mar 28, 2012 at 8:14 PM, Kukjin Kim<kgene.kim@samsung.com> wrote:
>> This patch fixes missing mach-s3c24xx/common.h which has been
>> lost when regarding s3c24xx directories merged.
>
> Just checking that the updated version of this patch is headed
> in for 3.4 -- we are still seeing the failure in linux-next builds
> and it would be nice to close out the build regressions in there
> as quickly as possible, since they tend to mask other regressions
> from being seen.
>
Hi Paul,
Yeah right and I updated it in my -next.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* Re: [PATCH 07/11] sh: fix several build failures from system.h fallout
From: Paul Mundt @ 2012-04-05 15:15 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Stephen Rothwell, dhowells, torvalds, linux-kernel, linux-next
In-Reply-To: <CAP=VYLpxEvcQv=AOZCU46PQrVn04MC7_Jhodba9z-mmj9XamSw@mail.gmail.com>
On Wed, Apr 04, 2012 at 10:49:30PM -0400, Paul Gortmaker wrote:
> [sorry for empty mail, pilot error]
>
> On Mon, Apr 2, 2012 at 7:57 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> >
> > I used to have sh-current and sh trees (and rmobile-current and rmobile)
> > trees in linux-next, but they have not been resurrected since the
> > kernel.org problems last year ...
> >
> > They were all branches of
> > git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git which is
> > still listed in MAINTAINERS but does not exist :-(
> >
> > Paul M, to you have an alternate place I can fetch from?
>
> Hi Paul M.
>
> Is this the tree Stephen should be using in linux-next?
>
> git://github.com/pmundt/linux-sh.git sh-latest
>
Yes, that's the current one for sh stuff for now. The rmobile stuff is
going through the ARM SoC tree nowadays, so that shouldn't matter. I
haven't bothered getting the trees back on kernel.org yet, so I haven't
updated the MAINTAINERS entry, but will probably do so in the future.
^ permalink raw reply
* Re: [PATCH 2/6] regmap: allow regmap instances to be named
From: Paul Gortmaker @ 2012-04-06 3:44 UTC (permalink / raw)
To: Stephen Warren; +Cc: Mark Brown, linux-kernel, Stephen Warren, linux-next
In-Reply-To: <1333576113-13196-2-git-send-email-swarren@wwwdotorg.org>
On Wed, Apr 4, 2012 at 5:48 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Some devices have multiple separate register regions. Logically, one
> regmap would be created per region. One issue that prevents this is that
> each instance will attempt to create the same debugfs files. Avoid this
> by allowing regmaps to be named, and use the name to construct the
> debugfs directory name.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> drivers/base/regmap/internal.h | 3 ++-
> drivers/base/regmap/regmap-debugfs.c | 14 +++++++++++---
> drivers/base/regmap/regmap.c | 4 ++--
> include/linux/regmap.h | 5 +++++
> 4 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
> index 6ee4dc5..d9ea8f5 100644
> --- a/drivers/base/regmap/internal.h
> +++ b/drivers/base/regmap/internal.h
> @@ -47,6 +47,7 @@ struct regmap {
>
> #ifdef CONFIG_DEBUG_FS
> struct dentry *debugfs;
> + const char *debugfs_name;
> #endif
>
> unsigned int max_register;
> @@ -110,7 +111,7 @@ int _regmap_write(struct regmap *map, unsigned int reg,
>
> #ifdef CONFIG_DEBUG_FS
> extern void regmap_debugfs_initcall(void);
> -extern void regmap_debugfs_init(struct regmap *map);
> +extern void regmap_debugfs_init(struct regmap *map, const char *name);
Hi Stephen,
Can you take a look at these linux-next fails?
drivers/base/regmap/regmap.c:349:2: error: too many arguments to
function 'regmap_debugfs_init'
drivers/base/regmap/regmap.c:434:2: error: too many arguments to
function 'regmap_debugfs_init'
make[4]: *** [drivers/base/regmap/regmap.o] Error 1
I'm assuming it is somehow related to the above commit (or family
of commits) -- since it complains about arg #s and you are changing
the arg #. (I didn't bisect to 100% confirm this.)
http://kisskb.ellerman.id.au/kisskb/buildresult/6039717/
http://kisskb.ellerman.id.au/kisskb/buildresult/6040074/
http://kisskb.ellerman.id.au/kisskb/buildresult/6040070/
Thanks,
Paul.
> extern void regmap_debugfs_exit(struct regmap *map);
> #else
> static inline void regmap_debugfs_initcall(void) { }
> diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
> index 251eb70..df97c93 100644
> --- a/drivers/base/regmap/regmap-debugfs.c
> +++ b/drivers/base/regmap/regmap-debugfs.c
> @@ -242,10 +242,17 @@ static const struct file_operations regmap_access_fops = {
> .llseek = default_llseek,
> };
>
> -void regmap_debugfs_init(struct regmap *map)
> +void regmap_debugfs_init(struct regmap *map, const char *name)
> {
> - map->debugfs = debugfs_create_dir(dev_name(map->dev),
> - regmap_debugfs_root);
> + if (name) {
> + map->debugfs_name = kasprintf(GFP_KERNEL, "%s-%s",
> + dev_name(map->dev), name);
> + name = map->debugfs_name;
> + } else {
> + name = dev_name(map->dev);
> + }
> +
> + map->debugfs = debugfs_create_dir(name, regmap_debugfs_root);
> if (!map->debugfs) {
> dev_warn(map->dev, "Failed to create debugfs directory\n");
> return;
> @@ -274,6 +281,7 @@ void regmap_debugfs_init(struct regmap *map)
> void regmap_debugfs_exit(struct regmap *map)
> {
> debugfs_remove_recursive(map->debugfs);
> + kfree(map->debugfs_name);
> }
>
> void regmap_debugfs_initcall(void)
> diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
> index 831ec42..339b2c8 100644
> --- a/drivers/base/regmap/regmap.c
> +++ b/drivers/base/regmap/regmap.c
> @@ -343,7 +343,7 @@ struct regmap *regmap_init(struct device *dev,
> goto err_map;
> }
>
> - regmap_debugfs_init(map);
> + regmap_debugfs_init(map, config->name);
>
> ret = regcache_init(map, config);
> if (ret < 0)
> @@ -426,7 +426,7 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
> map->precious_reg = config->precious_reg;
> map->cache_type = config->cache_type;
>
> - regmap_debugfs_init(map);
> + regmap_debugfs_init(map, config->name);
>
> map->cache_bypass = false;
> map->cache_only = false;
> diff --git a/include/linux/regmap.h b/include/linux/regmap.h
> index 48e9b86..2fd41e3 100644
> --- a/include/linux/regmap.h
> +++ b/include/linux/regmap.h
> @@ -46,6 +46,9 @@ struct reg_default {
> /**
> * Configuration for the register map of a device.
> *
> + * @name: Optional name of the regmap. Useful when a device has multiple
> + * register regions.
> + *
> * @reg_bits: Number of bits in a register address, mandatory.
> * @pad_bits: Number of bits of padding between register and value.
> * @val_bits: Number of bits in a register value, mandatory.
> @@ -77,6 +80,8 @@ struct reg_default {
> * @num_reg_defaults_raw: Number of elements in reg_defaults_raw.
> */
> struct regmap_config {
> + const char *name;
> +
> int reg_bits;
> int pad_bits;
> int val_bits;
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply
* Re: [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method.
From: Paul Gortmaker @ 2012-04-06 4:08 UTC (permalink / raw)
To: Richard Cochran
Cc: netdev, David Miller, Ben Hutchings, Martin Porter, Jacob Keller,
Jeff Kirsher, John Ronciak, e1000-devel, linux-next
In-Reply-To: <88e5b2cfcabda03826bb576b21e2e1d990f07117.1333529506.git.richardcochran@gmail.com>
On Wed, Apr 4, 2012 at 4:59 AM, Richard Cochran
<richardcochran@gmail.com> wrote:
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
> ---
> drivers/net/ethernet/adi/bfin_mac.c | 20 ++++++++++++++++++++
> 1 files changed, 20 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
> index ab4daec..db22278 100644
> --- a/drivers/net/ethernet/adi/bfin_mac.c
> +++ b/drivers/net/ethernet/adi/bfin_mac.c
> @@ -548,6 +548,25 @@ static int bfin_mac_ethtool_setwol(struct net_device *dev,
> return 0;
> }
>
> +static int bfin_mac_ethtool_get_ts_info(struct net_device *dev,
> + struct ethtool_ts_info *info);
-----------------------------------> ^^^^^^^
Trailing semicolon. Compile fail in linux-next due to a85bbddd.
http://kisskb.ellerman.id.au/kisskb/buildresult/6040086/
http://kisskb.ellerman.id.au/kisskb/buildresult/6040080/
http://kisskb.ellerman.id.au/kisskb/buildresult/6040087/
Thanks.
Paul.
> +{
> + info->so_timestamping =
> + SOF_TIMESTAMPING_TX_HARDWARE |
> + SOF_TIMESTAMPING_RX_HARDWARE |
> + SOF_TIMESTAMPING_SYS_HARDWARE;
> + info->phc_index = -1;
> + info->tx_types =
> + (1 << HWTSTAMP_TX_OFF) |
> + (1 << HWTSTAMP_TX_ON);
> + info->rx_filters =
> + (1 << HWTSTAMP_FILTER_NONE) |
> + (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
> + (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
> + (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT);
> + return 0;
> +}
> +
> static const struct ethtool_ops bfin_mac_ethtool_ops = {
> .get_settings = bfin_mac_ethtool_getsettings,
> .set_settings = bfin_mac_ethtool_setsettings,
> @@ -555,6 +574,7 @@ static const struct ethtool_ops bfin_mac_ethtool_ops = {
> .get_drvinfo = bfin_mac_ethtool_getdrvinfo,
> .get_wol = bfin_mac_ethtool_getwol,
> .set_wol = bfin_mac_ethtool_setwol,
> + .get_ts_info = bfin_mac_ethtool_get_ts_info,
> };
>
> /**************************************************************************/
> --
> 1.7.2.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method.
From: David Miller @ 2012-04-06 4:18 UTC (permalink / raw)
To: paul.gortmaker
Cc: mporter, e1000-devel, netdev, jacob.e.keller, john.ronciak,
bhutchings, linux-next
In-Reply-To: <CAP=VYLq1kCqLxi31HcGavKk8e3ydX43Xz-7rwayLJPWAnfk28Q@mail.gmail.com>
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Fri, 6 Apr 2012 00:08:52 -0400
> On Wed, Apr 4, 2012 at 4:59 AM, Richard Cochran
> <richardcochran@gmail.com> wrote:
>> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
>> ---
>> drivers/net/ethernet/adi/bfin_mac.c | 20 ++++++++++++++++++++
>> 1 files changed, 20 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
>> index ab4daec..db22278 100644
>> --- a/drivers/net/ethernet/adi/bfin_mac.c
>> +++ b/drivers/net/ethernet/adi/bfin_mac.c
>> @@ -548,6 +548,25 @@ static int bfin_mac_ethtool_setwol(struct net_device *dev,
>> return 0;
>> }
>>
>> +static int bfin_mac_ethtool_get_ts_info(struct net_device *dev,
>> + struct ethtool_ts_info *info);
>
> -----------------------------------> ^^^^^^^
>
> Trailing semicolon. Compile fail in linux-next due to a85bbddd.
I just pushed out the obvious fix for this.
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: [PATCH V4 net-next 04/26] gianfar: Support the get_ts_info ethtool method.
From: Paul Gortmaker @ 2012-04-06 4:25 UTC (permalink / raw)
To: Richard Cochran
Cc: netdev, David Miller, Ben Hutchings, Martin Porter, Jacob Keller,
Jeff Kirsher, John Ronciak, e1000-devel, linux-next
In-Reply-To: <c268d71203b066b9052a8cabd5f6c71de2a8fa77.1333529506.git.richardcochran@gmail.com>
On Wed, Apr 4, 2012 at 4:59 AM, Richard Cochran
<richardcochran@gmail.com> wrote:
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
> ---
> drivers/net/ethernet/freescale/gianfar.h | 3 ++
> drivers/net/ethernet/freescale/gianfar_ethtool.c | 29 ++++++++++++++++++++++
> drivers/net/ethernet/freescale/gianfar_ptp.c | 2 +
> 3 files changed, 34 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
> index 4c9f8d4..2136c7f 100644
> --- a/drivers/net/ethernet/freescale/gianfar.h
> +++ b/drivers/net/ethernet/freescale/gianfar.h
> @@ -1210,4 +1210,7 @@ struct filer_table {
> struct gfar_filer_entry fe[MAX_FILER_CACHE_IDX + 20];
> };
>
> +/* The gianfar_ptp module will set this variable */
> +extern int gfar_phc_index;
> +
> #endif /* __GIANFAR_H */
> diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
> index 8d74efd..27f49c7 100644
> --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
> +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
> @@ -1739,6 +1739,34 @@ static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
> return ret;
> }
>
> +int gfar_phc_index = -1;
> +
> +static int gfar_get_ts_info(struct net_device *dev,
> + struct ethtool_ts_info *info)
> +{
> + struct gfar_private *priv = netdev_priv(dev);
> +
> + if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)) {
> + info->so_timestamping =
> + SOF_TIMESTAMPING_RX_SOFTWARE |
> + SOF_TIMESTAMPING_SOFTWARE;
Commit 66636287 in linux-next appears to cause this:
drivers/net/ethernet/freescale/gianfar_ethtool.c:1751:4: error:
'SOF_TIMESTAMPING_RX_SOFTWARE' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1752:4: error:
'SOF_TIMESTAMPING_SOFTWARE' undeclared (first use in this function)
Needs an include of <linux/net_tstamp.h> ?
http://kisskb.ellerman.id.au/kisskb/buildresult/6039723/
http://kisskb.ellerman.id.au/kisskb/buildresult/6039704/
http://kisskb.ellerman.id.au/kisskb/buildresult/6040028/
I'd normally just provide a tested and signed off patch, but I'm kind of
limited to just browsing the build results at this particular moment. Sorry
about that.
Paul.
> + info->phc_index = -1;
> + return 0;
> + }
> + info->so_timestamping =
> + SOF_TIMESTAMPING_TX_HARDWARE |
> + SOF_TIMESTAMPING_RX_HARDWARE |
> + SOF_TIMESTAMPING_RAW_HARDWARE;
> + info->phc_index = gfar_phc_index;
> + info->tx_types =
> + (1 << HWTSTAMP_TX_OFF) |
> + (1 << HWTSTAMP_TX_ON);
> + info->rx_filters =
> + (1 << HWTSTAMP_FILTER_NONE) |
> + (1 << HWTSTAMP_FILTER_ALL);
> + return 0;
> +}
> +
> const struct ethtool_ops gfar_ethtool_ops = {
> .get_settings = gfar_gsettings,
> .set_settings = gfar_ssettings,
> @@ -1761,4 +1789,5 @@ const struct ethtool_ops gfar_ethtool_ops = {
> #endif
> .set_rxnfc = gfar_set_nfc,
> .get_rxnfc = gfar_get_nfc,
> + .get_ts_info = gfar_get_ts_info,
> };
> diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
> index 5fd620b..c08e5d4 100644
> --- a/drivers/net/ethernet/freescale/gianfar_ptp.c
> +++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
> @@ -515,6 +515,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
> err = PTR_ERR(etsects->clock);
> goto no_clock;
> }
> + gfar_phc_clock = ptp_clock_index(etsects->clock);
>
> dev_set_drvdata(&dev->dev, etsects);
>
> @@ -538,6 +539,7 @@ static int gianfar_ptp_remove(struct platform_device *dev)
> gfar_write(&etsects->regs->tmr_temask, 0);
> gfar_write(&etsects->regs->tmr_ctrl, 0);
>
> + gfar_phc_clock = -1;
> ptp_clock_unregister(etsects->clock);
> iounmap(etsects->regs);
> release_resource(etsects->rsrc);
> --
> 1.7.2.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH V4 net-next 04/26] gianfar: Support the get_ts_info ethtool method.
From: David Miller @ 2012-04-06 4:35 UTC (permalink / raw)
To: paul.gortmaker
Cc: mporter, e1000-devel, netdev, jacob.e.keller, john.ronciak,
bhutchings, linux-next
In-Reply-To: <CAP=VYLrNBjHgPJFzwBrQ4=5rouCD81PLW4f_TPZMkF7yObUdcA@mail.gmail.com>
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Fri, 6 Apr 2012 00:25:32 -0400
> Needs an include of <linux/net_tstamp.h> ?
I've pushed out that fix.
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: [PATCH V1] regulator: Add support for RICOH PMIC RC5T583 regulator
From: Paul Gortmaker @ 2012-04-06 4:37 UTC (permalink / raw)
To: Mark Brown; +Cc: Laxman Dewangan, lrg, sameo, linux-kernel, linux-next
In-Reply-To: <20120404104948.GA9693@opensource.wolfsonmicro.com>
On Wed, Apr 4, 2012 at 6:49 AM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Wed, Apr 04, 2012 at 12:44:00PM +0530, Laxman Dewangan wrote:
>> The RC5T583 PMIC from RICOH consists of 4 DCDC and 10
>> LDOs. This driver supports the control of different
>> regulator output through regulator interface.
>> This driver depends on MFD driver of RC5T583 and uses
>> mfd rc5t583 apis to communicate to device for accessing
>> different device's registers.
>
> Applied, thanks.
Hi Mark,
It appears this breaks linux-next allmodconfig build, because it
uses an uppercase V in the v2 of its MODULE_LICENSE.
FATAL: modpost: GPL-incompatible module rc5t583-regulator.ko uses
GPL-only symbol 'platform_driver_unregister'
make[2]: *** [__modpost] Error 1
The build is here:
http://kisskb.ellerman.id.au/kisskb/buildresult/6039758/
Thanks,
Paul.
^ permalink raw reply
* [PATCH] regmap: fix compilation when !CONFIG_DEBUG_FS
From: Stephen Warren @ 2012-04-06 5:09 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, paul.gortmaker, linux-next, Stephen Warren
From: Stephen Warren <swarren@nvidia.com>
Commit 79c64d5 "regmap: allow regmap instances to be named" changed the
prototype of regmap_debugfs_init, but didn't update the dummy inline used
when !CONFIG_DEBUGFS. Fix this.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
drivers/base/regmap/internal.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 9bc1d27..99b28ff 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -116,7 +116,7 @@ extern void regmap_debugfs_init(struct regmap *map, const char *name);
extern void regmap_debugfs_exit(struct regmap *map);
#else
static inline void regmap_debugfs_initcall(void) { }
-static inline void regmap_debugfs_init(struct regmap *map) { }
+static inline void regmap_debugfs_init(struct regmap *map, const char *name) { }
static inline void regmap_debugfs_exit(struct regmap *map) { }
#endif
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH 2/6] regmap: allow regmap instances to be named
From: Stephen Warren @ 2012-04-06 5:12 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: Mark Brown, linux-kernel, linux-next
In-Reply-To: <CAP=VYLpfssjmREbEcGMQ8P4N7wpKgv=vC++ho+UugtOsx5SxOQ@mail.gmail.com>
On 04/05/2012 09:44 PM, Paul Gortmaker wrote:
> On Wed, Apr 4, 2012 at 5:48 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> Some devices have multiple separate register regions. Logically, one
>> regmap would be created per region. One issue that prevents this is that
>> each instance will attempt to create the same debugfs files. Avoid this
>> by allowing regmaps to be named, and use the name to construct the
>> debugfs directory name.
...
> Hi Stephen,
>
> Can you take a look at these linux-next fails?
>
> drivers/base/regmap/regmap.c:349:2: error: too many arguments to
> function 'regmap_debugfs_init'
> drivers/base/regmap/regmap.c:434:2: error: too many arguments to
> function 'regmap_debugfs_init'
> make[4]: *** [drivers/base/regmap/regmap.o] Error 1
Oops. Sorry about that; evidently tegra_defconfig has CONFIG_DEBUG_FS
enabled and I didn't realize it. Fix posted.
^ permalink raw reply
* Re: [PATCH V1] regulator: Add support for RICOH PMIC RC5T583 regulator
From: Laxman Dewangan @ 2012-04-06 5:36 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Mark Brown, lrg@ti.com, sameo@linux.intel.com,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
In-Reply-To: <CAP=VYLq_X7NJb=j_GNTHwrCyW1pbZJ4duknKCXEyeAezSkH4gA@mail.gmail.com>
On Friday 06 April 2012 10:07 AM, Paul Gortmaker wrote:
>
> It appears this breaks linux-next allmodconfig build, because it
> uses an uppercase V in the v2 of its MODULE_LICENSE.
>
> FATAL: modpost: GPL-incompatible module rc5t583-regulator.ko uses
> GPL-only symbol 'platform_driver_unregister'
> make[2]: *** [__modpost] Error 1
> .
Oops, my bad, I did not realize it. I send the patch for fixing this
license issue.
Is it possible to catch such issue through check-patch?
^ permalink raw reply
* Re: [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h
From: Jonas Bonn @ 2012-04-06 6:28 UTC (permalink / raw)
To: Paul Gortmaker
Cc: dhowells, torvalds, linux-kernel, linux-next, Arnd Bergmann
In-Reply-To: <1333312727-11428-12-git-send-email-paul.gortmaker@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]
Thanks, applied.
Will send this upstream via the openrisc tree.
/Jonas
On Sun, 2012-04-01 at 16:38 -0400, Paul Gortmaker wrote:
> Builds of the openrisc or1ksim_defconfig show the following:
>
> In file included from arch/openrisc/include/generated/asm/cmpxchg.h:1:0,
> from include/asm-generic/atomic.h:18,
> from arch/openrisc/include/generated/asm/atomic.h:1,
> from include/linux/atomic.h:4,
> from include/linux/dcache.h:4,
> from fs/notify/fsnotify.c:19:
> include/asm-generic/cmpxchg.h: In function '__xchg':
> include/asm-generic/cmpxchg.h:34:20: error: expected ')' before 'u8'
> include/asm-generic/cmpxchg.h:34:20: warning: type defaults to 'int' in type name
>
> and many more lines of similar errors. It seems specific to the or32
> because most other platforms have an arch specific component that would
> have already included types.h ahead of time, but the o32 does not.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jonas Bonn <jonas@southpole.se>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> include/asm-generic/cmpxchg.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h
> index 8a36183..1488302 100644
> --- a/include/asm-generic/cmpxchg.h
> +++ b/include/asm-generic/cmpxchg.h
> @@ -10,6 +10,7 @@
> #error "Cannot use generic cmpxchg on SMP"
> #endif
>
> +#include <linux/types.h>
> #include <linux/irqflags.h>
>
> #ifndef xchg
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: sh tree (Was:Re: [PATCH 07/11] sh: fix several build failures from system.h fallout)
From: Stephen Rothwell @ 2012-04-06 6:40 UTC (permalink / raw)
To: Paul Mundt; +Cc: Paul Gortmaker, linux-kernel, linux-next
In-Reply-To: <20120405151558.GD23761@linux-sh.org>
[-- Attachment #1: Type: text/plain, Size: 836 bytes --]
Hi Paul,
On Fri, 6 Apr 2012 00:15:59 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
>
> On Wed, Apr 04, 2012 at 10:49:30PM -0400, Paul Gortmaker wrote:
> >
> > Is this the tree Stephen should be using in linux-next?
> >
> > git://github.com/pmundt/linux-sh.git sh-latest
>
> Yes, that's the current one for sh stuff for now. The rmobile stuff is
> going through the ARM SoC tree nowadays, so that shouldn't matter. I
> haven't bothered getting the trees back on kernel.org yet, so I haven't
> updated the MAINTAINERS entry, but will probably do so in the future.
OK, I have added that back - using the sh-latest branch for the sh tree
and the sh-fixes-for-linus branch for sh-current (maybe the sh/urgent
branch would be better?).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method.
From: Richard Cochran @ 2012-04-06 7:04 UTC (permalink / raw)
To: David Miller
Cc: paul.gortmaker, netdev, bhutchings, mporter, jacob.e.keller,
jeffrey.t.kirsher, john.ronciak, e1000-devel, linux-next
In-Reply-To: <20120406.001805.562264431747635985.davem@davemloft.net>
On Fri, Apr 06, 2012 at 12:18:05AM -0400, David Miller wrote:
> > Trailing semicolon. Compile fail in linux-next due to a85bbddd.
>
> I just pushed out the obvious fix for this.
Paul, thanks for compile testing, and David, thanks for fixing these.
Next time I promise to do at least the compile testing for the various
different architectures.
Richard
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: Giuseppe CAVALLARO @ 2012-04-06 7:09 UTC (permalink / raw)
To: David Miller
Cc: sfr, netdev, linux-next, linux-kernel, deepak.sikri,
shiraz.hashim, vikas.manocha
In-Reply-To: <20120404.235933.350585244341009071.davem@davemloft.net>
On 4/5/2012 5:59 AM, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 5 Apr 2012 13:25:15 +1000
>
>> After merging the final tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: In function 'stmmac_probe_config_dt':
>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:53:7: error: 'struct plat_stmmacenet_data' has no member named 'pbl'
>>
>> Caused by commit 8327eb65e795 ("stmmac: re-work the internal GMAC DMA
>> platf parameters"). Clearly I am missing something, because I can't see
>> how that patch is correct since nothing ever assigns to the new dma_cfg
>> pointer but it is dereferenced.
>>
>> I have added this patch to make it build today, but it is obviously not
>> correct.
>
> Sorry Stephen.
>
> Giuseppe don't submit patches to me that don't even compile.
>
> Please submit a proper fix to me for this _now_.
Sorry Dave!
I don't know what happened (I believed to test all).
I'm sending you the patches soon!!!
Peppe
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: Giuseppe CAVALLARO @ 2012-04-06 7:30 UTC (permalink / raw)
To: Giuseppe CAVALLARO
Cc: David Miller, sfr, netdev, linux-next, linux-kernel, deepak.sikri,
shiraz.hashim, vikas.manocha
In-Reply-To: <4F7E96B9.9060907@st.com>
On 4/6/2012 9:09 AM, Giuseppe CAVALLARO wrote:
> On 4/5/2012 5:59 AM, David Miller wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Thu, 5 Apr 2012 13:25:15 +1000
>>
>>> After merging the final tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: In function 'stmmac_probe_config_dt':
>>> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:53:7: error: 'struct plat_stmmacenet_data' has no member named 'pbl'
>>>
>>> Caused by commit 8327eb65e795 ("stmmac: re-work the internal GMAC DMA
>>> platf parameters"). Clearly I am missing something, because I can't see
>>> how that patch is correct since nothing ever assigns to the new dma_cfg
>>> pointer but it is dereferenced.
>>>
>>> I have added this patch to make it build today, but it is obviously not
>>> correct.
>>
>> Sorry Stephen.
>>
>> Giuseppe don't submit patches to me that don't even compile.
>>
>> Please submit a proper fix to me for this _now_.
>
> Sorry Dave!
> I don't know what happened (I believed to test all).
> I'm sending you the patches soon!!!
Please Stephen,
can you test it on your kernel. I didn't build when CONFIG_OF is enable.
I tested on ARM/SH/x86 but never with CONFIG_OF on.
The problem was due to the hard-coded values adding with devicetree support.
Sorry for this problem, next time I'll build also on OF.
I had also done a grep in all the arch to verify the ARCH that used the
pbl/fixed_burst/burst_len fields :-(. These have been moved in a
separate structure.
Let me know if the patch is ok.
Peppe
>
> Peppe
>
>> --
>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH] regmap: fix compilation when !CONFIG_DEBUG_FS
From: Mark Brown @ 2012-04-06 9:18 UTC (permalink / raw)
To: Stephen Warren; +Cc: linux-kernel, paul.gortmaker, linux-next, Stephen Warren
In-Reply-To: <1333688960-24402-1-git-send-email-swarren@wwwdotorg.org>
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
On Thu, Apr 05, 2012 at 11:09:20PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Commit 79c64d5 "regmap: allow regmap instances to be named" changed the
> prototype of regmap_debugfs_init, but didn't update the dummy inline used
> when !CONFIG_DEBUGFS. Fix this.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH v2] avr32: fix nop compile fails from system.h split up
From: Hans-Christian Egtvedt @ 2012-04-07 10:10 UTC (permalink / raw)
To: Paul Gortmaker
Cc: dhowells, torvalds, linux-kernel, linux-next, Haavard Skinnemoen
In-Reply-To: <1333494844-3802-1-git-send-email-paul.gortmaker@windriver.com>
Around Tue 03 Apr 2012 19:14:04 -0400 or thereabout, Paul Gortmaker wrote:
> To fix:
>
> In file included from kernel/exit.c:61:
> arch/avr32/include/asm/mmu_context.h: In function 'enable_mmu':
> arch/avr32/include/asm/mmu_context.h:135: error: implicit
> declaration of function 'nop'
>
> It needs an include of the new file created in:
>
> commit ae473946586680b01c13975a3b674de23ad7c93e
>
> "Disintegrate asm/system.h for AVR32"
>
> But since that file only contains "nop", and since other
> arch already have precedent of putting nop in asm/barrier.h
> we should just delete the new file and put nop in barrier.h
Sounds fine by me, thanks for the fix.
> Suggested-by: David Howells <dhowells@redhat.com>
> Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
<snipp diff>
--
mvh
Hans-Christian Egtvedt
^ permalink raw reply
* Re: [PATCH] android: make persistent_ram based drivers depend on HAVE_MEMBLOCK
From: Geert Uytterhoeven @ 2012-04-08 8:43 UTC (permalink / raw)
To: Colin Cross
Cc: linux-kernel, linux-next, John Stultz, Paul Gortmaker,
Android Kernel Team, gregkh, Linus Torvalds
In-Reply-To: <1332350313-2501-1-git-send-email-ccross@android.com>
On Wed, Mar 21, 2012 at 18:18, Colin Cross <ccross@android.com> wrote:
> m68k doesn't have memblock_reserve, which causes a build failure
> with allmodconfig. Make PERSISTENT_RAM and RAM_CONSOLE depend on
> HAVE_MEMBLOCK.
>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> Signed-off-by: Colin Cross <ccross@android.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> drivers/staging/android/Kconfig | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> I can't test on m68k, but this disables the options if I remove
> HAVE_MEMBLOCK from arm.
>
> diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
> index 08a3b11..eb1dee2 100644
> --- a/drivers/staging/android/Kconfig
> +++ b/drivers/staging/android/Kconfig
> @@ -27,13 +27,14 @@ config ANDROID_LOGGER
>
> config ANDROID_PERSISTENT_RAM
> bool
> + depends on HAVE_MEMBLOCK
> select REED_SOLOMON
> select REED_SOLOMON_ENC8
> select REED_SOLOMON_DEC8
>
> config ANDROID_RAM_CONSOLE
> bool "Android RAM buffer console"
> - depends on !S390 && !UML
> + depends on !S390 && !UML && HAVE_MEMBLOCK
> select ANDROID_PERSISTENT_RAM
> default n
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* linux-next: manual merge of the tile tree with Linus' tree
From: Stephen Rothwell @ 2012-04-10 0:34 UTC (permalink / raw)
To: Chris Metcalf; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1703 bytes --]
Hi Chris,
Today's linux-next merge of the tile tree got a conflict in
arch/tile/kernel/single_step.c between commit cdd8e16feba8 ("arch/tile:
return SIGBUS for addresses that are unaligned AND invalid") from Linus'
tree and commit 25c5acbdcc06 ("arch/tile: support building big-endian
kernel") from the tile tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/tile/kernel/single_step.c
index 9efbc13,8935deb..0000000
--- a/arch/tile/kernel/single_step.c
+++ b/arch/tile/kernel/single_step.c
@@@ -153,28 -153,6 +153,25 @@@ static tile_bundle_bits rewrite_load_st
if (((unsigned long)addr % size) == 0)
return bundle;
+ /*
+ * Return SIGBUS with the unaligned address, if requested.
+ * Note that we return SIGBUS even for completely invalid addresses
+ * as long as they are in fact unaligned; this matches what the
+ * tilepro hardware would be doing, if it could provide us with the
+ * actual bad address in an SPR, which it doesn't.
+ */
+ if (unaligned_fixup == 0) {
+ siginfo_t info = {
+ .si_signo = SIGBUS,
+ .si_code = BUS_ADRALN,
+ .si_addr = addr
+ };
+ trace_unhandled_signal("unaligned trap", regs,
+ (unsigned long)addr, SIGBUS);
+ force_sig_info(info.si_signo, &info, current);
+ return (tilepro_bundle_bits) 0;
+ }
+
- #ifndef __LITTLE_ENDIAN
- # error We assume little-endian representation with copy_xx_user size 2 here
- #endif
/* Handle unaligned load/store */
if (mem_op == MEMOP_LOAD || mem_op == MEMOP_LOAD_POSTINCR) {
unsigned short val_16;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tile tree with Linus' tree
From: Stephen Rothwell @ 2012-04-10 0:38 UTC (permalink / raw)
To: Chris Metcalf; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
Hi Chris,
Today's linux-next merge of the tile tree got a conflict in
arch/tile/kernel/stack.c between commit 5f639fdcd8c1 (arch/tile: various
bugs in stack backtracer"") from Linus' tree and commit aa127c855d1e
("arch/tile: Allow tilegx to build with either 16K or 64K page size")
from the tile tree.
The former removed the code modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-10 1:32 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, David Miller, netdev,
Meenakshi Venkataraman, Wey-Yi Guy
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-testmode.c between commit d33e152e1edd
("iwlwifi: Stop using NLA_PUT*()") from the net-next tree and commit
a42506eb27aa ("iwlwifi: move ucode_type from shared to op_mode") from the
wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
index a54e20e,d65dac8..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@@ -609,10 -605,9 +612,10 @@@ static int iwl_testmode_driver(struct i
inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
}
- if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type) ||
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode);
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
++ if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode) ||
+ nla_put_u32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size) ||
+ nla_put_u32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size))
+ goto nla_put_failure;
status = cfg80211_testmode_reply(skb);
if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n", status);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the tty tree
From: Stephen Rothwell @ 2012-04-10 3:06 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jiri Slaby, Karsten Keil
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
Hi Greg,
After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
ERROR: "isdn_tty_revision" [drivers/isdn/i4l/isdn.ko] undefined!
Presumably caused by commit 1ca6711ec001 ("ISDN: i4l, remove cvs crap").
That variable is still referenced in drivers/isdn/i4l/isdn_common.c. Grep
is your friend.
I have used the tty tree from next-20120405 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox