From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753572AbbB0PnX (ORCPT ); Fri, 27 Feb 2015 10:43:23 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:17478 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbbB0PnW (ORCPT ); Fri, 27 Feb 2015 10:43:22 -0500 Date: Fri, 27 Feb 2015 08:42:48 -0700 From: Jens Axboe To: CC: Subject: [GIT PULL] Two fixes for 4.0-rc2 Message-ID: <20150227154248.GA12546@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-Originating-IP: [192.168.54.13] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-02-27_05:2015-02-27,2015-02-27,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=1.72084568816899e-15 kscore.compositescore=0 circleOfTrustscore=0 compositescore=0.985052395226116 suspectscore=3 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 rbsscore=0.985052395226116 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=0 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.985052395226116 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1502270167 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Two smaller fixes for this cycle: - A fixup from Keith so that NVMe compiles without BLK_INTEGRITY, basically just moving the code around appropriately. - A fixup for shm, fixing an oops in shmem_mapping() for mapping with no inode. From Sasha. Please pull! git://git.kernel.dk/linux-block.git for-linus for you to fetch changes up to f0774d884bad7007b54cfffb5c93c23420c75aa6: mm: shmem: check for mapping owner before dereferencing (2015-02-23 10:00:11 -0800) ---------------------------------------------------------------- Keith Busch (1): NVMe: Fix for BLK_DEV_INTEGRITY not set Sasha Levin (1): mm: shmem: check for mapping owner before dereferencing drivers/block/nvme-core.c | 99 +++++++++++++++++++++++++++-------------------- mm/shmem.c | 3 ++ 2 files changed, 61 insertions(+), 41 deletions(-) -- Jens Axboe