From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752912AbcGTXs7 (ORCPT ); Wed, 20 Jul 2016 19:48:59 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:4239 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752568AbcGTXsy (ORCPT ); Wed, 20 Jul 2016 19:48:54 -0400 Subject: Re: for-4.8/drivers and Linus' tree + staging conflicts? To: Konrad Rzeszutek Wilk , , References: <20160715161904.GA30284@char.us.oracle.com> CC: , From: Jens Axboe Message-ID: <4790e021-0695-abd4-9281-4f7342c79e59@fb.com> Date: Wed, 20 Jul 2016 17:48:37 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160715161904.GA30284@char.us.oracle.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [166.171.120.165] X-ClientProxiedBy: BY2PR03CA054.namprd03.prod.outlook.com (10.141.249.27) To DM5PR15MB1193.namprd15.prod.outlook.com (10.173.209.11) X-MS-Office365-Filtering-Correlation-Id: d4dc5fa6-82dd-4b01-eede-08d3b0f862c8 X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1193;2:fI+pKUDcBbys1mL85u0fxEqpQ4Sq7P8ZvnAC7NvHRAMDcKXRFnXig2LdgzNUe9tqDFi9mY1AUQHHtmar89t3Yg+Z0WA1U57UtLE7xiirg8cK6DWHptTLUvZZ7K5nf+krQIgIW6r2YKQX4gr0dfkv58LpOSWeq6+fYmjTCY+ITIjp5GHgaNijuJxesSAhoUDY;3:Y3AfigyK37396Z1Fd8OmvF0ye5nLiYMsIDkl6CQzcZol8HzyZVyCvY+etrEPFDNq7/GGTdzo2MCPKNVDcaRHlf2GkR/aSH8EcgfTyuu67Pvi4MZOKYHPPycCuYF/B3Ft X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM5PR15MB1193; X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1193;25:fs+ddCWGcI4UXtA1H1l8CBg1NC82XScgIJzawz9H9JajgKU2Ytw85t8Vi9Y7ezD62xq7wO4QK2W2ueg4GlBURC8tUSVqs1Q+gXeBg8OYYl8dU0OkNeja2aS9QvrSJomyN3ujpWGwei1Os8kRMUeylDZ+SU8x6JlQqiEZRguAsOroAnGTXXrTK5vyrhkcp0MdB+O+3bOu66zH2SXzmD9HeDDOaSBo5R/kDJndbiazE7ZT2+q3+zbIjrAg/XL3HeLhwB+qh7u+BOxDAATV6WZH6FgP2+u10oXfERFf46UnAyLLOKNqW//RAsWGGpc9IyyfP4PVjuzV1fGbQnEGIiKpQ7zRb60PPjBX4pvPWultPxjaqYNYU7yNi91OKQ0bOOUmct4D9Oy0z+0c2EBrwUBV0PL5IuGgZpT/XI7EwsUoGL20Kbdf8hgdNepCL+tdEBqnxtgCJZYnmqlC/7K9q2tQ7ZkiqvrOQ3gHDS0miPculEU0VEKFlpuhLkzgCSK90TgBF+1rtaTp3GvQuib6Kb7GpZfWsFc/ul7aqqFQ1fzgJB1Z2WeJmTsiXWqkXXlHi+0F5NoM7eh5bFuBNtrRgSKynjnKQa3HkUJ3Tl16NEM3CDVhL4hTef1mxUuD0/SqGyuYn8XFwfJ/vJBdUHdasL1NRlBZFAM+BGFSzGjeyg7bLjanYmOzjtzqVgtwrXCiMO6FwiuroavdgIqjnsLAH3dwiA==;31:3B4sZZWJvAcesN8KTRK6pmI1Or6t0qmy6XrVQ4RzNK/evPCQv0yXPU59F7HO5BJozHCBwbKN7wSNVsR5fM+nzTAuAtmEA2fdI2RhfUsdo/T9OMd1cwRpJT66lQUe59Y4/loX9ZFqR2MzNDXXDKAHB0puuAD2rcAlpCq9trwm7KSrBofVxnkoMczqwELsz4yJoGqXj8r9XpetPeR6ewgd1g== X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1193;20:B5tLfL479EvNrIOPD2k0OaWQ+puQFdqUwOlT4lgYpLHnKpqWyD9PdILm3vnwjgv6BrxX6mvQj2+b0YUuYwwt+i/4qmssRilv8GeXjnaONpMj+zcyq3Z0VxslZaL0VTwNmSXD1K4FfTNA6CsTG+g6k8G/NEb2tHBiK6BfJWDQGrU=;4:BXyGmRE4KRVMwrlVSyS/Fl6IsZE+qRk/dahywicP63GqH9nfEtxJw9lSqFEwy0GaCNTEI5ZDogXLm+PQAa6vCwoOTrLg+VIkHBi62Xo8YMcSyRn9QiNuN5G24RpI89+eZcgpsP2pTA/ilzu1G/2d2vGN71a9m1XCsNCnpZUmCkqOGMZM+c/zTtBYsy3KId7Y3qDncefheQpvgHv8zVNe1TEhHFmHfQx1vc0YrRVhMl8YRY4aaTlDsuqayd2yJL7fUQUWreyy7WuwEluCXmAcNe8KPC0fdIU5rNxVb0+f645uakk/Wm55buZnZRw41SaKaO/vyuRNyIa2c/pn9oSxp3Udm1dAGi8QtWfIkCWNpOWW5kr1svg41UX/AgMgCcbh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001);SRVR:DM5PR15MB1193;BCL:0;PCL:0;RULEID:;SRVR:DM5PR15MB1193; X-Forefront-PRVS: 000947967F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(7916002)(189002)(24454002)(377454003)(199003)(105586002)(106356001)(7736002)(76176999)(2906002)(8666005)(50986999)(64126003)(47776003)(65956001)(66066001)(4326007)(83506001)(101416001)(7846002)(54356999)(65806001)(305945005)(33646002)(2950100001)(23746002)(8676002)(81156014)(81166006)(31696002)(36756003)(68736007)(77096005)(31686004)(2201001)(42186005)(230700001)(86362001)(189998001)(4001350100001)(50466002)(5001770100001)(97736004)(6116002)(3846002)(586003)(92566002)(65826006)(7059030);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR15MB1193;H:[172.20.10.2];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;DM5PR15MB1193;23:mdC6Fz5LGMSd35bD5rWlXnw/NIgqUBLHGPvuH?= =?Windows-1252?Q?vvvqMa95PlROqLHc7DtEEkTBSmv1OGUFj7hLRHAwy5sPB8gQEjnVp/UQ?= =?Windows-1252?Q?PtormbUeHrsmCowP3cgwUKHyesaxKpf+huXSzswJCWR8SCNsLhQ6Qioa?= =?Windows-1252?Q?BLGjJl4wKhRx3NlrmlyOjPsBt2llnlz2HPIkO6wDukHgNuOAB5XomSmq?= =?Windows-1252?Q?anFw5RDNNAwyOq2bwqafBCacLPb4wfzkDBVi8XvUnzuO0KE2qiWb3LnN?= =?Windows-1252?Q?fyPIiVbSz1RW2DlJQgnFczDKfqPbgxZ92qUxgYhnj89+MG2h8+txzwAM?= =?Windows-1252?Q?PorC1k1E4e3h2L+VHcgmK6Y3XezjD9qqyfBAly+RZZ/INeVTXcYI02ka?= =?Windows-1252?Q?dArGdpdoXmjK3la/AUwRIJC78M05Cy/RCwWAjJAn6Cf12bLnau1OLmH9?= =?Windows-1252?Q?vkJTcJ55EzHWLlk9Ba5zTGHAYaAYbuJsV+ADxrUb0mpt8KBB4EsOP94U?= =?Windows-1252?Q?Hwxla2S03P+i5xQMFWG0p0OvJ9mApKZEkB+3Np9TiryU5/QMqWtjZOp3?= =?Windows-1252?Q?E8weijqu6CD23b4vsm3+JFpsNHUxMJ7pc4AD/wigCzLR0pW4vVP/sr5L?= =?Windows-1252?Q?6nVBJUFX5fZPyGFmuNsS329GsqDRD7d44brDKJvMEMqVNsGnhg/DKSLk?= =?Windows-1252?Q?EZdixtpfr6kZHp8LZRF8MwdoDACagAJabdS6OHuTgE3HtRcwECweTlzI?= =?Windows-1252?Q?xObQUyx5yBnBriGa/T1on+aUTAhE7ileSiEwd0DT/ookRHhELdrCkGoa?= =?Windows-1252?Q?zq4sSzsLpwwCgE2FSygvxojd4FjipNAiAvDba22GVZR/ESsNaUKWGU7S?= =?Windows-1252?Q?woVHrK39CKVkTvHNL7UnPNKRn+GWyzcptaoB3uP3W86LVXq/+WUEnz9K?= =?Windows-1252?Q?bErsk8AT/5bWRyL6knR2e7aHXM4EJYxIuTYH8MkCOpv+c8+Nr2HMC9R+?= =?Windows-1252?Q?J4ObESbsNix1N6TNIBzD5GS+8nWyIWtyXmTfjy1puwjQ+MggSagk5LeQ?= =?Windows-1252?Q?Nhk7gUIxv4BfYLk4KBvaXPAwwPlU8VOQtayCSC1jNMVbx/iuAl/LcoC2?= =?Windows-1252?Q?AoE/w5v01DgGnOxjRX1iIwJv9FP4/efYBWI+3Zx8T1eCmUuZ4KFkmMcL?= =?Windows-1252?Q?iUUyqDRJOStITVVa4TYeZgDODp6amjao0IqtoN6NOv/wMVI5iTXsI4wG?= =?Windows-1252?Q?tP4vqeWF+XZJ2AYbiJG/DBMcoDkPKX0WIPQI4a/73YDSJwiqqtflsa1j?= =?Windows-1252?Q?jyOcKjklfoAXBfHDq1fMPEXuCQnBIHRg/88znX9b/PzGXBQeAakQAm8s?= =?Windows-1252?Q?iIMegGBpNNl?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1193;6:J2bR8rSlZH45Gd1NZaWAOAQkmVADvp1OuqEka8MbFzHFriMvpsFpoy2FhC97lXZNTkKEOrxWRouM6ADmGH/sVnMS3MApzfMA9qChQTbr+0CKceVWo8IPrvxsATbYORfQroNTDglRtCTaj4oVe11mRB8CU2RQXHzziE6+c2nMSDZHOUmPuW4pOv4zxcI5nLg6GHDXkBegx6kmZWEfVL2uYjxQ49K6DewjdI+cH5XzrqTvnW+jQcDzqj4IbEqTwuoCQC1lNP5GPhuGf8lYg1pEO5c5KDE/FLaMk///dH11rjM=;5:UOd62TvpXg6sun4zzgB7bJHnlk99+XCuJg9jZGTVrjmy9B7lumBdkjoRoff16LzBy7YfXIQPVjc2z/dkZE9KnEIpir7F7cRQRTCJoapgVZZY4YUZwqM1C3lH/LWmo+FRRLGIY7SfUCWe3OfFanmv5A==;24:rK253wAvRLSB0XIAePLBDWGwZ38l74PMKSGeznNO0BoBJV5g3OeVaejQ2YHa8taKuJmWZWq8hzrnRNO8K1DEW1CZ7/1jVjkXzS0tkoUFHxg=;7:ZDyx0FP5XFjC1s0mQ8NCWdq1JSIqtycg296IA+7XE4h9nYbhuD2WvefFu7Vq0gUab2Oa+zcBV9TxpwLcV3AbRarbXQL5wqJssa4HNfCeuFCGRfMpBNazi04eeeXK7p6gOyQ1HF6OrmnOawmPRXmRplKu2q83efCDsuXv+tB1j0JgYibagBKLPue5hBec1YPTRaCjzZHiMyx4TgV4u+v/IJuc01G9Z+ZpSuxqJHIVkReNJ2p+vmFnUzakbFu1BIV2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR15MB1193;20:py1NbqFoWGqWoCL4+jXku4UCh4Er0gI0lJoJ38yhdcoPDcLOCEmMT0MyP3wyQTJZl/C+5QaepzO/GyT9C29ni3x7JzlCjIdVxf5JHsU+FTReJxWtafsNqyk3xLMIoUKvgPQpn2iHGD1vZWp1UFb4VPP9xuR+WoZlr3knXZ0gq7c= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2016 23:48:43.7218 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR15MB1193 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-07-20_13:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/15/2016 10:19 AM, Konrad Rzeszutek Wilk wrote: > Hey Jens, > > I have some patches for Xen block driver that are based on Linus's tree > which has: > 7b427a5 xen-blkfront: save uncompleted reqs in blkfront_resume() > > That particular patch conflicts with your for-4.8/driver branch. > > What I was wondering is if: > > 1) Do you want me to create a branh for you to pull in your > for-4.8/drivers that has the above patch (and a resolution)? > And along with that the rest of the patches I've for 4.8? No, I don't want a lot of extra gunk. > 2) Or if you are going rebase your 'for-4.8/drivers' branch > on top of v4.7-rc7 (which will pull in the above commit?) Or that, I never rebase those branches. > 3) Stash the patches I've in the Xen tip tree (which is > based on 4.7-rc7) for 4.8 with me putting your Ack on them? > See below log and the full diff. We can do that, or I can stage them for post initial merge (essentially my for-linus, which I could base on 4.7-rc7 now). I'm fine with either. -- Jens Axboe