From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jan Kara <jack@suse.cz>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Subject: linux-next: manual merge of the ext3 tree with Linus' tree
Date: Fri, 18 Jun 2021 10:32:45 +1000 [thread overview]
Message-ID: <20210618103245.02f030b5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
Hi all,
Today's linux-next merge of the ext3 tree got a conflict in:
include/uapi/asm-generic/unistd.h
between commit:
8b1462b67f23 ("quota: finish disable quotactl_path syscall")
from Linus' tree and commit:
64c2c2c62f92 ("quota: Change quotactl_path() systcall to an fd-based one")
from the ext3 tree.
I fixed it up (I just used the latter version) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-06-18 0:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 0:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-10 1:22 linux-next: manual merge of the ext3 tree with Linus' tree Stephen Rothwell
2012-01-10 12:01 ` Jan Kara
2011-11-02 0:59 Stephen Rothwell
2010-05-22 5:45 Stephen Rothwell
2010-05-25 21:55 ` Jan Kara
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=20210618103245.02f030b5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marcin@juszkiewicz.com.pl \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).