From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Mauro Carvalho Chehab <mchehab@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wolfram Sang <wsa@the-dreams•de>,
Hans Verkuil <hans.verkuil@cisco•com>
Subject: linux-next: manual merge of the driver-core tree with the v4l-dvb tree
Date: Mon, 24 Nov 2014 18:31:22 +1100 [thread overview]
Message-ID: <20141124183122.4f318d48@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/staging/media/omap24xx/omap24xxcam.c between commit
db85a0403be4 ("[media] omap24xx/tcm825x: remove deprecated omap2 camera
drivers") from the v4l-dvb tree and commit 8c5bd8111b45 ("staging:
media: omap24xx: drop owner assignment from platform_drivers") from the
driver-core tree.
I fixed it up (the former removed the file, so I did that) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-11-24 7:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20141124183122.4f318d48@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=hans.verkuil@cisco$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
--cc=wsa@the-dreams$(echo .)de \
/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