[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the bkl-config tree with the v4l-dvb
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2010-12-28 5:26:15
Message-ID: 20101228162615.f94b1478.sfr () canb ! auug ! org ! au
[Download RAW message or body]

Hi Arnd,

Today's linux-next merge of the bkl-config tree got a conflict in
drivers/staging/stradis/Kconfig between commit
aef01debdfad83ab71a83b7af8cd90203404c1aa ("[media] cpia, stradis: remove
deprecated V4L1 drivers") from the v4l-dvb tree and commit
f2fed18d2a61afa5592b3002407e432c689c33f4 ("staging/stradis: mark as
"depends on BKL"") from the bkl-config tree.

The former removed the file that the latter modified, so I removed the
file as well.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[Attachment #3 (application/pgp-signature)]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[prev in list] [next in list] [prev in thread] [next in thread]