linux-kernel - Re: QRTR merge conflict resolution

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20160518104320.23ae8557@canb.auug.org.au>
Date:	Wed, 18 May 2016 10:43:20 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	bjorn.andersson@...aro.org, arnd@...db.de,
	linux-arm-kernel@...ts.infradead.org, andy.gross@...aro.org,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux-next@...r.kernel.org, olof@...om.net
Subject: Re: QRTR merge conflict resolution

Hi David,

On Tue, 17 May 2016 14:11:54 -0400 (EDT) David Miller <davem@...emloft.net> wrote:
>
> From: Bjorn Andersson <bjorn.andersson@...aro.org>
> Date: Fri, 13 May 2016 15:19:09 -0700
> 
> > I have prepared the merge of net-next and the conflicting tag from the
> > Qualcomm SOC, please include this in your pull towards Linus to avoid
> > the merge conflict.  
> 
> Pulled, thanks.

Except in the merge resolution, the 2 new functions added to
include/linux/soc/qcom/smd.h (qcom_smd_get_drvdata and
qcom_smd_set_drvdata) were not marked "static inline" :-(

-- 
Cheers,
Stephen Rothwell