lkml.org 
[lkml]   [2011]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the akpm tree with the v4l-dvb tree
Date
On Wednesday, November 09, 2011 10:38:07 Mauro Carvalho Chehab wrote:
> Em 09-11-2011 00:53, Stephen Rothwell escreveu:
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict between commit
> > "poll: add poll_requested_events() function" the v4l-dvb and akpm trees.
> > It was very similar (but not identical), so I dropeed it from the akpm
> > tree.
>
> Hans,
>
> Could you please double-check the differences?

The akpm version was slightly older. The version in linux-next contains a
coding style fix and adds a comment block to the header based on feedback I
received from Andrew.

Regards,

Hans

>
> > BTW Mauro, that commit in v4l-dvb comes from a branch that contains a
> > series of patches that have various Signed-off-by's but not yours ... it
> > looks like they were imported from patchwork, but you forgot to add your
> > SOB line.
>
> Stephen,
>
> Thanks for noticing it. Yes, I forgot to add my SOB on those patches, when
> importing from Hans tree. I'll fix it for tomorrow's merge.
>
> Thanks!
> Mauro
>


\
 
 \ /
  Last update: 2011-11-09 11:07    [W:0.045 / U:0.588 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site