From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751448AbaKJEee (ORCPT ); Sun, 9 Nov 2014 23:34:34 -0500 Received: from ozlabs.org ([103.22.144.67]:47696 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751158AbaKJEed (ORCPT ); Sun, 9 Nov 2014 23:34:33 -0500 Date: Mon, 10 Nov 2014 15:34:26 +1100 From: Stephen Rothwell To: Greg KH , "John W. Linville" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Wolfram Sang , Alexander Aring , Marcel Holtmann Subject: linux-next: manual merge of the driver-core tree with the wireless-next tree Message-ID: <20141110153426.616e1f19@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/s51G6A5wb7zLmkVq1U_kPfU"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/s51G6A5wb7zLmkVq1U_kPfU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/net/ieee802154/fakehard.c between commit 36426484fcac ("ieee802154: remove fakehard driver") from the wireless-next tree and commit bb1f1107858c ("net: ieee802154: drop owner assignment from platform_drivers") from the driver-core tree. I fixed it up (I just removed the file) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/s51G6A5wb7zLmkVq1U_kPfU Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUYEBXAAoJEMDTa8Ir7ZwVw7oP/Ru/7ipe1t4I4IpC+3bdCf4N Mg6lmr0syfNe+S+ewhuM/e5lq12CoPZZc4No9s6juDh89bevZ4NDgV28gBvYS/XX pEv8wHDGBaMMyPdU5/y08FiQvSJU600IVNNH4DY6/pR0osPDx207/yqx9+iWyCgl 6NOJXqKGT3d+E1ptTx2jBN1usvkTWawsUUTISdLJ8v9x1dJrhy8+wxElVtIfN6eM T36c4aVFcUnc8E4Bk943t7o+9aFt9Dfg1XOFMRJOQUplL+p7i9CrZZYZLk/3MRHw g2fytHKqPQR1c0tK+jeLRw+3pfwkP+Iekyzf4eNKQoKBQ85rSkBf34yPKpjxRoPx FCmoBo0i9EEQpTsjllzCa7lS/uLz4ufnxBGfVFFRv+/FB9oYcNihO0245JPO5N+N VVaaUWGxx+fEKDtN1bBCqZ83lEtZzXGpjdLwJtovak74QXTuy8crvdUC69TkCcH+ lUqKO9PFJaqHwA+/qJ4pgJlqrseYj5cdQjUjHHCdSHrRJODT24XQzfhPUp6Ztxlq BsAdHzeFUxd11XfeHhjE0Y24xhnBLY+qsy90TEOyQF+H5ANx8SAwE6ObE6TJNjh5 SBR5KwXsFCEV0hZfM3JK0unJiWbU+4vNCiukBHEALhB/x2xwmyy0+wMTpwepjjcs kyBpiyGdqbuyGwo545Th =LXcO -----END PGP SIGNATURE----- --Sig_/s51G6A5wb7zLmkVq1U_kPfU--