From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the ceph tree with Linus' tree Date: Tue, 12 Jan 2010 11:09:39 +1100 Message-ID: <20100112110939.234a6e65.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Sage Weil Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Randy Dunlap List-Id: linux-next.vger.kernel.org Hi Sage, Today's linux-next merge of the ceph tree got a conflict in Documentation/ioctl/ioctl-number.txt between commit cb5a8b2c92febbed57126e1b8416dfd7607ff03d ("docs: large update to ioctl-number.txt") from Linus' tree and commit 8f4e91dee2a245e4be6942f4a8d83a769e13a47d ("ceph: ioctls") from the ceph tree. Just overlapping additions - not a big deal. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc Documentation/ioctl/ioctl-number.txt index 35cf64d,91cfdd7..0000000 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@@ -289,9 -181,8 +289,10 @@@ Code Seq#(hex) Include File Comment 0x8C 00-3F WiNRADiO driver 0x90 00 drivers/cdrom/sbpcd.h +0x92 00-0F drivers/usb/mon/mon_bin.c 0x93 60-7F linux/auto_fs.h +0x94 all fs/btrfs/ioctl.h + 0x97 00-7F fs/ceph/ioctl.h Ceph file system 0x99 00-0F 537-Addinboard driver 0xA0 all linux/sdp/sdp.h Industrial Device Project