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,
Joe Perches <joe@perches.com>, Gabor Juhos <juhosg@openwrt.org>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree
Date: Thu, 2 May 2013 13:19:10 +1000 [thread overview]
Message-ID: <20130502131910.aefc70ed915dc403fa50d808@canb.auug.org.au> (raw)
In-Reply-To: <20130404114444.de4e40c24f4e1a0e4c0b7328@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1796 bytes --]
Hi Dave,
On Thu, 4 Apr 2013 11:44:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/rt2x00/rt2x00pci.c between commit 69a2bac8984c
> ("rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs") from the
> wireless tree and commit 1f9061d27d3d ("drivers:net: dma_alloc_coherent:
> use __GFP_ZERO instead of memset(, 0)") from the net-next tree.
>
> The former moved the code modified by the latter into a different file,
> so I added the following merge fix patch and can carry the fix as
> necessary (no action is required).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 4 Apr 2013 11:42:05 +1100
> Subject: [PATCH] drivers:net: fix up for code movement from rt2x00pci.c
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/wireless/rt2x00/rt2x00mmio.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00mmio.c b/drivers/net/wireless/rt2x00/rt2x00mmio.c
> index d84a680..9fe9a36 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00mmio.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00mmio.c
> @@ -123,12 +123,10 @@ static int rt2x00pci_alloc_queue_dma(struct rt2x00_dev *rt2x00dev,
> */
> addr = dma_alloc_coherent(rt2x00dev->dev,
> queue->limit * queue->desc_size,
> - &dma, GFP_KERNEL);
> + &dma, GFP_KERNEL | __GFP_ZERO);
> if (!addr)
> return -ENOMEM;
>
> - memset(addr, 0, queue->limit * queue->desc_size);
> -
> /*
> * Initialize all queue entries to contain valid addresses.
> */
This merge fix patch seems to have got lost somewhere ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-05-02 3:19 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-04 0:44 linux-next: manual merge of the net-next tree with the wireless tree Stephen Rothwell
2013-05-02 3:19 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-24 0:24 Stephen Rothwell
2023-10-12 0:37 Stephen Rothwell
2023-10-12 8:10 ` Johannes Berg
2023-10-19 21:40 ` Jakub Kicinski
2023-10-20 5:49 ` Johannes Berg
2014-07-24 2:47 Stephen Rothwell
2014-07-23 2:00 Stephen Rothwell
2014-05-23 3:45 Stephen Rothwell
2014-02-26 3:21 Stephen Rothwell
2014-02-21 2:34 Stephen Rothwell
2013-09-27 3:03 Stephen Rothwell
2013-08-27 4:10 Stephen Rothwell
2013-04-02 2:00 Stephen Rothwell
2013-04-02 9:30 ` Samuel Ortiz
2013-03-26 0:51 Stephen Rothwell
2013-03-26 0:48 Stephen Rothwell
2012-07-03 1:44 Stephen Rothwell
2012-07-03 2:33 ` John W. Linville
2012-06-14 3:12 Stephen Rothwell
2012-06-14 4:50 ` Mohammed Shafi Shajakhan
2012-06-14 12:59 ` John W. Linville
2012-05-04 3:21 Stephen Rothwell
2012-05-04 4:35 ` Guy, Wey-Yi
2012-02-16 1:40 Stephen Rothwell
2012-02-16 1:37 Stephen Rothwell
2011-12-20 2:02 Stephen Rothwell
2011-12-15 2:53 Stephen Rothwell
2011-12-15 3:16 ` 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=20130502131910.aefc70ed915dc403fa50d808@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=joe@perches.com \
--cc=juhosg@openwrt.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.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).