From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Leonid Iziumtsev <x0153368@ti•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Gigi Joseph <gigi.joseph@gmail•com>,
Gustavo Padovan <gustavo.padovan@collabora•co.uk>,
Amir Ayun <amira@ti•com>, Pavan Savoy <pavan_savoy@ti•com>
Subject: linux-next: manual merge of the akpm-current tree with the char-misc tree
Date: Tue, 13 Jan 2015 16:49:03 +1100 [thread overview]
Message-ID: <20150113164903.2dc0a2ce@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
drivers/misc/ti-st/st_core.c between commit 0ec0cf19201d
("drivers:misc:ti-st: protect against bad packets") from the char-misc
tree and commit 55ed078edf3f ("drivers/misc/ti-st/st_core.c: fix NULL
dereference on protocol type check") from the akpm-current tree.
I fixed it up (they were doing the same thing, so I kept the former as
it has a nice comment) 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 --]
next reply other threads:[~2015-01-13 5:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 5:49 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-06 6:35 linux-next: manual merge of the akpm-current tree with the char-misc tree Stephen Rothwell
2015-08-06 21:12 ` Greg KH
2014-01-14 4:51 Stephen Rothwell
2014-01-14 8:31 ` Winkler, Tomas
2014-01-15 1:57 ` Ian Munsie
2014-01-15 22:36 ` Winkler, Tomas
2014-01-15 23:52 ` Ian Munsie
2014-01-10 4:36 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=20150113164903.2dc0a2ce@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=amira@ti$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=gigi.joseph@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=gustavo.padovan@collabora$(echo .)co.uk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pavan_savoy@ti$(echo .)com \
--cc=x0153368@ti$(echo .)com \
/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