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
| ||
|
Date: Tue, 2 Oct 2012 11:35:19 +0200 From: Samuel Ortiz <sameo@...ux.intel.com> To: Jiri Kosina <jkosina@...e.cz> Cc: Stephen Rothwell <sfr@...b.auug.org.au>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Haojian Zhuang <haojian.zhuang@...il.com> Subject: Re: linux-next: manual merge of the trivial tree with the mfd tree Hi Jiri, On Tue, Oct 02, 2012 at 12:21:16AM +0200, Jiri Kosina wrote: > On Wed, 12 Sep 2012, Stephen Rothwell wrote: > > > Hi Jiri, > > > > Today's linux-next merge of the trivial tree got a conflict in > > drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd: > > 88pm860x: Use REG resource for backlight") from the mfd tree and commit > > e1c9ac420ef1 ("Revert "backlight: fix memory leak on obscure error > > path"") from the trivial tree. > > > > I just used the version from the mfd tree and can carry the fix as > > necessary (no action is required). > > Samuel, > > Linus has just pulled from trivial.git, so could you please make sure this > is taken care of (*) in your next pull request? Thanks a lot! > > (*) either by resolving the conflict in your tree first, or mentioning it > explicitly in your pull request to Linus. Thanks for the heads up. I usually fix the merge conflicts in a specific branch for-next-merge and give the URL to Linus, in case he needs it. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists