linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
To: Pavel Machek <pavel@ucw.cz>
Cc: mchehab@s-opensource.com, ivo.g.dimitrov.75@gmail.com,
	linux-media@vger.kernel.org, khilman@kernel.org,
	tony@atomide.com, hans.verkuil@cisco.com, aaro.koskinen@iki.fi,
	"kernel list" <linux-kernel@vger.kernel.org>,
	sre@kernel.org, martijn@brixit.nl,
	"Filip Matijević" <filip.matijevic.pz@gmail.com>,
	sakari.ailus@iki.fi, abcloriens@gmail.com,
	sakari.ailus@linux.intel.com, pali.rohar@gmail.com,
	clayton@craftyguy.net, linux-omap@vger.kernel.org,
	patrikbachan@gmail.com,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
	serge@hallyn.com
Subject: Re: [PATCH, libv4l]: Make libv4l2 usable on devices with complex pipeline
Date: Fri, 27 Jul 2018 09:47:08 -0300	[thread overview]
Message-ID: <20180727094708.18ef4e4e@coco.lan> (raw)
In-Reply-To: <20180708213258.GA18217@amd>

Em Sun, 8 Jul 2018 23:32:58 +0200
Pavel Machek <pavel@ucw.cz> escreveu:

> Add support for opening multiple devices in v4l2_open(), and for
> mapping controls between devices.
> 
> This is necessary for complex devices, such as Nokia N900.

Hi Pavel,

I tried to apply it here, but it seems that there are something
wrong with the patch:

$ quilt push -f --merge
Applying patch patches/lmml_50901_libv4l_make_libv4l2_usable_on_devices_with_complex_pipeline.patch
patching file lib/include/libv4l2.h
patching file lib/libv4l2/libv4l2-priv.h
patching file lib/libv4l2/libv4l2.c
Hunk #6 NOT MERGED at 1830-1857.
misordered hunks! output would be garbled
Hunk #7 FAILED at 1224.
Hunk #8 NOT MERGED at 1858-2057.
1 out of 8 hunks FAILED -- saving rejects to file lib/libv4l2/libv4l2.c.rej
patching file lib/libv4lconvert/control/libv4lcontrol.c
Applied patch patches/lmml_50901_libv4l_make_libv4l2_usable_on_devices_with_complex_pipeline.patch (forced; needs refresh)

I even tried to reset the tree to a patchset earlier than July, 8.
Same issue.

I could manually try to fix it, but that misordered hunks
warning is weird. Makes me wonder if the patch is not mangled.

Could you please re-send it on the top of upstream? Better to use
git send-email, as it won't mangle your patch.

Alternatively, please send me a ssh public key in private, and I'll
give you access to the repository where you can store those patches.

Thanks!
Mauro



Thanks,
Mauro

  parent reply	other threads:[~2018-07-27 12:47 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-08 21:32 [PATCH, libv4l]: Make libv4l2 usable on devices with complex pipeline Pavel Machek
2018-07-19 20:53 ` Pavel Machek
2018-07-23 18:36   ` Mauro Carvalho Chehab
2018-07-28 19:36     ` Pavel Machek
2018-07-28 21:11     ` new libv4l2 (was Re: [PATCH, libv4l]: Make libv4l2 usable on devices with complex pipeline) Pavel Machek
2018-07-30  9:31       ` Mauro Carvalho Chehab
2018-07-27 12:47 ` Mauro Carvalho Chehab [this message]
2018-07-28 21:02   ` [PATCH, libv4l]: Make libv4l2 usable on devices with complex pipeline Pavel Machek

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=20180727094708.18ef4e4e@coco.lan \
    --to=mchehab+samsung@kernel.org \
    --cc=aaro.koskinen@iki.fi \
    --cc=abcloriens@gmail.com \
    --cc=clayton@craftyguy.net \
    --cc=filip.matijevic.pz@gmail.com \
    --cc=hans.verkuil@cisco.com \
    --cc=ivo.g.dimitrov.75@gmail.com \
    --cc=khilman@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=martijn@brixit.nl \
    --cc=mchehab@s-opensource.com \
    --cc=pali.rohar@gmail.com \
    --cc=patrikbachan@gmail.com \
    --cc=pavel@ucw.cz \
    --cc=sakari.ailus@iki.fi \
    --cc=sakari.ailus@linux.intel.com \
    --cc=serge@hallyn.com \
    --cc=sre@kernel.org \
    --cc=tony@atomide.com \
    /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;
as well as URLs for NNTP newsgroup(s).