From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jens Axboe <axboe@kernel.dk>, Jonathan Corbet <corbet@lwn.net>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the jc_docs tree
Date: Wed, 16 Jul 2025 13:12:09 +0700 [thread overview]
Message-ID: <aHdCuWhR23EQPXJ2@archie.me> (raw)
In-Reply-To: <20250716150234.52ec0d5f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 5305 bytes --]
On Wed, Jul 16, 2025 at 03:02:34PM +1000, Stephen Rothwell wrote:
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> <snipped>...
> diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst
> index 677456c31228,4f1532a251d2..000000000000
> --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
> +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
> @@@ -223,32 -219,31 +223,31 @@@ Code Seq# Include Fil
> fs/xfs/linux-2.6/xfs_ioctl32.h,
> include/linux/falloc.h,
> linux/fs.h,
> -'X' all fs/ocfs2/ocfs_fs.h conflict!
> +'X' all fs/ocfs2/ocfs_fs.h conflict!
> - 'X' 01 linux/pktcdvd.h conflict!
> 'Z' 14-15 drivers/message/fusion/mptctl.h
> -'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> - <mailto:gregkh@linuxfoundation.org>
> -'a' all linux/atm*.h, linux/sonet.h ATM on linux
> - <http://lrcwww.epfl.ch/>
> -'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> -'b' 00-FF conflict! bit3 vme host bridge
> - <mailto:natalia@nikhefk.nikhef.nl>
> -'b' 00-0F linux/dma-buf.h conflict!
> -'c' 00-7F linux/comstats.h conflict!
> -'c' 00-7F linux/coda.h conflict!
> -'c' 00-1F linux/chio.h conflict!
> -'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> +'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
> + <mailto:gregkh@linuxfoundation.org>
> +'a' all linux/atm*.h, linux/sonet.h ATM on linux
> + <http://lrcwww.epfl.ch/>
> +'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver
> +'b' 00-FF conflict! bit3 vme host bridge
> + <mailto:natalia@nikhefk.nikhef.nl>
> +'b' 00-0F linux/dma-buf.h conflict!
> +'c' 00-7F linux/comstats.h conflict!
> +'c' 00-7F linux/coda.h conflict!
> +'c' 00-1F linux/chio.h conflict!
> +'c' 80-9F arch/s390/include/asm/chsc.h conflict!
> 'c' A0-AF arch/x86/include/asm/msr.h conflict!
> -'d' 00-FF linux/char/drm/drm.h conflict!
> -'d' 02-40 pcmcia/ds.h conflict!
> +'d' 00-FF linux/char/drm/drm.h conflict!
> +'d' 02-40 pcmcia/ds.h conflict!
> 'd' F0-FF linux/digi1.h
> -'e' all linux/digi1.h conflict!
> -'f' 00-1F linux/ext2_fs.h conflict!
> -'f' 00-1F linux/ext3_fs.h conflict!
> -'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> -'f' 00-0F fs/ext4/ext4.h conflict!
> -'f' 00-0F linux/fs.h conflict!
> -'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> +'e' all linux/digi1.h conflict!
> +'f' 00-1F linux/ext2_fs.h conflict!
> +'f' 00-1F linux/ext3_fs.h conflict!
> +'f' 00-0F fs/jfs/jfs_dinode.h conflict!
> +'f' 00-0F fs/ext4/ext4.h conflict!
> +'f' 00-0F linux/fs.h conflict!
> +'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict!
> 'f' 13-27 linux/fscrypt.h
> 'f' 81-8F linux/fsverity.h
> 'g' 00-0F linux/usb/gadgetfs.h
The resolution looks good, thanks!
--
An old man doll... just what I always wanted! - Clara
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2025-07-16 6:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 5:02 linux-next: manual merge of the block tree with the jc_docs tree Stephen Rothwell
2025-07-16 6:12 ` Bagas Sanjaya [this message]
2025-07-16 13:31 ` Jonathan Corbet
2025-07-16 21:32 ` Stephen Rothwell
2025-07-29 1:46 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-25 4:42 Stephen Rothwell
2019-07-09 0:08 ` Stephen Rothwell
2019-07-09 2:45 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aHdCuWhR23EQPXJ2@archie.me \
--to=bagasdotme@gmail.com \
--cc=axboe@kernel.dk \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.