From: Hans Verkuil <hverkuil@xs4all.nl>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the akpm tree with the v4l-dvb tree
Date: Wed, 9 Nov 2011 10:54:21 +0100 [thread overview]
Message-ID: <201111091054.21425.hverkuil@xs4all.nl> (raw)
In-Reply-To: <4EBA49FF.4090904@infradead.org>
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
>
next prev parent reply other threads:[~2011-11-09 10:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-09 2:53 linux-next: manual merge of the akpm tree with the v4l-dvb tree Stephen Rothwell
2011-11-09 9:38 ` Mauro Carvalho Chehab
2011-11-09 9:54 ` Hans Verkuil [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-20 13:49 Stephen Rothwell
2015-06-20 13:56 Stephen Rothwell
2015-06-20 14:05 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201111091054.21425.hverkuil@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox