From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Artem Bityutskiy <dedekind@yandex•ru>
Cc: linux-next@vger•kernel.org, Jonathan Corbet <corbet@lwn•net>
Subject: linux-next: manual merge of the ubi tree
Date: Tue, 22 Jul 2008 13:31:22 +1000 [thread overview]
Message-ID: <20080722133122.29f8e2cd.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
Hi Artem,
Today's linux-next merge of the ubi tree got a trivial conflict in
drivers/mtd/ubi/cdev.c between commit
72b67048f5dac18fd6494e3d3bff7e54840e8761 ("UBI: cdev lock_kernel()
pushdown") from Linus' tree and commit
9c0ec8fe1eed2106441e12ca2964f431df044f1d ("UBI: fix checkpatch.pl errors
and warnings") from the ubi tree.
Just overlapping additions of include files.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-22 3:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 3:31 Stephen Rothwell [this message]
2008-07-22 5:26 ` linux-next: manual merge of the ubi tree Artem Bityutskiy
2008-07-22 8:20 ` Stephen Rothwell
2008-07-22 6:25 ` Artem Bityutskiy
2008-07-22 16:09 ` 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=20080722133122.29f8e2cd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=dedekind@yandex$(echo .)ru \
--cc=linux-next@vger$(echo .)kernel.org \
/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