patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: Shreyansh Jain <shreyansh.jain@nxp.com>,
	stable@dpdk.org, hemant.agrawal@nxp.com,
	Jerin Jacob <jerin.jacob@caviumnetworks.com>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] bus/dpaa: fix build
Date: Thu, 21 Jun 2018 10:28:48 +0200	[thread overview]
Message-ID: <5065687.f9pk0mkCQI@xps> (raw)
In-Reply-To: <c8c86150-3799-6435-cc32-4bb63d69ec30@nxp.com>

21/06/2018 09:58, Shreyansh Jain:
> On Wednesday 20 June 2018 07:39 PM, Thomas Monjalon wrote:
> > The DPAA bus driver is defining some macros without prefix.
> > So it can conflict with other libraries like libbsd:
> > 
> > 	drivers/bus/dpaa/include/compat.h:53:
> > 		error: "__packed" redefined
> > 	/usr/include/bsd/sys/cdefs.h:120:
> > 		note: this is the location of the previous definition
> > 
> > Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
> > Cc: stable@dpdk.org
> > Cc: geoff.thorpe@nxp.com
> > Cc: hemant.agrawal@nxp.com
> > Cc: shreyansh.jain@nxp.com
> > 
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > ---
> >   drivers/bus/dpaa/include/compat.h | 6 ++++++
> >   1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h
> > index e4b570214..92241d231 100644
> > --- a/drivers/bus/dpaa/include/compat.h
> > +++ b/drivers/bus/dpaa/include/compat.h
> > @@ -48,9 +48,15 @@
> >    */
> >   
> >   /* Required compiler attributes */
> > +#ifndef __maybe_unused
> >   #define __maybe_unused	__rte_unused
> > +#endif
> > +#ifndef __always_unused
> >   #define __always_unused	__rte_unused
> > +#endif
> > +#ifndef __packed
> >   #define __packed	__rte_packed
> > +#endif
> >   #define noinline	__attribute__((noinline))
> >   
> >   #define L1_CACHE_BYTES 64
> > 
> 
> A similar patch was also issued by Jerin a few weeks back:
> http://patches.dpdk.org/patch/40597/

I missed it.

> There may be conflict while merging.
> 
> Whether you take that, or this (preferred):
> 
> Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>

This one is more complete.
Applied

      reply	other threads:[~2018-06-21  8:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-20 14:09 [dpdk-stable] " Thomas Monjalon
2018-06-21  7:58 ` [dpdk-stable] [dpdk-dev] " Shreyansh Jain
2018-06-21  8:28   ` Thomas Monjalon [this message]

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=5065687.f9pk0mkCQI@xps \
    --to=thomas@monjalon.net \
    --cc=dev@dpdk.org \
    --cc=hemant.agrawal@nxp.com \
    --cc=jerin.jacob@caviumnetworks.com \
    --cc=shreyansh.jain@nxp.com \
    --cc=stable@dpdk.org \
    /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).