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
| ||
|
Message-ID: <81C3A93C17462B4BBD7E272753C10579232F86B36C@EXDCVYMBSTM005.EQ1STM.local> Date: Fri, 29 Jun 2012 08:46:04 +0200 From: Sjur BRENDELAND <sjur.brandeland@...ricsson.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, David Miller <davem@...emloft.net>, "netdev@...r.kernel.org" <netdev@...r.kernel.org> Cc: "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, Per ELLEFSEN <per.ellefsen@...ricsson.com>, Kim LILLIESTIERNA <kim.xx.lilliestierna@...ricsson.com> Subject: RE: linux-next: manual merge of the net-next tree with the net tree Hi Stephen, > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/caif/caif_hsi.c between commits 3935600a7f34 ("caif-hsi: > Bugfix - Piggyback'ed embedded CAIF frame lost") and 1fdc7630b2cb > ("caif-hsi: Add missing return in error path") from the net tree and > commits 4e7bb59d49fb ("caif-hsi: Removed dead code") and c41254006377 > ("caif-hsi: Add rtnl support") from the net-next tree. > > I fixed them up (see below) and can carry the fix as necessary. Sorry for late response. Your merge looks perfect. Thanks, Sjur -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists