linux-kernel - linux-next: manual merge of the akpm tree with the slave-dma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20120722153548.48213df45606109be4f7952b@canb.auug.org.au>
Date:	Sun, 22 Jul 2012 15:35:48 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>,
	Vinod Koul <vinod.koul@...ux.intel.com>,
	Fabio Estevam <fabio.estevam@...escale.com>
Subject: linux-next: manual merge of the akpm tree with the slave-dma tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/dma/dmaengine.c between commit 634332502366 ("dmaengine: Cleanup
logging messages") from the slave-dma tree and commit
"drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma
channel message" from the akpm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/dma/dmaengine.c
index 3491654,6c87d67..0000000
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@@ -582,8 -578,8 +582,8 @@@ void dmaengine_get(void
  				list_del_rcu(&device->global_node);
  				break;
  			} else if (err)
- 				pr_err("%s: failed to get %s: (%d)\n",
+ 				pr_debug("%s: failed to get %s: (%d)\n",
 -					__func__, dma_chan_name(chan), err);
 +				       __func__, dma_chan_name(chan), err);
  		}
  	}
  

Content of type "application/pgp-signature" skipped