On Wed, 8 May 2019 14:05:35 -0700
Linus Torvalds wrote:
> On Wed, May 8, 2019 at 1:58 PM Jonathan Corbet wrote:
> >
> > I think this certainly belongs in the maintainer manual, but probably not
> > in pull-requests.rst. There are a lot of things about repository
> > management that seem to
On Wed, May 8, 2019 at 1:58 PM Jonathan Corbet wrote:
>
> I think this certainly belongs in the maintainer manual, but probably not
> in pull-requests.rst. There are a lot of things about repository
> management that seem to trip up even experienced maintainers; pre-pull
> merges is just one of
On Wed, 8 May 2019 22:17:12 +0200
Andreas Gruenbacher wrote:
> Would it make sense to describe how to deal with merge conflicts in
> Documentation/maintainer/pull-requests.rst to stop people from getting
> this wrong over and over again?
I think this certainly belongs in the maintainer manual,
On Wed, May 8, 2019 at 1:17 PM Andreas Gruenbacher wrote:
>
> Would it make sense to describe how to deal with merge conflicts in
> Documentation/maintainer/pull-requests.rst to stop people from getting
> this wrong over and over again?
Probably. I do think it got written up at some point (lwn
Linus,
On Wed, 8 May 2019 at 20:06, Linus Torvalds
wrote:
> On Wed, May 8, 2019 at 10:55 AM Linus Torvalds
> wrote:
> >
> > See what I'm saying? You would ask me to pull the un-merged state, but
> > then say "I noticed a few merge conflicts when I did my test merge,
> > and this is what I did"
Hi Linus,
please consider pulling the following changes for the GFS2 file
system, now without resolving the merge conflict Stephen Rothwell has
pointed out between commit
2b070cfe582b ("block: remove the i argument to bio_for_each_segment_all")
which is already merged, interacting with commit
On Wed, May 8, 2019 at 10:55 AM Linus Torvalds
wrote:
>
> See what I'm saying? You would ask me to pull the un-merged state, but
> then say "I noticed a few merge conflicts when I did my test merge,
> and this is what I did" kind of aside.
Side note: this is more important if you know of a merge
On Wed, May 8, 2019 at 4:49 AM Andreas Gruenbacher wrote:
>
> There was a conflict with commit 2b070cfe582b ("block: remove the i
> argument to bio_for_each_segment_all") on Jens's block layer changes
> which you've already merged. I've resolved that by merging those block
> layer changes; please
Hi Linus,
please consider pulling the following changes for the GFS2 file system.
There was a conflict with commit 2b070cfe582b ("block: remove the i
argument to bio_for_each_segment_all") on Jens's block layer changes
which you've already merged. I've resolved that by merging those block
layer
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit 49a57857aeea06ca831043acbb0fa5e0f50602fd:
Linux 5.0-rc3 (2019-01-21 13:14:44 +1300)
are
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit 40e020c129cfc991e8ab4736d2665351ffd1468d:
Linux 4.20-rc6 (2018-12-09 15:31:00 -0800)
- Original Message -
> On Tue, Oct 23, 2018 at 8:26 PM Bob Peterson wrote:
> >
> > Please consider pulling the following changes for the GFS2 file system.
>
> Pulled.
>
> Just FYI - I end up editing your notes to look a bit more like most
> other people send them. No need to change
On Tue, Oct 23, 2018 at 8:26 PM Bob Peterson wrote:
>
> Please consider pulling the following changes for the GFS2 file system.
Pulled.
Just FYI - I end up editing your notes to look a bit more like most
other people send them. No need to change anything, I just thought I'd
mention it.
Hi Linus,
Welcome back.
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit 050cdc6c9501abcd64720b8cc3e7941efee9547d:
Merge
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Note that I'm on holiday the rest of this week, but I added Andreas
Gruenbacher to the MAINTAINERS file, so he can react if there are
problems that can't wait until I'm back on 11 June.
Regards,
Bob Peterson
Hi Linus,
Please consider pulling the following additional 3 patches for the GFS2
file system.
Regards,
Bob Peterson
The following changes since commit e241e3f2bf975788a1b70dff2eb5180ca395b28e:
Merge tag 'for_linus' of
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit 1b88accf6a659c46d5c8e68912896f112bf882bb:
Merge tag 'for_linus' of
Hi Linus,
I've adjusted this pull request to have a proper diffstat generated by
git merge to a temporary branch, as I did the last time this happened.
So you can pull this one, but probably after Ted's merge request:
https://lkml.org/lkml/2017/11/12/256
Please consider pulling the following
- Original Message -
| Hi Linus,
|
| Please consider pulling the following changes for the GFS2 file system.
|
| Regards,
|
| Bob Peterson
|
| The following changes since commit 9e66317d3c92ddaab330c125dfe9d06eee268aff:
|
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit 9e66317d3c92ddaab330c125dfe9d06eee268aff:
Linux 4.14-rc3 (2017-10-01 14:54:54 -0700)
Hi Linus,
Sorry this is a bit rushed, but I wanted to get this out this week, and
I'll be traveling for the next ten days with unknown Internet access.
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
Hi Linus,
Sorry for the additional merge request, but Andreas discovered this
problem soon after you processed our last gfs2 merge. This fixes a
regression introduced by a patch we did in mid-2015, so best to
get it fixed. It just re-adds code that had been there originally.
Please consider
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit 3ef2bc099d1cce09e2844467e2ced98e1a44609d:
Merge tag 'devicetree-for-4.12' of
On Fri, May 5, 2017 at 1:28 PM, Bob Peterson wrote:
>
> I asked around, but nobody could tell me what went wrong. Strangely,
> this command:
>
> git log --oneline --right-only origin/master...FETCH_HEAD --stat
>
> doesn't show this, but this one does:
>
> git diff --stat
Hi Linus,
Please disregard my previous pull request and
consider pulling the following changes for the GFS2 file system.
Special note:
This time we had an unusual dependency on a patch (f9fe1c12) which
went through David Miller's net-next tree, so we have a merge commit
in our GFS2 for-next
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Special note:
This time we had an unusual dependency on a patch (f9fe1c12) which
went through David Miller's net-next tree, so we had a merge commit
on our GFS2 for-next branch. After you pulled that patch, I
- Original Message -
| On Wed, Mar 15, 2017 at 7:32 AM, Bob Peterson wrote:
| >
| > Andreas Gruenbacher (1):
| > gfs2: Avoid alignment hole in struct lm_lockname
|
| So I've pulled this because I think it fixes a real bug, but honestly
| I think it's the wrong
Hi Linus,
Please consider pulling the following additional patch for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit ae50dfd61665086e617cc9e554a1285d52765670:
Merge
Hi Linus,
Please consider pulling the following additional patch for the GFS2 file system.
Sorry for the lack of bake time on this one, but it is high priority, simple,
and has been well tested.
Bob Peterson
The following
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Bob Peterson
The following changes since commit a3443cda5588985a2724d6d0f4a5f04e625be6eb:
Merge branch 'next' of
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Bob Peterson
The following changes since commit 731c7d3a205ba89b475b2aa71b5f13dd6ae3de56:
Merge tag 'drm-for-v4.8' of
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
Since I'll be on vacation / holiday all next week, I'm doing the merge
window processing for GFS2 early this time, before the merge window has
been officially opened: I'd rather post the patches a little early than
Hi,
Please consider pulling the following changes for the GFS2 file system.
Bob Peterson
The following changes since commit 9dffdb38d864ae89e16ff7b3a09451270736e35b:
Merge tag 'staging-4.6-rc1' of
Hi,
Please consider pulling the following changes for the GFS2 file system.
Bob Peterson
The following changes since commit 67990608c8b95d2b8ccc29932376ae73d5818727:
Merge tag 'pm+acpi-4.5-rc1-1' of
Hi,
Please consider pulling the following changes for the GFS2 file system.
Bob Peterson
The following changes since commit 42d4ebb42a17754d2e8344dc1aa486119671d0eb:
Merge git://www.linux-watchdog.org/linux-watchdog (2015-11-10
Hi Linus,
Please consider pulling the following changes for the GFS2 file system.
I added patch #6 at the last minute, so it hasn't had a chance to make
it to linux-next yet, but it fixes a problem related to fs corruption
when block size != page size. I apologize, but I felt the seriousness
of
Hi,
Please consider pulling the following changes for the GFS2 file system.
I apologize for the late request, but as I explained in my previous email,
I wanted to make sure everything was done "the right way."
Bob Peterson
The
Hi,
I just wanted to give everyone (especially Linus) a heads-up on this.
I've been collecting patches for the GFS2 file system's for-next
branch. The biggest change this time revolves around allowing GFS2
to use rhashtable for its glocks, providing far greater scalability.
Since the patch was
Hi,
Please consider pulling the following changes for the GFS2 file system.
Regards,
Bob Peterson
The following changes since commit f4a3ae9308e34bcd704325a08879b2c1cfb74686:
GFS2: Use average srttb value in congestion
- Original Message -
On Tue, Apr 14, 2015 at 10:47 AM, Bob Peterson rpete...@redhat.com wrote:
12 files changed, 184 insertions(+), 95 deletions(-)
Oh, and this was incorrect. You had apparently limited the statistics
to the fs/gfs2 directory, and thus missed the changes to the
Hi,
On 15/04/15 00:16, Linus Torvalds wrote:
On Tue, Apr 14, 2015 at 10:47 AM, Bob Peterson rpete...@redhat.com wrote:
There's another that adds me as a GFS2 co-maintainer [...]
So generally, when I start getting pull requests from different
people, I'd like to see a previous separate
Hi,
Please consider pulling the following changes,
Bob Peterson
GFS2: merge window
Here is a list of patches we've accumulated for GFS2 for the current upstream
merge window. Most of the patches fix GFS2 quotas, which were not
On Tue, Apr 14, 2015 at 10:47 AM, Bob Peterson rpete...@redhat.com wrote:
There's another that adds me as a GFS2 co-maintainer [...]
So generally, when I start getting pull requests from different
people, I'd like to see a previous separate heads-up or confirmation
from the previous person just
On Tue, Apr 14, 2015 at 10:47 AM, Bob Peterson rpete...@redhat.com wrote:
12 files changed, 184 insertions(+), 95 deletions(-)
Oh, and this was incorrect. You had apparently limited the statistics
to the fs/gfs2 directory, and thus missed the changes to the
MAINTAINERS file. Don't do that -
Hi,
Please consider pulling the following changes,
Steve.
--
This time we have mostly clean ups. There is a bug fix for a NULL dereference
relating to ACLs, and another which improves (but does not fix entirely) an
Hi,
Please consider pulling the following changes,
Steve.
--
The following changes since commit 0df1f2487d2f0d04703f142813d53615d62a1da4:
Linux 3.18-rc3 (2014-11-02 15:01:51 -0800)
are available in the git
Hi,
Please consider pulling the following changes,
Steve.
-
The following changes since commit 37504a3be90b69438426d74ccf467a9fe192932b:
Merge tag 'gfs2-fixes' of
Hi,
Please consider pulling the following fixes for GFS2,
Steve.
The following changes since commit 372b1dbdd1fb5697890b937228d93cfd9c734c90:
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Hi,
Please consider pulling the following changes,
Steve.
-
The following changes since commit 6ca2a88ad820af56535ed1e6936e0490cb6ec6dc:
Merge branch 'x86-urgent-for-linus' of
Hi,
Please consider pulling the following bug fixes,
Steve.
-
The following changes since commit 7e3528c3660a2e8602abc7858b0994d611f74bc3:
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
(2013-11-24
Hi,
Please consider pulling the following fixes,
Steve.
The following changes since commit ea0341e071527d5cec350917b01ab901af09d758:
GFS2: Fix ref count bug relating to atomic_open (2013-11-21 18:47:57 +)
are available
Hi,
Please consider pulling the following changes when the merge window is open,
Steve.
--
The following changes since commit 2147dbfd059eb7fefcfd5934f74f25f0693d4a1f:
GFS2: Use generic list_lru for quota (2013-11-04
Hi,
Please consider pulling the following changes,
Steve.
--
The following changes since commit d6a5e06cd17a3f901231e345e4acc1c3dab9fbb8:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
(2013-08-19 09:30:12 -0700)
Hi,
Please consider pulling the following changes,
Steve.
-
Out of these five patches, the one for ensuring that the number of
revokes is not exceeded, and the one for checking the glock is not
Oops, forgot to sign this when I sent it first, so here is a signed copy of it.
Hi,
Please consider pulling the following changes,
Steve.
-
Out of these five patches, the one for ensuring that the number of
On Mon, Aug 19, 2013 at 2:26 AM, Steven Whitehouse swhit...@redhat.com wrote:
Oops, forgot to sign this when I sent it first, so here is a signed copy of
it.
Please sign the git tag instead of the email. There are no sane tools
to check email signatures etc, but git signed tags not only check
Hi,
Please consider pulling the following fixes for GFS2,
Steve.
--
There are four patches this time. The first fixes a problem where the
wrong descriptor type was being written into the log for journaled data
blocks.
Hi,
Please consider pulling the following fixes,
Steve.
This time there are just four fixes. There are a couple of minor updates
to the quota code, a fix for KConfig to ensure that only valid combinations
including
Hi,
Please consider pulling the following changes,
Steve.
--
There is not a whole lot of change this time - there are some further
changes which are in the works, but those will be held over until next
time.
Here there are
Hi,
Please consider pulling the following changes,
Steve.
There are two patches which fix up a couple of minor issues in the DLM
interface code, a missing error path in gfs2_rs_alloc(), two patches
which fix problems
On Fri, Apr 05, 2013 at 11:34:45AM +0100, Steven Whitehouse wrote:
Please consider pulling the following changes,
There's some mixup here that should be cleared up first.
David Teigland (2):
GFS2: Fix unlock of fcntl locks during withdrawn state
Steven Whitehouse (1):
GFS2:
Hi,
On Fri, 2013-04-05 at 12:27 -0400, David Teigland wrote:
On Fri, Apr 05, 2013 at 11:34:45AM +0100, Steven Whitehouse wrote:
Please consider pulling the following changes,
There's some mixup here that should be cleared up first.
David Teigland (2):
GFS2: Fix unlock of fcntl
Hi,
I've dropped out the patch which shouldn't have made it into the previous
pull request, so this set should be ok now. Apologies for not spotting
that issue sooner,
Steve.
-
There are two patches which fix up a couple of
Hi,
Please consider pulling the following GFS2 patches for the merge window,
Steve.
---
This is one of the smallest collections of patches for the merge
window for some time. There are some clean ups relating to the
Hi,
Please consider pulling the following changes:
The main feature this time is the new Orlov allocator and the patches
leading up to it which allow us to allocate new inodes from their own
allocation context, rather than borrowing that of their parent directory.
It is this change which then
Hi,
Please consider pulling the following GFS2 fixes,
Steve.
---
Here are a number of GFS2 bug fixes. There are three from Andy Price
which fix various issues spotted by automated code analysis. There are two
from
Hi,
Please consider pulling the following changes,
Steve.
---
The major feature this time is the rbm conversion in the resource
group code. The new struct gfs2_rbm specifies the location of an
allocatable block in (resource
Hi,
Please consider pulling the following GFS2 fixes
Steve.
--
Here are three GFS2 fixes for the current kernel tree. These are all
related to the block reservation code which was added at the merge
window. That code
Hi,
On Thu, 2012-08-02 at 18:22 -0700, Linus Torvalds wrote:
[ For some reason this didn't go out, and was in my drafts folder.
Better late than never, I guess ]
On Mon, Jul 23, 2012 at 7:59 AM, Steven Whitehouse swhit...@redhat.com
wrote:
Please consider pulling the following patches.
On Fri, Aug 3, 2012 at 3:18 AM, Steven Whitehouse swhit...@redhat.com wrote:
I've been writing summaries when I send out the pre-pull patch posting
so I could just copy paste from that if it thats the kind of thing
that you are after?
https://lkml.org/lkml/2012/7/23/59
Yup, exactly
[ For some reason this didn't go out, and was in my drafts folder.
Better late than never, I guess ]
On Mon, Jul 23, 2012 at 7:59 AM, Steven Whitehouse swhit...@redhat.com wrote:
Please consider pulling the following patches. There have been no changes
since
they were posted for review,
It
Hi,
Please consider pulling the following patches. There have been no changes since
they were posted for review,
Steve.
The following changes since commit af3a3ab2966112c0d0a44df7eeb1e95fe32d4495:
Merge
Hi,
Please consider pulling the following fix,
Steve.
-
The following changes since commit 95f714727436836bb46236ce2bcd8ee8f9274aed:
Merge tag 'ext4_for_linus' of
[Apologies - I don't think the first message got signed as
it should have. Here is a second attempt...]
Hi,
Please consider pulling the following patches,
Steve.
--
The following changes since commit
Hi,
Please consider pulling the following bug fixes,
Steve.
The following changes since commit 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691:
Merge tag 'ktest-fix-make-min-failed-build-for-real' of
Hi,
Please consider pulling the following changes. All except one of these
patches is actually a bug fix rather than specifically merge window
material. That remaining patch applies on top of the DLM patches which
were merged in the current window,
Steve.
Hi,
Please consider pulling the following changes,
Steve.
--
The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:
Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)
are available in the git repository
Hi,
Please consider pulling the following patch. Since it is only one
small patch I attached it below rather than posting it separately
as usual,
Steve.
The following changes since commit
Hi,
Please consider pulling the following changes,
Steve.
The following changes since commit 5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
Hi,
Please consider pulling the following three fixes,
Steve.
The following changes since commit 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc:
Linux 3.0-rc7 (2011-07-11 16:51:52 -0700)
are available in the git
Hi,
Please consider pulling the following change. Since there is only
one patch I included it at the end of this email rather than as a
separate message,
Steve.
---
The following changes since commit
Hi,
These two changes just missed out on the last pull request. Please
consider pulling the following two fixes,
Steve.
-
The following changes since commit c21fd1a8c68ce3f49b00caf10337169262cfb8ad:
Merge
Hi,
Please consider pulling the following GFS2 changes,
Steve.
--
The following changes since commit 2f666bcf757cb72549f360ef6da02f03620a48b6:
Merge branch 'drm-fixes' of
Hi,
Please consider pulling the following changes,
Steve.
---
The following changes since commit 2b1caf6ed7b888c95a1909d343799672731651a5:
Merge branch 'core-fixes-for-linus' of
Hi,
Please consider pulling the following GFS2 bug fixes,
Steve.
--
The following changes since commit e6f597a1425b5af64917be3448b29e2d5a585ac8:
staging: fix build failure in bcm driver (2011-01-17 17:39:39 -0800)
Hi,
When you are ready to start merging, please consider pulling the
following changes. There have been no updates since I posted the patches
before Christmas,
Steve.
--
The following changes since commit
Hi,
Please consider pulling the following fix,
Steve.
-
The following changes since commit e53beacd23d9cb47590da6a7a7f6d417b941a994:
Linux 2.6.37-rc2 (2010-11-15 18:31:02 -0800)
are available in the git repository
Hi,
Please consider pulling the following (very small!) patch,
Steve.
--
The following changes since commit 03a7ab083e4d619136d6f07ce70fa9de0bc436fc:
Merge
Hi,
Please consider pulling the following GFS2 fixes,
Steve.
The following changes since commit 2f7989efd4398d92b8adffce2e07dd043a0895fe:
Merge master.kernel.org:/home/rmk/linux-2.6-arm (2010-07-14 17:28:13 -0700)
are available in the git repository at:
Hi,
Please consider pulling the following three GFS2 fixes,
Steve.
---
The following changes since commit d7dbf4ffee1c7a17e2e5b5f01efe76fbd1671db6:
Linus Torvalds (1):
Merge branch 'for-linus' of
Hi,
Please consider pulling the following patches for GFS2,
Steve.
The following changes since commit b72c40949b0f04728f2993a1434598d3bad094ea:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/pci-2.6
are available in the git repository at:
Hi,
Please consider pulling the following small fixes,
Steve.
--
The following changes since commit 57d54889cd00db2752994b389ba714138652e60c:
Linus Torvalds (1):
Linux 2.6.34-rc1
are available in the git
Hi,
Please consider pulling the following GFS2 changes,
Steve.
--
The following changes since commit 30ff056c42c665b9ea535d8515890857ae382540:
Linus Torvalds (1):
Merge branch 'x86-uv-for-linus' of
Hi,
Please consider pulling the following changes,
Steve.
-
The following changes since commit 676ad585531e965416fd958747894541dabcec96:
Linus Torvalds (1):
Merge branch 'for-linus' of
Hi,
Please consider pulling the following two changes,
Steve.
The following changes since commit 1a45dcfe2525e9432cb4aba461d4994fc2befe42:
Linus Torvalds (1):
Merge branch 'for-linus' of
Hi,
Please consider pulling the following patches,
Steve.
The following changes since commit 066000dd856709b6980123eb39b957fe26993f7b:
Ananth N Mavinakayanahalli (1):
Revert x86, apic: Use logical flat on
Hi,
Please consider pulling the following GFS2 bug fixes,
Steve.
The following changes since commit 74d2e4f8d79ae0c4b6ec027958d5b18058662eea:
Linus Torvalds (1):
Linux 2.6.33-rc3
are available in the git repository at:
Hi,
Please consider pulling the following changes,
Steve.
---
The following changes since commit 894ef820b10d77e2d6d717342fc408bdd9825139:
Randy Dunlap (1):
dm-log-userspace: fix printk format warning
are
Hi,
Please consider pulling the following fix,
Steve.
The following changes since commit 64f1607ffbbc772685733ea63e6f7f4183df1b16:
Linus Torvalds (1):
Linux 2.6.31-rc6
are available in the git repository at:
Hi,
Please consider pulling the following changes,
Steve.
The following changes since commit 4be3bd7849165e7efa6b0b35a23d6a3598d97465:
Linus Torvalds (1):
Linux 2.6.31-rc4
are available in the git repository
1 - 100 of 111 matches
Mail list logo