From: Mauro Carvalho Chehab <mchehab@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Greg KH <greg@kroah•com>,
Hans Verkuil <hverkuil@xs4all•nl>
Subject: Re: linux-next: manual merge of the v4l-dvb tree
Date: Thu, 4 Sep 2008 01:44:18 -0300 [thread overview]
Message-ID: <20080904014418.1c4d57dd@mchehab.chehab.org> (raw)
In-Reply-To: <20080901134239.7d95d83a.sfr@canb.auug.org.au>
On Mon, 1 Sep 2008 13:42:39 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Mauro,
>
> On Mon, 1 Sep 2008 13:14:58 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the v4l-dvb tree got a conflict in
> > drivers/media/radio/dsbr100.c between commit
> > 59d1f04f76c8386d468f74c18fe5c008752c9340 ("USB: remove warn() macro from
> > usb.h") from the usb tree and commit
> > 63057954eb49549963c4c5079381492575cab33a ("V4L/DVB (8778): radio: fix
> > incorrect video_register_device result check") from the v4l-dvb tree.
> >
> > Just a context clash. I fixed it up (see below) and can carry the fix.
>
> Of course, this is fixable in the v4l-dvb tree as well.
Hi Stephen,
Thanks for warning me. Unfortunately, I got some issues on my current procedure
of handling my tree. The old procedure of using stacked git were much better
from my side, but were leading to a few inconsistencies. I'm still trying to
find a way to allow me to merge my patches without generating merge noise on
upstream tree and without needing to rebase every time a patch is merged
upstream.
I'm trying to give a definitive solution to fix it. Due to
that, I had to rebase my tree (in fact, I've re-created it). So, this conflict
will likely rise on today's (and probably on tomorrow's merge), since I'm
currently focused on fixing my tree to send a long list of pending stuff
upstream.
Cheers,
Mauro
next prev parent reply other threads:[~2008-09-04 4:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-01 3:14 linux-next: manual merge of the v4l-dvb tree Stephen Rothwell
2008-09-01 3:42 ` Stephen Rothwell
2008-09-04 4:44 ` Mauro Carvalho Chehab [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-13 3:00 Stephen Rothwell
2010-05-13 5:18 ` Mauro Carvalho Chehab
2010-05-13 5:59 ` Stephen Rothwell
2008-10-14 7:28 Stephen Rothwell
2008-10-27 7:16 ` Stephen Rothwell
2008-10-28 11:48 ` Mauro Carvalho Chehab
2008-10-28 12:04 ` Stephen Rothwell
2008-09-01 3:22 Stephen Rothwell
2008-08-19 4:11 Stephen Rothwell
2008-08-19 5:59 ` Hans Verkuil
2008-08-19 19:55 ` Greg KH
2008-07-29 3:03 Stephen Rothwell
2008-07-04 4:45 Stephen Rothwell
2008-06-30 4:56 Stephen Rothwell
2008-06-30 11:14 ` Mauro Carvalho Chehab
2008-06-30 4:49 Stephen Rothwell
2008-06-30 4:44 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=20080904014418.1c4d57dd@mchehab.chehab.org \
--to=mchehab@infradead$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=hverkuil@xs4all$(echo .)nl \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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