[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20140317133232.c18d3d977ecf8466f9959a8f@canb.auug.org.au>
Date: Mon, 17 Mar 2014 13:32:32 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jikos@...os.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Benjamin Tissoires <benjamin.tissoires@...hat.com>
Subject: linux-next: manual merge of the hid tree with Linus' tree
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/i2c-hid/i2c-hid.c between commit 9d27f43274e4 ("HID: fix
buffer allocations") from Linus' tree and commit 649f94790314 ("HID:
i2c-hid: use generic .request() implementation") from the hid tree.
I fixed it up (the latter removes the code modified by the former, so I
just used the latter) and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists